From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch

---
 company/src/views/enterprise/add_subtract.vue |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/company/src/views/enterprise/add_subtract.vue b/company/src/views/enterprise/add_subtract.vue
index 43dcd66..52173b9 100644
--- a/company/src/views/enterprise/add_subtract.vue
+++ b/company/src/views/enterprise/add_subtract.vue
@@ -12,6 +12,8 @@
 <!--                    3 4 閮芥槸閫�鍥炵敵璇蜂腑-->
                     <el-option label="宸查��鍥�" value="5"></el-option>
                     <el-option label="宸插叧闂�" value="6"></el-option>
+                    <el-option label="寰呭嚭鍗�" value="7"></el-option>
+                    <el-option label="鎶曚繚涓�" value="9"></el-option>
                 </el-select>
             </el-form-item>
           <el-form-item label="淇濋櫓鏂规" prop="baseSolutionsId">
@@ -42,9 +44,6 @@
         </el-form>
         <!-- 琛ㄦ牸鍜屽垎椤� -->
         <template v-slot:table-wrap>
-            <ul class="toolbar" v-permissions="['business:applychange:create']">
-                <li><el-button type="primary" @click="$refs.operaApplyChangeWindow.open('鏂板缓')" v-permissions="['business:applychange:create']">鏂板缓</el-button></li>
-            </ul>
             <el-table
                 v-loading="isWorking.search"
                 :data="tableData.list"
@@ -57,15 +56,24 @@
                 </el-table-column>
                 <el-table-column prop="status" label="淇濆崟鐘舵��" min-width="100px">
                     <template slot-scope="{row}">
-                        <span v-if="row.status === 0">寰呯缃�</span>
-                        <span v-if="row.status === 1">宸茬绔�</span>
-                        <span v-if="row.status === 2">宸蹭笂浼犳壒鍗�</span>
-                        <span v-if="row.status === 3">閫�鍥炵敵璇�</span>
+                        <span :class="'change-status'+row.status" v-if="row.status === 0">寰呯缃�</span>
+                        <span :class="'change-status'+row.status" v-if="row.status === 1">寰呭鏍�</span>
+                        <span :class="'change-status'+row.status" v-if="row.status === 2">宸茬敓鏁�</span>
+                        <span :class="'change-status'+row.status" v-if="row.status === 6">宸插叧闂�</span>
+                        <span :class="'change-status'+row.status" v-if="row.status === 7">寰呭嚭鍗�</span>
+                        <span :class="'change-status'+row.status" v-if="row.status === 9">鎶曚繚涓�</span>
+                        <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>
                     </template>
                 </el-table-column>
-                <el-table-column prop="companyName" label="鎶曚繚浼佷笟" min-width="100px"></el-table-column>
                 <el-table-column prop="applyCode" label="鍏宠仈淇濆崟鍙�" min-width="100px"></el-table-column>
                 <el-table-column prop="solutionsName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
+              <el-table-column label="绫诲瀷">
+                <template slot-scope="{row}">
+                  <span style="color: #00BA92" v-if="row.solutionType == 1">濮旀墭鎶曚繚</span>
+                  <span style="color: #F95601;"  v-else>鐩存帴鎶曚繚</span>
+                </template>
+              </el-table-column>
                 <el-table-column prop="addNum" label="鍔犱繚浜烘暟锛堜汉锛�" min-width="100px"></el-table-column>
                 <el-table-column prop="delNum" label="鍑忎繚浜烘暟锛堜汉锛�" min-width="100px"></el-table-column>
                 <el-table-column prop="fee" label="璐圭敤鍙樻洿" min-width="100px"></el-table-column>
@@ -76,7 +84,7 @@
                     fixed="right"
                 >
                     <template slot-scope="{row}">
-                        <el-button type="text" @click="$refs.operaApplyChangeWindow.open('鍔犲噺淇濊鎯�', row)">鏌ョ湅璇︽儏</el-button>
+                        <el-button type="text" @click="$refs.OperaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', row)">鏌ョ湅璇︽儏</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -88,7 +96,7 @@
             </pagination>
         </template>
         <!-- 璇︽儏 -->
-        <add_subtractDetails ref="add_subtractDetails" @success="handlePageChange"/>
+        <OperaApplyChangeDetailWindow ref="OperaApplyChangeDetailWindow" @success="handlePageChange"/>
     </TableLayout>
 </template>
 
@@ -97,11 +105,13 @@
     import TableLayout from '@/layouts/TableLayout'
     import Pagination from '@/components/common/Pagination'
     import add_subtractDetails from '@/components/enterprise/add_subtractDetails'
+    import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
     import {all as solutionAll, all} from '@/api/business/solutions'
+    import { mapState } from 'vuex'
     export default {
         name: 'add_subtract',
         extends: BaseTable,
-        components: { TableLayout, Pagination, add_subtractDetails },
+        components: { TableLayout, Pagination, add_subtractDetails, OperaApplyChangeDetailWindow },
         data () {
             return {
                 // 鎼滅储

--
Gitblit v1.9.3