From c11a24bfb5200b9fd85b84b497e700ffd43ec467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= <daofugui@163.com>
Date: Thu, 5 Sep 2019 15:48:57 +0800
Subject: [PATCH] no message

---
 src/i18n/zh-CN.js                             |   2 +
 .../events/epdcevents-add-or-update.vue       | 172 ++----------------
 src/views/modules/events/epdcevents.vue       |   5 +-
 3 files changed, 16 insertions(+), 163 deletions(-)

diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js
index 5994243e..a87fa76b 100644
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@@ -17,6 +17,8 @@ t.confirm = '确定'
 t.import = '导入'
 t.cancel = '取消'
 t.logout = '退出'
+t.verify = '审核'
+t.verifyLabel = '议题审核'
 
 t.prompt = {}
 t.prompt.title = '提示'
diff --git a/src/views/modules/events/epdcevents-add-or-update.vue b/src/views/modules/events/epdcevents-add-or-update.vue
index 52110a4e..abd36801 100644
--- a/src/views/modules/events/epdcevents-add-or-update.vue
+++ b/src/views/modules/events/epdcevents-add-or-update.vue
@@ -1,73 +1,11 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+  <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="用户ID" prop="userId">
-          <el-input v-model="dataForm.userId" placeholder="用户ID"></el-input>
+      <el-form-item label="议题内容" prop="eventContent">
+          <p>{{dataForm.eventContent}}</p>
+          <el-image v-for="url in urls" :key="url" :src="url" lazy></el-image>
       </el-form-item>
-          <el-form-item label="议题内容" prop="issueContent">
-          <el-input v-model="dataForm.issueContent" placeholder="议题内容"></el-input>
-      </el-form-item>
-          <el-form-item label="区" prop="area">
-          <el-input v-model="dataForm.area" placeholder="区"></el-input>
-      </el-form-item>
-          <el-form-item label="区ID" prop="areaId">
-          <el-input v-model="dataForm.areaId" placeholder="区ID"></el-input>
-      </el-form-item>
-          <el-form-item label="街道" prop="street">
-          <el-input v-model="dataForm.street" placeholder="街道"></el-input>
-      </el-form-item>
-          <el-form-item label="街道ID" prop="streetId">
-          <el-input v-model="dataForm.streetId" placeholder="街道ID"></el-input>
-      </el-form-item>
-          <el-form-item label="社区" prop="community">
-          <el-input v-model="dataForm.community" placeholder="社区"></el-input>
-      </el-form-item>
-          <el-form-item label="社区ID" prop="communityId">
-          <el-input v-model="dataForm.communityId" placeholder="社区ID"></el-input>
-      </el-form-item>
-          <el-form-item label="网格" prop="grid">
-          <el-input v-model="dataForm.grid" placeholder="网格"></el-input>
-      </el-form-item>
-          <el-form-item label="网格ID" prop="gridId">
-          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
-      </el-form-item>
-          <el-form-item label="议题位置地址" prop="issueAddress">
-          <el-input v-model="dataForm.issueAddress" placeholder="议题位置地址"></el-input>
-      </el-form-item>
-          <el-form-item label="议题分类ID" prop="issueCategoryId">
-          <el-input v-model="dataForm.issueCategoryId" placeholder="议题分类ID"></el-input>
-      </el-form-item>
-          <el-form-item label="议题位置纬度" prop="issusLatitude">
-          <el-input v-model="dataForm.issusLatitude" placeholder="议题位置纬度"></el-input>
-      </el-form-item>
-          <el-form-item label="议题位置经度" prop="issueLongitude">
-          <el-input v-model="dataForm.issueLongitude" placeholder="议题位置经度"></el-input>
-      </el-form-item>
-          <el-form-item label="友邻社区ID" prop="friendlyCommunityId">
-          <el-input v-model="dataForm.friendlyCommunityId" placeholder="友邻社区ID"></el-input>
-      </el-form-item>
-          <el-form-item label="事件状态 0-待审核，2-驳回，4-审核通过" prop="eventState">
-          <el-input v-model="dataForm.eventState" placeholder="事件状态 0-待审核，2-驳回，4-审核通过"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标识 0：未删除，1：已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0：未删除，1：已删除"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
-      </el-form>
+    </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
       <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
@@ -83,101 +21,14 @@ export default {
       visible: false,
       dataForm: {
         id: '',
-        userId: '',
-        issueContent: '',
-        area: '',
-        areaId: '',
-        street: '',
-        streetId: '',
-        community: '',
-        communityId: '',
-        grid: '',
-        gridId: '',
-        issueAddress: '',
-        issueCategoryId: '',
-        issusLatitude: '',
-        issueLongitude: '',
-        friendlyCommunityId: '',
-        eventState: '',
-        delFlag: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: ''
-      }
+        eventContent: ''
+      },
+      urls: []
     }
   },
   computed: {
     dataRule () {
-      return {
-        userId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        issueContent: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        area: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        areaId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        street: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        streetId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        community: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        communityId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        grid: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        gridId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        issueAddress: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        issueCategoryId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        issusLatitude: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        issueLongitude: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        friendlyCommunityId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        eventState: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        revision: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      }
+      return {}
     }
   },
   methods: {
@@ -192,7 +43,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/demo/epdcevents/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/events/epdcevents/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -200,6 +51,7 @@ export default {
           ...this.dataForm,
           ...res.data
         }
+        this.urls = res.data.imageArray
       }).catch(() => {})
     },
     // 表单提交
@@ -208,7 +60,7 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/demo/epdcevents/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/events/epdcevents/review', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
diff --git a/src/views/modules/events/epdcevents.vue b/src/views/modules/events/epdcevents.vue
index 1189bca9..a59ed388 100644
--- a/src/views/modules/events/epdcevents.vue
+++ b/src/views/modules/events/epdcevents.vue
@@ -34,13 +34,12 @@
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column label="序号" type="index" show-overflow-tooltip width="50" ></el-table-column>
-        <el-table-column prop="issueContent" label="议题内容" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="eventContent" label="议题内容" header-align="center" align="center"></el-table-column>
         <el-table-column prop="createdTime" label="提交时间" header-align="center" align="center"></el-table-column>
         <el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('events:epdcevents:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('events:epdcevents:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('events:epdcevents:verify')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('verify') }}</el-button>
           </template>
         </el-table-column>
       </el-table>