Skip to content

R
rbc-demo
Commit 08777958 by 袁成
Options

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

parents 717d6e30 e956e310
Showing with 93 additions and 60 deletions
develop/@gms/gms-plugin-billexpand/package.json
{ {
"name": "@gms/gms-plugin-billexpand", "name": "@gms/gms-plugin-billexpand",
"version": "0.0.5-SNAPSHOT", "version": "0.0.6",
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
"build": "vue-cli-service build", "build": "vue-cli-service build",
......
develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/index.less
.rbc-basedata-popover { .rbc-basedata-popover {
padding: 0px; padding: 0px !important;
} }
\ No newline at end of file
develop/@gms/gms-plugin-billexpand/src/emcon.js
...@@ -731,7 +731,13 @@ export default { ...@@ -731,7 +731,13 @@ export default {
"type": "field", "type": "field",
"title": "单据id", "title": "单据id",
"key": "billId" "key": "billId"
} },
{
"isRequired": true,
"type": "string",
"title": "页签名称",
"key": "displayName"
},
] ]
}, },
"description": "指定跳转页面，配置单据id，通过在当前页签打开形式进行跳转", "description": "指定跳转页面，配置单据id，通过在当前页签打开形式进行跳转",
...@@ -764,6 +770,12 @@ export default { ...@@ -764,6 +770,12 @@ export default {
"title": "隐藏工具栏", "title": "隐藏工具栏",
"key": "hideButton" "key": "hideButton"
}, },
{
"isRequired": true,
"type": "string",
"title": "页签名称",
"key": "displayName"
},
] ]
}, },
"description": "指定跳转页面，配置单据id和单据类型，通过在当前页签打开形式进行跳转", "description": "指定跳转页面，配置单据id和单据类型，通过在当前页签打开形式进行跳转",
...@@ -896,7 +908,13 @@ export default { ...@@ -896,7 +908,13 @@ export default {
"type": "metaData", "type": "metaData",
"title": "跳转页面", "title": "跳转页面",
"key": "viewName" "key": "viewName"
} },
{
"isRequired": true,
"type": "string",
"title": "页签名称",
"key": "displayName"
},
], ],
"paramHandler": "function (val){if(val && Object.prototype.toString.call(val) === '[object Array]'){return{'viewName':val[0]}}}" "paramHandler": "function (val){if(val && Object.prototype.toString.call(val) === '[object Array]'){return{'viewName':val[0]}}}"
}, },
...@@ -942,7 +960,13 @@ export default { ...@@ -942,7 +960,13 @@ export default {
"type": "field", "type": "field",
"title": "单据id", "title": "单据id",
"key": "billId" "key": "billId"
} },
{
"isRequired": true,
"type": "string",
"title": "页签名称",
"key": "displayName"
},
] ]
}, },
"description": "指定跳转页面，配置单据id，通过打开新页签形式进行跳转", "description": "指定跳转页面，配置单据id，通过打开新页签形式进行跳转",
...@@ -980,7 +1004,13 @@ export default { ...@@ -980,7 +1004,13 @@ export default {
"type": "Boolean", "type": "Boolean",
"title": "可编辑", "title": "可编辑",
"key": "canEdit" "key": "canEdit"
} },
{
"isRequired": true,
"type": "string",
"title": "页签名称",
"key": "displayName"
},
] ]
}, },
"description": "配置单据id和需审批的taskId，通过打开新页签形式进行跳转，该审批页面是列表唯一指定", "description": "配置单据id和需审批的taskId，通过打开新页签形式进行跳转，该审批页面是列表唯一指定",
......
develop/@gms/gms-plugin-billexpand/src/formula/SetSubFieldNull.js
...@@ -14,8 +14,8 @@ export default { ...@@ -14,8 +14,8 @@ export default {
let tmpField = subField.FieldCode; let tmpField = subField.FieldCode;
let subTableObject = context.getTableType(subField.FieldTableCode) let subTableObject = context.getTableType(subField.FieldTableCode)
let oldIndex = context.getSubFocus() let oldIndex = context.getSubFocus()
let focusData = context.getAllSubData()[subTableObject.title][oldIndex].getData() let focusData = oldIndex && context.getAllSubData()[subTableObject.title][oldIndex].getData()
if (!_.isEqual(focusData[tmpField]._field_old_value_, focusData[tmpField].value) || !_.isEmpty(focusData[tmpField].value)) { if (focusData && (!_.isEqual(focusData[tmpField]._field_old_value_, focusData[tmpField].value) || !_.isEmpty(focusData[tmpField].value))) {
focusData[tmpField]._field_old_value_ = focusData[tmpField].value = null focusData[tmpField]._field_old_value_ = focusData[tmpField].value = null
context.refreshSubDataRow(subTableObject.title); context.refreshSubDataRow(subTableObject.title);
} }
......
develop/@gms/gms-plugin-billexpand/src/formula/SetSubFieldValue.js
...@@ -25,64 +25,66 @@ export default { ...@@ -25,64 +25,66 @@ export default {
} }
if (targetObject.type === "sub") { if (targetObject.type === "sub") {
let subTableFocusOldIndex = context.getSubFocus() 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() let oldIndex = context.getSubFocus()
switch (valueType) { if(subTableFocusData){
case FormulaConstants.billFiled.BMJJFL: { switch (valueType) {
let comp1 = arguments[0][2].getResult().Value; case FormulaConstants.billFiled.BMJJFL: {
let comp2 = arguments[0][3].getResult().Value; let comp1 = arguments[0][2].getResult().Value;
let comp3 = arguments[0][4].getResult().Value; let comp2 = arguments[0][3].getResult().Value;
let comp4 = arguments[0][5].getResult().Value; let comp3 = arguments[0][4].getResult().Value;
if ((!_.isEmpty(comp1) || _.isNumber(comp1)) && (!_.isEmpty(comp2) || _.isNumber(comp2)) && (!_.isEmpty(comp3) || (_.isNumber(comp3)) && (!_.isEmpty(comp4) || (_.isNumber(comp4))))) { let comp4 = arguments[0][5].getResult().Value;
if (!_.isEmpty(comp3) && !(_.isEqual(subTableFocusData[arguments[0][4].FieldCode.split(".")[0]]._field_old_value_, subTableFocusData[arguments[0][4].FieldCode.split(".")[0]].value))) { if ((!_.isEmpty(comp1) || _.isNumber(comp1)) && (!_.isEmpty(comp2) || _.isNumber(comp2)) && (!_.isEmpty(comp3) || (_.isNumber(comp3)) && (!_.isEmpty(comp4) || (_.isNumber(comp4))))) {
console.log("s2 SetSubField api") if (!_.isEmpty(comp3) && !(_.isEqual(subTableFocusData[arguments[0][4].FieldCode.split(".")[0]]._field_old_value_, subTableFocusData[arguments[0][4].FieldCode.split(".")[0]].value))) {
this.getMDObject({ console.log("s2 SetSubField api")
"limit": 1, this.getMDObject({
"offset": 0,
"pagination": true,
"tableName": comp2,
"code": comp3,
"queryDataStructure": "ALL"
}, data => {
let param = {
"limit": 1, "limit": 1,
"offset": 0, "offset": 0,
"pagination": true, "pagination": true,
"tableName": comp1, "tableName": comp2,
"code": data.rows[0][comp4].split("||")[0], "code": comp3,
"queryDataStructure": "ALL" "queryDataStructure": "ALL"
}; }, data => {
this.getMDObject(param, data => { let param = {
let newIndex = context.getSubFocus(); "limit": 1,
if (oldIndex !== newIndex) { "offset": 0,
context.setSubFocus(oldIndex) "pagination": true,
} "tableName": comp1,
console.log("s3 setValue") "code": data.rows[0][comp4].split("||")[0],
subTableFocusData[targetField.FieldCode]._field_old_value_ = subTableFocusData[targetField.FieldCode].value = data.rows[0] "queryDataStructure": "ALL"
if (oldIndex !== newIndex) { };
context.setSubFocus(newIndex) this.getMDObject(param, data => {
} let newIndex = context.getSubFocus();
context.refreshSubDataRow(targetObject.title) 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 => { }, resp => {
console.error("子表赋值：SetSubFieldValue执行失败 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; subTableFocusData[targetField.FieldCode]._field_old_value_ = subTableFocusData[targetField.FieldCode].value = null;
context.refreshSubDataRow(targetObject.title); 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 { } else {
......
develop/@gms/gms-plugin-billexpand/src/query-actions/createBill.js
...@@ -29,7 +29,7 @@ export default { ...@@ -29,7 +29,7 @@ export default {
}, },
{ {
openWay: "FUNCTAB", openWay: "FUNCTAB",
title: "创建单据", title: param.displayName || "创建单据",
} }
); );
}else{ }else{
......
develop/@gms/gms-plugin-billexpand/src/query-actions/editBill.js
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
}, },
{ {
openWay: "FUNCTAB", openWay: "FUNCTAB",
title: "编辑单据", title: param.displayName || "编辑单据",
} }
); );
} else { } else {
......
develop/@gms/gms-plugin-billexpand/src/query-actions/examineAction.js
...@@ -31,7 +31,7 @@ export default { ...@@ -31,7 +31,7 @@ export default {
}, },
{ {
openWay: "FUNCTAB", openWay: "FUNCTAB",
title: "单据审批", title: param.displayName || "单据审批",
} }
); );
} else { } else {
......
develop/@gms/gms-plugin-billexpand/src/query-actions/goToDetail.js
...@@ -29,7 +29,7 @@ export default { ...@@ -29,7 +29,7 @@ export default {
}, },
{ {
openWay: "FUNCTAB", openWay: "FUNCTAB",
title: "单据详情", title: param.displayName || "单据详情",
} }
); );
} else { } else {
......
develop/@gms/gms-plugin-billexpand/src/query-actions/seeDetailAction.js
...@@ -29,7 +29,7 @@ export default { ...@@ -29,7 +29,7 @@ export default {
}, },
{ {
openWay: "FUNCTAB", openWay: "FUNCTAB",
title: "单据详情", title: param.displayName || "单据详情",
} }
); );
} else { } else {
......
solution.json
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
}, },
{ {
"name": "gms-plugin-billexpand", "name": "gms-plugin-billexpand",
"version": "0.0.5-SNAPSHOT" "version": "0.0.6"
}, },
{ {
"name": "gms-plugin-mainpage-reimburseBill", "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