From 0f8c7e95b9e9adce06f8229e932746bc0f079884 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 25 Aug 2022 09:26:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/worklog/workLog.vue        |  6 ++++--
 .../communityService/worklog/workLogForm.vue    | 17 +++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 6c221465f..4bf2e50ab 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -371,8 +371,8 @@ export default {
               });
     },
     async handleExportModule () {
-      // let url = "/heart/workdiaryService/record/downloadTemplate";
-      let url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/downloadTemplate";
+      let url = "/heart/workdiaryService/record/downloadTemplate";
+      // let url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/downloadTemplate";
 
       let params = {};
       await this.$http({
@@ -520,6 +520,8 @@ export default {
 
     //重置搜索条件
     resetSearch () {
+      this.optionsG = []
+      this.demandUserList = []
       this.workLog = {
         gridId: '',
         serviceType: '',
diff --git a/src/views/modules/communityService/worklog/workLogForm.vue b/src/views/modules/communityService/worklog/workLogForm.vue
index dee051f3f..cbb3a06f1 100644
--- a/src/views/modules/communityService/worklog/workLogForm.vue
+++ b/src/views/modules/communityService/worklog/workLogForm.vue
@@ -31,8 +31,8 @@
                       style="display: block"
                       prop="serviceType">
           <el-select v-model="formData.serviceType"
-                     filterable
                      placeholder="请选择"
+                     filterable
                      clearable>
             <el-option v-for="item in serviceTypeList"
                        :key="item.serviceType"
@@ -152,7 +152,7 @@ export default {
       applicantId: '',
       keyWords: '',
       formData: {
-        serviceType: 0,
+        serviceType: '',
         serviceTypeName: '',
         gridId: '',
         gridName: '',
@@ -175,6 +175,7 @@ export default {
   async created () {
     this.getGridList('query')
     this.getServiceTypeList()
+    // this.getDemandUserList()
   },
   mounted () {
   },
@@ -188,10 +189,10 @@ export default {
       //获取服务事项
       await this.getServiceTypeList()
       this.getGridList(type)
-
       this.formType = type
       if (type === 'edit'){
         this.formData = row
+        this.getDemandUserList(this.formData.gridId)
       }
       this.endLoading()
     },
@@ -211,11 +212,11 @@ export default {
         this.$message.error(msg)
       }
     },
-    async getDemandUserList () {
+    async getDemandUserList (gridId) {
       const { user } = await this.$store.state;
       const params = {
         agencyId: user.agencyId,
-        gridId: this.formData.gridId,
+        gridId: gridId,
         name: "",
       };
       // addorupdate
@@ -226,6 +227,7 @@ export default {
                   return this.$message.error(res.msg);
                 } else {
                   this.demandUserList = res.data;
+                  console.log(this.demandUserList)
                 }
               })
               .catch(() => {
@@ -249,7 +251,7 @@ export default {
       }
     },
     handleGridChange (val) {
-      this.getDemandUserList();
+      this.getDemandUserList(this.formData.gridId);
     },
 
 
@@ -298,11 +300,14 @@ export default {
 
     },
     resetData () {
+      this.demandUserList = []
+      this.optionsG = []
       this.formData = {
         serviceType: 0,
         gridId: '',
         applicantAddress: '',
         applicantName: '',
+        applicantId: '',
         serviceContent: '',
         applicantMobile: '',
         principalName: '',