Merge branch 'develop' of ssh://nvwa.jiuqi.com.cn:2222/GFP/RBC/rbc-frontend into develop-yuancheng

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

+import addInfoModal from '../components-control/add-info-modal.vue';
+export default {
+	execute: function (bill, param) {
+		if (param) {
+      let component = null;
+      let name = GMS.$hideContainer.addComponent(addInfoModal, {}, function (c) {
+        GMS.showDetailAction = true;//详情，点击确定按钮。记录此参数
+        component = c;
+        c.bill = bill;
+        c.isReadOnly = true
+        let tableName = null;
+        if(param.param && param.param.tableName){
+          tableName = param.param.tableName
+        }
+        let obj = c.getCurrentRowData(tableName);
+        if(!obj['BILLNAME']&&tableName=='SRMXZB'){
+          GAMS.Common.messagePrompt('此条数据没有详情信息');
+          return
+        }
+        if(!obj['BILLNAME']){
+          GAMS.Common.messagePrompt('无详情参数');
+          return
+        }
+        c.showDetail = true; 
+        c.selectBill = obj['BILLEDITNAME'];
+        c.billId = obj['BILLID'];
+        c.subBillData = obj.BILLDETAILOBJ;
+        c.modal_visible = true;
+        console.log('param',param,obj);
+      });
+		} else {
+			GAMS.Common.messagePrompt('无详情参数');
+		}
+	}
+}
\ No newline at end of file

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

@@ -1349,6 +1349,17 @@ export default {
 				"param": []
 			},
 			"description": "",
+			"title": "审批查看详情[showDetailSPAction]",
+			"value": "showDetailSPAction",
+			"alwaysUse":true
+		},
+		{
+			"discard": false,
+			"path": "资产/通用",
+			"extends": {
+				"param": []
+			},
+			"description": "",
 			"title": "编辑[editAction]",
 			"value": "editAction"
 		}, {

develop/@gms/gms-plugin-billexpand/src/formula/SetSubFieldNull.js

@@ -14,10 +14,14 @@ export default {
             let tmpField = subField.FieldCode;
             let subTableObject = context.getTableType(subField.FieldTableCode)
             let oldIndex = context.getSubFocus()
-            let focusData = oldIndex && context.getAllSubData()[subTableObject.title][oldIndex].getData()
-            if (focusData && (!_.isEqual(focusData[tmpField]._field_old_value_, focusData[tmpField].value) || !_.isEmpty(focusData[tmpField].value))) {
-                focusData[tmpField]._field_old_value_ = focusData[tmpField].value = null
-                context.refreshSubDataRow(subTableObject.title);
+            try {
+                let focusData = context.getAllSubData()[subTableObject.title][oldIndex].getData()
+                if (!_.isEqual(focusData[tmpField]._field_old_value_, focusData[tmpField].value) || !_.isEmpty(focusData[tmpField].value)) {
+                    focusData[tmpField]._field_old_value_ = focusData[tmpField].value = null
+                    context.refreshSubDataRow(subTableObject.title);
+                }
+            } catch (error) {
+                console.log(error)
             }
         }
     },

develop/@gms/gms-plugin-billexpand/src/formula/SetSubFieldValue.js

@@ -27,7 +27,7 @@ export default {
                 let subTableFocusOldIndex = context.getSubFocus()
                 let subTableFocusData = subTableFocusOldIndex && context.getAllSubData()[targetObject.title][subTableFocusOldIndex].getData()
                 let oldIndex = context.getSubFocus()
-                if(subTableFocusData){
+                try {
                     switch (valueType) {
                         case  FormulaConstants.billFiled.BMJJFL: {
                             let comp1 = arguments[0][2].getResult().Value;
@@ -85,7 +85,9 @@ export default {
                         default : {
                             console.log("")
                         }
-                    }
+                    } 
+                } catch (error) {
+                    console.log(error)
                 }
             } else {
                 console.error("SetSubFieldValue公式配置错误,暂不支持主表字段赋值")

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

@@ -6,6 +6,7 @@ import copyAction from './actions/copyAction';
 import printAction from './actions/printAction'
 import printMultiAction from './actions/printMultiAction'
 import showDetailAction from './actions/showDetailAction'
+import showDetailSPAction from './actions/showDetailSPAction';
 import editAction from './actions/editAction';
 import updatebillStateAction from './actions/updatebillStateAction';
 import updateStateLincaoAction from './actions/updateStateLincaoAction';
@@ -221,6 +222,7 @@ export default {
         copyAction,
         printAction,
         showDetailAction,
+        showDetailSPAction,
         editAction,
         updatebillStateAction,
         updateStateLincaoAction,