Merge branch 'dev_0814' of http://121.42.41.42:7070/r/esua-epdc-admin into dev_0814

src/views/modules/events/item-deal-detail.vue

@@ -46,11 +46,13 @@
         </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>
+          <label>{{evaluateDeptDTO.deptName}}</label>&nbsp;
-          <el-select @change="changeHandler($event,evaluateDeptDTO)" v-model="evaluateDeptDTO.evaluationLevel">
+          <el-radio-group v-model="evaluateDeptDTO.evaluationLevel">
-            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            <el-radio :label="2">非常满意</el-radio>
-          </el-select>
+            <el-radio :label="1">基本满意</el-radio>
+            <el-radio :label="0">不满意</el-radio>
+          </el-radio-group>
         </div>
       </el-form-item>
     </el-form>
@@ -92,7 +94,7 @@ export default {
       },
       options: [{
         value: '2',
-        label: '满意'
+        label: '非常满意'
       }, {
         value: '1',
         label: '基本满意'
@@ -134,10 +136,6 @@ export default {
         }
       })
     },
-    changeHandler (event, index) {
-      console.log(event)
-      console.log(index)
-    },
     // 获取信息
     getInfo () {
       this.$http.get(`/events/item/${this.dataForm.id}`).then(({ data: res }) => {
@@ -159,6 +157,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('内部处理意见不能为空')
       }
@@ -172,10 +171,11 @@ 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) {
+        if (this.postDataForm.evaluateDeptDTOS.length !== this.dataForm.evaluateDeptDTOS.length) {
-          return this.$message.error('请进行满意度调查')
+          return this.$message.error('请完善满意度调查')
         }
       }
       this.$http['post'](

src/views/modules/news/news-publish.vue

@@ -141,8 +141,8 @@ export default {
       dataForm: {
         id: '',
         streetId: '',
-        communityId: '',
+        communityId: null,
-        gridId: '',
+        gridId: null,
         newsCateroryId: '',
         newsTitle: '',
         newsReleaseStartTime: '',
@@ -150,8 +150,8 @@ export default {
         newsContent: '',
         newsImageUrl: '',
         street: '',
-        community: '',
+        community: null,
-        grid: '',
+        grid: null,
         newsProperty: ''
       },
       time: [],