From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把

---
 company/src/components/business/OperaWtbApplyShopWindow.vue |  105 ++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 77 insertions(+), 28 deletions(-)

diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index d31b62f..08e5733 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -11,9 +11,9 @@
                 <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 && 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>
+                        <el-button type="primary" v-if="model.status === 27" @click="goYjxb">涓�閿画淇�</el-button>
+                        <el-button type="primary" v-if="model.status === 27 && ( model.loseEfficacyDays ||!model.loseEfficacyDays)" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: dataId })">鍔犲噺淇濈敵璇�</el-button>
+                        <el-button type="primary" v-if="model.status === 27 &&  ( model.loseEfficacyDays ||!model.loseEfficacyDays)" @click="$refs.factoryChange.open('鏇存崲娲鹃仯鍗曚綅鐢宠', { id: dataId })">鏇存崲娲鹃仯鍗曚綅鐢宠</el-button>
                     </div>
                 </div>
                 <div class="desc_item_label">
@@ -26,7 +26,7 @@
                   <div class="desc_item_label_right">
                     <el-button type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚璇︽儏鍗�',model,0)">瀵煎嚭璇﹀崟</el-button>
                       <template v-if="userInfo.type === 1">
-                          <el-button v-if="model.status == 24" type="primary" @click="$refs.OperaInsuranceApply.open('鎶曚繚鐢宠', {id: dataId})">鍐嶆鎶曚繚</el-button>
+                          <el-button v-if="model.status == 24" type="primary" @click="$refs.OperaInsuranceApplyAddWindow.open('鎶曚繚鐢宠', {id: dataId})">鍐嶆鎶曚繚</el-button>
                           <el-button v-if="[21,22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewFanganshu">鏌ョ湅纭涔�</el-button>
                         <el-button v-if="[22,23,24,25,26,27].includes(model.status)  && model.shenqingdanFile" type="primary" @click="viewShenqingdan">鏌ョ湅鐢宠鍗�</el-button>
                         <el-button v-if="[1,2,3].includes(model.unionApplyTbdStatus) &&(model.toubaodanFile || model.oubaodanSignedFile)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
@@ -85,10 +85,11 @@
                             align="center"
                             label="鎶曚繚浜烘暟">
                         </el-table-column>
+                      <el-table-column prop="guaranteeNum"  align="center" label="鍦ㄤ繚浜烘暟" ></el-table-column>
                         <el-table-column
                             prop="serviceDays"
                             align="center"
-                            label="鍦ㄤ繚鏃堕暱锛堝ぉ锛�">
+                            label="淇濆崟鏃堕暱锛堝ぉ锛�">
                         </el-table-column>
                         <el-table-column
                             prop="currentFee"
@@ -181,7 +182,7 @@
                                     <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-option label="鎵规敼鐢宠涓�" value="9"></el-option>
                                 </el-select>
                             </el-form-item>
                             <el-form-item label="鎵瑰崟鐢熸晥璧锋湡" prop="end">
@@ -229,7 +230,7 @@
                             label="鎬у埆">
                             <template slot-scope="{row}">
                                 <span v-if="row.sex === 0">鐢�</span>
-                                <span v-else>濂�</span>
+                              <span  v-if="row.sex === 1">濂�</span>
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -271,6 +272,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"
@@ -295,7 +301,7 @@
                                 <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 === 7">寰呭嚭鍗�</span>
-                              <span :class="'change-status'+row.status" v-if="row.status === 9">鎶曚繚涓�</span>
+                              <span :class="'change-status'+row.status" v-if="row.status === 9">鎵规敼鐢宠涓�</span>
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -326,8 +332,26 @@
                             :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="fee"
+                          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()"
@@ -359,7 +383,7 @@
                                 <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 === 7">寰呭嚭鍗�</span>
-                              <span :class="'change-status'+row.status" v-if="row.status === 9">鎶曚繚涓�</span>
+                              <span :class="'change-status'+row.status" v-if="row.status === 9">鎵规敼鐢宠涓�</span>
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -387,6 +411,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 +435,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 +461,7 @@
         <!--    浼佷笟鐢宠閫�鍥�    -->
         <applyReturn ref="applyReturn" @success="successEvent" />
         <!--    鏂板鎶曚繚    -->
-        <OperaInsuranceApply ref="OperaInsuranceApply" @success="successEvent" />
+        <OperaInsuranceApplyAddWindowNew ref="OperaInsuranceApplyAddWindow" @success="result" />
         <!--    鍔犲噺淇濈敵璇�    -->
         <additionSubtractionApplication ref="additionSubtractionApplication" @success="successEvent" />
         <!--    鏇存崲娲鹃仯鍗曚綅鐢宠    -->
@@ -442,6 +471,7 @@
         <!-- 鏇存崲娲鹃仯鍗曚綅璇︽儏 -->
         <OperaApplyChangeUnitDetailWindow ref="OperaApplyChangeUnitDetailWindow" @success="successEvent"/>
         <!--    楠岃瘉鎵嬫満鍙�    -->
+        <OperaPdfViewerWindow ref="OperaPdfViewerWindow"  />
         <operaverifyPhoneNumberWindew ref="operaverifyPhoneNumberWindew" @success="goSign" />
         <template v-slot:footer>
             <el-button @click="visible=false">杩斿洖</el-button>
@@ -475,18 +505,18 @@
       </el-dialog>
     </GlobalWindow>
 </template>
-
 <script>
 import BaseOpera from '@/components/base/BaseOpera'
+import OperaInsuranceApplyAddWindowNew from '@/components/enterprise/OperaInsuranceApplyAddWindow'
 import GlobalWindow from '@/components/common/GlobalWindow'
 import InsuranceDetails from '@/components/business/InsuranceDetails'
 import OperaWtbApplyCheckWindow from '@/components/business/OperaWtbApplyCheckWindow'
+import OperaPdfViewerWindow from '@/components/business/OperaPdfViewerWindow'
 import additionSubtractionApplication from '@/components/enterprise/additionSubtractionApplication'
 import factoryChange from '@/components/enterprise/factoryChange'
 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,9 +530,8 @@
 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";
+import {sendSms} from '@/api/business/smsEmail';
 
 export default {
   name: 'OperaWtbApplyShopWindow',
@@ -510,9 +539,10 @@
   components: {
     GlobalWindow,
     InsuranceDetails,
+    OperaPdfViewerWindow,
     OperaWtbApplyCheckWindow,
     applyReturn,
-    OperaInsuranceApply,
+    OperaInsuranceApplyAddWindowNew,
     additionSubtractionApplication,
     factoryChange,
     OperaApplyChangeDetailWindow,
@@ -584,11 +614,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 +633,8 @@
       this.formInline.startTimeS = ''
       this.formInline.type = ''
       this.activeName = '0'
+
+      this.visible = true
       this.getDetail()
       this.getList()
       this.getDW()
@@ -765,7 +796,7 @@
     exportExcel () {
       if (this.activeName === '0') {
         exportExcel({
-          capacity: 10,
+          capacity: 60000,
           page: this.currentPage,
           model: {
             solutionName: this.tableData[0].solutionsName,
@@ -784,7 +815,7 @@
         })
       } else {
         applyChagneDetailExcel({
-          capacity: 10,
+          capacity: 60000,
           page: this.currentPage,
           model: {
             applyId: this.dataId,
@@ -874,30 +905,40 @@
         this.$tip.apiFailed(err)
       })
     },
+    goYjxb(){
+      this.$refs.OperaInsuranceApplyAddWindow.open('缁繚', {id: this.dataId,type: 1 })
+    },
     viewToubaodan () {
       if (this.model.toubaodanSignedFile && this.model.toubaodanSignedFile.fileurlFull) {
         setTimeout(() => {
-          window.open(this.model.toubaodanSignedFile.fileurlFull)
+          this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鎶曚繚鍗�',this.model.toubaodanSignedFile.fileurlFull)
+          // window.open(this.model.toubaodanSignedFile.fileurlFull)
         }, 500)
       } else if (this.model.toubaodanFile && this.model.toubaodanFile.fileurlFull) {
         setTimeout(() => {
-          window.open(this.model.toubaodanFile.fileurlFull)
+          this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鎶曚繚鍗�',this.model.toubaodanFile.fileurlFull)
+          // window.open(this.model.toubaodanFile.fileurlFull)
         }, 500)
       }
     },
     viewBaoxiandan () {
       if (this.model.baoxiandanFile && this.model.baoxiandanFile.fileurlFull) {
-        window.open(this.model.baoxiandanFile.fileurlFull)
+
+        this.$refs.OperaPdfViewerWindow.open('鏌ョ湅淇濋櫓鍗�',this.model.baoxiandanFile.fileurlFull)
+        // window.open(this.model.baoxiandanFile.fileurlFull)
       }
     },
     viewFanganshu () {
       if (this.model.fanganFile && this.model.fanganFile.fileurlFull) {
-        window.open(this.model.fanganFile.fileurlFull)
+        this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鏂规纭涔�',this.model.fanganFile.fileurlFull)
+
+        // window.open(this.model.fanganFile.fileurlFull)
       }
     },
     viewShenqingdan () {
-      if (this.model.shenqingdanFile && this.model.shenqingdanFile.fileurlFull) {
-        window.open(this.model.shenqingdanFile.fileurlFull)
+      if (this.model.shenqingdanFile && this.model.shenqingdanFile.fileurlFull){
+        this.$refs.OperaPdfViewerWindow.open('鏌ョ湅鐢宠鍗�',this.model.shenqingdanFile.fileurlFull)
+        // window.open(this.model.shenqingdanFile.fileurlFull)
       }
     },
     handleSizeChange (val) {
@@ -921,6 +962,14 @@
       }).catch(err => {
       })
     },
+    result(flag,param){
+      console.log(flag,param)
+      if(param && param.godetail && param.id){
+       this.open('濮旀墭淇濊鎯�',{id:param.id})
+      }else{
+        this.successEvent()
+      }
+    },
     successEvent () {
       // this.visible=false
       this.getDetail()

--
Gitblit v1.9.3