From b496da6315314d9bd048ac2214d8bc95d2f1df02 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 13 十一月 2024 08:59:18 +0800
Subject: [PATCH] 优化

---
 company/src/views/business/applyChange.vue |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/company/src/views/business/applyChange.vue b/company/src/views/business/applyChange.vue
index 3c3421d..07a1949 100644
--- a/company/src/views/business/applyChange.vue
+++ b/company/src/views/business/applyChange.vue
@@ -14,8 +14,14 @@
           <el-option label="宸插叧闂�" value="6"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="鎶曚繚浼佷笟" prop="companyId">{{searchForm.companyId}}
-        <el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @change="search">
+      <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">
+        <el-select v-model="searchForm.companyId" filterable placeholder="璇烽�夋嫨" @change="search">
           <el-option
               v-for="item in companyList"
               :key="item.id"
@@ -24,8 +30,8 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="淇濋櫓鏂规" prop="baseSolutionsId">{{searchForm.baseSolutionsId}}
-        <el-select v-model="searchForm.baseSolutionsId" placeholder="璇烽�夋嫨" @change="search">
+      <el-form-item label="淇濋櫓鏂规" prop="baseSolutionsId">
+        <el-select v-model="searchForm.baseSolutionsId" filterable placeholder="璇烽�夋嫨" @change="search">
           <el-option
               v-for="item in solutionList"
               :key="item.baseId"
@@ -85,7 +91,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 +104,7 @@
     </template>
     <!-- 璇︽儏 -->
     <OperaApplyChangeDetailWindow ref="operaApplyChangeDetailWindow" @success="handlePageChange"/>
+    <OperaUnionChangeDetailWindow ref="OperaUnionChangeDetailWindow" @success="handlePageChange"/>
   </TableLayout>
 </template>
 
@@ -105,13 +112,14 @@
 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";
 export default {
   name: 'add_subtract',
   extends: BaseTable,
-  components: { TableLayout, Pagination, OperaApplyChangeDetailWindow },
+  components: { TableLayout, Pagination, OperaApplyChangeDetailWindow, OperaUnionChangeDetailWindow },
   data () {
     return {
       // 鎼滅储
@@ -122,6 +130,7 @@
         createDateE: '',
         createDateS: '',
         companyId: '',
+        solutionType: '',
         baseSolutionsId: '',
         time: []
       },
@@ -140,8 +149,15 @@
     this.loadSelectList()
   },
   methods: {
+    openEdit(row) {
+      if (row.solutionType === 0) {
+        this.$refs.operaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', row)
+      } else if (row.solutionType === 1) {
+        this.$refs.OperaUnionChangeDetailWindow.open('鍔犲噺淇濊鎯�', row)
+      }
+    },
     loadSelectList() {
-      solutionAll({dataType:2}).then(res => {
+      solutionAll({dataType:2,type:0}).then(res => {
         this.solutionList = res
       }).catch(err => {
       })

--
Gitblit v1.9.3