Merge branch 'develop-zhouyi' into 'develop'

fix(@gms/gms-plugin-billexpand): 选择单据不触发公式

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

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

@@ -6,6 +6,7 @@ export default {
 			let name = GMS.$hideContainer.addComponent(addInfoModal, {}, function (c) {
 				component = c;
 				c.masterFieldsObj={};
+
 				if(param.param && param.param.masterFields){
 					param.param.masterFields.forEach(v=>{
 						v.fieldBillRelation.forEach(item=>{
@@ -15,9 +16,12 @@ export default {
 						})
 					})
 				}
+
 				c.bill = bill;
 				c.actionParam = param;
 				c.actionParam.param.viewArr.map(v=>v.title=v.title.split('[')[0])
+				// 不知道这玩意哪来的，先用这个替代吧
+				c.actionParam.param.masterSubRelation = bill.getTableType('sub_table')
 				c.getAssetsModal();
 				c.currentRowData = {};
 				c.selectBill='';