From cc7b8e15406627394fb9766aaabf35f04b68f152 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.com>
Date: Thu, 13 Jan 2022 16:46:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/events/edit-process-progress.vue  |  14 +-
 .../events/item-process-progress-list.vue     | 256 ++++++++++++++++++
 2 files changed, 263 insertions(+), 7 deletions(-)
 create mode 100644 src/views/modules/events/item-process-progress-list.vue

diff --git a/src/views/modules/events/edit-process-progress.vue b/src/views/modules/events/edit-process-progress.vue
index 6001d4d..619e635 100644
--- a/src/views/modules/events/edit-process-progress.vue
+++ b/src/views/modules/events/edit-process-progress.vue
@@ -4,15 +4,15 @@
       <el-form :model="item" ref="item" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'" style="padding-bottom: 60px">
           <div style="padding-bottom: 20px">
             <div
-              :style="{marginBottom: '10px', width: '35px', height: '20px', fontSize: '12px', borderRadius: '4px', background: item.handleType === 'project' ? '#009688': item.handleType === 'issue' || item.handleType === 'issue-project' ? '#ffa546' : item.handleType === 'event' || item.handleType === 'event-issue'? '#46A3FF' : '', color: '#fff', textAlign: 'center', lineHeight: '20px'}"
+              :style="{marginBottom: '10px', width: '35px', height: '20px', fontSize: '12px', borderRadius: '4px', background: item.handleType === 'project' ? '#009688': item.handleType === 'issue' || item.handleType === 'issue-project' || item.handleType === 'event-issue' ? '#ffa546' : item.handleType === 'event' || item.handleType === 'event-issue'? '#46A3FF' : '', color: '#fff', textAlign: 'center', lineHeight: '20px'}"
               style="display: inline-block !important">
-              {{item.handleType === 'project' ? '项目': item.handleType === 'issue' || item.handleType === 'issue-project' ? '议题' : item.handleType === 'event' || item.handleType === 'event-issue' ? '事件' : ''}}
+              {{item.handleType === 'project' ? '项目': item.handleType === 'issue' || item.handleType === 'issue-project' || item.handleType === 'event-issue' ? '议题' : item.handleType === 'event' ? '事件' : ''}}
             </div>
             <span style="padding-left: 36px; font-weight: bold; color: rgb(96, 98, 102);">[  {{item | formatState}}  ]</span>
             <span v-if="item.handleType != 'event'" style="padding-left: 36px">处理部门： {{item.handlerDept}}</span>
             <span v-if="item.handleType === 'event'" style="padding-left: 36px">事件内容： {{item.eventContent}}</span>
           </div>
-          <el-form-item label="操作时间">
+          <el-form-item :label="item.handleType != 'event' ? '操作时间' : '发布时间'">
             <el-date-picker v-model="item.createdTime"
                             type="datetime"
                             value-format="yyyy-MM-dd HH:mm:ss"
@@ -21,7 +21,7 @@
                             placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
-          <el-form-item :label="item.handleType === 'project' || item.handleType === 'issue-project' ? '项目处理意见' : '意见'">
+          <el-form-item :label="item.handleType === 'project' || item.handleType === 'issue-project' ? '项目处理意见' : '意见'" v-if="item.handleType != 'event'">
             <el-input v-model="item.advice" maxlength="500" show-word-limit></el-input>
           </el-form-item>
           <el-form-item :label="item.handleType === 'project' || item.handleType === 'issue-project' ? '项目处理图片' : '图片'" v-if="item.handleType != 'event'">
@@ -112,8 +112,8 @@ export default {
         item.stateName = '转项目'
         return '转项目'
       } else if (item.handleType === 'event') {
-        item.stateName = '事件发起'
-        return '事件发起'
+        item.stateName = '事件发布'
+        return '事件发布'
       }
     }
   },
@@ -135,7 +135,7 @@ export default {
       this.processProgress.forEach((item, index, arr) => {
         if (index < arr.length - 1 && arr[index].createdTime < arr[index + 1].createdTime) {
           flag = false
-          return this.$message.error(' [' + arr[index].stateName + '] 的操作时间应在 [' + arr[index + 1].stateName + '] 的操作时间之后')
+          return this.$message.error(' [' + arr[index].stateName + '] 的操作时间应在 [' + arr[index + 1].stateName + '] 的时间之后')
         }
       })
       if (flag) {
diff --git a/src/views/modules/events/item-process-progress-list.vue b/src/views/modules/events/item-process-progress-list.vue
new file mode 100644
index 0000000..79f95b6
--- /dev/null
+++ b/src/views/modules/events/item-process-progress-list.vue
@@ -0,0 +1,256 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-item__item}">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item label="所属机构">
+          <el-cascader
+            v-model="ids"
+            :options="options"
+            :props="{ checkStrictly: true }"
+            clearable
+          >
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="项目编号" prop="itemCode">
+          <el-input
+            v-model="dataForm.itemCode"
+            placeholder="请输入项目编号"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="时间" prop="startTime">
+          <el-date-picker
+            v-model="dataForm.startTime"
+            type="date"
+            :picker-options="pickerBeginDateBefore"
+            value-format="yyyy-MM-dd"
+            format="yyyy-MM-dd"
+            placeholder="选择日期时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至" label-width="25px" prop="endTime">
+          <el-date-picker
+            v-model="dataForm.endTime"
+            type="date"
+            :picker-options="pickerBeginDateAfter"
+            value-format="yyyy-MM-dd"
+            format="yyyy-MM-dd"
+            placeholder="选择日期时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+      </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
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="itemContent"
+          label="项目内容"
+          header-align="center"
+          min-width="400"
+          align="left"
+        ></el-table-column>
+        <el-table-column
+          prop="itemCode"
+          label="项目编号"
+          header-align="center"
+          width="142"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="createdTime"
+          label="转成项目时间"
+          header-align="center"
+          width="180"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="nickName"
+          label="提交人"
+          header-align="center"
+          width="150"
+          align="center"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          prop="participantsNum"
+          label="参与人数"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="approveNum"
+          label="支持人数"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="opposeNum"
+          label="不支持人数"
+          header-align="center"
+          width="95"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="commentNum"
+          label="评论人数"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="browseNum"
+          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
+              type="text"
+              size="small"
+              @click="editAction(scope.row.id)"
+              >编辑处理进展</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+      <edit-process-progress
+        v-if="editVisible"
+        ref="editProcessProgress"
+        @refreshDataList="getDataList"
+      ></edit-process-progress>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import editProcessProgress from './edit-process-progress'
+export default {
+  mixins: [mixinViewModule],
+  name: 'ItemCloseList',
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/events/item/page',
+        getDataListIsPage: true
+      },
+      dataForm: {
+        id: '',
+        itemState: '',
+        startTime: '',
+        endTime: '',
+        streetId: '',
+        communityId: '',
+        gridId: '',
+        itemCode: ''
+      },
+      ids: [],
+      options: [],
+      editVisible: false,
+      pickerBeginDateBefore: {
+        disabledDate: time => {
+          let beginDateVal = this.dataForm.startTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal).getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: time => {
+          let EndDateVal = this.dataForm.endTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal).getTime()
+          }
+        }
+      }
+    }
+  },
+  components: {
+    editProcessProgress
+  },
+  created: function () {
+    this.getOptions()
+  },
+  watch: {
+    ids: function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.ids[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.ids[0]
+        this.dataForm.communityId = this.ids[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.ids[0]
+        this.dataForm.communityId = this.ids[1]
+        this.dataForm.gridId = this.ids[2]
+      }
+    }
+  },
+  methods: {
+    editAction (id) {
+      this.editVisible = true
+      this.$nextTick(() => {
+        this.$refs.editProcessProgress.dataForm.id = id
+        this.$refs.editProcessProgress.init()
+      })
+    },
+    getOptions () {
+      this.$http
+        .get(`/sys/user/deptOptions/getByLoginUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => {})
+    }
+  }
+}
+</script>