From 529d0b8982cf30f57ba7e366c0f822c1d82c0b69 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 五月 2024 13:37:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

---
 company/src/views/enterprise/insuranceApply.vue |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index 47769b1..a9eb6de 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/company/src/views/enterprise/insuranceApply.vue
@@ -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"
@@ -84,7 +84,7 @@
                   <span>{{row.fee!=null?row.fee: '-'}}</span>
                 </template>
               </el-table-column>
-                <el-table-column prop="checkDate" label="鎻愪氦鏃ユ湡"></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
@@ -149,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 })
@@ -160,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