From 750fcaab65650f204933b687c9306a339636d7d9 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.com>
Date: Mon, 10 Jan 2022 17:47:12 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E3=80=90=E7=BC=96=E8=BE=91=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E3=80=91=E5=B7=B2=E5=AE=8C=E6=88=90=EF=BC=8C=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E8=BF=9B=E5=B1=95=20-=20=E9=A1=B5=E9=9D=A2=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/events/edit-process-progress.vue  | 230 ++++++++++++++++++
 1 file changed, 230 insertions(+)
 create mode 100644 src/views/modules/events/edit-process-progress.vue

diff --git a/src/views/modules/events/edit-process-progress.vue b/src/views/modules/events/edit-process-progress.vue
new file mode 100644
index 0000000..1c54135
--- /dev/null
+++ b/src/views/modules/events/edit-process-progress.vue
@@ -0,0 +1,230 @@
+<template>
+  <el-dialog :visible.sync="visible" title="处理进展" :close-on-click-modal="false" :close-on-press-escape="false">
+    <div v-for="(item,index) in processProgress" :key="index">
+      <el-form :model="item" ref="item" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'" style="padding-bottom: 60px">
+          <!-- <el-form-item label="" prop="">
+            <div>{{ index + 1 }}</div>
+          </el-form-item> -->
+          <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 === 'init' ? '#46A3FF' : '', color: '#fff', textAlign: 'center', lineHeight: '20px'}"
+              style="display: inline-block !important">
+              {{item.handleType === 'project' ? '项目': item.handleType === 'issue' || item.handleType === 'issue-project' ? '议题' : item.handleType === 'init' ? '事件' : ''}}
+            </div>
+            <span v-if="item.state != '100'" style="padding-left: 36px; font-weight: bold; color: rgb(96, 98, 102);">[  {{item | formatState}}  ]</span>
+            <span v-if="item.state != '100'" style="padding-left: 36px">处理部门： {{item.handlerDept}}</span>
+            <span v-if="item.state == '100'" style="padding-left: 36px">议题内容： {{item.eventContent}}</span>
+          </div>
+          <el-form-item label="操作时间">
+            <el-date-picker v-model="item.createdTime"
+                            type="datetime"
+                            placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="项目处理意见">
+            <el-input v-model="item.advice"></el-input>
+          </el-form-item>
+          <el-form-item label="回复居民意见">
+            <el-input v-model="item.outAdvice"></el-input>
+          </el-form-item>
+          <el-form-item label="图片">
+            <el-input v-model="item.outAdvice"></el-input>
+          </el-form-item>
+    </el-form>
+    </div>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import 'element-ui/lib/theme-chalk/timeline.css'
+import 'element-ui/lib/theme-chalk/timeline-item.css'
+import 'element-ui/lib/theme-chalk/image.css'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: ''
+      },
+      processProgress: []
+    }
+  },
+  filters: {
+    formatState (item) {
+      if (item.handleType === 'project') {
+        if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length > 0) {
+          return '吹哨'
+        } else if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length === 0) {
+          return '回应'
+        } else if (item.state === 5) {
+          return '关闭'
+        } else if (item.state === 10) {
+          return '结案'
+        }
+      } else if (item.handleType === 'issue' || item.handleType === 'init') {
+        if (item.state === 0) {
+          return '审核通过'
+        } else if (item.state === 1) {
+          return '回应'
+        } else if (item.state === 2) {
+          return '关闭'
+        } else if (item.state === 3) {
+          return '转议题'
+        }
+      } else if (item.handleType === 'issue-project') {
+        return '转项目'
+      }
+    }
+  },
+  watch: {
+    'processProgress': function (val) {
+      console.log('processProgress')
+      console.log(this.processProgress)
+    }
+  },
+  methods: {
+    init () {
+      this.$nextTick(() => {
+        this.visible = true
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    getInfo () {
+      this.$http.get(`/events/item/getProcessProgress/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.processProgress = res.data
+        console.log(this.processProgress)
+      }).catch(() => {})
+    },
+    dataFormSubmitHandle () {
+      console.log('processProgress')
+      console.log(this.processProgress)
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+    .project-handle {
+        .el-timeline {
+            padding-left: 9px;
+            font-size: 13px;
+        }
+    }
+    .el-form-item__label {
+        font-weight: bold;
+    }
+</style>
+
+<style lang="scss" scoped>
+    .project-handle {
+        width: 100%;
+        height: calc(100vh - 120px);
+        background: #ffffff;
+        box-sizing: border-box;
+        padding: 10px;
+        .project-detail {
+            width: 79%;
+            height: 80%;
+            border: 2px solid #ccc;
+            box-sizing: border-box;
+            padding: 10px;
+            float:left;
+            margin-bottom: 1%;
+            position: relative;
+             padding-top: 20px;
+            .project-detail-tip {
+              position: absolute;
+              top: 0;
+              left:0;
+              width: 80px;
+              height: 30px;
+              line-height: 30px;
+              color: #ffffff;
+              background: #4ac38b;
+              text-align:center;
+            }
+            .el-form {
+                width: 58%;
+                height: 100%;
+                float:left;
+                overflow-y:auto;
+                &::-webkit-scrollbar {
+                    width: 5px;
+                    height: 1px;
+                }
+                &::-webkit-scrollbar-thumb {
+                    border-radius: 5px;
+                    background: #aaa;
+                }
+                &::-webkit-scrollbar-track {
+                    border-radius: 10px;
+                    background: #fff;
+                }
+            }
+            .container {
+                width: 40%;
+                height: 80%;
+                float: right;
+                .location {
+                    height: 30px;
+                    line-height: 30px;
+                }
+                #map {
+                    width: 100%;
+                    height: calc(100% - 30px);
+                }
+            }
+        }
+        .project-progress {
+            width: 20%;
+            height: 80%;
+            float: right;
+            border: 2px solid #ccc;
+            box-sizing: border-box;
+            margin-left: 1%;
+            padding-top: 20px;
+            overflow-y:auto;
+            position: relative;
+            padding-top: 40px;
+            .project-progress-tip {
+              position: absolute;
+              top: 0;
+              left:0;
+              width: 80px;
+              height: 30px;
+              line-height: 30px;
+              color: #ffffff;
+              background: #0098ff;
+              text-align:center;
+            }
+            &::-webkit-scrollbar {
+                width: 5px;
+                height: 1px;
+            }
+            &::-webkit-scrollbar-thumb {
+                border-radius: 5px;
+                background: #aaa;
+            }
+            &::-webkit-scrollbar-track {
+                border-radius: 10px;
+                background: #ccc;
+            }
+        }
+        .handle-operation {
+            width: 79%;
+            height: 49%;
+            box-sizing: border-box;
+            border: 2px solid #ccc;
+            float:left;
+        }
+    }
+</style>

From 337004b7cf17e627f03f8f1fab0ec9ae72c792c5 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.com>
Date: Wed, 12 Jan 2022 16:40:51 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=20=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E8=BF=9B=E5=B1=95=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/events/edit-process-progress.vue  | 119 ++++++++++++++----
 1 file changed, 93 insertions(+), 26 deletions(-)

diff --git a/src/views/modules/events/edit-process-progress.vue b/src/views/modules/events/edit-process-progress.vue
index 1c54135..e364855 100644
--- a/src/views/modules/events/edit-process-progress.vue
+++ b/src/views/modules/events/edit-process-progress.vue
@@ -2,18 +2,15 @@
   <el-dialog :visible.sync="visible" title="处理进展" :close-on-click-modal="false" :close-on-press-escape="false">
     <div v-for="(item,index) in processProgress" :key="index">
       <el-form :model="item" ref="item" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'" style="padding-bottom: 60px">
-          <!-- <el-form-item label="" prop="">
-            <div>{{ index + 1 }}</div>
-          </el-form-item> -->
           <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 === 'init' ? '#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' ? '#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 === 'init' ? '事件' : ''}}
+              {{item.handleType === 'project' ? '项目': item.handleType === 'issue' || item.handleType === 'issue-project' ? '议题' : item.handleType === 'event' || item.handleType === 'event-issue' ? '事件' : ''}}
             </div>
-            <span v-if="item.state != '100'" style="padding-left: 36px; font-weight: bold; color: rgb(96, 98, 102);">[  {{item | formatState}}  ]</span>
-            <span v-if="item.state != '100'" style="padding-left: 36px">处理部门： {{item.handlerDept}}</span>
-            <span v-if="item.state == '100'" style="padding-left: 36px">议题内容： {{item.eventContent}}</span>
+            <span v-if="item.handleType != 'event'" 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-date-picker v-model="item.createdTime"
@@ -21,28 +18,50 @@
                             placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="项目处理意见">
+          <el-form-item :label="item.handleType === 'project' || item.handleType === 'issue-project' ? '项目处理意见' : '意见'">
             <el-input v-model="item.advice"></el-input>
           </el-form-item>
-          <el-form-item label="回复居民意见">
-            <el-input v-model="item.outAdvice"></el-input>
+          <el-form-item :label="item.handleType === 'project' || item.handleType === 'issue-project' ? '项目处理图片' : '图片'" 
+                        v-if="item.handleType != 'event'">
+            <el-upload list-type="picture-card"
+                      :limit=3
+                      :action="uploadUrl"
+                      :file-list="item.images"
+                      :on-exceed="handleExceed"
+                      :on-success="(res, file, fileList) => { return handlePicSuccess(res, file, fileList, index, 'image')}"
+                      :on-remove="(file, fileList) => { return handleRemove(file, fileList, index, 'image')}">
+              <i slot="default" class="el-icon-plus"></i>
+            </el-upload>
           </el-form-item>
-          <el-form-item label="图片">
+          <el-form-item label="回复居民意见" v-if="item.handleType != 'event' && item.handleType != 'event-issue' && item.handleType != 'issue'">
             <el-input v-model="item.outAdvice"></el-input>
           </el-form-item>
+          <el-form-item label="回复居民图片" v-if="item.handleType != 'event' && item.handleType != 'event-issue' && item.handleType != 'issue'">
+            <el-upload list-type="picture-card"
+                      :limit=3
+                      :action="uploadUrl"
+                      :file-list="item.outImages"
+                      :on-exceed="handleExceed"
+                      :on-success="(res, file, fileList) => { return handlePicSuccess(res, file, fileList, index, 'outImage')}"
+                      :on-remove="(file, fileList) => { return handleRemove(file, fileList, index, 'outImage')}">
+              <i slot="default" class="el-icon-plus"></i>
+            </el-upload>
+          </el-form-item>
     </el-form>
     </div>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <el-button type="primary" :disabled = "isDisabled" :loading="isLoading" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
     </template>
   </el-dialog>
 </template>
 
 <script>
+import Cookies from 'js-cookie'
 import 'element-ui/lib/theme-chalk/timeline.css'
 import 'element-ui/lib/theme-chalk/timeline-item.css'
 import 'element-ui/lib/theme-chalk/image.css'
+import debounce from 'lodash/debounce'
 export default {
   data () {
     return {
@@ -50,7 +69,11 @@ export default {
       dataForm: {
         id: ''
       },
-      processProgress: []
+      uploadUrl: '',
+      // 数据源
+      processProgress: [],
+      isDisabled: false,
+      isLoading: false
     }
   },
   filters: {
@@ -65,7 +88,7 @@ export default {
         } else if (item.state === 10) {
           return '结案'
         }
-      } else if (item.handleType === 'issue' || item.handleType === 'init') {
+      } else if (item.handleType === 'issue' || item.handleType === 'event-issue') {
         if (item.state === 0) {
           return '审核通过'
         } else if (item.state === 1) {
@@ -80,16 +103,14 @@ export default {
       }
     }
   },
-  watch: {
-    'processProgress': function (val) {
-      console.log('processProgress')
-      console.log(this.processProgress)
-    }
-  },
   methods: {
     init () {
       this.$nextTick(() => {
         this.visible = true
+        // 确定按钮 防点击
+        this.isDisabled = false
+        this.isLoading = false
+        this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
         if (this.dataForm.id) {
           this.getInfo()
         }
@@ -101,13 +122,59 @@ export default {
           return this.$message.error(res.msg)
         }
         this.processProgress = res.data
-        console.log(this.processProgress)
       }).catch(() => {})
     },
-    dataFormSubmitHandle () {
-      console.log('processProgress')
-      console.log(this.processProgress)
-    }
+    // 图片上传
+    handlePicSuccess (res, file, fileList, index, imgType) {
+      let image = {}
+      image.name = Math.round(Math.random() * 5)
+      image.url = res.data.url
+      if ('outImage' == imgType) {
+        this.processProgress[index].outImages.push(image)
+      } else if ('image' == imgType) {
+        this.processProgress[index].images.push(image)
+      }
+    },
+    handleRemove (file, fileList, index, imgType) {
+      if ('outImage' == imgType) {
+        this.processProgress[index].outImages = fileList
+      } else if ('image' == imgType) {
+        this.processProgress[index].images = fileList
+      }
+    },
+    handleExceed () {
+      this.$message({
+        showClose: true,
+        message: '只能上传三张图片',
+        type: 'warning'
+      })
+    },
+    dataFormSubmitHandle: debounce(function () {
+      // this.$refs['dataForm'].validate((valid) => {
+        // if (!valid) {
+        //   return false
+        // }
+        this.isLoading = true
+        this.isDisabled = true
+        this.$http['post']('/events/item/editProcessProgressList/', this.processProgress).then(({ data: res }) => {
+          if (res.code !== 0) {
+            // 确定按钮 防点击
+            this.isDisabled = false
+            this.isLoading = false
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      // })
+    }, 1000, { 'leading': true, 'trailing': false })
   }
 }
 </script>

From 5f17b617a61531aef2a276839268eb8ee1b8104b Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.com>
Date: Thu, 13 Jan 2022 13:50:25 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/events/edit-process-progress.vue  | 89 ++++++++++++-------
 1 file changed, 55 insertions(+), 34 deletions(-)

diff --git a/src/views/modules/events/edit-process-progress.vue b/src/views/modules/events/edit-process-progress.vue
index e364855..6001d4d 100644
--- a/src/views/modules/events/edit-process-progress.vue
+++ b/src/views/modules/events/edit-process-progress.vue
@@ -8,21 +8,23 @@
               style="display: inline-block !important">
               {{item.handleType === 'project' ? '项目': item.handleType === 'issue' || item.handleType === 'issue-project' ? '议题' : item.handleType === 'event' || item.handleType === 'event-issue' ? '事件' : ''}}
             </div>
-            <span v-if="item.handleType != 'event'" style="padding-left: 36px; font-weight: bold; color: rgb(96, 98, 102);">[  {{item | formatState}}  ]</span>
+            <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>
+            <span v-if="item.handleType === 'event'" style="padding-left: 36px">事件内容： {{item.eventContent}}</span>
           </div>
           <el-form-item label="操作时间">
             <el-date-picker v-model="item.createdTime"
                             type="datetime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            format="yyyy-MM-dd HH:mm:ss"
+                            :clearable="false"
                             placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
           <el-form-item :label="item.handleType === 'project' || item.handleType === 'issue-project' ? '项目处理意见' : '意见'">
-            <el-input v-model="item.advice"></el-input>
+            <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'">
+          <el-form-item :label="item.handleType === 'project' || item.handleType === 'issue-project' ? '项目处理图片' : '图片'" v-if="item.handleType != 'event'">
             <el-upload list-type="picture-card"
                       :limit=3
                       :action="uploadUrl"
@@ -34,7 +36,7 @@
             </el-upload>
           </el-form-item>
           <el-form-item label="回复居民意见" v-if="item.handleType != 'event' && item.handleType != 'event-issue' && item.handleType != 'issue'">
-            <el-input v-model="item.outAdvice"></el-input>
+            <el-input v-model="item.outAdvice" maxlength="500" show-word-limit></el-input>
           </el-form-item>
           <el-form-item label="回复居民图片" v-if="item.handleType != 'event' && item.handleType != 'event-issue' && item.handleType != 'issue'">
             <el-upload list-type="picture-card"
@@ -51,7 +53,7 @@
     </div>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" :disabled = "isDisabled" :loading="isLoading" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <el-button type="primary" :disabled = "isDisabled" :loading="isLoading" @click="validateTime()">{{ $t('confirm') }}</el-button>
     </template>
   </el-dialog>
 </template>
@@ -80,26 +82,38 @@ export default {
     formatState (item) {
       if (item.handleType === 'project') {
         if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length > 0) {
+          item.stateName = '吹哨'
           return '吹哨'
         } else if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length === 0) {
+          item.stateName = '回应'
           return '回应'
         } else if (item.state === 5) {
+          item.stateName = '关闭'
           return '关闭'
         } else if (item.state === 10) {
+          item.stateName = '结案'
           return '结案'
         }
       } else if (item.handleType === 'issue' || item.handleType === 'event-issue') {
         if (item.state === 0) {
+          item.stateName = '审核通过'
           return '审核通过'
         } else if (item.state === 1) {
+          item.stateName = '回应'
           return '回应'
         } else if (item.state === 2) {
+          item.stateName = '关闭'
           return '关闭'
         } else if (item.state === 3) {
+          item.stateName = '转议题'
           return '转议题'
         }
       } else if (item.handleType === 'issue-project') {
+        item.stateName = '转项目'
         return '转项目'
+      } else if (item.handleType === 'event') {
+        item.stateName = '事件发起'
+        return '事件发起'
       }
     }
   },
@@ -116,6 +130,18 @@ export default {
         }
       })
     },
+    validateTime () {
+      var flag = true
+      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 + '] 的操作时间之后')
+        }
+      })
+      if (flag) {
+        this.dataFormSubmitHandle()
+      }
+    },
     getInfo () {
       this.$http.get(`/events/item/getProcessProgress/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
@@ -129,16 +155,16 @@ export default {
       let image = {}
       image.name = Math.round(Math.random() * 5)
       image.url = res.data.url
-      if ('outImage' == imgType) {
+      if (imgType === 'outImage') {
         this.processProgress[index].outImages.push(image)
-      } else if ('image' == imgType) {
+      } else if (imgType === 'image') {
         this.processProgress[index].images.push(image)
       }
     },
     handleRemove (file, fileList, index, imgType) {
-      if ('outImage' == imgType) {
+      if (imgType === 'outImage') {
         this.processProgress[index].outImages = fileList
-      } else if ('image' == imgType) {
+      } else if (imgType === 'image') {
         this.processProgress[index].images = fileList
       }
     },
@@ -150,30 +176,25 @@ export default {
       })
     },
     dataFormSubmitHandle: debounce(function () {
-      // this.$refs['dataForm'].validate((valid) => {
-        // if (!valid) {
-        //   return false
-        // }
-        this.isLoading = true
-        this.isDisabled = true
-        this.$http['post']('/events/item/editProcessProgressList/', this.processProgress).then(({ data: res }) => {
-          if (res.code !== 0) {
-            // 确定按钮 防点击
-            this.isDisabled = false
-            this.isLoading = false
-            return this.$message.error(res.msg)
+      this.isLoading = true
+      this.isDisabled = true
+      this.$http['post']('/events/item/editProcessProgressList/', this.processProgress).then(({ data: res }) => {
+        if (res.code !== 0) {
+          // 确定按钮 防点击
+          this.isDisabled = false
+          this.isLoading = false
+          return this.$message.error(res.msg)
+        }
+        this.$message({
+          message: this.$t('prompt.success'),
+          type: 'success',
+          duration: 500,
+          onClose: () => {
+            this.visible = false
+            this.$emit('refreshDataList')
           }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
-      // })
+        })
+      }).catch(() => {})
     }, 1000, { 'leading': true, 'trailing': false })
   }
 }

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 4/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=BC=96=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>

From fd745c455914400769142890d292658baa42b52d Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.com>
Date: Thu, 20 Jan 2022 15:18:05 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E8=BF=9B=E5=B1=95=E7=BC=96=E8=BE=91=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=20=E6=BB=A1=E6=84=8F=E5=BA=A6=E8=AF=84=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/events/edit-process-progress.vue  |  38 ++++--
 .../events/item-process-progress-list.vue     | 119 ++++++------------
 2 files changed, 65 insertions(+), 92 deletions(-)

diff --git a/src/views/modules/events/edit-process-progress.vue b/src/views/modules/events/edit-process-progress.vue
index 619e635..199d25d 100644
--- a/src/views/modules/events/edit-process-progress.vue
+++ b/src/views/modules/events/edit-process-progress.vue
@@ -4,12 +4,12 @@
       <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' || item.handleType === 'event-issue' ? '#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' || item.handleType === 'project-evaluation' ? '#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-issue' ? '议题' : item.handleType === 'event' ? '事件' : ''}}
+              {{item.handleType === 'project' || item.handleType === 'project-evaluation' ? '项目': 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' && item.handleType != 'project-evaluation'" 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="item.handleType != 'event' ? '操作时间' : '发布时间'">
@@ -21,10 +21,14 @@
                             placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
-          <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 label="评价得分" v-if="item.handleType === 'project-evaluation'">
+            <el-rate v-model="item.evaluationScore" show-text :texts="rateText" :max="3">
+            </el-rate>
           </el-form-item>
-          <el-form-item :label="item.handleType === 'project' || item.handleType === 'issue-project' ? '项目处理图片' : '图片'" v-if="item.handleType != 'event'">
+          <el-form-item :label="item.handleType === 'project' || item.handleType === 'issue-project' ? '项目处理意见' : item.handleType === 'project-evaluation' ? '评价内容' :'意见'" v-if="item.handleType != 'event'">
+            <el-input v-model="item.advice" maxlength="100" show-word-limit></el-input>
+          </el-form-item>
+          <el-form-item :label="item.handleType === 'project' || item.handleType === 'issue-project' ? '项目处理图片' : '图片'" v-if="item.handleType != 'event' && item.handleType != 'project-evaluation'">
             <el-upload list-type="picture-card"
                       :limit=3
                       :action="uploadUrl"
@@ -35,10 +39,10 @@
               <i slot="default" class="el-icon-plus"></i>
             </el-upload>
           </el-form-item>
-          <el-form-item label="回复居民意见" v-if="item.handleType != 'event' && item.handleType != 'event-issue' && item.handleType != 'issue'">
+          <el-form-item label="回复居民意见" v-if="item.handleType != 'event' && item.handleType != 'event-issue' && item.handleType != 'issue' && item.handleType != 'project-evaluation'">
             <el-input v-model="item.outAdvice" maxlength="500" show-word-limit></el-input>
           </el-form-item>
-          <el-form-item label="回复居民图片" v-if="item.handleType != 'event' && item.handleType != 'event-issue' && item.handleType != 'issue'">
+          <el-form-item label="回复居民图片" v-if="item.handleType != 'event' && item.handleType != 'event-issue' && item.handleType != 'issue' && item.handleType != 'project-evaluation'">
             <el-upload list-type="picture-card"
                       :limit=3
                       :action="uploadUrl"
@@ -75,7 +79,13 @@ export default {
       // 数据源
       processProgress: [],
       isDisabled: false,
-      isLoading: false
+      isLoading: false,
+      rateText: [
+        '不满意',
+        '基本满意',
+        '非常满意'
+      ],
+      iconClasses: ['icon-rate-face-1', 'icon-rate-face-2', 'icon-rate-face-3']
     }
   },
   filters: {
@@ -114,6 +124,9 @@ export default {
       } else if (item.handleType === 'event') {
         item.stateName = '事件发布'
         return '事件发布'
+      } else if (item.handleType === 'project-evaluation') {
+        item.stateName = '满意度评价'
+        return '满意度评价'
       }
     }
   },
@@ -316,3 +329,10 @@ export default {
         }
     }
 </style>
+
+<style lang="scss" scoped>
+  /deep/ .el-rate__icon {
+    font-size: 34px;
+    margin-right: 40px;
+  }
+</style>
diff --git a/src/views/modules/events/item-process-progress-list.vue b/src/views/modules/events/item-process-progress-list.vue
index 79f95b6..7246406 100644
--- a/src/views/modules/events/item-process-progress-list.vue
+++ b/src/views/modules/events/item-process-progress-list.vue
@@ -15,35 +15,13 @@
           >
           </el-cascader>
         </el-form-item>
-        <el-form-item label="项目编号" prop="itemCode">
+        <el-form-item label="项目内容" prop="itemContent">
           <el-input
-            v-model="dataForm.itemCode"
-            placeholder="请输入项目编号"
+            v-model="dataForm.itemContent"
+            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>
@@ -63,26 +41,27 @@
           width="50"
         ></el-table-column>
         <el-table-column
-          show-overflow-tooltip
-          prop="itemContent"
-          label="项目内容"
+          prop="grid"
+          label="所属网格"
           header-align="center"
           min-width="400"
           align="left"
         ></el-table-column>
         <el-table-column
-          prop="itemCode"
-          label="项目编号"
+          prop="itemState"
+          label="项目状态"
           header-align="center"
-          width="142"
-          align="center"
+          min-width="400"
+          align="left"
+          :formatter="showItemStateNameFormatter"
         ></el-table-column>
         <el-table-column
-          prop="createdTime"
-          label="转成项目时间"
+          show-overflow-tooltip
+          prop="itemContent"
+          label="项目内容"
           header-align="center"
-          width="180"
-          align="center"
+          min-width="400"
+          align="left"
         ></el-table-column>
         <el-table-column
           prop="nickName"
@@ -92,37 +71,6 @@
           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"
@@ -179,27 +127,23 @@ export default {
         streetId: '',
         communityId: '',
         gridId: '',
-        itemCode: ''
+        itemCode: '',
+        itemContent: ''
       },
       ids: [],
       options: [],
       editVisible: false,
-      pickerBeginDateBefore: {
-        disabledDate: time => {
-          let beginDateVal = this.dataForm.startTime
-          if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal).getTime()
-          }
-        }
+      itemStateOptions: [{
+        value: '0',
+        label: '处理中'
       },
-      pickerBeginDateAfter: {
-        disabledDate: time => {
-          let EndDateVal = this.dataForm.endTime
-          if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal).getTime()
-          }
-        }
-      }
+      {
+        value: '5',
+        label: '已关闭'
+      }, {
+        value: '10',
+        label: '已结案'
+      }]
     }
   },
   components: {
@@ -233,6 +177,15 @@ export default {
     }
   },
   methods: {
+    showItemStateNameFormatter: function (row, column) {
+      if (row.itemState) {
+        let dict = this.itemStateOptions.filter(item => item.value === row.itemState)[0]
+        if (dict) {
+          return dict.label
+        }
+      }
+      return ''
+    },
     editAction (id) {
       this.editVisible = true
       this.$nextTick(() => {

From 306d6df45a50b2f9c3afa42666892c455d97cbfd Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.com>
Date: Fri, 21 Jan 2022 16:39:43 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=20=3D=20=EF=BC=8C=E6=98=AF=E5=9B=A0=E4=B8=BA?=
 =?UTF-8?q?=E6=80=95=E6=89=80=E6=9C=89=E7=9A=84=E6=97=B6=E9=97=B4=E9=83=BD?=
 =?UTF-8?q?=E4=B8=80=E6=A0=B7=EF=BC=8C=E4=BB=8E=E8=80=8C=E4=B8=8D=E5=A5=BD?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=20=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/events/edit-process-progress.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/events/edit-process-progress.vue b/src/views/modules/events/edit-process-progress.vue
index 199d25d..c9f4934 100644
--- a/src/views/modules/events/edit-process-progress.vue
+++ b/src/views/modules/events/edit-process-progress.vue
@@ -146,7 +146,7 @@ export default {
     validateTime () {
       var flag = true
       this.processProgress.forEach((item, index, arr) => {
-        if (index < arr.length - 1 && arr[index].createdTime < arr[index + 1].createdTime) {
+        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 + '] 的时间之后')
         }