Skip to content

R
rbc-demo
Commit 5007b8b4 by 袁成
Options

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

parents 2a76815f 1bfe9f4c
Showing with 318 additions and 219 deletions
develop/@gms/gms-plugin-billexpand/src/actions/agreeAction.js
import { getUUID } from "../query-actions/util/lib"; import { getUUID } from "../query-actions/util/lib";
import Bridge from '../components-control/util/bridge'
import SelectApprovers from '../components-control/select-approvers.vue' import SelectApprovers from '../components-control/select-approvers.vue'
export default { export default {
execute: function (bill, param) { execute: function (bill, param) {
...@@ -91,27 +92,12 @@ export default { ...@@ -91,27 +92,12 @@ export default {
window.osConfig.appOpenMode && window.osConfig.appOpenMode &&
window.osConfig.appOpenMode == "apploader" window.osConfig.appOpenMode == "apploader"
) { ) {
GMS.$hideContainer.$portalAPI.emit('nros-tag-close') GMS.$hideContainer.$portalAPI.emit('entry-tag-close')
GMS.$hideContainer.$portalAPI.emit(
"open-new-page", //打开一个新的页签
getUUID(),
"runner-bill-form",
{
templateName: param.param.viewName,
id: billId,
state:'readOnly'
},
{
openWay: "FUNCTAB",
title: "单据详情",
}
);
} }
else { else if (Bridge.vm) {
GMS.$hideContainer.$router.push({ Bridge.vm.modal_visible = false
path: "/showInnerBillForm/" + param.param.viewName + "/" + billId
})
} }
window.GMS.vbus.$emit('refresh-workflow-job-view')
} }
}.bind(this) }.bind(this)
) )
......
develop/@gms/gms-plugin-billexpand/src/actions/cacheSaveAction.js
...@@ -11,14 +11,10 @@ export default { ...@@ -11,14 +11,10 @@ export default {
if (param) { if (param) {
bill.setControlsSate(param["_control_name_"], 'enable',false); bill.setControlsSate(param["_control_name_"], 'enable',false);
bill.runFormulaCheckData(param.param, function (msg) { bill.runFormulaCheckData(param.param, function (msg) {
if (msg.length == 0) { if (msg.length == 0) {//缓存数据
if (param.param && param.param.hasOwnProperty('cacheData') && !param.param.cacheData) { let obj = bill.getBuillData();
this.saveData(bill, param); obj.billDefine = param.define;
} else { this.execuFormula(obj, param);//点击确定，执行公式
let obj = bill.getBuillData();
obj.billDefine = param.define;
this.execuFormula(obj, param);//点击确定，执行公式
}
} else { } else {
GMS.$http.post(`/baseData/data/list`, { GMS.$http.post(`/baseData/data/list`, {
pagination: false, pagination: false,
...@@ -39,94 +35,6 @@ export default { ...@@ -39,94 +35,6 @@ export default {
GAMS.Common.messagePrompt('缺少参数'); GAMS.Common.messagePrompt('缺少参数');
} }
}, },
saveData(bill, param) {
let that = this;
let buidData = bill.getBuillData();
console.log('buidData:', buidData);
let controlArr = bill.action.filter(
(v) => v.execute == "searchBillAction"
);
let detailData = [];
let arrApi1 = [];
if (controlArr[0].param.field && controlArr[0].param.field.length > 0) {
let tableList = controlArr[0].param.field.map(v => v.targetTableName);
tableList = Array.from(new Set(tableList));
tableList.forEach(v => {
if (buidData.hasOwnProperty(v)) {
for (let i = 0; i < bill.getSubData(v).length; i++) {
let rowDataObject = bill.getSubDataRow(v, i);
let obj = rowDataObject.getValue("currentRowData");
if (obj && obj.BILLDETAILOBJ) {
let billId = obj.BILLID;
let billName = obj.BILLNAME;
let billDefine = billName.replace(/_E/ig, "").replace(/_R/ig, "").replace(/_A/ig, "");
arrApi1.push(that.searchBillObj(billDefine, billId, obj.BILLDETAILOBJ));
} else {
let billId = rowDataObject.getData().BILLID.value;
let billName = rowDataObject.getData().BILLNAME.value;
let billDefine = billName.replace(/_E/ig, "").replace(/_R/ig, "").replace(/_A/ig, "");
arrApi1.push(that.searchBillObj(billDefine, billId));
}
}
}
})
}
if (arrApi1.length > 0) {
Promise.all(arrApi1).then((list) => {
detailData = list;
that.saveAsync(buidData, detailData, param, bill);
})
} else {
that.saveAsync(buidData, detailData, param, bill);
}
},
saveAsync(buidData, detailData, param, bill) {
let postData = {
data: buidData,
detailData: detailData
}
let url = `/rbc/bill/action/saveExpenceAccount/${param.define}`;
GMS.$http.post(url, JSON.stringify(postData), {
headers: {
post: {
"Content-Type": "application/json",
}
}
}).then(
function (response) {
bill.setControlsSate(param["_control_name_"], 'enable',true);
if (response.data.code == 0) {
//存储返回回来的创建时间、修改时间
bill.getMasterData().setValue('createTime', response.data.content.billData.createTime);
bill.getMasterData().setValue('modifyTime', response.data.content.billData.modifyTime);
bill.getMasterData().setValue('recver', response.data.content.billData.recver);
bill.getMasterData().setValue('billCode', response.data.content.billData.billCode);
GMS.vbus.$emit('saveSuccess',buidData,param);
}else{
response.data.msg && GMS.vbus.$Message.error(response.data.msg);
}
}
).catch()
},
searchBillObj(billDefine, billId, BILLDETAILOBJ) {
return new Promise((resolve, reject) => {
GMS.$http.get(
`/gms/bill/${billDefine}/${billId}?withSubs=true`
).then((data) => {
let obj = BILLDETAILOBJ;
if (data.status == 200 && data.data.code == 0) {
if(!BILLDETAILOBJ){
obj = data.data.content
}
obj.recver = data.data.content&&data.data.content.recver;
}
obj.billDefine = billDefine;
resolve(obj);
}).catch((error) => {
reject(error)
})
})
},
execuFormula(buidData, param) { execuFormula(buidData, param) {
let postData = { let postData = {
data: buidData data: buidData
......
develop/@gms/gms-plugin-billexpand/src/actions/rejectAction.js
import { getUUID } from "../query-actions/util/lib"; import { getUUID } from "../query-actions/util/lib";
import Bridge from '../components-control/util/bridge'
export default { export default {
execute: function (bill, param) { execute: function (bill, param) {
if(bill){ if(bill){
...@@ -42,27 +43,12 @@ export default { ...@@ -42,27 +43,12 @@ export default {
window.osConfig.appOpenMode && window.osConfig.appOpenMode &&
window.osConfig.appOpenMode == "apploader" window.osConfig.appOpenMode == "apploader"
) { ) {
GMS.$hideContainer.$portalAPI.emit('nros-tag-close') GMS.$hideContainer.$portalAPI.emit('entry-tag-close')
GMS.$hideContainer.$portalAPI.emit(
"open-new-page", //打开一个新的页签
getUUID(),
"runner-bill-form",
{
templateName: param.param.viewName,
id: billId,
state:'readOnly'
},
{
openWay: "FUNCTAB",
title: "单据详情",
}
);
} }
else { else if (Bridge.vm) {
GMS.$hideContainer.$router.push({ Bridge.vm.modal_visible = false
path: "/showInnerBillForm/" + param.param.viewName + "/" + billId
})
} }
window.GMS.vbus.$emit('refresh-workflow-job-view')
} }
}.bind(this) }.bind(this)
) )
......
develop/@gms/gms-plugin-billexpand/src/actions/saveAction.js
import { getUUID } from "../query-actions/util/lib"; import errorMessageUtil from "./util/errorMessageUtil";
export default { export default {
execute: function (bill, param) { execute: function (bill, param) {
if (bill) { if (bill) {
const masterData = bill.getMasterData() bill.runFormulaCheckData(param, (msg) => {
// 驳回状态
// 此时保存创建一张新单据
if (masterData.getValue('billState') == 91) {
;[
'billCode',
'billState',
'flowFinishTime',
'flowProcessId',
'flowState',
'flowSubmitTime',
'orgCode',
'createTime',
'modifyTime',
].forEach((key) => {
if (masterData.getValue(key))
masterData.setValue(key, '')
bill.billdata.masterFiled[key] = ''
})
masterData.setValue('orgId', '00000000-0000-0000-000000000000')
masterData.setValue('recver', 0)
masterData.setValue('id', getUUID())
}
bill.runFormulaCheckData(param, function (msg) {
if (msg.length == 0) { if (msg.length == 0) {
let postData = { bill.setControlsSate(param["_control_name_"], "enable", false);
actions: "bill.Basic.save" this.saveData(bill, param);
} else {
GMS.vbus.$Modal.warning({
title: "信息错误",
content: msg,
});
}
});
}
},
saveData(bill, param) {
let that = this;
let buidData = bill.getBuillData();
console.log("buidData:", buidData);
let controlArr = bill.action.filter((v) => v.execute == "searchBillAction");
let detailData = [];
let arrApi1 = [];
if (
controlArr.length > 0 &&
controlArr[0].param.field &&
controlArr[0].param.field.length > 0
) {
let tableList = controlArr[0].param.field.map((v) => v.targetTableName);
tableList = Array.from(new Set(tableList));
tableList.forEach((v) => {
if (buidData.hasOwnProperty(v)) {
for (let i = 0; i < bill.getSubData(v).length; i++) {
let rowDataObject = bill.getSubDataRow(v, i);
let obj = rowDataObject.getValue("currentRowData");
if (obj && obj.BILLDETAILOBJ) {
let billId = obj.BILLID;
let billName = obj.BILLNAME;
let billDefine = billName
.replace(/_E/gi, "")
.replace(/_R/gi, "")
.replace(/_A/gi, "");
arrApi1.push(
that.searchBillObj(billDefine, billId, obj.BILLDETAILOBJ)
);
} else {
let billId = rowDataObject.getData().BILLID.value;
let billName = rowDataObject.getData().BILLNAME.value;
let billDefine = billName
.replace(/_E/gi, "")
.replace(/_R/gi, "")
.replace(/_A/gi, "");
arrApi1.push(that.searchBillObj(billDefine, billId));
}
} }
bill.setControlsSate(param["_control_name_"], 'enable', false) }
});
bill.executeServerAction(postData, function (code, data) { }
bill.setControlsSate(param["_control_name_"], 'enable', true) if (arrApi1.length > 0) {
console.log('code',code) Promise.all(arrApi1).then((list) => {
console.log('data',data) detailData = list;
if (code === 200) { that.saveAsync(buidData, detailData, param, bill);
const id = data.content.billData.id });
GMS.vbus.$emit('change-form-state', { state: 'readOnly', billId: id }) } else {
GMS.vbus.$Message.success("保存成功"); that.saveAsync(buidData, detailData, param, bill);
} else if (code === 201) { }
GMS.vbus.$Message.error(data.message); },
} else if (code === 202) { searchBillObj(billDefine, billId, BILLDETAILOBJ) {
if (data.responseJSON.message && data.responseJSON.message.startsWith("FLOW-")) { return new Promise((resolve, reject) => {
GMS.vbus.$Message.error({ GMS.$http.get(`/gms/bill/${billDefine}/${billId}?withSubs=true`)
content: data.responseJSON.message, .then((data) => {
duration: 3 let obj = BILLDETAILOBJ;
}); if (data.status == 200 && data.data.code == 0) {
} else { if (!BILLDETAILOBJ) {
GMS.vbus.$Message.error("保存单据异常请联系管理员"); obj = data.data.content;
}
} }
}) obj.recver = data.data.content && data.data.content.recver;
}
obj.billDefine = billDefine;
resolve(obj);
})
.catch((error) => {
reject(error);
});
});
},
saveAsync(buidData, detailData, param, bill) {
let postData = {
data: buidData,
detailData: detailData,
};
//executed/bill.CCSPD/bill.Basic.save?transmission=total
let url = `/rbc/bill/action/rbcbillsave/${param.define}/bill.Basic.save?transmission=total`;
GMS.$http
.post(url, JSON.stringify(postData), {
headers: {
post: {
"Content-Type": "application/json",
},
},
})
.then(function (response) {
bill.setControlsSate(param["_control_name_"], "enable", true);
if (response.data.code == 0) {
//存储返回回来的创建时间、修改时间
bill.getMasterData().setValue("createTime", response.data.content.billData.createTime);
bill.getMasterData().setValue("modifyTime", response.data.content.billData.modifyTime);
bill.getMasterData().setValue("recver", response.data.content.billData.recver);
bill.getMasterData().setValue("billCode", response.data.content.billData.billCode);
const id = response.data.content.billData.id;
GMS.vbus.$Message.success("保存成功");
GMS.vbus.$emit('change-form-state', { state: 'readOnly', billId: id})
GMS.vbus.$emit("saveSuccess", buidData, param);
} else { } else {
GMS.vbus.$Modal.warning({ response.data.message && GMS.vbus.$Message.error({
title: '信息错误', content: errorMessageUtil.saveAction.getErrorMessage(response.data.message),
content: msg duration: 3
}); });
} }
}) })
} .catch((error) => {});
} },
} }
\ No newline at end of file
develop/@gms/gms-plugin-billexpand/src/actions/util/errorMessageUtil.js 0 → 100644
import _ from 'lodash'
/**
* 按钮报错信息处理
*
* @author fengjiansheng
* @date 2022-02-09
*/
export default {
saveAction: {
commonMessage: "保存失败，请联系系统管理员。",
customMessageList: [
{
preMessage: "More than one row with the given identifier was found",
convertMessage: "保存失败，基础数据存在多条相同记录，基础数据标识："
}
],
getErrorBaseDataName(a) {
if (!a || !_.isString(a)) {
return "";
}
let reg = /(?<=datamodel\.).*?(?=;)/;
let targetString = a.match(reg);
return targetString ? targetString[0] : "";
},
getErrorMessage(a) {
if (!a || !_.isString(a)) {
return this.commonMessage;
}
let errorPreMessage = "";
for (let i = 0; i < this.customMessageList.length; i++) {
if (a.indexOf(this.customMessageList[i].preMessage) > -1) {
errorPreMessage = this.customMessageList[i].convertMessage;
break;
}
}
return errorPreMessage === "" ? this.commonMessage : errorPreMessage + this.getErrorBaseDataName(a);
}
}
}
\ No newline at end of file
develop/@gms/gms-plugin-billexpand/src/components-control/typesBill.vue
...@@ -142,6 +142,13 @@ export default { ...@@ -142,6 +142,13 @@ export default {
this.init = true; this.init = true;
}); });
}); });
GMS.vbus.$on("workflow-state-change", (val) => {
console.log('refresh', val)
this.init = false;
this.$nextTick(() => {
this.init = true;
})
})
GMS.vbus.$on("submitSuccess", (res, param) => { GMS.vbus.$on("submitSuccess", (res, param) => {
GMS.vbus.$emit("custom-query-refresh"); GMS.vbus.$emit("custom-query-refresh");
GMS.vbus.$emit("tab-count-refresh"); GMS.vbus.$emit("tab-count-refresh");
...@@ -157,7 +164,6 @@ export default { ...@@ -157,7 +164,6 @@ export default {
}); });
GMS.vbus.$on("saveSuccess", (res, param) => { GMS.vbus.$on("saveSuccess", (res, param) => {
//自己扩展的保存 //自己扩展的保存
GMS.vbus.$Message.success("保存成功");
this.initBill(res, param, true); this.initBill(res, param, true);
}); });
GMS.vbus.$on("resetBillData", this.changeData); GMS.vbus.$on("resetBillData", this.changeData);
...@@ -169,6 +175,7 @@ export default { ...@@ -169,6 +175,7 @@ export default {
GMS.vbus.$off("saveSuccess"); GMS.vbus.$off("saveSuccess");
GMS.vbus.$off("submitSuccess"); GMS.vbus.$off("submitSuccess");
GMS.vbus.$off("change-form-state"); GMS.vbus.$off("change-form-state");
GMS.vbus.$off("workflow-state-change")
}, },
}; };
</script> </script>
......
develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/index.vue
...@@ -219,7 +219,7 @@ export default { ...@@ -219,7 +219,7 @@ export default {
const treeRes = await this.getBaseData(treePostData, '/baseData/data/tree') const treeRes = await this.getBaseData(treePostData, '/baseData/data/tree')
getTreeDataMap(treeRes.data.rows) getTreeDataMap(treeRes.data.rows)
treeData = treeRes.data.rows[0] treeData = treeRes.data.rows[0]
groupname = treeRes.data.rows[0].attributes.objectcode groupname = treeRes.data.rows[0] && treeRes.data.rows[0].attributes.objectcode
} }
// 基础数据类型为分组列表时 // 基础数据类型为分组列表时
if (this.structtype === 1) { if (this.structtype === 1) {
...@@ -230,7 +230,7 @@ export default { ...@@ -230,7 +230,7 @@ export default {
if (item && item.attributes && item.attributes.objectcode) { if (item && item.attributes && item.attributes.objectcode) {
objectCodes.push(item.attributes.objectcode) objectCodes.push(item.attributes.objectcode)
} }
if (item.children && item.children.length > 0) { if (item && item.children && item.children.length > 0) {
getGroupNames(item.children) getGroupNames(item.children)
} }
}) })
......
develop/@gms/gms-plugin-billexpand/src/control/buttonGrouop.vue
...@@ -55,15 +55,16 @@ export default { ...@@ -55,15 +55,16 @@ export default {
} }
} }
// 监听工作流状态改变 // 监听工作流状态改变
GMS.vbus.$on("workflow-state-change", (val) => { GMS.vbus.$on("workflow-state-change", this.handleWorkflowStateChange)
this.workflowState = val
this.getBtnGroup()
})
}, },
beforeDestroy() { beforeDestroy() {
GMS.vbus.$off("workflow-state-change"); GMS.vbus.$off("workflow-state-change", this.handleWorkflowStateChange);
}, },
methods: { methods: {
handleWorkflowStateChange(val) {
this.workflowState = val
this.getBtnGroup()
},
checkParent() { checkParent() {
let curNode = this.$refs.btnGroup let curNode = this.$refs.btnGroup
while (curNode) { while (curNode) {
...@@ -130,7 +131,7 @@ export default { ...@@ -130,7 +131,7 @@ export default {
case 90: case 90:
return disableState.includes('90') return disableState.includes('90')
case 91: case 91:
return disableState.includes('91') return disableState.includes('91') || getBillState()
case 92: case 92:
return disableState.includes('92') return disableState.includes('92')
case 1: case 1:
......
develop/@gms/gms-plugin-billexpand/src/control/workflow-track.vue
...@@ -165,7 +165,18 @@ export default { ...@@ -165,7 +165,18 @@ export default {
bizObjId: this.context.bill.getMasterData().getValue('id'), bizObjId: this.context.bill.getMasterData().getValue('id'),
}, },
}).then((res) => { }).then((res) => {
this.data = res && res[0] res = res || []
let count = 0
this.data = res[0]
for (let o of res) {
if (o.procState == 1) {
this.data = o
;++count
}
}
if (count > 1) {
this.$Message.error('工作流数据异常')
}
if (!this.data) return if (!this.data) return
this.data.steps.push({ this.data.steps.push({
title: "提交申请", title: "提交申请",
......
develop/@gms/gms-plugin-billexpand/src/emcon.js
...@@ -1156,7 +1156,8 @@ export default { ...@@ -1156,7 +1156,8 @@ export default {
"description": "", "description": "",
"title": "财务_查询草稿[CW_draftSearchAction]", "title": "财务_查询草稿[CW_draftSearchAction]",
"value": "draftSearchAction", "value": "draftSearchAction",
"btnDisable": "false" "btnDisable": "false",
"btnDisable": "billReadOnly;90;91;92"
}, { }, {
"discard": false, "discard": false,
"path": "单据/复制单据", "path": "单据/复制单据",
...@@ -1184,11 +1185,6 @@ export default { ...@@ -1184,11 +1185,6 @@ export default {
"path": "单据/缓存单据数据", "path": "单据/缓存单据数据",
"extends": { "extends": {
"param": [{ "param": [{
"cacheData": true,
"type": "Boolean",
"title": "是否缓存数据",
"key": "cacheData"
}, {
"clearable": true, "clearable": true,
"ref": "gams2.bill", "ref": "gams2.bill",
"type": "select", "type": "select",
...@@ -1371,7 +1367,7 @@ export default { ...@@ -1371,7 +1367,7 @@ export default {
"description": "", "description": "",
"title": "财务_保存[CW_saveAction]", "title": "财务_保存[CW_saveAction]",
"value": "CW_saveAction", "value": "CW_saveAction",
"btnDisable": "billReadOnly;90;91;92" "btnDisable": "billReadOnly;90;92"
}, },
{ {
"discard": false, "discard": false,
...@@ -1481,7 +1477,7 @@ export default { ...@@ -1481,7 +1477,7 @@ export default {
"description": "", "description": "",
"title": "财务_提交[CW_submitAction]", "title": "财务_提交[CW_submitAction]",
"value": "CW_submitAction", "value": "CW_submitAction",
"btnDisable": "billEdit;90;91;92" "btnDisable": "billEdit;90;92"
}, },
{ {
"discard": false, "discard": false,
...@@ -3763,6 +3759,22 @@ export default { ...@@ -3763,6 +3759,22 @@ export default {
"extends": { "extends": {
"info": { "info": {
"param": [], "param": [],
"name": "AmountComp",
"description": "金额比较公式 e.g. AmountComp(BXD_H.BXJEXX,BXD_H.BXJEX1)",
"title": "金额比较公式",
"return": 1
}
},
"description": "",
"title": "金额比较公式",
"value": "AmountComp"
},
{
"discard": false,
"path": "通用",
"extends": {
"info": {
"param": [],
"name": "CheckReferenceRelation", "name": "CheckReferenceRelation",
"description": "校验单据是否被引用 e.g. CheckReferenceRelation('REF_FLAG','1','当前单据已被引用，暂时无法删除。')", "description": "校验单据是否被引用 e.g. CheckReferenceRelation('REF_FLAG','1','当前单据已被引用，暂时无法删除。')",
"title": "校验单据是否被引用", "title": "校验单据是否被引用",
......
develop/@gms/gms-plugin-billexpand/src/formula/AmountComp.js 0 → 100644
import _ from "./FormulaConstants";
/**
* 金额比较公式
* 比较左右两个操作数是否相等 参数可以是返回值类型为number的公式
* @author fengjiansheng
* @date 2022-02-07
*/
export default {
formulaName: "AmountComp",
execute: function () {
if (arguments && arguments[0] && arguments[0].length === 2) {
let leftOperand = arguments[0][0];
let rightOperand = arguments[0][1];
if (leftOperand && rightOperand) {
leftOperand = _.getFormulaParamValue(leftOperand);
rightOperand = _.getFormulaParamValue(rightOperand);
if (_.isNumber(leftOperand) && _.isNumber(rightOperand)) {
return _.isAmountEqual(leftOperand, rightOperand);
} else {
console.error(this.formulaName + _.ERROR_MSG.PARAM_TYPE);
return false;
}
} else {
return false;
}
} else {
console.error(this.formulaName + _.ERROR_MSG.PARAM_NUM);
return false;
}
},
getResultType: function () {
return _.resultType.boolean;
}
}
develop/@gms/gms-plugin-billexpand/src/formula/FormulaConstants.js
import _ from 'lodash'
/** /**
* 公式常量 * 公式常量
* @author fengjiansheng * @author fengjiansheng
* @date 2021-09-13 * @date 2021-09-13
*/ */
export default { export default {
billFiled:{ billFiled: {
BMJJFL: 9999, BMJJFL: 9999,
NULL: 0, NULL: 0,
},
resultType: {
anyType: 0,
boolean: 1,
datetime: 2,
number: 3,
string: 6,
},
ERROR_MSG: {
PARAM_TYPE: "公式配置错误，参数类型不匹配。",
PARAM_NUM: "公式配置错误，参数个数不匹配。",
}, },
moneyFormatDecimal : (num, decimal) => { toNumber(a) {
return _.toNumber(a);
},
isNumber(a) {
return _.isNumber(a);
},
isAmountEqual(a, b) {
if (this.isNumber(a) && this.isNumber(b)) {
return Math.abs(this.toNumber(a) - this.toNumber(b)) <= 0.0000001;
} else {
throw new Error("invalid param");
}
},
moneyFormatDecimal(num, decimal) {
num = num.toString() num = num.toString()
let index = num.indexOf('.') let index = num.indexOf('.')
if (index !== -1) { if (index !== -1) {
...@@ -19,9 +45,9 @@ export default { ...@@ -19,9 +45,9 @@ export default {
} }
return parseFloat(num).toFixed(decimal) return parseFloat(num).toFixed(decimal)
}, },
getFormulaParamValue(obj){ getFormulaParamValue(obj) {
if(obj){ if (obj) {
return obj.getResult().Value return obj.getResult().Value
} }
return obj return obj
}, },
......
develop/@gms/gms-plugin-billexpand/src/mcon.js
...@@ -169,6 +169,7 @@ import SubTableJointString from "@/formula/SubTableJointString" ...@@ -169,6 +169,7 @@ import SubTableJointString from "@/formula/SubTableJointString"
import LoginUserIsContianRole from "@/formula/SubTableJointString" import LoginUserIsContianRole from "@/formula/SubTableJointString"
import SubTableSetBaseData from "@/formula/SubTableSetBaseData" import SubTableSetBaseData from "@/formula/SubTableSetBaseData"
import UpdateBillReferenceRelationshipFunction from "./formula/UpdateBillReferenceRelationshipFunction"; import UpdateBillReferenceRelationshipFunction from "./formula/UpdateBillReferenceRelationshipFunction";
import AmountComp from "./formula/AmountComp";
export default { export default {
actions: { actions: {
updateFieldAction, updateFieldAction,
...@@ -341,7 +342,8 @@ export default { ...@@ -341,7 +342,8 @@ export default {
UpdateImageInfoRefState, UpdateImageInfoRefState,
UpdateBillReferenceRelationshipFunction, UpdateBillReferenceRelationshipFunction,
ClearImageInfoRefState, ClearImageInfoRefState,
CheckReferenceRelation CheckReferenceRelation,
AmountComp,
}, },
routes : { routes : {
showPrint: { showPrint: {
......
develop/@gms/gms-plugin-billexpand/src/query-actions/editBill.js
...@@ -4,7 +4,7 @@ export default { ...@@ -4,7 +4,7 @@ export default {
execute(context, param) { execute(context, param) {
GMS.queryObject = {//上张下张用 GMS.queryObject = {//上张下张用
currentDataQueryConditionSet: context.currentDataQueryConditionSet, currentDataQueryConditionSet: context.currentDataQueryConditionSet,
index: context.selects[0]._index, index: context.selects[0]._index||(context.selects[0]._serialIndex)*1-1,
templateName:param.viewName, templateName:param.viewName,
isReadOnly:false isReadOnly:false
} }
......
develop/@gms/gms-plugin-billexpand/src/query-actions/examineAction.js
...@@ -8,7 +8,7 @@ export default { ...@@ -8,7 +8,7 @@ export default {
} }
GMS.queryObject = {//上张下张用 GMS.queryObject = {//上张下张用
currentDataQueryConditionSet: context.currentDataQueryConditionSet, currentDataQueryConditionSet: context.currentDataQueryConditionSet,
index: context.selects[0]._index, index: context.selects[0]._index||(context.selects[0]._serialIndex)*1-1,
templateName:param.viewName, templateName:param.viewName,
isReadOnly:true isReadOnly:true
} }
...@@ -36,6 +36,15 @@ export default { ...@@ -36,6 +36,15 @@ export default {
} }
); );
} else { } else {
let href = window.location.href
if (href.indexOf('taskId') > -1) {
href = href.substring(0, href.indexOf('taskId'))
href += 'taskId=' + context.selects[0][param.taskId]
}
else {
href += '?taskId=' + context.selects[0][param.taskId]
}
window.location.href = href
GMS.$hideContainer.addComponent(typesBill, {}, function(c) { GMS.$hideContainer.addComponent(typesBill, {}, function(c) {
c.templateName = templateName; c.templateName = templateName;
c.billId = billId; c.billId = billId;
......
develop/@gms/gms-plugin-billexpand/src/query-actions/goToDetail.js
...@@ -7,7 +7,12 @@ export default { ...@@ -7,7 +7,12 @@ export default {
context.dom.$Message.info("请配置跳转页面的参数"); context.dom.$Message.info("请配置跳转页面的参数");
return; return;
} }
GMS.queryObject = {//上张下张用
currentDataQueryConditionSet: context.currentDataQueryConditionSet,
index: context.selects[0]._index||(context.selects[0]._serialIndex)*1-1,
templateName: context.selects[0][param.viewName],
isReadOnly: true,
}
if ( if (
window.osConfig.appOpenMode && window.osConfig.appOpenMode &&
window.osConfig.appOpenMode == "apploader" window.osConfig.appOpenMode == "apploader"
...@@ -33,6 +38,7 @@ export default { ...@@ -33,6 +38,7 @@ export default {
c.init = true; c.init = true;
c.modal_visible = true; c.modal_visible = true;
c.isReadOnly = true c.isReadOnly = true
c.state = 'readOnly'
}) })
} }
} }
......
develop/@gms/gms-plugin-billexpand/src/query-actions/seeDetailAction.js
...@@ -8,7 +8,7 @@ export default { ...@@ -8,7 +8,7 @@ export default {
} }
GMS.queryObject = {//上张下张用 GMS.queryObject = {//上张下张用
currentDataQueryConditionSet: context.currentDataQueryConditionSet, currentDataQueryConditionSet: context.currentDataQueryConditionSet,
index: context.selects[0]._index, index: context.selects[0]._index||(context.selects[0]._serialIndex)*1-1,
templateName:param.viewName, templateName:param.viewName,
isReadOnly:true isReadOnly:true
} }
......
develop/@rbc/runner-bill-form/src/views/bill-form-runner.vue
...@@ -56,8 +56,16 @@ export default { ...@@ -56,8 +56,16 @@ export default {
// this.type = 'load' // this.type = 'load'
}); });
}); });
GMS.vbus.$on("workflow-state-change", (val) => {
console.log('refresh', val)
this.init = false;
this.$nextTick(() => {
this.init = true;
})
})
}, },
beforeDestroy() { beforeDestroy() {
GMS.vbus.$off("workflow-state-change")
GMS.vbus.$off("change-form-state"); GMS.vbus.$off("change-form-state");
this.$portalAPI.off('on-close-tag', this.checkBillChange) this.$portalAPI.off('on-close-tag', this.checkBillChange)
}, },
......
develop/@rbc/workflow-job-view/src/app.vue
...@@ -104,6 +104,9 @@ export default { ...@@ -104,6 +104,9 @@ export default {
this.templateName = this.templateOptionList[0]?.templateName; this.templateName = this.templateOptionList[0]?.templateName;
this.handleSearch(); this.handleSearch();
}); });
window.GMS.vbus.$on('refresh-workflow-job-view', () => {
this.handleSearch()
})
}, },
methods: { methods: {
......
solution.json
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"name": "nvwa", "name": "nvwa",
"index": { "index": {
"name": "@gms/gms-entry", "name": "@gms/gms-entry",
"version": "latest" "version": "0.2.90-rbc"
}, },
"login": { "login": {
"name": "@rbc/rbc-login", "name": "@rbc/rbc-login",
......
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