bug修改

6 years ago · ae17c1d185
6 changed files with 55 additions and 40 deletions
--- a/src/views/modules/events/issue-detail.vue
+++ b/src/views/modules/events/issue-detail.vue
@ -2,13 +2,13 @@
  <el-dialog :visible.sync="visible" :title="$t('look')" :close-on-click-modal="false" :close-on-press-escape="false">
    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
      <el-form-item label="发布人">
-        <p>{{dataForm.nickName}}</p>
+        <div>{{dataForm.nickName}}</div>
      </el-form-item>
      <el-form-item label="发布时间">
-        <p>{{dataForm.distributeTime}}</p>
+        <div>{{dataForm.distributeTime}}</div>
      </el-form-item>
      <el-form-item label="议题内容">
-        <p>{{dataForm.issueContent}}</p>
+        {{dataForm.issueContent}}
      </el-form-item>
      <el-form-item>
        <span>支持 {{dataForm.approveNum}}</span>
--- a/src/views/modules/events/issue-process-deal.vue
+++ b/src/views/modules/events/issue-process-deal.vue
@ -2,13 +2,15 @@
  <el-dialog :visible.sync="visible" :title="$t('deal')" :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="nickName">
-        <p>{{dataForm.nickName}}</p>
+        <div>{{dataForm.nickName}}</div>
      </el-form-item>
      <el-form-item label="发布时间" prop="distributeTime">
-        <p>{{dataForm.distributeTime}}</p>
+        <div>
+           {{dataForm.distributeTime}}
+        </div>
      </el-form-item>
      <el-form-item label="议题内容" prop="eventContent">
-        <p>{{dataForm.issueContent}}</p>
+        <div>{{dataForm.issueContent}}</div>
      </el-form-item>
      <el-form-item label="工作反馈" prop="jobFeedback">
        <el-timeline :reverse="false">
@ -76,6 +78,9 @@ export default {
        ],
        eventState: [
          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        state: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
        ]
      }
    }
--- a/src/views/modules/events/issue-reject-detail.vue
+++ b/src/views/modules/events/issue-reject-detail.vue
@ -2,23 +2,23 @@
  <el-dialog :visible.sync="visible" :title="$t('verifyLabel')" :close-on-click-modal="false" :close-on-press-escape="false">
    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
      <el-form-item label="议题内容" prop="eventContent">
-        <p>{{dataForm.eventContent}}</p>
+        <div>{{dataForm.eventContent}}</div>
        <img v-for="imgUrl in dataForm.images" :key="imgUrl" style='width: 70px;height: 70px;margin: 10px' :layer-src="imgUrl" :src="imgUrl" alt="image">
      </el-form-item>
      <el-form-item label="地址" prop="address">
-        <p>{{dataForm.address}}</p>
+        <div>{{dataForm.address}}</div>
      </el-form-item>
      <el-form-item label="提交人" prop="nickName">
-        <p>{{dataForm.nickName}}</p>
+        <div>{{dataForm.nickName}}</div>
      </el-form-item>
      <el-form-item label="提交时间" prop="createdTime">
-        <p>{{dataForm.createdTime}}</p>
+        <div>{{dataForm.createdTime}}</div>
      </el-form-item>
      <el-form-item label="事件状态" prop="stateName">
-        <p>{{dataForm.stateName}}</p>
+        <div>{{dataForm.stateName}}</div>
      </el-form-item>
      <el-form-item label="驳回意见" prop="advice">
-        <p>{{dataForm.advice}}</p>
+        <div>{{dataForm.advice}}</div>
      </el-form-item>
    </el-form>
    <template slot="footer">
--- a/src/views/modules/events/issue-review-detail.vue
+++ b/src/views/modules/events/issue-review-detail.vue
@ -2,21 +2,11 @@
  <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>
+        <div>{{dataForm.eventContent}}</div>
        <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>
+        <div>{{dataForm.nickName}}</div>
      </el-form-item>
      <el-form-item label="审核操作" prop="eventState">
        <el-select v-model="dataForm.eventState" placeholder="请选择">
@ -28,6 +18,16 @@
          </el-option>
        </el-select>
      </el-form-item>
+      <el-form-item label="类别" prop="categoryId" v-if="categoryVisible">
+        <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="advice">
          <el-input v-model="dataForm.advice" placeholder="处理意见"></el-input>
      </el-form-item>
@ -53,6 +53,7 @@ export default {
        advice: '',
        eventState: ''
      },
+      categoryVisible: true,
      urls: [],
      categoryOptions: [],
      verifyOptions: [{
@ -79,6 +80,15 @@ export default {
      }
    }
  },
+  watch: {
+    'dataForm.eventState': function (val) {
+      if (val === '2') {
+        this.categoryVisible = false
+      } else {
+        this.categoryVisible = true
+      }
+    }
+  },
  methods: {
    init () {
      this.visible = true
--- a/src/views/modules/events/item-deal-detail.vue
+++ b/src/views/modules/events/item-deal-detail.vue
@ -2,35 +2,35 @@
  <el-dialog :visible.sync="visible" :title="$t('deal')" :close-on-click-modal="false" :close-on-press-escape="false">
    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '130px' : '90px'">
      <el-form-item label="发布人" prop="nickName">
-        <p>{{dataForm.nickName}}</p>
+        <div>{{dataForm.nickName}}</div>
      </el-form-item>
      <el-form-item label="发布时间" prop="distributeTime">
-        <p>{{dataForm.distributeTime}}</p>
+        <div>{{dataForm.distributeTime}}</div>
      </el-form-item>
      <el-form-item label="议题内容" prop="eventContent">
-        <p>{{dataForm.itemContent}}</p>
+        <div>{{dataForm.itemContent}}</div>
        <img v-for="imgUrl in dataForm.images" :key="imgUrl" style='width: 70px;height: 70px;margin: 10px' :layer-src="imgUrl" :src="imgUrl" alt="image">
      </el-form-item>
      <el-form-item label="地址" prop="issueAddress">
-        <p>{{dataForm.issueAddress}}</p>
+        <div>{{dataForm.issueAddress}}</div>
      </el-form-item>
      <el-form-item label="处理进度" prop="jobFeedback">
        <el-timeline :reverse="false">
          <el-timeline-item v-for="(handleProgressResultDTO, index) in dataForm.handleProgressResultDTOS" :key="index" :timestamp="handleProgressResultDTO.createdTime" placement="top">
            <el-card>
-              <p>{{handleProgressResultDTO.progressName}}{{handleProgressResultDTO.createdTime}}</p>
-              <p>{{handleProgressResultDTO.advice}}</p>
+              <div>{{handleProgressResultDTO.progressName}}{{handleProgressResultDTO.createdTime}}</div>
+              <div>{{handleProgressResultDTO.advice}}</div>
            </el-card>
          </el-timeline-item>
        </el-timeline>
      </el-form-item>
-      <el-form-item label="处理意见(内部)" prop="handleAdvice">
+      <el-form-item label="处理意见(内部)" prop="handleAdvice" :required="true">
          <el-input v-model="postDataForm.handleAdvice" placeholder="不超过50字"></el-input>
      </el-form-item>
-      <el-form-item label="处理意见(外部)" prop="outHandleAdvice">
+      <el-form-item label="处理意见(外部)" prop="outHandleAdvice" :required="true">
          <el-input v-model="postDataForm.outHandleAdvice" placeholder="不超过50字"></el-input>
      </el-form-item>
-      <el-form-item label="处理" prop="handleCategory">
+      <el-form-item label="处理" prop="handleCategory" :required="true">
        <el-select v-model="postDataForm.handleCategory" placeholder="请选择">
          <el-option
            v-for="handleResultDTO in dataForm.handleResultDTOS"
@ -40,12 +40,12 @@
          </el-option>
        </el-select>
      </el-form-item>
-     <el-form-item label="流转对象" prop="deptResultDTOS" v-if="deptResultDTOSVisible">
+     <el-form-item label="流转对象" prop="deptResultDTOS" v-if="deptResultDTOSVisible" :required="true">
        <el-checkbox-group v-model="postDataForm.deptResultDTOS">
          <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">
+      <el-form-item label="满意度评价" prop="evaluateDeptDTOS" v-if="evaluateDeptDTOSVisible" :required="true">
        <div v-for="(evaluateDeptDTO, index) in dataForm.evaluateDeptDTOS" :key="index">
          <label>{{evaluateDeptDTO.deptName}}</label>&nbsp;
          <el-radio-group v-model="evaluateDeptDTO.evaluationLevel">
--- a/src/views/modules/events/item-detail.vue
+++ b/src/views/modules/events/item-detail.vue
@ -2,13 +2,13 @@
  <el-dialog :visible.sync="visible" :title="$t('look')" :close-on-click-modal="false" :close-on-press-escape="false">
    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
      <el-form-item label="发布人">
-        <p>{{dataForm.nickName}}</p>
+        <div>{{dataForm.nickName}}</div>
      </el-form-item>
      <el-form-item label="发布时间">
-        <p>{{dataForm.distributeTime}}</p>
+        <div>{{dataForm.distributeTime}}</div>
      </el-form-item>
      <el-form-item label="议题内容">
-        <p>{{dataForm.itemContent}}</p>
+        <div>{{dataForm.itemContent}}</div>
      </el-form-item>
      <el-form-item>
        <span>支持 {{dataForm.approveNum}}</span>
@ -19,8 +19,8 @@
        <el-timeline :reverse="false">
          <el-timeline-item v-for="(handleProgressResultDTO, index) in dataForm.handleProgressResultDTOS" :key="index" :timestamp="handleProgressResultDTO.createdTime" placement="top">
            <el-card>
-              <p>{{handleProgressResultDTO.progressName}}{{handleProgressResultDTO.createdTime}}</p>
-              <p>{{handleProgressResultDTO.advice}}</p>
+              <div>{{handleProgressResultDTO.progressName}}{{handleProgressResultDTO.createdTime}}</div>
+              <div>{{handleProgressResultDTO.advice}}</div>
            </el-card>
          </el-timeline-item>
        </el-timeline>