From ad5c2bf44c99d299cbb5b8182675aec514d55a57 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 15:38:37 +0800
Subject: [PATCH] 提交一把

---
 company/src/views/enterprise/add_subtract.vue |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/company/src/views/enterprise/add_subtract.vue b/company/src/views/enterprise/add_subtract.vue
index d93b480..0376094 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">
@@ -58,15 +60,24 @@
                         <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="applyCode" label="鍏宠仈淇濆崟鍙�" min-width="100px"></el-table-column>
                 <el-table-column prop="solutionsName" label="淇濋櫓鏂规" min-width="100px"></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 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>
+                <el-table-column prop="validTime" label="鐢宠鏃ユ湡" min-width="100px"></el-table-column>
                 <el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
                 <el-table-column
                     label="鎿嶄綔"

--
Gitblit v1.9.3