From c8332afe4ca3adbdcc6c41e2159cc0237fa198d4 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 26 Nov 2021 09:37:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8=E8=81=94?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regionalParty/activitys.vue               |  7 ++--
 .../regionalParty/activitysForm.vue           | 22 +++++++----
 .../regionalParty/unitsForm.vue               | 18 ++++-----
 .../ninePlaces/inspect/inspectReview.vue      | 37 ++++++++++++-------
 4 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index 2842a246..e31257f5 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -53,6 +53,7 @@
                         prop="startTime">
             <el-date-picker v-model="timeRange"
                             type="daterange"
+                            value-format="yyyy-MM-dd HH:mm:ss"
                             @change="handleTimeChange"
                             range-separator="至"
                             start-placeholder="开始时间"
@@ -183,7 +184,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="formTitle"
-               width="850px"
+               width="950px"
                top="5vh"
                @closed="diaClose">
       <activitys-form ref="ref_form"
@@ -548,8 +549,8 @@ export default {
         const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
         const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
 
-        this.formData.startTime = startTimeArray[0] + startTimeArray[1] + startTimeArray[2]
-        this.formData.endTime = endTimeArray[0] + endTimeArray[1] + endTimeArray[2]
+        this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
+        this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
 
         // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
         // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue
index a85b8f7c..a509533a 100644
--- a/src/views/modules/communityParty/regionalParty/activitysForm.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue
@@ -78,7 +78,7 @@
 
               <p v-else
                  class="text_p"
-                 v-html="item.content"></p>
+                 v-html="formData.content"></p>
             </div>
           </el-form-item>
 
@@ -97,8 +97,8 @@
                         label-width="150px">
             <el-date-picker v-model="formData.activityTime"
                             value-format="yyyy-MM-dd HH:mm:ss"
-                            type="date"
-                            placeholder="选择日期">
+                            type="datetime"
+                            placeholder="选择时间">
             </el-date-picker>
           </el-form-item>
 
@@ -167,7 +167,7 @@
 
               <p v-else
                  class="text_p"
-                 v-html="item.result"></p>
+                 v-html="formData.result"></p>
             </div>
           </el-form-item>
         </el-form>
@@ -211,7 +211,7 @@ export default {
         unitId: '',//单位ID
         title: '',//活动标题
         target: '',//活动目标
-        contact: '',//活动内容
+        content: '',//活动内容
         activityTime: '',//活动时间
         peopleCount: 0,//服务人数
         result: '', //活动结果
@@ -291,7 +291,7 @@ export default {
       if (code === 0) {
         this.$message({
           type: 'success',
-          message: '新增联建单位成功'
+          message: '操作成功'
         })
         this.resetData()
         this.$emit('dialogOk')
@@ -428,7 +428,7 @@ export default {
         unitId: '',//单位ID
         title: '',//活动标题
         target: '',//活动目标
-        contact: '',//活动内容
+        content: '',//活动内容
         activityTime: '',//活动时间
         peopleCount: 0,//服务人数
         result: '', //活动结果
@@ -502,7 +502,7 @@ export default {
   }
 }
 </script>
-<style scoped>
+<style  lang="scss" scoped>
 .item_width_1 {
   width: 560px;
 }
@@ -544,6 +544,12 @@ export default {
   height: 400px;
   overflow: auto;
 }
+.text_p {
+  margin: 0;
+  > p {
+    margin: 0;
+  }
+}
 </style>
 
 <style lang=scss>
diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue
index bfc2c23c..168763c0 100644
--- a/src/views/modules/communityParty/regionalParty/unitsForm.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue
@@ -262,15 +262,15 @@ export default {
 
     },
     async addUnit () {
-      // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-      // if (regPhone.test(this.formData.contactMobile) === 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.contactMobile) === false) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的手机号码'
+        })
+        return false;
+      }
 
       let url = '/heart/icpartyunit/save'
       // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/save"
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
index 12a350ac..1f83f45e 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
@@ -122,7 +122,7 @@
             <el-button type="text"
                        style="color:#D51010;text-decoration: underline;"
                        size="small"
-                       @click="handleDelete(scope.row)">删除</el-button>
+                       @click="handleDelete(scope.row,scope.$index)">删除</el-button>
 
           </template>
         </el-table-column>
@@ -190,16 +190,17 @@ export default {
     //点击分队切换人员
     async hancleChangeTeam (row, index, tableIndex) {
       this.tableData[tableIndex].inspectorArray = [...[]]
-      await this.loadInspectors(index, tableIndex)
+      let teamId = this.teamsList[index].teamId
+      await this.loadInspectors(teamId, tableIndex)
     },
 
     //加载分队下人员
-    async loadInspectors (index, tableIndex) {
+    async loadInspectors (teamId, tableIndex) {
 
       const url = '/gov/org/placepatrolteamstaff/getlist'
       // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteamstaff/getlist'
       let params = {
-        teamId: this.teamsList[index].teamId
+        teamId: teamId
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -231,6 +232,7 @@ export default {
         if (data.list && data.list.length > 0) {
           data.list.forEach(item => {
             item.isEdit = false
+            item.isNew = false
             let array = item.inspectors.split(',')
             item.inspectorArray = [...array]
 
@@ -264,10 +266,15 @@ export default {
       this.tableData.push(obj)
     },
 
-    handleEdit (row, index) {
-
-      this.loadInspectors(index)
+    async handleEdit (row, tableIndex) {
+      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 }
     },
 
     async handleComfirm (row, tableIndex) {
@@ -326,7 +333,7 @@ export default {
       return message
     },
 
-    async handleDelete (row) {
+    async handleDelete (row, tableIndex) {
 
       this.$confirm("确认删除?", "提示", {
         confirmButtonText: "确定",
@@ -334,7 +341,12 @@ export default {
         type: "warning"
       })
         .then(() => {
-          this.deleteRecord(row)
+          if (row.placePatrolReviewRecordId) {//存在id，调用服务删除
+            this.deleteRecord(row, tableIndex)
+          } else {//不存在id，直接删除数组数据
+            this.tableData.splice(tableIndex, 1);
+          }
+
         })
         .catch(err => {
           if (err == "cancel") {
@@ -344,7 +356,8 @@ export default {
         });
     },
 
-    async deleteRecord (row) {
+    async deleteRecord (row, tableIndex) {
+
       const url = "/gov/org/placepatrolrecord/delreview"
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/delreview"
 
@@ -360,15 +373,13 @@ export default {
           message: "删除成功"
         });
 
-        this.loadTable()
+        this.tableData.splice(tableIndex, 1);
       } else {
         this.$message.error(msg)
       }
     },
 
     handleCancle () {
-
-
       this.$emit('dialogCancle')
 
     },