From 058a7f3e70ba1f5a9bb5d18a0517eea936c0c863 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 26 Nov 2021 10:45:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E6=9F=A5=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ninePlaces/inspect/inspect.vue            | 10 ++--
 .../ninePlaces/inspect/inspectReview.vue      | 52 ++++++++++---------
 .../ninePlaces/team/teamForm.vue              | 34 +++++++-----
 3 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
index bf05bbc9..9d433ea1 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
@@ -50,9 +50,9 @@
         <div>
 
           <el-form-item label="场所类型"
-                        prop="ninePlacsVal">
+                        prop="ninePlaceVal">
             <el-select class="item_width_1"
-                       v-model="formData.ninePlacsVal"
+                       v-model="formData.ninePlaceVal"
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in placeTypeList"
@@ -64,7 +64,7 @@
 
           </el-form-item>
 
-          <el-form-item label="最终结果"
+          <el-form-item label="最新结果"
                         prop="finalResult">
             <el-select class="item_width_1"
                        v-model="formData.finalResult"
@@ -270,7 +270,7 @@ export default {
         placeOrgName: '',//场所名称	
         firstResult: '',//首次检查结果【0:合格 1:不合格】	
         gridId: '',//场所区域【网格Id】	
-        ninePlacsVal: '',//场所类型【九小场所Value值】	
+        ninePlaceVal: '',//场所类型【九小场所Value值】	
         finalResult: '',//最终检查结果【0:合格 1:不合格】	
       },
 
@@ -483,7 +483,7 @@ export default {
         mobile: '',//联系电话	
         scale: '',//场所规模【 0:10人以下 1:10-20人 2:21-40人 3:41-100人 4:100人以上】	
         gridId: '',//场所区域【网格Id】	
-        ninePlacsVal: '',//场所类型【九小场所Value值】	
+        ninePlaceVal: '',//场所类型【九小场所Value值】	
         isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
       }
     },
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
index 1f83f45e..292e03d6 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
@@ -27,7 +27,7 @@
           <template slot-scope="scope">
             <div v-if="scope.row.isEdit">
               <el-date-picker v-model="scope.row.reviewTime"
-                              value-format="yyyy-MM-dd HH:mm:ss"
+                              value-format="yyyy-MM-dd"
                               type="date"
                               placeholder="选择日期">
               </el-date-picker>
@@ -233,19 +233,18 @@ export default {
           data.list.forEach(item => {
             item.isEdit = false
             item.isNew = false
-            let array = item.inspectors.split(',')
-            item.inspectorArray = [...array]
+            let arrayInspectors = item.inspectors.split(',')
+            item.inspectorArray = [...arrayInspectors]
 
+            let arrayReviewTime = item.reviewTime.split(' ')
+            item.reviewTime = arrayReviewTime[0]
           });
-          let array = item.reviewTime.split(' ')
-          item.reviewTime = array[0]
 
-          this.tableData = { ...data.list }
+          this.tableData = [...data.list]
         } else {
           this.tableData = []
         }
 
-
       } else {
         this.$message.error(msg)
       }
@@ -270,11 +269,13 @@ export default {
       let teamId = row.placePatrolTeamId
       await this.loadInspectors(teamId, tableIndex)
 
-      let params = JSON.parse(JSON.stringify(row))
-      params.isEdit = true
-      params.isNew = false
-      params.inspectorArray = params.inspectors.split(',')
-      this.tableData[tableIndex] = { ...params }
+      let rowData = JSON.parse(JSON.stringify(row))
+      rowData.isEdit = true
+      rowData.isNew = false
+      rowData.inspectorArray = rowData.inspectors.split(',')
+
+      console.log(rowData)
+      this.$set(this.tableData, tableIndex, rowData)
     },
 
     async handleComfirm (row, tableIndex) {
@@ -293,21 +294,23 @@ export default {
     async addReview (row, tableIndex) {
 
       let url = "/gov/org/placepatrolreviewrecord/add"
+      if (row.placePatrolReviewRecordId) {
+        url = "/gov/org/placepatrolreviewrecord/edit"
+      }
 
       let params = JSON.parse(JSON.stringify(row))
       params.inspectors = params.inspectorArray.join(',')
+      params.reviewTime = params.reviewTime + ' 00:00:00'
 
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        this.$message({
-          type: 'success',
-          message: '操作成功'
-        })
+        let array = data.reviewTime.split(' ')
+        data.reviewTime = array[0]
+        data.isEdit = false
+        data.isNew = false
 
-        params.isEdit = false
-        params.isNew = false
-        this.$set(this.tableData, tableIndex, params)
+        this.$set(this.tableData, tableIndex, data)
 
       } else {
 
@@ -358,8 +361,7 @@ export default {
 
     async deleteRecord (row, tableIndex) {
 
-      const url = "/gov/org/placepatrolrecord/delreview"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/delreview"
+      const url = "/gov/org/placepatrolreviewrecord/del"
 
       let params = {
         placePatrolReviewRecordId: row.placePatrolReviewRecordId
@@ -368,10 +370,10 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "删除成功"
-        });
+        // this.$message({
+        //   type: "success",
+        //   message: "删除成功"
+        // });
 
         this.tableData.splice(tableIndex, 1);
       } else {
diff --git a/src/views/modules/communityService/ninePlaces/team/teamForm.vue b/src/views/modules/communityService/ninePlaces/team/teamForm.vue
index db819678..2a6252fe 100644
--- a/src/views/modules/communityService/ninePlaces/team/teamForm.vue
+++ b/src/views/modules/communityService/ninePlaces/team/teamForm.vue
@@ -113,7 +113,7 @@
                         v-model="item.name"
                         class="item_width_3"
                         clearable
-                        placeholder="请输入电话">
+                        placeholder="请输入姓名">
               </el-input>
               <span class="item_width_span_3"
                     v-else>{{item.name}}</span>
@@ -261,15 +261,15 @@ export default {
       this.memberList.splice(index, 1)
     },
     async addTeam () {
-      // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-      // if (regPhone.test(this.formData.mobile) === false) {
-      //   this.btnDisable = false
-      //   this.$message({
-      //     type: 'warning',
-      //     message: '请输入正确的手机号码'
-      //   })
-      //   return false;
-      // }
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      if (regPhone.test(this.formData.mobile) === false) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的手机号码'
+        })
+        return false;
+      }
       if (this.formData.gridIdArray.length > 0) {
         this.formData.gridIds = this.formData.gridIdArray.join(',')
       } else {
@@ -287,6 +287,7 @@ export default {
           type: 'warning',
           message: msgMember
         })
+        this.btnDisable = false
         return false
       }
 
@@ -324,11 +325,18 @@ export default {
       if (this.memberList.length === 0) {
         return '成员列表不能为空'
       }
-      this.memberList.forEach(element => {
-        if (!element.mobile || !element.name) {
+
+      for (let item of this.memberList) {
+        if (!item.mobile || !item.name) {
           return '成员的姓名和电话不能为空'
+        } else {
+          const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+          if (regPhone.test(item.mobile) === false) {
+            return '请输入正确的手机号码';
+          }
         }
-      });
+      }
+
       return ''
     },