Merge branch 'develop-zhouyi' into 'develop'

Develop zhouyi

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

develop/@gms/gms-plugin-billexpand/src/components-control/add-info-modal.vue

@@ -91,7 +91,7 @@ export default {
     return {
       isReadOnly: false,
       showDetail: false,
-      state: null,
+      state: '',
       billId: "",
       modal_visible: false,
       showBiffForm: false,
@@ -231,7 +231,13 @@ export default {
       }, 100);
     },
     setFieldFromMaster(bill){
-      if(!this.actionParam.param.masterFields) return
+      if(
+        !this.actionParam
+        || !this.actionParam.param
+        || !this.actionParam.param.masterFields
+      ) {
+        return
+      }
       let obj = this.actionParam.param.masterFields.find(
         (v) => v.billName == this.selectBill
       );