From 6eae839af7b211e76e6bc168088ec9e506ae1b2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= <daofugui@163.com>
Date: Fri, 20 Sep 2019 10:24:59 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=BB=A1=E6=84=8F=E5=BA=A6=E8=AF=84?=
 =?UTF-8?q?=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/events/item-deal-detail.vue | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/events/item-deal-detail.vue b/src/views/modules/events/item-deal-detail.vue
index a2eb3562..2d082456 100644
--- a/src/views/modules/events/item-deal-detail.vue
+++ b/src/views/modules/events/item-deal-detail.vue
@@ -46,7 +46,7 @@
         </el-checkbox-group>
       </el-form-item>
       <el-form-item label="满意度评价" prop="evaluateDeptDTOS" v-if="evaluateDeptDTOSVisible">
-        <div v-for="evaluateDeptDTO in dataForm.evaluateDeptDTOS" :key="evaluateDeptDTO.deptName">
+        <div v-for="(evaluateDeptDTO, index) in dataForm.evaluateDeptDTOS" :key="index">
           <label>{{evaluateDeptDTO.deptName}}</label><br>
           <el-select @change="changeHandler($event,evaluateDeptDTO)" v-model="evaluateDeptDTO.evaluationLevel">
             <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
@@ -92,7 +92,7 @@ export default {
       },
       options: [{
         value: '2',
-        label: '满意'
+        label: '非常满意'
       }, {
         value: '1',
         label: '基本满意'
@@ -109,6 +109,12 @@ export default {
       if (val === 1) {
         this.deptResultDTOSVisible = true
         this.evaluateDeptDTOSVisible = false
+        for (let index = 0; index < this.dataForm.deptResultDTOS.length; index++) {
+          const deptResultDTO = this.dataForm.deptResultDTOS[index]
+          if (deptResultDTO.selected === true) {
+            this.postDataForm.deptResultDTOS.push(deptResultDTO)
+          }
+        }
       } else if (val === 10) {
         if (this.dataForm.evaluateDeptDTOS.length === 0) {
           return
@@ -134,9 +140,17 @@ export default {
         }
       })
     },
-    changeHandler (event, index) {
-      console.log(event)
-      console.log(index)
+    changeHandler (event, evaluateDeptDTO) {
+      let flag = 0
+      for (let index = 0; index < this.postDataForm.evaluateDeptDTOS.length; index++) {
+        const element = this.postDataForm.evaluateDeptDTOS[index]
+        if (element.deptId === evaluateDeptDTO.deptId) {
+          flag = 1
+        }
+      }
+      if (flag === 0) {
+        this.postDataForm.evaluateDeptDTOS.push(evaluateDeptDTO)
+      }
     },
     // 获取信息
     getInfo () {
@@ -172,12 +186,14 @@ export default {
         if (this.postDataForm.deptResultDTOS === undefined || this.postDataForm.deptResultDTOS.length <= 0) {
           return this.$message.error('请选择流转对象')
         }
+        this.postDataForm.evaluateDeptDTOS = []
       }
       if (this.postDataForm.evaluateDeptDTOSVisible) {
-        if (this.postDataForm.evaluateDeptDTOS === undefined || this.postDataForm.evaluateDeptDTOS.length <= 0) {
-          return this.$message.error('请进行满意度调查')
+        if (this.postDataForm.evaluateDeptDTOS.length !== this.dataForm.evaluateDeptDTOS.length) {
+          return this.$message.error('请完善满意度调查')
         }
       }
+      console.log(this.postDataForm)
       this.$http['post'](
         '/events/item/itemHandleSubmit', this.postDataForm).then(({ data: res }) => {
         if (res.code !== 0) {

From 2665fadb4bf14fde820ed6bd64ee504bf2c76a09 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Fri, 20 Sep 2019 10:52:36 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=BB=A1=E6=84=8F?=
 =?UTF-8?q?=E5=BA=A6=E8=AF=84=E4=BB=B7=E9=80=89=E6=8B=A9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/events/item-deal-detail.vue | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/events/item-deal-detail.vue b/src/views/modules/events/item-deal-detail.vue
index 2d082456..971b3d13 100644
--- a/src/views/modules/events/item-deal-detail.vue
+++ b/src/views/modules/events/item-deal-detail.vue
@@ -45,12 +45,22 @@
           <el-checkbox v-for="deptResultDTO in dataForm.deptResultDTOS" :label="deptResultDTO" :key="deptResultDTO.deptName">{{deptResultDTO.deptName}}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
+<!--      <el-form-item label="满意度评价" prop="evaluateDeptDTOS" v-if="evaluateDeptDTOSVisible">-->
+<!--        <div v-for="(evaluateDeptDTO, index) in dataForm.evaluateDeptDTOS" :key="index">-->
+<!--          <label>{{evaluateDeptDTO.deptName}}</label><br>-->
+<!--          <el-select @change="changeHandler($event,evaluateDeptDTO)" v-model="evaluateDeptDTO.evaluationLevel">-->
+<!--            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>-->
+<!--          </el-select>-->
+<!--        </div>-->
+<!--      </el-form-item>-->
       <el-form-item label="满意度评价" prop="evaluateDeptDTOS" v-if="evaluateDeptDTOSVisible">
         <div v-for="(evaluateDeptDTO, index) in dataForm.evaluateDeptDTOS" :key="index">
-          <label>{{evaluateDeptDTO.deptName}}</label><br>
-          <el-select @change="changeHandler($event,evaluateDeptDTO)" v-model="evaluateDeptDTO.evaluationLevel">
-            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
-          </el-select>
+          <label>{{evaluateDeptDTO.deptName}}</label>&nbsp;
+          <el-radio-group v-model="evaluateDeptDTO.evaluationLevel">
+            <el-radio :label="2">非常满意</el-radio>
+            <el-radio :label="1">基本满意</el-radio>
+            <el-radio :label="0">不满意</el-radio>
+          </el-radio-group>
         </div>
       </el-form-item>
     </el-form>
@@ -173,6 +183,7 @@ export default {
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.postDataForm.id = this.dataForm.id
+      this.postDataForm.evaluateDeptDTOS = this.dataForm.evaluateDeptDTOS
       if (this.postDataForm.handleAdvice === '') {
         return this.$message.error('内部处理意见不能为空')
       }
@@ -193,7 +204,7 @@ export default {
           return this.$message.error('请完善满意度调查')
         }
       }
-      console.log(this.postDataForm)
+      console.log(JSON.stringify(this.postDataForm))
       this.$http['post'](
         '/events/item/itemHandleSubmit', this.postDataForm).then(({ data: res }) => {
         if (res.code !== 0) {

From c236acf17c07c6dcd0298ed3d81e5e8b4588689e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= <daofugui@163.com>
Date: Fri, 20 Sep 2019 13:31:21 +0800
Subject: [PATCH 3/4] no message

---
 src/views/modules/events/item-deal-detail.vue | 27 -------------------
 1 file changed, 27 deletions(-)

diff --git a/src/views/modules/events/item-deal-detail.vue b/src/views/modules/events/item-deal-detail.vue
index 971b3d13..86cb9260 100644
--- a/src/views/modules/events/item-deal-detail.vue
+++ b/src/views/modules/events/item-deal-detail.vue
@@ -45,14 +45,6 @@
           <el-checkbox v-for="deptResultDTO in dataForm.deptResultDTOS" :label="deptResultDTO" :key="deptResultDTO.deptName">{{deptResultDTO.deptName}}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
-<!--      <el-form-item label="满意度评价" prop="evaluateDeptDTOS" v-if="evaluateDeptDTOSVisible">-->
-<!--        <div v-for="(evaluateDeptDTO, index) in dataForm.evaluateDeptDTOS" :key="index">-->
-<!--          <label>{{evaluateDeptDTO.deptName}}</label><br>-->
-<!--          <el-select @change="changeHandler($event,evaluateDeptDTO)" v-model="evaluateDeptDTO.evaluationLevel">-->
-<!--            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>-->
-<!--          </el-select>-->
-<!--        </div>-->
-<!--      </el-form-item>-->
       <el-form-item label="满意度评价" prop="evaluateDeptDTOS" v-if="evaluateDeptDTOSVisible">
         <div v-for="(evaluateDeptDTO, index) in dataForm.evaluateDeptDTOS" :key="index">
           <label>{{evaluateDeptDTO.deptName}}</label>&nbsp;
@@ -119,12 +111,6 @@ export default {
       if (val === 1) {
         this.deptResultDTOSVisible = true
         this.evaluateDeptDTOSVisible = false
-        for (let index = 0; index < this.dataForm.deptResultDTOS.length; index++) {
-          const deptResultDTO = this.dataForm.deptResultDTOS[index]
-          if (deptResultDTO.selected === true) {
-            this.postDataForm.deptResultDTOS.push(deptResultDTO)
-          }
-        }
       } else if (val === 10) {
         if (this.dataForm.evaluateDeptDTOS.length === 0) {
           return
@@ -150,18 +136,6 @@ export default {
         }
       })
     },
-    changeHandler (event, evaluateDeptDTO) {
-      let flag = 0
-      for (let index = 0; index < this.postDataForm.evaluateDeptDTOS.length; index++) {
-        const element = this.postDataForm.evaluateDeptDTOS[index]
-        if (element.deptId === evaluateDeptDTO.deptId) {
-          flag = 1
-        }
-      }
-      if (flag === 0) {
-        this.postDataForm.evaluateDeptDTOS.push(evaluateDeptDTO)
-      }
-    },
     // 获取信息
     getInfo () {
       this.$http.get(`/events/item/${this.dataForm.id}`).then(({ data: res }) => {
@@ -204,7 +178,6 @@ export default {
           return this.$message.error('请完善满意度调查')
         }
       }
-      console.log(JSON.stringify(this.postDataForm))
       this.$http['post'](
         '/events/item/itemHandleSubmit', this.postDataForm).then(({ data: res }) => {
         if (res.code !== 0) {

From 0df26cf2e031a2c334ee1cd4a068fbac7a19c193 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Fri, 20 Sep 2019 16:18:37 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=96=B0=E9=97=BBbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/news/news-publish.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/news/news-publish.vue b/src/views/modules/news/news-publish.vue
index aec3e892..2f12d25f 100644
--- a/src/views/modules/news/news-publish.vue
+++ b/src/views/modules/news/news-publish.vue
@@ -141,8 +141,8 @@ export default {
       dataForm: {
         id: '',
         streetId: '',
-        communityId: '',
-        gridId: '',
+        communityId: null,
+        gridId: null,
         newsCateroryId: '',
         newsTitle: '',
         newsReleaseStartTime: '',
@@ -150,8 +150,8 @@ export default {
         newsContent: '',
         newsImageUrl: '',
         street: '',
-        community: '',
-        grid: '',
+        community: null,
+        grid: null,
         newsProperty: ''
       },
       time: [],