Skip to content

R
rbc-demo
Commit 65078ea6 by Joey
Options

Merge branch 'develop' into develop-zhouyi

parents e4a3a939 3a7edf60
Showing with 223 additions and 3 deletions
develop/@gms/gms-plugin-billexpand/src/emcon.js
......@@ -3890,6 +3890,86 @@ export default {
"title": "子表中的某个字段是否等于某个值，满足条件的同时求最大最小值",
"value": "SubTableIsContainValue"
},
{
"discard": false,
"path": "通用",
"extends": {
"info": {
"param": [],
"name": "GetAccessoryCount",
"description": "获取当前单据附件的数量，无需传参（后端公式）",
"title": "获取当前单据附件的数量",
"return": 0
}
},
"description": "获取当前单据附件的数量,无需传参（后端公式）",
"title": "获取当前单据附件的数量",
"value": "GetAccessoryCount"
},
{
"discard": false,
"path": "通用",
"extends": {
"info": {
"param": [],
"name": "GetSubTableRows",
"description": "1.子表的必填字段，2.子表在主表中的表名（前端公式）",
"title": "获取当前子表的行数的公式",
"return": 0
}
},
"description": "获取当前单据附件的数量,无需传参（前端公式）",
"title": "1.子表的必填字段，2.子表在主表中的表名",
"value": "GetSubTableRows"
},
{
"discard": false,
"path": "通用",
"extends": {
"info": {
"param": [],
"name": "LoginUserIsContianRole",
"description": "支持多个参数，参数名为角色的code",
"title": "判断当前用户是否包含角色",
"return": 0
}
},
"description": "支持多个参数，参数名为角色的code",
"title": "判断当前用户是否包含角色",
"value": "LoginUserIsContianRole"
},
{
"discard": false,
"path": "通用",
"extends": {
"info": {
"param": [],
"name": "SubTableJointString",
"description": "SubTableJointString（'子表中需要拼接的字段','子表在主表中的表名','需要拿什么拼接'） -- 前端公式",
"title": "子表中按照某个字符拼接",
"return": 0
}
},
"description": "SubTableJointString（'子表中需要拼接的字段','子表在主表中的表名','需要拿什么拼接'） -- 前端公式",
"title": "子表中按照某个字符拼接",
"value": "SubTableJointString"
},
{
"discard": false,
"path": "通用",
"extends": {
"info": {
"param": [],
"name": "SubTableSetBaseData",
"description": "1.从那个字段取，那个字段里面的对应的基础数据的名称，2.要取的基础数据字段标识,第一个参数中的你要取出的对应的基础数据字段,3.要被带出的基础数据标识名4.要被带出的字段名称",
"title": "子表根据基础数据带出基础数据",
"return": 0
}
},
"description": "1.从那个字段取，那个字段里面的对应的基础数据的名称，2.要取的基础数据字段标识,第一个参数中的你要取出的对应的基础数据字段,3.要被带出的基础数据标识名4.要被带出的字段名称",
"title": "子表根据基础数据带出基础数据",
"value": "SubTableSetBaseData"
},
],
dropdownOptionList: [
{
......
develop/@gms/gms-plugin-billexpand/src/formula/GetAccessoryCount.js 0 → 100644
//获取当前单据附件的数量
export default {
execute:function(){
console.log("进入获取附件数量公式")
},
getResultType:function(){
return FMR.ConstDataTypes.General;
}
}
develop/@gms/gms-plugin-billexpand/src/formula/GetSubTableRows.js 0 → 100644
// 获取当前子表的行数的公式
export default {
execute:function(){
console.log("获取当前子表的行数的公式");
let tableName = arguments[0][1].StaticValue
let count ;
if(arguments[1].getSubData(tableName)){
let subTableValue = arguments[1].getSubData(tableName)
count = subTableValue.length
}else {
return "请检查配置，找不到配置中的子表"
}
return count;
},
getResultType:function(){
return FMR.ConstDataTypes.General;
}
}
\ No newline at end of file
develop/@gms/gms-plugin-billexpand/src/formula/LoginUserIsContianRole.js 0 → 100644
// 判断当前用户是否包含角色 - 后端公式
export default {
execute:function(){
console.log("进入获取当前用户关联职员基础数据前端公式");
},
getResultType:function(){
return FMR.ConstDataTypes.General;
}
}
\ No newline at end of file
develop/@gms/gms-plugin-billexpand/src/formula/SubTableJointString.js 0 → 100644
// 子表中按照某个字符拼接
export default {
execute: function () {
console.log("子表中按照某个字符拼接");
let field = arguments[0][0].FieldCode
let tableName = arguments[0][1].StaticValue
let value = arguments[0][2].StaticValue
let stringJoin = "";
if (arguments[1].getSubData(tableName)) {
let subTableValues = arguments[1].getSubData(tableName)
subTableValues.forEach((item, index) => {
if (item.getData()[field]) {
if (item.getData()[field].value.length != 0 ) {
stringJoin = stringJoin + item.getData()[field].value + ","
}
}
});
}
if(stringJoin.length > 0 ){
stringJoin = stringJoin.slice(0,stringJoin.length-1)
return stringJoin;
}else{
return null;
}
},
getResultType: function () {
return FMR.ConstDataTypes.General;
}
}
\ No newline at end of file
develop/@gms/gms-plugin-billexpand/src/formula/SubTableSetBaseData.js 0 → 100644
// 子表根据基础数据带出基础数据
export default {
execute: function () {
debugger
console.log("子表中的某个字段是否等于某个值");
//从那个字段取，那个字段里面的对应的基础数据的名称，要取的基础数据字段标识,要赋值给谁
if (arguments && arguments[0] && arguments[0].length > 1 && arguments[1]) {
let context = arguments[1]
let masterSubField = arguments[0][0].getResult().Value;
let baseDataField = arguments[0][1].StaticValue;
let baseDataDefine = arguments[0][2].StaticValue;
let targetSubField = arguments[0][3]
let subTableObject = context.getTableType(targetSubField.FieldTableCode)
let oldIndex = context.getSubFocus()
let focusData = context.getAllSubData()[subTableObject.title][oldIndex].getData()
if (_.isString(masterSubField[baseDataField]) && masterSubField[baseDataField].length > 0) {
if ((!(_.isEqual(focusData[arguments[0][0].FieldCode]._field_old_value_, focusData[arguments[0][0].FieldCode].value)))) {
let param = {
"objectcode": masterSubField[baseDataField],
"tableName": baseDataDefine,
"queryDataStructure": "ALL",
"limit": 1,
"offset": 0,
"pagination": true
}
this.getMDObject(param, (data) => {
let newIndex = context.getSubFocus();
if (oldIndex !== newIndex) {
context.setSubFocus(oldIndex)
}
focusData[arguments[0][0].FieldCode]._field_old_value_ = focusData[arguments[0][0].FieldCode].value
// focusData.ZJ._field_old_value_ = focusData.ZJ.value
// focusData.RZRQ._field_old_value_ = focusData.RZRQ.value
// focusData.LDRQ._field_old_value_ = focusData.LDRQ.value
// targetSubField.dynamicNodeFactory.methodJson.SetFieldData('', linkId, data.cSontent, '')
focusData[targetSubField.FieldCode]._field_old_value_ = focusData[targetSubField.FieldCode].value = data.rows[0]
if (oldIndex !== newIndex) {
context.setSubFocus(newIndex)
}
context.refreshSubDataRow(subTableObject.title)
}, (resp) => {
GAMS.Common.messagePrompt("境内住宿标准金额获取接口请求失败，请联系管理员")
console.error("获取境内住宿标准公式直接失败"+resp)
});
}
}
}
},
getMDObject(param, callBack, errorCallBack) {
GMS.$http.post("/baseData/data/list", param).then(data => {
callBack(data.data);
}).catch((resp) => {
errorCallBack(resp);
});
},
getResultType: function () {
return FMR.ConstDataTypes.General;
}
}
\ No newline at end of file
develop/@gms/gms-plugin-billexpand/src/mcon.js
......@@ -163,6 +163,10 @@ import simpleAdvanceDeleteAction from "./query-actions/simpleAdvanceDeleteAction
import SubTableOneToOneFilter from "@/formula/SubTableOneToOneFilter";
import draftFixBugAction from "@/actions/draftFixBugAction";
import SubTableIsContainValue from "@/formula/SubTableIsContainValue";
import GetSubTableRows from "@/formula/GetSubTableRows"
import SubTableJointString from "@/formula/SubTableJointString"
import LoginUserIsContianRole from "@/formula/SubTableJointString"
import SubTableSetBaseData from "@/formula/SubTableSetBaseData"
export default {
actions: {
updateFieldAction,
......@@ -243,6 +247,10 @@ export default {
rbcBasedataTree
},
formula: {
SubTableSetBaseData,
LoginUserIsContianRole,
SubTableJointString,
GetSubTableRows,
SubTableIsContainValue,
SubTableOneToOneFilter,
GetMdOrgParentField,
......
develop/@gms/gms-plugin-billexpand/src/query-actions/createBill.js
......@@ -24,6 +24,8 @@ export default {
"runner-bill-form",
{
templateName: templateName,
init: true,
state: '',
},
{
openWay: "FUNCTAB",
......
develop/@rbc/runner-bill-form/src/views/bill-form-runner.vue
......@@ -4,7 +4,7 @@
v-if="init"
:templateName="templateName"
:id="billId"
:type="type"
:type="billId ? 'load' : 'init'"
:state="state"
@loadFinish="loadFinishFun"
></gms-bill-form>
......@@ -49,11 +49,11 @@ export default {
if (billId !== undefined) {
this.billId = billId;
}
this.state = state || '';
this.state = state ;
this.init = false;
this.$nextTick(() => {
this.init = true;
this.type = 'load'
// this.type = 'load'
});
});
},
......
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