From f8b1073fbb28d37e08016eed32c682f8c5eae391 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 02 二月 2024 17:26:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 company/src/components/business/OperaApplyChangeDetailWindow.vue |   61 +++++++++++++++++++++---------
 1 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index 42dcc5d..80da9b3 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -11,23 +11,25 @@
                 <div class="desc_item_label">
                     <div class="desc_item_label_left">
                         <span>鎶曚繚浼佷笟锛歿{ apply.companyName }}</span>
-                      <span v-if="model.status === 0">淇濆崟鐘舵�侊細寰呯缃�</span>
-                      <span v-if="model.status === 1">淇濆崟鐘舵�侊細宸茬绔�</span>
-                      <span v-if="model.status === 2">淇濆崟鐘舵�侊細宸茬敓鏁�</span>
-                      <span v-if="model.status === 3 || model.status === 4">淇濆崟鐘舵�侊細閫�鍥炵敵璇�</span>
-                      <span v-if="model.status ===5 || model.status === 8">淇濆崟鐘舵�侊細宸查��鍥�</span>
-                      <span v-if="model.status ===7">淇濆崟鐘舵�侊細宸插叧闂�</span>
+                        <span v-if="model.status === 0">淇濆崟鐘舵�侊細寰呯缃�</span>
+                        <span v-if="model.status === 1">淇濆崟鐘舵�侊細寰呭鏍�</span>
+                        <span v-if="model.status === 2">淇濆崟鐘舵�侊細宸蹭笂浼犳壒鍗�</span>
+                        <span v-if="model.status === 1">淇濆崟鐘舵�侊細宸茬绔�</span>
+                        <span v-if="model.status === 2">淇濆崟鐘舵�侊細宸茬敓鏁�</span>
+                        <span v-if="model.status === 3 || model.status === 4">淇濆崟鐘舵�侊細閫�鍥炵敵璇�</span>
+                        <span v-if="model.status === 5 || model.status === 8">淇濆崟鐘舵�侊細宸查��鍥�</span>
+                        <span v-if="model.status === 7 || model.status === 6">淇濆崟鐘舵�侊細宸插叧闂�</span>
                         <span>鎻愪氦鏃堕棿锛歿{ model.createDate }}</span>
                     </div>
                   <div class="desc_item_label_right">
                       <template v-if="userInfo.type === 1">
                           <el-button type="primary" @click="$refs.ApplyChangeDetails.open('鍔犲噺淇濊鍗�',apply,model)">瀵煎嚭璇﹀崟</el-button>
-                          <el-button v-if="model.status == 4" type="primary" @click="$refs.OperaInsuranceApply.open('鎶曚繚鐢宠', {id: dataId})">鍐嶆鎶曚繚</el-button>
-                          <el-button type="primary" v-if="model.status == 0"   @click="goSign">绛剧讲鐢宠鍗�</el-button>
-                          <el-button v-if="[2, 3, 5, 7, 8].includes(model.status)" type="primary" @click="viewToubaodan">鐢宠閫�鍥�</el-button>
+                          <el-button v-if="[5, 8].includes(model.status)" type="primary" @click="$refs.reinsurance.open('鍔犲噺淇濈敵璇�', {id: dataId, applyChangId: modelId})">鍐嶆鎶曚繚</el-button>
+                          <el-button type="primary" v-if="model.status == 0" @click="goSign">绛剧讲鐢宠鍗�</el-button>
+                          <el-button v-if="[0, 1, 2, 3, 7].includes(model.status)" type="primary" @click="$refs.add_subtract_return.open('鐢宠閫�鍥�', { id: modelId })">鐢宠閫�鍥�</el-button>
                           <el-button v-if="model.status == 5" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
-                          <el-button v-if="model.status == 5" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
-                          <el-button v-if="model.status == 2" type="primary" @click="closeApply">鍏抽棴璁㈠崟</el-button>
+                          <el-button v-if="model.status == 2" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
+                          <el-button v-if="[5, 8].includes(model.status)" type="primary" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
                       </template>
                         <template v-else>
                             <el-button type="primary" @click="$refs.ApplyChangeDetails.open('鍔犲噺淇濊鍗�',apply,model)">瀵煎嚭璇﹀崟</el-button>
@@ -180,11 +182,12 @@
         <ApplyChangeDetails ref="ApplyChangeDetails" @success="successEvent" />
         <OperaApplyChangeCheckWindow ref="OperaApplyChangeCheckWindow" @success="successEvent" />
         <!--    浼佷笟鐢宠閫�鍥�    -->
-        <applyReturn ref="applyReturn" @success="successEvent" />
+<!--        <applyReturn ref="applyReturn" @success="successEvent" />-->
+        <add_subtract_return ref="add_subtract_return" @success="successEvent" />
         <!--    鏂板鎶曚繚    -->
         <OperaInsuranceApply ref="OperaInsuranceApply" @success="successEvent" />
         <!--    鍔犲噺淇濈敵璇�    -->
-        <additionSubtractionApplication ref="additionSubtractionApplication" @success="successEvent" />
+        <reinsurance ref="reinsurance" @success="successEvent" />
         <!--    鎹㈠巶鐢宠    -->
         <factoryChange ref="factoryChange" @success="successEvent" />
     </GlobalWindow>
@@ -195,15 +198,16 @@
 import GlobalWindow from '@/components/common/GlobalWindow'
 import ApplyChangeDetails from '@/components/business/ApplyChangeDetails'
 import OperaApplyChangeCheckWindow from '@/components/business/OperaApplyChangeCheckWindow'
-import additionSubtractionApplication from '@/components/enterprise/additionSubtractionApplication'
+import reinsurance from '@/components/enterprise/reinsurance'
 import factoryChange from '@/components/enterprise/factoryChange'
-import applyReturn from '@/components/enterprise/applyReturn'
+import add_subtract_return from '@/components/enterprise/add_subtract_return'
 import {
   getDetail,
   getChangeDetail,
   applyChagneDetailPage,
   getJiajianBaoSignLink
 } from '@/api/business/insuranceApply'
+import { applyChangeOpt } from '@/api/business/applyChange'
 import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyWindow'
 import { mapState } from 'vuex'
 
@@ -214,9 +218,9 @@
       GlobalWindow,
       ApplyChangeDetails,
       OperaApplyChangeCheckWindow,
-      applyReturn,
+      add_subtract_return,
       OperaInsuranceApply,
-      additionSubtractionApplication,
+      reinsurance,
       factoryChange
   },
   data () {
@@ -240,7 +244,7 @@
           memberName: '',
           types: ''
       },
-      reverse: true,
+      reverse: false,
       radio: 0,
       activities: [],
       tableData: [],
@@ -270,6 +274,24 @@
      },
       resetting() {
             this.search()
+      },
+      closeOrder() {
+          this.$confirm('纭鍏抽棴姝よ鍗曞悧?', '鎻愮ず', {
+              confirmButtonText: '纭畾',
+              cancelButtonText: '鍙栨秷',
+              type: 'warning'
+          }).then(() => {
+              applyChangeOpt({
+                  optType: 6,
+                  applyId: this.model.id
+              }).then(res => {
+                  this.getDetail()
+              }).catch(e => {
+                  this.$message.error(e)
+              })
+          }).catch(() => {
+
+          });
       },
       search() {
           this.currentPage = 1
@@ -425,6 +447,9 @@
                 align-items: center;
                 justify-content: space-between;
                 margin-bottom: 10px;
+                .desc_item_label_left {
+                    flex-shrink: 0;
+                }
                 span {
                     font-size: 14px;
                     color: black;

--
Gitblit v1.9.3