Skip to content

R
rbc-demo
Commit 4174cf42 by Joey
Options

Merge branch 'develop' into develop-zhouyi

parents 4e025f02 0f44c1a1
Showing with 52 additions and 50 deletions
develop/@gms/gms-plugin-billexpand/package.json
{
"name": "@gms/gms-plugin-billexpand",
"version": "0.0.5-SNAPSHOT",
"version": "0.0.6",
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
......
develop/@gms/gms-plugin-billexpand/src/formula/SetSubFieldNull.js
......@@ -14,8 +14,8 @@ export default {
let tmpField = subField.FieldCode;
let subTableObject = context.getTableType(subField.FieldTableCode)
let oldIndex = context.getSubFocus()
let focusData = context.getAllSubData()[subTableObject.title][oldIndex].getData()
if (!_.isEqual(focusData[tmpField]._field_old_value_, focusData[tmpField].value) || !_.isEmpty(focusData[tmpField].value)) {
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);
}
......
develop/@gms/gms-plugin-billexpand/src/formula/SetSubFieldValue.js
......@@ -25,64 +25,66 @@ export default {
}
if (targetObject.type === "sub") {
let subTableFocusOldIndex = context.getSubFocus()
let subTableFocusData = context.getAllSubData()[targetObject.title][subTableFocusOldIndex].getData()
let subTableFocusData = subTableFocusOldIndex && context.getAllSubData()[targetObject.title][subTableFocusOldIndex].getData()
let oldIndex = context.getSubFocus()
switch (valueType) {
case FormulaConstants.billFiled.BMJJFL: {
let comp1 = arguments[0][2].getResult().Value;
let comp2 = arguments[0][3].getResult().Value;
let comp3 = arguments[0][4].getResult().Value;
let comp4 = arguments[0][5].getResult().Value;
if ((!_.isEmpty(comp1) || _.isNumber(comp1)) && (!_.isEmpty(comp2) || _.isNumber(comp2)) && (!_.isEmpty(comp3) || (_.isNumber(comp3)) && (!_.isEmpty(comp4) || (_.isNumber(comp4))))) {
if (!_.isEmpty(comp3) && !(_.isEqual(subTableFocusData[arguments[0][4].FieldCode.split(".")[0]]._field_old_value_, subTableFocusData[arguments[0][4].FieldCode.split(".")[0]].value))) {
console.log("s2 SetSubField api")
this.getMDObject({
"limit": 1,
"offset": 0,
"pagination": true,
"tableName": comp2,
"code": comp3,
"queryDataStructure": "ALL"
}, data => {
let param = {
if(subTableFocusData){
switch (valueType) {
case FormulaConstants.billFiled.BMJJFL: {
let comp1 = arguments[0][2].getResult().Value;
let comp2 = arguments[0][3].getResult().Value;
let comp3 = arguments[0][4].getResult().Value;
let comp4 = arguments[0][5].getResult().Value;
if ((!_.isEmpty(comp1) || _.isNumber(comp1)) && (!_.isEmpty(comp2) || _.isNumber(comp2)) && (!_.isEmpty(comp3) || (_.isNumber(comp3)) && (!_.isEmpty(comp4) || (_.isNumber(comp4))))) {
if (!_.isEmpty(comp3) && !(_.isEqual(subTableFocusData[arguments[0][4].FieldCode.split(".")[0]]._field_old_value_, subTableFocusData[arguments[0][4].FieldCode.split(".")[0]].value))) {
console.log("s2 SetSubField api")
this.getMDObject({
"limit": 1,
"offset": 0,
"pagination": true,
"tableName": comp1,
"code": data.rows[0][comp4].split("||")[0],
"tableName": comp2,
"code": comp3,
"queryDataStructure": "ALL"
};
this.getMDObject(param, data => {
let newIndex = context.getSubFocus();
if (oldIndex !== newIndex) {
context.setSubFocus(oldIndex)
}
console.log("s3 setValue")
subTableFocusData[targetField.FieldCode]._field_old_value_ = subTableFocusData[targetField.FieldCode].value = data.rows[0]
if (oldIndex !== newIndex) {
context.setSubFocus(newIndex)
}
context.refreshSubDataRow(targetObject.title)
}, data => {
let param = {
"limit": 1,
"offset": 0,
"pagination": true,
"tableName": comp1,
"code": data.rows[0][comp4].split("||")[0],
"queryDataStructure": "ALL"
};
this.getMDObject(param, data => {
let newIndex = context.getSubFocus();
if (oldIndex !== newIndex) {
context.setSubFocus(oldIndex)
}
console.log("s3 setValue")
subTableFocusData[targetField.FieldCode]._field_old_value_ = subTableFocusData[targetField.FieldCode].value = data.rows[0]
if (oldIndex !== newIndex) {
context.setSubFocus(newIndex)
}
context.refreshSubDataRow(targetObject.title)
}, resp => {
console.error("子表赋值：SetSubFieldValue执行失败 resp:" + resp)
});
}, resp => {
console.error("子表赋值：SetSubFieldValue执行失败 resp:" + resp)
});
}, resp => {
console.error("子表赋值：SetSubFieldValue执行失败 resp:" + resp)
});
}
} else {
subTableFocusData[targetField.FieldCode]._field_old_value_ = subTableFocusData[targetField.FieldCode].value = null;
context.refreshSubDataRow(targetObject.title);
}
} else {
break
}
case FormulaConstants.billFiled.NULL: {
subTableFocusData[targetField.FieldCode]._field_old_value_ = subTableFocusData[targetField.FieldCode].value = null;
context.refreshSubDataRow(targetObject.title);
break
}
default : {
console.log("")
}
break
}
case FormulaConstants.billFiled.NULL: {
subTableFocusData[targetField.FieldCode]._field_old_value_ = subTableFocusData[targetField.FieldCode].value = null;
context.refreshSubDataRow(targetObject.title);
break
}
default : {
console.log("")
}
}
} else {
......
solution.json
......@@ -101,7 +101,7 @@
},
{
"name": "gms-plugin-billexpand",
"version": "0.0.5-SNAPSHOT"
"version": "0.0.6"
},
{
"name": "gms-plugin-mainpage-reimburseBill",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment