Merge branch 'develop-yuancheng' into 'develop'

Develop yuancheng

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

develop/@gms/gms-plugin-billexpand/src/control/buttonGrouop.vue

@@ -121,13 +121,13 @@ export default {
                 ACTIONS[item].title.indexOf('[')
               )
         btnConfg.billStateDisable = this.getBillStateDisable(
-          ACTIONS[item].btnDisable
+          ACTIONS[item].btnDisable, item
         )
         btnConfg.buttonDefine.name = this.define.config.action + item
         return btnConfg
       })
     },
-    getBillStateDisable(val) {
+    getBillStateDisable(val, btnItem) {
       if (!val) return false
       let approveState = null
       if (this.workflowState === 0) {
@@ -136,6 +136,10 @@ export default {
         approveState = this.workflowState
       }
       let disableState = val.split(';')
+      // 配置工作流已提交未审批90状态下可用
+      if (btnItem && btnItem.isApprove) {
+        disableState = disableState.filter(item => item !== '90')
+      }
       const getBillState = () => {
         if (this.tmpBill.state === '') {
           return disableState.includes('billEdit')

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

@@ -1451,25 +1451,6 @@ export default {
 			"title": "缓存单据数据[cacheSaveAction]",
 			"value": "cacheSaveAction",
 		},
-		// {
-		// 	"discard": false,
-		// 	"path": "单据/保存报销单",
-		// 	"extends": {
-		// 		"param": [{
-		// 			"clearable": true,
-		// 			"ref": "gams2.bill",
-		// 			"type": "select",
-		// 			"title": "执行动作",
-		// 			"key": "actions",
-		// 			"innerRef": "actions"
-		// 		}
-		// 		]
-		// 	},
-		// 	"description": "",
-		// 	"title": "保存(报销单)[saveActionBXD]",
-		// 	"value": "saveActionBXD",
-		// 	"btnDisable": "billReadOnly;90;91;92"
-		// }, 
 		{
 			"discard": false,
 			"path": "资产/通用",
@@ -1604,13 +1585,17 @@ export default {
 			"path": "资产/通用",
 			"extends": {
 				"param": [
-
+					{
+						"type": "Boolean",
+						"title": "审批可用",
+						"key": "isApprove"
+					}
 				]
 			},
 			"description": "",
 			"title": "财务_保存[CW_saveAction]",
 			"value": "CW_saveAction",
-			"btnDisable": "billReadOnly;92"
+			"btnDisable": "billReadOnly;90;92"
 		},
 		{
 			"discard": false,