From 603a69f583edd472772526de5e57eb4fe724ddc3 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 03 四月 2024 10:20:32 +0800
Subject: [PATCH] 提交一把

---
 company/src/api/business/applyChange.js                          |    3 +
 company/src/components/business/OperaApplyChangeDetailWindow.vue |   31 +++++++++++----
 company/src/components/business/OperaWtbApplyCheckWindow.vue     |    8 ++--
 company/src/components/business/ApplyChangeDetails.vue           |   25 ++++++++++--
 company/src/views/enterprise/add_subtract.vue                    |    6 ++-
 company/src/views/business/applyChangeShop.vue                   |    6 ++-
 6 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/company/src/api/business/applyChange.js b/company/src/api/business/applyChange.js
index 9c5fa28..715195c 100644
--- a/company/src/api/business/applyChange.js
+++ b/company/src/api/business/applyChange.js
@@ -15,6 +15,9 @@
 export function updateById (data) {
     return request.post('/business/applyChange/updateById', data)
 }
+export function check (data) {
+    return request.post('/business/applyChange/check', data)
+}
 
 // 鏂板缓
 export function create (data) {
diff --git a/company/src/components/business/ApplyChangeDetails.vue b/company/src/components/business/ApplyChangeDetails.vue
index ada8485..be7d96c 100644
--- a/company/src/components/business/ApplyChangeDetails.vue
+++ b/company/src/components/business/ApplyChangeDetails.vue
@@ -92,8 +92,8 @@
     import BaseOpera from '@/components/base/BaseOpera'
     import GlobalWindow from '@/components/common/GlobalWindow'
     import {getChangeDetailList, exportJiajianBaoExcel} from "@/api/business/insuranceApply";
+    import {check } from "@/api/business/applyChange";
     import {exportComFiles} from "@/api/business/company";
-    // import {all as solutionAll} from "@/api/business/solutions";
     export default {
         name: 'ApplyChangeDetails',
         extends: BaseOpera,
@@ -124,14 +124,31 @@
             })
         },
         methods: {
-            open(title,target,target2){
+            open(title,target,target2,target3){
               this.title=title
               this.visible=true
               this.apply = target
               this.model = target2
-              this.form.id=target.id
+              this.form.id=target2.id
+              this.type=target3
               this.getDetailListDo()
             },
+           check (type) {
+            this.form.dealBackApply = type
+            this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
+                .then(() => {
+                  this.isWorking = true
+                  check(this.form)
+                      .then(response => {
+                        this.visible = false
+                        this.$emit('success')
+                      }).catch(err => {
+                    this.$tip.apiFailed(err)
+                  })
+                })
+                .catch(() => {
+                })
+          },
            getDetailListDo() {
              this.detailList = []
              var that = this
@@ -316,7 +333,7 @@
                 border-bottom: 1px solid #b4bbc5;
                 box-sizing: border-box;
                 &:nth-child(2) {
-                   flex: 5;
+                   flex: 5.5;
                 }
               }
               .box_form_item {
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index ed15eb5..576a5e4 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -14,31 +14,44 @@
                         <span v-if="model.status === 0">淇濆崟鐘舵�侊細<span  :class="'change-status'+model.status" >寰呯缃�</span></span>
                         <span v-if="model.status === 1">淇濆崟鐘舵�侊細<span  :class="'change-status'+model.status" >寰呭鏍�</span></span>
                         <span v-if="model.status === 2">淇濆崟鐘舵�侊細<span  :class="'change-status'+model.status" >宸茬敓鏁�</span></span>
-                        <span v-if="model.status === 9">淇濆崟鐘舵�侊細<span  :class="'change-status'+model.status" >寰呭嚭鍗�</span></span>
+                        <span v-if="model.status === 7">淇濆崟鐘舵�侊細<span  :class="'change-status'+model.status" >寰呭嚭鍗�</span></span>
+                        <span v-if="model.status === 9">淇濆崟鐘舵�侊細<span  :class="'change-status'+model.status" >鎶曚繚涓�</span></span>
                         <span v-if="model.status === 3 || model.status === 4">淇濆崟鐘舵�侊細<span  :class="'change-status'+model.status" >閫�鍥炵敵璇�</span></span>
                         <span v-if="model.status === 5 || model.status === 8">淇濆崟鐘舵�侊細<span  :class="'change-status'+model.status" >宸查��鍥�</span></span>
-                        <span v-if="model.status === 7 || model.status === 6">淇濆崟鐘舵�侊細<span  :class="'change-status'+model.status" >宸插叧闂�</span></span>
+                        <span v-if=" model.status === 6">淇濆崟鐘舵�侊細<span  :class="'change-status'+model.status" >宸插叧闂�</span></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="[5, 8].includes(model.status)" type="primary" @click="$refs.reinsurance.open('鍔犲噺淇濈敵璇�', {id: dataId, applyChangId: modelId})">鍐嶆鎶曚繚</el-button>
+                          <el-button type="primary"  @click="$refs.reinsurance.open('鍔犲噺淇濈敵璇�', {id: dataId, applyChangId: modelId})">鍐嶆鎶曚繚</el-button>
                           <el-button type="primary" v-if="model.status == 0" @click="getSignLink(0)">绛剧讲鐢宠鍗�</el-button>
                           <el-button v-if="[0, 1, 3, 7].includes(model.status) && model.solutionType == 0" type="danger" @click="$refs.add_subtract_return.open('鐢宠閫�鍥�', { id: modelId })">鐢宠閫�鍥�</el-button>
-                          <el-button v-if="[1,2,9].includes(model.status)" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
+                          <el-button v-if="[1,2,4,7].includes(model.status)" type=".open('鍔犲噺淇濊鍗�',apply,model)">瀵煎嚭璇﹀崟</el-button>
+                          <el-button v-if="[1,2,4,7,9].includes(model.status)" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</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>
-                            <el-button v-if="[1,2,4].includes(model.status)" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
+                        <template v-if="2">
+                            <el-button type="primary" @click="$refs.ApplyChangeDetails.open('鍔犲噺淇濊鍗�',apply,model,0)">瀵煎嚭璇﹀崟</el-button>
+                            <el-button v-if="[1,2,4,7,9].includes(model.status)" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
                             <el-button v-if="[2].includes(model.status)" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
+                            <el-button v-if=" model.solutionType == 1 && [1].includes(model.status)" type="primary" @click="$refs.ApplyChangeDetails.open('鎶曚繚瀹℃牳',apply,model,1)">鎶曚繚瀹℃牳</el-button>
+                            <el-button v-if=" model.solutionType == 1 && [0,1].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
+                            <el-button v-if=" model.solutionType == 1 && [7].includes(model.status)" type="danger" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
                             <el-button v-if=" model.solutionType == 0 && [1].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('涓婁紶鎵瑰崟',model,3)">涓婁紶鎵瑰崟</el-button>
                             <el-button  v-if="model.solutionType == 0 &&[3,4].includes(model.status)"  type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('椹冲洖閫�鍥炵敵璇�',model,5)">椹冲洖閫�鍥炵敵璇�</el-button>
-                            <el-button  v-if="model.solutionType == 0 &&[0,1,3,4].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
+                            <el-button  v-if="model.solutionType == 0 &&[0,1].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
                             <el-button  v-if="model.solutionType == 0 &&[2].includes(model.status)"  type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('淇敼鎵瑰崟',model,4)">淇敼鎵瑰崟</el-button>
                         </template>
+                        <template  v-if="0">
+                          <el-button type="primary" @click="$refs.ApplyChangeDetails.open('鍔犲噺淇濊鍗�',apply,model,0)">瀵煎嚭璇﹀崟</el-button>
+                          <el-button v-if="[1,2,4,7,9].includes(model.status)" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
+                          <el-button v-if="[2].includes(model.status)" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
+                          <el-button v-if=" model.solutionType == 0 && [1].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('涓婁紶鎵瑰崟',model,3)">涓婁紶鎵瑰崟</el-button>
+                          <el-button  v-if="model.solutionType == 0 &&[3,4].includes(model.status)"  type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('椹冲洖閫�鍥炵敵璇�',model,5)">椹冲洖閫�鍥炵敵璇�</el-button>
+                          <el-button  v-if="model.solutionType == 0 &&[0,1].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
+                          <el-button  v-if="model.solutionType == 0 &&[2].includes(model.status)"  type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('淇敼鎵瑰崟',model,4)">淇敼鎵瑰崟</el-button>
+                        </template>
                   </div>
                 </div>
                 <div class="desc_item_from">
diff --git a/company/src/components/business/OperaWtbApplyCheckWindow.vue b/company/src/components/business/OperaWtbApplyCheckWindow.vue
index 7c4ef48..8f72b5c 100644
--- a/company/src/components/business/OperaWtbApplyCheckWindow.vue
+++ b/company/src/components/business/OperaWtbApplyCheckWindow.vue
@@ -8,8 +8,8 @@
     >
         <!--    閫�鍥炴姇淇�    -->
         <el-form v-if="visible1==true" :model="form" ref="form1" :rules="rules1" style="width: 100%;">
-          <el-form-item label="濉啓閫�鍥炶鏄庯細" prop="backBackInfo">
-            <el-input type="textarea" v-model="form.backWtb" placeholder="璇疯緭鍏�" v-trim/>
+          <el-form-item label="濉啓閫�鍥炶鏄庯細" prop="backCheckInfo">
+            <el-input type="textarea" v-model="form.backCheckInfo" placeholder="璇疯緭鍏�" v-trim/>
           </el-form-item>
         </el-form>
          <el-form v-if="visible2==true" :model="form" ref="form2" :rules="rules2" style="width: 100%;">
@@ -27,7 +27,7 @@
 <script>
 import BaseOpera from '@/components/base/BaseOpera'
 import GlobalWindow from '@/components/common/GlobalWindow'
-import { check, closeWtbForShop } from '@/api/business/insuranceApply'
+import { back, closeWtbForShop } from '@/api/business/insuranceApply'
 export default {
   name: 'OperaWtbApplyCheckWindow',
   extends: BaseOpera,
@@ -106,7 +106,7 @@
       this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
         .then(() => {
           this.isWorking = true
-          check({ id: this.model.id, checkInfo: this.form.backCheckInfo })
+          back({ id: this.model.id, checkInfo: this.form.backCheckInfo })
             .then(response => {
               this.visible = false
               this.$emit('success')
diff --git a/company/src/views/business/applyChangeShop.vue b/company/src/views/business/applyChangeShop.vue
index b61cdf3..0a63775 100644
--- a/company/src/views/business/applyChangeShop.vue
+++ b/company/src/views/business/applyChangeShop.vue
@@ -12,7 +12,8 @@
           <!--                    3 4 閮芥槸閫�鍥炵敵璇蜂腑-->
           <el-option label="宸查��鍥�" value="5"></el-option>
           <el-option label="宸插叧闂�" value="6"></el-option>
-          <el-option label="寰呭嚭鍗�" value="9"></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="companyId">
@@ -71,7 +72,8 @@
             <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>
             <span  :class="'change-status'+row.status" v-if="row.status ===6">宸插叧闂�</span>
-            <span  :class="'change-status'+row.status" v-if="row.status ===9">寰呭嚭鍗�</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>
           </template>
         </el-table-column>
         <el-table-column prop="companyName" label="鎶曚繚浼佷笟" min-width="100px"></el-table-column>
diff --git a/company/src/views/enterprise/add_subtract.vue b/company/src/views/enterprise/add_subtract.vue
index 3498a77..52173b9 100644
--- a/company/src/views/enterprise/add_subtract.vue
+++ b/company/src/views/enterprise/add_subtract.vue
@@ -12,7 +12,8 @@
 <!--                    3 4 閮芥槸閫�鍥炵敵璇蜂腑-->
                     <el-option label="宸查��鍥�" value="5"></el-option>
                     <el-option label="宸插叧闂�" value="6"></el-option>
-                    <el-option label="寰呭嚭鍗�" value="9"></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">
@@ -59,7 +60,8 @@
                         <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 === 9">寰呭嚭鍗�</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>

--
Gitblit v1.9.3