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

src/views/modules/events/epdcevents-add-or-update.vue

@@ -2,8 +2,34 @@
   <el-dialog :visible.sync="visible" :title="$t('verifyLabel')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item label="议题内容" prop="eventContent">
-          <p>{{dataForm.eventContent}}</p>
-          <el-image v-for="url in urls" :key="url" :src="url" lazy></el-image>
+        <p>{{dataForm.eventContent}}</p>
+        <img v-for="imgUrl in urls" :key="imgUrl" style='width: 70px;height: 70px;margin: 10px' :layer-src="imgUrl" :src="imgUrl" alt="image">
+      </el-form-item>
+      <el-form-item label="提交人" prop="nickName">
+        <p>{{dataForm.nickName}}</p>
+      </el-form-item>
+      <el-form-item label="类别" prop="categoryId">
+        <el-select v-model="dataForm.categoryId" placeholder="请选择">
+          <el-option
+            v-for="item in categoryOptions"
+            :key="item.id"
+            :label="item.categoryName"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审核操作" prop="eventState">
+        <el-select v-model="dataForm.eventState" placeholder="请选择">
+          <el-option
+            v-for="item in verifyOptions"
+            :key="item.verifyFlag"
+            :label="item.verifyTitle"
+            :value="item.verifyFlag">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="处理意见" prop="advice">
+          <el-input v-model="dataForm.advice" placeholder="处理意见"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
@@ -21,14 +47,36 @@ export default {
       visible: false,
       dataForm: {
         id: '',
-        eventContent: ''
+        eventContent: '',
+        nickName: '',
+        categoryId: '',
+        advice: '',
+        eventState: ''
       },
-      urls: []
+      urls: [],
+      categoryOptions: [],
+      verifyOptions: [{
+        verifyFlag: '2',
+        verifyTitle: '驳回'
+      }, {
+        verifyFlag: '4',
+        verifyTitle: '审核通过'
+      }]
     }
   },
   computed: {
     dataRule () {
-      return {}
+      return {
+        categoryId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        eventState: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        advice: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
     }
   },
   methods: {
@@ -38,9 +86,26 @@ export default {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
           this.getInfo()
+          this.getCategoryList()
         }
       })
     },
+    getCategoryList () {
+      this.$http.get(
+        '/events/eventcategory/list',
+        {
+          params: {
+            categoryCode: '0'
+          }
+        }
+      ).then(({ data: res }) => {
+        this.dataListLoading = false
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.categoryOptions = res.data
+      }).catch(() => {})
+    },
     // 获取信息
     getInfo () {
       this.$http.get(`/events/epdcevents/${this.dataForm.id}`).then(({ data: res }) => {
@@ -60,7 +125,9 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/events/epdcevents/review', this.dataForm).then(({ data: res }) => {
+        console.log(this.dataForm)
+        this.$http['post'](
+          '/events/epdcevents/review', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }

src/views/modules/events/epdcevents.vue

@@ -2,6 +2,36 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-demo__epdcevents}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="街道">
+          <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
+            <el-option
+              v-for="item in streetOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="社区">
+          <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
+            <el-option
+              v-for="item in communityOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="网格">
+          <el-select v-model="dataForm.gridId" placeholder="请选择">
+            <el-option
+              v-for="item in gridOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="时间" prop="startTime">
           <el-date-picker
                   v-model="dataForm.startTime"
@@ -73,7 +103,10 @@ export default {
       },
       dataForm: {
         startTime: '',
-        endTime: ''
+        endTime: '',
+        streetId: '',
+        communityId: '',
+        gridId: ''
       },
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -95,6 +128,38 @@ export default {
   },
   components: {
     AddOrUpdate
+  },
+  created: function () {
+    this.getStreetList()
+  },
+  methods: {
+    getStreetList () {
+      this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.streetOptions = res.data
+      }).catch(() => {})
+    },
+    getCommunityList () {
+      this.dataForm.communityId = ''
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.communityOptions = res.data
+      }).catch(() => {})
+    },
+    getGridList () {
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.gridOptions = res.data
+      }).catch(() => {})
+    }
   }
 }
 </script>