From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch

---
 company/src/views/enterprise/myPolicy.vue |   62 ++++++++++++++++++++++--------
 1 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/company/src/views/enterprise/myPolicy.vue b/company/src/views/enterprise/myPolicy.vue
index 87c499e..0498c59 100644
--- a/company/src/views/enterprise/myPolicy.vue
+++ b/company/src/views/enterprise/myPolicy.vue
@@ -9,9 +9,9 @@
                 <el-select v-model="searchForm.baseSolutionId" placeholder="璇烽�夋嫨" @change="search">
                     <el-option
                         v-for="item in solutionList"
-                        :key="item.id"
+                        :key="item.baseId"
                         :label="item.name"
-                        :value="item.id">
+                        :value="item.baseId">
                     </el-option>
                 </el-select>
             </el-form-item>
@@ -19,7 +19,7 @@
                 <el-select v-model="searchForm.statusCollect" placeholder="璇烽�夋嫨" @change="search">
                     <el-option label="寰呭鏍�" value="0"></el-option>
                     <el-option label="寰呭嚭鍗�" value="1"></el-option>
-                    <el-option label="寰呯绔�" value="7"></el-option>
+                    <el-option label="寰呯缃�" value="7"></el-option>
                     <el-option label="淇濋殰涓�" value="2"></el-option>
                     <el-option label="宸茶繃鏈�" value="3"></el-option>
                     <el-option label="宸查��鍥�" value="4"></el-option>
@@ -56,20 +56,20 @@
         </el-form>
         <!-- 琛ㄦ牸鍜屽垎椤� -->
         <template v-slot:table-wrap>
-            <div style="margin-bottom: 30px;" v-if="obj.waitSignNum > 0 && obj.renewalNum > 0">
-                <el-alert type="warning" show-icon :closable="false" style="margin-bottom: 15px;" v-if="obj.renewalNum > 0">
+            <div style="margin-bottom: 15px;" v-if="obj.waitSignNum > 0 || obj.renewalNum > 0">
+                <el-alert type="warning" show-icon :closable="false" :style="obj.waitSignNum > 0 ? 'margin-bottom: 15px;' : ''" v-if="obj.renewalNum > 0">
                     <span style="margin-right: 15px;">缁繚鎻愰啋: 鎮ㄦ湁鍗冲皢鍒版湡淇濋櫓</span>
                     <el-button type="text" @click="$refs.renewalInsurance.open('缁繚鎻愰啋')">鏌ョ湅璇︽儏</el-button>
-                    <el-button type="text" @click="closeRemind(1)">鍏抽棴鎻愰啋</el-button>
+                    <el-button type="text" @click="closeRemind(6)">鍏抽棴鎻愰啋</el-button>
                 </el-alert>
                 <el-alert type="warning" :closable="false" show-icon v-if="obj.waitSignNum > 0">
                     <span style="margin-right: 15px;">鎶曚繚鎻愰啋: 鎮ㄦ湁鎶曚繚鐢宠寰呯缃�</span>
                     <el-button type="text" @click="see">鏌ョ湅璇︽儏</el-button>
-                    <el-button type="text" @click="closeRemind(2)">鍏抽棴鎻愰啋</el-button>
+                    <el-button type="text" @click="closeRemind(1)">鍏抽棴鎻愰啋</el-button>
                 </el-alert>
             </div>
             <ul class="toolbar" v-permissions="['business:dispatchunit:create']">
-                <li><el-button type="primary" @click="$refs.OperaInsuranceApplyWindow.open('鎶曚繚鐢宠')">鎶曚繚鐢宠</el-button></li>
+                <li><el-button type="primary" @click="$refs.OperaInsuranceApplyWindow.open('鎶曚繚鐢宠', { type: '' })">鎶曚繚鐢宠</el-button></li>
             </ul>
             <el-table
                 v-loading="isWorking.search"
@@ -87,15 +87,33 @@
                   </template>
                 </el-table-column>
                 <el-table-column prop="solutionsName" label="淇濋櫓鏂规"></el-table-column>
-                <el-table-column label="淇濆崟鍙�">
+              <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 label="淇濆崟鍙�">
                     <template slot-scope="{row}">
                         <span>{{row.code ? row.code : '-'}}</span>
                     </template>
                 </el-table-column>
                 <el-table-column prop="insureNum" label="鎶曚繚浜烘暟"></el-table-column>
-                <el-table-column prop="serviceDays" label="鎶曚繚鏃堕暱锛堝ぉ锛�"></el-table-column>
-                <el-table-column prop="currentFee" label="浜х敓璐圭敤"></el-table-column>
-                <el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級"></el-table-column>
+                <el-table-column label="鎶曚繚鏃堕暱锛堝ぉ锛�">
+                    <template slot-scope="{row}">
+                        <span>{{(row.serviceDays - row.loseEfficacyDays) < 0 ? `-` : row.serviceDays - row.loseEfficacyDays}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="currentFee" label="宸蹭骇鐢熻垂鐢�">
+                    <template slot-scope="{row}">
+                      <span>{{row.currentFee!=null?row.currentFee: '-'}}</span>
+                    </template>
+                  </el-table-column>
+                <el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級">
+                  <template slot-scope="{row}">
+                    <span>{{row.fee!=null?row.fee: '-'}}</span>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="checkDate" label="鎻愪氦鏃ユ湡"></el-table-column>
                 <el-table-column prop="startTime" label="鎶曚繚鐢熸晥鏃ユ湡"></el-table-column>
                 <el-table-column prop="endTime" label="鎶曚繚澶辨晥鏃ユ湡"></el-table-column>
@@ -106,10 +124,10 @@
                     fixed="right"
                 >
                     <template slot-scope="{row}">
-                        <el-button type="text" @click="$refs.OperaInsuranceApplyDetails.open('鎶曚繚璇︽儏', { id: row.id })" v-permissions="['business:insuranceapply:update']">鏌ョ湅璇︽儏</el-button>
-                        <template v-if="row.statusCollect === 2">
-                            <el-button type="text" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: row.id })">鍔犲噺淇濈敵璇�</el-button>
-                        </template>
+                        <el-button type="text" @click="godetail(row)" v-permissions="['business:insuranceapply:update']">鏌ョ湅璇︽儏</el-button>
+<!--                        <template v-if="row.statusCollect === 2">-->
+<!--                            <el-button type="text" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: row.id })">鍔犲噺淇濈敵璇�</el-button>-->
+<!--                        </template>-->
                     </template>
                 </el-table-column>
             </el-table>
@@ -124,6 +142,7 @@
         <OperaInsuranceApplyWindow ref="OperaInsuranceApplyWindow" @success="handlePageChange" />
         <!--    鎶曚繚璇︽儏    -->
         <OperaInsuranceApplyDetails ref="OperaInsuranceApplyDetails" @success="handlePageChange" />
+      <OperaWtbApplyShopWindow ref="OperaWtbApplyShopWindow" @success="handlePageChange" />
         <!--    鍔犲噺淇濈敵璇�    -->
         <additionSubtractionApplication ref="additionSubtractionApplication" @success="handlePageChange" />
         <!--    缁繚寮圭獥    -->
@@ -139,6 +158,7 @@
     import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
     import additionSubtractionApplication from '@/components/enterprise/additionSubtractionApplication'
     import renewalInsurance from '@/components/enterprise/renewalInsurance'
+    import OperaWtbApplyShopWindow from '@/components/business/OperaWtbApplyShopWindow'
 
     import { all as solutionAll} from '@/api/business/solutions'
     import { getCaptcha, closeApplyNotice } from '@/api/business/notices'
@@ -151,7 +171,8 @@
             OperaInsuranceApplyWindow,
             OperaInsuranceApplyDetails,
             renewalInsurance,
-            additionSubtractionApplication
+            additionSubtractionApplication,
+          OperaWtbApplyShopWindow
         },
         data () {
             return {
@@ -186,6 +207,13 @@
             this.getNum()
         },
         methods:{
+          godetail (row) {
+            if (row.solutionType == 1) {
+              this.$refs.OperaWtbApplyShopWindow.open('濮旀墭鎶曚繚璇︽儏', { id: row.id })
+            } else {
+              this.$refs.OperaInsuranceApplyDetails.open('鎶曚繚璇︽儏', { id: row.id })
+            }
+          },
             see() {
                 this.searchForm.statusCollect = '7'
                 this.search()

--
Gitblit v1.9.3