From df59cad917c6db1db3b36a23f4b3e7be510e9ed0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 五月 2024 11:20:37 +0800
Subject: [PATCH] git ch

---
 company/src/views/enterprise/insuranceApply.vue |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index f5aadd4..d316324 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/company/src/views/enterprise/insuranceApply.vue
@@ -12,7 +12,7 @@
                     <el-option label="宸查��鍥�" value="4"></el-option>
                     <el-option label="閫�鍥炵敵璇蜂腑" value="5"></el-option>
                     <el-option label="宸插叧闂�" value="6"></el-option>
-                    <el-option label="鎶曚繚涓�" value="25"></el-option>
+                    <el-option label="鎶曚繚涓�" value="26"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="淇濋櫓鏂规" prop="baseSolutionId">
@@ -28,7 +28,7 @@
             <el-form-item label="鎻愪氦鏃ユ湡" prop="createDate">
                 <el-date-picker
                     v-model="searchForm.createDate"
-                    @change="search"
+                    @change="changeTime"
                     type="daterange"
                     range-separator="鑷�"
                     value-format="yyyy-MM-dd"
@@ -44,7 +44,7 @@
         <!-- 琛ㄦ牸鍜屽垎椤� -->
         <template v-slot:table-wrap>
             <ul class="toolbar" v-permissions="['business:dispatchunit:create']">
-                <li><el-button type="primary" @click="$refs.OperaInsuranceApplyWindow.open('鎶曚繚鐢宠', {type: ''})">鎶曚繚鐢宠</el-button></li>
+                <li><el-button type="primary" @click="$refs.OperaInsuranceApplyAddWindow.open('鎶曚繚鐢宠', {type: ''})">鎶曚繚鐢宠</el-button></li>
             </ul>
             <el-table
                 v-loading="isWorking.search"
@@ -74,8 +74,17 @@
                         <span>{{(row.serviceDays - row.loseEfficacyDays) < 0 ? `-` : row.serviceDays - row.loseEfficacyDays}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級"></el-table-column>
-                <el-table-column prop="checkDate" label="鎻愪氦鏃ユ湡"></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="createDate" label="鎻愪氦鏃ユ湡"></el-table-column>
                 <el-table-column prop="startTime" label="鎶曚繚鐢熸晥鏃ユ湡"></el-table-column>
                 <el-table-column prop="endTime" label="鎶曚繚澶辨晥鏃ユ湡"></el-table-column>
                 <el-table-column
@@ -97,7 +106,7 @@
             </pagination>
         </template>
         <!--    鏂板鎶曚繚    -->
-        <OperaInsuranceApplyWindow ref="OperaInsuranceApplyWindow" @success="handlePageChange" />
+        <OperaInsuranceApplyAddWindow ref="OperaInsuranceApplyAddWindow" @success="handlePageChange" />
         <OperaWtbApplyShopWindow ref="OperaWtbApplyShopWindow" @success="handlePageChange" />
         <!--    鎶曚繚璇︽儏    -->
         <OperaInsuranceApplyDetails ref="OperaInsuranceApplyDetails" @success="handlePageChange" />
@@ -108,7 +117,7 @@
 import BaseTable from '@/components/base/BaseTable'
 import TableLayout from '@/layouts/TableLayout'
 import Pagination from '@/components/common/Pagination'
-import OperaInsuranceApplyWindow from '@/components/enterprise/OperaInsuranceApplyWindow'
+import OperaInsuranceApplyAddWindow from '@/components/enterprise/OperaInsuranceApplyAddWindow'
 import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
 import OperaWtbApplyShopWindow from '@/components/business/OperaWtbApplyShopWindow'
 
@@ -116,7 +125,7 @@
 export default {
   name: 'InsuranceApply',
   extends: BaseTable,
-  components: { TableLayout, Pagination, OperaInsuranceApplyWindow, OperaInsuranceApplyDetails,OperaWtbApplyShopWindow },
+  components: { TableLayout, Pagination, OperaInsuranceApplyAddWindow, OperaInsuranceApplyDetails,OperaWtbApplyShopWindow },
   data () {
     return {
       // 鎼滅储
@@ -140,6 +149,12 @@
     this.loadSelectList()
   },
   methods: {
+      reset() {
+          this.searchForm.createTimeS = ''
+          this.searchForm.createTimeE = ''
+          this.$refs.searchForm.resetFields()
+          this.search()
+      },
     godetail (row) {
       if (row.solutionType == 1) {
         this.$refs.OperaWtbApplyShopWindow.open('濮旀墭鎶曚繚璇︽儏', { id: row.id })
@@ -151,6 +166,11 @@
       solutionAll({ dataType: 2 }).then(res => {
         this.solutionList = res
       })
+    },
+    changeTime (e) {
+        this.searchForm.createTimeS = e[0]
+        this.searchForm.createTimeE = e[1]
+        this.search()
     }
   }
 }

--
Gitblit v1.9.3