Merge branch 'develop-yuancheng' into 'develop'

change-form-state

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

develop/@gms/gms-plugin-billexpand/src/actions/saveAction.js

@@ -114,8 +114,12 @@ export default {
             GMS.queryObject.index=0;
           }
           GMS.vbus.$Message.success("保存成功");
+          if (param.param && param.param.isApprove) {
+            GMS.vbus.$emit('change-form-state', { state: ''})
+          } else {
             GMS.vbus.$emit('change-form-state', { state: 'readOnly', billId: id})
-          GMS.vbus.$emit("saveSuccess", buidData, param);
+          }
+          // GMS.vbus.$emit("saveSuccess", buidData, param);
         } else {
           response.data.message && GMS.vbus.$Message.error({
             content: errorMessageUtil.saveAction.getErrorMessage(response.data.message),

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

@@ -138,9 +138,9 @@ export default {
       let disableState = val.split(';')
       // 配置工作流已提交未审批90, billReadOnly状态下可用
       // 主要用于保存在审批状态下可用，审批还能修改··
-      if (btnItem && btnItem.isApprove) {
+      if (this.define.btnGroupAction && this.define.btnGroupAction[btnItem] && this.define.btnGroupAction[btnItem].isApprove) {
         disableState = disableState.filter(item => {
-          if (item === '90' || item === 'billReadOnly') {
+          if (item === '90') {
             return false
           } else {
             return true