Merge branch 'develop-zhouyi' into 'develop'

fix(@gms/gms-plugin-billexpand): 删除冗余emcon

See merge request GFP/RBC/rbc-frontend!202

develop/@gms/gms-plugin-billexpand/src/constant.js

@@ -13,6 +13,7 @@ export const APPROVAL_TRACK_TABLE = {
   CREATE_TIME: 'createTime',
   APPROVAL_COMMENT: 'approvalcomments',
   NODE_NAME: 'approvalnodename',
+  CURRENT_NODE: 'currnode',
   CREATOR_FULL_NAME: 'creatorfullname',
   OPERATION: 'operation',
 }

develop/@gms/gms-plugin-billexpand/src/control/workflow-track.vue

@@ -166,17 +166,20 @@ export default {
       if (subTable instanceof Array) {
         this.data = subTable.map((obj) => {
           const operation = obj.getValue(APPROVAL_TRACK_TABLE.OPERATION)
+          const currNode = obj.getValue(APPROVAL_TRACK_TABLE.CURRENT_NODE)
             
           return {
             state: 2,
             result:
-              operation == '提交'
-                ? -1
-                : operation == '同意'
-                ? 1
-                : operation == '驳回'
-                ? 3
-                : -2,
+              currNode == 99
+              ? -2
+              : operation == '提交'
+              ? -1
+              : operation == '同意'
+              ? 1
+              : operation == '驳回'
+              ? 3
+              : -2,
             actualOwner: obj.getValue(APPROVAL_TRACK_TABLE.CREATOR_FULL_NAME),
             createTime: obj.getValue(APPROVAL_TRACK_TABLE.CREATE_TIME),
             completeTime: obj.getValue(APPROVAL_TRACK_TABLE.CREATE_TIME),
@@ -184,6 +187,7 @@ export default {
             title: obj.getValue(APPROVAL_TRACK_TABLE.NODE_NAME),
           }
         })
+        this.data = this.data.reverse()
       }
       return
     }

develop/@gms/gms-plugin-billexpand/src/emcon.js

@@ -2120,7 +2120,7 @@ export default {
 				]
 			},
 			"description": "",
-			"title": "财务_同意[GH_agreeAction]",
+			"title": "工会_同意[GH_agreeAction]",
 			"value": "GH_agreeAction",
 			"btnDisable": "billEdit"
 		},
@@ -2219,7 +2219,7 @@ export default {
 				]
 			},
 			"description": "",
-			"title": "财务_驳回[GH_rejectAction]",
+			"title": "工会_驳回[GH_rejectAction]",
 			"value": "GH_rejectAction",
 			"btnDisable": "billEdit"
 		},
@@ -2267,7 +2267,7 @@ export default {
 				]
 			},
 			"description": "",
-			"title": "财务_提交[GH_submitAction]",
+			"title": "工会_提交[GH_submitAction]",
 			"value": "GH_submitAction",
 			"btnDisable": "billEdit;1;90;92"
 		},
@@ -2329,18 +2329,6 @@ export default {
 		},
 		{
 			"discard": false,
-			"path": "资产/通用",
-			"extends": {
-				"param": [
-				]
-			},
-			"description": "",
-			"title": "工会_同意[GH_agreeAction]",
-			"value": "GH_agreeAction",
-			"btnDisable": "false"
-		},
-		{
-			"discard": false,
 			"path": "报销/工会",
 			"extends": {
 				"param": [
@@ -2351,30 +2339,6 @@ export default {
 			"value": "GH_retrieveAction",
 			"btnDisable": "billEdit"
 		},
-		{
-			"discard": false,
-			"path": "资产/通用",
-			"extends": {
-				"param": [
-				]
-			},
-			"description": "",
-			"title": "工会_拒绝[GH_rejectAction]",
-			"value": "GH_rejectAction",
-			"btnDisable": "billEdit"
-		},
-		{
-			"discard": false,
-			"path": "资产/通用",
-			"extends": {
-				"param": [
-				]
-			},
-			"description": "",
-			"title": "工会_提交[GH_submitAction]",
-			"value": "GH_submitAction",
-			"btnDisable": "billEdit"
-		},
 	],
 	billFormula: [
 		{