From 3011b9800d6c5bee031d87bc4e225b5b1fb52571 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 23 十一月 2024 09:19:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/views/business/applyChange.vue | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/company/src/views/business/applyChange.vue b/company/src/views/business/applyChange.vue
index 1e2c6e7..2031d8a 100644
--- a/company/src/views/business/applyChange.vue
+++ b/company/src/views/business/applyChange.vue
@@ -9,9 +9,15 @@
<el-option label="寰呭鏍�" value="1"></el-option>
<el-option label="宸茬敓鏁�" value="2"></el-option>
<el-option label="鐢宠閫�鍥�" value="3"></el-option>
- <!-- 3 4 閮芥槸閫�鍥炵敵璇蜂腑-->
<el-option label="宸查��鍥�" value="5"></el-option>
<el-option label="宸插叧闂�" value="6"></el-option>
+ <el-option label="鎵规敼鐢宠涓�" value="9"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎶曚繚绫诲瀷" prop="solutionType">
+ <el-select v-model="searchForm.solutionType" placeholder="璇烽�夋嫨" @change="search">
+ <el-option label="鐩翠繚鎶曚繚" :value="0"></el-option>
+ <el-option label="濮旀墭鎶曚繚" :value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鎶曚繚浼佷笟" prop="companyId">
@@ -52,6 +58,9 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
+ <ul class="toolbar">
+ <li><el-button type="primary" @click="$refs.chooseCompany.open('閫夋嫨浼佷笟')">鏂板</el-button></li>
+ </ul>
<el-table
v-loading="isWorking.search"
:data="tableData.list"
@@ -70,6 +79,7 @@
<span :class="'change-status'+row.status" v-if="row.status === 3 || row.status === 4">閫�鍥炵敵璇�</span>
<span :class="'change-status'+row.status" v-if="row.status ===5 || row.status === 8">宸查��鍥�</span>
<span :class="'change-status'+row.status" v-if="row.status ===6">宸插叧闂�</span>
+ <span :class="'change-status'+row.status" v-if="row.status ===9">鎵规敼鐢宠涓�</span>
</template>
</el-table-column>
<el-table-column prop="companyName" label="鎶曚繚浼佷笟" min-width="100px"></el-table-column>
@@ -85,7 +95,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', row)">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="openEdit(row)">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
@@ -98,6 +108,11 @@
</template>
<!-- 璇︽儏 -->
<OperaApplyChangeDetailWindow ref="operaApplyChangeDetailWindow" @success="handlePageChange"/>
+ <OperaUnionChangeDetailWindow ref="OperaUnionChangeDetailWindow" @success="handlePageChange"/>
+ <!-- 閫夋嫨浼佷笟 -->
+ <chooseCompany ref="chooseCompany" @submit="getCompany" />
+ <!-- 閫夋嫨淇濆崟 -->
+ <selectPolicy ref="selectPolicy" @success="handlePageChange" />
</TableLayout>
</template>
@@ -105,13 +120,16 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
+import OperaUnionChangeDetailWindow from '@/components/business/OperaUnionChangeDetailWindow'
import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
import {all as solutionAll, all} from '@/api/business/solutions'
import {pageAll as companyAll} from "@/api/business/company";
+import chooseCompany from '@/components/common/chooseCompany'
+import selectPolicy from '@/components/business/selectPolicy'
export default {
name: 'add_subtract',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaApplyChangeDetailWindow },
+ components: { TableLayout, Pagination, OperaApplyChangeDetailWindow, OperaUnionChangeDetailWindow, chooseCompany, selectPolicy },
data () {
return {
// 鎼滅储
@@ -122,7 +140,7 @@
createDateE: '',
createDateS: '',
companyId: '',
- solutionType: 0,
+ solutionType: '',
baseSolutionsId: '',
time: []
},
@@ -141,6 +159,17 @@
this.loadSelectList()
},
methods: {
+ getCompany(e) {
+ this.$refs.selectPolicy.open('閫夋嫨淇濆崟', e.companyId, 1)
+ },
+ openEdit(row) {
+ this.$refs.operaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', row)
+ // if (row.solutionType === 0) {
+ // this.$refs.operaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', row)
+ // } else if (row.solutionType === 1) {
+ // this.$refs.OperaUnionChangeDetailWindow.open('鍔犲噺淇濊鎯�', row)
+ // }
+ },
loadSelectList() {
solutionAll({dataType:2,type:0}).then(res => {
this.solutionList = res
--
Gitblit v1.9.3