Merge branch 'develop' of http://nvwa.jiuqi.com.cn/gitlab/GFP/RBC/rbc-frontend into develop

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

@@ -187,7 +187,7 @@ export default {
         function (error) {
           bill.setControlsSate(param["_control_name_"], "enable", true)
           bill.setControlsSate(param["_control_name_"], "loading", false)
-          GMS.$hideContainer.$Message.error('error')
+          GMS.$hideContainer.$Message.error('工作流配置错误，请联系管理员')
         }.bind(this)
       );
   },

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

@@ -100,7 +100,7 @@ export default {
           function(error) {
               bill.setControlsSate(param["_control_name_"], "enable", true)
               bill.setControlsSate(param["_control_name_"],"loading",false)
-              GMS.$hideContainer.$Message.error(error)
+              GMS.$hideContainer.$Message.error('工作流配置错误，请联系管理员')
           }.bind(this)
       );
   },

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

@@ -98,6 +98,10 @@ export default {
           GMS.$hideContainer.$Spin.hide();
           GMS.$hideContainer.$Message.error("暂存单据异常请联系管理员");
         }
+      }).catch((err) => {
+        GMS.$hideContainer.$Message.error('工作流配置错误，请联系管理员');
+        bill.setControlsSate(param["_control_name_"], "enable", true)
+        bill.setControlsSate(param["_control_name_"],"loading",false)
       })
     } else {
       GMS.$hideContainer.$Spin.hide();

develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/index.vue

@@ -293,7 +293,9 @@ export default {
         this.baseDataList = rows
       }
       this.originBaseDataList = JSON.parse(JSON.stringify(this.baseDataList))
-      this.dataListShow = true
+      if (!this.showModal) {
+        this.dataListShow = true
+      }
     },
     // 点击下拉菜单的条目
     handleMainSearchSelectClick(item) {