From a4945c89ee72aa8b6f2c0a75653a3256a2b30b4f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 16 五月 2024 19:02:57 +0800
Subject: [PATCH] 提交一把

---
 company/src/components/business/OperaWtbApplyShopWindow.vue |   42 ++++++++++++++++++++++++++++++++----------
 1 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index d31b62f..297eb8a 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -11,7 +11,7 @@
                 <div class="desc_item_label" v-if="userInfo.type === 1 && model.status ===27 ">
                     <div class="desc_item_label_left">
                         <span>淇濋櫓鍒版湡杩樻湁 <b style="color: #F95601;">{{model.loseEfficacyDays ? model.loseEfficacyDays : '-'}}</b> 澶�</span>
-                        <el-button type="primary" v-if="model.status === 27" @click="$refs.OperaInsuranceApply.open('缁繚', { id: dataId, type: 1 })">涓�閿画淇�</el-button>
+                        <el-button type="primary" v-if="model.status === 27" @click="$refs.OperaInsuranceApplyAddWindow.open('缁繚', {id: dataId,type: 1 })">涓�閿画淇�</el-button>
                         <el-button type="primary" v-if="model.status === 27 && model.loseEfficacyDays" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: dataId })">鍔犲噺淇濈敵璇�</el-button>
                         <el-button type="primary" v-if="model.status === 27 && model.loseEfficacyDays" @click="$refs.factoryChange.open('鏇存崲娲鹃仯鍗曚綅鐢宠', { id: dataId })">鏇存崲娲鹃仯鍗曚綅鐢宠</el-button>
                     </div>
@@ -271,6 +271,11 @@
                             <span>{{row.fee!=null?row.fee: '-'}}</span>
                           </template>
                         </el-table-column>
+                      <el-table-column
+                          prop="remark"
+                          align="center"
+                          label="澶囨敞">
+                      </el-table-column>
                     </el-table>
                     <el-table
                         :data="list1"
@@ -326,8 +331,20 @@
                             :key="Math.random()"
                             prop="applyStartTime"
                             align="center"
-                            label="鎵瑰崟鐢熸晥璧锋湡">
+                            label="鎵瑰鐢熸晥鏃ユ湡">
                         </el-table-column>
+                        <el-table-column
+                            :key="Math.random()"
+                            prop="delValidTime"
+                            align="center"
+                            label="鎵瑰噺鐢熸晥鏃ユ湡">
+                        </el-table-column>
+                      <el-table-column
+                          :key="Math.random()"
+                          prop="remark"
+                          align="center"
+                          label="澶囨敞">
+                      </el-table-column>
                         <el-table-column
                             align="center"
                             :key="Math.random()"
@@ -387,6 +404,11 @@
                             label="鎵瑰崟鐢熸晥璧锋湡">
                         </el-table-column>
                         <el-table-column
+                            prop="remark"
+                            align="center"
+                            label="澶囨敞">
+                        </el-table-column>
+                        <el-table-column
                             :key="Math.random()"
                             align="center"
                             label="鎿嶄綔">
@@ -406,7 +428,7 @@
                     </div>
                 </div>
                 <div class="desc_item_review">
-                    <div class="desc_item_review_label">瀹℃牳娴佺▼</div>
+                    <div class="desc_item_review_label">鎿嶄綔璁板綍</div>
                   <el-timeline :reverse="reverse">
                     <el-timeline-item
                         v-for="(activity, index) in activities"
@@ -432,7 +454,7 @@
         <!--    浼佷笟鐢宠閫�鍥�    -->
         <applyReturn ref="applyReturn" @success="successEvent" />
         <!--    鏂板鎶曚繚    -->
-        <OperaInsuranceApply ref="OperaInsuranceApply" @success="successEvent" />
+        <OperaInsuranceApplyAddWindow ref="OperaInsuranceApplyAddWindow" @success="successEvent" />
         <!--    鍔犲噺淇濈敵璇�    -->
         <additionSubtractionApplication ref="additionSubtractionApplication" @success="successEvent" />
         <!--    鏇存崲娲鹃仯鍗曚綅鐢宠    -->
@@ -478,6 +500,7 @@
 
 <script>
 import BaseOpera from '@/components/base/BaseOpera'
+import OperaInsuranceApplyAddWindow from '@/components/enterprise/OperaInsuranceApplyAddWindow'
 import GlobalWindow from '@/components/common/GlobalWindow'
 import InsuranceDetails from '@/components/business/InsuranceDetails'
 import OperaWtbApplyCheckWindow from '@/components/business/OperaWtbApplyCheckWindow'
@@ -486,7 +509,6 @@
 import operaverifyPhoneNumberWindew from '@/components/business/operaverifyPhoneNumberWindew'
 import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
 import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow'
-
 import applyReturn from '@/components/enterprise/applyReturn'
 import {
   getDetail,
@@ -500,7 +522,6 @@
 import { findListByDTO } from '@/api/business/dispatchUnit'
 import { fetchList } from '@/api/business/applyChange'
 import { findListByDTO as worktypeFindListByDTO } from '@/api/business/worktype'
-import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyWindow'
 import { mapState } from 'vuex'
 import {sendSms} from "@/api/business/smsEmail";
 
@@ -512,7 +533,7 @@
     InsuranceDetails,
     OperaWtbApplyCheckWindow,
     applyReturn,
-    OperaInsuranceApply,
+    OperaInsuranceApplyAddWindow,
     additionSubtractionApplication,
     factoryChange,
     OperaApplyChangeDetailWindow,
@@ -584,11 +605,10 @@
   },
   methods: {
     open (title, target) {
-      this.visible = true
       this.title = title
       this.model = {}
-      this.num=0
-      this.timer=null
+      this.num= 0
+      this.timer= null
       this.dataId = null
       this.dataId = target.id
       this.form.businessId = target.id
@@ -604,6 +624,8 @@
       this.formInline.startTimeS = ''
       this.formInline.type = ''
       this.activeName = '0'
+
+      this.visible = true
       this.getDetail()
       this.getList()
       this.getDW()

--
Gitblit v1.9.3