Merge branch 'develop-yuancheng' into 'develop'

Develop yuancheng

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

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

@@ -157,14 +157,16 @@ export default {
         }
       }
       switch (approveState) {
-        case 90:
-          return disableState.includes('90')
-        case 91:
+        case 90: // 待审批
+          return disableState.includes('90')                   
+        case 91: // 被驳回
           return disableState.includes('91') || getBillState()
-        case 92:
-          return disableState.includes('92')
-        case 1:
-          return disableState.includes('1') || getBillState()
+        case 92: // 审批完成
+          return disableState.includes('92')                  
+        case 1:  // 已暂存
+          return disableState.includes('1') || getBillState() 
+        case 2:  // 已保存
+          return disableState.includes('2') || getBillState()  
         default:
           return getBillState()
       }

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

@@ -1585,7 +1585,7 @@ export default {
 			"description": "",
 			"title": "财务_暂存[CW_tempSave]",
 			"value": "CW_tempSave",
-			"btnDisable": "billReadOnly;90;91;92"
+			"btnDisable": "billReadOnly;90;92"
 		},
 		{
 			"discard": false,