Merge remote-tracking branch 'origin/feature/item_appeal' into feature/item_appeal

# Conflicts:
#	src/views/modules/events/item-examine-detail-view.vue

src/views/modules/events/appeal-detail-view.vue

@@ -200,11 +200,17 @@ export default {
         } else if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length === 0) {
           return '回应'
         } else if (item.state === 5) {
-          return '关闭'
+          return '不予受理'
         } else if (item.state === 10) {
           return '结案'
+        } else if (item.state === 11) {
+          return '结案申请'
+        } else if (item.state === 12) {
+          return '响应拟办'
+        } else if (item.state === 13) {
+          return '直接办理'
         } else if (item.state === 15) {
-          return '上报网格化平台'
+          return '社区吹哨'
         } else if (item.state === 20) {
           return '网格化平台-受理'
         } else if (item.state === 25) {
@@ -275,7 +281,8 @@ export default {
         }
         this.dataForm.handleProgressResultDTOS.forEach((item, index, arr) => {
           if (index === arr.length - 1) {
-            item.type = 'issue-project'
+            // item.type = 'issue-project'
+            item.type = 'project'
           } else {
             item.type = 'project'
           }

src/views/modules/events/item-examine-detail-view.vue

@@ -249,19 +249,19 @@ export default {
         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 === 12 || item.state === 1001) {
-          return '响应拟办'
-        } else if (item.state === 13) {
-          return '直接办理'
+          return '回应'
         } else if (item.state === 5) {
           return '不予受理'
         } else if (item.state === 10) {
           return '结案'
         } else if (item.state === 11) {
           return '结案申请'
+        } else if (item.state === 12 || item.state === 1001) {
+          return '响应拟办'
+        } else if (item.state === 13) {
+          return '直接办理'
         } else if (item.state === 15) {
-          return '上报网格化平台'
+          return '社区吹哨'
         } else if (item.state === 20) {
           return '网格化平台-受理'
         } else if (item.state === 25) {
@@ -280,10 +280,6 @@ export default {
           return '网格化平台-催办'
         } else if (item.state === 60) {
           return '网格化平台-结案'
-        } else if (item.state === 85) {
-          return '项目延期-审核通过'
-        } else if (item.state === 90) {
-          return '项目熔断-审核通过'
         }
       } else if (item.type === 'issue' || item.type === 'init') {
         if (item.state === 0) {
@@ -352,7 +348,8 @@ export default {
         }
         this.dataForm.handleProgressResultDTOS.forEach((item, index, arr) => {
           if (index === arr.length - 1) {
-            item.type = 'issue-project'
+            // item.type = 'issue-project'
+            item.type = 'project'
           } else {
             item.type = 'project'
           }