-
- { commonUtils.isNotEmptyArr(ImportData) ?
-
-
+ ) : (
+ ""
+ )}
+
+
-
: ''}
+
+
-
+
- {
- props.sModelsType === 'element/workcalendar' ?
-
-
:
-
-
- { _this.slaveTabsRef = ref; }}>
-
- {
- commonUtils.isNotEmptyArr(diliverConfigTypeArr1) ?
- diliverConfigTypeArr1.map((item) => {
- // 匹配数字
- // eslint-disable-next-line no-unused-vars
- let num = item.replace(/[^\d]/g, '').trim();
- let tabName = item.replace(/\d+/g,'');
- /* 从主表配置 找到控件名=tabName,否则取他的showName */
- const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
- if(commonUtils.isNotEmptyArr(tableConfigArr)) {
- tabName=tableConfigArr[0].showName;
- }
- return (
-
-
-
-
-
+
+ ) : (
+
+
+ {
+ _this.slaveTabsRef = ref;
+ }}
+ >
+
+ {commonUtils.isNotEmptyArr(diliverConfigTypeArr1)
+ ? diliverConfigTypeArr1.map(item => {
+ // 匹配数字
+ // eslint-disable-next-line no-unused-vars
+ let num = item.replace(/[^\d]/g, "").trim();
+ let tabName = item.replace(/\d+/g, "");
+ /* 从主表配置 找到控件名=tabName,否则取他的showName */
+ const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
+ if (commonUtils.isNotEmptyArr(tableConfigArr)) {
+ tabName = tableConfigArr[0].showName;
+ }
+ return (
+
+
+ );
+ })
+ : ""}
+ {onlySlave ? (
+ <>
+
+
- );
- })
- : ''
- }
- {
- onlySlave ?
- (
- <>
-
-
- {bControlSeparateTab && (
-
-
- )}
-
- ) : ''
- }
- {
- commonUtils.isNotEmptyArr(diliverConfigTypeArr2) ?
- diliverConfigTypeArr2.map((item) => {
- // 匹配数字
- // eslint-disable-next-line no-unused-vars
- let num = item.replace(/[^\d]/g, '').trim();
- let tabName = item.replace(/\d+/g,'');
- /* 从主表配置 找到控件名=tabName,否则取他的showName */
- const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
- if(commonUtils.isNotEmptyArr(tableConfigArr)) {
- tabName =tableConfigArr[0].showName;
- }
- return (
-
-
+
+
+
+
+ {app.currentPane.title !== "功能模块界面设置单据" ? (
+
+
-
- {
- app.currentPane.title !== '功能模块界面设置单据' ?
-
-
:
-
-
- }
-
- }
-
-
-
- {!bControlSeparateTab &&
-
+ {!bControlSeparateTab &&
+
+ )}
+
+ ) : (
+ ""
+ )}
+ {commonUtils.isNotEmptyArr(diliverConfigTypeArr2)
+ ? diliverConfigTypeArr2.map(item => {
+ // 匹配数字
+ // eslint-disable-next-line no-unused-vars
+ let num = item.replace(/[^\d]/g, "").trim();
+ let tabName = item.replace(/\d+/g, "");
+ /* 从主表配置 找到控件名=tabName,否则取他的showName */
+ const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
+ if (commonUtils.isNotEmptyArr(tableConfigArr)) {
+ tabName = tableConfigArr[0].showName;
+ }
+ return (
+
+
+ );
+ })
+ : ""}
+ {onlySlave0 ? (
+ <>
+
+
+
-
- {bControlSeparateTab0 && (
-
-
- )}
-
- ) : ''
- }
- {
- commonUtils.isNotEmptyArr(diliverConfigTypeArr3) ?
- diliverConfigTypeArr3.map((item) => {
- // 匹配数字
- // eslint-disable-next-line no-unused-vars
- let num = item.replace(/[^\d]/g, '').trim();
- let tabName = item.replace(/\d+/g,'');
- /* 从主表配置 找到控件名=tabName,否则取他的showName */
- const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
- if(commonUtils.isNotEmptyArr(tableConfigArr)) {
- tabName =tableConfigArr[0].showName;
- }
- return (
-
-
+
+ {bControlSeparateTab && (
+
+
+
-
- );
- })
- : ''
- }
- {
- onlySlave0 ?
- (
- <>
-
- {
- app.currentPane.title !== '功能模块界面设置单据' ?
-
-
:
-
-
- }
-
- }
-
-
-
- {!bControlSeparateTab0 &&
-
+ )}
+
+
+
+ {app.currentPane.title !== "功能模块界面设置单据" ? (
+
+
+ ) : (
+
-
- : ''
- }
- {
- props.showImportErrorVisible ?
-
+ {bFlow ? (
+
+
+ ) : (
+ ""
+ )}
+ {props.showImportErrorVisible ? (
+
-
- : ''
- }
- {
- false && props.sParamsModalVisible ?
-
+
+ ) : (
+ ""
+ )}
+ {false && props.sParamsModalVisible ? (
+
- : ''
- }
-
- {
- false && props.sParamsNewModalVisible ?
-
+
+ ) : (
+ ""
+ )}
+
+ {false && props.sParamsNewModalVisible ? (
+
- : ''
- }
-
- {
- props.contextMenuModalVisible ?
-
- : ''
- }
+ >
+
+ ) : (
+ ""
+ )}
+
+ {props.contextMenuModalVisible ?
+
+ ) : (
+ ""
+ )}
+
-
+ {bControlSeparateTab0 && (
+
+
+ )}
+
+ ) : (
+ ""
+ )}
+ {commonUtils.isNotEmptyArr(diliverConfigTypeArr3)
+ ? diliverConfigTypeArr3.map(item => {
+ // 匹配数字
+ // eslint-disable-next-line no-unused-vars
+ let num = item.replace(/[^\d]/g, "").trim();
+ let tabName = item.replace(/\d+/g, "");
+ /* 从主表配置 找到控件名=tabName,否则取他的showName */
+ const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
+ if (commonUtils.isNotEmptyArr(tableConfigArr)) {
+ tabName = tableConfigArr[0].showName;
+ }
+ return (
+
+
+ );
+ })
+ : ""}
+ {onlySlave1 ? (
+ <>
+
+
- {bControlSeparateTab1 && (
-
-
- )}
-
- ) : ''
- }
- {
- commonUtils.isNotEmptyArr(diliverConfigTypeArr4) ?
- diliverConfigTypeArr4.map((item) => {
- // 匹配数字
- // eslint-disable-next-line no-unused-vars
- let num = item.replace(/[^\d]/g, '').trim();
- let tabName = item.replace(/\d+/g,'');
- /* 从主表配置 找到控件名=tabName,否则取他的showName */
- const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
- if(commonUtils.isNotEmptyArr(tableConfigArr)) {
- tabName =tableConfigArr[0].showName;
- }
- return (
-
-
+ {bControlSeparateTab1 && (
+
+
+ )}
+
+ ) : (
+ ""
+ )}
+ {commonUtils.isNotEmptyArr(diliverConfigTypeArr4)
+ ? diliverConfigTypeArr4.map(item => {
+ // 匹配数字
+ // eslint-disable-next-line no-unused-vars
+ let num = item.replace(/[^\d]/g, "").trim();
+ let tabName = item.replace(/\d+/g, "");
+ /* 从主表配置 找到控件名=tabName,否则取他的showName */
+ const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
+ if (commonUtils.isNotEmptyArr(tableConfigArr)) {
+ tabName = tableConfigArr[0].showName;
+ }
+ return (
+
+
+ );
+ })
+ : ""}
+ {onlyslave2 ? (
+ <>
+
+
+ {bControlSeparateTab2 && (
+
+
+ )}
+
+ ) : (
+ ""
+ )}
+ {commonUtils.isNotEmptyArr(diliverConfigTypeArr5)
+ ? diliverConfigTypeArr5.map(item => {
+ // 匹配数字
+ // eslint-disable-next-line no-unused-vars
+ let num = item.replace(/[^\d]/g, "").trim();
+ let tabName = item.replace(/\d+/g, "");
+ /* 从主表配置 找到控件名=tabName,否则取他的showName */
+ const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
+ if (commonUtils.isNotEmptyArr(tableConfigArr)) {
+ tabName = tableConfigArr[0].showName;
+ }
+ return (
+
+
+ );
+ })
+ : ""}
+ {onlyslave3 ? (
+ <>
+
+
+ {bControlSeparateTab3 && (
+
+
+ )}
+
+ ) : (
+ ""
+ )}
+ {commonUtils.isNotEmptyArr(diliverConfigTypeArr6)
+ ? diliverConfigTypeArr6.map(item => {
+ // 匹配数字
+ // eslint-disable-next-line no-unused-vars
+ let num = item.replace(/[^\d]/g, "").trim();
+ let tabName = item.replace(/\d+/g, "");
+ /* 从主表配置 找到控件名=tabName,否则取他的showName */
+ const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
+ if (commonUtils.isNotEmptyArr(tableConfigArr)) {
+ tabName = tableConfigArr[0].showName;
+ }
+ return (
+
+
+ );
+ })
+ : ""}
+ {onlyslave4 ? (
+ <>
+
+
+ {bControlSeparateTab4 && (
+
+
+ )}
+
+ ) : (
+ ""
+ )}
+ {onlyslave5 ? (
+ <>
+
+
+
+ ) : (
+ ""
+ )}
+ {onlyslave6 ? (
+ <>
+
+
+
+ ) : (
+ ""
+ )}
+ {onlyslave7 ? (
+ <>
+
+
+
+ ) : (
+ ""
+ )}
+ {onlyslave8 ? (
+ <>
+
+
+
+ ) : (
+ ""
+ )}
+ {onlyslave9 ? (
+ <>
+
+
+
+ ) : (
+ ""
+ )}
+ {onlyslave10 ? (
+ <>
+
+
+
+ ) : (
+ ""
+ )}
+
- : ''
- }
- {
- props.productProcessInfoChooseVisible ?
-
+
+
-
- );
- })
- : ''
- }
- {
- onlySlave1 ?
- (
- <>
-
-
- {
- props.app.currentPane.title !== '功能模块界面设置单据' ?
-
+
-
-
-
- {/*
+ {!bControlSeparateTab0 &&
+ )}
+
+
+
+ {props.app.currentPane.title !== "功能模块界面设置单据" ? (
+
-
+
+
+ {/*
{slave2Config && slave2Config.sChinese === '上批对比' &&
*/}
-
- :
-
- }
-
- }
-
-
-
- {!bControlSeparateTab1 &&
-
+ ) : (
+
+
+
-
- {bControlSeparateTab2 && (
-
-
- )}
-
- ) : ''
- }
- {
- commonUtils.isNotEmptyArr(diliverConfigTypeArr5) ?
- diliverConfigTypeArr5.map((item) => {
- // 匹配数字
- // eslint-disable-next-line no-unused-vars
- let num = item.replace(/[^\d]/g, '').trim();
- let tabName = item.replace(/\d+/g,'');
- /* 从主表配置 找到控件名=tabName,否则取他的showName */
- const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
- if(commonUtils.isNotEmptyArr(tableConfigArr)) {
- tabName =tableConfigArr[0].showName;
- }
- return (
-
-
- );
- })
- : ''
- }
- {
- onlyslave3 ?
- (
- <>
-
-
- {bControlSeparateTab3 && (
-
-
- )}
-
- ) : ''
- }
- {
- commonUtils.isNotEmptyArr(diliverConfigTypeArr6) ?
- diliverConfigTypeArr6.map((item) => {
- // 匹配数字
- // eslint-disable-next-line no-unused-vars
- let num = item.replace(/[^\d]/g, '').trim();
- let tabName = item.replace(/\d+/g,'');
- /* 从主表配置 找到控件名=tabName,否则取他的showName */
- const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
- if(commonUtils.isNotEmptyArr(tableConfigArr)) {
- tabName = tableConfigArr[0].showName;
- }
- return (
-
-
- );
- })
- : ''
- }
- {
- onlyslave4 ?
- (
- <>
-
-
- {bControlSeparateTab4 && (
-
-
- )}
-
- ) : ''
- }
- {
- onlyslave5 ?
- (
- <>
-
-
-
- ) : ''
- }
- {
- onlyslave6 ?
- (
- <>
-
-
-
- ) : ''
- }
- {
- onlyslave7 ?
- (
- <>
-
-
-
- ) : ''
- }
- {
- onlyslave8 ?
- (
- <>
-
-
-
- ) : ''
- }
- {
- onlyslave9 ?
- (
- <>
-
-
-
- ) : ''
- }
- {
- onlyslave10 ?
- (
- <>
-
-
-
- ) : ''
- }
-
-
- }
-
- {
- bFlow ?
-
+
-
-
- );
- })
- : ''
- }
- {
- onlyslave2 ?
- (
- <>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ )}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ) : (
+ ""
+ )}
+ {props.productProcessInfoChooseVisible ? (
+
-
-
+
+
-
-
-
-
+
+
+
+ 上批数据
+ 上批数据
- {this.handleGetMsg(returnData.msg)}
-
- ),
- okText: '确认',
+ title: "温馨提示:",
+ content: {this.handleGetMsg(returnData.msg)}
,
+ okText: "确认",
onOk() {},
});
this.props.onSaveState({
loading: false,
});
- return false;
- } else { /* 失败 */
+ return false;
+ } else {
+ /* 失败 */
this.props.getServiceError(returnData);
this.props.onSaveState({
loading: false,
});
- return false;
+ return false;
}
return true;
}
};
/** toolbar保存 */
- handleSaveData = async (params) => {
+ handleSaveData = async params => {
const {
token,
sModelsId,
@@ -1516,15 +1686,56 @@ export default (ChildComponent) => {
const { userinfo } = app;
const { copyTo } = app.currentPane;
const onSendSocketMessage = this.props.handleSendSocketMessage;
- const BtnSave = commonFunc.showMessage(app.commonConst, 'BtnSave');/* 保存 */
+ const BtnSave = commonFunc.showMessage(app.commonConst, "BtnSave"); /* 保存 */
params.optName = BtnSave;
+ // params.data.forEach(item=>{
+ // item.column?.forEach(col=>{
+ // if(col.isSettingFunctions) {
+ // if(col.iOrder > 10 ) {
+ // const i = Math.floor(col.iOrder / 10)
+ // col.iOrder = this.props.slaveData[i - 1].iOrder
+ // } else {
+ // col.iOrder = 1;
+ // }
+ // }
+ // })
+ // })
+ const tableData = this.props.slaveData.sort((a, b) => {
+ const hasA = a.hasOwnProperty("sName") && a.sName != null;
+ const hasB = b.hasOwnProperty("sName") && b.sName != null;
+ if (hasA && !hasB) return -1;
+ if (!hasA && hasB) return 1;
+
+ // 2. bVisible 为 true 的在前
+ const visA = a.bVisible === true;
+ const visB = b.bVisible === true;
+ if (visA && !visB) return -1;
+ if (!visA && visB) return 1;
+
+ // 3. 最后按 iOrder 升序
+ return a.iOrder - b.iOrder;
+ });
+ params.data.forEach(item=>{
+ if (item.name === "slave") {
+ const isSettingFunctions = item.column.some(col => col.isSettingFunctions);
+ if (isSettingFunctions) {
+ item.column = tableData.map((col,i) => {
+ col.iOrder =( i + 1 )* 10;
+ col.handleType = col.handleType || "update";
+ return col
+ });
+ }
+ }
+ })
+ console.log("params", this.props);
+
const returnData = await commonBusiness.saveData({ token, value: params, sModelsId });
if (commonUtils.isNotEmptyObject(returnData)) {
if (commonUtils.isNotEmptyObject(copyTo)) {
const sIdArray = [];
- if(commonUtils.isNotEmptyArr(copyTo.slaveData)) {
+ if (commonUtils.isNotEmptyArr(copyTo.slaveData)) {
const { slaveData } = copyTo;
- slaveData.forEach((item) => {
+ slaveData.forEach(item => {
const redisKey = item.sSlaveId;
sIdArray.push(redisKey);
});
@@ -1535,22 +1746,23 @@ export default (ChildComponent) => {
}
const sId = sIdArray.toString();
- onSendSocketMessage('copyfinish', 'noAction', sId, userinfo.sId, null, null);
+ onSendSocketMessage("copyfinish", "noAction", sId, userinfo.sId, null, null);
}
- onSendSocketMessage('release', 'noAction', currentId, userinfo.sId, null, null);
+ onSendSocketMessage("release", "noAction", currentId, userinfo.sId, null, null);
this.props.onSaveState({
- enabled: false, currentId: masterData.sId,
+ enabled: false,
+ currentId: masterData.sId,
});
// 保存后更新panes,currentPane的checkedId，防止浏览器刷新时重新又变成新增。
const iPaneIndex = app.panes.findIndex(item => item.key === app.currentPane.key);
app.panes[iPaneIndex].checkedId = masterData.sId;
app.currentPane.checkedId = masterData.sId;
- dispatch({ type: 'app/savePanesAndCurrentPane', payload: { panes: app.panes, currentPane: app.currentPane } });
+ dispatch({ type: "app/savePanesAndCurrentPane", payload: { panes: app.panes, currentPane: app.currentPane } });
/* 新记录时，关闭后能自动带值 */
const callBackRecord = this.props.app.currentPane.newRecordMethod;
if (callBackRecord !== undefined) {
- const sId = masterData.sId === undefined ? masterData.sid : masterData.sId;/* sId */
+ const sId = masterData.sId === undefined ? masterData.sid : masterData.sId; /* sId */
/* 回调 传[新增的数据sId] */
if (this.props.app.currentPane.newRecordMethod !== undefined) {
this.props.app.currentPane.newRecordMethod(sId);
@@ -1560,7 +1772,22 @@ export default (ChildComponent) => {
if (billnosetting.bAutoCheck) {
await this.handleAudit(1);
} else {
- await this.handleGetData(masterConfig, slaveConfig, slave0Config, slave1Config, slave2Config, slave3Config, slave4Config, null, slave5Config, slave6Config, slave7Config, slave8Config, slave9Config, slave10Config);
+ await this.handleGetData(
+ masterConfig,
+ slaveConfig,
+ slave0Config,
+ slave1Config,
+ slave2Config,
+ slave3Config,
+ slave4Config,
+ null,
+ slave5Config,
+ slave6Config,
+ slave7Config,
+ slave8Config,
+ slave9Config,
+ slave10Config
+ );
if (this.props.app.currentPane.refresh !== undefined) {
this.props.app.currentPane.refresh();
}
@@ -1578,9 +1805,10 @@ export default (ChildComponent) => {
};
/** toolbar校验保存 */
handleValidateSave = () => {
- this.form.validateFields(async (err) => {
+ this.form.validateFields(async err => {
/* 验证通过与不通过走不同的流程 */
- if (err) { /* 验证失败 */
+ if (err) {
+ /* 验证失败 */
/* 直接渲染显示错误提示 */
for (const key of Object.keys(err)) {
message.error(err[key].errors[0].message);
@@ -1588,7 +1816,8 @@ export default (ChildComponent) => {
this.props.onSaveState({
loading: false,
});
- } else { /* 验证成功 */
+ } else {
+ /* 验证成功 */
const {
masterConfig,
slaveConfig,
@@ -1627,9 +1856,15 @@ export default (ChildComponent) => {
// });
// return;
// }
- if (!commonBusiness.validateMaster(masterConfig, masterData, this.props) || !commonBusiness.validateTable(slaveConfig, slaveData, this.props) || !commonBusiness.validateTable(slave1Config, slave1Data, this.props) ||
- (!commonBusiness.validateTable(slave0Config, slave0Data, this.props)) || !commonBusiness.validateTable(slave2Config, slave2Data, this.props) ||
- !commonBusiness.validateTable(slave3Config, slave3Data, this.props) || !commonBusiness.validateTable(slave4Config, slave4Data, this.props)) {
+ if (
+ !commonBusiness.validateMaster(masterConfig, masterData, this.props) ||
+ !commonBusiness.validateTable(slaveConfig, slaveData, this.props) ||
+ !commonBusiness.validateTable(slave1Config, slave1Data, this.props) ||
+ !commonBusiness.validateTable(slave0Config, slave0Data, this.props) ||
+ !commonBusiness.validateTable(slave2Config, slave2Data, this.props) ||
+ !commonBusiness.validateTable(slave3Config, slave3Data, this.props) ||
+ !commonBusiness.validateTable(slave4Config, slave4Data, this.props)
+ ) {
this.props.onSaveState({
loading: false,
});
@@ -1637,17 +1872,17 @@ export default (ChildComponent) => {
}
/* 根据配置校验 表格内容是否为空 */
- if(commonUtils.isNotEmptyObject(this.props)) {
+ if (commonUtils.isNotEmptyObject(this.props)) {
for (const key of Object.keys(this.props)) {
- if(key.includes('Config') && !key.includes('onGet') && !key.includes('report')) {
- const tablename = key.replace('Config', '').trim();
+ if (key.includes("Config") && !key.includes("onGet") && !key.includes("report")) {
+ const tablename = key.replace("Config", "").trim();
const tableConfigName = key;
- const tableDataName = tablename +'Data';
+ const tableDataName = tablename + "Data";
const tableConfig = this.props[tableConfigName];
const tableData = this.props[tableDataName];
- if(tableConfig && tableConfig.bNotCanEmpty){
- if(commonUtils.isEmptyArr(tableData) ){
- message.error(commonFunc.showMessage(app.commonConst, 'slaveNotNull')); // 表格不能为空！
+ if (tableConfig && tableConfig.bNotCanEmpty) {
+ if (commonUtils.isEmptyArr(tableData)) {
+ message.error(commonFunc.showMessage(app.commonConst, "slaveNotNull")); // 表格不能为空！
this.props.onSaveState({
loading: false,
});
@@ -1662,18 +1897,22 @@ export default (ChildComponent) => {
if (commonUtils.isNotEmptyArr(slaveData)) {
let flag = true;
for (const item of slaveData) {
- if (sModelsType === 'materialsStock/productionmaterialsadjust') {
+ if (sModelsType === "materialsStock/productionmaterialsadjust") {
if (commonUtils.isNotEmptyStr(item.sWareHouseId)) {
if (masterData.sWareHouseId === item.sWareHouseId) {
- message.error(commonFunc.showMessage(app.commonConst, 'NotSameMateMaterialWarehouse'));/* 材料调拨原仓库与调入仓库不能一致 */
+ message.error(commonFunc.showMessage(app.commonConst, "NotSameMateMaterialWarehouse")); /* 材料调拨原仓库与调入仓库不能一致 */
flag = false;
break;
}
}
}
// {"paper":"纸张","finished":"成品","half_finished":"半成品","accessories":"辅料","corrugated":"瓦楞"}
- if (commonUtils.isNotEmptyObject(item.sMaterialsType) && item.sMaterialsType === 'paper' && commonUtils.isEmptyObject(item.sMaterialsStyle)) {
- message.error(item.sMaterialsName + commonFunc.showMessage(app.commonConst, 'NoStyle'));/* 请填写"${item.sMaterialsName}"的规格 */
+ if (
+ commonUtils.isNotEmptyObject(item.sMaterialsType) &&
+ item.sMaterialsType === "paper" &&
+ commonUtils.isEmptyObject(item.sMaterialsStyle)
+ ) {
+ message.error(item.sMaterialsName + commonFunc.showMessage(app.commonConst, "NoStyle")); /* 请填写"${item.sMaterialsName}"的规格 */
flag = false;
break;
}
@@ -1691,7 +1930,7 @@ export default (ChildComponent) => {
});
return;
}
- if (commonUtils.isNotEmptyArr(slaveData) && sModelsType === 'materialsStock/productionmaterials') {
+ if (commonUtils.isNotEmptyArr(slaveData) && sModelsType === "materialsStock/productionmaterials") {
const flag = await this.handleEleMaterialsStoreCurrQty(slaveData);
if (!flag) {
this.props.onSaveState({
@@ -1700,35 +1939,40 @@ export default (ChildComponent) => {
return;
}
}
- if (sModelsType === 'purchase/purchaseEnquiry') {
+ if (sModelsType === "purchase/purchaseEnquiry") {
delete masterData.maxBillNo;
}
- if (sModelsType === 'cashier/receipt' || sModelsType === 'cashier/payment') {
+ if (sModelsType === "cashier/receipt" || sModelsType === "cashier/payment") {
let flag = true;
- if (masterData.sSettlementId === 'bank') {
+ if (masterData.sSettlementId === "bank") {
if (commonUtils.isEmptyStr(masterData.sBankId) || commonUtils.isEmptyStr(masterData.sBankAccount)) {
- message.error(commonFunc.showMessage(app.commonConst, 'requiredsBankAccount'));/* 收/付款条件为银行时，银行、银行账号为必填项 */
+ message.error(commonFunc.showMessage(app.commonConst, "requiredsBankAccount")); /* 收/付款条件为银行时，银行、银行账号为必填项 */
flag = false;
}
}
- if (masterData.sSettlementId === 'bill') {
+ if (masterData.sSettlementId === "bill") {
if (commonUtils.isEmptyStr(masterData.sBankId) || commonUtils.isEmptyStr(masterData.sInvoiceNo)) {
- message.error(commonFunc.showMessage(app.commonConst, 'requiredsInvoiceNo'));/* 收/付款条件为票据时，银行、票据号码为必填项 */
+ message.error(commonFunc.showMessage(app.commonConst, "requiredsInvoiceNo")); /* 收/付款条件为票据时，银行、票据号码为必填项 */
flag = false;
}
}
let dslaveTotalMoney = 0;
for (const item of slaveData) {
- if (item.handleType !== 'del') {
+ if (item.handleType !== "del") {
if (commonUtils.isNotEmptyNumber(item.dTotalMoney)) {
dslaveTotalMoney += item.dTotalMoney;
}
}
}
- const dPmoney = this.props.getFloatNum('dProductMoney');
- dslaveTotalMoney = commonUtils.convertFixNum(dslaveTotalMoney, dPmoney);/* 取系统设定小数位 */
- if (commonUtils.isNotEmptyArr(slaveData) && commonUtils.isNotEmptyNumber(masterData.dTotalMoney) && commonUtils.isNotEmptyNumber(masterData.dAdvanceMoney) && commonUtils.convertFixNum(masterData.dTotalMoney - masterData.dAdvanceMoney, dPmoney) !== dslaveTotalMoney) {
- message.error(commonFunc.showMessage(app.commonConst, 'NotSameTotalMoney'));/* 主从表总金额不一致 */
+ const dPmoney = this.props.getFloatNum("dProductMoney");
+ dslaveTotalMoney = commonUtils.convertFixNum(dslaveTotalMoney, dPmoney); /* 取系统设定小数位 */
+ if (
+ commonUtils.isNotEmptyArr(slaveData) &&
+ commonUtils.isNotEmptyNumber(masterData.dTotalMoney) &&
+ commonUtils.isNotEmptyNumber(masterData.dAdvanceMoney) &&
+ commonUtils.convertFixNum(masterData.dTotalMoney - masterData.dAdvanceMoney, dPmoney) !== dslaveTotalMoney
+ ) {
+ message.error(commonFunc.showMessage(app.commonConst, "NotSameTotalMoney")); /* 主从表总金额不一致 */
flag = false;
}
/* 收付款保存前，看到从表没数据，预收勾上时，自动调用一下分摊 */
@@ -1743,67 +1987,59 @@ export default (ChildComponent) => {
}
}
const configNameList = Object.keys(this.props)
- .filter(
- item =>
- (item && item.startsWith("slave") && item.endsWith("Config"))
- )
+ .filter(item => item && item.startsWith("slave") && item.endsWith("Config"))
.map(item => item.replace("Config", ""));
const data = [];
- data.push(commonBusiness.mergeData('master', masterConfig.sTbName, [masterData]));
+ data.push(commonBusiness.mergeData("master", masterConfig.sTbName, [masterData]));
if (slaveConfig && commonUtils.isNotEmptyArr(slaveColumn)) {
- data.push(commonBusiness.mergeData('slave', slaveConfig.sTbName, slaveData, slaveDelData));
+ data.push(commonBusiness.mergeData("slave", slaveConfig.sTbName, slaveData, slaveDelData));
}
- if (slave0Config && commonUtils.isNotEmptyArr(slave0Column) && slave0Config.sTbName !== 'sysbillcheckresult') {
- data.push(commonBusiness.mergeData('slave0', slave0Config.sTbName, slave0Data, slave0DelData));
+ if (slave0Config && commonUtils.isNotEmptyArr(slave0Column) && slave0Config.sTbName !== "sysbillcheckresult") {
+ data.push(commonBusiness.mergeData("slave0", slave0Config.sTbName, slave0Data, slave0DelData));
}
- if (slave1Config && commonUtils.isNotEmptyArr(slave1Column) && slave1Config.sTbName !== 'sysbillcheckresult') {
- data.push(commonBusiness.mergeData('slave1', slave1Config.sTbName, slave1Data, slave1DelData));
+ if (slave1Config && commonUtils.isNotEmptyArr(slave1Column) && slave1Config.sTbName !== "sysbillcheckresult") {
+ data.push(commonBusiness.mergeData("slave1", slave1Config.sTbName, slave1Data, slave1DelData));
}
- if (slave2Config && commonUtils.isNotEmptyArr(slave2Column) && slave2Config.sTbName !== 'sysbillcheckresult') {
- data.push(commonBusiness.mergeData('slave2', slave2Config.sTbName, slave2Data, slave2DelData));
+ if (slave2Config && commonUtils.isNotEmptyArr(slave2Column) && slave2Config.sTbName !== "sysbillcheckresult") {
+ data.push(commonBusiness.mergeData("slave2", slave2Config.sTbName, slave2Data, slave2DelData));
}
- if (slave3Config && commonUtils.isNotEmptyArr(slave3Column) && slave3Config.sTbName !== 'sysbillcheckresult') {
- data.push(commonBusiness.mergeData('slave3', slave3Config.sTbName, slave3Data, slave3DelData));
+ if (slave3Config && commonUtils.isNotEmptyArr(slave3Column) && slave3Config.sTbName !== "sysbillcheckresult") {
+ data.push(commonBusiness.mergeData("slave3", slave3Config.sTbName, slave3Data, slave3DelData));
}
- if (slave4Config && commonUtils.isNotEmptyArr(slave4Column) && slave4Config.sTbName !== 'sysbillcheckresult') {
- data.push(commonBusiness.mergeData('slave4', slave4Config.sTbName, slave4Data, slave4DelData));
+ if (slave4Config && commonUtils.isNotEmptyArr(slave4Column) && slave4Config.sTbName !== "sysbillcheckresult") {
+ data.push(commonBusiness.mergeData("slave4", slave4Config.sTbName, slave4Data, slave4DelData));
}
- if(commonUtils.isNotEmptyArr(configNameList)) {
+ if (commonUtils.isNotEmptyArr(configNameList)) {
configNameList.forEach(tbName => {
- const {
- [`${tbName}Config`]: tableConfig,
- [`${tbName}Data`]: tableData,
- [`${tbName}DelData`]: tableDelData
- } = this.props;
- if (tableConfig && tableConfig.sTbName && tableConfig.sSqlStr !== "noQuery"
- && tbName!=='slave' && tbName!=='slave0' && tbName!=='slave1' && tbName!=='slave2' && tbName!=='slave3'
- && tbName!=='slave4') {
+ const { [`${tbName}Config`]: tableConfig, [`${tbName}Data`]: tableData, [`${tbName}DelData`]: tableDelData } = this.props;
+ if (
+ tableConfig &&
+ tableConfig.sTbName &&
+ tableConfig.sSqlStr !== "noQuery" &&
+ tbName !== "slave" &&
+ tbName !== "slave0" &&
+ tbName !== "slave1" &&
+ tbName !== "slave2" &&
+ tbName !== "slave3" &&
+ tbName !== "slave4"
+ ) {
const tableDataNew = tbName === "master" ? [tableData] : tableData;
- data.push(
- commonBusiness.mergeData(
- tbName,
- tableConfig.sTbName,
- tableDataNew,
- tableDelData
- )
- );
+ data.push(commonBusiness.mergeData(tbName, tableConfig.sTbName, tableDataNew, tableDelData));
}
});
}
- this.handleSaveData({ data, sClientType: '1', sSysLogSrcId: masterData.sId });
+ this.handleSaveData({ data, sClientType: "1", sSysLogSrcId: masterData.sId });
}
});
};
/* 切换作废状态 */
- handleOkChangeInvaild = async (props) => {
- const {
- sModelsId, masterData, masterConfig, handleType,
- } = props;
+ handleOkChangeInvaild = async props => {
+ const { sModelsId, masterData, masterConfig, handleType } = props;
const value = {
- sClientType: '1',
+ sClientType: "1",
sId: [masterData.sId],
sTableName: masterConfig.sTbName,
handleType,
@@ -1812,7 +2048,7 @@ export default (ChildComponent) => {
const { data } = await commonServices.postValueService(props.app.token, value, url);
if (data.code === 1) {
message.success(data.msg);
- masterData.bInvalid = handleType === 'toVoid'; /* 作废状态 */
+ masterData.bInvalid = handleType === "toVoid"; /* 作废状态 */
props.onSaveState({ masterData });
/* 审核(消审)后刷新跳转路由数据（commonList）的数据 */
if (props.app.currentPane.refresh !== undefined) {
@@ -1824,7 +2060,7 @@ export default (ChildComponent) => {
};
/* 作废、取消作废的公用函数 */
- handleInvalid = (obj) => {
+ handleInvalid = obj => {
const props = { ...this.props, ...this.state, ...obj };
const onOkInvaild = this.handleOkChangeInvaild;
confirm({
@@ -1832,8 +2068,7 @@ export default (ChildComponent) => {
onOk() {
onOkInvaild(props);
},
- onCancel() {
- },
+ onCancel() {},
});
};
@@ -1842,17 +2077,17 @@ export default (ChildComponent) => {
/* 待用数据声明 */
const { dispatch, sTabId } = this.props;
dispatch({
- type: 'content/onRouter',
+ type: "content/onRouter",
payload: {
- url: `${commonConfig.server_host}gdsmodule/getGdsmoduleById/${sActiveId}?sModelsId=${sActiveId}`, /* 接口地址 */
- sParentId: sTabId, /* 父页面编号 */
+ url: `${commonConfig.server_host}gdsmodule/getGdsmoduleById/${sActiveId}?sModelsId=${sActiveId}` /* 接口地址 */,
+ sParentId: sTabId /* 父页面编号 */,
checkedId: sId,
},
});
};
/* 上查下查三级菜单 在上一条下一条时必须清除searchUpDownData */
- handleSearchUpDownThird = async (upDownKey) => {
+ handleSearchUpDownThird = async upDownKey => {
/* 待用数据声明 */
const { masterConfig, searchUpDownData: searchUpDownDataOld } = this.props;
/** 获取sqlCondition参数：{sSqlCondition,sId} */
@@ -1871,12 +2106,10 @@ export default (ChildComponent) => {
/* 单据页复制到 */
handleCopyTo = (name, sActiveId) => {
/* 待用数据声明 */
- const {
- dispatch, masterConfig, slave1Data, masterData, slaveData, slave2Data, slave0Data, slave3Data, slave4Data,
- } = this.props;
+ const { dispatch, masterConfig, slave1Data, masterData, slaveData, slave2Data, slave0Data, slave3Data, slave4Data } = this.props;
// 从表有sCopyToCondition则不能复制，并提示
- if (commonUtils.isNotEmptyArr(slaveData) && name.includes('.')) {
+ if (commonUtils.isNotEmptyArr(slaveData) && name.includes(".")) {
const sCopyToConditionIndex = slaveData.findIndex(item => item.sCopyToCondition);
if (sCopyToConditionIndex !== -1) {
message.warning(slaveData[sCopyToConditionIndex].sCopyToCondition);
@@ -1896,15 +2129,15 @@ export default (ChildComponent) => {
copyTo.slave3Data = slave3Data;
copyTo.slave4Data = slave4Data;
dispatch({
- type: 'content/onRouter',
+ type: "content/onRouter",
payload: {
- url: `${commonConfig.server_host}gdsmodule/getGdsmoduleById/${sActiveId}?sModelsId=${sActiveId}`, /* 接口地址 */
+ url: `${commonConfig.server_host}gdsmodule/getGdsmoduleById/${sActiveId}?sModelsId=${sActiveId}` /* 接口地址 */,
copyTo,
},
});
};
- handleCopyFrom = async (obj) => {
+ handleCopyFrom = async obj => {
// const {
// slaveData, masterData, masterConfig,
// } = this.props;
@@ -1922,10 +2155,15 @@ export default (ChildComponent) => {
const dataReturn = (await commonServices.getService(token, url)).data;
if (dataReturn.code === 1) {
const returnData = dataReturn.dataset.rows[0];
- if (obj.copyFromKey.includes('customizeFormInfo')) { /* 复制从自定义窗体 */
+ if (obj.copyFromKey.includes("customizeFormInfo")) {
+ /* 复制从自定义窗体 */
this.props.onSaveState({ copyFromChooseVisible: true, copyFromChooseData: returnData, copyFromKey: obj.copyFromKey });
} else {
- this.props.onSaveState({ productProcessInfoChooseVisible: true, productProcessInfoChooseData: returnData, productProcessInfoCopyFromKey: obj.copyFromKey });
+ this.props.onSaveState({
+ productProcessInfoChooseVisible: true,
+ productProcessInfoChooseData: returnData,
+ productProcessInfoCopyFromKey: obj.copyFromKey,
+ });
}
} else {
this.props.getServiceError(dataReturn);
@@ -1933,24 +2171,37 @@ export default (ChildComponent) => {
};
/* 上一条、下一条、首条、末条 */
- handleSearchData = async (handleType) => {
+ handleSearchData = async handleType => {
const {
- sModelsId, app, currentIndexFlag, currentPageNo, masterData, sSrcModelsId,
- masterConfig, slaveConfig, slave0Config, slave1Config, slave2Config, slave3Config, slave4Config,
+ sModelsId,
+ app,
+ currentIndexFlag,
+ currentPageNo,
+ masterData,
+ sSrcModelsId,
+ masterConfig,
+ slaveConfig,
+ slave0Config,
+ slave1Config,
+ slave2Config,
+ slave3Config,
+ slave4Config,
} = this.props;
- let { sBillIdsArray = []} = this.props;
+ let { sBillIdsArray = [] } = this.props;
let { currentId } = this.props;
const { currentPane, token } = app;
- const tipLast = commonFunc.showLocalMessage(this.props, 'tipLast', '当前已经是最后一条');
- const tipFirst = commonFunc.showLocalMessage(this.props, 'tipFirst', '当前已经是第一条');
- let {
- pages, sFilterOrderBy, bFilter, sListFormmasterId, currentIndex, fromKey,
- } = currentPane;
- if (fromKey === '1') {
- const fromKeyConfig = masterConfig.gdsconfigformslave.find(i => i && i.sName === 'sListFormmasterId');
+ const tipLast = commonFunc.showLocalMessage(this.props, "tipLast", "当前已经是最后一条");
+ const tipFirst = commonFunc.showLocalMessage(this.props, "tipFirst", "当前已经是第一条");
+ let { pages, sFilterOrderBy, bFilter, sListFormmasterId, currentIndex, fromKey } = currentPane;
+ if (fromKey === "1") {
+ const fromKeyConfig = masterConfig.gdsconfigformslave.find(i => i && i.sName === "sListFormmasterId");
if (fromKeyConfig) sListFormmasterId = fromKeyConfig.sActiveKey;
}
- let currentPosition = currentIndexFlag ? currentPageNo : commonUtils.isEmptyObject(pages) ? 1 : (((pages.current - 1) * commonConfig.pageSize) + Number.parseInt(currentIndex, 10)) + 1;
+ let currentPosition = currentIndexFlag
+ ? currentPageNo
+ : commonUtils.isEmptyObject(pages)
+ ? 1
+ : (pages.current - 1) * commonConfig.pageSize + Number.parseInt(currentIndex, 10) + 1;
if (currentIndex === undefined) {
currentPosition = 1;
}
@@ -1959,24 +2210,25 @@ export default (ChildComponent) => {
// } else if (handleType === 'end') {
// currentPosition = pages.total;
// }
- if (!commonUtils.isNum(currentPosition)) { // 如果是列表直接点增加，就跳到第一条去
+ if (!commonUtils.isNum(currentPosition)) {
+ // 如果是列表直接点增加，就跳到第一条去
currentPosition = 1;
}
- let bExist = false;
+ let bExist = false;
/* 如果sBillIdsArray已存在 则不请求 */
- if(commonUtils.isNotEmptyArr(sBillIdsArray) && sBillIdsArray.length > 0) {
- const index = sBillIdsArray.indexOf(currentId);
- if(index > -1) {
+ if (commonUtils.isNotEmptyArr(sBillIdsArray) && sBillIdsArray.length > 0) {
+ const index = sBillIdsArray.indexOf(currentId);
+ if (index > -1) {
if ("next".includes(handleType)) {
currentPosition = index + 1;
- if(currentPosition > sBillIdsArray.length - 1 ){
+ if (currentPosition > sBillIdsArray.length - 1) {
message.warn(tipLast);
- return ;
+ return;
}
} else if ("up".includes(handleType)) {
- if(index === 0){
+ if (index === 0) {
message.warn(tipFirst);
- return ;
+ return;
}
currentPosition = index - 1;
} else if ("first".includes(handleType)) {
@@ -1992,20 +2244,27 @@ export default (ChildComponent) => {
}
}
/* 如果是第一次请求 */
- if(!bExist) {
- const bFromList = commonUtils.isEmptyObject(pages) ? true: false;
- if(bFromList) {
- if(handleType ==='next' || handleType ==='end') {
+ if (!bExist) {
+ const bFromList = commonUtils.isEmptyObject(pages) ? true : false;
+ if (bFromList) {
+ if (handleType === "next" || handleType === "end") {
message.warn(tipLast);
- return ;
- }else {
+ return;
+ } else {
message.warn(tipFirst);
- return ;
+ return;
}
}
const value = {
- sClientType: '1', sFilterOrderBy, bFilter, sListFormmasterId, currentPosition, handleType, iCountSum: pages.total,
- sUpId: masterData?.sId, sParentModelId :sSrcModelsId,
+ sClientType: "1",
+ sFilterOrderBy,
+ bFilter,
+ sListFormmasterId,
+ currentPosition,
+ handleType,
+ iCountSum: pages.total,
+ sUpId: masterData?.sId,
+ sParentModelId: sSrcModelsId,
};
const url = `${commonConfig.server_host}business/getBusinessDataByIndex?sModelsId=${sModelsId}`;
/* 接收返回值 */
@@ -2017,39 +2276,40 @@ export default (ChildComponent) => {
const returnData = data.dataset.rows[0];
/* 拿到接口返回的sBillids */
- console.log('returnData', returnData);
+ console.log("returnData", returnData);
const sBillIds = returnData.sBillIds;
- if(commonUtils.isNotEmptyArr(sBillIds)) {
- sBillIdsArray = sBillIds;
+ if (commonUtils.isNotEmptyArr(sBillIds)) {
+ sBillIdsArray = sBillIds;
}
currentId = returnData.sId;
currentPosition = returnData.currentPosition;
- } else { /* 失败 */
+ } else {
+ /* 失败 */
this.props.getServiceError(data);
return false;
}
-
}
- this.props.onSaveState({
- currentIndexFlag: true,
- currentPageNo: currentPosition,
- currentId,
- searchUpDownData: {},
- slaveSelectedRowKeys: [],
- sBillIdsArray,
- },
- () => {
+ this.props.onSaveState(
+ {
+ currentIndexFlag: true,
+ currentPageNo: currentPosition,
+ currentId,
+ searchUpDownData: {},
+ slaveSelectedRowKeys: [],
+ sBillIdsArray,
+ },
+ () => {
this.handleGetData(masterConfig, slaveConfig, slave0Config, slave1Config, slave2Config, slave3Config, slave4Config);
- });
+ }
+ );
return true;
};
- handleCancel = (obj) => {
+ handleCancel = obj => {
/* 待用数据声明 */
const that = this;
- const {
- currentId, masterConfig, slaveConfig,slave0Config, slave1Config, slave2Config, slave3Config, slave4Config, app, masterData,
- } = this.props;
+ const { currentId, masterConfig, slaveConfig, slave0Config, slave1Config, slave2Config, slave3Config, slave4Config, app, masterData } =
+ this.props;
const { userinfo } = app;
const onSendSocketMessage = this.props.handleSendSocketMessage;
const onGetDataOk = this.handleGetData;
@@ -2069,31 +2329,40 @@ export default (ChildComponent) => {
newPanes.push(item);
}
});
- that.props.dispatch({ type: 'app/removePane', payload: { changePanes: newPanes, currentPane: panes[currentPaneIndex - 1] } });/* 关闭当前页签 */
+ that.props.dispatch({
+ type: "app/removePane",
+ payload: { changePanes: newPanes, currentPane: panes[currentPaneIndex - 1] },
+ }); /* 关闭当前页签 */
}
/* 复制到新增页签取消时 关闭页签 并清除操作记录 */
if (commonUtils.isNotEmptyObject(copyTo)) {
const { slaveData, srcFormRoute, copyOtherData } = copyTo;
- if (commonUtils.isNotEmptyObject(srcFormRoute) && srcFormRoute.includes('materialRequirementsPlanning')) { /* 物料需求计划用sWorkOrderMaterialId作为唯一键 */
+ if (commonUtils.isNotEmptyObject(srcFormRoute) && srcFormRoute.includes("materialRequirementsPlanning")) {
+ /* 物料需求计划用sWorkOrderMaterialId作为唯一键 */
const sIdArray = [];
- if (commonUtils.isNotEmptyArr(copyOtherData) && copyOtherData[0].name === 'detail' && commonUtils.isNotEmptyArr(copyOtherData[0].data)) {
+ if (
+ commonUtils.isNotEmptyArr(copyOtherData) &&
+ copyOtherData[0].name === "detail" &&
+ commonUtils.isNotEmptyArr(copyOtherData[0].data)
+ ) {
const slaveDetailData = copyOtherData[0].data;
- slaveDetailData.forEach((item) => {
+ slaveDetailData.forEach(item => {
const redisKey = item.sWorkOrderMaterialId;
sIdArray.push(redisKey);
});
- } else { /* 变更单、采购申请单 */
- slaveData.forEach((item) => {
+ } else {
+ /* 变更单、采购申请单 */
+ slaveData.forEach(item => {
const redisKey = item.sWorkOrderMaterialId;
sIdArray.push(redisKey);
});
}
const sId = sIdArray.toString();
- onSendSocketMessage('copyfinish', 'noAction', sId, userinfo.sId, null, null);
+ onSendSocketMessage("copyfinish", "noAction", sId, userinfo.sId, null, null);
} else if (commonUtils.isNotEmptyArr(slaveData)) {
const sIdArray = [];
- slaveData.forEach((item) => {
+ slaveData.forEach(item => {
const redisKey = item.sSlaveId;
sIdArray.push(redisKey);
});
@@ -2102,34 +2371,34 @@ export default (ChildComponent) => {
sIdArray.push(masterData.sSrcSlaveId);
}
const sId = sIdArray.toString();
- onSendSocketMessage('copyfinish', 'noAction', sId, userinfo.sId, null, null);
- } else if (commonUtils.isNotEmptyObject(masterData) && commonUtils.isNotEmptyObject(masterData.sSrcSlaveId)) {
+ onSendSocketMessage("copyfinish", "noAction", sId, userinfo.sId, null, null);
+ } else if (commonUtils.isNotEmptyObject(masterData) && commonUtils.isNotEmptyObject(masterData.sSrcSlaveId)) {
const sIdArray = [];
/* 处理只有单主表解锁问题 */
sIdArray.push(masterData.sSrcSlaveId);
const sId = sIdArray.toString();
- onSendSocketMessage('copyfinish', 'noAction', sId, userinfo.sId, null, null);
+ onSendSocketMessage("copyfinish", "noAction", sId, userinfo.sId, null, null);
}
}
return;
}
- const bChanged = commonBusiness.handleGetChanged(that.props) ;
- if(bChanged) {
+ const bChanged = commonBusiness.handleGetChanged(that.props);
+ if (bChanged) {
onGetDataOk(masterConfig, slaveConfig, slave0Config, slave1Config, slave2Config, slave3Config, slave4Config);
}
onSaveStateOk({ enabled: false });
if (commonUtils.isNotEmptyObject(copyTo)) {
const { slaveData } = copyTo;
const sIdArray = [];
- slaveData.forEach((item) => {
+ slaveData.forEach(item => {
const redisKey = item.sSlaveId;
sIdArray.push(redisKey);
});
const sId = sIdArray.toString();
- onSendSocketMessage('copyfinish', 'noAction', sId, userinfo.sId, null, null);
+ onSendSocketMessage("copyfinish", "noAction", sId, userinfo.sId, null, null);
}
- onSendSocketMessage('release', 'noAction', currentId, userinfo.sId, null, null);
+ onSendSocketMessage("release", "noAction", currentId, userinfo.sId, null, null);
},
// onOk() {
// if (!currentId) {
@@ -2165,13 +2434,12 @@ export default (ChildComponent) => {
// }
// onSendSocketMessage('release', 'noAction', currentId, userinfo.sId, null, null);
// },
- onCancel() {
- },
+ onCancel() {},
});
};
/* 删除 */
- handleDel = (obj) => {
+ handleDel = obj => {
const props = { ...this.props, ...this.state };
const onOkDel = this.handleOkDel;
confirm({
@@ -2179,32 +2447,30 @@ export default (ChildComponent) => {
onOk() {
onOkDel(props);
},
- onCancel() {
- },
+ onCancel() {},
});
};
/* 确定要删除 */
- handleOkDel = async (props) => {
+ handleOkDel = async props => {
/* 数据参数 */
- const {
- token, sModelsId, sModelsType, masterConfig, masterData, slaveConfig, slave1Config, orderDetailConfig, app, formData,
- } = props;
+ const { token, sModelsId, sModelsType, masterConfig, masterData, slaveConfig, slave1Config, orderDetailConfig, app, formData } = props;
const { userinfo, systemData } = app;
const { sMakePerson } = masterData; /* 本单据制单人 */
- const { sUserName, sType } = userinfo;/* 登录用户 */
- const iIndex = systemData.findIndex(item => item.sName === 'CkxModifyBillNoMakePerson');
+ const { sUserName, sType } = userinfo; /* 登录用户 */
+ const iIndex = systemData.findIndex(item => item.sName === "CkxModifyBillNoMakePerson");
if (iIndex > -1) {
const sValue = systemData[iIndex].sValue;
- if (sValue === '0') { /* 系统未启用非制单人修改单据，普通用户非制单人不可以修改制单人的单据 */
- if (sType !== 'sysadmin' && sUserName !== sMakePerson) {
- message.error(commonFunc.showMessage(app.commonConst, 'NoDelByNoMakePerson'));
+ if (sValue === "0") {
+ /* 系统未启用非制单人修改单据，普通用户非制单人不可以修改制单人的单据 */
+ if (sType !== "sysadmin" && sUserName !== sMakePerson) {
+ message.error(commonFunc.showMessage(app.commonConst, "NoDelByNoMakePerson"));
return;
}
}
}
const value = {
- sClientType: '1',
+ sClientType: "1",
data: {
sMasterTable: masterConfig.sTbName,
sId: [masterData.sId],
@@ -2214,29 +2480,28 @@ export default (ChildComponent) => {
if (commonUtils.isNotEmptyObject(slaveConfig)) {
sSlaveTable.push({
tableName: slaveConfig.sTbName,
- relationName: 'sParentId',
+ relationName: "sParentId",
});
}
if (commonUtils.isNotEmptyObject(slave1Config)) {
sSlaveTable.push({
tableName: slave1Config.sTbName,
- relationName: 'sParentId',
+ relationName: "sParentId",
});
}
- if (sModelsType === 'purchase/purchaseOrder') {
- let orderDetailConfig ={};
- let orderDetailConfigArr = formData.filter(item => item.bGrd && item.sTbName === 'purpurchaseorderDetail');
- if(commonUtils.isNotEmptyArr(orderDetailConfigArr)) {
+ if (sModelsType === "purchase/purchaseOrder") {
+ let orderDetailConfig = {};
+ let orderDetailConfigArr = formData.filter(item => item.bGrd && item.sTbName === "purpurchaseorderDetail");
+ if (commonUtils.isNotEmptyArr(orderDetailConfigArr)) {
orderDetailConfig = orderDetailConfigArr[0];
}
- if(commonUtils.isNotEmptyObject(orderDetailConfig)) {
+ if (commonUtils.isNotEmptyObject(orderDetailConfig)) {
sSlaveTable.push({
tableName: orderDetailConfig.sTbName,
- relationName: 'sParentId',
+ relationName: "sParentId",
});
}
-
}
value.sSlaveTable = sSlaveTable;
const { sBillNo, sId } = masterData || {};
@@ -2249,13 +2514,14 @@ export default (ChildComponent) => {
this.props.app.currentPane.refresh();
}
this.handleDelDataSuccess(props);
- } else { /* 失败 */
+ } else {
+ /* 失败 */
this.props.getServiceError(data);
}
};
/* 数据删除成功跳转到新路由即pane */
- handleDelDataSuccess = (props) => {
+ handleDelDataSuccess = props => {
const { app } = props;
let { panes, currentPane } = app;
/* 删除单据后退出当前路由后,标签panes变化后的集合 */
@@ -2268,19 +2534,19 @@ export default (ChildComponent) => {
/** 添加表格空行 */
handleTableAdd = (name, isWait) => {
/* 从CommonBase获取默认参数 */
- const {
- masterData, masterConfig, sModelsType, app,
- } = this.props;
+ const { masterData, masterConfig, sModelsType, app } = this.props;
let { [`${name}Data`]: tableData } = this.props;
tableData = commonUtils.isEmptyObject(tableData) ? [] : tableData;
const tableDataRow = this.props.onDataRowAdd(name, true);
/* 添加行的业务处理拿出去 */
- if (sModelsType.includes('sales/')) {
+ if (sModelsType.includes("sales/")) {
if (commonUtils.isEmptyStr(masterData.sCustomerId)) {
- const iIndex = masterConfig.gdsconfigformslave.findIndex(item => ((item.sName === 'sCustomerId' || item.sName === 'sCustomerNo' || item.sName === 'sCustomerName') && item.bVisible));
+ const iIndex = masterConfig.gdsconfigformslave.findIndex(
+ item => (item.sName === "sCustomerId" || item.sName === "sCustomerNo" || item.sName === "sCustomerName") && item.bVisible
+ );
if (iIndex > -1) {
const { showName } = masterConfig.gdsconfigformslave[iIndex];
- message.warn(showName + commonFunc.showMessage(app.commonConst, 'isNotNull')); // 不能为空
+ message.warn(showName + commonFunc.showMessage(app.commonConst, "isNotNull")); // 不能为空
return;
}
}
@@ -2298,7 +2564,11 @@ export default (ChildComponent) => {
return tableDataRow;
} else if (commonUtils.isNotEmptyObject(tableDataRow)) {
tableData.push(tableDataRow);
- this.props.onSaveState({ [`${name}Data`]: tableData, [`${name}Pagination`]: { total: tableData.length, current: 9999 }, [`${name}SelectedRowKeys`]: [tableDataRow.sId] });
+ this.props.onSaveState({
+ [`${name}Data`]: tableData,
+ [`${name}Pagination`]: { total: tableData.length, current: 9999 },
+ [`${name}SelectedRowKeys`]: [tableDataRow.sId],
+ });
}
};
@@ -2306,55 +2576,61 @@ export default (ChildComponent) => {
handleTableAddChild = (name, flag, bchild) => {
/* 从CommonBase获取默认参数 */
const {
- masterData, masterConfig, sModelsType, app, [`${name}Pagination`]: tablePagination, slaveSelectedRowKeys,[`${name}SelectedRowKeys`]: tableSelectedRowKeys,
+ masterData,
+ masterConfig,
+ sModelsType,
+ app,
+ [`${name}Pagination`]: tablePagination,
+ slaveSelectedRowKeys,
+ [`${name}SelectedRowKeys`]: tableSelectedRowKeys,
} = this.props;
let { [`${name}Data`]: tableData } = this.props;
tableData = commonUtils.isEmptyObject(tableData) ? [] : tableData;
- if(name === 'slave' && bchild === 'childNode') {
+ if (name === "slave" && bchild === "childNode") {
const tableDataRow = this.props.onDataRowAdd(name, true);
- if(commonUtils.isEmptyArr(tableSelectedRowKeys)) {
- message.error('请选择数据!');
- return ;
+ if (commonUtils.isEmptyArr(tableSelectedRowKeys)) {
+ message.error("请选择数据!");
+ return;
}
const iSlaveIndex = tableData.findIndex(item => item.sId === tableSelectedRowKeys[0]);
if (iSlaveIndex > -1) {
const slaveRow = tableData[iSlaveIndex];
- if(commonUtils.isNotEmptyObject(slaveRow)) {
+ if (commonUtils.isNotEmptyObject(slaveRow)) {
tableDataRow.sFatherSlaveId = slaveRow.sId;
if (commonUtils.isNotEmptyObject(tableDataRow)) {
tableData.push(tableDataRow);
- this.props.onSaveState({ [`${name}Data`]: tableData, [`${name}Pagination`]: { ...tablePagination, total: tableData.length, current: 9999 }, [`${name}SelectedRowKeys`]: [tableDataRow.sId] });
+ this.props.onSaveState({
+ [`${name}Data`]: tableData,
+ [`${name}Pagination`]: { ...tablePagination, total: tableData.length, current: 9999 },
+ [`${name}SelectedRowKeys`]: [tableDataRow.sId],
+ });
}
}
}
-
}
-
};
/** 复制 */
handleTableCopy = (name, isWait) => {
- const {
- [`${name}Data`]: tableData, [`${name}SelectedRowKeys`]: tableSelectedRowKeys,
- } = this.props;
+ const { [`${name}Data`]: tableData, [`${name}SelectedRowKeys`]: tableSelectedRowKeys } = this.props;
if (commonUtils.isEmptyArr(tableSelectedRowKeys)) {
- message.warn(commonFunc.showMessage(this.props.app.commonConst, 'pleaseChooseCopyData'));/* 请选择复制数据 */
+ message.warn(commonFunc.showMessage(this.props.app.commonConst, "pleaseChooseCopyData")); /* 请选择复制数据 */
} else {
for (const sId of tableSelectedRowKeys) {
const tableDataIndex = tableData.findIndex(item => item.sId === sId);
if (tableDataIndex > -1) {
const tableDataRow = JSON.parse(JSON.stringify(tableData[tableDataIndex]));
tableDataRow.sId = commonUtils.createSid();
- tableDataRow.handleType = 'add';
+ tableDataRow.handleType = "add";
tableDataRow.key = tableDataRow.sId;
- tableDataRow.sSrcSlaveId = '';
- tableDataRow.sSrcId = '';
+ tableDataRow.sSrcSlaveId = "";
+ tableDataRow.sSrcId = "";
tableDataRow.dSrcQty = null;
if (commonUtils.isNotEmptyObject(tableDataRow.sMaterialsMemo)) {
- tableDataRow.sMaterialsMemo = '';
+ tableDataRow.sMaterialsMemo = "";
}
if (commonUtils.isNotEmptyObject(tableDataRow.sProcessMemo)) {
- tableDataRow.sProcessMemo = '';
+ tableDataRow.sProcessMemo = "";
}
if (isWait) {
return tableDataRow;
@@ -2368,26 +2644,27 @@ export default (ChildComponent) => {
};
handleTableCopyTo = (name, toname, isWait) => {
- const {
- [`${name}Data`]: tableData, [`${toname}Data`]: tablePersonData, [`${name}SelectedRowKeys`]: tableSelectedRowKeys,
- } = this.props;
+ const { [`${name}Data`]: tableData, [`${toname}Data`]: tablePersonData, [`${name}SelectedRowKeys`]: tableSelectedRowKeys } = this.props;
if (commonUtils.isEmptyArr(tableSelectedRowKeys)) {
- message.warn(commonFunc.showMessage(this.props.app.commonConst, 'pleaseChooseCopyData'));/* 请选择复制数据 */
+ message.warn(commonFunc.showMessage(this.props.app.commonConst, "pleaseChooseCopyData")); /* 请选择复制数据 */
} else {
for (const sId of tableSelectedRowKeys) {
const tableDataIndex = tableData.findIndex(item => item.sId === sId);
if (tableDataIndex > -1) {
const tableDataRow = JSON.parse(JSON.stringify(tableData[tableDataIndex]));
tableDataRow.sId = commonUtils.createSid();
- tableDataRow.handleType = 'add';
+ tableDataRow.handleType = "add";
tableDataRow.key = tableDataRow.sId;
if (isWait) {
return tableDataRow;
} else if (commonUtils.isNotEmptyObject(tableDataRow)) {
if (commonUtils.isNotEmptyObject(toname)) {
tablePersonData.push(tableDataRow);
- this.props.onSaveState({ [`${toname}Data`]: tablePersonData, [`${toname}Pagination`]: { total: tablePersonData.length, current: 9999 } });
- message.success('操作成功！');
+ this.props.onSaveState({
+ [`${toname}Data`]: tablePersonData,
+ [`${toname}Pagination`]: { total: tablePersonData.length, current: 9999 },
+ });
+ message.success("操作成功！");
} else {
tableData.push(tableDataRow);
this.props.onSaveState({ [`${name}Data`]: tableData, [`${name}Pagination`]: { total: tableData.length, current: 9999 } });
@@ -2400,70 +2677,80 @@ export default (ChildComponent) => {
/** 复制全部 */
handleTableCopyAll = (name, isWait) => {
- const {
- slaveData, controlData, slaveSelectedRowKeys, slave0Data,
- } = this.props;
+ const { slaveData, controlData, slaveSelectedRowKeys, slave0Data } = this.props;
let { processData } = this.props;
- if (name === 'slave') {
+ if (name === "slave") {
if (commonUtils.isEmptyArr(slaveSelectedRowKeys)) {
- message.warn(commonFunc.showMessage(this.props.app.commonConst, 'pleaseChooseCopyData'));/* 请选择复制数据 */
+ message.warn(commonFunc.showMessage(this.props.app.commonConst, "pleaseChooseCopyData")); /* 请选择复制数据 */
} else {
for (const sId of slaveSelectedRowKeys) {
const slaveDataIndex = slaveData.findIndex(item => item.sId === sId);
if (slaveDataIndex > -1) {
const slaveDataRow = JSON.parse(JSON.stringify(slaveData[slaveDataIndex]));
slaveDataRow.sId = commonUtils.createSid();
- slaveDataRow.handleType = 'add';
+ slaveDataRow.handleType = "add";
slaveDataRow.key = slaveDataRow.sId;
slaveData.push(slaveDataRow);
if (commonUtils.isNotEmptyArr(controlData)) {
- controlData.filter(itemControl => itemControl.sSlaveId === sId).forEach((itemControl) => {
- const tableDataRow = JSON.parse(JSON.stringify(itemControl));
- tableDataRow.sId = commonUtils.createSid();
- tableDataRow.handleType = 'add';
- tableDataRow.key = tableDataRow.sId;
- tableDataRow.sSlaveId = slaveDataRow.sId;
- controlData.push(tableDataRow);
- /* 部件表复制其材料表、工序表 */
- slave0Data.filter(item => item.sControlId === itemControl.sId && item.sType !== '2').forEach((item) => {
- const slave0Row = JSON.parse(JSON.stringify(item));
+ controlData
+ .filter(itemControl => itemControl.sSlaveId === sId)
+ .forEach(itemControl => {
+ const tableDataRow = JSON.parse(JSON.stringify(itemControl));
+ tableDataRow.sId = commonUtils.createSid();
+ tableDataRow.handleType = "add";
+ tableDataRow.key = tableDataRow.sId;
+ tableDataRow.sSlaveId = slaveDataRow.sId;
+ controlData.push(tableDataRow);
+ /* 部件表复制其材料表、工序表 */
+ slave0Data
+ .filter(item => item.sControlId === itemControl.sId && item.sType !== "2")
+ .forEach(item => {
+ const slave0Row = JSON.parse(JSON.stringify(item));
+ slave0Row.sId = commonUtils.createSid();
+ slave0Row.handleType = "add";
+ slave0Row.sControlId = tableDataRow.sId;
+ slave0Row.sPartsName = tableDataRow.sPartsName;
+ slave0Row.sSlaveId = tableDataRow.sSlaveId;
+ slave0Data.push(slave0Row);
+ });
+ processData
+ .filter(item => item.sControlId === itemControl.sId && item.sType !== "3")
+ .forEach(item => {
+ const processRow = JSON.parse(JSON.stringify(item));
+ processRow.sId = commonUtils.createSid();
+ processRow.handleType = "add";
+ processRow.sControlId = tableDataRow.sId;
+ processRow.sPartsName = tableDataRow.sPartsName;
+ processRow.sSlaveId = tableDataRow.sSlaveId;
+ processData.push(processRow);
+ });
+ processData = this.sortData(controlData, processData);
+ });
+ }
+ if (commonUtils.isNotEmptyArr(slave0Data)) {
+ /* 订单从表复制全部 复制成品材料 */
+ slave0Data
+ .filter(item => item.sSlaveId === sId && item.sType === "2")
+ .forEach(slave0Item => {
+ const slave0Row = JSON.parse(JSON.stringify(slave0Item));
+ slave0Row.handleType = "add";
slave0Row.sId = commonUtils.createSid();
- slave0Row.handleType = 'add';
- slave0Row.sControlId = tableDataRow.sId;
- slave0Row.sPartsName = tableDataRow.sPartsName;
- slave0Row.sSlaveId = tableDataRow.sSlaveId;
+ slave0Row.sSlaveId = slaveDataRow.sId;
slave0Data.push(slave0Row);
});
- processData.filter(item => item.sControlId === itemControl.sId && item.sType !== '3').forEach((item) => {
- const processRow = JSON.parse(JSON.stringify(item));
+ }
+
+ if (commonUtils.isNotEmptyArr(processData)) {
+ /* 订单从表复制全部 复制成品工序 */
+ processData
+ .filter(item => item.sSlaveId === sId && item.sType === "3")
+ .forEach(processItem => {
+ const processRow = JSON.parse(JSON.stringify(processItem));
+ processRow.handleType = "add";
processRow.sId = commonUtils.createSid();
- processRow.handleType = 'add';
- processRow.sControlId = tableDataRow.sId;
- processRow.sPartsName = tableDataRow.sPartsName;
- processRow.sSlaveId = tableDataRow.sSlaveId;
+ processRow.sSlaveId = slaveDataRow.sId;
processData.push(processRow);
});
- processData = this.sortData(controlData, processData);
- });
- }
- if (commonUtils.isNotEmptyArr(slave0Data)) { /* 订单从表复制全部 复制成品材料 */
- slave0Data.filter(item => item.sSlaveId === sId && item.sType === '2').forEach((slave0Item) => {
- const slave0Row = JSON.parse(JSON.stringify(slave0Item));
- slave0Row.handleType = 'add';
- slave0Row.sId = commonUtils.createSid();
- slave0Row.sSlaveId = slaveDataRow.sId;
- slave0Data.push(slave0Row);
- });
- }
-
- if (commonUtils.isNotEmptyArr(processData)) { /* 订单从表复制全部 复制成品工序 */
- processData.filter(item => item.sSlaveId === sId && item.sType === '3').forEach((processItem) => {
- const processRow = JSON.parse(JSON.stringify(processItem));
- processRow.handleType = 'add';
- processRow.sId = commonUtils.createSid();
- processRow.sSlaveId = slaveDataRow.sId;
- processData.push(processRow);
- });
}
}
this.props.onSaveState({
@@ -2475,41 +2762,43 @@ export default (ChildComponent) => {
});
}
}
- } else if (name === 'control') {
- const {
- [`${name}Data`]: tableData, [`${name}SelectedRowKeys`]: tableSelectedRowKeys,
- } = this.props;
+ } else if (name === "control") {
+ const { [`${name}Data`]: tableData, [`${name}SelectedRowKeys`]: tableSelectedRowKeys } = this.props;
if (commonUtils.isEmptyArr(tableSelectedRowKeys)) {
- message.warn(commonFunc.showMessage(this.props.app.commonConst, 'pleaseChooseCopyData'));/* 请选择复制数据 */
+ message.warn(commonFunc.showMessage(this.props.app.commonConst, "pleaseChooseCopyData")); /* 请选择复制数据 */
} else {
for (const sId of tableSelectedRowKeys) {
const tableDataIndex = tableData.findIndex(item => item.sId === sId);
if (tableDataIndex > -1) {
const tableDataRow = JSON.parse(JSON.stringify(tableData[tableDataIndex]));
tableDataRow.sId = commonUtils.createSid();
- tableDataRow.handleType = 'add';
+ tableDataRow.handleType = "add";
tableDataRow.key = tableDataRow.sId;
if (isWait) {
return tableDataRow;
} else if (commonUtils.isNotEmptyObject(tableDataRow)) {
tableData.push(tableDataRow);
/* 部件表复制其材料表、工序表 */
- slave0Data.filter(item => item.sControlId === sId && item.sType !== '2').forEach((item) => {
- const slave0Row = JSON.parse(JSON.stringify(item));
- slave0Row.sId = commonUtils.createSid();
- slave0Row.handleType = 'add';
- slave0Row.sControlId = tableDataRow.sId;
- slave0Row.sPartsName = tableDataRow.sPartsName;
- slave0Data.push(slave0Row);
- });
- processData.filter(item => item.sControlId === sId && item.sType !== '3').forEach((item) => {
- const processRow = JSON.parse(JSON.stringify(item));
- processRow.sId = commonUtils.createSid();
- processRow.handleType = 'add';
- processRow.sControlId = tableDataRow.sId;
- processRow.sPartsName = tableDataRow.sPartsName;
- processData.push(processRow);
- });
+ slave0Data
+ .filter(item => item.sControlId === sId && item.sType !== "2")
+ .forEach(item => {
+ const slave0Row = JSON.parse(JSON.stringify(item));
+ slave0Row.sId = commonUtils.createSid();
+ slave0Row.handleType = "add";
+ slave0Row.sControlId = tableDataRow.sId;
+ slave0Row.sPartsName = tableDataRow.sPartsName;
+ slave0Data.push(slave0Row);
+ });
+ processData
+ .filter(item => item.sControlId === sId && item.sType !== "3")
+ .forEach(item => {
+ const processRow = JSON.parse(JSON.stringify(item));
+ processRow.sId = commonUtils.createSid();
+ processRow.handleType = "add";
+ processRow.sControlId = tableDataRow.sId;
+ processRow.sPartsName = tableDataRow.sPartsName;
+ processData.push(processRow);
+ });
processData = this.sortData(tableData, processData);
this.props.onSaveState({
[`${name}Data`]: tableData,
@@ -2526,11 +2815,11 @@ export default (ChildComponent) => {
handleCloseProductProcessInfoChooseModal = () => {
this.props.onSaveState({
- productProcessInfoChooseVisible: false
- })
- }
+ productProcessInfoChooseVisible: false,
+ });
+ };
- singlePQtyChange = (tableDataRow) => {
+ singlePQtyChange = tableDataRow => {
const bZfZf = tableDataRow.iPrintMode === 2; // 正反版
const bSample = tableDataRow.dSumPQty >= 4; // 样本
tableDataRow.iPrintModePo = tableDataRow.iPrintMode <= 2 ? 2 : tableDataRow.iPrintMode === 3 ? 0 : -1;
@@ -2540,66 +2829,84 @@ export default (ChildComponent) => {
tableDataRow.dPlateQty = Math.ceil(tableDataRow.dSumPQty / tableDataRow.dSinglePQty);
}
- if (bZfZf && (tableDataRow.iPrintModePo === 2)) { // 双面样本，正反
- if (tableDataRow.dPlateQty < 2) { // 不管建议放正自翻版了，点方式什么是什么
+ if (bZfZf && tableDataRow.iPrintModePo === 2) {
+ // 双面样本，正反
+ if (tableDataRow.dPlateQty < 2) {
+ // 不管建议放正自翻版了，点方式什么是什么
tableDataRow.dPlateQty = 2;
tableDataRow.iStick = Math.ceil(commonUtils.isNull(tableDataRow.dPlateQty, 0) / 2);
- tableDataRow.dSumPlateQty = tableDataRow.iStick * (
- commonUtils.isNull(tableDataRow.iPositiveColor, 0) +
- commonUtils.isNull(tableDataRow.iPositiveSpecialColor, 0) +
- commonUtils.isNull(tableDataRow.iOppositeColor, 0) +
- commonUtils.isNull(tableDataRow.iOppositeSpecialColor, 0));
+ tableDataRow.dSumPlateQty =
+ tableDataRow.iStick *
+ (commonUtils.isNull(tableDataRow.iPositiveColor, 0) +
+ commonUtils.isNull(tableDataRow.iPositiveSpecialColor, 0) +
+ commonUtils.isNull(tableDataRow.iOppositeColor, 0) +
+ commonUtils.isNull(tableDataRow.iOppositeSpecialColor, 0));
} else {
- if (tableDataRow.iPrintModePo !== 2) { // 单面样本
+ if (tableDataRow.iPrintModePo !== 2) {
+ // 单面样本
tableDataRow.dPlateQty = (commonUtils.isNull(tableDataRow.dSumPQty, 0) * 0.5) / tableDataRow.dSinglePQty;
tableDataRow.iStick = Math.ceil(tableDataRow.dPlateQty);
- tableDataRow.dSumPlateQty = tableDataRow.iStick * (commonUtils.isNull(tableDataRow.iPositiveColor, 0) +
- commonUtils.isNull(tableDataRow.iPositiveSpecialColor, 0));
+ tableDataRow.dSumPlateQty =
+ tableDataRow.iStick *
+ (commonUtils.isNull(tableDataRow.iPositiveColor, 0) + commonUtils.isNull(tableDataRow.iPositiveSpecialColor, 0));
} else {
- tableDataRow.dPlateQty = commonUtils.isNull(tableDataRow.dSumPQty, 0) / commonUtils.isNull(commonUtils.nullIf(tableDataRow.dSinglePQty, 0), 1);
+ tableDataRow.dPlateQty =
+ commonUtils.isNull(tableDataRow.dSumPQty, 0) / commonUtils.isNull(commonUtils.nullIf(tableDataRow.dSinglePQty, 0), 1);
tableDataRow.iStick = Math.ceil(tableDataRow.dPlateQty / 2);
}
- tableDataRow.dSumPlateQty = tableDataRow.iStick * (
- commonUtils.isNull(tableDataRow.iPositiveColor, 0) +
- commonUtils.isNull(tableDataRow.iPositiveSpecialColor, 0) +
- commonUtils.isNull(tableDataRow.iOppositeColor, 0) +
- commonUtils.isNull(tableDataRow.iOppositeSpecialColor, 0));
+ tableDataRow.dSumPlateQty =
+ tableDataRow.iStick *
+ (commonUtils.isNull(tableDataRow.iPositiveColor, 0) +
+ commonUtils.isNull(tableDataRow.iPositiveSpecialColor, 0) +
+ commonUtils.isNull(tableDataRow.iOppositeColor, 0) +
+ commonUtils.isNull(tableDataRow.iOppositeSpecialColor, 0));
}
} else {
- if (tableDataRow.iPrintModePo !== 2) { // 单面样本
+ if (tableDataRow.iPrintModePo !== 2) {
+ // 单面样本
tableDataRow.dPlateQty = (commonUtils.isNull(tableDataRow.dSumPQty, 0) * 0.5) / tableDataRow.dSinglePQty;
} else {
- tableDataRow.dPlateQty = commonUtils.isNull(tableDataRow.dSumPQty, 0) / commonUtils.isNull(commonUtils.nullIf(tableDataRow.dSinglePQty, 0), 1);
+ tableDataRow.dPlateQty =
+ commonUtils.isNull(tableDataRow.dSumPQty, 0) / commonUtils.isNull(commonUtils.nullIf(tableDataRow.dSinglePQty, 0), 1);
}
tableDataRow.iStick = Math.ceil(tableDataRow.dPlateQty);
- tableDataRow.dSumPlateQty = tableDataRow.iStick * (
- commonUtils.isNull(tableDataRow.iPositiveColor, 0) +
- commonUtils.isNull(tableDataRow.iPositiveSpecialColor, 0));
+ tableDataRow.dSumPlateQty =
+ tableDataRow.iStick * (commonUtils.isNull(tableDataRow.iPositiveColor, 0) + commonUtils.isNull(tableDataRow.iPositiveSpecialColor, 0));
}
if (tableDataRow.iStick > 0 && tableDataRow.dSinglePQty > 0) {
- tableDataRow.dMachineQty = commonUtils.convertFixNum((commonUtils.isNull(tableDataRow.dPartsQty, 0) * commonUtils.isNull(tableDataRow.dSumPQty, 0) * 0.5) / tableDataRow.dSinglePQty / tableDataRow.iStick, 0);
+ tableDataRow.dMachineQty = commonUtils.convertFixNum(
+ (commonUtils.isNull(tableDataRow.dPartsQty, 0) * commonUtils.isNull(tableDataRow.dSumPQty, 0) * 0.5) /
+ tableDataRow.dSinglePQty /
+ tableDataRow.iStick,
+ 0
+ );
tableDataRow.dSumMachineQty = tableDataRow.dMachineQty * tableDataRow.iStick;
}
} else {
tableDataRow.iStick = 1;
- tableDataRow.dSumPlateQty = tableDataRow.iStick * (
- commonUtils.isNull(tableDataRow.iPositiveColor, 0) +
- commonUtils.isNull(tableDataRow.iPositiveSpecialColor, 0) +
- commonUtils.isNull(tableDataRow.iOppositeColor, 0) +
- commonUtils.isNull(tableDataRow.iOppositeSpecialColor, 0));
+ tableDataRow.dSumPlateQty =
+ tableDataRow.iStick *
+ (commonUtils.isNull(tableDataRow.iPositiveColor, 0) +
+ commonUtils.isNull(tableDataRow.iPositiveSpecialColor, 0) +
+ commonUtils.isNull(tableDataRow.iOppositeColor, 0) +
+ commonUtils.isNull(tableDataRow.iOppositeSpecialColor, 0));
if (bZfZf && tableDataRow.iPrintModePo === 2) {
tableDataRow.dPlateQty = 2;
- tableDataRow.dSumPlateQty = tableDataRow.iStick * (commonUtils.isNull(tableDataRow.iPositiveColor, 0) +
- commonUtils.isNull(tableDataRow.iPositiveSpecialColor, 0) + commonUtils.isNull(tableDataRow.iOppositeColor, 0) +
- commonUtils.isNull(tableDataRow.iOppositeSpecialColor, 0));
+ tableDataRow.dSumPlateQty =
+ tableDataRow.iStick *
+ (commonUtils.isNull(tableDataRow.iPositiveColor, 0) +
+ commonUtils.isNull(tableDataRow.iPositiveSpecialColor, 0) +
+ commonUtils.isNull(tableDataRow.iOppositeColor, 0) +
+ commonUtils.isNull(tableDataRow.iOppositeSpecialColor, 0));
} else {
tableDataRow.dPlateQty = 1;
- tableDataRow.dSumPlateQty = tableDataRow.iStick * (commonUtils.isNull(tableDataRow.iPositiveColor, 0) +
- commonUtils.isNull(tableDataRow.iPositiveSpecialColor, 0));
+ tableDataRow.dSumPlateQty =
+ tableDataRow.iStick * (commonUtils.isNull(tableDataRow.iPositiveColor, 0) + commonUtils.isNull(tableDataRow.iPositiveSpecialColor, 0));
}
if (tableDataRow.dSinglePQty > 0) {
- if (tableDataRow.iPage > 1) { // 笔记本 用 非样本 来做， 倍率是每页都一样才可以用 原先 /2 是指页数， 现在直接按张数
+ if (tableDataRow.iPage > 1) {
+ // 笔记本 用 非样本 来做， 倍率是每页都一样才可以用 原先 /2 是指页数， 现在直接按张数
tableDataRow.dMachineQty = commonUtils.convertFixNum((tableDataRow.dPartsQty * tableDataRow.iPage) / tableDataRow.dSinglePQty, 0);
} else {
tableDataRow.dMachineQty = commonUtils.convertFixNum(commonUtils.isNull(tableDataRow.dPartsQty, 0) / tableDataRow.dSinglePQty, 0);
@@ -2614,17 +2921,24 @@ export default (ChildComponent) => {
// name 不写完整的state名称作用为了要用到total // (name, changeValue, sId, dropDownData)
handleTableChange = async (name, sFieldName, changeValue, sId, dropDownData, isWait) => {
/* 从CommonBase获取默认参数 */
- const {
- [`${name}Data`]: tableData, sModelsType, sModelsId, token, app, slaveConfig, slave0Data, slaveData,
- } = this.props;
+ const { [`${name}Data`]: tableData, sModelsType, sModelsId, token, app, slaveConfig, slave0Data, slaveData } = this.props;
const { dNetMoney, dNetPrice } = app.decimals;
- if (name === 'control' && sModelsType === 'sales/salesOrder') {
+ if (name === "control" && sModelsType === "sales/salesOrder") {
const { [`${name}Data`]: tableData, slave0Data: slave0DataOld, slave2Data: slave2DataOld } = this.props;
let tableDataRow = await this.props.onDataChange(name, sFieldName, changeValue, sId, dropDownData, true);
if (tableDataRow === undefined) return;
- if (sFieldName === 'dSinglePQty' || sFieldName === 'dSumPQty' || sFieldName === 'iPrintModePo' || sFieldName === 'iPrintMode' || sFieldName === 'iPrintModePo' || sFieldName === 'iPositiveColor' ||
- sFieldName === 'iPositiveSpecialColor' || sFieldName === 'iOppositeColor' || sFieldName === 'iOppositeSpecialColor') {
- if (sFieldName === 'iPrintModePo') {
+ if (
+ sFieldName === "dSinglePQty" ||
+ sFieldName === "dSumPQty" ||
+ sFieldName === "iPrintModePo" ||
+ sFieldName === "iPrintMode" ||
+ sFieldName === "iPrintModePo" ||
+ sFieldName === "iPositiveColor" ||
+ sFieldName === "iPositiveSpecialColor" ||
+ sFieldName === "iOppositeColor" ||
+ sFieldName === "iOppositeSpecialColor"
+ ) {
+ if (sFieldName === "iPrintModePo") {
if (tableDataRow.iPrintModePo === 0) {
tableDataRow.iPrintMode = 3;
if (tableDataRow.iPositiveColor === 0) {
@@ -2649,9 +2963,10 @@ export default (ChildComponent) => {
tableDataRow.iPositiveColor = tableDataRow.iPositiveColor === 0 ? 4 : tableDataRow.iPositiveColor;
tableDataRow.iOppositeColor = tableDataRow.iOppositeColor === 0 ? tableDataRow.iPositiveColor : tableDataRow.iOppositeColor;
}
- } else if (sFieldName === 'iPrintMode') {
+ } else if (sFieldName === "iPrintMode") {
if (tableDataRow.iPrintMode === 0 || tableDataRow.iPrintMode === 1) {
- tableDataRow.iPositiveColor = commonUtils.isEmpty(tableDataRow.iPositiveColor) || tableDataRow.iPositiveColor === 0 ? 4 : tableDataRow.iPositiveColor;
+ tableDataRow.iPositiveColor =
+ commonUtils.isEmpty(tableDataRow.iPositiveColor) || tableDataRow.iPositiveColor === 0 ? 4 : tableDataRow.iPositiveColor;
tableDataRow.iOppositeColor = tableDataRow.iPositiveColor;
tableDataRow.iOppositeSpecialColor = tableDataRow.iPositiveSpecialColor;
} else if (tableDataRow.iPrintMode === 2) {
@@ -2667,7 +2982,7 @@ export default (ChildComponent) => {
tableDataRow.iOppositeColor = 0;
tableDataRow.iOppositeSpecialColor = 0;
}
- } else if (sFieldName === 'iPositiveColor' || sFieldName === 'iPositiveSpecialColor') {
+ } else if (sFieldName === "iPositiveColor" || sFieldName === "iPositiveSpecialColor") {
if (tableDataRow.iPrintMode === 0 || tableDataRow.iPrintMode === 1) {
tableDataRow.iOppositeColor = tableDataRow.iPositiveColor;
tableDataRow.iOppositeSpecialColor = tableDataRow.iPositiveSpecialColor;
@@ -2677,14 +2992,14 @@ export default (ChildComponent) => {
}
const slave0Data = [];
const slave2Data = [];
- slave0DataOld.forEach((item) => {
+ slave0DataOld.forEach(item => {
const itemNew = { ...item };
if (itemNew.sControlId === sId) {
itemNew.sPartsName = tableDataRow.sPartsName;
}
slave0Data.push(itemNew);
});
- slave2DataOld.forEach((item) => {
+ slave2DataOld.forEach(item => {
const itemNew = { ...item };
if (itemNew.sControlId === sId) {
itemNew.sPartsName = tableDataRow.sPartsName;
@@ -2700,25 +3015,43 @@ export default (ChildComponent) => {
} else {
let { masterData } = this.props;
const iIndex = tableData.findIndex(item => item.sId === sId);
- if (sFieldName.substring(0, 1) === 'd' && commonUtils.convertToNum(tableData[iIndex][sFieldName]) === commonUtils.convertToNum(changeValue[sFieldName])) {
+ if (
+ sFieldName.substring(0, 1) === "d" &&
+ commonUtils.convertToNum(tableData[iIndex][sFieldName]) === commonUtils.convertToNum(changeValue[sFieldName])
+ ) {
if (!(tableData[iIndex][sFieldName] === undefined && commonUtils.convertToNum(changeValue[sFieldName]) === 0)) return;
}
- if (sFieldName === 'sProductName' && name === 'slave' && (sModelsType.includes('sales/salesOrder') || sModelsType.includes('manufacture/workOrder') || sModelsType.includes('quotation/quotation'))) {
+ if (
+ sFieldName === "sProductName" &&
+ name === "slave" &&
+ (sModelsType.includes("sales/salesOrder") || sModelsType.includes("manufacture/workOrder") || sModelsType.includes("quotation/quotation"))
+ ) {
if (commonUtils.isNotEmptyObject(changeValue) && Object.keys(changeValue).length === 1 && Object.keys(changeValue)[0] === sFieldName) {
changeValue.sProductId = changeValue.sProductName;
}
}
let tableDataRow = this.props.onDataChange(name, sFieldName, changeValue, sId, dropDownData, true);
- if ((sFieldName === 'sProductId' || sFieldName === 'sProductName' || sFieldName === 'sProductStyle' || sFieldName === 'sProductUnit' || sFieldName === 'sProductNo'
- || sFieldName === 'sCustomerProductNo' || sFieldName === 'sProductClassifyId' || sFieldName === 'sProductClassifyName') && !commonUtils.isEmpty(tableDataRow.sProductId)) {
+ if (
+ (sFieldName === "sProductId" ||
+ sFieldName === "sProductName" ||
+ sFieldName === "sProductStyle" ||
+ sFieldName === "sProductUnit" ||
+ sFieldName === "sProductNo" ||
+ sFieldName === "sCustomerProductNo" ||
+ sFieldName === "sProductClassifyId" ||
+ sFieldName === "sProductClassifyName") &&
+ !commonUtils.isEmpty(tableDataRow.sProductId)
+ ) {
// const productIdDropDown = commonUtils.getStoreDropDownData(sModelsId, 'slave', sFieldName);
let productIdDropDown;
const slaveIndex = slaveConfig.gdsconfigformslave.findIndex(item => item.sName === sFieldName);
if (slaveIndex > -1) {
- const sqlDropDownData = await this.props.getSqlDropDownData(sModelsId, 'slave', slaveConfig.gdsconfigformslave[slaveIndex]);
+ const sqlDropDownData = await this.props.getSqlDropDownData(sModelsId, "slave", slaveConfig.gdsconfigformslave[slaveIndex]);
productIdDropDown = sqlDropDownData.dropDownData;
}
- const iProductIdIndex = commonUtils.isEmptyArr(productIdDropDown) ? -1 : productIdDropDown.findIndex(item => item.sId === tableDataRow.sProductId);
+ const iProductIdIndex = commonUtils.isEmptyArr(productIdDropDown)
+ ? -1
+ : productIdDropDown.findIndex(item => item.sId === tableDataRow.sProductId);
if (iProductIdIndex === -1) {
tableDataRow.sProductInfo = JSON.stringify({
sProductId: tableDataRow.sProductName,
@@ -2731,13 +3064,16 @@ export default (ChildComponent) => {
sProductClassifyName: tableDataRow.sProductClassifyName,
});
} else {
- tableDataRow.sProductInfo = '';
+ tableDataRow.sProductInfo = "";
}
- if ((sFieldName === 'sProductId' || sFieldName === 'sProductName' || sFieldName === 'sProductNo') && !commonUtils.isEmpty(changeValue.sProductId)) {
+ if (
+ (sFieldName === "sProductId" || sFieldName === "sProductName" || sFieldName === "sProductNo") &&
+ !commonUtils.isEmpty(changeValue.sProductId)
+ ) {
const url = `${commonConfig.server_host}business/getProData?sModelsId=${sModelsId}`;
const { sCustomerId } = masterData; /* 增加客户id参数 */
const value = {
- sProName: 'Sp_Cashier_GetProductPrice',
+ sProName: "Sp_Cashier_GetProductPrice",
paramsMap: {
sProductGuid: changeValue.sProductId,
sCustomerId,
@@ -2751,32 +3087,39 @@ export default (ChildComponent) => {
// this.props.getServiceError(returnData);
// }
}
- } else if (sModelsType === 'sales/salesOrder' && (sFieldName === 'sProductClassifyId' || sFieldName === 'sProductClassifyName') && name === 'slave') {
+ } else if (
+ sModelsType === "sales/salesOrder" &&
+ (sFieldName === "sProductClassifyId" || sFieldName === "sProductClassifyName") &&
+ name === "slave"
+ ) {
const { controlData } = this.props;
if (controlData !== undefined && !commonUtils.isEmpty(tableData.sProductInfo)) {
const controlDataFilter = controlData.filter(item => item.sSlaveId === tableData[iIndex].sId);
const tableSelectedRowKeys = [];
- controlDataFilter.forEach((item) => {
+ controlDataFilter.forEach(item => {
tableSelectedRowKeys.push(item.sId);
});
- const slave0ReturnData = this.otherTableDel('slave0', tableSelectedRowKeys);
- const slave2ReturnData = this.otherTableDel('slave2', tableSelectedRowKeys);
- const slave3ReturnData = this.props.onDataRowDel('slave3', true, tableSelectedRowKeys);
+ const slave0ReturnData = this.otherTableDel("slave0", tableSelectedRowKeys);
+ const slave2ReturnData = this.otherTableDel("slave2", tableSelectedRowKeys);
+ const slave3ReturnData = this.props.onDataRowDel("slave3", true, tableSelectedRowKeys);
this.props.onSaveState({
...slave0ReturnData,
...slave2ReturnData,
...slave3ReturnData,
});
}
- } else if (sModelsType.includes('cashier/') && sFieldName === 'dTotalMoney') { /* 付款单、收款单，从表付款/收款金额改变，会自动汇总到主表付款金额中 */
+ } else if (sModelsType.includes("cashier/") && sFieldName === "dTotalMoney") {
+ /* 付款单、收款单，从表付款/收款金额改变，会自动汇总到主表付款金额中 */
const addStata = {};
addStata.dTotalMoney = 0;
- if (iIndex > -1) { /* 选中行 */
+ if (iIndex > -1) {
+ /* 选中行 */
let dMoney = commonUtils.isNotEmptyNumber(tableDataRow.dTotalMoney) ? tableDataRow.dTotalMoney : 0;
dMoney = commonUtils.convertStrToNumber(dMoney);
addStata.dTotalMoney = dMoney + commonUtils.convertStrToNumber(addStata.dTotalMoney);
}
- tableData.forEach((item, index) => { /* 非选中行 */
+ tableData.forEach((item, index) => {
+ /* 非选中行 */
if (index !== iIndex) {
const dMoney = commonUtils.isNotEmptyNumber(item.dTotalMoney) ? item.dTotalMoney : 0;
addStata.dTotalMoney = commonUtils.convertFixNum(dMoney, 6) + commonUtils.convertFixNum(addStata.dTotalMoney, 6);
@@ -2786,19 +3129,22 @@ export default (ChildComponent) => {
this.props.onSaveState({ masterData });
}
// 取工艺卡数据
- if (sModelsType && sModelsType.includes('sales/salesOrder') && (sFieldName === 'sProductId' || sFieldName === 'sProductNo' || sFieldName === 'sProductName') && name === 'slave') {
- const {
- controlConfig, slave0Config, processConfig,
- } = this.props;
+ if (
+ sModelsType &&
+ sModelsType.includes("sales/salesOrder") &&
+ (sFieldName === "sProductId" || sFieldName === "sProductNo" || sFieldName === "sProductName") &&
+ name === "slave"
+ ) {
+ const { controlConfig, slave0Config, processConfig } = this.props;
let { controlData, slave0Data, processData } = this.props;
const sId = tableData[iIndex].sId;
- const bCkxCopyFromTechnology = app.systemData.filter(item => item.sName === 'CkxCopyFromTechnology')[0].sValue;
- if (bCkxCopyFromTechnology === '1' && tableDataRow.sProductId !== tableDataRow.sProductName) {
- const controlSelectedData = commonUtils.isNotEmptyArr(controlData) ? controlData.filter(item => item.sSlaveId === sId) : [];
+ const bCkxCopyFromTechnology = app.systemData.filter(item => item.sName === "CkxCopyFromTechnology")[0].sValue;
+ if (bCkxCopyFromTechnology === "1" && tableDataRow.sProductId !== tableDataRow.sProductName) {
+ const controlSelectedData = commonUtils.isNotEmptyArr(controlData) ? controlData.filter(item => item.sSlaveId === sId) : [];
if (commonUtils.isNotEmptyObject(controlSelectedData)) {
- const slave0ReturnData = this.otherTableDel('slave0', controlSelectedData);
- const processReturnData = this.otherTableDel('process', controlSelectedData);
- const controlReturnData = this.props.onDataRowDel('control', true, controlSelectedData);
+ const slave0ReturnData = this.otherTableDel("slave0", controlSelectedData);
+ const processReturnData = this.otherTableDel("process", controlSelectedData);
+ const controlReturnData = this.props.onDataRowDel("control", true, controlSelectedData);
controlData = controlReturnData.controlData;
slave0Data = slave0ReturnData.slave0Data;
processData = processReturnData.processData;
@@ -2813,36 +3159,42 @@ export default (ChildComponent) => {
const sProductIdArray = [];
sProductIdArray.push(sProductId);
const sProductIds = sProductIdArray.toString();
- const condition = { sCustomerId, sProductIds, sType:'select' };
+ const condition = { sCustomerId, sProductIds, sType: "select" };
const dataUrl = `${commonConfig.server_host}salesorder/getProcessCardDataByCustomIdProductId/?sModelsId=${sModelsId}`;
const dataReturn = (await commonServices.postValueService(token, condition, dataUrl)).data;
- const config = this.props.masterConfig.gdsconfigformslave.filter(item => item.sControlName.includes('BtnCopyFrom.ActProcessCard'));
+ const config = this.props.masterConfig.gdsconfigformslave.filter(item => item.sControlName.includes("BtnCopyFrom.ActProcessCard"));
if (dataReturn.code === 1) {
const returnData = dataReturn.dataset.rows[0];
- const copyToControlConfig = config.filter(item => item.sControlName.toLowerCase() === 'BtnCopyFrom.ActProcessCard.Control'.toLowerCase());
- const copyToSlave0Config = config.filter(item => item.sControlName.toLowerCase() === 'BtnCopyFrom.ActProcessCard.Slave0'.toLowerCase());
- const copyToProcessConfig = config.filter(item => item.sControlName.toLowerCase() === 'BtnCopyFrom.ActProcessCard.Process'.toLowerCase());
- const controlAssignField = commonUtils.isNotEmptyArr(copyToControlConfig) ? copyToControlConfig[0].sAssignField : '';
- const slave0AssignField = commonUtils.isNotEmptyArr(copyToSlave0Config) ? copyToSlave0Config[0].sAssignField : '';
- const processAssignField = commonUtils.isNotEmptyArr(copyToProcessConfig) ? copyToProcessConfig[0].sAssignField : '';
+ const copyToControlConfig = config.filter(
+ item => item.sControlName.toLowerCase() === "BtnCopyFrom.ActProcessCard.Control".toLowerCase()
+ );
+ const copyToSlave0Config = config.filter(item => item.sControlName.toLowerCase() === "BtnCopyFrom.ActProcessCard.Slave0".toLowerCase());
+ const copyToProcessConfig = config.filter(
+ item => item.sControlName.toLowerCase() === "BtnCopyFrom.ActProcessCard.Process".toLowerCase()
+ );
+ const controlAssignField = commonUtils.isNotEmptyArr(copyToControlConfig) ? copyToControlConfig[0].sAssignField : "";
+ const slave0AssignField = commonUtils.isNotEmptyArr(copyToSlave0Config) ? copyToSlave0Config[0].sAssignField : "";
+ const processAssignField = commonUtils.isNotEmptyArr(copyToProcessConfig) ? copyToProcessConfig[0].sAssignField : "";
const newCopyTo = {};
newCopyTo.master = masterData;
newCopyTo.slave = commonUtils.isEmptyArr(tableData) ? {} : tableData;
/* 订单选择产品 调用工艺卡数据 */
- if(commonUtils.isNotEmptyArr(returnData.slaveData)) {
- returnData.slaveData.forEach((slaveItem) => {
+ if (commonUtils.isNotEmptyArr(returnData.slaveData)) {
+ returnData.slaveData.forEach(slaveItem => {
/* 从工艺卡数据集 找到从表相同产品ID,客户ID */
- if(slaveItem.sProductId === tableDataRow.sProductId) { /* 选中当前行 */
- tableDataRow = { ... tableDataRow, ...commonFunc.getAssignFieldValue(slaveAssignField, slaveItem, newCopyTo) }; // 取赋值字段
+ if (slaveItem.sProductId === tableDataRow.sProductId) {
+ /* 选中当前行 */
+ tableDataRow = { ...tableDataRow, ...commonFunc.getAssignFieldValue(slaveAssignField, slaveItem, newCopyTo) }; // 取赋值字段
// tableDataRow.sFatherSlaveId = slaveItem.sFatherSlaveId;
- tableDataRow.sOriginalId = commonUtils.isNotEmptyObject(slaveItem.sSlaveId) ? slaveItem.sSlaveId : slaveItem.sId; /* 原始sId */
+ tableDataRow.sOriginalId = commonUtils.isNotEmptyObject(slaveItem.sSlaveId) ? slaveItem.sSlaveId : slaveItem.sId; /* 原始sId */
tableDataRow.sBatchNo = tableDataRow.sId; /* 添加批次行 */
- tableData[iIndex] = { ... tableData[iIndex], ...tableDataRow }; // 取赋值字段
- } else{ /* 其他数据 新增 */
+ tableData[iIndex] = { ...tableData[iIndex], ...tableDataRow }; // 取赋值字段
+ } else {
+ /* 其他数据 新增 */
newCopyTo.slave = slaveItem;
- let slaveRow ={};
+ let slaveRow = {};
slaveRow = { ...slaveRow, ...commonFunc.getAssignFieldValue(slaveAssignField, slaveItem, newCopyTo) }; // 取赋值字段
- slaveRow.handleType = 'add';
+ slaveRow.handleType = "add";
slaveRow.sFatherSlaveId = slaveItem.sFatherSlaveId;
slaveRow.sId = commonUtils.createSid();
slaveRow.sParentId = masterData.sId;
@@ -2853,110 +3205,124 @@ export default (ChildComponent) => {
});
}
/* 若有层级 则拼装新的slaveData层级 */
- const tableFilterData = tableData.filter(item => item.sBatchNo ===tableDataRow.sId );
- if(commonUtils.isNotEmptyArr(tableFilterData)) {
- const slaveNewData = commonUtils.genTreeDataByArrSales(tableFilterData, 'sId', 'sFatherSlaveId');
- if(commonUtils.isNotEmptyArr(slaveNewData)) {
- slaveNewData.forEach((item) => {
+ const tableFilterData = tableData.filter(item => item.sBatchNo === tableDataRow.sId);
+ if (commonUtils.isNotEmptyArr(tableFilterData)) {
+ const slaveNewData = commonUtils.genTreeDataByArrSales(tableFilterData, "sId", "sFatherSlaveId");
+ if (commonUtils.isNotEmptyArr(slaveNewData)) {
+ slaveNewData.forEach(item => {
const iIndex = tableData.findIndex(row => row.sId === item.sId);
- if(iIndex > -1) {
- tableData[iIndex] = {...tableData[iIndex], ...item };
+ if (iIndex > -1) {
+ tableData[iIndex] = { ...tableData[iIndex], ...item };
}
- })
+ });
}
}
if (commonUtils.isNotEmptyArr(returnData.controlData)) {
// eslint-disable-next-line no-loop-func
- returnData.controlData.forEach((controlItem) => {
+ returnData.controlData.forEach(controlItem => {
newCopyTo.control = controlItem;
const newSid = commonUtils.createSid();
let controlRow = commonFunc.getDefaultData(controlConfig, newCopyTo, { newSid }); // 取默认值
controlRow = { ...controlRow, ...commonFunc.getAssignFieldValue(controlAssignField, controlItem, newCopyTo) }; // 取赋值字段
- controlRow.handleType = 'add';
+ controlRow.handleType = "add";
controlRow.sId = newSid;
controlRow.sSlaveId = tableDataRow.sId;
controlRow.sParentId = masterData.sId;
controlData.push(controlRow);
if (commonUtils.isNotEmptyArr(returnData.slave0Data)) {
- returnData.slave0Data.filter(item => item.sControlId === controlItem.sId).forEach((slave0Item) => {
- newCopyTo.slave0 = slave0Item;
- const newSid = commonUtils.createSid();
- let slave0Row = commonFunc.getDefaultData(slave0Config, newCopyTo, { newSid }); // 取默认值
- slave0Row = { ...slave0Row, ...commonFunc.getAssignFieldValue(slave0AssignField, slave0Item, newCopyTo) }; // 取赋值字段
- slave0Row.handleType = 'add';
- slave0Row.sId = newSid;
- slave0Row.sSlaveId = tableDataRow.sId;
- slave0Row.sParentId = masterData.sId;
- slave0Row.sControlId = controlRow.sId;
- slave0Row.sPartsName = controlRow.sPartsName;
- slave0Data.push(slave0Row);
- });
+ returnData.slave0Data
+ .filter(item => item.sControlId === controlItem.sId)
+ .forEach(slave0Item => {
+ newCopyTo.slave0 = slave0Item;
+ const newSid = commonUtils.createSid();
+ let slave0Row = commonFunc.getDefaultData(slave0Config, newCopyTo, { newSid }); // 取默认值
+ slave0Row = { ...slave0Row, ...commonFunc.getAssignFieldValue(slave0AssignField, slave0Item, newCopyTo) }; // 取赋值字段
+ slave0Row.handleType = "add";
+ slave0Row.sId = newSid;
+ slave0Row.sSlaveId = tableDataRow.sId;
+ slave0Row.sParentId = masterData.sId;
+ slave0Row.sControlId = controlRow.sId;
+ slave0Row.sPartsName = controlRow.sPartsName;
+ slave0Data.push(slave0Row);
+ });
}
if (commonUtils.isNotEmptyArr(returnData.processData)) {
- returnData.processData.filter(item => item.sControlId === controlItem.sId).forEach((processItem) => {
- newCopyTo.process = processItem;
- const newSid = commonUtils.createSid();
- let processRow = commonFunc.getDefaultData(processConfig, newCopyTo, { newSid }); // 取默认值
- processRow = { ...processRow, ...commonFunc.getAssignFieldValue(processAssignField, processItem, newCopyTo) }; // 取赋值字段
- processRow.handleType = 'add';
- processRow.sId = newSid;
- processRow.sSlaveId = tableDataRow.sId;
- processRow.sParentId = masterData.sId;
- processRow.sControlId = controlRow.sId;
- processRow.sPartsName = controlRow.sPartsName;
- processData.push(processRow);
- });
+ returnData.processData
+ .filter(item => item.sControlId === controlItem.sId)
+ .forEach(processItem => {
+ newCopyTo.process = processItem;
+ const newSid = commonUtils.createSid();
+ let processRow = commonFunc.getDefaultData(processConfig, newCopyTo, { newSid }); // 取默认值
+ processRow = { ...processRow, ...commonFunc.getAssignFieldValue(processAssignField, processItem, newCopyTo) }; // 取赋值字段
+ processRow.handleType = "add";
+ processRow.sId = newSid;
+ processRow.sSlaveId = tableDataRow.sId;
+ processRow.sParentId = masterData.sId;
+ processRow.sControlId = controlRow.sId;
+ processRow.sPartsName = controlRow.sPartsName;
+ processData.push(processRow);
+ });
}
});
}
if (commonUtils.isNotEmptyArr(returnData.slave0Data)) {
// eslint-disable-next-line no-loop-func
- returnData.slave0Data.filter(item => item.sType === '2').forEach((slave0Item) => {
- newCopyTo.slave0 = slave0Item;
- const newSid = commonUtils.createSid();
- let slave0Row = commonFunc.getDefaultData(slave0Config, newCopyTo, { newSid }); // 取默认值
- slave0Row = { ...slave0Row, ...commonFunc.getAssignFieldValue(slave0AssignField, slave0Item, newCopyTo) }; // 取赋值字段
- slave0Row.handleType = 'add';
- slave0Row.sId = newSid;
- slave0Row.sSlaveId = tableDataRow.sId;
- slave0Row.sParentId = masterData.sId;
- slave0Data.push(slave0Row);
- });
+ returnData.slave0Data
+ .filter(item => item.sType === "2")
+ .forEach(slave0Item => {
+ newCopyTo.slave0 = slave0Item;
+ const newSid = commonUtils.createSid();
+ let slave0Row = commonFunc.getDefaultData(slave0Config, newCopyTo, { newSid }); // 取默认值
+ slave0Row = { ...slave0Row, ...commonFunc.getAssignFieldValue(slave0AssignField, slave0Item, newCopyTo) }; // 取赋值字段
+ slave0Row.handleType = "add";
+ slave0Row.sId = newSid;
+ slave0Row.sSlaveId = tableDataRow.sId;
+ slave0Row.sParentId = masterData.sId;
+ slave0Data.push(slave0Row);
+ });
}
if (commonUtils.isNotEmptyArr(returnData.processData)) {
// eslint-disable-next-line no-loop-func
- returnData.processData.filter(item => item.sType === '3').forEach((processItem) => {
- newCopyTo.process = processItem;
- const newSid = commonUtils.createSid();
- let processRow = commonFunc.getDefaultData(processConfig, newCopyTo, { newSid }); // 取默认值
- processRow = { ...processRow, ...commonFunc.getAssignFieldValue(processAssignField, processItem, newCopyTo) }; // 取赋值字段
- processRow.handleType = 'add';
- processRow.sId = newSid;
- processRow.sSlaveId = tableDataRow.sId;
- processRow.sParentId = masterData.sId;
- processData.push(processRow);
- });
+ returnData.processData
+ .filter(item => item.sType === "3")
+ .forEach(processItem => {
+ newCopyTo.process = processItem;
+ const newSid = commonUtils.createSid();
+ let processRow = commonFunc.getDefaultData(processConfig, newCopyTo, { newSid }); // 取默认值
+ processRow = { ...processRow, ...commonFunc.getAssignFieldValue(processAssignField, processItem, newCopyTo) }; // 取赋值字段
+ processRow.handleType = "add";
+ processRow.sId = newSid;
+ processRow.sSlaveId = tableDataRow.sId;
+ processRow.sParentId = masterData.sId;
+ processData.push(processRow);
+ });
}
this.props.onSaveState({ controlData, slave0Data, processData });
}
}
- } else if (sModelsType === 'sales/salesOrder' && (sFieldName === 'dProductQty' || sFieldName === 'dGiveQty' || sFieldName === 'dStockupQty') && name === 'slave') {
- const {
- controlData, slaveSelectedRowKeys,
- } = this.props;
+ } else if (
+ sModelsType === "sales/salesOrder" &&
+ (sFieldName === "dProductQty" || sFieldName === "dGiveQty" || sFieldName === "dStockupQty") &&
+ name === "slave"
+ ) {
+ const { controlData, slaveSelectedRowKeys } = this.props;
const controlSelectedData = controlData.filter(item => item.sSlaveId === slaveSelectedRowKeys[0]);
for (const one of controlSelectedData) {
one.dPartsQty = commonUtils.isNull(tableDataRow.dProductQty, 0) + commonUtils.isNull(tableDataRow.dGiveQty, 0);
}
this.props.onSaveState({ controlData });
- } else if (sModelsType.includes('purchase/') && (sFieldName === 'sMaterialsId' || sFieldName === 'sMaterialsNo' || sFieldName === 'sMaterialsName') && name === 'slave') {
+ } else if (
+ sModelsType.includes("purchase/") &&
+ (sFieldName === "sMaterialsId" || sFieldName === "sMaterialsNo" || sFieldName === "sMaterialsName") &&
+ name === "slave"
+ ) {
const url = `${commonConfig.server_host}business/getProData?sModelsId=${sModelsId}`;
const value = {
- sProName: 'Sp_Cashier_GetMaterialsPrice',
+ sProName: "Sp_Cashier_GetMaterialsPrice",
paramsMap: {
sMaterialsGuid: changeValue.sMaterialsId,
sSupplyGuid: masterData.sSupplyId,
@@ -2969,9 +3335,9 @@ export default (ChildComponent) => {
// else {
// this.props.getServiceError(returnData);
// }
- } else if (sModelsType === 'sales/salesCheck' && sFieldName === 'dLossMoney' && name === 'slave') {
+ } else if (sModelsType === "sales/salesCheck" && sFieldName === "dLossMoney" && name === "slave") {
if (commonUtils.isNotEmptyNumber(tableDataRow.dSrcMoney) && commonUtils.isNotEmptyNumber(tableDataRow.dLossMoney)) {
- const dPprice = this.props.getFloatNum('dProductPrice'); /* 获取系统设定小数位 */
+ const dPprice = this.props.getFloatNum("dProductPrice"); /* 获取系统设定小数位 */
tableDataRow.dProductMoney = commonUtils.convertFixNum(tableDataRow.dSrcMoney - tableDataRow.dLossMoney, dPprice);
} else if (commonUtils.isNotEmptyNumber(tableDataRow.dSrcMoney) && commonUtils.isEmptyNumber(tableDataRow.dLossMoney)) {
tableDataRow.dProductMoney = tableDataRow.dSrcMoney;
@@ -2979,23 +3345,41 @@ export default (ChildComponent) => {
}
}
/* 各种金额，税额，价格计算 */
- let models = name === 'materials' ? 'Materials' :
- sModelsType.includes('sales/') || sModelsType.includes('manufacture/') || sModelsType.includes('quotation/') || sModelsType.includes('productStock/') || sModelsType.includes('semigoodsStock/') ? 'Product' : 'Materials';
- const bSaleMaterials = models === 'Product' && commonUtils.isNotEmptyObject(tableDataRow.sMaterialsId);
- if (sModelsType.includes('purchase/') || sModelsType.includes('quotation/') || sModelsType.includes('manufacture/') || sModelsType.includes('materialsStock/') || sModelsType.includes('outside/') || sModelsType.includes('semigoodsStock/')
- || sModelsType.includes('sales/materials') || sModelsType === 'sales/salesCheck') {
- if (sModelsType.includes('sales/materials') || sModelsType === 'sales/salesCheck' || bSaleMaterials) {
+ let models =
+ name === "materials"
+ ? "Materials"
+ : sModelsType.includes("sales/") ||
+ sModelsType.includes("manufacture/") ||
+ sModelsType.includes("quotation/") ||
+ sModelsType.includes("productStock/") ||
+ sModelsType.includes("semigoodsStock/")
+ ? "Product"
+ : "Materials";
+ const bSaleMaterials = models === "Product" && commonUtils.isNotEmptyObject(tableDataRow.sMaterialsId);
+ if (
+ sModelsType.includes("purchase/") ||
+ sModelsType.includes("quotation/") ||
+ sModelsType.includes("manufacture/") ||
+ sModelsType.includes("materialsStock/") ||
+ sModelsType.includes("outside/") ||
+ sModelsType.includes("semigoodsStock/") ||
+ sModelsType.includes("sales/materials") ||
+ sModelsType === "sales/salesCheck"
+ ) {
+ if (sModelsType.includes("sales/materials") || sModelsType === "sales/salesCheck" || bSaleMaterials) {
tableDataRow.dAuxiliaryQty = tableDataRow.dProductQty;
}
tableDataRow = await this.handleMaterialsChange(tableDataRow, sModelsId, masterData, changeValue, sFieldName, app, token, models);
}
- if (bSaleMaterials) { /* 如果是材料销售模块/销售对账 如果是材料 则用换算数量*单价 算金额 */
+ if (bSaleMaterials) {
+ /* 如果是材料销售模块/销售对账 如果是材料 则用换算数量*单价 算金额 */
/* 材料逻辑计算 */
- if (commonUtils.isNotEmptyNumber(tableDataRow.dMaterialsQty) && tableDataRow.dMaterialsQty !== 0 ) {
- let modelsNew = '';
- if (models === 'Product') { /* 计算前将Product替换为Materials */
- modelsNew = 'Materials';
+ if (commonUtils.isNotEmptyNumber(tableDataRow.dMaterialsQty) && tableDataRow.dMaterialsQty !== 0) {
+ let modelsNew = "";
+ if (models === "Product") {
+ /* 计算前将Product替换为Materials */
+ modelsNew = "Materials";
const dCurrencyRate = commonUtils.convertIsNotNumToNumber1(masterData.dCurrencyRate); /* 汇率 */
const { dNetPrice } = app.decimals;
@@ -3013,47 +3397,59 @@ export default (ChildComponent) => {
tableDataRow[`dN${modelsNew}Money`] = tableDataRow[`d${models}ForeignMoney`];
tableDataRow[`d${modelsNew}ForeignMoney`] = tableDataRow[`d${models}ForeignMoney`];
tableDataRow[`d${modelsNew}Money`] = tableDataRow[`d${models}Money`];
- tableDataRow.bSalesMaterials = true;/* 材料销售 销售对账 材料计算 */
- models = 'Materials';
- sFieldName = commonUtils.isNotEmptyObject(sFieldName) ? sFieldName.replace('Product', 'Materials') : sFieldName;
+ tableDataRow.bSalesMaterials = true; /* 材料销售 销售对账 材料计算 */
+ models = "Materials";
+ sFieldName = commonUtils.isNotEmptyObject(sFieldName) ? sFieldName.replace("Product", "Materials") : sFieldName;
}
}
}
tableDataRow = commonBusiness.getCalculateAllMoney(app, models, sFieldName, masterData, tableDataRow);
- let dMaterialsMoney = '';
- if (sModelsType.includes('outside/')) { /* 工序发外 && (sFieldName === 'sSupplyName' || sFieldName === 'sProcessName' || sFieldName === 'dAuxiliaryQty') */
+ let dMaterialsMoney = "";
+ if (sModelsType.includes("outside/")) {
+ /* 工序发外 && (sFieldName === 'sSupplyName' || sFieldName === 'sProcessName' || sFieldName === 'dAuxiliaryQty') */
let sComputeId = {};
const sSupplyId = masterData.sSupplyId;
const sProcessId = tableDataRow.sProcessId;
if (commonUtils.isNotEmptyObject(sProcessId)) {
/* 根据客户id,工序id获取公式ID */
sComputeId = await commonBusiness.getOutSideProcessFormula({
- token, sModelsId, sSupplyId, sProcessId,
+ token,
+ sModelsId,
+ sSupplyId,
+ sProcessId,
});
if (!commonUtils.isEmpty(sComputeId)) {
dMaterialsMoney = await commonBusiness.getFormulaValue({
- token, sModelsId, masterData, tableDataRow, sComputeId,
+ token,
+ sModelsId,
+ masterData,
+ tableDataRow,
+ sComputeId,
});
tableDataRow.dMaterialsMoney = dMaterialsMoney;
- tableDataRow = commonBusiness.getCalculateMoney(app, masterData, tableDataRow, 'Materials');
+ tableDataRow = commonBusiness.getCalculateMoney(app, masterData, tableDataRow, "Materials");
}
}
/* 在detail表（加工工序）中将每一个工序都填写单价，算出金额，几个工序金额应该汇总到slave表（回厂信息）最后一道工序金额中，并要自动算单价 */
// /* 将改变数量、金额 汇总到slave0回厂信息表 */
- const iSlave0ProductIndex = slave0Data.findIndex(item => commonUtils.isNotEmptyObject(item.sCombineProcessIds) && item.sCombineProcessIds.split(',').includes(tableDataRow.sSrcSlaveId));
- if(iSlave0ProductIndex > -1) {
- const addState ={};
+ const iSlave0ProductIndex = slave0Data.findIndex(
+ item => commonUtils.isNotEmptyObject(item.sCombineProcessIds) && item.sCombineProcessIds.split(",").includes(tableDataRow.sSrcSlaveId)
+ );
+ if (iSlave0ProductIndex > -1) {
+ const addState = {};
let dMaterialsProductMoneyAll = 0;
let dMaterialsProductPrice = 0;
const slaveORow = slave0Data[iSlave0ProductIndex];
/* 合计该组金额 */
- const slaveFilterData = tableData.filter(item => commonUtils.isNotEmptyObject(slaveORow.sCombineProcessIds) && slaveORow.sCombineProcessIds.split(',').includes(item.sSrcSlaveId));
- if(commonUtils.isNotEmptyArr(slaveFilterData)) {
+ const slaveFilterData = tableData.filter(
+ item => commonUtils.isNotEmptyObject(slaveORow.sCombineProcessIds) && slaveORow.sCombineProcessIds.split(",").includes(item.sSrcSlaveId)
+ );
+ if (commonUtils.isNotEmptyArr(slaveFilterData)) {
for (const one of slaveFilterData) {
- if(one.sId === tableDataRow.sId) {
+ if (one.sId === tableDataRow.sId) {
dMaterialsProductMoneyAll += tableDataRow.dMaterialsMoney;
} else {
dMaterialsProductMoneyAll += commonUtils.isNull(one.dMaterialsMoney, 0);
@@ -3070,35 +3466,41 @@ export default (ChildComponent) => {
// }
/* 更新数量（取同一部件，工序名称相同项数据的数量） */
- if(slaveORow.sCombineProcessIds){
- const sCombineProcessIdsArr = slaveORow.sCombineProcessIds.split(',');
+ if (slaveORow.sCombineProcessIds) {
+ const sCombineProcessIdsArr = slaveORow.sCombineProcessIds.split(",");
if (tableDataRow.sProcessName === slaveORow.sProcessName && sCombineProcessIdsArr.includes(tableDataRow.sSrcSlaveId)) {
addState.dAuxiliaryQty = tableDataRow.dAuxiliaryQty;
addState.dMaterialsQty = tableDataRow.dMaterialsQty;
}
}
- if(dMaterialsProductMoneyAll !==0) {
- if(tableDataRow.dAuxiliaryQty !== 0 ) {
+ if (dMaterialsProductMoneyAll !== 0) {
+ if (tableDataRow.dAuxiliaryQty !== 0) {
dMaterialsProductPrice = commonUtils.convertFixNum(dMaterialsProductMoneyAll / slaveORow.dMaterialsQty, dNetPrice);
}
addState.dMaterialsMoney = dMaterialsProductMoneyAll;
addState.dMaterialsPrice = dMaterialsProductPrice;
}
- addState.handleType = commonUtils.isEmpty(slave0Data[iSlave0ProductIndex].handleType) ? 'update' : slave0Data[iSlave0ProductIndex].handleType;
- slave0Data[iSlave0ProductIndex] = { ...slave0Data[iSlave0ProductIndex], ... addState};
- slave0Data[iSlave0ProductIndex] = commonBusiness.getCalculateMoney(app, masterData, slave0Data[iSlave0ProductIndex], 'Materials');
+ addState.handleType = commonUtils.isEmpty(slave0Data[iSlave0ProductIndex].handleType)
+ ? "update"
+ : slave0Data[iSlave0ProductIndex].handleType;
+ slave0Data[iSlave0ProductIndex] = { ...slave0Data[iSlave0ProductIndex], ...addState };
+ slave0Data[iSlave0ProductIndex] = commonBusiness.getCalculateMoney(app, masterData, slave0Data[iSlave0ProductIndex], "Materials");
}
this.props.onSaveState({ slave0Data, slaveData });
- } else if (sModelsType === 'outside/outsideprocess1' && (sFieldName === 'sSupplyName' || sFieldName === 'sProcessName' || sFieldName === 'dAuxiliaryQty')) { /* 工序发外 */
- tableDataRow = commonBusiness.getCalculateMoney(app, masterData, tableDataRow, 'Materials');
+ } else if (
+ sModelsType === "outside/outsideprocess1" &&
+ (sFieldName === "sSupplyName" || sFieldName === "sProcessName" || sFieldName === "dAuxiliaryQty")
+ ) {
+ /* 工序发外 */
+ tableDataRow = commonBusiness.getCalculateMoney(app, masterData, tableDataRow, "Materials");
}
// 是否默认只能勾选一个
- if (['bDefault'].includes(sFieldName)) {
+ if (["bDefault"].includes(sFieldName)) {
if (changeValue.bDefault) {
tableData.forEach(i => {
i && i.bDefault && (i.bDefault = false);
- })
+ });
}
}
@@ -3123,7 +3525,7 @@ export default (ChildComponent) => {
/* 删除从表中的数据并存入删除集合中 */
const slaveDataFilter = tableData[tableDataIndex];
tableData.splice(tableDataIndex, 1);
- slaveDataFilter.handleType = 'del';
+ slaveDataFilter.handleType = "del";
tableDelData.push(slaveDataFilter);
tableDataIndex = tableData.findIndex(item => item.sControlId === sId);
}
@@ -3133,57 +3535,100 @@ export default (ChildComponent) => {
handleMaterialsChange = async (tableDataRow, sModelsId, masterData, changeValue, sFieldName, app, token, models) => {
const { sComputeId, sConversionComputeId, sReConversionComputeId } = tableDataRow;
- const sFormulaIdType = tableDataRow.bInverse ? 'sReComputeId' : 'sComputeId'; /* 正算、反算类型 */
- if (sFieldName === 'sMaterialsNo' || sFieldName === 'sMaterialsName' || sFieldName === 'dAuxiliaryQty' || sFieldName === 'dReelAuxiliaryQty' || sFieldName === 'dConversionQty' || sFieldName === 'sMaterialsStyle' || sFieldName === 'dProductQty') {
- if (sFieldName === 'dReelAuxiliaryQty') {
- if (tableDataRow.sMaterialsUnit === '吨' && tableDataRow.bReel && tableDataRow.dGramWeight > 0) {
- tableDataRow = commonBusiness.getMaterialsQty(app, { ...tableDataRow, sMaterialsStyle: tableDataRow.sReelMaterialsStyle }, 'dReelAuxiliaryQty', 'dMaterialsQty');
+ const sFormulaIdType = tableDataRow.bInverse ? "sReComputeId" : "sComputeId"; /* 正算、反算类型 */
+ if (
+ sFieldName === "sMaterialsNo" ||
+ sFieldName === "sMaterialsName" ||
+ sFieldName === "dAuxiliaryQty" ||
+ sFieldName === "dReelAuxiliaryQty" ||
+ sFieldName === "dConversionQty" ||
+ sFieldName === "sMaterialsStyle" ||
+ sFieldName === "dProductQty"
+ ) {
+ if (sFieldName === "dReelAuxiliaryQty") {
+ if (tableDataRow.sMaterialsUnit === "吨" && tableDataRow.bReel && tableDataRow.dGramWeight > 0) {
+ tableDataRow = commonBusiness.getMaterialsQty(
+ app,
+ { ...tableDataRow, sMaterialsStyle: tableDataRow.sReelMaterialsStyle },
+ "dReelAuxiliaryQty",
+ "dMaterialsQty"
+ );
tableDataRow.dAuxiliaryQty = tableDataRow.dMaterialsQty;
- tableDataRow.sMaterialsStyle = tableDataRow.sMaterialsStyle !== undefined && tableDataRow.sMaterialsStyle.split('*').length > 1 ? tableDataRow.sMaterialsStyle.split('*')[0] : tableDataRow.sMaterialsStyle;
+ tableDataRow.sMaterialsStyle =
+ tableDataRow.sMaterialsStyle !== undefined && tableDataRow.sMaterialsStyle.split("*").length > 1
+ ? tableDataRow.sMaterialsStyle.split("*")[0]
+ : tableDataRow.sMaterialsStyle;
tableDataRow.sAuxiliaryUnit = tableDataRow.sMaterialsUnit;
- } else if (tableDataRow.sMaterialsUnit.toUpper() === 'M2' && tableDataRow.bReel) {
- tableDataRow = commonBusiness.getMaterialsQty(app, tableDataRow, 'dReelAuxiliaryQty', 'dMaterialsQty');
+ } else if (tableDataRow.sMaterialsUnit.toUpper() === "M2" && tableDataRow.bReel) {
+ tableDataRow = commonBusiness.getMaterialsQty(app, tableDataRow, "dReelAuxiliaryQty", "dMaterialsQty");
tableDataRow.dAuxiliaryQty = tableDataRow.dReelAuxiliaryQty;
} else {
tableDataRow.dAuxiliaryQty = tableDataRow.dReelAuxiliaryQty;
}
}
- if (commonUtils.isEmpty(sComputeId) && sFieldName !== 'dConversionQty') {
- if (sFieldName === 'dProductQty') {
+ if (commonUtils.isEmpty(sComputeId) && sFieldName !== "dConversionQty") {
+ if (sFieldName === "dProductQty") {
tableDataRow.dMaterialsQty = await commonBusiness.getFormulaValue({
- token, sModelsId, masterData, tableDataRow, sComputeId, sFormulaIdType,
+ token,
+ sModelsId,
+ masterData,
+ tableDataRow,
+ sComputeId,
+ sFormulaIdType,
});
// tableDataRow = commonBusiness.getMaterialsQty(app, tableDataRow, 'dProductQty', 'dMaterialsQty');
- } else if (app.currentPane.sModelsType && app.currentPane.sModelsType.includes('outside/')) {
- tableDataRow = commonBusiness.getMaterialsQty(app, tableDataRow, 'dAuxiliaryQty', 'dMaterialsQty');
+ } else if (app.currentPane.sModelsType && app.currentPane.sModelsType.includes("outside/")) {
+ tableDataRow = commonBusiness.getMaterialsQty(app, tableDataRow, "dAuxiliaryQty", "dMaterialsQty");
} else {
tableDataRow.dMaterialsQty = await commonBusiness.getFormulaValue({
- token, sModelsId, masterData, tableDataRow, sComputeId, sFormulaIdType,
+ token,
+ sModelsId,
+ masterData,
+ tableDataRow,
+ sComputeId,
+ sFormulaIdType,
});
}
} else if (!commonUtils.isEmpty(sComputeId)) {
tableDataRow.dMaterialsQty = await commonBusiness.getFormulaValue({
- token, sModelsId, masterData, tableDataRow, sComputeId,
+ token,
+ sModelsId,
+ masterData,
+ tableDataRow,
+ sComputeId,
});
}
- if (sFieldName !== 'dConversionQty' && !commonUtils.isEmpty(sConversionComputeId)) {
+ if (sFieldName !== "dConversionQty" && !commonUtils.isEmpty(sConversionComputeId)) {
tableDataRow.dConversionQty = await commonBusiness.getFormulaValue({
- token, sModelsId, masterData, tableDataRow, sComputeId: sConversionComputeId,
+ token,
+ sModelsId,
+ masterData,
+ tableDataRow,
+ sComputeId: sConversionComputeId,
});
}
- } else if (sFieldName === 'dMaterialsQty') {
+ } else if (sFieldName === "dMaterialsQty") {
const { sReComputeId } = tableDataRow;
if (commonUtils.isEmpty(sReComputeId) && tableDataRow.bInverse) {
- if (app.currentPane.sModelsType && app.currentPane.sModelsType.includes('outside/')) {
- tableDataRow = commonBusiness.getAuxiliaryQty(app, tableDataRow, sFieldName, 'dAuxiliaryQty');
+ if (app.currentPane.sModelsType && app.currentPane.sModelsType.includes("outside/")) {
+ tableDataRow = commonBusiness.getAuxiliaryQty(app, tableDataRow, sFieldName, "dAuxiliaryQty");
} else {
tableDataRow.dAuxiliaryQty = await commonBusiness.getFormulaValue({
- token, sModelsId, masterData, tableDataRow, sReComputeId, sFormulaIdType,
+ token,
+ sModelsId,
+ masterData,
+ tableDataRow,
+ sReComputeId,
+ sFormulaIdType,
});
}
} else if (tableDataRow.bInverse) {
tableDataRow.dAuxiliaryQty = await commonBusiness.getFormulaValue({
- token, sModelsId, masterData, tableDataRow, sComputeId: sReComputeId,
+ token,
+ sModelsId,
+ masterData,
+ tableDataRow,
+ sComputeId: sReComputeId,
});
if (commonUtils.isNotEmptyArr(tableDataRow.dAuxiliaryQty) && tableDataRow.dAuxiliaryQty !== 0) {
tableDataRow.dProductQty = tableDataRow.dAuxiliaryQty;
@@ -3191,43 +3636,65 @@ export default (ChildComponent) => {
}
if (!commonUtils.isEmpty(sReConversionComputeId)) {
tableDataRow.dConversionQty = await commonBusiness.getFormulaValue({
- token, sModelsId, masterData, tableDataRow, sComputeId: sReConversionComputeId,
+ token,
+ sModelsId,
+ masterData,
+ tableDataRow,
+ sComputeId: sReConversionComputeId,
});
}
- } else if (sFieldName === 'dAuxiliaryLossQty') {
- const tableDataRowNew ={ ...tableDataRow ,dAuxiliaryQty:tableDataRow.dAuxiliaryLossQty };
+ } else if (sFieldName === "dAuxiliaryLossQty") {
+ const tableDataRowNew = { ...tableDataRow, dAuxiliaryQty: tableDataRow.dAuxiliaryLossQty };
if (commonUtils.isEmpty(sComputeId)) {
// tableDataRow = commonBusiness.getMaterialsQty(app, tableDataRow, sFieldName, 'dLossQty');
tableDataRow.dLossQty = await commonBusiness.getFormulaValue({
- token, sModelsId, masterData, tableDataRow:tableDataRowNew, sComputeId, sFormulaIdType,
+ token,
+ sModelsId,
+ masterData,
+ tableDataRow: tableDataRowNew,
+ sComputeId,
+ sFormulaIdType,
});
} else {
tableDataRow.dLossQty = await commonBusiness.getFormulaValue({
- token, sModelsId, masterData, tableDataRow:tableDataRowNew, sComputeId,
+ token,
+ sModelsId,
+ masterData,
+ tableDataRow: tableDataRowNew,
+ sComputeId,
});
}
if (!commonUtils.isEmpty(tableDataRow.dSrcSurplusAuxiliaryQty)) {
tableDataRow.dAuxiliaryQty = tableDataRow.dSrcSurplusAuxiliaryQty - tableDataRow.dAuxiliaryLossQty;
tableDataRow.dMaterialsQty = commonUtils.convertFixNum(tableDataRow.dSrcSurplusQty - tableDataRow.dLossQty, 6);
}
- } else if (sFieldName === 'dLossQty') {
+ } else if (sFieldName === "dLossQty") {
const { sReComputeId } = tableDataRow;
- const tableDataRowNew ={ ...tableDataRow ,dMaterialsQty:tableDataRow.dLossQty };
+ const tableDataRowNew = { ...tableDataRow, dMaterialsQty: tableDataRow.dLossQty };
if (commonUtils.isEmpty(sReComputeId) && tableDataRow.bInverse) {
// tableDataRow = commonBusiness.getAuxiliaryQty(app, tableDataRow, sFieldName, 'dAuxiliaryLossQty');
tableDataRow.dAuxiliaryLossQty = await commonBusiness.getFormulaValue({
- token, sModelsId, masterData, tableDataRow:tableDataRowNew, sReComputeId, sFormulaIdType,
+ token,
+ sModelsId,
+ masterData,
+ tableDataRow: tableDataRowNew,
+ sReComputeId,
+ sFormulaIdType,
});
} else {
tableDataRow.dAuxiliaryLossQty = await commonBusiness.getFormulaValue({
- token, sModelsId, masterData, tableDataRow:tableDataRowNew, sComputeId: sReComputeId,
+ token,
+ sModelsId,
+ masterData,
+ tableDataRow: tableDataRowNew,
+ sComputeId: sReComputeId,
});
}
if (!commonUtils.isEmpty(tableDataRow.dSrcSurplusAuxiliaryQty)) {
tableDataRow.dAuxiliaryQty = tableDataRow.dSrcSurplusAuxiliaryQty - tableDataRow.dAuxiliaryLossQty;
tableDataRow.dMaterialsQty = tableDataRow.dSrcSurplusQty - tableDataRow.dLossQty;
}
- } else if (sFieldName === 'sProcessId' || sFieldName === 'sProcessNo' || sFieldName === 'sProcessName') {
+ } else if (sFieldName === "sProcessId" || sFieldName === "sProcessNo" || sFieldName === "sProcessName") {
const sProcessId = changeValue.sProcessId;
const url = `${commonConfig.server_host}process/outsideprocess?sModelsId=${sModelsId}&sProcessId=${sProcessId}`;
const dataReturn = (await commonServices.getService(token, url)).data;
@@ -3235,34 +3702,35 @@ export default (ChildComponent) => {
if (commonUtils.isNotEmptyArr(dataReturn.dataset.rows)) {
tableDataRow.dMaterialsPrice = dataReturn.dataset.rows[0].dMaterialsPrice;
}
- tableDataRow = commonBusiness.getCalculateAllMoney(app, models, 'dMaterialsPrice', masterData, tableDataRow);
+ tableDataRow = commonBusiness.getCalculateAllMoney(app, models, "dMaterialsPrice", masterData, tableDataRow);
}
}
return tableDataRow;
- }
+ };
handleMasterChange = async (name, sFieldName, changeValue, sId, dropDownData, isWait, masterDataNew) => {
-
// if (sFieldName === 'sZczlx' && changeValue.sZczlx === '01') {
// this.handleClearAllData();
// return;
// }
- const {
- sModelsId, sModelsType, masterData: masterDataOld,app, masterConfig, slaveConfig, token,
- } = this.props;
+ const { sModelsId, sModelsType, masterData: masterDataOld, app, masterConfig, slaveConfig, token } = this.props;
let { slaveData, slave0Data = [] } = this.props;
const addState = {};
- const masterData = masterDataNew === undefined ? masterDataOld === undefined ? {} : masterDataOld : masterDataNew;
+ const masterData = masterDataNew === undefined ? (masterDataOld === undefined ? {} : masterDataOld) : masterDataNew;
let bNewSlaveData = false;
- if ( sModelsType && (sModelsType.includes('sales/') || sModelsType.includes('productStock/')) && ( sFieldName === 'sCustomerId' || sFieldName === 'sCustomerNo' || sFieldName === 'sCustomerName')) {
+ if (
+ sModelsType &&
+ (sModelsType.includes("sales/") || sModelsType.includes("productStock/")) &&
+ (sFieldName === "sCustomerId" || sFieldName === "sCustomerNo" || sFieldName === "sCustomerName")
+ ) {
if (commonUtils.isNotEmptyArr(slaveData)) {
// 从表有数据，请删除后修改客户！不能去掉
if (slaveData.length === 1 && commonUtils.isEmpty(slaveData[0].sProductId)) {
bNewSlaveData = true;
} else {
- message.warn(commonFunc.showMessage(app.commonConst, 'slaveHasDataPleaseDel'));
+ message.warn(commonFunc.showMessage(app.commonConst, "slaveHasDataPleaseDel"));
return;
}
}
@@ -3274,28 +3742,29 @@ export default (ChildComponent) => {
// commonUtils.setStoreDropDownData(sModelsId, 'master', 'sProductId', []);
// commonUtils.setStoreDropDownData(sModelsId, 'master', 'sProductNo', []);
// commonUtils.setStoreDropDownData(sModelsId, 'master', 'sProductName', []);
- } if (sFieldName === 'sSupplyId' || sFieldName === 'sSupplyNo' || sFieldName === 'sSupplyName') {
+ }
+ if (sFieldName === "sSupplyId" || sFieldName === "sSupplyNo" || sFieldName === "sSupplyName") {
changeValue.tGetPayDate = commonBusiness.getGeyPayDate({ ...masterData, ...changeValue });
- } else if (sFieldName === 'sWareHouseId' || sFieldName === 'sWareHouseNo' || sFieldName === 'sWareHouseName') {
- commonUtils.setStoreDropDownData(sModelsId, 'slave', 'sMaterialsId', []);
- commonUtils.setStoreDropDownData(sModelsId, 'slave', 'sMaterialsNo', []);
- commonUtils.setStoreDropDownData(sModelsId, 'slave', 'sMaterialsName', []);
- if (sModelsType === 'materialsStock/materialsCheck' || sModelsType === 'productStock/productCheck') {
+ } else if (sFieldName === "sWareHouseId" || sFieldName === "sWareHouseNo" || sFieldName === "sWareHouseName") {
+ commonUtils.setStoreDropDownData(sModelsId, "slave", "sMaterialsId", []);
+ commonUtils.setStoreDropDownData(sModelsId, "slave", "sMaterialsNo", []);
+ commonUtils.setStoreDropDownData(sModelsId, "slave", "sMaterialsName", []);
+ if (sModelsType === "materialsStock/materialsCheck" || sModelsType === "productStock/productCheck") {
let value = {};
- if (sModelsType === 'materialsStock/materialsCheck') {
+ if (sModelsType === "materialsStock/materialsCheck") {
value = {
- sProName: 'Sp_System_AccountSquareCheck',
+ sProName: "Sp_System_AccountSquareCheck",
paramsMap: {
iType2: 1,
- sWareHouseGuid: commonUtils.isNotEmptyObject(changeValue.sWareHouseId) ? changeValue.sWareHouseId : '',
+ sWareHouseGuid: commonUtils.isNotEmptyObject(changeValue.sWareHouseId) ? changeValue.sWareHouseId : "",
},
};
- } else if (sModelsType === 'productStock/productCheck') {
+ } else if (sModelsType === "productStock/productCheck") {
value = {
- sProName: 'Sp_System_AccountSquareCheck',
+ sProName: "Sp_System_AccountSquareCheck",
paramsMap: {
iType2: 2,
- sWareHouseGuid: commonUtils.isNotEmptyObject(changeValue.sWareHouseId) ? changeValue.sWareHouseId : '',
+ sWareHouseGuid: commonUtils.isNotEmptyObject(changeValue.sWareHouseId) ? changeValue.sWareHouseId : "",
},
};
}
@@ -3312,93 +3781,93 @@ export default (ChildComponent) => {
return;
}
}
- } else if (sModelsType.includes('cashier/') && sFieldName === 'sBillType') {
- commonUtils.setStoreDropDownData(sModelsId, 'master', 'sCustomerId', []);
- commonUtils.setStoreDropDownData(sModelsId, 'master', 'sCustomerNo', []);
- commonUtils.setStoreDropDownData(sModelsId, 'master', 'sCustomerName', []);
- commonUtils.setStoreDropDownData(sModelsId, 'master', 'sSupplyId', []);
- commonUtils.setStoreDropDownData(sModelsId, 'master', 'sSupplyNo', []);
- commonUtils.setStoreDropDownData(sModelsId, 'master', 'sSupplyName', []);
- commonUtils.setStoreDropDownData(sModelsId, 'master', 'sFamilyId', []);
- commonUtils.setStoreDropDownData(sModelsId, 'master', 'sFamilyNo', []);
- commonUtils.setStoreDropDownData(sModelsId, 'master', 'sFamilyName', []);
- changeValue.sCustomerId = '';
- const iIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === 'sCustomerId');
+ } else if (sModelsType.includes("cashier/") && sFieldName === "sBillType") {
+ commonUtils.setStoreDropDownData(sModelsId, "master", "sCustomerId", []);
+ commonUtils.setStoreDropDownData(sModelsId, "master", "sCustomerNo", []);
+ commonUtils.setStoreDropDownData(sModelsId, "master", "sCustomerName", []);
+ commonUtils.setStoreDropDownData(sModelsId, "master", "sSupplyId", []);
+ commonUtils.setStoreDropDownData(sModelsId, "master", "sSupplyNo", []);
+ commonUtils.setStoreDropDownData(sModelsId, "master", "sSupplyName", []);
+ commonUtils.setStoreDropDownData(sModelsId, "master", "sFamilyId", []);
+ commonUtils.setStoreDropDownData(sModelsId, "master", "sFamilyNo", []);
+ commonUtils.setStoreDropDownData(sModelsId, "master", "sFamilyName", []);
+ changeValue.sCustomerId = "";
+ const iIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === "sCustomerId");
if (iIndex > -1) {
masterConfig.gdsconfigformslave[iIndex].bReGetDropDown = true;
}
- changeValue.sSupplyId = '';
- const iSupplyIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === 'sSupplyId');
+ changeValue.sSupplyId = "";
+ const iSupplyIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === "sSupplyId");
if (iSupplyIndex > -1) {
masterConfig.gdsconfigformslave[iSupplyIndex].bReGetDropDown = true;
}
/* 财务调整中切换调整类型后，对象名称清空 */
- const sBillTypeIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === 'sFamilyName');
+ const sBillTypeIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === "sFamilyName");
if (sBillTypeIndex > -1) {
- masterData.sFamilyName = '';
+ masterData.sFamilyName = "";
}
this.props.onSaveState({ masterConfig });
- } else if (sFieldName === 'sGetPayId') {
+ } else if (sFieldName === "sGetPayId") {
changeValue.tGetPayDate = commonBusiness.getGeyPayDate({ ...masterData, ...changeValue });
- } else if (sFieldName === 'sSettlementId') {
- if (changeValue.sSettlementId === 'cash') {
- const sBankAccountIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === 'sBankAccount');
+ } else if (sFieldName === "sSettlementId") {
+ if (changeValue.sSettlementId === "cash") {
+ const sBankAccountIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === "sBankAccount");
if (sBankAccountIndex > -1) {
masterConfig.gdsconfigformslave[sBankAccountIndex].iTag = 1;
- masterData.sBankAccount = '';
+ masterData.sBankAccount = "";
}
- const sInvoiceNoIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === 'sInvoiceNo');
+ const sInvoiceNoIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === "sInvoiceNo");
if (sInvoiceNoIndex > -1) {
masterConfig.gdsconfigformslave[sInvoiceNoIndex].iTag = 1;
- masterData.sInvoiceNo = '';
+ masterData.sInvoiceNo = "";
}
- const sBankIdIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === 'sBankId' || item.sName === 'sBankName');
+ const sBankIdIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === "sBankId" || item.sName === "sBankName");
if (sBankIdIndex > -1) {
masterConfig.gdsconfigformslave[sBankIdIndex].iTag = 1;
- masterData.sBankId = '';
- masterData.sBankName = '';
+ masterData.sBankId = "";
+ masterData.sBankName = "";
}
- const tDueDateIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === 'tDueDate');
+ const tDueDateIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === "tDueDate");
if (tDueDateIndex > -1) {
masterConfig.gdsconfigformslave[tDueDateIndex].iTag = 1;
delete masterData.tDueDate;
}
}
- if (changeValue.sSettlementId === 'bank') {
- const sInvoiceNoIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === 'sInvoiceNo');
+ if (changeValue.sSettlementId === "bank") {
+ const sInvoiceNoIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === "sInvoiceNo");
if (sInvoiceNoIndex > -1) {
masterConfig.gdsconfigformslave[sInvoiceNoIndex].iTag = 1;
- masterData.sInvoiceNo = '';
+ masterData.sInvoiceNo = "";
}
- const sBankAccountIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === 'sBankAccount');
+ const sBankAccountIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === "sBankAccount");
if (sBankAccountIndex > -1) {
masterConfig.gdsconfigformslave[sBankAccountIndex].iTag = 0;
}
- const sBankIdIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === 'sBankId' || item.sName === 'sBankName');
+ const sBankIdIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === "sBankId" || item.sName === "sBankName");
if (sBankIdIndex > -1) {
masterConfig.gdsconfigformslave[sBankIdIndex].iTag = 0;
}
- const tDueDateIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === 'tDueDate');
+ const tDueDateIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === "tDueDate");
if (tDueDateIndex > -1) {
masterConfig.gdsconfigformslave[tDueDateIndex].iTag = 1;
delete masterData.tDueDate;
}
}
- if (changeValue.sSettlementId === 'bill') {
- const sBankAccountIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === 'sBankAccount');
+ if (changeValue.sSettlementId === "bill") {
+ const sBankAccountIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === "sBankAccount");
if (sBankAccountIndex > -1) {
masterConfig.gdsconfigformslave[sBankAccountIndex].iTag = 1;
- masterData.sBankAccount = '';
+ masterData.sBankAccount = "";
}
- const sInvoiceNoIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === 'sInvoiceNo');
+ const sInvoiceNoIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === "sInvoiceNo");
if (sInvoiceNoIndex > -1) {
masterConfig.gdsconfigformslave[sInvoiceNoIndex].iTag = 0;
}
- const sBankIdIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === 'sBankId');
+ const sBankIdIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === "sBankId");
if (sBankIdIndex > -1) {
masterConfig.gdsconfigformslave[sBankIdIndex].iTag = 0;
}
- const tDueDateIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === 'tDueDate');
+ const tDueDateIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === "tDueDate");
if (tDueDateIndex > -1) {
masterConfig.gdsconfigformslave[tDueDateIndex].iTag = 0;
}
@@ -3409,39 +3878,60 @@ export default (ChildComponent) => {
if (commonUtils.isNotEmptyObject(masterDataAfter)) {
returnData.masterData = masterDataAfter;
}
- if (sFieldName === 'sSupplyId' || sFieldName === 'sSupplyNo' || sFieldName === 'sSupplyName' || sFieldName === 'sWareHouseId'
- || sFieldName === 'sWareHouseNo' || sFieldName === 'sWareHouseName' || sFieldName === 'tDeliverDate'
- || sFieldName === 'sCurrency' || sFieldName === 'dCurrencyRate' || sFieldName === 'sCurrencyName') {
+ if (
+ sFieldName === "sSupplyId" ||
+ sFieldName === "sSupplyNo" ||
+ sFieldName === "sSupplyName" ||
+ sFieldName === "sWareHouseId" ||
+ sFieldName === "sWareHouseNo" ||
+ sFieldName === "sWareHouseName" ||
+ sFieldName === "tDeliverDate" ||
+ sFieldName === "sCurrency" ||
+ sFieldName === "dCurrencyRate" ||
+ sFieldName === "sCurrencyName"
+ ) {
const slaveDataNew = [];
- const models = sModelsType.includes('sales/') || sModelsType.includes('manufacture/') || sModelsType.includes('productStock/') ? 'Product' : 'Materials';
+ const models =
+ sModelsType.includes("sales/") || sModelsType.includes("manufacture/") || sModelsType.includes("productStock/") ? "Product" : "Materials";
for (const item of slaveData) {
- let tableDataRow = ((sFieldName === 'sWareHouseId' || sFieldName === 'sWareHouseNo' || sFieldName === 'sWareHouseName') && (sModelsType.includes('materialsStock/productionmaterialsadjust'))) ?
- { ...item } : { ...item, [sFieldName]: changeValue[sFieldName] };
- if (sFieldName === 'sSupplyId' || sFieldName === 'sSupplyNo' || sFieldName === 'sSupplyName') {
+ let tableDataRow =
+ (sFieldName === "sWareHouseId" || sFieldName === "sWareHouseNo" || sFieldName === "sWareHouseName") &&
+ sModelsType.includes("materialsStock/productionmaterialsadjust")
+ ? { ...item }
+ : { ...item, [sFieldName]: changeValue[sFieldName] };
+ if (sFieldName === "sSupplyId" || sFieldName === "sSupplyNo" || sFieldName === "sSupplyName") {
tableDataRow.sTaxId = changeValue.sTaxId;
tableDataRow.sTaxNo = changeValue.sTaxNo;
tableDataRow.sTaxName = changeValue.sTaxName;
tableDataRow.dTaxRate = changeValue.dTaxRate;
- tableDataRow.handleType = commonUtils.isEmpty(tableDataRow.handleType) ? 'update' : tableDataRow.handleType;
- let dMaterialsMoney = '';
- if (sModelsType && sModelsType.includes('outside/')) { /* 工序发外 */
- let sComputeId = '';
+ tableDataRow.handleType = commonUtils.isEmpty(tableDataRow.handleType) ? "update" : tableDataRow.handleType;
+ let dMaterialsMoney = "";
+ if (sModelsType && sModelsType.includes("outside/")) {
+ /* 工序发外 */
+ let sComputeId = "";
const sSupplyId = changeValue.sSupplyId;
const sProcessId = tableDataRow.sProcessId;
/* 根据客户id,工序id获取公式ID */
if (commonUtils.isNotEmptyObject(sSupplyId) && commonUtils.isNotEmptyObject(sProcessId)) {
sComputeId = await commonBusiness.getOutSideProcessFormula({
- token, sModelsId, sSupplyId, sProcessId,
+ token,
+ sModelsId,
+ sSupplyId,
+ sProcessId,
});
- console.log('sComputeId', sComputeId);
+ console.log("sComputeId", sComputeId);
if (commonUtils.isNotEmptyObject(sComputeId)) {
dMaterialsMoney = await commonBusiness.getFormulaValue({
- token, sModelsId, masterData: returnData.masterData, tableDataRow, sComputeId,
+ token,
+ sModelsId,
+ masterData: returnData.masterData,
+ tableDataRow,
+ sComputeId,
});
- console.log('dMaterialsMoney', dMaterialsMoney);
+ console.log("dMaterialsMoney", dMaterialsMoney);
tableDataRow.dMaterialsMoney = dMaterialsMoney;
- tableDataRow = commonBusiness.getCalculateMoney(app, returnData.masterData, tableDataRow, 'Materials');
+ tableDataRow = commonBusiness.getCalculateMoney(app, returnData.masterData, tableDataRow, "Materials");
}
// else {
// tableDataRow.dMaterialsPrice = 0;
@@ -3449,13 +3939,16 @@ export default (ChildComponent) => {
// }
}
} else {
- tableDataRow = commonBusiness.getCalculateAllMoney(app, models, 'sTaxId', returnData.masterData, tableDataRow);
+ tableDataRow = commonBusiness.getCalculateAllMoney(app, models, "sTaxId", returnData.masterData, tableDataRow);
}
- } else if (sFieldName === 'sCurrency' || sFieldName === 'dCurrencyRate' || sFieldName === 'sCurrencyName') {
+ } else if (sFieldName === "sCurrency" || sFieldName === "dCurrencyRate" || sFieldName === "sCurrencyName") {
tableDataRow = commonBusiness.getCalculateAllMoney(app, models, `d${models}ForeignPrice`, returnData.masterData, tableDataRow);
- tableDataRow.handleType = commonUtils.isEmpty(tableDataRow.handleType) ? 'update' : tableDataRow.handleType;
+ tableDataRow.handleType = commonUtils.isEmpty(tableDataRow.handleType) ? "update" : tableDataRow.handleType;
}
- if ((sFieldName === 'sWareHouseId' || sFieldName === 'sWareHouseNo' || sFieldName === 'sWareHouseName') && (!sModelsType.includes('materialsStock/productionmaterialsadjust'))) {
+ if (
+ (sFieldName === "sWareHouseId" || sFieldName === "sWareHouseNo" || sFieldName === "sWareHouseName") &&
+ !sModelsType.includes("materialsStock/productionmaterialsadjust")
+ ) {
tableDataRow.sWareHouseId = changeValue.sWareHouseId;
tableDataRow.sWareHouseNo = changeValue.sWareHouseNo;
tableDataRow.sWareHouseName = changeValue.sWareHouseName;
@@ -3465,14 +3958,14 @@ export default (ChildComponent) => {
tableDataRow.sWareHouseLocationId = changeValue.sWareHouseLocationId;
tableDataRow.sWareHouseLocationNo = changeValue.sWareHouseLocationNo;
tableDataRow.sWareHouseLocationName = changeValue.sWareHouseLocationName;
- tableDataRow.handleType = commonUtils.isEmpty(tableDataRow.handleType) ? 'update' : tableDataRow.handleType;
+ tableDataRow.handleType = commonUtils.isEmpty(tableDataRow.handleType) ? "update" : tableDataRow.handleType;
}
slaveDataNew.push(tableDataRow);
}
addState.slaveData = slaveDataNew;
// this.props.onSaveState({ slaveData: slaveDataNew });
- if (sFieldName === 'sSupplyId' || sFieldName === 'sSupplyNo' || sFieldName === 'sSupplyName') {
+ if (sFieldName === "sSupplyId" || sFieldName === "sSupplyNo" || sFieldName === "sSupplyName") {
const slave0DataNew = [];
for (const item of slave0Data) {
let tableDataRow = { ...item };
@@ -3480,19 +3973,19 @@ export default (ChildComponent) => {
tableDataRow.sTaxNo = changeValue.sTaxNo;
tableDataRow.sTaxName = changeValue.sTaxName;
tableDataRow.dTaxRate = changeValue.dTaxRate;
- tableDataRow.handleType = commonUtils.isEmpty(tableDataRow.handleType) ? 'update' : tableDataRow.handleType;
- tableDataRow = commonBusiness.getCalculateMoney(app, returnData.masterData, tableDataRow, 'Materials');
+ tableDataRow.handleType = commonUtils.isEmpty(tableDataRow.handleType) ? "update" : tableDataRow.handleType;
+ tableDataRow = commonBusiness.getCalculateMoney(app, returnData.masterData, tableDataRow, "Materials");
slave0DataNew.push(tableDataRow);
}
addState.slave0Data = slave0DataNew;
}
- } else if ((sFieldName === 'sCustomerId' || sFieldName === 'sCustomerNo' || sFieldName === 'sCustomerName')) {
+ } else if (sFieldName === "sCustomerId" || sFieldName === "sCustomerNo" || sFieldName === "sCustomerName") {
if (commonUtils.isNotEmptyArr(slaveData)) {
// 从表有数据，请删除后修改客户！不能去掉
if (slaveData.length === 1 && commonUtils.isEmpty(slaveData[0].sProductId)) {
bNewSlaveData = true;
} else {
- message.warn(commonFunc.showMessage(app.commonConst, 'slaveHasDataPleaseDel'));
+ message.warn(commonFunc.showMessage(app.commonConst, "slaveHasDataPleaseDel"));
return;
}
}
@@ -3502,7 +3995,7 @@ export default (ChildComponent) => {
allTableData.master = returnData.masterData;
const newSid = commonUtils.createSid();
const tableDataRowAdd = commonFunc.getDefaultData(slaveConfig, allTableData, { newSid });
- tableDataRowAdd.handleType = 'add';
+ tableDataRowAdd.handleType = "add";
tableDataRowAdd.sId = newSid;
tableDataRowAdd.sParentId = masterData && masterData.sId ? masterData.sId : null;
tableDataRowAdd.key = tableDataRowAdd.sId;
@@ -3517,37 +4010,42 @@ export default (ChildComponent) => {
// this.getCustomerReceipt({ masterData: returnData.masterData });
// }
// }
- } else if (sFieldName === 'sExpenseeName') {
- let { slaveDelData, slave0DelData}= this.props;
+ } else if (sFieldName === "sExpenseeName") {
+ let { slaveDelData, slave0DelData } = this.props;
const allTableData = {};
allTableData.master = returnData.masterData;
const newCopyTo = {};
newCopyTo.master = masterData;
const slaveDataNew = [];
const slave0DataNew = [];
- if(commonUtils.isEmptyArr(slaveDelData)) {
+ if (commonUtils.isEmptyArr(slaveDelData)) {
slaveDelData = [];
}
- if(commonUtils.isEmptyArr(slave0DelData)) {
+ if (commonUtils.isEmptyArr(slave0DelData)) {
slave0DelData = [];
}
//获取部门名称数据
let sDepartNameDropDown;
- const masterIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === 'sDepartName');
- slaveData.forEach((item) => {
- item.handleType = 'del';
+ const masterIndex = masterConfig.gdsconfigformslave.findIndex(item => item.sName === "sDepartName");
+ slaveData.forEach(item => {
+ item.handleType = "del";
slaveDelData.push(item);
});
if (masterIndex > -1) {
const config = masterConfig.gdsconfigformslave[masterIndex];
- const slaveAssignField = config.sAssignField || '';
- const sqlDropDownData = await this.props.getSqlDropDownData(sModelsId, 'master', masterConfig.gdsconfigformslave[masterIndex], returnData.masterData);
+ const slaveAssignField = config.sAssignField || "";
+ const sqlDropDownData = await this.props.getSqlDropDownData(
+ sModelsId,
+ "master",
+ masterConfig.gdsconfigformslave[masterIndex],
+ returnData.masterData
+ );
sDepartNameDropDown = sqlDropDownData.dropDownData;
- sDepartNameDropDown.forEach((item) => {
+ sDepartNameDropDown.forEach(item => {
const newSid = commonUtils.createSid();
let tableDataRowAdd = commonFunc.getDefaultData(slaveConfig, allTableData, { newSid });
tableDataRowAdd = { ...tableDataRowAdd, ...commonFunc.getAssignFieldValue(slaveAssignField, item, newCopyTo) }; // 取赋值字段
- tableDataRowAdd.handleType = 'add';
+ tableDataRowAdd.handleType = "add";
tableDataRowAdd.sId = newSid;
tableDataRowAdd.sParentId = masterData && masterData.sId ? masterData.sId : null;
tableDataRowAdd.key = tableDataRowAdd.sId;
@@ -3558,38 +4056,67 @@ export default (ChildComponent) => {
}
// 获取工作中心数据
let sWorkCenterNameDropDown;
- const master1Index = masterConfig.gdsconfigformslave.findIndex(item => item.sName === 'sWorkCenterName');
- slave0Data.forEach((item) => {
- item.handleType = 'del';
+ const master1Index = masterConfig.gdsconfigformslave.findIndex(item => item.sName === "sWorkCenterName");
+ slave0Data.forEach(item => {
+ item.handleType = "del";
slave0DelData.push(item);
});
if (master1Index > -1) {
const config = masterConfig.gdsconfigformslave[master1Index];
- const slaveAssignField = config.sAssignField || '';
- const sqlDropDownData = await this.props.getSqlDropDownData(sModelsId, 'master', masterConfig.gdsconfigformslave[master1Index], returnData.masterData);
+ const slaveAssignField = config.sAssignField || "";
+ const sqlDropDownData = await this.props.getSqlDropDownData(
+ sModelsId,
+ "master",
+ masterConfig.gdsconfigformslave[master1Index],
+ returnData.masterData
+ );
sWorkCenterNameDropDown = sqlDropDownData.dropDownData;
- sWorkCenterNameDropDown.forEach((item) => {
+ sWorkCenterNameDropDown.forEach(item => {
const newSid = commonUtils.createSid();
let tableDataRowAdd = commonFunc.getDefaultData(slaveConfig, allTableData, { newSid });
tableDataRowAdd = { ...tableDataRowAdd, ...commonFunc.getAssignFieldValue(slaveAssignField, item, newCopyTo) }; // 取赋值字段
- tableDataRowAdd.handleType = 'add';
+ tableDataRowAdd.handleType = "add";
tableDataRowAdd.sId = newSid;
tableDataRowAdd.sParentId = masterData && masterData.sId ? masterData.sId : null;
tableDataRowAdd.key = tableDataRowAdd.sId;
tableDataRowAdd.bDefault = false;
tableDataRowAdd.iOrder = 1;
slave0DataNew.push(tableDataRowAdd);
- })
+ });
}
addState.slaveData = slaveDataNew;
addState.slaveDelData = slaveDelData;
addState.slave0Data = slave0DataNew;
addState.slave0DelData = slave0DelData;
}
- const models = name === 'materials' ? 'Materials' :
- sModelsType.includes('sales/') || sModelsType.includes('manufacture/') || sModelsType.includes('quotation/') || sModelsType.includes('productStock/') || sModelsType.includes('semigoodsStock/') ? 'Product' : 'Materials';
- if (sModelsType.includes('purchase/') || sModelsType.includes('quotation/') || sModelsType.includes('manufacture/') || sModelsType.includes('materialsStock/') || sModelsType.includes('outside/') || sModelsType.includes('semigoodsStock/')) {
- const masterData = await this.handleMaterialsChange(returnData.masterData, sModelsId, masterData, changeValue, sFieldName, app, token, models);
+ const models =
+ name === "materials"
+ ? "Materials"
+ : sModelsType.includes("sales/") ||
+ sModelsType.includes("manufacture/") ||
+ sModelsType.includes("quotation/") ||
+ sModelsType.includes("productStock/") ||
+ sModelsType.includes("semigoodsStock/")
+ ? "Product"
+ : "Materials";
+ if (
+ sModelsType.includes("purchase/") ||
+ sModelsType.includes("quotation/") ||
+ sModelsType.includes("manufacture/") ||
+ sModelsType.includes("materialsStock/") ||
+ sModelsType.includes("outside/") ||
+ sModelsType.includes("semigoodsStock/")
+ ) {
+ const masterData = await this.handleMaterialsChange(
+ returnData.masterData,
+ sModelsId,
+ masterData,
+ changeValue,
+ sFieldName,
+ app,
+ token,
+ models
+ );
returnData = { ...returnData, masterData };
}
@@ -3597,17 +4124,21 @@ export default (ChildComponent) => {
if (commonUtils.isNotEmptyArr(addState.slaveData) && commonUtils.isNotEmptyArr(addState.slave0Data)) {
const { dNetPrice } = app.decimals;
for (const tableDataRow of addState.slaveData) {
- const iSlave0ProductIndex = addState.slave0Data.findIndex(item => commonUtils.isNotEmptyObject(item.sCombineProcessIds) && item.sCombineProcessIds.split(',').includes(tableDataRow.sSrcSlaveId));
- if(iSlave0ProductIndex > -1) {
+ const iSlave0ProductIndex = addState.slave0Data.findIndex(
+ item => commonUtils.isNotEmptyObject(item.sCombineProcessIds) && item.sCombineProcessIds.split(",").includes(tableDataRow.sSrcSlaveId)
+ );
+ if (iSlave0ProductIndex > -1) {
const addState1 = {};
let dMaterialsProductMoneyAll = 0;
let dMaterialsProductPrice = 0;
const slaveORow = slave0Data[iSlave0ProductIndex];
/* 合计该组金额 */
- const slaveFilterData = addState.slaveData.filter(item => commonUtils.isNotEmptyObject(slaveORow.sCombineProcessIds) && slaveORow.sCombineProcessIds.split(',').includes(item.sSrcSlaveId));
- if(commonUtils.isNotEmptyArr(slaveFilterData)) {
+ const slaveFilterData = addState.slaveData.filter(
+ item => commonUtils.isNotEmptyObject(slaveORow.sCombineProcessIds) && slaveORow.sCombineProcessIds.split(",").includes(item.sSrcSlaveId)
+ );
+ if (commonUtils.isNotEmptyArr(slaveFilterData)) {
for (const one of slaveFilterData) {
- if(one.sId === tableDataRow.sId) {
+ if (one.sId === tableDataRow.sId) {
dMaterialsProductMoneyAll += commonUtils.isNull(tableDataRow.dMaterialsMoney, 0);
} else {
dMaterialsProductMoneyAll += commonUtils.isNull(one.dMaterialsMoney, 0);
@@ -3616,23 +4147,30 @@ export default (ChildComponent) => {
}
/* 更新数量（取同一部件，工序名称相同项数据的数量） */
- if(slaveORow.sCombineProcessIds){
- const sCombineProcessIdsArr = slaveORow.sCombineProcessIds.split(',');
+ if (slaveORow.sCombineProcessIds) {
+ const sCombineProcessIdsArr = slaveORow.sCombineProcessIds.split(",");
if (tableDataRow.sProcessName === slaveORow.sProcessName && sCombineProcessIdsArr.includes(tableDataRow.sSrcSlaveId)) {
addState1.dAuxiliaryQty = tableDataRow.dAuxiliaryQty;
addState1.dMaterialsQty = tableDataRow.dMaterialsQty;
}
}
- if(dMaterialsProductMoneyAll !==0) {
- if(tableDataRow.dAuxiliaryQty !== 0) {
+ if (dMaterialsProductMoneyAll !== 0) {
+ if (tableDataRow.dAuxiliaryQty !== 0) {
dMaterialsProductPrice = commonUtils.convertFixNum(dMaterialsProductMoneyAll / slaveORow.dMaterialsQty, dNetPrice);
}
addState1.dMaterialsMoney = dMaterialsProductMoneyAll;
addState1.dMaterialsPrice = dMaterialsProductPrice;
}
- addState1.handleType = commonUtils.isEmpty(addState.slave0Data[iSlave0ProductIndex].handleType) ? 'update' : addState.slave0Data[iSlave0ProductIndex].handleType;
- addState.slave0Data[iSlave0ProductIndex] = { ...addState.slave0Data[iSlave0ProductIndex], ... addState1};
- addState.slave0Data[iSlave0ProductIndex] = commonBusiness.getCalculateMoney(app, masterData, addState.slave0Data[iSlave0ProductIndex], 'Materials');
+ addState1.handleType = commonUtils.isEmpty(addState.slave0Data[iSlave0ProductIndex].handleType)
+ ? "update"
+ : addState.slave0Data[iSlave0ProductIndex].handleType;
+ addState.slave0Data[iSlave0ProductIndex] = { ...addState.slave0Data[iSlave0ProductIndex], ...addState1 };
+ addState.slave0Data[iSlave0ProductIndex] = commonBusiness.getCalculateMoney(
+ app,
+ masterData,
+ addState.slave0Data[iSlave0ProductIndex],
+ "Materials"
+ );
}
}
}
@@ -3641,10 +4179,10 @@ export default (ChildComponent) => {
return { ...returnData, ...addState };
} else {
this.props.onSaveState({ ...returnData, ...addState }, () => {
- if (['17038380450009419160550182640000'].includes(sModelsId)) {
- if (['tYear'].includes(sFieldName)) {
+ if (["17038380450009419160550182640000"].includes(sModelsId)) {
+ if (["tYear"].includes(sFieldName)) {
this.props.onSaveState({ pageLoading: true });
- this.handleButtonClick('BtnCalc').finally(() => {
+ this.handleButtonClick("BtnCalc").finally(() => {
this.props.onSaveState({ pageLoading: false });
});
}
@@ -3652,12 +4190,12 @@ export default (ChildComponent) => {
});
return returnData;
}
- }
+ };
// 清空所有数据
handleClearAllData = () => {
const { masterConfig, masterData = {}, slaveData = [] } = this.props;
- const { handleType = 'update', sId } = masterData;
+ const { handleType = "update", sId } = masterData;
const copyTo = {
master: masterData,
slave: slaveData,
@@ -3670,29 +4208,24 @@ export default (ChildComponent) => {
};
for (let i = 0; i < 11; i++) {
- const num = i == 0 ? '' : i - 1;
+ const num = i == 0 ? "" : i - 1;
const slaveName = `slave${num}`;
const onlySlaveName = `onlySlave${num}`;
const onlySlaveValue = this.props[onlySlaveName];
if (onlySlaveValue) {
addState[`${slaveName}Data`] = [];
- if (handleType === 'update') {
+ if (handleType === "update") {
const slaveDataOld = this.props[`${slaveName}Data`] || [];
- addState[`${slaveName}DelData`] =
- slaveDataOld
- .filter(item => item.handleType !== 'add1')
- .map(item => ({ ...item, handleType: 'del' }));
+ addState[`${slaveName}DelData`] = slaveDataOld.filter(item => item.handleType !== "add1").map(item => ({ ...item, handleType: "del" }));
}
}
}
this.props.onSaveState(addState);
- }
+ };
- handleBtnPrint =async (sActiveId, checked, eKey) => {
- const {
- app, sModelsId, masterConfig, masterData, slaveConfig, sModelsType, reportData, menuChildData, formRoute, controlConfig,
- } = this.props;
- if (sModelsType === 'manufacture/workOrder') {
+ handleBtnPrint = async (sActiveId, checked, eKey) => {
+ const { app, sModelsId, masterConfig, masterData, slaveConfig, sModelsType, reportData, menuChildData, formRoute, controlConfig } = this.props;
+ if (sModelsType === "manufacture/workOrder") {
this.handleUpdateProduction();
}
const { token } = app;
@@ -3704,8 +4237,8 @@ export default (ChildComponent) => {
const queryFilterJson = JSON.stringify(queryFilter);
// const masterDataJson = JSON.stringify(masterData);
/* 拿到打印报表名称 */
- let printReportName = 'report';
- let printCustomerReportName = 'report';
+ let printReportName = "report";
+ let printCustomerReportName = "report";
if (commonUtils.isNotEmptyArr(reportData)) {
const iIndex = reportData.findIndex(item => item.sId === sActiveId);
if (iIndex > -1) {
@@ -3718,25 +4251,35 @@ export default (ChildComponent) => {
printCustomerReportName = menuChildData[iIndex].sReportName;
}
}
- let urlPrint = '';
- if (formRoute === '/indexPage/printlabel') {
- if (commonUtils.isNotEmptyObject(masterData) && masterData.dTrunkQty !== undefined && masterData.dFractionQty !== undefined && masterData.dPackQty !== undefined) { // masterData中必填的三个字段
+ let urlPrint = "";
+ if (formRoute === "/indexPage/printlabel") {
+ if (
+ commonUtils.isNotEmptyObject(masterData) &&
+ masterData.dTrunkQty !== undefined &&
+ masterData.dFractionQty !== undefined &&
+ masterData.dPackQty !== undefined
+ ) {
+ // masterData中必填的三个字段
// const param = masterDataJson;
/* 把masterData放在数组中 */
const ListData = [];
ListData.push(masterData);
const param = JSON.stringify(ListData);
- if (eKey.indexOf('BtnPrint.') > -1) {
- urlPrint = `${commonConfig.file_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`;
- } else if (eKey.indexOf('BtnPrintCus.') > -1) {
- urlPrint = `${commonConfig.file_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`;
+ if (eKey.indexOf("BtnPrint.") > -1) {
+ urlPrint = `${commonConfig.file_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${
+ checked ? "fileType=.xlsx&" : ""
+ }printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`;
+ } else if (eKey.indexOf("BtnPrintCus.") > -1) {
+ urlPrint = `${commonConfig.file_host}printReport/printPdf/${printCustomerReportName}?${
+ checked ? "fileType=.xlsx&" : ""
+ }printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`;
}
/* Get提交地址栏参数过多,更改Get提交为Post提交 */
this.handleOpenPost(urlPrint, param);
} else {
- const dTrunkQtyName = masterConfig.gdsconfigformslave.filter(item => item.sName === 'dTrunkQty');
- const dFractionQtyName = masterConfig.gdsconfigformslave.filter(item => item.sName === 'dFractionQty');
- const dPackQtyName = masterConfig.gdsconfigformslave.filter(item => item.sName === 'dPackQty');
+ const dTrunkQtyName = masterConfig.gdsconfigformslave.filter(item => item.sName === "dTrunkQty");
+ const dFractionQtyName = masterConfig.gdsconfigformslave.filter(item => item.sName === "dFractionQty");
+ const dPackQtyName = masterConfig.gdsconfigformslave.filter(item => item.sName === "dPackQty");
if (masterData.dTrunkQty === undefined && commonUtils.isNotEmptyObject(dTrunkQtyName)) {
message.error(`${dTrunkQtyName[0].showName} 必填项！`);
} else if (masterData.dFractionQty === undefined && commonUtils.isNotEmptyObject(dFractionQtyName)) {
@@ -3746,12 +4289,12 @@ export default (ChildComponent) => {
}
return;
}
- } else if (eKey.indexOf('BtnPrint.') > -1) {
+ } else if (eKey.indexOf("BtnPrint.") > -1) {
let { controlSelectedRowKeys } = this.props;
/* 不出现选择框，则打印全部；出现选择框，则打印勾选的 */
let bisMutiSelect = false;
if (commonUtils.isNotEmptyObject(controlConfig) && commonUtils.isNotEmptyArr(controlConfig.gdsconfigformslave)) {
- const filterData = controlConfig.gdsconfigformslave.filter(item => item.sControlName === 'bisMutiSelect');
+ const filterData = controlConfig.gdsconfigformslave.filter(item => item.sControlName === "bisMutiSelect");
if (commonUtils.isNotEmptyArr(filterData)) {
bisMutiSelect = filterData[0].bVisible;
}
@@ -3759,36 +4302,43 @@ export default (ChildComponent) => {
if (bisMutiSelect === false || bisMutiSelect === undefined) {
controlSelectedRowKeys = [];
}
- urlPrint = `${commonConfig.file_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&sControlIds=${commonUtils.isNotEmptyArr(controlSelectedRowKeys) ? controlSelectedRowKeys : []}`;
- } else if (eKey.indexOf('BtnPrintCus.') > -1) {
- urlPrint = `${commonConfig.file_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`;
+ urlPrint = `${commonConfig.file_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${
+ checked ? "fileType=.xlsx&" : ""
+ }sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&sControlIds=${
+ commonUtils.isNotEmptyArr(controlSelectedRowKeys) ? controlSelectedRowKeys : []
+ }`;
+ } else if (eKey.indexOf("BtnPrintCus.") > -1) {
+ urlPrint = `${commonConfig.file_host}printReport/printPdf/${printCustomerReportName}?${
+ checked ? "fileType=.xlsx&" : ""
+ }sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`;
}
- if (formRoute !== '/indexPage/printlabel') {
+ if (formRoute !== "/indexPage/printlabel") {
window.open(`${encodeURI(`${urlPrint}&queryFilter=${queryFilterJson}`)}&token=${encodeURIComponent(token)}`);
}
};
- handleOpenPost= (url, params) => {
+ handleOpenPost = (url, params) => {
const newWin = window.open();
- let formStr = '';
- formStr = `';
+ let formStr = "";
+ formStr =
+ `";
newWin.document.body.innerHTML = formStr;
newWin.document.forms[0].submit();
return newWin;
- }
+ };
handleUpdateProduction = async () => {
const { sModelsId, masterData } = this.props;
const { sBillNo, sId } = masterData || {};
const dataUrl = `${commonConfig.server_host}business/addUpdateDelBusinessData?sModelsId=${sModelsId}&sBillNo=${sBillNo}&sSysLogSrcId=${sId}`;
const value = {
- data: [{
- sTable: 'mftworkordermaster',
- column: [{ handleType: 'update', sId: masterData.sId, bProduction: 1 }],
- }],
- sClientType: '1',
+ data: [
+ {
+ sTable: "mftworkordermaster",
+ column: [{ handleType: "update", sId: masterData.sId, bProduction: 1 }],
+ },
+ ],
+ sClientType: "1",
};
const dataReturn = (await commonServices.postValueService(this.props.app.token, value, dataUrl)).data;
if (dataReturn.code === 1) {
@@ -3803,10 +4353,8 @@ export default (ChildComponent) => {
};
/* 工单、工艺卡、报价单控制表回带图片地址 */
- handleFilfileManageOk= async (controlFilfileData, controlFilfileDelData, sSrcSlaveId) => {
- const {
- controlData: tableData, app, sModelsId, token, controlConfig,
- } = this.props;
+ handleFilfileManageOk = async (controlFilfileData, controlFilfileDelData, sSrcSlaveId) => {
+ const { controlData: tableData, app, sModelsId, token, controlConfig } = this.props;
if (commonUtils.isNotEmptyObject(sSrcSlaveId)) {
if (commonUtils.isNotEmptyArr(controlFilfileDelData)) {
const addState = {};
@@ -3814,32 +4362,32 @@ export default (ChildComponent) => {
if (iIndex > -1) {
const tableDataNewRow = tableData[iIndex];
const { sMaterialsPicturePath, sMachinePicturePath } = tableDataNewRow;
- const controlsMaterialsPictureDelData = controlFilfileDelData.filter(item => item.sType === '3'); /* 开料 */
+ const controlsMaterialsPictureDelData = controlFilfileDelData.filter(item => item.sType === "3"); /* 开料 */
if (commonUtils.isNotEmptyArr(controlsMaterialsPictureDelData)) {
- controlsMaterialsPictureDelData.forEach((slaveItem) => {
+ controlsMaterialsPictureDelData.forEach(slaveItem => {
if (slaveItem.sPicturePath === sMaterialsPicturePath) {
- addState.sMaterialsPicturePath = '';
+ addState.sMaterialsPicturePath = "";
}
});
}
- const sMachinePictureDelPath = controlFilfileDelData.filter(item => item.sType === '4'); /* 联版 */
+ const sMachinePictureDelPath = controlFilfileDelData.filter(item => item.sType === "4"); /* 联版 */
if (commonUtils.isNotEmptyArr(sMachinePictureDelPath)) {
- sMachinePictureDelPath.forEach((slaveItem) => {
+ sMachinePictureDelPath.forEach(slaveItem => {
if (slaveItem.sPicturePath === sMachinePicturePath) {
- addState.sMachinePicturePath = '';
+ addState.sMachinePicturePath = "";
}
});
}
- if (commonUtils.isNotEmptyObject(addState) && (addState.sMachinePicturePath === '' || addState.sMaterialsPicturePath === '')) {
+ if (commonUtils.isNotEmptyObject(addState) && (addState.sMachinePicturePath === "" || addState.sMaterialsPicturePath === "")) {
tableData[iIndex] = { ...tableDataNewRow, ...addState };
const data = [];
const updataData = {};
const updateWhere = {};
const column = {};
- if (addState.sMaterialsPicturePath === '') {
+ if (addState.sMaterialsPicturePath === "") {
column.sMaterialsPicturePath = addState.sMaterialsPicturePath;
}
- if (addState.sMachinePicturePath === '') {
+ if (addState.sMachinePicturePath === "") {
column.sMachinePicturePath = addState.sMachinePicturePath;
}
if (commonUtils.isNotEmptyObject(tableDataNewRow.sId) && commonUtils.isNotEmptyObject(column)) {
@@ -3852,7 +4400,7 @@ export default (ChildComponent) => {
const configUrl = `${commonConfig.server_host}business/updateBusinessData?sModelsId=${sModelsId}`;
const value = {
data,
- sClientType: '1',
+ sClientType: "1",
};
const dataReturn = (await commonServices.postValueService(token, value, configUrl)).data;
if (dataReturn.code === 1) {
@@ -3873,13 +4421,17 @@ export default (ChildComponent) => {
if (iIndex > -1) {
const tableDataNewRow = tableData[iIndex];
const { sMaterialsPicturePath, sMachinePicturePath } = tableDataNewRow;
- const controlsMaterialsPictureData = controlFilfileData.filter(item => item.sType === '3');
+ const controlsMaterialsPictureData = controlFilfileData.filter(item => item.sType === "3");
if (commonUtils.isNotEmptyArr(controlsMaterialsPictureData)) {
- addState.sMaterialsPicturePath = commonUtils.isNotEmptyObject(controlsMaterialsPictureData[0].sPicturePath) ? controlsMaterialsPictureData[0].sPicturePath : ''; /* 上机默认取上传图片的第一条 */
+ addState.sMaterialsPicturePath = commonUtils.isNotEmptyObject(controlsMaterialsPictureData[0].sPicturePath)
+ ? controlsMaterialsPictureData[0].sPicturePath
+ : ""; /* 上机默认取上传图片的第一条 */
}
- const controlsMachinePictureData = controlFilfileData.filter(item => item.sType === '4');
+ const controlsMachinePictureData = controlFilfileData.filter(item => item.sType === "4");
if (commonUtils.isNotEmptyArr(controlsMachinePictureData)) {
- addState.sMachinePicturePath = commonUtils.isNotEmptyObject(controlsMachinePictureData[0].sPicturePath) ? controlsMachinePictureData[0].sPicturePath : '';
+ addState.sMachinePicturePath = commonUtils.isNotEmptyObject(controlsMachinePictureData[0].sPicturePath)
+ ? controlsMachinePictureData[0].sPicturePath
+ : "";
}
if (commonUtils.isNotEmptyObject(addState)) {
tableData[iIndex] = { ...tableDataNewRow, ...addState };
@@ -3903,7 +4455,7 @@ export default (ChildComponent) => {
const configUrl = `${commonConfig.server_host}business/updateBusinessData?sModelsId=${sModelsId}`;
const value = {
data,
- sClientType: '1',
+ sClientType: "1",
};
const dataReturn = (await commonServices.postValueService(token, value, configUrl)).data;
if (dataReturn.code === 1) {
@@ -3920,9 +4472,9 @@ export default (ChildComponent) => {
}
}
} else {
- return message.warning(commonFunc.showMessage(app.commonConst, 'selectedRowKeysNo'));
+ return message.warning(commonFunc.showMessage(app.commonConst, "selectedRowKeysNo"));
}
- }
+ };
// 收付款分摊
handleShare = () => {
/* 分摊 */
@@ -3930,7 +4482,7 @@ export default (ChildComponent) => {
const { dNetMoney } = app.decimals;
const masterData = { ...masterDataOld };
const slaveData = [];
- slaveDataOld.forEach((item) => {
+ slaveDataOld.forEach(item => {
slaveData.push({ ...item });
});
@@ -3941,7 +4493,7 @@ export default (ChildComponent) => {
let positiveSum = 0; /* 正数求和 */
let positiveRoundingSum = 0; /* 正数舍入求和 */
const positiveData = []; /* 正数集 */
- slaveData.forEach((child) => {
+ slaveData.forEach(child => {
child.dTotalMoney = 0;
child.dRoundingMoney = commonUtils.isNum(child.dRoundingMoney) ? child.dRoundingMoney : 0;
if (child.dBalanceMoney < 0) {
@@ -3954,7 +4506,7 @@ export default (ChildComponent) => {
positiveData.push(child);
}
});
- if (commonUtils.convertFixNum(((minusSum - minusRoundingSum) + (positiveSum - positiveRoundingSum)) - dTotalMoney, dNetMoney) <= 0) {
+ if (commonUtils.convertFixNum(minusSum - minusRoundingSum + (positiveSum - positiveRoundingSum) - dTotalMoney, dNetMoney) <= 0) {
/* 够扣 */
positiveSum -= minusRoundingSum;
positiveSum -= positiveRoundingSum;
@@ -3963,32 +4515,28 @@ export default (ChildComponent) => {
for (let i = 0; i < minusData.length; i += 1) {
/* 负数遍历 */
const dBalanceMoney = Math.abs(minusData[i].dBalanceMoney); /* 余额正数 */
- const dRoundingMoney = minusData[i].dRoundingMoney !== undefined
- ? minusData[i].dRoundingMoney
- : 0;
+ const dRoundingMoney = minusData[i].dRoundingMoney !== undefined ? minusData[i].dRoundingMoney : 0;
if (positiveSum <= dBalanceMoney) {
- minusData[i].dTotalMoney = commonUtils.convertFixNum(-(positiveSum) - (dRoundingMoney * 1), dNetMoney);
+ minusData[i].dTotalMoney = commonUtils.convertFixNum(-positiveSum - dRoundingMoney * 1, dNetMoney);
if (minusData[i].handleType === undefined) {
- minusData[i].handleType = commonUtils.isEmpty(minusData[i].handleType) ? 'update' : minusData[i].handleType;
+ minusData[i].handleType = commonUtils.isEmpty(minusData[i].handleType) ? "update" : minusData[i].handleType;
}
break;
} else {
- minusData[i].dTotalMoney = commonUtils.convertFixNum(-(dBalanceMoney * 1) - (dRoundingMoney * 1), dNetMoney);
- positiveSum -= dBalanceMoney - (dRoundingMoney * 1);
+ minusData[i].dTotalMoney = commonUtils.convertFixNum(-(dBalanceMoney * 1) - dRoundingMoney * 1, dNetMoney);
+ positiveSum -= dBalanceMoney - dRoundingMoney * 1;
if (minusData[i].handleType === undefined) {
- minusData[i].handleType = commonUtils.isEmpty(minusData[i].handleType) ? 'update' : minusData[i].handleType;
+ minusData[i].handleType = commonUtils.isEmpty(minusData[i].handleType) ? "update" : minusData[i].handleType;
}
}
}
for (let i = 0; i < positiveData.length; i += 1) {
/* 正数遍历 */
const { dBalanceMoney } = positiveData[i]; /* 余额正数 */
- const dRoundingMoney = positiveData[i].dRoundingMoney !== undefined
- ? positiveData[i].dRoundingMoney
- : 0;
- positiveData[i].dTotalMoney = commonUtils.convertFixNum((dBalanceMoney * 1) - (dRoundingMoney * 1), dNetMoney);
+ const dRoundingMoney = positiveData[i].dRoundingMoney !== undefined ? positiveData[i].dRoundingMoney : 0;
+ positiveData[i].dTotalMoney = commonUtils.convertFixNum(dBalanceMoney * 1 - dRoundingMoney * 1, dNetMoney);
if (positiveData[i].handleType === undefined) {
- positiveData[i].handleType = commonUtils.isEmpty(positiveData[i].handleType) ? 'update' : positiveData[i].handleType;
+ positiveData[i].handleType = commonUtils.isEmpty(positiveData[i].handleType) ? "update" : positiveData[i].handleType;
}
}
masterData.dAdvanceMoney = 0;
@@ -3998,23 +4546,21 @@ export default (ChildComponent) => {
for (let i = 0; i < positiveData.length; i += 1) {
/* 正数遍历 */
const { dBalanceMoney } = positiveData[i]; /* 余额正数 */
- const dRoundingMoney = positiveData[i].dRoundingMoney !== undefined
- ? positiveData[i].dRoundingMoney
- : 0;
- positiveData[i].dTotalMoney = commonUtils.convertFixNum((dBalanceMoney * 1) - (dRoundingMoney * 1), dNetMoney);
- positiveData[i].handleType = commonUtils.isEmpty(positiveData[i].handleType) ? 'update' : positiveData[i].handleType;
+ const dRoundingMoney = positiveData[i].dRoundingMoney !== undefined ? positiveData[i].dRoundingMoney : 0;
+ positiveData[i].dTotalMoney = commonUtils.convertFixNum(dBalanceMoney * 1 - dRoundingMoney * 1, dNetMoney);
+ positiveData[i].handleType = commonUtils.isEmpty(positiveData[i].handleType) ? "update" : positiveData[i].handleType;
}
for (let i = 0; i < minusData.length; i += 1) {
/* 负数遍历 */
minusData[i].dRoundingMoney = 0;
- minusData[i].handleType = commonUtils.isEmpty(minusData[i].handleType) ? 'update' : minusData[i].handleType;
+ minusData[i].handleType = commonUtils.isEmpty(minusData[i].handleType) ? "update" : minusData[i].handleType;
}
masterData.dAdvanceMoney = commonUtils.convertFixNum(Math.abs(positiveSum), dNetMoney);
masterData.bAdvance = true;
}
- masterData.handleType = commonUtils.isEmpty(masterData.handleType) ? 'update' : masterData.handleType;
+ masterData.handleType = commonUtils.isEmpty(masterData.handleType) ? "update" : masterData.handleType;
this.props.onSaveState({ masterData, slaveData });
- } else if (((minusSum - minusRoundingSum) + (positiveSum - positiveRoundingSum)) - dTotalMoney > 0) {
+ } else if (minusSum - minusRoundingSum + (positiveSum - positiveRoundingSum) - dTotalMoney > 0) {
/* 不够扣情况 */
minusSum -= minusRoundingSum;
minusSum -= positiveRoundingSum;
@@ -4022,31 +4568,27 @@ export default (ChildComponent) => {
for (let i = 0; i < minusData.length; i += 1) {
/* 负数遍历 */
const dBalanceMoney = Math.abs(minusData[i].dBalanceMoney); /* 余额正数 */
- const dRoundingMoney = minusData[i].dRoundingMoney !== undefined
- ? minusData[i].dRoundingMoney
- : 0;
- minusData[i].dTotalMoney = commonUtils.convertFixNum(-(dBalanceMoney * 1) - (dRoundingMoney * 1), dNetMoney);
- minusData[i].handleType = commonUtils.isEmpty(minusData[i].handleType) ? 'update' : minusData[i].handleType;
+ const dRoundingMoney = minusData[i].dRoundingMoney !== undefined ? minusData[i].dRoundingMoney : 0;
+ minusData[i].dTotalMoney = commonUtils.convertFixNum(-(dBalanceMoney * 1) - dRoundingMoney * 1, dNetMoney);
+ minusData[i].handleType = commonUtils.isEmpty(minusData[i].handleType) ? "update" : minusData[i].handleType;
}
for (let i = 0; i < positiveData.length; i += 1) {
/* 正数遍历 */
const { dBalanceMoney } = positiveData[i]; /* 余额正数 */
- const dRoundingMoney = positiveData[i].dRoundingMoney !== undefined
- ? positiveData[i].dRoundingMoney
- : 0;
+ const dRoundingMoney = positiveData[i].dRoundingMoney !== undefined ? positiveData[i].dRoundingMoney : 0;
if (Math.abs(minusSum) <= dBalanceMoney) {
- positiveData[i].dTotalMoney = commonUtils.convertFixNum(Math.abs(minusSum) - (dRoundingMoney * 1), dNetMoney);
- positiveData[i].handleType = commonUtils.isEmpty(positiveData[i].handleType) ? 'update' : positiveData[i].handleType;
+ positiveData[i].dTotalMoney = commonUtils.convertFixNum(Math.abs(minusSum) - dRoundingMoney * 1, dNetMoney);
+ positiveData[i].handleType = commonUtils.isEmpty(positiveData[i].handleType) ? "update" : positiveData[i].handleType;
break;
} else {
- positiveData[i].dTotalMoney = commonUtils.convertFixNum((dBalanceMoney * 1) - (dRoundingMoney * 1), dNetMoney);
- minusSum = -(Math.abs(minusSum) - (dBalanceMoney * 1) - (dRoundingMoney * 1));
- positiveData[i].handleType = commonUtils.isEmpty(positiveData[i].handleType) ? 'update' : positiveData[i].handleType;
+ positiveData[i].dTotalMoney = commonUtils.convertFixNum(dBalanceMoney * 1 - dRoundingMoney * 1, dNetMoney);
+ minusSum = -(Math.abs(minusSum) - dBalanceMoney * 1 - dRoundingMoney * 1);
+ positiveData[i].handleType = commonUtils.isEmpty(positiveData[i].handleType) ? "update" : positiveData[i].handleType;
}
}
masterData.dAdvanceMoney = 0;
masterData.bAdvance = false;
- masterData.handleType = commonUtils.isEmpty(masterData.handleType) ? 'update' : masterData.handleType;
+ masterData.handleType = commonUtils.isEmpty(masterData.handleType) ? "update" : masterData.handleType;
this.props.onSaveState({ masterData, slaveData });
}
// let allTotalMoney = 0;
@@ -4064,15 +4606,13 @@ export default (ChildComponent) => {
};
handleImport = async () => {
- const {
- sModelsId, sModelsType, masterConfig, masterData, slaveData, slaveDelData: slaveDelDataOld, app,
- } = this.props;
+ const { sModelsId, sModelsType, masterConfig, masterData, slaveData, slaveDelData: slaveDelDataOld, app } = this.props;
if (commonUtils.isEmpty(masterData.sWareHouseId)) {
- message.error(commonFunc.getConfigShowName(masterConfig, 'sWareHouseId') + commonFunc.showMessage(app.commonConst, 'isNotNull')); // 不能为空！
+ message.error(commonFunc.getConfigShowName(masterConfig, "sWareHouseId") + commonFunc.showMessage(app.commonConst, "isNotNull")); // 不能为空！
return;
}
let url;
- if (sModelsType.includes('productStock/')) {
+ if (sModelsType.includes("productStock/")) {
url = `${commonConfig.server_host}eleProductStock/getEleProductStock?sModelsId=${sModelsId}&sWareHouseId=${masterData.sWareHouseId}`;
} else {
url = `${commonConfig.server_host}eleMaterialsStock/getEleMaterialsStock?sModelsId=${sModelsId}&sWareHouseId=${masterData.sWareHouseId}`;
@@ -4082,12 +4622,12 @@ export default (ChildComponent) => {
if (dataReturn.code === 1) {
const returnData = dataReturn.dataset.rows;
const slaveDelData = commonUtils.isEmptyArr(slaveDelDataOld) ? [] : slaveDelDataOld;
- slaveData.forEach((item) => {
- item.handleType = 'del';
+ slaveData.forEach(item => {
+ item.handleType = "del";
slaveDelData.push({ ...item });
});
- returnData.forEach((item) => {
- item.handleType = 'add';
+ returnData.forEach(item => {
+ item.handleType = "add";
item.sParentId = masterData.sId;
});
this.props.onSaveState({ slaveData: returnData, slaveDelData });
@@ -4097,10 +4637,8 @@ export default (ChildComponent) => {
};
handleOutTemplate = async () => {
- const {
- token, formData,
- } = this.props;
- const slaveConfig = formData.filter(item => item.sGrd === 'importTemplate')[0];
+ const { token, formData } = this.props;
+ const slaveConfig = formData.filter(item => item.sGrd === "importTemplate")[0];
window.location.href = `${commonConfig.server_host}import/exportTemplet?gdsconfigformmasterId=${slaveConfig.sId}&token=${token}`;
};
handleDesignFunction = () => {
@@ -4109,128 +4647,131 @@ export default (ChildComponent) => {
handleBatchPriceUpdate = () => {
const { slaveData, slaveSelectedRowKeys, app } = this.props;
if (slaveSelectedRowKeys === undefined || slaveSelectedRowKeys.length !== 1) {
- return message.warning(commonFunc.showMessage(app.commonConst, 'selectedRowKeysNo'));/* 请选择一条数据进行操作 */
+ return message.warning(commonFunc.showMessage(app.commonConst, "selectedRowKeysNo")); /* 请选择一条数据进行操作 */
} else {
const batchPriceUpdateData = slaveData.filter(item => item.sId === slaveSelectedRowKeys[0]);
this.props.onSaveState({ batchPriceUpdateData, visibleBatchPriceUpdate: true });
}
};
-
/* 解析消息 */
- handleGetMsg = (str) => {
- const msgArr = commonUtils.isNotEmptyObject(str) ? str.split('xpm'): '';
+ handleGetMsg = str => {
+ const msgArr = commonUtils.isNotEmptyObject(str) ? str.split("xpm") : "";
const divStr = [];
- if(commonUtils.isNotEmptyArr(msgArr)) {
- for (let i = 0; i < msgArr.length; i ++) {
+ if (commonUtils.isNotEmptyArr(msgArr)) {
+ for (let i = 0; i < msgArr.length; i++) {
divStr.push({msgArr[i]}
); } } return divStr; - } + }; /* 导出Excel */ handleOut = async () => { - const { - slaveConfig, formRoute, masterData, - } = this.props; + const { slaveConfig, formRoute, masterData } = this.props; /* 导出使用Post提交 */ - const url = `${commonConfig.server_host}excel/export/${slaveConfig.sId}?sModelsId=${slaveConfig.sParentId}&sName=${formRoute}&token=${encodeURIComponent(this.props.app.token)}`; + const url = `${commonConfig.server_host}excel/export/${slaveConfig.sId}?sModelsId=${ + slaveConfig.sParentId + }&sName=${formRoute}&token=${encodeURIComponent(this.props.app.token)}`; const conditionValuesStr = JSON.stringify({ sId: masterData?.sId, sBillNo: masterData?.sBillNo }); - this.handleOpenOut(url, '', '', undefined, conditionValuesStr); + this.handleOpenOut(url, "", "", undefined, conditionValuesStr); }; /* Get提交地址栏参数过多,更改Get提交为Post提交 */ handleOpenOut = (url, bFilter, slaveOrderBy, sGroupByList, conditionValues) => { const newWin = window.open(); - let formStr = ''; + let formStr = ""; // 设置样式为隐藏，打开新标签再跳转页面前，如果有可现实的表单选项，用户会看到表单内容数据 - formStr = `'; + formStr += ""; newWin.document.body.innerHTML = formStr; newWin.document.forms[0].submit(); return newWin; - } + }; /* 导出模版数据 */ handleOutTemplateData = async () => { - const { - slaveConfig, formRoute, masterData, sortedInfo, - } = this.props; - const sort = commonUtils.isNotEmptyObject(sortedInfo) ? sortedInfo.order === 'ascend' ? 'asc' : 'desc' : ''; - const slaveOrderBy = commonUtils.isNotEmptyObject(sortedInfo) && Object.keys(sortedInfo).length > 0 ? { [sortedInfo.columnKey]: sort } : ''; // - const sId = commonUtils.isNotEmptyObject(masterData) ? masterData.sId : ''; + const { slaveConfig, formRoute, masterData, sortedInfo } = this.props; + const sort = commonUtils.isNotEmptyObject(sortedInfo) ? (sortedInfo.order === "ascend" ? "asc" : "desc") : ""; + const slaveOrderBy = commonUtils.isNotEmptyObject(sortedInfo) && Object.keys(sortedInfo).length > 0 ? { [sortedInfo.columnKey]: sort } : ""; // + const sId = commonUtils.isNotEmptyObject(masterData) ? masterData.sId : ""; if (commonUtils.isNotEmptyObject(sId)) { const sSqlCondition = { sParentId: sId }; let url = `${commonConfig.server_host}excel/export/${slaveConfig.sId}?sModelsId=${slaveConfig.sParentId}&token=${this.props.app.token}&sName=${formRoute}`; if (commonUtils.isNotEmptyObject(sSqlCondition)) { url = `${url}&sSqlCondition=${encodeURIComponent(JSON.stringify(sSqlCondition))}`; } - if (slaveOrderBy !== undefined && slaveOrderBy !== '' && Object.keys(slaveOrderBy).length > 0) { + if (slaveOrderBy !== undefined && slaveOrderBy !== "" && Object.keys(slaveOrderBy).length > 0) { url = `${url}&sFilterOrderBy=${encodeURIComponent(JSON.stringify(slaveOrderBy))}`; } window.open(url); } else { - message.warn('没有主表数据！'); + message.warn("没有主表数据！"); } }; /** 按钮操作事件 */ handleButtonClick = async (name, bBtncalcComfim) => { - const FriendlyReminder = commonFunc.showLocalMessage(this.props, 'FriendlyReminder', '温馨提示'); - if (name === 'BtnOut') { + const FriendlyReminder = commonFunc.showLocalMessage(this.props, "FriendlyReminder", "温馨提示"); + if (name === "BtnOut") { this.handleOut(); - } else if (name === 'BtnDesignFunction') { + } else if (name === "BtnDesignFunction") { this.handleDesignFunction(); - } else if (name === 'BtnBatchPriceUpdate') { + } else if (name === "BtnBatchPriceUpdate") { this.handleBatchPriceUpdate(); - } else if (name && name.includes('BtnOutTemplateData')) { /* 导出模版数据 */ + } else if (name && name.includes("BtnOutTemplateData")) { + /* 导出模版数据 */ this.handleOutTemplateData(); - } else if (name && name.includes('BtnOutTemplate')) { + } else if (name && name.includes("BtnOutTemplate")) { this.handleOutTemplate(); } const { sModelsType, masterConfig, slaveConfig, slave0Config, slave1Config, slave2Config, slave3Config, slave4Config } = this.props; - if (name === 'BtnRefresh') { + if (name === "BtnRefresh") { if (this.props.app.currentPane.refresh !== undefined) { this.props.app.currentPane.refresh(); } this.handleGetData(masterConfig, slaveConfig, slave0Config, slave1Config, slave2Config, slave3Config, slave4Config); - } else if ((name === 'BtnShare' || name === 'BtnOutTemplate') && (sModelsType.includes('cashier/') || sModelsType.includes('sales/') || sModelsType.includes('purchase/'))) { + } else if ( + (name === "BtnShare" || name === "BtnOutTemplate") && + (sModelsType.includes("cashier/") || sModelsType.includes("sales/") || sModelsType.includes("purchase/")) + ) { // 收付款分摊 - if (name === 'BtnShare') { + if (name === "BtnShare") { this.handleShare(); } - if (sModelsType.includes('sales/') && name === 'BtnOutTemplate') { + if (sModelsType.includes("sales/") && name === "BtnOutTemplate") { this.handleOutTemplate(); } - } else if (name === 'BtnImport' && (sModelsType.includes('materialsStock/') || sModelsType.includes('productStock/'))) { - if (name === 'BtnImport') { + } else if (name === "BtnImport" && (sModelsType.includes("materialsStock/") || sModelsType.includes("productStock/"))) { + if (name === "BtnImport") { this.handleImport(); } - } else if(name && name.includes('BtnTempSql')) { /* 通过BtnTempSql按钮 自定义调用Sql 并将数据回填到界面上 */ + } else if (name && name.includes("BtnTempSql")) { + /* 通过BtnTempSql按钮 自定义调用Sql 并将数据回填到界面上 */ const { masterConfig, slaveConfig, sModelsId, token } = this.props; - let { masterData,slaveData } = this.props; + let { masterData, slaveData } = this.props; const slave0Data = []; const slave1Data = []; const slave2Data = []; const slave3Data = []; const slave4Data = []; - const copyTo ={}; + const copyTo = {}; copyTo.name = name; copyTo.slaveData = slaveData; - const buttonConfigArr = masterConfig && masterConfig.gdsconfigformslave.filter(item => item.sControlName && item.sControlName.includes('BtnTempSql')); + const buttonConfigArr = + masterConfig && masterConfig.gdsconfigformslave.filter(item => item.sControlName && item.sControlName.includes("BtnTempSql")); const allConfig = { - slaveConfig, masterConfig, + slaveConfig, + masterConfig, }; - if(commonUtils.isNotEmptyArr(buttonConfigArr)) { + if (commonUtils.isNotEmptyArr(buttonConfigArr)) { copyTo.config = buttonConfigArr; - const sTmpInfoConfig = buttonConfigArr.filter(item => item.sControlName && item.sControlName.includes('BtnTempSql'))[0]; + const sTmpInfoConfig = buttonConfigArr.filter(item => item.sControlName && item.sControlName.includes("BtnTempSql"))[0]; const sControlName = sTmpInfoConfig.sControlName; const dataUrl = `${commonConfig.server_host}salesorder/getTmpInfoBySql/?sModelsId=${sModelsId}`; - const sConfigformId = commonUtils.isEmpty(sTmpInfoConfig) ? '' : sTmpInfoConfig.sParentId; + const sConfigformId = commonUtils.isEmpty(sTmpInfoConfig) ? "" : sTmpInfoConfig.sParentId; if (commonUtils.isNotEmptyObject(sTmpInfoConfig)) { const newCopyTo = {}; newCopyTo.master = copyTo.masterData; @@ -4242,27 +4783,31 @@ export default (ChildComponent) => { if (dataReturn.code === 1) { slaveData = []; const returnData = dataReturn.dataset.rows[0]; - const copyToMasterDetailConfig = copyTo.config.filter(item => item.sControlName.toLowerCase() === `${copyTo.name}.masterdetail`.toLowerCase()); + const copyToMasterDetailConfig = copyTo.config.filter( + item => item.sControlName.toLowerCase() === `${copyTo.name}.masterdetail`.toLowerCase() + ); const copyToSlaveConfig = copyTo.config.filter(item => item.sControlName.toLowerCase() === `${copyTo.name}.slave`.toLowerCase()); - const copyToSlaveDetailConfig = copyTo.config.filter(item => item.sControlName.toLowerCase() === `${copyTo.name}.slavedetail`.toLowerCase()); + const copyToSlaveDetailConfig = copyTo.config.filter( + item => item.sControlName.toLowerCase() === `${copyTo.name}.slavedetail`.toLowerCase() + ); const copyToSlave1Config = copyTo.config.filter(item => item.sControlName.toLowerCase() === `${copyTo.name}.slave1`.toLowerCase()); const copyToSlave0Config = copyTo.config.filter(item => item.sControlName.toLowerCase() === `${copyTo.name}.slave0`.toLowerCase()); const copyToSlave2Config = copyTo.config.filter(item => item.sControlName.toLowerCase() === `${copyTo.name}.slave2`.toLowerCase()); const copyToSlava3Config = copyTo.config.filter(item => item.sControlName.toLowerCase() === `${copyTo.name}.slava3`.toLowerCase()); const copyToSlava4Config = copyTo.config.filter(item => item.sControlName.toLowerCase() === `${copyTo.name}.slava4`.toLowerCase()); - const masterDetailAssignField = commonUtils.isNotEmptyArr(copyToMasterDetailConfig) ? copyToMasterDetailConfig[0].sAssignField : ''; - const salveDetailAssignField = commonUtils.isNotEmptyArr(copyToSlaveDetailConfig) ? copyToSlaveDetailConfig[0].sAssignField : ''; - const salveAssignField = commonUtils.isNotEmptyArr(copyToSlaveConfig) ? copyToSlaveConfig[0].sAssignField : ''; - const slave1AssignField = commonUtils.isNotEmptyArr(copyToSlave1Config) ? copyToSlave1Config[0].sAssignField : ''; - const slave0AssignField = commonUtils.isNotEmptyArr(copyToSlave0Config) ? copyToSlave0Config[0].sAssignField : ''; - const slave2AssignField = commonUtils.isNotEmptyArr(copyToSlave2Config) ? copyToSlave2Config[0].sAssignField : ''; - const slave3AssignField = commonUtils.isNotEmptyArr(copyToSlava3Config) ? copyToSlava3Config[0].sAssignField : ''; - const slave4AssignField = commonUtils.isNotEmptyArr(copyToSlava4Config) ? copyToSlava4Config[0].sAssignField : ''; + const masterDetailAssignField = commonUtils.isNotEmptyArr(copyToMasterDetailConfig) ? copyToMasterDetailConfig[0].sAssignField : ""; + const salveDetailAssignField = commonUtils.isNotEmptyArr(copyToSlaveDetailConfig) ? copyToSlaveDetailConfig[0].sAssignField : ""; + const salveAssignField = commonUtils.isNotEmptyArr(copyToSlaveConfig) ? copyToSlaveConfig[0].sAssignField : ""; + const slave1AssignField = commonUtils.isNotEmptyArr(copyToSlave1Config) ? copyToSlave1Config[0].sAssignField : ""; + const slave0AssignField = commonUtils.isNotEmptyArr(copyToSlave0Config) ? copyToSlave0Config[0].sAssignField : ""; + const slave2AssignField = commonUtils.isNotEmptyArr(copyToSlave2Config) ? copyToSlave2Config[0].sAssignField : ""; + const slave3AssignField = commonUtils.isNotEmptyArr(copyToSlava3Config) ? copyToSlava3Config[0].sAssignField : ""; + const slave4AssignField = commonUtils.isNotEmptyArr(copyToSlava4Config) ? copyToSlava4Config[0].sAssignField : ""; if (commonUtils.isNotEmptyArr(returnData.master) && masterDetailAssignField) { masterData = { ...masterData, ...commonFunc.getAssignFieldValue(masterDetailAssignField, returnData.master[0], newCopyTo) }; } if (commonUtils.isNotEmptyArr(returnData.slave)) { - returnData.slave.forEach((slaveItem) => { + returnData.slave.forEach(slaveItem => { newCopyTo.slave = slaveItem; const newSid = commonUtils.createSid(); let slaveRow = commonFunc.getDefaultData(allConfig.slaveConfig, newCopyTo, { newSid }); // 取默认值 @@ -4271,7 +4816,7 @@ export default (ChildComponent) => { } else if (salveAssignField) { slaveRow = { ...slaveRow, ...commonFunc.getAssignFieldValue(salveAssignField, slaveItem, newCopyTo) }; // 取赋值字段 } - slaveRow.handleType = 'add'; + slaveRow.handleType = "add"; slaveRow.sId = newSid; slaveRow.sParentId = masterData.sId; slaveData.push(slaveRow); @@ -4279,12 +4824,12 @@ export default (ChildComponent) => { } if (commonUtils.isNotEmptyArr(returnData.slave0)) { - returnData.slave0.forEach((slave0Item) => { + returnData.slave0.forEach(slave0Item => { newCopyTo.slave0 = slave0Item; const newSid = commonUtils.createSid(); let slave0Row = commonFunc.getDefaultData(allConfig.slave0Config, newCopyTo, { newSid }); // 取默认值 slave0Row = { ...slave0Row, ...commonFunc.getAssignFieldValue(slave0AssignField, slave0Item, newCopyTo) }; // 取赋值字段 - slave0Row.handleType = 'add'; + slave0Row.handleType = "add"; slave0Row.sId = newSid; slave0Row.sParentId = masterData.sId; slave0Data.push(slave0Row); @@ -4292,12 +4837,12 @@ export default (ChildComponent) => { } if (commonUtils.isNotEmptyArr(returnData.slave1)) { - returnData.slave1.forEach((slave1Item) => { + returnData.slave1.forEach(slave1Item => { newCopyTo.slave1 = slave1Item; const newSid = commonUtils.createSid(); let slave1Row = commonFunc.getDefaultData(allConfig.slave1Config, newCopyTo, { newSid }); // 取默认值 slave1Row = { ...slave1Row, ...commonFunc.getAssignFieldValue(slave1AssignField, slave1Item, newCopyTo) }; // 取赋值字段 - slave1Row.handleType = 'add'; + slave1Row.handleType = "add"; slave1Row.sId = newSid; slave1Row.sParentId = masterData.sId; slave1Data.push(slave1Row); @@ -4305,12 +4850,12 @@ export default (ChildComponent) => { } if (commonUtils.isNotEmptyArr(returnData.slave2)) { - returnData.slave2.forEach((slave2Item) => { + returnData.slave2.forEach(slave2Item => { newCopyTo.slave2 = slave2Item; const newSid = commonUtils.createSid(); let slave2Row = commonFunc.getDefaultData(allConfig.slave2Config, newCopyTo, { newSid }); // 取默认值 slave2Row = { ...slave2Row, ...commonFunc.getAssignFieldValue(slave2AssignField, slave2Item, newCopyTo) }; // 取赋值字段 - slave2Row.handleType = 'add'; + slave2Row.handleType = "add"; slave2Row.sId = newSid; slave2Row.sParentId = masterData.sId; slave2Data.push(slave2Row); @@ -4318,12 +4863,12 @@ export default (ChildComponent) => { } if (commonUtils.isNotEmptyArr(returnData.slave3)) { - returnData.slave3.forEach((slave3Item) => { + returnData.slave3.forEach(slave3Item => { newCopyTo.slave3 = slave3Item; const newSid = commonUtils.createSid(); let slave3Row = commonFunc.getDefaultData(allConfig.slave3Config, newCopyTo, { newSid }); // 取默认值 slave3Row = { ...slave3Row, ...commonFunc.getAssignFieldValue(slave3AssignField, slave3Item, newCopyTo) }; // 取赋值字段 - slave3Row.handleType = 'add'; + slave3Row.handleType = "add"; slave3Row.sId = newSid; slave3Row.sParentId = masterData.sId; slave3Data.push(slave3Row); @@ -4331,40 +4876,42 @@ export default (ChildComponent) => { } if (commonUtils.isNotEmptyArr(returnData.slave4)) { - returnData.slave4.forEach((slave4Item) => { + returnData.slave4.forEach(slave4Item => { newCopyTo.slave4 = slave4Item; const newSid = commonUtils.createSid(); let slave4Row = commonFunc.getDefaultData(allConfig.slave4Config, newCopyTo, { newSid }); // 取默认值 slave4Row = { ...slave4Row, ...commonFunc.getAssignFieldValue(slave4AssignField, slave4Item, newCopyTo) }; // 取赋值字段 - slave4Row.handleType = 'add'; + slave4Row.handleType = "add"; slave4Row.sId = newSid; slave4Row.sParentId = masterData.sId; slave4Data.push(slave4Row); }); } - this.props.onSaveState({ slaveData, slave1Data, slave2Data, slave3Data, slave4Data}); + this.props.onSaveState({ slaveData, slave1Data, slave2Data, slave3Data, slave4Data }); } else { this.props.getServiceError(dataReturn); } } } else { - message.error('请正确配置自定义按钮！'); - } - }else if (name && name.includes('BtnCalc')) { /* 实现通用计算功能 */ - const { masterConfig, masterData, sModelsId, } = this.props; - this.props.onSaveState({ pageLoading:true }); - const btnConfig = commonUtils.isNotEmptyArr(masterConfig.gdsconfigformslave.filter(item => (item.sControlName === name))) ? - masterConfig.gdsconfigformslave.filter(item => (item.sControlName === name))[0] : {};// sButtonEnabled sButtonParam - if(commonUtils.isNotEmptyObject(btnConfig)) { + message.error("请正确配置自定义按钮！"); + } + } else if (name && name.includes("BtnCalc")) { + /* 实现通用计算功能 */ + const { masterConfig, masterData, sModelsId } = this.props; + this.props.onSaveState({ pageLoading: true }); + const btnConfig = commonUtils.isNotEmptyArr(masterConfig.gdsconfigformslave.filter(item => item.sControlName === name)) + ? masterConfig.gdsconfigformslave.filter(item => item.sControlName === name)[0] + : {}; // sButtonEnabled sButtonParam + if (commonUtils.isNotEmptyObject(btnConfig)) { /* 组装allTableData */ - const allTableMap ={}; - const allReturnMap ={}; - const slaveNameList = []; + const allTableMap = {}; + const allReturnMap = {}; + const slaveNameList = []; /* 从props找到 所有的Config */ - if(commonUtils.isNotEmptyArr(this.props)) { + if (commonUtils.isNotEmptyArr(this.props)) { for (const key of Object.keys(this.props)) { - if(key.includes('Config') && !key.includes('onGet') && !key.includes('report')) { - const tablename = key.replace('Config', '').trim(); + if (key.includes("Config") && !key.includes("onGet") && !key.includes("report")) { + const tablename = key.replace("Config", "").trim(); slaveNameList.push(tablename); } } @@ -4372,23 +4919,23 @@ export default (ChildComponent) => { if (commonUtils.isNotEmptyArr(slaveNameList)) { slaveNameList.forEach((name, index) => { - const tableConfig = this.props[name +'Config']; /* 动态配置 */ - const tableData = this.props[name +'Data']; /* 动态配置 */ - if(commonUtils.isNotEmptyObject(tableConfig)) { - allTableMap[name +'.'+ tableConfig.sTbName] = tableData; + const tableConfig = this.props[name + "Config"]; /* 动态配置 */ + const tableData = this.props[name + "Data"]; /* 动态配置 */ + if (commonUtils.isNotEmptyObject(tableConfig)) { + allTableMap[name + "." + tableConfig.sTbName] = tableData; } }); const masterTbName = masterConfig.sTbName; - allTableMap['master.'+ masterTbName] = masterData; + allTableMap["master." + masterTbName] = masterData; } const sButtonParam = btnConfig.sButtonParam; - const btn = commonUtils.isJSON(sButtonParam) ? JSON.parse(sButtonParam) : ''; + const btn = commonUtils.isJSON(sButtonParam) ? JSON.parse(sButtonParam) : ""; const sProName = btn.sproName; const url = `${commonConfig.server_host}calcprocedure/calc?sModelsId=${sModelsId}`; const value = { sProName, sButtonParam, - allTableMap + allTableMap, }; if (bBtncalcComfim) { value.iFlag = 1; @@ -4396,104 +4943,98 @@ export default (ChildComponent) => { const dataReturn = (await commonServices.postValueService(this.props.app.token, value, url)).data; if (dataReturn.code === 1) { /* 数据操作 数据回传页面 */ - message.success('操作成功！'); + message.success("操作成功！"); const returnData = dataReturn.dataset.rows[0]; if (commonUtils.isNotEmptyArr(slaveNameList) && commonUtils.isNotEmptyObject(returnData)) { slaveNameList.forEach((name, index) => { - const tableConfig = this.props[name +'Config']; /* 动态配置 */ - let tableDelData = this.props[name +'DelData']; - if(commonUtils.isEmptyArr(tableDelData)) { + const tableConfig = this.props[name + "Config"]; /* 动态配置 */ + let tableDelData = this.props[name + "DelData"]; + if (commonUtils.isEmptyArr(tableDelData)) { tableDelData = []; } - let tableDelDataNew = [] + let tableDelDataNew = []; let tableData = []; - if(commonUtils.isNotEmptyObject(tableConfig)) { - tableData = returnData[name +'.'+ tableConfig.sTbName]; /* 动态配置 */ - if(commonUtils.isNotEmptyArr(tableData) && Array.isArray(tableData)) { - tableDelDataNew = tableData.filter(item => item.handleType === 'del'); - tableData = tableData.filter(item => item.handleType !== 'del'); + if (commonUtils.isNotEmptyObject(tableConfig)) { + tableData = returnData[name + "." + tableConfig.sTbName]; /* 动态配置 */ + if (commonUtils.isNotEmptyArr(tableData) && Array.isArray(tableData)) { + tableDelDataNew = tableData.filter(item => item.handleType === "del"); + tableData = tableData.filter(item => item.handleType !== "del"); tableDelData = tableDelData.concat(tableDelDataNew); } - } - allReturnMap[name +'Data'] = tableData; - allReturnMap[name +'DelData'] = tableDelData; + allReturnMap[name + "Data"] = tableData; + allReturnMap[name + "DelData"] = tableDelData; }); const masterTbName = masterConfig.sTbName; - allReturnMap.masterData = returnData['master.'+ masterTbName]; + allReturnMap.masterData = returnData["master." + masterTbName]; allReturnMap.masterData.enabled = true; } // this.handleValidateSave(); - this.props.onSaveState({ ...allReturnMap, pageLoading:false }); - }else if (dataReturn.code === -8 || dataReturn.code === 2) { + this.props.onSaveState({ ...allReturnMap, pageLoading: false }); + } else if (dataReturn.code === -8 || dataReturn.code === 2) { Modal.info({ - title: '温馨提示:', - content: ( -
- {this.handleGetMsg(dataReturn.msg)}
-
- ),
- okText: '确认',
+ title: "温馨提示:",
+ content: {this.handleGetMsg(dataReturn.msg)}
,
+ okText: "确认",
onOk() {},
});
- this.props.onSaveState({ pageLoading:false });
+ this.props.onSaveState({ pageLoading: false });
} else if (dataReturn.code === -7) {
const _this = this;
Modal.confirm({
title: FriendlyReminder,
- content: (
-
- {this.handleGetMsg(dataReturn.msg)}
-
- ),
+ content: {this.handleGetMsg(dataReturn.msg)}
,
onOk() {
_this.handleButtonClick(name, true);
},
- onCancel() {}
+ onCancel() {},
});
- this.props.onSaveState({ pageLoading:false });
- } else { /* 失败 */
+ this.props.onSaveState({ pageLoading: false });
+ } else {
+ /* 失败 */
this.props.getServiceError(dataReturn);
- this.props.onSaveState({ pageLoading:false });
+ this.props.onSaveState({ pageLoading: false });
}
-
}
- } else if (name === 'BtnTmpInfoBySql') { /* 自定义数据源 */
+ } else if (name === "BtnTmpInfoBySql") {
+ /* 自定义数据源 */
this.handleBtnTmpInfoBySql(name);
- } else if (name === 'BtnExtract') { /* 提取上批数据功能 */
+ } else if (name === "BtnExtract") {
+ /* 提取上批数据功能 */
this.handleBtnExtract(name);
}
};
- handleBtnTmpInfoBySql = async (btnName) => {
- const { masterConfig, masterData, slaveData, slaveSelectedRowKeys, token, sModelsId} = this.props;
+ handleBtnTmpInfoBySql = async btnName => {
+ const { masterConfig, masterData, slaveData, slaveSelectedRowKeys, token, sModelsId } = this.props;
let slaveRow = {};
- if(commonUtils.isNotEmptyArr(slaveSelectedRowKeys)) {
+ if (commonUtils.isNotEmptyArr(slaveSelectedRowKeys)) {
const iIndex = slaveData.findIndex(item => slaveSelectedRowKeys.includes(item.sId));
- if(iIndex > -1) {
+ if (iIndex > -1) {
slaveRow = slaveData[iIndex];
}
} else {
slaveRow = slaveData[0];
}
- const tableConfig = commonUtils.isNotEmptyArr(masterConfig.gdsconfigformslave.filter(item => item.sControlName === btnName)) ?
- masterConfig.gdsconfigformslave.filter(item => item.sControlName === btnName)[0] : {};
+ const tableConfig = commonUtils.isNotEmptyArr(masterConfig.gdsconfigformslave.filter(item => item.sControlName === btnName))
+ ? masterConfig.gdsconfigformslave.filter(item => item.sControlName === btnName)[0]
+ : {};
const sTmpInfoConfig = tableConfig;
const sButtonParam = tableConfig.sButtonParam;
- const btn = commonUtils.isNotEmptyObject(sButtonParam) ? JSON.parse(sButtonParam) : '';
- if(commonUtils.isNotEmptyObject(btn)) {
- const sProName = commonUtils.isNotEmptyObject(btn) ? btn.sproName : '';
+ const btn = commonUtils.isNotEmptyObject(sButtonParam) ? JSON.parse(sButtonParam) : "";
+ if (commonUtils.isNotEmptyObject(btn)) {
+ const sProName = commonUtils.isNotEmptyObject(btn) ? btn.sproName : "";
const sTmpInfoBySqlBtnName = btn.sControlName;
const newCopyTo = {};
newCopyTo.master = masterData;
/* 找到自定义TempInfo配置 */
const sTmpInfoBySqlBtnConfig = masterConfig.gdsconfigformslave.filter(item => item.sControlName.includes(sTmpInfoBySqlBtnName));
const dataUrl = `${commonConfig.server_host}salesorder/getTmpInfoBySql/?sModelsId=${sModelsId}`;
- const sConfigformId = commonUtils.isEmpty(sTmpInfoBySqlBtnConfig) ? '' : sTmpInfoBySqlBtnConfig[0].sParentId;
- const sControlName = commonUtils.isNotEmptyObject(sTmpInfoBySqlBtnName) ? sTmpInfoBySqlBtnName : 'TmpInfoBySql';
+ const sConfigformId = commonUtils.isEmpty(sTmpInfoBySqlBtnConfig) ? "" : sTmpInfoBySqlBtnConfig[0].sParentId;
+ const sControlName = commonUtils.isNotEmptyObject(sTmpInfoBySqlBtnName) ? sTmpInfoBySqlBtnName : "TmpInfoBySql";
const sAssignField = sTmpInfoBySqlBtnConfig[0].sAssignField;
let sRowData = [slaveRow];
- if(sTmpInfoBySqlBtnConfig[0].sSqlCondition && sTmpInfoBySqlBtnConfig[0].sSqlCondition.includes('master.')) {
+ if (sTmpInfoBySqlBtnConfig[0].sSqlCondition && sTmpInfoBySqlBtnConfig[0].sSqlCondition.includes("master.")) {
sRowData = [masterData];
}
const values = { sConfigformId, sControlName, sRowData };
@@ -4515,42 +5056,44 @@ export default (ChildComponent) => {
if (commonUtils.isEmptyArr(oldData)) {
oldData = [];
}
- if (sTmpInfoBySqlBtnName.includes('_edit')) { /* 替换 根据对应字段对比 相同的不管 不同的插入 */
+ if (sTmpInfoBySqlBtnName.includes("_edit")) {
+ /* 替换 根据对应字段对比 相同的不管 不同的插入 */
/* 对应字段 */
const sActiveKey = sTmpInfoBySqlBtnConfig[0].sActiveKey;
const keyData = returnData[key];
let newData = [];
if (commonUtils.isNotEmptyArr(keyData)) {
- keyData.forEach((child) => {
+ keyData.forEach(child => {
const filterData = oldData.filter(item => item[sActiveKey] !== child[sActiveKey]);
if (commonUtils.isNotEmptyArr(filterData) && filterData.length === oldData.length) {
let tableRow = {};
tableRow = { ...tableRow, ...commonFunc.getAssignFieldValue(sAssignField, child) }; // 取赋值字段
tableRow.sId = commonUtils.createSid();
tableRow.sParentId = masterData.sId;
- tableRow.handleType = 'add';
+ tableRow.handleType = "add";
newData.push(tableRow);
}
});
- newData = oldData.concat(newData)
+ newData = oldData.concat(newData);
}
allReturnMap[sName] = newData;
- } else if (sTmpInfoBySqlBtnName.includes('_del')) { /* 替换 根据对应字段对比 相同的不管 不同的插入 */
+ } else if (sTmpInfoBySqlBtnName.includes("_del")) {
+ /* 替换 根据对应字段对比 相同的不管 不同的插入 */
/* 对应字段 */
- oldData.forEach((child) => {
- child.handleType ='del';
+ oldData.forEach(child => {
+ child.handleType = "del";
oldDelData.push(child);
});
allReturnMap[sDelName] = oldDelData;
oldData = [];
const keyData = returnData[key];
if (commonUtils.isNotEmptyArr(keyData)) {
- keyData.forEach((child) => {
+ keyData.forEach(child => {
let tableRow = {};
tableRow = { ...tableRow, ...commonFunc.getAssignFieldValue(sAssignField, child) }; // 取赋值字段
tableRow.sId = commonUtils.createSid();
tableRow.sParentId = masterData.sId;
- tableRow.handleType = 'add';
+ tableRow.handleType = "add";
tableRow.key = tableRow.sId;
oldData.push(tableRow);
});
@@ -4559,12 +5102,11 @@ export default (ChildComponent) => {
} else {
allReturnMap[sName] = returnData[key];
}
-
}
if (commonUtils.isNotEmptyArr(allReturnMap.masterData) && Array.isArray(allReturnMap.masterData)) {
allReturnMap.masterData = allReturnMap.masterData[0];
}
- console.log('allReturnMap:', allReturnMap);
+ console.log("allReturnMap:", allReturnMap);
this.props.onSaveState({ ...allReturnMap });
}
} else {
@@ -4572,19 +5114,18 @@ export default (ChildComponent) => {
}
}
} else {
- message.error('配置错误，没有配置对应字段！');
+ message.error("配置错误，没有配置对应字段！");
}
-
- }
+ };
/* 提取功能 */
- handleBtnExtract = (btnName) => {
+ handleBtnExtract = btnName => {
/* 上批数据 */
const { masterConfig, slaveChildInfoList, formData, slaveData = [], slaveSelectedRowKeys } = this.props;
let slaveRow = {};
- if(commonUtils.isNotEmptyArr(slaveData)) {
- if(commonUtils.isEmptyArr(slaveSelectedRowKeys)) {
- slaveRow = slaveData[0];
+ if (commonUtils.isNotEmptyArr(slaveData)) {
+ if (commonUtils.isEmptyArr(slaveSelectedRowKeys)) {
+ slaveRow = slaveData[0];
} else {
slaveRow = slaveData.find(item => item.sId === slaveSelectedRowKeys[0]);
}
@@ -4600,50 +5141,51 @@ export default (ChildComponent) => {
slaveRow.sNoteMemo9Up = 50;
slaveRow.sNoteMemo10Up = 50;
slaveRow.sNoteMemo11Up = 110;
- console.log('slaveRow', slaveRow);
- const tableConfig = commonUtils.isNotEmptyArr(masterConfig.gdsconfigformslave.filter(item => item.sControlName === btnName)) ?
- masterConfig.gdsconfigformslave.filter(item => item.sControlName === btnName)[0] : {};
- const sAssignField = commonUtils.isNotEmptyObject(tableConfig) ? tableConfig.sAssignField : '';
- console.log('22sAssignField2', sAssignField);
+ console.log("slaveRow", slaveRow);
+ const tableConfig = commonUtils.isNotEmptyArr(masterConfig.gdsconfigformslave.filter(item => item.sControlName === btnName))
+ ? masterConfig.gdsconfigformslave.filter(item => item.sControlName === btnName)[0]
+ : {};
+ const sAssignField = commonUtils.isNotEmptyObject(tableConfig) ? tableConfig.sAssignField : "";
+ console.log("22sAssignField2", sAssignField);
const addState = {};
- console.log('slaveChildInfoList', slaveChildInfoList);
+ console.log("slaveChildInfoList", slaveChildInfoList);
/* 找到界面所有子表配置, 将子表数据中的Up给对应父级配置的没有up的字段 */
- if(commonUtils.isNotEmptyArr(slaveChildInfoList) && commonUtils.isNotEmptyObject(slaveRow)) {
- slaveChildInfoList.forEach((slaveChildName) => {
- const childName = slaveChildName.split('-')[0];
+ if (commonUtils.isNotEmptyArr(slaveChildInfoList) && commonUtils.isNotEmptyObject(slaveRow)) {
+ slaveChildInfoList.forEach(slaveChildName => {
+ const childName = slaveChildName.split("-")[0];
const childConfig = this.props[`${childName}Config`];
const childData = this.props[`${childName}Data`];
- console.log('config:::', childName, childData);
- if(commonUtils.isNotEmptyObject(childConfig)) {
+ console.log("config:::", childName, childData);
+ if (commonUtils.isNotEmptyObject(childConfig)) {
/* 找到父级配置 */
- const fatherConfig = formData.find(fatherConfig => fatherConfig.sChildTableName &&
- fatherConfig.sChildTableName.split(",").includes(childConfig?.sGrd));
- const fatherName = fatherConfig.sGrd;
+ const fatherConfig = formData.find(
+ fatherConfig => fatherConfig.sChildTableName && fatherConfig.sChildTableName.split(",").includes(childConfig?.sGrd)
+ );
+ const fatherName = fatherConfig.sGrd;
let fatherData = this.props[`${fatherName}Data`];
- if(commonUtils.isEmptyArr(fatherData)) {
+ if (commonUtils.isEmptyArr(fatherData)) {
fatherData = [];
}
let tableRow = {};
- tableRow = { ...tableRow, ...commonFunc.getAssignFieldValue(sAssignField, slaveRow)}; // 取赋值字段
- console.log('tableRow', tableRow);
- if(commonUtils.isEmptyArr(fatherData)) {
- const newRow ={...tableRow};
+ tableRow = { ...tableRow, ...commonFunc.getAssignFieldValue(sAssignField, slaveRow) }; // 取赋值字段
+ console.log("tableRow", tableRow);
+ if (commonUtils.isEmptyArr(fatherData)) {
+ const newRow = { ...tableRow };
newRow.sId = commonUtils.createSid();
- fatherData.push(newRow)
+ fatherData.push(newRow);
} else {
const handleType = commonUtils.isEmpty(fatherData[0].handleType) ? "update" : fatherData[0].handleType;
- fatherData[0] = { ...fatherData[0] ,...tableRow, handleType }
+ fatherData[0] = { ...fatherData[0], ...tableRow, handleType };
}
- addState[fatherName]= fatherData;
- console.log('fatherName:', fatherName);
- console.log('fatherConfig', fatherConfig);
- console.log('fatherData', fatherData);
+ addState[fatherName] = fatherData;
+ console.log("fatherName:", fatherName);
+ console.log("fatherConfig", fatherConfig);
+ console.log("fatherData", fatherData);
}
-
- })
+ });
}
- console.log('addState', addState);
- this.props.onSaveState ( { addState })
+ console.log("addState", addState);
+ this.props.onSaveState({ addState });
};
handleBtnChoose = async (name, sControlName, chooseConfig) => {
@@ -4657,17 +5199,18 @@ export default (ChildComponent) => {
this.props.getServiceError(dataReturn);
}
};
- handleViewClick = (name, sName, record, index , myConfig) => {
- if (name === 'process' && sName === 'sProcessParamStr') { // process sProcessParam
+ handleViewClick = (name, sName, record, index, myConfig) => {
+ if (name === "process" && sName === "sProcessParamStr") {
+ // process sProcessParam
const { processConfig, enabled, sModelsType } = this.props;
const slaveSelectOneData = record;
let modalVisible = false;
const sProcessParamsSelects = [];
- let paramType = '';
+ let paramType = "";
if (commonUtils.isNotEmptyObject(slaveSelectOneData)) {
- if (sModelsType.includes('manufacture/')) {
+ if (sModelsType.includes("manufacture/")) {
paramType = slaveSelectOneData.sWorkOrderParam;
- } else if (sModelsType.includes('quotation/')) {
+ } else if (sModelsType.includes("quotation/")) {
paramType = slaveSelectOneData.sProcessParam;
}
}
@@ -4679,7 +5222,7 @@ export default (ChildComponent) => {
const iIndex = processConfig.gdsconfigformslave.findIndex(item => item.sName === `sParamValue${i.toString()}`);
if (iIndex > -1 && !commonUtils.isEmpty(sProcessParam[`sParam${i.toString()}`])) {
processConfig.gdsconfigformslave[iIndex].showName = sProcessParam[`sParam${i.toString()}`];
- processConfig.gdsconfigformslave[iIndex].bVisible = !sProcessParam[`sParam${i.toString()}`].includes('参数值');
+ processConfig.gdsconfigformslave[iIndex].bVisible = !sProcessParam[`sParam${i.toString()}`].includes("参数值");
record[`sParam${i.toString()}`] = sProcessParam[`sParam${i.toString()}`];
sProcessParamsSelects.push(processConfig.gdsconfigformslave[iIndex]);
} else if (iIndex > -1) {
@@ -4690,8 +5233,8 @@ export default (ChildComponent) => {
/* Begin 找到除了工艺参数以外的额外参数 通过对应字段找到该字段配置 */
for (const key of Object.keys(slaveSelectOneData)) {
- if (key.includes('sParam')) {
- const iIndexOther = processConfig.gdsconfigformslave.findIndex(item => item.sName === key.replace('sParam', '').trim());
+ if (key.includes("sParam")) {
+ const iIndexOther = processConfig.gdsconfigformslave.findIndex(item => item.sName === key.replace("sParam", "").trim());
if (iIndexOther > -1 && !commonUtils.isEmpty(slaveSelectOneData[key])) {
const fieldConfig = processConfig.gdsconfigformslave[iIndexOther];
if (fieldConfig) {
@@ -4700,9 +5243,10 @@ export default (ChildComponent) => {
const bSrc = slaveSelectOneData[bSrcName];
/* 如果不原配置 则同参数配置雷同 */
if (!bSrc) {
- processConfig.gdsconfigformslave[iIndexOther].sFieldToContent = '1'; /* 从工序配置的DropDownData中拿数据 */
- } else { /* 走原配置读取数据源 */
- processConfig.gdsconfigformslave[iIndexOther].sFieldToContent = ''; /* 从工序配置的DropDownData中拿数据 */
+ processConfig.gdsconfigformslave[iIndexOther].sFieldToContent = "1"; /* 从工序配置的DropDownData中拿数据 */
+ } else {
+ /* 走原配置读取数据源 */
+ processConfig.gdsconfigformslave[iIndexOther].sFieldToContent = ""; /* 从工序配置的DropDownData中拿数据 */
}
processConfig.gdsconfigformslave[iIndexOther].bParam = true; /* 增加参数字段标识 */
processConfig.gdsconfigformslave[iIndexOther].showName = sProcessParam[`sParam${sFieldName.toString()}`];
@@ -4727,17 +5271,18 @@ export default (ChildComponent) => {
sProcessParamsSelects,
sProcessParamsModalVisible: modalVisible,
});
- } else if (name === 'process' && sName === 'sParams' && commonUtils.isNotEmptyObject(record.sParams)) { // process sProcessParam
+ } else if (name === "process" && sName === "sParams" && commonUtils.isNotEmptyObject(record.sParams)) {
+ // process sProcessParam
const { processConfig, enabled, sModelsType } = this.props;
const slaveSelectOneData = record;
let modalVisible = false;
const sProcessParamsSelects = [];
let sParamData = [];
- let paramType = '';
+ let paramType = "";
if (commonUtils.isNotEmptyObject(slaveSelectOneData)) {
- if (sModelsType.includes('manufacture/')) {
+ if (sModelsType.includes("manufacture/")) {
paramType = slaveSelectOneData.sWorkOrderParam;
- } else if (sModelsType.includes('quotation/')) {
+ } else if (sModelsType.includes("quotation/")) {
paramType = slaveSelectOneData.sProcessParam;
}
}
@@ -4746,36 +5291,42 @@ export default (ChildComponent) => {
bisMutiSelect: true,
bMutiSelect: false,
};
- const gdsconfigformslave = [{
- sId: commonUtils.createSid(),
- sName: 'sId',
- showName: '主键',
- bVisible: false,
- iFitWidth: 200,
- }, {
- sId: commonUtils.createSid(),
- sName: 'bSelfCbx',
- showName: '选择',
- bVisible: true,
- iFitWidth: 45,
- }, {
- sId: commonUtils.createSid(),
- sName: 'sParamKey',
- showName: '参数主键',
- bVisible: true,
- iFitWidth: 200,
- }, {
- sId: commonUtils.createSid(),
- sName: 'sParamName',
- showName: '参数名',
- bVisible: true,
- iFitWidth: 400,
- }, {
- sId: commonUtils.createSid(),
- sName: 'sParamValue',
- showName: '参数值',
- bVisible: true,
- }];
+ const gdsconfigformslave = [
+ {
+ sId: commonUtils.createSid(),
+ sName: "sId",
+ showName: "主键",
+ bVisible: false,
+ iFitWidth: 200,
+ },
+ {
+ sId: commonUtils.createSid(),
+ sName: "bSelfCbx",
+ showName: "选择",
+ bVisible: true,
+ iFitWidth: 45,
+ },
+ {
+ sId: commonUtils.createSid(),
+ sName: "sParamKey",
+ showName: "参数主键",
+ bVisible: true,
+ iFitWidth: 200,
+ },
+ {
+ sId: commonUtils.createSid(),
+ sName: "sParamName",
+ showName: "参数名",
+ bVisible: true,
+ iFitWidth: 400,
+ },
+ {
+ sId: commonUtils.createSid(),
+ sName: "sParamValue",
+ showName: "参数值",
+ bVisible: true,
+ },
+ ];
sParamConfig.gdsconfigformslave = gdsconfigformslave;
const sParamColumn = commonFunc.getHeaderConfig(sParamConfig);
if (commonUtils.isNotEmptyObject(paramType) && enabled) {
@@ -4788,23 +5339,23 @@ export default (ChildComponent) => {
sParamsModalVisible: true,
sParamConfig,
sParamColumn,
- sParamData
+ sParamData,
});
} else {
- if(sName === 'myTableConfig') {
- this.handleQuickViewClick(name, sName, record, index, myConfig );
+ if (sName === "myTableConfig") {
+ this.handleQuickViewClick(name, sName, record, index, myConfig);
} else {
- this.props.onViewClick(name, sName, record, index, myConfig );
+ this.props.onViewClick(name, sName, record, index, myConfig);
}
}
};
- handleViewChoose= (name, sName, record) => {
+ handleViewChoose = (name, sName, record) => {
const { sId } = record; /* 控制表主键 */
const { enabled } = this.props;
const sisColorSelectedRowKeys = [];
let jsonData = [];
- if (name === 'process' && sName === 'sColorSerialMemo') {
+ if (name === "process" && sName === "sColorSerialMemo") {
const { [`${name}Data`]: tableData } = this.props;
const iIndex = tableData.findIndex(item => item.sId === sId);
if (iIndex > -1) {
@@ -4813,7 +5364,7 @@ export default (ChildComponent) => {
if (commonUtils.isNotEmptyObject(sColorSerialMemo)) {
try {
jsonData = JSON.parse(sColorSerialMemo);
- jsonData.forEach((item) => {
+ jsonData.forEach(item => {
sisColorSelectedRowKeys.push(item.sId);
});
} catch (ex) {
@@ -4823,23 +5374,24 @@ export default (ChildComponent) => {
}
this.props.onSaveState({
sisColorChooseVisible: true,
- processSelectedRowId: sId, /* 工序表选中行sId */
+ processSelectedRowId: sId /* 工序表选中行sId */,
enabled,
sisColorSelectedRowKeys,
sisColorSelectedData: jsonData,
});
- }else if ( sName === 'sParams') { // process sProcessParam
+ } else if (sName === "sParams") {
+ // process sProcessParam
const { processConfig, enabled, sModelsType } = this.props;
const slaveSelectOneData = record;
let modalVisible = false;
const sProcessParamsSelects = [];
let sParamData = [];
- let paramType = '';
+ let paramType = "";
if (commonUtils.isNotEmptyObject(slaveSelectOneData)) {
paramType = slaveSelectOneData.sWorkOrderParam;
}
- if(commonUtils.isEmpty(paramType)) {
- message.warn('无工艺参数！');
+ if (commonUtils.isEmpty(paramType)) {
+ message.warn("无工艺参数！");
return;
}
/* 工序参数以表格形式展示 列 */
@@ -4847,49 +5399,55 @@ export default (ChildComponent) => {
bisMutiSelect: false,
bMutiSelect: false,
};
- const gdsconfigformslave = [{
- sId: commonUtils.createSid(),
- sName: 'sId',
- showName: '主键',
- bVisible: false,
- iFitWidth: 200,
- }, {
- sId: commonUtils.createSid(),
- sName: 'bSelfCbx',
- showName: '选择',
- bVisible: true,
- iFitWidth: 37,
- }, {
- sId: commonUtils.createSid(),
- sName: 'sParamKey',
- showName: '参数主键',
- bVisible: false,
- iFitWidth: 200,
- }, {
- sId: commonUtils.createSid(),
- sName: 'sParamName',
- showName: '参数名',
- bVisible: true,
- iFitWidth: 230,
- }, {
- sId: commonUtils.createSid(),
- sName: 'sParamValue',
- showName: '参数值',
- bVisible: true,
- }];
+ const gdsconfigformslave = [
+ {
+ sId: commonUtils.createSid(),
+ sName: "sId",
+ showName: "主键",
+ bVisible: false,
+ iFitWidth: 200,
+ },
+ {
+ sId: commonUtils.createSid(),
+ sName: "bSelfCbx",
+ showName: "选择",
+ bVisible: true,
+ iFitWidth: 37,
+ },
+ {
+ sId: commonUtils.createSid(),
+ sName: "sParamKey",
+ showName: "参数主键",
+ bVisible: false,
+ iFitWidth: 200,
+ },
+ {
+ sId: commonUtils.createSid(),
+ sName: "sParamName",
+ showName: "参数名",
+ bVisible: true,
+ iFitWidth: 230,
+ },
+ {
+ sId: commonUtils.createSid(),
+ sName: "sParamValue",
+ showName: "参数值",
+ bVisible: true,
+ },
+ ];
sParamConfig.gdsconfigformslave = gdsconfigformslave;
const sParamColumn = commonFunc.getHeaderConfig(sParamConfig);
if (commonUtils.isNotEmptyObject(paramType)) {
/* 要把数据以表格的形式显示出来 */
const sParamJsonObj = JSON.parse(paramType);
for (const key of Object.keys(sParamJsonObj)) {
- if (key.includes('sParam') && !key.includes('DropDown') && !key.includes('Default')) {
+ if (key.includes("sParam") && !key.includes("DropDown") && !key.includes("Default")) {
const obj = {};
obj.sId = commonUtils.createSid();
obj.sParamKey = key;
obj.sParamName = sParamJsonObj[key];
/* 找到数字 找到下拉数据源 */
- const num = key.replace(/[^\d]/g, '').trim();
+ const num = key.replace(/[^\d]/g, "").trim();
if (Number(num)) {
const number = Number(num);
const sParamDropDownKey = `sParamDropDown${number}`;
@@ -4901,34 +5459,34 @@ export default (ChildComponent) => {
}
}
/* 将sParam1中的数据 还原到sParamData数据中 */
- if(commonUtils.isNotEmptyObject(record.sParams)) {
+ if (commonUtils.isNotEmptyObject(record.sParams)) {
const selectedData = JSON.parse(record.sParams);
- if(commonUtils.isNotEmptyArr(selectedData)) {
- selectedData.forEach((itemS) => {
+ if (commonUtils.isNotEmptyArr(selectedData)) {
+ selectedData.forEach(itemS => {
sParamData.forEach(j => {
if (!Object.prototype.hasOwnProperty.call(itemS?.data || {}, j?.sParamKey)) return;
const value = itemS?.data?.[j.sParamKey];
if (j) j.sParamValue = value;
- })
+ });
const iIndex = sParamData.findIndex(item => item.sParamName === itemS.sParamName);
- if(iIndex > -1) {
- const addState ={};
+ if (iIndex > -1) {
+ const addState = {};
addState.sParamValue = itemS.sParamValue;
addState.bSelfCbx = itemS.bSelfCbx;
- sParamData[iIndex] ={...sParamData[iIndex], ...addState};
+ sParamData[iIndex] = { ...sParamData[iIndex], ...addState };
}
});
}
/* 如果数据集有一个是非选中的则非选中状态 否则全选 */
- if(commonUtils.isNotEmptyArr(sParamColumn)) {
- const iIndex = sParamColumn.findIndex(item => item.dataIndex ==='bSelfCbx');
- if(iIndex > -1) {
+ if (commonUtils.isNotEmptyArr(sParamColumn)) {
+ const iIndex = sParamColumn.findIndex(item => item.dataIndex === "bSelfCbx");
+ if (iIndex > -1) {
const filterData = sParamData.filter(item => !item.bSelfCbx);
- if(commonUtils.isNotEmptyArr(filterData)) {
- sParamColumn[iIndex] ={ ...sParamColumn[iIndex], bCheckAll:false};
- }else {
- sParamColumn[iIndex] ={ ...sParamColumn[iIndex], bCheckAll:true};
+ if (commonUtils.isNotEmptyArr(filterData)) {
+ sParamColumn[iIndex] = { ...sParamColumn[iIndex], bCheckAll: false };
+ } else {
+ sParamColumn[iIndex] = { ...sParamColumn[iIndex], bCheckAll: true };
}
}
}
@@ -4941,21 +5499,22 @@ export default (ChildComponent) => {
sParamConfig,
sParamColumn,
sParamData,
- sParamModalType:'sWork',
+ sParamModalType: "sWork",
enabled,
});
- }else if ( sName === 'sParamsNew') { // 工艺参数NEW
+ } else if (sName === "sParamsNew") {
+ // 工艺参数NEW
const { processConfig, enabled, sModelsType } = this.props;
const slaveSelectOneData = record;
let modalVisible = false;
const sProcessParamsSelects = [];
let sParamNewData = [];
- let paramType = '';
+ let paramType = "";
if (commonUtils.isNotEmptyObject(slaveSelectOneData)) {
paramType = slaveSelectOneData.sWorkOrderParam;
}
- if(commonUtils.isEmpty(paramType)) {
- message.warn('无工艺参数！');
+ if (commonUtils.isEmpty(paramType)) {
+ message.warn("无工艺参数！");
return;
}
/* 工序参数以表格形式展示 列 */
@@ -4963,49 +5522,55 @@ export default (ChildComponent) => {
bisMutiSelect: false,
bMutiSelect: false,
};
- const gdsconfigformslave = [{
- sId: commonUtils.createSid(),
- sName: 'sId',
- showName: '主键',
- bVisible: false,
- iFitWidth: 200,
- }, {
- sId: commonUtils.createSid(),
- sName: 'bSelfCbx',
- showName: '选择',
- bVisible: true,
- iFitWidth: 37,
- }, {
- sId: commonUtils.createSid(),
- sName: 'sParamKey',
- showName: '参数主键',
- bVisible: false,
- iFitWidth: 200,
- }, {
- sId: commonUtils.createSid(),
- sName: 'sParamName',
- showName: '参数名',
- bVisible: true,
- iFitWidth: 230,
- }, {
- sId: commonUtils.createSid(),
- sName: 'sParamValue',
- showName: '参数值',
- bVisible: true,
- }];
+ const gdsconfigformslave = [
+ {
+ sId: commonUtils.createSid(),
+ sName: "sId",
+ showName: "主键",
+ bVisible: false,
+ iFitWidth: 200,
+ },
+ {
+ sId: commonUtils.createSid(),
+ sName: "bSelfCbx",
+ showName: "选择",
+ bVisible: true,
+ iFitWidth: 37,
+ },
+ {
+ sId: commonUtils.createSid(),
+ sName: "sParamKey",
+ showName: "参数主键",
+ bVisible: false,
+ iFitWidth: 200,
+ },
+ {
+ sId: commonUtils.createSid(),
+ sName: "sParamName",
+ showName: "参数名",
+ bVisible: true,
+ iFitWidth: 230,
+ },
+ {
+ sId: commonUtils.createSid(),
+ sName: "sParamValue",
+ showName: "参数值",
+ bVisible: true,
+ },
+ ];
sParamNewConfig.gdsconfigformslave = gdsconfigformslave;
const sParamNewColumn = commonFunc.getHeaderConfig(sParamNewConfig);
if (commonUtils.isNotEmptyObject(paramType)) {
/* 要把数据以表格的形式显示出来 */
const sParamJsonObj = JSON.parse(paramType);
for (const key of Object.keys(sParamJsonObj)) {
- if (key.includes('sParam') && !key.includes('DropDown') && !key.includes('Default')) {
+ if (key.includes("sParam") && !key.includes("DropDown") && !key.includes("Default")) {
const obj = {};
obj.sId = commonUtils.createSid();
obj.sParamKey = key;
obj.sParamName = sParamJsonObj[key];
/* 找到数字 找到下拉数据源 */
- const num = key.replace(/[^\d]/g, '').trim();
+ const num = key.replace(/[^\d]/g, "").trim();
if (Number(num)) {
const number = Number(num);
const sParamDropDownKey = `sParamDropDown${number}`;
@@ -5017,34 +5582,34 @@ export default (ChildComponent) => {
}
}
/* 将sParam1中的数据 还原到sParamData数据中 */
- if(commonUtils.isNotEmptyObject(record.sParamsNew)) {
+ if (commonUtils.isNotEmptyObject(record.sParamsNew)) {
const selectedData = JSON.parse(record.sParamsNew);
- if(commonUtils.isNotEmptyArr(selectedData)) {
- selectedData.forEach((itemS) => {
+ if (commonUtils.isNotEmptyArr(selectedData)) {
+ selectedData.forEach(itemS => {
sParamNewData.forEach(j => {
if (!Object.prototype.hasOwnProperty.call(itemS?.data || {}, j?.sParamKey)) return;
const value = itemS?.data?.[j.sParamKey];
if (j) j.sParamValue = value;
- })
+ });
const iIndex = sParamNewData.findIndex(item => item.sParamName === itemS.sParamName);
- if(iIndex > -1) {
- const addState ={};
+ if (iIndex > -1) {
+ const addState = {};
addState.sParamValue = itemS.sParamValue;
addState.bSelfCbx = itemS.bSelfCbx;
- sParamNewData[iIndex] ={...sParamNewData[iIndex], ...addState};
+ sParamNewData[iIndex] = { ...sParamNewData[iIndex], ...addState };
}
});
}
/* 如果数据集有一个是非选中的则非选中状态 否则全选 */
- if(commonUtils.isNotEmptyArr(sParamNewColumn)) {
- const iIndex = sParamNewColumn.findIndex(item => item.dataIndex ==='bSelfCbx');
- if(iIndex > -1) {
+ if (commonUtils.isNotEmptyArr(sParamNewColumn)) {
+ const iIndex = sParamNewColumn.findIndex(item => item.dataIndex === "bSelfCbx");
+ if (iIndex > -1) {
const filterData = sParamNewData.filter(item => !item.bSelfCbx);
- if(commonUtils.isNotEmptyArr(filterData)) {
- sParamNewColumn[iIndex] ={ ...sParamNewColumn[iIndex], bCheckAll:false};
- }else {
- sParamNewColumn[iIndex] ={ ...sParamNewColumn[iIndex], bCheckAll:true};
+ if (commonUtils.isNotEmptyArr(filterData)) {
+ sParamNewColumn[iIndex] = { ...sParamNewColumn[iIndex], bCheckAll: false };
+ } else {
+ sParamNewColumn[iIndex] = { ...sParamNewColumn[iIndex], bCheckAll: true };
}
}
}
@@ -5058,10 +5623,11 @@ export default (ChildComponent) => {
sParamNewConfig,
sParamNewColumn,
sParamNewData,
- sParamModalType:'sWork',
+ sParamModalType: "sWork",
enabled,
});
- } else if (enabled && name === 'control' && (sName === 'sPositiveColor' || sName === 'sOppositeColor')) { /* 控制表 选择正面颜色、反面颜色 */
+ } else if (enabled && name === "control" && (sName === "sPositiveColor" || sName === "sOppositeColor")) {
+ /* 控制表 选择正面颜色、反面颜色 */
const { [`${name}Data`]: tableData } = this.props;
const iIndex = tableData.findIndex(item => item.sId === sId);
if (iIndex > -1) {
@@ -5070,7 +5636,7 @@ export default (ChildComponent) => {
if (commonUtils.isNotEmptyObject(sColorSerialMemo)) {
try {
jsonData = JSON.parse(sColorSerialMemo);
- jsonData.forEach((item) => {
+ jsonData.forEach(item => {
sisColorSelectedRowKeys.push(item.sId);
});
} catch (ex) {
@@ -5080,41 +5646,37 @@ export default (ChildComponent) => {
}
this.props.onSaveState({
sisColorChooseVisible: true,
- controlSelectedRowId: sId, /* 控制表选中行sId */
- processSelectedRowId: '', /* 工序表选中行sId */
+ controlSelectedRowId: sId /* 控制表选中行sId */,
+ processSelectedRowId: "" /* 工序表选中行sId */,
enabled,
sisColorSelectedRowKeys,
sisColorSelectedData: jsonData,
- sisColorField: sName, /* 弹出字段 */
+ sisColorField: sName /* 弹出字段 */,
});
}
- }
+ };
/* 选择工艺参数点击确定 */
- handleParamsOk = () => { // 工艺参数弹窗确定按钮
- const {
- processData,
- processRecord,
- processConfig,
- sParamData,
- enabled,
- sParamModalType
- } = this.props;
- if(enabled) {
+ handleParamsOk = () => {
+ // 工艺参数弹窗确定按钮
+ const { processData, processRecord, processConfig, sParamData, enabled, sParamModalType } = this.props;
+ if (enabled) {
if (commonUtils.isNotEmptyArr(processData) && commonUtils.isNotEmptyObject(processRecord)) {
const processSelectDataIndex = processData.findIndex(item => item.sId === processRecord.sId);
if (processSelectDataIndex > -1) {
if (commonUtils.isNotEmptyArr(sParamData)) {
- let sParamJsonData = '';
+ let sParamJsonData = "";
const sParamSeletedData = sParamData.filter(item => item.bSelfCbx);
- if(commonUtils.isNotEmptyObject(sParamSeletedData)) {
+ if (commonUtils.isNotEmptyObject(sParamSeletedData)) {
sParamJsonData = JSON.stringify(sParamSeletedData);
}
let { handleType } = processData[processSelectDataIndex];
- handleType = commonUtils.isEmpty(handleType) ? 'update' : handleType;
- if(sParamModalType === 'sQuo') { /* 报价参数点击确定 */
+ handleType = commonUtils.isEmpty(handleType) ? "update" : handleType;
+ if (sParamModalType === "sQuo") {
+ /* 报价参数点击确定 */
processData[processSelectDataIndex].sQuoParams = sParamJsonData;
- } else { /* 工单参数点击确定 */
+ } else {
+ /* 工单参数点击确定 */
processData[processSelectDataIndex].sParams = sParamJsonData;
}
processData[processSelectDataIndex].handleType = handleType;
@@ -5130,44 +5692,47 @@ export default (ChildComponent) => {
sParamsModalVisible: false,
});
}
- }
+ };
- handleParamsNewOk = () => { // 工艺参数弹窗确定按钮
+ handleParamsNewOk = () => {
+ // 工艺参数弹窗确定按钮
const {
tableRecordName,
- [`${tableRecordName}Data`]: processData ,
+ [`${tableRecordName}Data`]: processData,
tableRecord: processRecord,
processConfig,
sParamNewData,
enabled,
- sParamModalType
+ sParamModalType,
} = this.props;
- if(enabled) {
+ if (enabled) {
if (commonUtils.isNotEmptyArr(processData) && commonUtils.isNotEmptyObject(processRecord)) {
const processSelectDataIndex = processData.findIndex(item => item.sId === processRecord.sId);
if (processSelectDataIndex > -1) {
if (commonUtils.isNotEmptyArr(sParamNewData)) {
- let sParamJsonData = '';
+ let sParamJsonData = "";
let sParamSeletedData = sParamNewData.filter(item => item.bSelfCbx);
- if(commonUtils.isNotEmptyObject(sParamSeletedData)) {
- const originSParamsNew = JSON.parse(processData[processSelectDataIndex]?.sParamsNew || '[]');
- if (!Array.isArray(originSParamsNew) || !originSParamsNew.length) return message.error('数据异常');
- const replaceData = {}
- sParamSeletedData.forEach(i => (i && i.sParamKey && ( replaceData[i.sParamKey] = i.sParamValue )));
- sParamSeletedData = originSParamsNew.map( i => ({
+ if (commonUtils.isNotEmptyObject(sParamSeletedData)) {
+ const originSParamsNew = JSON.parse(processData[processSelectDataIndex]?.sParamsNew || "[]");
+ if (!Array.isArray(originSParamsNew) || !originSParamsNew.length) return message.error("数据异常");
+ const replaceData = {};
+ sParamSeletedData.forEach(i => i && i.sParamKey && (replaceData[i.sParamKey] = i.sParamValue));
+ sParamSeletedData = originSParamsNew.map(i => ({
...i,
data: {
- ...i.data || {},
- ...replaceData || {},
- }
- }))
+ ...(i.data || {}),
+ ...(replaceData || {}),
+ },
+ }));
sParamJsonData = JSON.stringify(sParamSeletedData);
}
let { handleType } = processData[processSelectDataIndex];
- handleType = commonUtils.isEmpty(handleType) ? 'update' : handleType;
- if(sParamModalType === 'sQuo') { /* 报价参数点击确定 */
+ handleType = commonUtils.isEmpty(handleType) ? "update" : handleType;
+ if (sParamModalType === "sQuo") {
+ /* 报价参数点击确定 */
processData[processSelectDataIndex].sQuoParams = sParamJsonData;
- } else { /* 工单参数点击确定 */
+ } else {
+ /* 工单参数点击确定 */
processData[processSelectDataIndex].sParamsNew = sParamJsonData;
}
processData[processSelectDataIndex].handleType = handleType;
@@ -5175,7 +5740,7 @@ export default (ChildComponent) => {
}
}
this.props.onSaveState({
- [`${tableRecordName}Data`]:processData,
+ [`${tableRecordName}Data`]: processData,
sParamsNewModalVisible: false,
});
} else {
@@ -5183,20 +5748,20 @@ export default (ChildComponent) => {
sParamsNewModalVisible: false,
});
}
- }
+ };
/* 获取表格数据 */
handleGetTableConfig = async (name, sModelsId) => {
- if(commonUtils.isNotEmptyObject(sModelsId)) {
+ if (commonUtils.isNotEmptyObject(sModelsId)) {
const newConfig = await this.props.onGetTableConfig(name, sModelsId);
- if(commonUtils.isNotEmptyObject(newConfig)) {
+ if (commonUtils.isNotEmptyObject(newConfig)) {
const newColumn = commonFunc.getHeaderConfig(newConfig);
- this.props.onSaveState({[`${[name]}Config`]: newConfig, [`${[name]}Column`]: newColumn })
+ this.props.onSaveState({ [`${[name]}Config`]: newConfig, [`${[name]}Column`]: newColumn });
}
}
- }
+ };
/* 快捷键跳转 */
- handleQuickViewClick = async (name, sName, record, index , myConfigArr) => {
+ handleQuickViewClick = async (name, sName, record, index, myConfigArr) => {
const {
slaveConfig,
slaveData,
@@ -5214,9 +5779,9 @@ export default (ChildComponent) => {
// masterData,
// employeeConfig,
} = this.props;
- console.log('myConfigArr',myConfigArr)
+ console.log("myConfigArr", myConfigArr);
let picArr = [];
- if(commonUtils.isNotEmptyArr(myConfigArr)) {
+ if (commonUtils.isNotEmptyArr(myConfigArr)) {
picArr = myConfigArr;
}
@@ -5226,59 +5791,60 @@ export default (ChildComponent) => {
const iIndex = index;
const [{ sActiveId }] = picArr;
let [{ sActiveKey }] = picArr;
- const sFormId = sActiveId === '1' ? commonUtils.isEmpty(tableDataRow.sFormId) ? tableDataRow.sSrcFormId : tableDataRow.sFormId : sActiveId;
- if (commonUtils.isNotEmptyObject(sActiveKey) && sActiveKey.includes('.')) { /* 接口按钮跳转 如果有slave.对应字段 则需要取出对应字段 */
- const index = sActiveKey.lastIndexOf('.');
+ const sFormId = sActiveId === "1" ? (commonUtils.isEmpty(tableDataRow.sFormId) ? tableDataRow.sSrcFormId : tableDataRow.sFormId) : sActiveId;
+ if (commonUtils.isNotEmptyObject(sActiveKey) && sActiveKey.includes(".")) {
+ /* 接口按钮跳转 如果有slave.对应字段 则需要取出对应字段 */
+ const index = sActiveKey.lastIndexOf(".");
sActiveKey = sActiveKey.substring(index + 1, sActiveKey.length);
}
const sNameUrl = `${commonConfig.server_host}gdsmodule/getGdsmoduleById/${sFormId}?sModelsId=${sFormId}&sName=${formRoute}`;
const filterCondition = [];
const conditionValues = this.props.getSqlCondition(picArr[0], name, tableDataRow);
if (!commonUtils.isEmpty(conditionValues)) {
- Object.keys(conditionValues).forEach((item) => {
- if ((item === 'tStartDate_pro' || item.substring(0, 1) === 'p')) {
+ Object.keys(conditionValues).forEach(item => {
+ if (item === "tStartDate_pro" || item.substring(0, 1) === "p") {
if (!commonUtils.isEmpty(conditionValues[item]) && conditionValues[item].length >= 2) {
const tStartDate = moment(conditionValues[item][0]).format(this.sDateFormat);
- const tEndDate = moment(conditionValues[item][1]).add(1, 'days').format(this.sDateFormat);
+ const tEndDate = moment(conditionValues[item][1]).add(1, "days").format(this.sDateFormat);
filterCondition.push({
bFilterName: item,
- bFilterCondition: '=',
+ bFilterCondition: "=",
bFilterValue: `${tStartDate},${tEndDate}`,
});
}
- } else if ((item === 'mStartDate_pro' || item.substring(0, 1) === 'm')) {
+ } else if (item === "mStartDate_pro" || item.substring(0, 1) === "m") {
if (!commonUtils.isEmpty(conditionValues[item])) {
- const tStartDate = moment(conditionValues[item]).startOf('month').format(this.sDateFormat);
- const tEndDate = moment(conditionValues[item]).endOf('month').add(1, 'days').format(this.sDateFormat);
+ const tStartDate = moment(conditionValues[item]).startOf("month").format(this.sDateFormat);
+ const tEndDate = moment(conditionValues[item]).endOf("month").add(1, "days").format(this.sDateFormat);
filterCondition.push({
bFilterName: `t${item.substring(1, item.length)}`,
- bFilterCondition: '=',
+ bFilterCondition: "=",
bFilterValue: `${tStartDate},${tEndDate}`,
});
}
- } else if (item.substring(0, 1) === 't') {
+ } else if (item.substring(0, 1) === "t") {
filterCondition.push({
bFilterName: item,
- bFilterCondition: '=',
+ bFilterCondition: "=",
bFilterValue: moment(conditionValues[item]).format(this.sDateFormat),
});
} else {
filterCondition.push({
bFilterName: item,
- bFilterCondition: '=',
+ bFilterCondition: "=",
bFilterValue: conditionValues[item],
});
}
});
}
this.props.dispatch({
- type: 'content/onRouter',
+ type: "content/onRouter",
payload: {
url: sNameUrl,
- refresh: getConfig.bind(this, name, sModelsId), /* 刷新方法 */
+ refresh: getConfig.bind(this, name, sModelsId) /* 刷新方法 */,
sTabId: commonUtils.createSid(),
// sParentId: this.state.sTabId,
- urlDataType: 'newPane',
+ urlDataType: "newPane",
checkedId: myConfigArr[0].sId,
sName: myConfigArr[0].sName,
bFilter: slaveFilterCondition,
@@ -5295,15 +5861,28 @@ export default (ChildComponent) => {
};
handleSelect = async (name, selectConfig, selectData) => {
const {
- [`${name}Data`]: tableData, [`${name}Config`]: tableConfig, masterConfig, controlSelectedRowKeys, sModelsId, token, app, tableName, sModelsType,
- slaveConfig, slave0Config,slave1Config, slave2Config, slave3Config ,slave4Config,
+ [`${name}Data`]: tableData,
+ [`${name}Config`]: tableConfig,
+ masterConfig,
+ controlSelectedRowKeys,
+ sModelsId,
+ token,
+ app,
+ tableName,
+ sModelsType,
+ slaveConfig,
+ slave0Config,
+ slave1Config,
+ slave2Config,
+ slave3Config,
+ slave4Config,
} = this.props;
let { masterData } = this.props;
- if(selectConfig?.sControlName && selectConfig?.sControlName.includes('TmpInfoBySql')){
+ if (selectConfig?.sControlName && selectConfig?.sControlName.includes("TmpInfoBySql")) {
const copyConfig = selectConfig;
const sTmpInfoBySqlBtnConfig = copyConfig;
- const sConfigformId = commonUtils.isEmpty(copyConfig) ? '' : copyConfig.sParentId;
- const sControlName = commonUtils.isNotEmptyObject(copyConfig) && copyConfig.sControlName ? copyConfig.sControlName : 'TmpInfoBySql';
+ const sConfigformId = commonUtils.isEmpty(copyConfig) ? "" : copyConfig.sParentId;
+ const sControlName = commonUtils.isNotEmptyObject(copyConfig) && copyConfig.sControlName ? copyConfig.sControlName : "TmpInfoBySql";
const dataUrl = `${commonConfig.server_host}salesorder/getTmpInfoBySql/?sModelsId=${sModelsId}`;
const sRowData = selectData;
const condition = { sConfigformId, sControlName, sRowData };
@@ -5313,7 +5892,9 @@ export default (ChildComponent) => {
const returnData = dataReturn.dataset.rows[0];
if (commonUtils.isNotEmptyObject(returnData)) {
for (const key of Object.keys(returnData)) {
- let config = masterConfig.gdsconfigformslave.filter(item => item.sControlName.split('.').length === 3 && item.sControlName.includes(selectConfig.sControlName + '.' + key))[0];
+ let config = masterConfig.gdsconfigformslave.filter(
+ item => item.sControlName.split(".").length === 3 && item.sControlName.includes(selectConfig.sControlName + "." + key)
+ )[0];
const sAssignField = config ? config.sAssignField : copyConfig.sAssignField;
const sTmpInfoBySqlBtnName = config?.sControlName;
const sName = `${key}Data`;
@@ -5327,61 +5908,64 @@ export default (ChildComponent) => {
if (commonUtils.isEmptyArr(oldData)) {
oldData = [];
}
- if (key === 'master' || key === 'TmpInfoBySql' ) {
+ if (key === "master" || key === "TmpInfoBySql") {
const newRow = Array.isArray(returnData[key]) ? returnData[key][0] : returnData[key];
masterData = { ...masterData, ...commonFunc.getAssignFieldValue(sAssignField, newRow) }; // 取赋值字段
- masterData.maxBillNo = 'sBillNo';
- masterData.handleType = commonUtils.isEmpty(masterData.handleType) ? 'update' : masterData.handleType;
+ masterData.maxBillNo = "sBillNo";
+ masterData.handleType = commonUtils.isEmpty(masterData.handleType) ? "update" : masterData.handleType;
allReturnMap.masterData = masterData;
- } else if (sTmpInfoBySqlBtnName.includes('_add')) { /* 原有数据集不动，新数据插入 */
+ } else if (sTmpInfoBySqlBtnName.includes("_add")) {
+ /* 原有数据集不动，新数据插入 */
/* 对应字段 */
const keyData = returnData[key];
if (commonUtils.isNotEmptyArr(keyData)) {
- keyData.forEach((child) => {
+ keyData.forEach(child => {
const tableRow = { ...child, ...commonFunc.getAssignFieldValue(sAssignField, child) }; // 取赋值字段
tableRow.sId = commonUtils.createSid();
tableRow.sParentId = masterData.sId;
- tableRow.handleType = 'add';
+ tableRow.handleType = "add";
oldData.push(tableRow);
});
}
allReturnMap[sName] = oldData;
- }else if (sTmpInfoBySqlBtnName.includes('_edit')) { /* 替换 根据对应字段对比 相同的不管 不同的插入 */
+ } else if (sTmpInfoBySqlBtnName.includes("_edit")) {
+ /* 替换 根据对应字段对比 相同的不管 不同的插入 */
/* 对应字段 */
const sActiveKey = sTmpInfoBySqlBtnConfig[0].sActiveKey;
const keyData = returnData[key];
let newData = [];
if (commonUtils.isNotEmptyArr(keyData)) {
- keyData.forEach((child) => {
+ keyData.forEach(child => {
const filterData = oldData.filter(item => item[sActiveKey] !== child[sActiveKey]);
if (commonUtils.isNotEmptyArr(filterData) && filterData.length === oldData.length) {
let tableRow = {};
tableRow = { ...tableRow, ...commonFunc.getAssignFieldValue(sAssignField, child) }; // 取赋值字段
tableRow.sId = commonUtils.createSid();
tableRow.sParentId = masterData.sId;
- tableRow.handleType = 'add';
+ tableRow.handleType = "add";
newData.push(tableRow);
}
});
- newData = oldData.concat(newData)
+ newData = oldData.concat(newData);
}
allReturnMap[sName] = newData;
- } else if (sTmpInfoBySqlBtnName.includes('_del') || !sTmpInfoBySqlBtnName.includes('_')) { /* 替换 根据对应字段对比 相同的不管 不同的插入 */
+ } else if (sTmpInfoBySqlBtnName.includes("_del") || !sTmpInfoBySqlBtnName.includes("_")) {
+ /* 替换 根据对应字段对比 相同的不管 不同的插入 */
/* 对应字段 */
- oldData.forEach((child) => {
- child.handleType ='del';
+ oldData.forEach(child => {
+ child.handleType = "del";
oldDelData.push(child);
});
allReturnMap[sDelName] = oldDelData;
oldData = [];
- console.log('returnData', returnData[key]);
+ console.log("returnData", returnData[key]);
const keyData = returnData[key];
if (commonUtils.isNotEmptyArr(keyData)) {
- keyData.forEach((child) => {
+ keyData.forEach(child => {
const tableRow = { ...child, ...commonFunc.getAssignFieldValue(sAssignField, child) }; // 取赋值字段
tableRow.sId = commonUtils.createSid();
tableRow.sParentId = masterData.sId;
- tableRow.handleType = 'add';
+ tableRow.handleType = "add";
oldData.push(tableRow);
});
}
@@ -5389,80 +5973,82 @@ export default (ChildComponent) => {
} else {
allReturnMap[sName] = returnData[key];
}
-
}
- console.log('allReturnMap:', allReturnMap);
+ console.log("allReturnMap:", allReturnMap);
this.props.onSaveState({ ...allReturnMap });
}
} else {
this.props.getServiceError(dataReturn);
}
- }else if(selectConfig?.sControlName ==='BtnGetApiDialog') { /* 回刷单据 */
+ } else if (selectConfig?.sControlName === "BtnGetApiDialog") {
+ /* 回刷单据 */
await this.handleGetData(masterConfig, slaveConfig, slave0Config, slave1Config, slave2Config, slave3Config, slave4Config);
}
- }
+ };
handleSelect1 = async (name, selectConfig, selectData) => {
- const {
- masterData, masterConfig, token, sModelsId
- } = this.props;
+ const { masterData, masterConfig, token, sModelsId } = this.props;
const _props = this.props;
const _this = this;
- const copyConfig = masterConfig.gdsconfigformslave.filter(item => item.sControlName.split('.').length === 2 && item.sControlName.includes(this.copyName))[0];
- const sConfigformId = commonUtils.isEmpty(copyConfig) ? '' : copyConfig.sParentId;
- const sControlName = commonUtils.isNotEmptyObject(copyConfig) && copyConfig.sControlName ? copyConfig.sControlName : 'TmpInfoBySql';
+ const copyConfig = masterConfig.gdsconfigformslave.filter(
+ item => item.sControlName.split(".").length === 2 && item.sControlName.includes(this.copyName)
+ )[0];
+ const sConfigformId = commonUtils.isEmpty(copyConfig) ? "" : copyConfig.sParentId;
+ const sControlName = commonUtils.isNotEmptyObject(copyConfig) && copyConfig.sControlName ? copyConfig.sControlName : "TmpInfoBySql";
const dataUrl = `${commonConfig.server_host}salesorder/getTmpInfoBySql/?sModelsId=${sModelsId}`;
const addState = {};
const sRowData = selectData;
async function fetchData() {
- const condition = { sConfigformId, sControlName, sRowData };
- const dataReturn = (await commonServices.postValueService(token, condition, dataUrl)).data;
- if (dataReturn.code === 1) {
- const returnData = dataReturn.dataset.rows[0];
- for (const key in returnData) {
- let arr = JSON.parse(JSON.stringify(returnData[key]));
- arr.forEach((item, idx) => {
- const newCopyTo = {};
- newCopyTo.master = masterData;
- let config = masterConfig.gdsconfigformslave.filter(item => item.sControlName.split('.').length === 3 && item.sControlName.includes(selectConfig.sControlName + '.' + key))[0];
- const sAssignField = config ? config.sAssignField : copyConfig.sAssignField;
- const newSid = commonUtils.createSid();
- let mixData = commonFunc.getDefaultData(_props[`${key}Config`] || {}, newCopyTo, { newSid }); // 取默认值
- mixData = { ...mixData, ...commonFunc.getAssignFieldValue(sAssignField, item, newCopyTo) }; // 取赋值字段
- mixData.handleType = 'add';
- mixData.sId = newSid;
- mixData.sParentId = key === 'mater' || key ==='TmpInfoBySql' ? mixData.sParentId : masterData.sId;
- if (key === 'master' || key === 'TmpInfoBySql') {
- mixData.sFormId = _this.props.masterData.sFormId;
- mixData.sId = _this.props.masterData.sId;
- mixData.maxBillNo = 'sBillNo';
- mixData.handleType = commonUtils.isEmpty( _this.props.masterData.handleType) ? 'update' : _this.props.masterData.handleType;
- arr[idx] = mixData;
- } else {
- mixData.sParentId = _this.props.masterData.sId;
- arr[idx] = mixData;
- }
- })
- const tableName = key === 'mater' || key ==='TmpInfoBySql' ? 'master' : key;
- if (addState[`${tableName}Data`] === undefined) {
- addState[`${tableName}Data`] = [];
+ const condition = { sConfigformId, sControlName, sRowData };
+ const dataReturn = (await commonServices.postValueService(token, condition, dataUrl)).data;
+ if (dataReturn.code === 1) {
+ const returnData = dataReturn.dataset.rows[0];
+ for (const key in returnData) {
+ let arr = JSON.parse(JSON.stringify(returnData[key]));
+ arr.forEach((item, idx) => {
+ const newCopyTo = {};
+ newCopyTo.master = masterData;
+ let config = masterConfig.gdsconfigformslave.filter(
+ item => item.sControlName.split(".").length === 3 && item.sControlName.includes(selectConfig.sControlName + "." + key)
+ )[0];
+ const sAssignField = config ? config.sAssignField : copyConfig.sAssignField;
+ const newSid = commonUtils.createSid();
+ let mixData = commonFunc.getDefaultData(_props[`${key}Config`] || {}, newCopyTo, { newSid }); // 取默认值
+ mixData = { ...mixData, ...commonFunc.getAssignFieldValue(sAssignField, item, newCopyTo) }; // 取赋值字段
+ mixData.handleType = "add";
+ mixData.sId = newSid;
+ mixData.sParentId = key === "mater" || key === "TmpInfoBySql" ? mixData.sParentId : masterData.sId;
+ if (key === "master" || key === "TmpInfoBySql") {
+ mixData.sFormId = _this.props.masterData.sFormId;
+ mixData.sId = _this.props.masterData.sId;
+ mixData.maxBillNo = "sBillNo";
+ mixData.handleType = commonUtils.isEmpty(_this.props.masterData.handleType) ? "update" : _this.props.masterData.handleType;
+ arr[idx] = mixData;
+ } else {
+ mixData.sParentId = _this.props.masterData.sId;
+ arr[idx] = mixData;
}
- addState[`${tableName}Data`] = addState[`${tableName}Data`].concat(arr);
- console.log('结果集', addState);
+ });
+ const tableName = key === "mater" || key === "TmpInfoBySql" ? "master" : key;
+ if (addState[`${tableName}Data`] === undefined) {
+ addState[`${tableName}Data`] = [];
}
- } else {
- _this.props.getServiceError(dataReturn);
+ addState[`${tableName}Data`] = addState[`${tableName}Data`].concat(arr);
+ console.log("结果集", addState);
}
+ } else {
+ _this.props.getServiceError(dataReturn);
+ }
}
await fetchData();
if (addState.masterData) {
[addState.masterData] = addState.masterData;
}
if (Object.keys(addState).length) {
- this.props.onSaveState({...addState});
+ this.props.onSaveState({ ...addState });
}
};
- handleSelectCancel = (name) => {
+ handleSelectCancel = name => {
this.props.onSaveState({ [`${name}ChooseVisible`]: false });
};
/* 双击弹出Memo */
@@ -5491,15 +6077,18 @@ export default (ChildComponent) => {
// this.props.onSaveState({ ...sCurrMemoProps });
// };
// async await
- handleEleMaterialsStoreCurrQty = async (slaveData) => {
+ handleEleMaterialsStoreCurrQty = async slaveData => {
const { sModelsId, app } = this.props;
let flag = true;
- const InsufficientInventory = commonFunc.showMessage(app.commonConst, 'InsufficientInventory');/* 库存不足，不能领料 */
- const MateriaTransferQuantityVerificationFailed = commonFunc.showMessage(app.commonConst, 'MateriaTransferQuantityVerificationFailed');/* 材料调拨数量校验失败，请稍后操作 */
+ const InsufficientInventory = commonFunc.showMessage(app.commonConst, "InsufficientInventory"); /* 库存不足，不能领料 */
+ const MateriaTransferQuantityVerificationFailed = commonFunc.showMessage(
+ app.commonConst,
+ "MateriaTransferQuantityVerificationFailed"
+ ); /* 材料调拨数量校验失败，请稍后操作 */
const url = `${commonConfig.server_host}eleMaterialsStock/getEleMaterialsStoreCurrQty?sModelsId=${sModelsId}`;
for (const item of slaveData) {
const body = {
- sMaterialsId: item.sMaterialsId, /* 查询条件 */
+ sMaterialsId: item.sMaterialsId /* 查询条件 */,
sMaterialsStyle: item.sMaterialsStyle,
sWareHouseId: item.sWareHouseId,
};
@@ -5537,10 +6126,8 @@ export default (ChildComponent) => {
}
}
return flag;
- }
- handleBtnExportSql = () => {
-
- }
+ };
+ handleBtnExportSql = () => {};
componentDidUpdate() {
if (this.state.initSId) {
@@ -5556,7 +6143,7 @@ export default (ChildComponent) => {
if (oSelectedTr && oTbody) {
oTbody.scrollTop = oSelectedTr.offsetTop;
this.setState({
- initSId: '',
+ initSId: "",
});
}
}
@@ -5564,21 +6151,36 @@ export default (ChildComponent) => {
handleTableBlur = async (name, sFieldName, record, tableConfig) => {
const { sModelsId, app, token, sModelsType, [`${name}Data`]: tableData, [`${name}Data`]: tableSelectedRowKeys, masterData } = this.props;
- const models = name === 'materials' ? 'Materials' :
- sModelsType.includes('sales/') || sModelsType.includes('manufacture/') || sModelsType.includes('print/') || sModelsType.includes('quotation/') || sModelsType.includes('productStock/') ? 'Product' : 'Materials';
+ const models =
+ name === "materials"
+ ? "Materials"
+ : sModelsType.includes("sales/") ||
+ sModelsType.includes("manufacture/") ||
+ sModelsType.includes("print/") ||
+ sModelsType.includes("quotation/") ||
+ sModelsType.includes("productStock/")
+ ? "Product"
+ : "Materials";
let tableDataRow = {};
- if (sFieldName === 'sMaterialsNo' || sFieldName === 'sMaterialsName' || sFieldName === 'dAuxiliaryQty' || sFieldName === 'dReelAuxiliaryQty' || sFieldName === 'dConversionQty' || sFieldName === 'sMaterialsStyle') {
+ if (
+ sFieldName === "sMaterialsNo" ||
+ sFieldName === "sMaterialsName" ||
+ sFieldName === "dAuxiliaryQty" ||
+ sFieldName === "dReelAuxiliaryQty" ||
+ sFieldName === "dConversionQty" ||
+ sFieldName === "sMaterialsStyle"
+ ) {
let iIndex = -1;
- if(commonUtils.isEmptyArr(tableSelectedRowKeys)) {
+ if (commonUtils.isEmptyArr(tableSelectedRowKeys)) {
iIndex = 0;
} else {
- tableData.findIndex(item => item.sId === tableSelectedRowKeys.toString())
+ tableData.findIndex(item => item.sId === tableSelectedRowKeys.toString());
}
tableDataRow = await this.handleMaterialsChange(record, sModelsId, masterData, {}, sFieldName, app, token, models);
- if(iIndex > -1) {
+ if (iIndex > -1) {
tableData[iIndex] = tableDataRow;
}
- this.props.onSaveState({ [`${name}Data`]: tableData})
+ this.props.onSaveState({ [`${name}Data`]: tableData });
} else {
this.props.onDropDownBlur(name, sFieldName, record, tableConfig);
}
@@ -5590,18 +6192,21 @@ export default (ChildComponent) => {
const showConfigNew = JSON.parse(JSON.stringify(showConfig)); /* 深拷贝配置 */
contextMenuConfig.push(showConfigNew);
this.props.onSaveState({
- contextMenuModalVisible: true, /* 右击全部更新弹窗 */
- contextMenuConfig, /* 右击字段配置 数组形式 */
- contextMenuRecord: record, /* 右击数据 */
- contextMenuName: showConfig.showName, /* 右击字段 */
- contextMenuTbName: tbName, /* 右击字段 */
+ contextMenuModalVisible: true /* 右击全部更新弹窗 */,
+ contextMenuConfig /* 右击字段配置 数组形式 */,
+ contextMenuRecord: record /* 右击数据 */,
+ contextMenuName: showConfig.showName /* 右击字段 */,
+ contextMenuTbName: tbName /* 右击字段 */,
});
- }
+ };
/* 单据字段单击右键全部更新，弹出窗选择后，更新此列所有数据。（只更新非只读字段） */
- handleContextMenuOk= async (contextMenuValue, contextMenuData, contextMenuType) => {
+ handleContextMenuOk = async (contextMenuValue, contextMenuData, contextMenuType) => {
const {
- contextMenuConfig, contextMenuTbName, [`${contextMenuTbName}Data`]: tableData, [`${contextMenuTbName}SelectedRowKeys`]: selectedRowKeys,
+ contextMenuConfig,
+ contextMenuTbName,
+ [`${contextMenuTbName}Data`]: tableData,
+ [`${contextMenuTbName}SelectedRowKeys`]: selectedRowKeys,
} = this.props;
if (commonUtils.isNotEmptyObject(contextMenuTbName) && commonUtils.isNotEmptyArr(tableData)) {
if (commonUtils.isNotEmptyArr(contextMenuConfig) && commonUtils.isNotEmptyObject(contextMenuConfig[0])) {
@@ -5609,10 +6214,10 @@ export default (ChildComponent) => {
const tableFilterData = tableData.filter(item => selectedRowKeys.includes(item.sId));
if (commonUtils.isNotEmptyArr(tableFilterData)) {
let changeData = [];
- const chooseType = commonUtils.isNotEmptyNumber(contextMenuType) ? contextMenuType : 1;
- if(chooseType === 1) {
+ const chooseType = commonUtils.isNotEmptyNumber(contextMenuType) ? contextMenuType : 1;
+ if (chooseType === 1) {
changeData = tableData;
- } else if(chooseType === 2) {
+ } else if (chooseType === 2) {
const iIndex = tableData.findIndex(item => selectedRowKeys.includes(item.sId));
changeData = tableData.filter((_, index) => index >= iIndex);
}
@@ -5625,29 +6230,35 @@ export default (ChildComponent) => {
addState[sName] = contextMenuValue;
const iIndex = tableData.findIndex(row => row.sId === child.sId);
const bShowProcess = [
- 'sMaterialsNo',
- 'sMaterialsName',
- 'dAuxiliaryQty',
- 'dReelAuxiliaryQty',
- 'dConversionQty',
- 'sMaterialsStyle',
- 'sMaterialsStyle',
- 'dMaterialsQty',
- 'dAuxiliaryLossQty',
- 'dLossQty',
- 'sProcessId',
- 'sProcessNo',
- 'sProcessName'
+ "sMaterialsNo",
+ "sMaterialsName",
+ "dAuxiliaryQty",
+ "dReelAuxiliaryQty",
+ "dConversionQty",
+ "sMaterialsStyle",
+ "sMaterialsStyle",
+ "dMaterialsQty",
+ "dAuxiliaryLossQty",
+ "dLossQty",
+ "sProcessId",
+ "sProcessNo",
+ "sProcessName",
].includes(sName);
- bShowProcess && message.loading({ content: , key: "xlyProcess", duration: 0, className: styles.xlyProcess});
- if(iIndex > -1) {
- addState.handleType = commonUtils.isEmpty(tableData[iIndex].handleType) ? 'update' : tableData[iIndex].handleType;
+ bShowProcess && message.loading({ content: , key: "xlyProcess", duration: 0, className: styles.xlyProcess });
+ if (iIndex > -1) {
+ addState.handleType = commonUtils.isEmpty(tableData[iIndex].handleType) ? "update" : tableData[iIndex].handleType;
tableData[iIndex] = { ...tableData[iIndex], ...addState, ...contextMenuData };
const changeValue = { ...contextMenuData };
changeValue[sName] = contextMenuValue;
- this.xlyProcessPercent = ((i + 1) / changeData.length * 100).toFixed(2);
- const duration = i === changeData.length - 1 ? 1 : 0;
- bShowProcess && message.loading({ content: , key: "xlyProcess", duration, className: styles.xlyProcess});
+ this.xlyProcessPercent = (((i + 1) / changeData.length) * 100).toFixed(2);
+ const duration = i === changeData.length - 1 ? 1 : 0;
+ bShowProcess &&
+ message.loading({
+ content: ,
+ key: "xlyProcess",
+ duration,
+ className: styles.xlyProcess,
+ });
/* 手动触发改变事件 */
const result = await this.handleTableChange(contextMenuTbName, sName, changeValue, child.sId, [], true);
@@ -5660,18 +6271,18 @@ export default (ChildComponent) => {
}
this.props.onSaveState({
[`${contextMenuTbName}Data`]: tableData,
- contextMenuModalVisible: false, /* 右击全部更新弹窗 */
+ contextMenuModalVisible: false /* 右击全部更新弹窗 */,
});
- }
+ };
- handleCancelModal = (modelVisible) => {
+ handleCancelModal = modelVisible => {
this.props.onSaveState({
[modelVisible]: false,
});
- }
+ };
handleTableSelectRowChange = async (name, selectedRowKeys, changeValue, isWait) => {
- if (name === 'sParamNew' && commonUtils.isNotEmptyArr(selectedRowKeys)) {
+ if (name === "sParamNew" && commonUtils.isNotEmptyArr(selectedRowKeys)) {
/* 点击工艺参数列表 根据点击行动态加载配置 */
const { sParamNewData, sParamNewConfig } = this.props;
/* 找到最后一个选中 */
@@ -5680,13 +6291,13 @@ export default (ChildComponent) => {
/* 选中数据时 塞入选中行的配置 */
if (iIndex > -1) {
const sParamObj = sParamNewData[iIndex];
- const index = sParamNewConfig.gdsconfigformslave.findIndex(item => item.sName === 'sParamValue');
+ const index = sParamNewConfig.gdsconfigformslave.findIndex(item => item.sName === "sParamValue");
if (index > -1) {
if (commonUtils.isNotEmptyObject(sParamObj.sDropDownData)) {
- sParamNewConfig.gdsconfigformslave[index].sDropDownType = 'const';
+ sParamNewConfig.gdsconfigformslave[index].sDropDownType = "const";
sParamNewConfig.gdsconfigformslave[index].showDropDown = JSON.stringify(sParamObj.sDropDownData);
} else {
- sParamNewConfig.gdsconfigformslave[index].sDropDownType = '';
+ sParamNewConfig.gdsconfigformslave[index].sDropDownType = "";
sParamNewConfig.gdsconfigformslave[index].showDropDown = undefined;
}
}
@@ -5706,18 +6317,14 @@ export default (ChildComponent) => {
} else {
this.props.onTableSelectRowChange(name, selectedRowKeys);
}
- }
+ };
handleGetParamsValue = ({ sName, sValue, record = {} }) => {
const jsonData = commonUtils.convertStrToObj(sValue, []);
- if (["sParams", 'sParamsNew'].includes(sName)) {
+ if (["sParams", "sParamsNew"].includes(sName)) {
const { sWorkOrderParam: sWorkOrderParamStr } = record;
- const sWorkOrderParam = commonUtils.convertStrToObj(
- sWorkOrderParamStr,
- {}
- );
- const sWorkOrderData =
- jsonData.find(item => item.sParamType === "sWorkOrder") || {};
+ const sWorkOrderParam = commonUtils.convertStrToObj(sWorkOrderParamStr, {});
+ const sWorkOrderData = jsonData.find(item => item.sParamType === "sWorkOrder") || {};
const { data = {} } = sWorkOrderData;
const result = [];
Object.keys(data).forEach(key => {
@@ -5732,15 +6339,14 @@ export default (ChildComponent) => {
};
handleSelectCommonPopup = (currentPaneName, selectConfig, selectData, tbName) => {
- const {
- [`${tbName}SelectedRowKeys`]: tableSelectedRowKeys, masterData, processConfig,
- } = this.props;
- let {
- [`${tbName}Data`]: tableData
- } = this.props;
+ const { [`${tbName}SelectedRowKeys`]: tableSelectedRowKeys, masterData, processConfig } = this.props;
+ let { [`${tbName}Data`]: tableData } = this.props;
const addState = {};
- if(selectConfig.sControlName && selectConfig.sControlName.includes('BtnPopupTray')) {
- const iIndex = commonUtils.isNotEmptyArr(tableSelectedRowKeys) && commonUtils.isNotEmptyObject(tableSelectedRowKeys[0]) ? tableData.findIndex(item => item.sId === tableSelectedRowKeys[0]) : -1;
+ if (selectConfig.sControlName && selectConfig.sControlName.includes("BtnPopupTray")) {
+ const iIndex =
+ commonUtils.isNotEmptyArr(tableSelectedRowKeys) && commonUtils.isNotEmptyObject(tableSelectedRowKeys[0])
+ ? tableData.findIndex(item => item.sId === tableSelectedRowKeys[0])
+ : -1;
let dSumProductQty = 0;
if (commonUtils.isNotEmptyArr(selectData)) {
// eslint-disable-next-line no-unused-vars
@@ -5748,7 +6354,7 @@ export default (ChildComponent) => {
const newCopyTo = {};
newCopyTo.master = masterData;
const sName = selectConfig.sKeyUpFilter; /* 将后台配置筛选字段作为 列字段 */
- let sValue = '';
+ let sValue = "";
if (iIndex > -1) {
newCopyTo.slave = tableData[iIndex];
sValue = tableData[iIndex][sName];
@@ -5757,27 +6363,29 @@ export default (ChildComponent) => {
if (selectData.length === 1 || (index === 0 && commonUtils.isEmptyObject(sValue))) {
let tableDataRow = {}; // 取默认值
tableDataRow = { ...tableData[iIndex] };
- if (tbName === 'slave') {
+ if (tbName === "slave") {
tableDataRow.sSqlConditionId = tableDataRow.sId;
}
tableDataRow = { ...tableDataRow, ...commonFunc.getAssignFieldValue(selectConfig.sAssignField, item, newCopyTo) }; // 取赋值字段
tableData[iIndex] = tableDataRow;
- tableData[iIndex].handleType = commonUtils.isEmpty(tableData[iIndex].handleType) ? 'update' : tableData[iIndex].handleType;
+ tableData[iIndex].handleType = commonUtils.isEmpty(tableData[iIndex].handleType) ? "update" : tableData[iIndex].handleType;
} else {
let tableDataRowAdd = this.handleTableAdd(tbName, true);
- if (tbName === 'slave') {
+ if (tbName === "slave") {
tableDataRowAdd.sSqlConditionId = tableDataRowAdd.sId;
}
tableDataRowAdd = { ...tableDataRowAdd, ...commonFunc.getAssignFieldValue(selectConfig.sAssignField, item, newCopyTo) }; // 取赋值字段0
tableData.push(tableDataRowAdd);
}
-
});
tableData.forEach((item, index) => {
- dSumProductQty = commonUtils.convertFixNum(commonUtils.convertFixNum(commonUtils.isNull(dSumProductQty, 0),6) + commonUtils.convertFixNum(commonUtils.isNull(item.dSampleQty),6),6);
+ dSumProductQty = commonUtils.convertFixNum(
+ commonUtils.convertFixNum(commonUtils.isNull(dSumProductQty, 0), 6) + commonUtils.convertFixNum(commonUtils.isNull(item.dSampleQty), 6),
+ 6
+ );
});
masterData.dInspectQty = commonUtils.convertFixNum(dSumProductQty * 10000, 6);
- masterData.handleType = commonUtils.isEmpty(masterData.handleType) ? 'update' : masterData.handleType;
+ masterData.handleType = commonUtils.isEmpty(masterData.handleType) ? "update" : masterData.handleType;
addState[`${tbName}Data`] = tableData;
addState.masterData = masterData;
this.props.onSaveState({ ...addState });
@@ -5785,7 +6393,7 @@ export default (ChildComponent) => {
} else {
this.props.onSelectCommonPopup(currentPaneName, selectConfig, selectData, tbName);
}
- }
+ };
/** 键盘事件监听 */
onKeyDown = (e, record, sName, name) => {
@@ -5801,27 +6409,31 @@ export default (ChildComponent) => {
const currentTable = document.getElementById(uniqueTableId);
const currentTr = currentTable.querySelector(`tr[data-row-key="${record.sId}"]`);
const allInput = currentTr.querySelectorAll(`input[id*="${record.sId}"]`);
- const iIndex = Array.from(allInput).findIndex(item => item.getAttribute('id') === `${sName}${record.sId}`);
+ const iIndex = Array.from(allInput).findIndex(item => item.getAttribute("id") === `${sName}${record.sId}`);
if (iIndex < allInput.length - 1) {
keyCode = 39;
} else {
const oFirstInput = allInput[0];
- firstName = oFirstInput.getAttribute('id').replace(record.sId, '');
+ firstName = oFirstInput.getAttribute("id").replace(record.sId, "");
keyCode = 40;
}
}
// 以下if条件为 为解决bug2031问题入口 需求：收款单里输入的收款金额，上下键操作把加减金额改为选择上下行（通过上下方向键切换行数）
- if ([38, 40].includes(keyCode)) { // 上键、下键
+ if ([38, 40].includes(keyCode)) {
+ // 上键、下键
e.preventDefault();
- if (tableData.length > 1) { // 当从表行数大于一行时才有上下移动的意义
+ if (tableData.length > 1) {
+ // 当从表行数大于一行时才有上下移动的意义
const index = tableData.findIndex(item => item.sId === record.sId); // 获取当前编辑行的下标
if (index > -1) {
- if (keyCode === 38 && index > 0) { // 方向键上键 且 当前编辑行下标大于0时，为0时无法向上
+ if (keyCode === 38 && index > 0) {
+ // 方向键上键 且 当前编辑行下标大于0时，为0时无法向上
const lastSid = tableData[index - 1].sId; // 获取上一个id
this.props.onSaveState({ [`${name}SelectedRowKeys`]: [lastSid] }, () => commonUtils.focus(`${sName}${lastSid}`));
}
- if (keyCode === 40 && index < tableData.length - 1) { // 方向键下键 且 当前编辑行下标小于最大值时，为最大值时无法向下
+ if (keyCode === 40 && index < tableData.length - 1) {
+ // 方向键下键 且 当前编辑行下标小于最大值时，为最大值时无法向下
const nextSid = tableData[index + 1].sId; // 获取下一个id
this.props.onSaveState({ [`${name}SelectedRowKeys`]: [nextSid] }, () => commonUtils.focus(`${firstName || sName}${nextSid}`));
}
@@ -5829,20 +6441,24 @@ export default (ChildComponent) => {
}
}
const move = (keyCode, cursortPosition, columnIndex, currentElement) => {
- const inputType = currentElement.getAttribute('type');
+ const inputType = currentElement.getAttribute("type");
const value = currentElement.value;
- if (keyCode === 37 && columnIndex > 0 && cursortPosition < 1) { // 左移 则 列下标必须大于0, 且光标在最左侧
+ if (keyCode === 37 && columnIndex > 0 && cursortPosition < 1) {
+ // 左移 则 列下标必须大于0, 且光标在最左侧
const lastId = `${tableColumn[columnIndex - 1].dataIndex}${record.sId}`;
if (!commonUtils.focus(lastId, e)) move(keyCode, cursortPosition, columnIndex - 1, currentElement); // 递归
}
- if (keyCode === 39 && columnIndex < tableColumn.length - 1) { // 右移 则 列下标必须小于列数量-1
- if (!record[sName] || cursortPosition >= value.length || inputType === 'search' || bEnter) { // 当前列为空 或 光标位置不小于当前值的长度
+ if (keyCode === 39 && columnIndex < tableColumn.length - 1) {
+ // 右移 则 列下标必须小于列数量-1
+ if (!record[sName] || cursortPosition >= value.length || inputType === "search" || bEnter) {
+ // 当前列为空 或 光标位置不小于当前值的长度
const nextId = `${tableColumn[columnIndex + 1].dataIndex}${record.sId}`;
if (!commonUtils.focus(nextId, e)) move(keyCode, cursortPosition, columnIndex + 1, currentElement); // 递归
}
}
};
- if ([37, 39].includes(keyCode)) { // 左键、右键
+ if ([37, 39].includes(keyCode)) {
+ // 左键、右键
const currentElement = document.getElementById(`${sName}${record.sId}`); // 当前编辑框对象
if (currentElement) {
const cursortPosition = commonUtils.getCursortPosition(currentElement); // 光标位置
@@ -5850,8 +6466,40 @@ export default (ChildComponent) => {
move(keyCode, cursortPosition, columnIndex, currentElement);
}
}
- }
-
+ };
+ /* 拖拽表格树形节点 */
+ handleMoveRow = (dragIndex, hoverIndex, dragKey, hoverKey, props) => {
+ const { slaveData: data } = this.props;
+ // const dragRow = data[dragIndex];
+ const dragObject = commonUtils.isNotEmptyArr(data.filter(ele => ele.sId === dragKey)) ? data.filter(ele => ele.sId === dragKey)[0] : {};
+ const hoverObject = commonUtils.isNotEmptyArr(data.filter(ele => ele.sId === hoverKey)) ? data.filter(ele => ele.sId === hoverKey)[0] : {};
+ // 同级菜单的移动
+ let newData = data.filter(ele => ele.sId !== dragKey);
+ let insertIndex = 0;
+ if (commonUtils.isNotEmptyArr(newData)) {
+ newData.forEach((ele, index) => {
+ if (ele.sId === hoverKey) {
+ if (dragIndex > hoverIndex) {
+ // 上移：dragKey表示的元素 放到 hoverKey表示的元素之前
+ insertIndex = index;
+ } else {
+ // 下移 dragKey表示的元素 放到 hoverKey表示的元素之后
+ insertIndex = index + 1;
+ }
+ }
+ });
+ newData.splice(insertIndex, 0, dragObject);
+ if (commonUtils.isNotEmptyObject(dragObject)) {
+ dragObject.handleType = dragObject.handleType ? dragObject.handleType : "update";
+ dragObject.iOrder = hoverObject.iOrder + 1
+ }
+ // newData.forEach((item,index) =>{
+ // item.handleType = 'update'
+ // item.iOrder =
+ // })
+ this.props.onSaveState({ slaveData: newData });
+ }
+ };
render() {
const { masterData, sModelsType, app } = this.props;
const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
@@ -5872,10 +6520,10 @@ export default (ChildComponent) => {
onCopyTo={this.handleCopyTo}
onCopyFrom={this.handleCopyFrom}
onSearchData={this.handleSearchData}
- onNext={this.handleSearchData.bind(this, 'next')}
- onBtnPrior={this.handleSearchData.bind(this, 'up')}
- onBtnFirst={this.handleSearchData.bind(this, 'first')}
- onBtnLast={this.handleSearchData.bind(this, 'end')}
+ onNext={this.handleSearchData.bind(this, "next")}
+ onBtnPrior={this.handleSearchData.bind(this, "up")}
+ onBtnFirst={this.handleSearchData.bind(this, "first")}
+ onBtnLast={this.handleSearchData.bind(this, "end")}
onSearchUpDown={this.handleSearchUpDown}
onGetData={this.handleGetData}
onCancel={this.handleCancel}
@@ -5913,6 +6561,7 @@ export default (ChildComponent) => {
onTableSelectRowChange={this.handleTableSelectRowChange}
onGetParamsValue={this.handleGetParamsValue}
onSelectCommonPopup={this.handleSelectCommonPopup}
+ onMoveRow={this.handleMoveRow}
/>
);
}
diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js
index a1d1083..cd58671 100644
--- a/src/components/Common/CommonTable/index.js
+++ b/src/components/Common/CommonTable/index.js
@@ -5,7 +5,7 @@
/* eslint-disable react/no-array-index-key */
/* eslint-disable react/jsx-closing-tag-location */
/* eslint-disable */
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from "react";
import {
CheckCircleFilled,
ClockCircleFilled,
@@ -26,57 +26,53 @@ import {
ClearOutlined,
CaretUpOutlined,
CaretDownOutlined,
- PlaySquareOutlined
-} from '@ant-design/icons';
-import { Icon as LegacyIcon } from '@ant-design/compatible';
+ PlaySquareOutlined,
+} from "@ant-design/icons";
+import { Icon as LegacyIcon } from "@ant-design/compatible";
// import '@ant-design/compatible/assets/index.css';
-import lodash from 'lodash';
-import { Table, Input, Checkbox, Button, Upload, message, Popover, Spin, Space, Form, Tooltip, Row, Progress,Modal, Col, Pagination } from 'antd-v4';
-import { DndProvider, DropTarget, DragSource } from 'react-dnd';
-import {
- sortableContainer,
- sortableElement,
- sortableHandle,
-} from 'react-sortable-hoc';
-import { MenuOutlined } from '@ant-design/icons';
-import { HTML5Backend } from 'react-dnd-html5-backend';
-import { Resizable } from 'react-resizable';
-import styles from './index.less';
-import * as commonUtils from '@/utils/utils';
-import ShowTypeNew from '@/components/Common/CommonComponent';
-import Highlighter from 'react-highlight-words';
-import commonConfig from '@/utils/config';
-import update from 'immutability-helper';
-import * as commonFunc from '@/components/Common/commonFunc';
-import moment from 'moment';
-import ParamIcon from '@/assets/param.svg';
-import sAlumiteIcon from '@/assets/sAlumite.svg';
-import ReplaceIcon from '@/assets/extract.svg';
-import DisReplaceIcon from '@/assets/disableExtract.svg';
-import DisAlumiteIcon from '@/assets/disabledsAlumite.svg';
-import ShowImg from '@/components/Common/ShowImage/ShowImage';
-import ShowImgStyle from '@/components/Common/ShowImage/ShowImage.less';
-import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
-import CommonListSelectTree from '@/components/Common/CommonListSelectTree';
-import CommonListSelect from '@/components/Common/CommonListSelect';
-import CommonList from '@/components/Common/CommonList';
-import CommonListTreeSelect from '@/components/Common/CommonListTreeSelect';
-import AntdDraggableDiv from '@/components/Common/AntdDraggableDiv';
-import SlaveMemo from '@/components/Common/SlaveMemo';
-import { VList } from '@/components/Vlist';
-import { VList as VListNew } from '@/components/VlistNew';
+import lodash from "lodash";
+import { Table, Input, Checkbox, Button, Upload, message, Popover, Spin, Space, Form, Tooltip, Row, Progress, Modal, Col, Pagination } from "antd-v4";
+import { DndProvider, DropTarget, DragSource } from "react-dnd";
+import { sortableContainer, sortableElement, sortableHandle } from "react-sortable-hoc";
+import { MenuOutlined } from "@ant-design/icons";
+import { HTML5Backend } from "react-dnd-html5-backend";
+import { Resizable } from "react-resizable";
+import styles from "./index.less";
+import * as commonUtils from "@/utils/utils";
+import ShowTypeNew from "@/components/Common/CommonComponent";
+import Highlighter from "react-highlight-words";
+import commonConfig from "@/utils/config";
+import update from "immutability-helper";
+import * as commonFunc from "@/components/Common/commonFunc";
+import moment from "moment";
+import ParamIcon from "@/assets/param.svg";
+import sAlumiteIcon from "@/assets/sAlumite.svg";
+import ReplaceIcon from "@/assets/extract.svg";
+import DisReplaceIcon from "@/assets/disableExtract.svg";
+import DisAlumiteIcon from "@/assets/disabledsAlumite.svg";
+import ShowImg from "@/components/Common/ShowImage/ShowImage";
+import ShowImgStyle from "@/components/Common/ShowImage/ShowImage.less";
+import AntdDraggableModal from "@/components/Common/AntdDraggableModal";
+import CommonListSelectTree from "@/components/Common/CommonListSelectTree";
+import CommonListSelect from "@/components/Common/CommonListSelect";
+import CommonList from "@/components/Common/CommonList";
+import CommonListTreeSelect from "@/components/Common/CommonListTreeSelect";
+import AntdDraggableDiv from "@/components/Common/AntdDraggableDiv";
+import SlaveMemo from "@/components/Common/SlaveMemo";
+import { VList } from "@/components/Vlist";
+import { VList as VListNew } from "@/components/VlistNew";
import SvgIcon from "../../SvgIcon";
-import PrintPdf from '@/components/PrintPdf/PrintPdf';
-import OfficePreview from '@/components/Common/OfficePreview';
-import EditTableCommonListSelectFlex from '@/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex';
-import ColorInfo from './colorInfo';
+import PrintPdf from "@/components/PrintPdf/PrintPdf";
+import OfficePreview from "@/components/Common/OfficePreview";
+import EditTableCommonListSelectFlex from "@/components/Common/CommonListSelectFlex/EditTableCommonListSelectFlex";
+import ColorInfo from "./colorInfo";
+import cloneDeep from "lodash/cloneDeep";
// import { VList } from 'virtuallist-antd';
-
/* 获取配置及数据 */
const FormItem = Form.Item;
const { confirm } = Modal;
-const ResizeableTitle = (props) => {
+const ResizeableTitle = props => {
const { onResize, width, ...restProps } = props;
if (!width) {
return
- {
- if (fileType === 'pdf') {
- this.setState({
- pdfFileVisible: true,
- pdfFileUrl: fileList[0],
- });
- } else {
- this.handlePreviewImage(e, fileList);
- }
- }} title="预览">
+ let fileName = fileList[0].substring(fileList[0].lastIndexOf("/") + 1);
+ fileName = fileName.substring(fileName.indexOf("_") + 1);
+ const picHref = `${commonConfig.file_host}file/download?savePathStr=${encodeURIComponent(value)}&sModelsId=100&token=${encodeURIComponent(
+ this.props.app.token
+ )}`;
+ const fileType = fileName.split(".").pop().toLowerCase();
+ const previewFileList = ["jpg", "png", "jepg", "webp", "svg", "bmp", "apng", "pdf"];
+ return (
+
+ {
+ if (fileType === "pdf") {
+ this.setState({
+ pdfFileVisible: true,
+ pdfFileUrl: fileList[0],
+ });
+ } else {
+ this.handlePreviewImage(e, fileList);
+ }
+ }}
+ title="预览"
+ >
+
+ );
} else {
- return {
- this.setState({
- commonFileDownloadVisible: true,
- commonFileDownloadList: fileList.map(item => {return { url: item, checked: false }}),
- })
- }}
- >{`附件（${fileList.length}）`};
+ return (
+ {
+ this.setState({
+ commonFileDownloadVisible: true,
+ commonFileDownloadList: fileList.map(item => {
+ return { url: item, checked: false };
+ }),
+ });
+ }}
+ >{`附件（${fileList.length}）`}
+ );
}
- }
+ };
}
if (commonUtils.isNotEmptyArr(sMakeUpPath)) {
sMakeUpPath.forEach(item => {
- item.render = (value = '', record) => {
+ item.render = (value = "", record) => {
const { formId, name, enabled } = this.props;
- const { token } = this.props.app;
+ const { token } = this.props.app;
const divProps = {
action: `${commonConfig.file_host}file/upload?sModelsId=${formId}&token=${token}`,
- onChange: (info) => {
+ onChange: info => {
this.handleUploadChange(info, () => {});
const savePathStr = info?.file?.response?.dataset?.rows?.[0]?.savePathStr;
this.props.onDataChange(name, item.dataIndex, { [item.dataIndex]: savePathStr }, record.sId, []);
},
- accept: '*/*',
+ accept: "*/*",
showUploadList: false,
multiple: false,
};
- return
- {
- value && [''].map(() => {
- const iconProps = {
- className: styles.imgPDf,
- onClick: () => {
- this.setState({
- officePreviewVisible: true,
- officeFileUrl: value,
- })
+ return (
+ 
0}
+ onClick={e => this.handlePreviewImage(e, picAddr)}
+ style={{ width: "30px", height: "20px" }}
+ />
+
+ );
+ }
+
+ return imgBox;
+ })}
+ {enabled && (
+
+
+ )}
+
+ );
+ };
+ });
}
- this.props.onCostomColums?.([
- ...tableColumn,
- ...subTableColumn
- ]);
+ this.props.onCostomColums?.([...tableColumn, ...subTableColumn]);
// 判断工序状态
if (commonUtils.isNotEmptyArr(sPartNameStatus) && commonUtils.isNotEmptyArr(dataSource)) {
this.useVListNew = true;
- const sModelsType = commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ? this.props.app.currentPane.sModelsType : '';
- if (sModelsType === 'production/productionPlanInfo' || location.pathname.toLowerCase('commonList') || sModelsType === 'productionMainPlan/productionMainPlan' || location.pathname.toLowerCase().indexOf('oee') > -1) {
- sPartNameStatus[0].render = (itemStr) => {
+ const sModelsType =
+ commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ? this.props.app.currentPane.sModelsType : "";
+ if (
+ sModelsType === "production/productionPlanInfo" ||
+ location.pathname.toLowerCase("commonList") ||
+ sModelsType === "productionMainPlan/productionMainPlan" ||
+ location.pathname.toLowerCase().indexOf("oee") > -1
+ ) {
+ sPartNameStatus[0].render = itemStr => {
if (commonUtils.isJSON(itemStr)) {
const sPartItem = JSON.parse(itemStr);
return (
//
+ {value &&
+ [""].map(() => {
+ const iconProps = {
+ className: styles.imgPDf,
+ onClick: () => {
+ this.setState({
+ officePreviewVisible: true,
+ officeFileUrl: value,
+ });
+ },
+ };
+
+ const picAddr = commonUtils.isNotEmptyObject(value) ? value.split(",") : "";
+ const dataUrl = picAddr[0].includes("xlyerpfiles")
+ ? `${commonConfig.file_host}file/download?savePathStr=${picAddr[0]}&scale=0.1&sModelsId=100&token=${token}`
+ : picAddr[0]; /* 缩略图 */
+
+ const officeFileTypeList = ["PDF", "DOCX", "XLSX", "MP4", "WEBM", "OGG"];
+ const imgTypeList = ["PNG", "SVG", "JPG", "JPEG", "GIF", "BMP", "TIFF", "ICO"];
+ const officeFileType = picAddr[0].split(".").pop().toUpperCase();
+ let fileIcon =
;
- }
- })
+ let imgBox =
- {
- return
- {
- // eslint-disable-next-line array-callback-return
- sPartItem.map((t, i) => {
- const sPartItemLength = sPartItem.length;
- // const record = dataSource[i]; /* 获取每行数据 */
- let colorValue = '#000000';
- if (t?.background) {
- colorValue = t.background;
- } else {
- const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
- switch (Number(sState)) { // 根据状态显示颜色
- case 0:
- colorValue = '#808080'; /* 0：灰色 */
- break;
- case 1:
- colorValue = '#808080'; /* 1：灰色 */
- break;
- case 2:
- colorValue = '#ff4d4f'; /* 2：红色 */
- break;
- case 3:
- colorValue = '#d4b106'; /* 3：黄色 */
- break;
- case 4:
- colorValue = '#000000'; /* 黑色 */
- break;
- case 5:
- colorValue = '#49aa19'; /* 5：绿色 */
- break;
- default:
- colorValue = '#000000';
- }
+ {
+ return (
+
+ {
+ // eslint-disable-next-line array-callback-return
+ sPartItem.map((t, i) => {
+ const sPartItemLength = sPartItem.length;
+ // const record = dataSource[i]; /* 获取每行数据 */
+ let colorValue = "#000000";
+ if (t?.background) {
+ colorValue = t.background;
+ } else {
+ const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
+ switch (
+ Number(sState) // 根据状态显示颜色
+ ) {
+ case 0:
+ colorValue = "#808080"; /* 0：灰色 */
+ break;
+ case 1:
+ colorValue = "#808080"; /* 1：灰色 */
+ break;
+ case 2:
+ colorValue = "#ff4d4f"; /* 2：红色 */
+ break;
+ case 3:
+ colorValue = "#d4b106"; /* 3：黄色 */
+ break;
+ case 4:
+ colorValue = "#000000"; /* 黑色 */
+ break;
+ case 5:
+ colorValue = "#49aa19"; /* 5：绿色 */
+ break;
+ default:
+ colorValue = "#000000";
+ }
+ }
+ return (
+
- }}>
-
+ {commonUtils.isNotEmptyObject(t.sProcessName) ? t.sProcessName : ""}
+ {i + 1 === sPartItemLength ? "" :
+ );
+ })
}
- return (
-
- {commonUtils.isNotEmptyObject(t.sProcessName) ? t.sProcessName : ''}
- { i + 1 === sPartItemLength ? '' :
- );
- })
- }
-
+
+ );
+ }}
+ >
+
{
// eslint-disable-next-line array-callback-return
sPartItem.map((t, i) => {
const sPartItemLength = sPartItem.length;
// const record = dataSource[i]; /* 获取每行数据 */
- let colorValue = '#000000';
+ let colorValue = "#000000";
if (t?.background) {
colorValue = t.background;
} else {
const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
- switch (Number(sState)) { // 根据状态显示颜色
+ switch (
+ Number(sState) // 根据状态显示颜色
+ ) {
case 0:
- colorValue = '#808080'; /* 0：灰色 */
+ colorValue = "#808080"; /* 0：灰色 */
break;
case 1:
- colorValue = '#808080'; /* 1：灰色 */
+ colorValue = "#808080"; /* 1：灰色 */
break;
case 2:
- colorValue = '#ff4d4f'; /* 2：红色 */
+ colorValue = "#ff4d4f"; /* 2：红色 */
break;
case 3:
- colorValue = '#d4b106'; /* 3：黄色 */
+ colorValue = "#d4b106"; /* 3：黄色 */
break;
case 4:
- colorValue = '#000000'; /* 黑色 */
+ colorValue = "#000000"; /* 黑色 */
break;
case 5:
- colorValue = '#49aa19'; /* 5：绿色 */
+ colorValue = "#49aa19"; /* 5：绿色 */
break;
default:
- colorValue = '#000000';
+ colorValue = "#000000";
}
}
return (
-
- {commonUtils.isNotEmptyObject(t.sProcessName) ? t.sProcessName : ''}
- { i + 1 === sPartItemLength ? '' :
-
);
}
};
} else {
- sPartNameStatus[0].render = (itemStr) => {
+ sPartNameStatus[0].render = itemStr => {
if (itemStr) {
- const sPartItem = itemStr.split('->');
+ const sPartItem = itemStr.split("->");
return (
-
+ {commonUtils.isNotEmptyObject(t.sProcessName) ? t.sProcessName : ""}
+ {i + 1 === sPartItemLength ? "" :
);
})
}
+
{
// eslint-disable-next-line array-callback-return
sPartItem.map((t, i) => {
const sPartItemLength = sPartItem.length;
- const ArrItemStr = t.split('#')[0]; /* 工序名称 */
- const ArrItemNum = t.split('#')[1]; /* 状态 */
- const ArrItemName = t.split('#')[2]; /* 机台名称 */
- const ArrItemBanZhu = t.split('#')[3]; /* 班组 */
- const ArrItemTime = t.split('#')[4]; /* 排单时间 */
- const ArrItemPCNum = t.split('#')[5]; /* 排程数 */
- const ArrItemSBNum = t.split('#')[6]; /* 上报数 */
- const ArrItem7Num = commonUtils.isNotEmptyArr(t.split('#')) && t.split('#').length > 8 ? t.split('#')[8] : ''; /* 包数 */
- const ArrItem8Num = commonUtils.isNotEmptyArr(t.split('#')) && t.split('#').length > 9 ? t.split('#')[9]: ''; /* 每包数量 */
- const ArrItem9Num = commonUtils.isNotEmptyArr(t.split('#')) && t.split('#').length > 10 ? t.split('#')[10]: ''; /* 零头数量 */
- let ArrItemNumChange = '';
+ const ArrItemStr = t.split("#")[0]; /* 工序名称 */
+ const ArrItemNum = t.split("#")[1]; /* 状态 */
+ const ArrItemName = t.split("#")[2]; /* 机台名称 */
+ const ArrItemBanZhu = t.split("#")[3]; /* 班组 */
+ const ArrItemTime = t.split("#")[4]; /* 排单时间 */
+ const ArrItemPCNum = t.split("#")[5]; /* 排程数 */
+ const ArrItemSBNum = t.split("#")[6]; /* 上报数 */
+ const ArrItem7Num = commonUtils.isNotEmptyArr(t.split("#")) && t.split("#").length > 8 ? t.split("#")[8] : ""; /* 包数 */
+ const ArrItem8Num = commonUtils.isNotEmptyArr(t.split("#")) && t.split("#").length > 9 ? t.split("#")[9] : ""; /* 每包数量 */
+ const ArrItem9Num = commonUtils.isNotEmptyArr(t.split("#")) && t.split("#").length > 10 ? t.split("#")[10] : ""; /* 零头数量 */
+ let ArrItemNumChange = "";
let icon;
// eslint-disable-next-line default-case
switch (Number(ArrItemNum)) {
case 0:
- ArrItemNumChange = '未排程';
- icon = {
- return
-
);
// 数字转换图标
return (
- 工序名称：{ArrItemStr}
- 状态：{ArrItemNumChange}
- 机台名称：{ArrItemName}
- 班组：{ArrItemBanZhu}
- 排单时间：{ArrItemTime}
- 排程数：{ArrItemPCNum}
- 上报数：{ArrItemSBNum}
- {
- ArrItem7Num ? 包数：{ArrItem7Num}
:''
- }
- {
- ArrItem8Num ? 每包数量：{ArrItem8Num}
:''
- }
- {
- ArrItem9Num ? 零头数量：{ArrItem9Num}
:''
- }
+
+ 工序名称：
+ {ArrItemStr}
+
+
+ 状态：
+ {ArrItemNumChange}
+
+
+ 机台名称：
+ {ArrItemName}
+
+
+ 班组：
+ {ArrItemBanZhu}
+
+
+ 排单时间：
+ {ArrItemTime}
+
+
+ 排程数：
+ {ArrItemPCNum}
+
+
+ 上报数：
+ {ArrItemSBNum}
+
+ {ArrItem7Num ? (
+
+ 包数：
+ {ArrItem7Num}
+
+ ) : (
+ ""
+ )}
+ {ArrItem8Num ? (
+
+ 每包数量：
+ {ArrItem8Num}
+
+ ) : (
+ ""
+ )}
+ {ArrItem9Num ? (
+
+ 零头数量：
+ {ArrItem9Num}
+
+ ) : (
+ ""
+ )}
+
);
}
@@ -1465,112 +1629,168 @@ class CommonTableRc extends React.Component {
// 判断材料准备状态
if (commonUtils.isNotEmptyArr(sMaterialsStatus) && commonUtils.isNotEmptyArr(dataSource)) {
this.useVListNew = true;
- const sModelsType = commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ? this.props.app.currentPane.sModelsType : '';
- if (true || sModelsType === 'production/productionPlanInfo' || sModelsType === 'productionMainPlan/productionMainPlan' || (commonUtils.isNotEmptyObject(sModelsType) && sModelsType.includes('view/')) || location.pathname.toLowerCase().indexOf('oee') > -1) {
+ const sModelsType =
+ commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ? this.props.app.currentPane.sModelsType : "";
+ if (
+ true ||
+ sModelsType === "production/productionPlanInfo" ||
+ sModelsType === "productionMainPlan/productionMainPlan" ||
+ (commonUtils.isNotEmptyObject(sModelsType) && sModelsType.includes("view/")) ||
+ location.pathname.toLowerCase().indexOf("oee") > -1
+ ) {
/* 动态列Jsonn解析 */
if (commonUtils.isNotEmptyArr(sMaterialsStatus) && commonUtils.isNotEmptyArr(dataSource)) {
sMaterialsStatus.forEach((jsonStatus, index) => {
const dWidth = jsonStatus.width * 2;
- const sBackGroundColor = jsonStatus.bReadonly ? '#f1f2f8' : '';
- if (commonUtils.isNotEmptyArr(jsonStatus.children)) { /* 嵌套列头JSON解析 */
+ const sBackGroundColor = jsonStatus.bReadonly ? "#f1f2f8" : "";
+ if (commonUtils.isNotEmptyArr(jsonStatus.children)) {
+ /* 嵌套列头JSON解析 */
for (const obj of jsonStatus.children) {
- obj.render = (itemStr) => {
+ obj.render = itemStr => {
if (commonUtils.isJSON(itemStr)) {
const sPartItem = JSON.parse(itemStr);
/* 取箭头弹出的窗体配置 */
let showConfig = {};
- let linkStyle = '';/* 弹窗 */
- if (commonUtils.isNotEmptyArr(this.props.config) && commonUtils.isNotEmptyArr(this.props.config.gdsconfigformslave) && commonUtils.isNotEmptyStr('sMaterialsStatus')) {
- const showConfigArr = this.props.config.gdsconfigformslave.filter(item => item.sName === 'sMaterialsStatus' && item.bVisible);
+ let linkStyle = ""; /* 弹窗 */
+ if (
+ commonUtils.isNotEmptyArr(this.props.config) &&
+ commonUtils.isNotEmptyArr(this.props.config.gdsconfigformslave) &&
+ commonUtils.isNotEmptyStr("sMaterialsStatus")
+ ) {
+ const showConfigArr = this.props.config.gdsconfigformslave.filter(item => item.sName === "sMaterialsStatus" && item.bVisible);
if (commonUtils.isNotEmptyArr(showConfigArr)) {
showConfig = showConfigArr[0];
- if (commonUtils.isNotEmptyObject(showConfig) && showConfig.sDropDownType === 'picArr' && !commonUtils.isEmpty(showConfig.sActiveId) && commonUtils.isEmptyArr(this.props.sGroupByList)) {
- linkStyle = 'sMaterialsStatusStyle';
+ if (
+ commonUtils.isNotEmptyObject(showConfig) &&
+ showConfig.sDropDownType === "picArr" &&
+ !commonUtils.isEmpty(showConfig.sActiveId) &&
+ commonUtils.isEmptyArr(this.props.sGroupByList)
+ ) {
+ linkStyle = "sMaterialsStatusStyle";
}
}
}
return (
-
{icon}
- {ArrItemStr}
+
+ {ArrItemStr}
+
{/*{ i + 1 === sPartItemLength ? '' :
);
})
}
-
-
- {
- // eslint-disable-next-line array-callback-return;
- sPartItem.map((t, i) => {
- const sPartItemLength = sPartItem.length;
- let colorValue = '#000000';
- if (t?.background) {
- colorValue = t.background;
- } else {
- const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
- switch (Number(sState)) { // 根据状态显示颜色
- case 0:
- colorValue = '#000000'; /* 0：黑色 */
- break;
- case 1:
- colorValue = '#ff4d4f'; /* 1：红色 */
- break;
- case 2:
- colorValue = '#49aa19'; /* 2：绿色 */
- break;
- case 3:
- colorValue = '#49aa19'; /* 3：绿色 */
- break;
- case 4:
- colorValue = '#ff4d4f'; /* 4：红色 */
- break;
- default:
- colorValue = '#000000';
- }
+ {
+ return (
+
+ {
+ // eslint-disable-next-line array-callback-return;
+ sPartItem.map((t, i) => {
+ const sPartItemLength = sPartItem.length;
+ let colorValue = "#000000";
+ if (t?.background) {
+ colorValue = t.background;
+ } else {
+ const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
+ switch (
+ Number(sState) // 根据状态显示颜色
+ ) {
+ case 0:
+ colorValue = "#000000"; /* 0：黑色 */
+ break;
+ case 1:
+ colorValue = "#ff4d4f"; /* 1：红色 */
+ break;
+ case 2:
+ colorValue = "#49aa19"; /* 2：绿色 */
+ break;
+ case 3:
+ colorValue = "#49aa19"; /* 3：绿色 */
+ break;
+ case 4:
+ colorValue = "#ff4d4f"; /* 4：红色 */
+ break;
+ default:
+ colorValue = "#000000";
+ }
+ }
+ return (
+
- }}>
-
+ {commonUtils.isNotEmptyObject(t.sMaterialsName) ? (
+
+ {t.sMaterialsName}
+
+ ) : (
+ ""
+ )}
+ {i + 1 === sPartItemLength ? "" : -}
+
+ );
+ })
}
- return (
-
- {commonUtils.isNotEmptyObject(t.sMaterialsName) ?
-
- {t.sMaterialsName}
- : ''}
- { i + 1 === sPartItemLength ? '' : -}
-
- );
- })
- }
-
+
+ );
+ }}
+ >
+
{
// eslint-disable-next-line array-callback-return;
sPartItem.map((t, i) => {
const sPartItemLength = sPartItem.length;
- let colorValue = '#000000';
+ let colorValue = "#000000";
if (t?.background) {
colorValue = t.background;
} else {
const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
- switch (Number(sState)) { // 根据状态显示颜色
+ switch (
+ Number(sState) // 根据状态显示颜色
+ ) {
case 0:
- colorValue = '#000000'; /* 0：黑色 */
+ colorValue = "#000000"; /* 0：黑色 */
break;
case 1:
- colorValue = '#ff4d4f'; /* 1：红色 */
+ colorValue = "#ff4d4f"; /* 1：红色 */
break;
case 2:
- colorValue = '#49aa19'; /* 2：绿色 */
+ colorValue = "#49aa19"; /* 2：绿色 */
break;
case 3:
- colorValue = '#49aa19'; /* 3：绿色 */
+ colorValue = "#49aa19"; /* 3：绿色 */
break;
case 4:
- colorValue = '#ff4d4f'; /* 4：红色 */
+ colorValue = "#ff4d4f"; /* 4：红色 */
break;
default:
- colorValue = '#000000';
+ colorValue = "#000000";
}
}
return (
-
- {commonUtils.isNotEmptyObject(t.sMaterialsName) ?
-
- {t.sMaterialsName}
- : ''}
- { i + 1 === sPartItemLength ? '' : -}
+ {
- return
+ {commonUtils.isNotEmptyObject(t.sMaterialsName) ? (
+
+ {t.sMaterialsName}
+
+ ) : (
+ ""
+ )}
+ {i + 1 === sPartItemLength ? "" : -}
);
})
@@ -1582,105 +1802,157 @@ class CommonTableRc extends React.Component {
return itemStr;
}
};
- };
- } else { /* 无嵌套列头JSON列解析 */
- sMaterialsStatus[index].render = (itemStr) => {
+ }
+ } else {
+ /* 无嵌套列头JSON列解析 */
+ sMaterialsStatus[index].render = itemStr => {
if (commonUtils.isJSON(itemStr)) {
const sPartItem = JSON.parse(itemStr);
/* 取箭头弹出的窗体配置 */
let showConfig = {};
- let linkStyle = '';/* 弹窗 */
- if (commonUtils.isNotEmptyArr(this.props.config) && commonUtils.isNotEmptyArr(this.props.config.gdsconfigformslave) && commonUtils.isNotEmptyStr('sMaterialsStatus')) {
- const showConfigArr = this.props.config.gdsconfigformslave.filter(item => item.sName === 'sMaterialsStatus' && item.bVisible);
+ let linkStyle = ""; /* 弹窗 */
+ if (
+ commonUtils.isNotEmptyArr(this.props.config) &&
+ commonUtils.isNotEmptyArr(this.props.config.gdsconfigformslave) &&
+ commonUtils.isNotEmptyStr("sMaterialsStatus")
+ ) {
+ const showConfigArr = this.props.config.gdsconfigformslave.filter(item => item.sName === "sMaterialsStatus" && item.bVisible);
if (commonUtils.isNotEmptyArr(showConfigArr)) {
showConfig = showConfigArr[0];
- if (commonUtils.isNotEmptyObject(showConfig) && showConfig.sDropDownType === 'picArr' && !commonUtils.isEmpty(showConfig.sActiveId) && commonUtils.isEmptyArr(this.props.sGroupByList)) {
- linkStyle = 'sMaterialsStatusStyle';
+ if (
+ commonUtils.isNotEmptyObject(showConfig) &&
+ showConfig.sDropDownType === "picArr" &&
+ !commonUtils.isEmpty(showConfig.sActiveId) &&
+ commonUtils.isEmptyArr(this.props.sGroupByList)
+ ) {
+ linkStyle = "sMaterialsStatusStyle";
}
}
}
return (
-
- {
- // eslint-disable-next-line array-callback-return;
- sPartItem.map((t, i) => {
- const sPartItemLength = sPartItem.length;
- let colorValue = '#000000';
- if (t?.background) {
- colorValue = t.background;
- } else {
- const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
- switch (Number(sState)) { // 根据状态显示颜色
- case 0:
- colorValue = '#000000'; /* 0：黑色 */
- break;
- case 1:
- colorValue = '#ff4d4f'; /* 1：红色 */
- break;
- case 2:
- colorValue = '#49aa19'; /* 2：绿色 */
- break;
- case 3:
- colorValue = '#49aa19'; /* 3：绿色 */
- break;
- case 4:
- colorValue = '#ff4d4f'; /* 4：红色 */
- break;
- default:
- colorValue = '#000000';
- }
+ {
+ return (
+
+ {
+ // eslint-disable-next-line array-callback-return;
+ sPartItem.map((t, i) => {
+ const sPartItemLength = sPartItem.length;
+ let colorValue = "#000000";
+ if (t?.background) {
+ colorValue = t.background;
+ } else {
+ const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
+ switch (
+ Number(sState) // 根据状态显示颜色
+ ) {
+ case 0:
+ colorValue = "#000000"; /* 0：黑色 */
+ break;
+ case 1:
+ colorValue = "#ff4d4f"; /* 1：红色 */
+ break;
+ case 2:
+ colorValue = "#49aa19"; /* 2：绿色 */
+ break;
+ case 3:
+ colorValue = "#49aa19"; /* 3：绿色 */
+ break;
+ case 4:
+ colorValue = "#ff4d4f"; /* 4：红色 */
+ break;
+ default:
+ colorValue = "#000000";
+ }
+ }
+ return (
+
- }}>
-
+ {commonUtils.isNotEmptyObject(t.sMaterialsName) ? (
+
+ {t.sMaterialsName}
+
+ ) : (
+ ""
+ )}
+ {i + 1 === sPartItemLength ? "" : -}
+
+ );
+ })
}
- return (
-
- {commonUtils.isNotEmptyObject(t.sMaterialsName) ?
-
- {t.sMaterialsName}
- : ''}
- { i + 1 === sPartItemLength ? '' : -}
-
- );
- })
- }
-
+
+ );
+ }}
+ >
+
{
// eslint-disable-next-line array-callback-return;
sPartItem.map((t, i) => {
const sPartItemLength = sPartItem.length;
- let colorValue = '#000000';
+ let colorValue = "#000000";
if (t?.background) {
colorValue = t.background;
} else {
const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
- switch (Number(sState)) { // 根据状态显示颜色
+ switch (
+ Number(sState) // 根据状态显示颜色
+ ) {
case 0:
- colorValue = '#000000'; /* 0：黑色 */
+ colorValue = "#000000"; /* 0：黑色 */
break;
case 1:
- colorValue = '#ff4d4f'; /* 1：红色 */
+ colorValue = "#ff4d4f"; /* 1：红色 */
break;
case 2:
- colorValue = '#49aa19'; /* 2：绿色 */
+ colorValue = "#49aa19"; /* 2：绿色 */
break;
case 3:
- colorValue = '#49aa19'; /* 3：绿色 */
+ colorValue = "#49aa19"; /* 3：绿色 */
break;
case 4:
- colorValue = '#ff4d4f'; /* 4：红色 */
+ colorValue = "#ff4d4f"; /* 4：红色 */
break;
default:
- colorValue = '#000000';
+ colorValue = "#000000";
}
}
return (
-
- {commonUtils.isNotEmptyObject(t.sMaterialsName) ?
-
- {t.sMaterialsName}
- : ''}
- { i + 1 === sPartItemLength ? '' : -}
+
+ {commonUtils.isNotEmptyObject(t.sMaterialsName) ? (
+
+ {t.sMaterialsName}
+
+ ) : (
+ ""
+ )}
+ {i + 1 === sPartItemLength ? "" : -}
);
})
@@ -1689,7 +1961,12 @@ class CommonTableRc extends React.Component {
);
} else {
- return {itemStr}
;
+ return (
+
+ {" "}
+ {itemStr}{" "}
+
+ );
}
};
}
@@ -1700,40 +1977,51 @@ class CommonTableRc extends React.Component {
/* 动态列Jsonn解析 */
if (commonUtils.isNotEmptyArr(dynamicColumn) && commonUtils.isNotEmptyArr(dataSource)) {
dynamicColumn.forEach((jsonStatus, index) => {
- if (commonUtils.isNotEmptyArr(jsonStatus.children)) { /* 嵌套列头JSON解析 */
- const childrenJson = jsonStatus.children.filter(itemChild=> itemChild.dataIndex && itemChild.dataIndex.includes('json'));
+ if (commonUtils.isNotEmptyArr(jsonStatus.children)) {
+ /* 嵌套列头JSON解析 */
+ const childrenJson = jsonStatus.children.filter(itemChild => itemChild.dataIndex && itemChild.dataIndex.includes("json"));
for (const obj of childrenJson) {
- obj.render = (itemStr) => {
+ obj.render = itemStr => {
if (commonUtils.isNotEmptyObject(itemStr) && commonUtils.isJSON(itemStr)) {
const sPartItem = JSON.parse(itemStr);
return (
-
+
{
// eslint-disable-next-line array-callback-return;
sPartItem.map((t, i) => {
// const sPartItemLength = sPartItem.length;
- let colorValue = '#000000';
+ let colorValue = "#000000";
const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
- switch (Number(sState)) { // 根据状态显示颜色
+ switch (
+ Number(sState) // 根据状态显示颜色
+ ) {
case 1:
- colorValue = '#ff0000'; /* 1：红色 */
+ colorValue = "#ff0000"; /* 1：红色 */
break;
case 2:
- colorValue = '#49aa19'; /* 2：绿色 */
+ colorValue = "#49aa19"; /* 2：绿色 */
break;
case 3:
- colorValue = '#ffff00'; /* 3：黄色 */
+ colorValue = "#ffff00"; /* 3：黄色 */
break;
case 0:
- colorValue = ''; /* 3：不要颜色 */
+ colorValue = ""; /* 3：不要颜色 */
break;
default:
- colorValue = '';
+ colorValue = "";
}
return (
{t.dSchedulHours}
@@ -1745,38 +2033,37 @@ class CommonTableRc extends React.Component {
);
}
};
- };
- } else { /* 无嵌套列头JSON列解析 */
- dynamicColumn[index].render = (itemStr) => {
+ }
+ } else {
+ /* 无嵌套列头JSON列解析 */
+ dynamicColumn[index].render = itemStr => {
if (commonUtils.isNotEmptyObject(itemStr) && commonUtils.isJSON(itemStr)) {
const sPartItem = JSON.parse(itemStr);
return (
-
+
{
// eslint-disable-next-line array-callback-return;
sPartItem.map((t, i) => {
// const sPartItemLength = sPartItem.length;
- let colorValue = '#000000';
+ let colorValue = "#000000";
const sState = commonUtils.isEmpty(t.sState) ? 4 : t.sState;
- switch (Number(sState)) { // 根据状态显示颜色
+ switch (
+ Number(sState) // 根据状态显示颜色
+ ) {
case 1:
- colorValue = '#ff0000'; /* 1：红色 */
+ colorValue = "#ff0000"; /* 1：红色 */
break;
case 2:
- colorValue = '#49aa19'; /* 2：绿色 */
+ colorValue = "#49aa19"; /* 2：绿色 */
break;
case 3:
- colorValue = '#ffff00'; /* 3：黄色 */
+ colorValue = "#ffff00"; /* 3：黄色 */
break;
default:
- colorValue = '#666';
+ colorValue = "#666";
}
return (
-
+
);
@@ -1794,18 +2081,18 @@ class CommonTableRc extends React.Component {
// 判断时间状态
if (commonUtils.isNotEmptyArr(sTimeStatus) && commonUtils.isNotEmptyArr(dataSource)) {
- sTimeStatus[0].render = (itemStr) => {
+ sTimeStatus[0].render = itemStr => {
if (commonUtils.isJSON(itemStr)) {
const sPartItem = JSON.parse(itemStr);
- const linkStyle = 'sTimeStatusStyle';/* 弹窗 */
+ const linkStyle = "sTimeStatusStyle"; /* 弹窗 */
return (
-
{t.dSchedulHours}
+
{
// eslint-disable-next-line array-callback-return;
sPartItem.map((t, i) => {
const sPartItemLength = sPartItem.length;
const sColor = t.sColor;
- const dWidth = t.dRate !== undefined && t.dRate !== 0 ? `${t.dRate * 500}px` : '100px';
+ const dWidth = t.dRate !== undefined && t.dRate !== 0 ? `${t.dRate * 500}px` : "100px";
const content = (
{`${t.sName} ：${t.sValue}`}
@@ -1817,7 +2104,13 @@ class CommonTableRc extends React.Component {
@@ -1837,34 +2130,39 @@ class CommonTableRc extends React.Component {
// 判断拼板状态
if (commonUtils.isNotEmptyArr(sScheduleStatusJson) && commonUtils.isNotEmptyArr(dataSource)) {
this.useVListNew = true;
- sScheduleStatusJson[0].render = (itemStr) => {
+ sScheduleStatusJson[0].render = itemStr => {
if (commonUtils.isJSON(itemStr)) {
const itemJson = commonUtils.convertStrToObj(itemStr);
const itemLength = itemJson.length;
const content = itemJson.map((t, i) => {
- const { sState, sColor = '#000000', sName = '' } = t;
+ const { sState, sColor = "#000000", sName = "" } = t;
return (
- {commonUtils.isNotEmptyObject(specialTitle) ? specialTitle :sValue} }
+ res = (
+
- this.onKeyDownDiv(e, sName)}
- suppressContentEditableWarning
- contentEditable="true"
- onClick={
- commonUtils.isNotEmptyObject(linkStyle)
- ? clickEvent === "onViewChoose"
- ? this.handleViewChoose.bind(
- this,
- this.props.name,
- showConfig.sName,
- record,
- index
- )
- : clickEvent === "onMemoShow"
- ? this.handleMemoShow.bind(
- this,
- this.props.name,
- showConfig.sName,
- record,
- index,
- showConfig
- )
- : clickEvent === "onOpenPopupModal"
+ {" "}
+ {(commonUtils.isNotEmptyObject(sName) && sName.substring(0, 1) === "b") || imgBox !== "" ? (
+ ""
+ ) : (
+ {commonUtils.isNotEmptyObject(specialTitle) ? specialTitle : sValue} }
+ >
+ this.onKeyDownDiv(e, sName)}
+ suppressContentEditableWarning
+ contentEditable="true"
+ onClick={
+ commonUtils.isNotEmptyObject(linkStyle)
+ ? clickEvent === "onViewChoose"
+ ? this.handleViewChoose.bind(this, this.props.name, showConfig.sName, record, index)
+ : clickEvent === "onMemoShow"
+ ? this.handleMemoShow.bind(this, this.props.name, showConfig.sName, record, index, showConfig)
+ : clickEvent === "onOpenPopupModal"
? this.handleFieldPopupModal.bind(this, showConfig, sName, record)
- : this.handleViewClick.bind(
- this,
- this.props.name,
- showConfig.sName,
- record,
- index,
- showConfig
- )
- : null
- }
- > { sValue}
-
- }{bShow}{imgBox}{showQty}
+ : this.handleViewClick.bind(this, this.props.name, showConfig.sName, record, index, showConfig)
+ : null
+ }
+ >
+ {" "}
+ {sValue}
+
+
+ )}
+ {bShow}
+ {imgBox}
+ {showQty}
+
);
// 人检-质检代码特殊处理
@@ -5768,10 +6739,22 @@ class CommonTableRc extends React.Component {
};
/** willProps赋值 * */
- assignmentWillProps = (props) => {
+ assignmentWillProps = props => {
// 重构修改 去除filteredData;
const {
- dataSource, totalData, totalData1, selectedRowKeys, enabled, headerColumn, previewImage, previewVisible, tableColumn, slaveInfoHeaderColumn, searchText, slaveInfoSelectedRowKeys, expKeys,
+ dataSource,
+ totalData,
+ totalData1,
+ selectedRowKeys,
+ enabled,
+ headerColumn,
+ previewImage,
+ previewVisible,
+ tableColumn,
+ slaveInfoHeaderColumn,
+ searchText,
+ slaveInfoSelectedRowKeys,
+ expKeys,
} = this.state;
const stateValue = {};
this.computedTableHeight();
@@ -5805,22 +6788,22 @@ class CommonTableRc extends React.Component {
const result = item;
if (!item.width) {
item.width = 120;
- } else if (typeof item.width === 'string') {
+ } else if (typeof item.width === "string") {
item.width = parseInt(item.width);
}
return result;
});
// 给headerColumn加一个空的列来自适应表格宽度
- const hasTableLastEmpty = stateValue.headerColumn.find(item => item.dataIndex === 'tableLastEmpty');
+ const hasTableLastEmpty = stateValue.headerColumn.find(item => item.dataIndex === "tableLastEmpty");
if (!hasTableLastEmpty) {
stateValue.headerColumn.push({
with: undefined,
- title: '',
- dataIndex: 'tableLastEmpty',
+ title: "",
+ dataIndex: "tableLastEmpty",
bReadonly: true,
bNotResize: true,
- })
+ });
}
/* showType附加于表格中 */
@@ -5828,7 +6811,8 @@ class CommonTableRc extends React.Component {
child.render = (text, record, index) => this.bindShowType(props, text, record, child.dataIndex, index);
}
}
- if (!this.props.skipSlaveInfo && props.slaveInfo !== undefined && props.slaveInfo.headerColumn !== undefined && props.config) { // commonUtils.isNotEmptyArr(props.data) 不能用函数不然新增时置空后不能更新数据
+ if (!this.props.skipSlaveInfo && props.slaveInfo !== undefined && props.slaveInfo.headerColumn !== undefined && props.config) {
+ // commonUtils.isNotEmptyArr(props.data) 不能用函数不然新增时置空后不能更新数据
// && JSON.stringify(headerColumn) !== JSON.stringify(props.headerColumn)
if (JSON.parse(sessionStorage.getItem(`${props.formId}_${props.config.sId}_info`))) {
const columnArry = JSON.parse(sessionStorage.getItem(`${props.formId}_${props.config.sId}_info`));
@@ -5855,51 +6839,60 @@ class CommonTableRc extends React.Component {
}
}
/* 是否显示上传控件(数据格式:布尔) */
- this.isUploadShow = this.findIsExistByControlName(props, 'BtnUpload');
+ this.isUploadShow = this.findIsExistByControlName(props, "BtnUpload");
/* 是否显示查看控件(数据格式:布尔) */
- this.isLookShow = this.findIsExistByControlName(props, 'BtnLook');
+ this.isLookShow = this.findIsExistByControlName(props, "BtnLook");
/* 是否显示新增控件(数据格式:布尔) */
- this.isAddShow = this.findIsExistByControlName(props, 'BtnAdd');
+ this.isAddShow = this.findIsExistByControlName(props, "BtnAdd");
/* 是否显示modal控件(数据格式:布尔) */
- this.isModalShow = this.findIsExistByControlName(props, 'BtnChooseMaterials');
+ this.isModalShow = this.findIsExistByControlName(props, "BtnChooseMaterials");
/* 是否显示ChooseProcess控件(数据格式:布尔) */
- this.isChooseProcessShow = this.findIsExistByControlName(props, 'BtnChooseProcess');
+ this.isChooseProcessShow = this.findIsExistByControlName(props, "BtnChooseProcess");
/* 是否显示复制控件(数据格式:布尔) */
- this.isCopyShow = this.findIsExistByControlName(props, 'BtnCopy');
+ this.isCopyShow = this.findIsExistByControlName(props, "BtnCopy");
/* 是否显示复制全部控件(数据格式:布尔) */
- this.isCopyAllShow = this.findIsExistByControlName(props, 'BtnCopyAll');
+ this.isCopyAllShow = this.findIsExistByControlName(props, "BtnCopyAll");
/* 是否显示复制全部控件(数据格式:布尔) */
- this.isCopyMoreShow = this.findIsExistByControlName(props, 'BtnCopyMore');
+ this.isCopyMoreShow = this.findIsExistByControlName(props, "BtnCopyMore");
/* 是否显示删除控件(数据格式:布尔) */
- this.isDelShow = this.findIsExistByControlName(props, 'BtnDel');
+ this.isDelShow = this.findIsExistByControlName(props, "BtnDel");
// /* 上传后执行函数(数据格式:函数) */
// this.onUploadChange = props.onUploadChange;
/* 是否可以进行行移动 */
// this.isDragAndDrop = false; // props.isDragAndDrop;
this.isDragAndDrop = props.isDragAndDrop; // props.isDragAndDrop;
/* 是否可以弹窗 */
- this.isPopupShow = this.findIsExistByControlPopup(props, 'BtnPopup');
- this.isParamShow = this.findVisibleControlName(props, 'BtnShowParam');
+ this.isPopupShow = this.findIsExistByControlPopup(props, "BtnPopup");
+ this.isParamShow = this.findVisibleControlName(props, "BtnShowParam");
/* 是否可以成品工序 */
if (commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyObject(props.tableProps) && props.tableProps.bShowProductProcess !== undefined) {
this.isChooseProductProcess = props.tableProps.bShowProductProcess;
}
/* 是否可以成品材料 */
- if (commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyObject(props.tableProps) && props.tableProps.bShowProductMaterials !== undefined) {
+ if (
+ commonUtils.isNotEmptyObject(props) &&
+ commonUtils.isNotEmptyObject(props.tableProps) &&
+ props.tableProps.bShowProductMaterials !== undefined
+ ) {
this.isChooseProductMaterials = props.tableProps.bShowProductMaterials;
}
/* table表头信息(数据类型:数组对象) */
- if (props.headerColumn !== undefined && (commonUtils.isNotEmptyArr(stateValue.headerColumn) || (enabled !== props.enabled))) {
+ if (props.headerColumn !== undefined && (commonUtils.isNotEmptyArr(stateValue.headerColumn) || enabled !== props.enabled)) {
if (commonUtils.isNotEmptyArr(stateValue.headerColumn)) {
- stateValue.tableColumn = this.getTableColumn(stateValue.headerColumn, 'filter', props);
+ stateValue.tableColumn = this.getTableColumn(stateValue.headerColumn, "filter", props);
} else {
- stateValue.tableColumn = this.getTableColumn(headerColumn, 'filter', props);
+ stateValue.tableColumn = this.getTableColumn(headerColumn, "filter", props);
}
}
/* table表头信息(数据类型:数组对象) */
- if (!this.props.skipSlaveInfo && props.slaveInfo !== undefined && props.slaveInfo.headerColumn !== undefined && (commonUtils.isNotEmptyArr(props.slaveInfo.headerColumn) || (enabled !== props.enabled))) {
+ if (
+ !this.props.skipSlaveInfo &&
+ props.slaveInfo !== undefined &&
+ props.slaveInfo.headerColumn !== undefined &&
+ (commonUtils.isNotEmptyArr(props.slaveInfo.headerColumn) || enabled !== props.enabled)
+ ) {
stateValue.slaveInfoHeaderColumn = props.slaveInfo.headerColumn;
/* showType附加于表格中 */
for (const child of stateValue.slaveInfoHeaderColumn) {
@@ -5907,9 +6900,9 @@ class CommonTableRc extends React.Component {
}
if (commonUtils.isNotEmptyArr(props.slaveInfo.headerColumn)) {
if (commonUtils.isNotEmptyArr(stateValue.slaveInfoHeaderColumn)) {
- stateValue.tableInfoColumn = this.getTableColumn(stateValue.slaveInfoHeaderColumn, 'filter', props.slaveInfo);
+ stateValue.tableInfoColumn = this.getTableColumn(stateValue.slaveInfoHeaderColumn, "filter", props.slaveInfo);
} else {
- stateValue.tableInfoColumn = this.getTableColumn(slaveInfoHeaderColumn, 'filter', props.slaveInfo);
+ stateValue.tableInfoColumn = this.getTableColumn(slaveInfoHeaderColumn, "filter", props.slaveInfo);
}
}
stateValue.slaveInfo = props.slaveInfo;
@@ -5932,26 +6925,33 @@ class CommonTableRc extends React.Component {
this.sId = props.sId;
}
- if (props.data !== undefined && JSON.stringify(dataSource) !== JSON.stringify(props.data)) { // commonUtils.isNotEmptyArr(props.data) 不能用函数不然新增时置空后不能更新数据
+ if (props.data !== undefined && JSON.stringify(dataSource) !== JSON.stringify(props.data)) {
+ // commonUtils.isNotEmptyArr(props.data) 不能用函数不然新增时置空后不能更新数据
stateValue.dataSource = [...props.data];
}
- /* 合计行数据 *//* 数据(数据格式:数组对象) */
- if (props.totalData !== undefined && JSON.stringify(totalData) !== JSON.stringify(props.totalData) && !this.props.enabled) { // 要用this. this.props.enabled
+ /* 合计行数据 */ /* 数据(数据格式:数组对象) */
+ if (props.totalData !== undefined && JSON.stringify(totalData) !== JSON.stringify(props.totalData) && !this.props.enabled) {
+ // 要用this. this.props.enabled
if (props.totalData.length > 0) {
stateValue.totalData = [...props.totalData];
if (commonUtils.isEmptyArr(stateValue.totalData)) {
stateValue.totalData.push({});
}
stateValue.totalData[0].bSum = true;
- stateValue.totalData[0].key = '0000';
+ stateValue.totalData[0].key = "0000";
} else {
stateValue.totalData = [];
}
}
// 总计
- if (props.formId === '101111519916710024055720' && props.totalData1 !== undefined && JSON.stringify(totalData1) !== JSON.stringify(props.totalData1) && !this.props.enabled) {
+ if (
+ props.formId === "101111519916710024055720" &&
+ props.totalData1 !== undefined &&
+ JSON.stringify(totalData1) !== JSON.stringify(props.totalData1) &&
+ !this.props.enabled
+ ) {
stateValue.totalData1 = props.totalData1;
}
@@ -5959,8 +6959,12 @@ class CommonTableRc extends React.Component {
stateValue.selectedRowKeys = [...props.selectedRowKeys];
}
- if (props.slaveInfo !== undefined && props.slaveInfo.selectedRowKeys !== undefined && JSON.stringify(slaveInfoSelectedRowKeys) !== JSON.stringify(props.slaveInfo.selectedRowKeys)) {
- stateValue.slaveInfoSelectedRowKeys = [...props.slaveInfo.selectedRowKeys];// [...props.slaveInfo.selectedRowKeys];
+ if (
+ props.slaveInfo !== undefined &&
+ props.slaveInfo.selectedRowKeys !== undefined &&
+ JSON.stringify(slaveInfoSelectedRowKeys) !== JSON.stringify(props.slaveInfo.selectedRowKeys)
+ ) {
+ stateValue.slaveInfoSelectedRowKeys = [...props.slaveInfo.selectedRowKeys]; // [...props.slaveInfo.selectedRowKeys];
}
// 重构修改
@@ -5984,16 +6988,20 @@ class CommonTableRc extends React.Component {
if (props.enabled) {
const { config, name, rootType } = this.props;
if (commonUtils.isNotEmptyObject(config)) {
- const productionRoute = (commonUtils.isNotEmptyObject(props.app.currentPane) && commonUtils.isNotEmptyObject(props.app.currentPane.route) && props.app.currentPane.route.includes('productionSchedule'));
- if (productionRoute) { /* 生产排程对选中行进行汇总 */
+ const productionRoute =
+ commonUtils.isNotEmptyObject(props.app.currentPane) &&
+ commonUtils.isNotEmptyObject(props.app.currentPane.route) &&
+ props.app.currentPane.route.includes("productionSchedule");
+ if (productionRoute) {
+ /* 生产排程对选中行进行汇总 */
this.handleSumOtherColumn(props.config, props.data);
- } else if(rootType === 'list') {
- if(commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyArr(props.totalData)) {
- const addState ={};
+ } else if (rootType === "list") {
+ if (commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyArr(props.totalData)) {
+ const addState = {};
addState.totalData = props.totalData;
- this.setState({ ...addState })
+ this.setState({ ...addState });
}
- } else if(name ==='slaveChild'){
+ } else if (name === "slaveChild") {
this.handleSumChildColumn(props.config, props.data);
} else {
this.handleSumAllColumn(props.config, props.data);
@@ -6021,7 +7029,11 @@ class CommonTableRc extends React.Component {
if (stateValue.tableColumn[index].children && stateValue.tableColumn[index].children.length) {
const childrenSortArr = [];
const childrenDataIndexArr = [];
- item.children = item.children.map(child => { return {...child, ...{ sortIndex: sortArr.indexOf(child.dataIndex) }}}).sort(compare('sortIndex'));
+ item.children = item.children
+ .map(child => {
+ return { ...child, ...{ sortIndex: sortArr.indexOf(child.dataIndex) } };
+ })
+ .sort(compare("sortIndex"));
item.children.forEach((child, childIndex) => {
const currentSort = sortArr.indexOf(child.dataIndex);
if (childIndex === 0) {
@@ -6044,8 +7056,8 @@ class CommonTableRc extends React.Component {
newColumnList[sortArrIndex] = {
...stateValue.tableColumn[index],
children: stateValue.tableColumn[index].children.filter(child => childrenDataIndexArr[sortArrIndex].includes(child.dataIndex)),
- sortIndex: Math.min(...sortArrItem)
- }
+ sortIndex: Math.min(...sortArrItem),
+ };
});
addTableColumn = [...addTableColumn, ...newColumnList];
stateValue.tableColumn[index].delete = true;
@@ -6057,8 +7069,8 @@ class CommonTableRc extends React.Component {
}
});
stateValue.tableColumn = stateValue.tableColumn.filter(item => !item.delete); // 删除需要分割的双层表头
- stateValue.tableColumn = [ ...stateValue.tableColumn, ...addTableColumn ]; // 将分割后的双层表头加回去
- stateValue.tableColumn = stateValue.tableColumn.sort(compare('sortIndex'));
+ stateValue.tableColumn = [...stateValue.tableColumn, ...addTableColumn]; // 将分割后的双层表头加回去
+ stateValue.tableColumn = stateValue.tableColumn.sort(compare("sortIndex"));
// 合并一级表头相同的相邻的column
stateValue.tableColumn = stateValue.tableColumn.reduce((prev, cur) => {
if (prev.length) {
@@ -6077,12 +7089,15 @@ class CommonTableRc extends React.Component {
}
}, []);
}
- if (commonUtils.isJSON(sessionStorage.getItem(`${this.props.formId}_${this.props.config.sId}_info_headerColumns`)) && stateValue.tableInfoColumn) {
+ if (
+ commonUtils.isJSON(sessionStorage.getItem(`${this.props.formId}_${this.props.config.sId}_info_headerColumns`)) &&
+ stateValue.tableInfoColumn
+ ) {
const sortArr = JSON.parse(sessionStorage.getItem(`${this.props.formId}_${this.props.config.sId}_info_headerColumns`));
stateValue.tableInfoColumn.forEach((item, index) => {
stateValue.tableInfoColumn[index].sortIndex = sortArr.indexOf(item.dataIndex);
});
- stateValue.tableInfoColumn = stateValue.tableInfoColumn.sort(compare('sortIndex'));
+ stateValue.tableInfoColumn = stateValue.tableInfoColumn.sort(compare("sortIndex"));
}
}
if (this.mounted) {
@@ -6103,20 +7118,25 @@ class CommonTableRc extends React.Component {
/** 计算表格高度 * */
computedTableHeight = () => {
let tableHeaderHeight = this.hasMergeHeader ? 58 : 29;
- if (commonUtils.isNotEmptyArr(this.props.headerColumn) && this.props.headerColumn && this.props.headerColumn.find(item => commonUtils.isNotEmptyObject(item.title) && item.title.indexOf('-') != -1)) {
+ if (
+ commonUtils.isNotEmptyArr(this.props.headerColumn) &&
+ this.props.headerColumn &&
+ this.props.headerColumn.find(item => commonUtils.isNotEmptyObject(item.title) && item.title.indexOf("-") != -1)
+ ) {
tableHeaderHeight = 58;
}
// const footerHeight = (this.state.totalData.length && this.props.footer === undefined) ? 29 : 0;
const footerHeight = commonUtils.isNotEmptyArr(this.state.totalData1) ? 58 : 29;
if (this.props.tableProps.AutoTableHeight) {
this.scrollY = this.props.tableProps.AutoTableHeight;
- this.tableHeight = this.props.tableProps.AutoTableHeight == '100%' ? '100%' : this.props.tableProps.AutoTableHeight + tableHeaderHeight + footerHeight;
+ this.tableHeight =
+ this.props.tableProps.AutoTableHeight == "100%" ? "100%" : this.props.tableProps.AutoTableHeight + tableHeaderHeight + footerHeight;
return;
}
const paneKey = this.props.app.currentPane.key;
let searchMainFormDom = document.getElementsByClassName(`searchMainForm_${paneKey || 0}`)[0];
- if (searchMainFormDom && location.pathname?.includes('commonCostomTabBill')) {
+ if (searchMainFormDom && location.pathname?.includes("commonCostomTabBill")) {
searchMainFormDom = searchMainFormDom.parentNode;
}
const searchComponentDom = document.getElementsByClassName(`searchComponentContainer_${paneKey || 0}`)[0];
@@ -6128,42 +7148,45 @@ class CommonTableRc extends React.Component {
return;
}
// 区分bill页面是否包含tab;
- if (this.scrollY && (!searchMainFormHeight && !searchComponentHeight && !offsetHeight)) {
+ if (this.scrollY && !searchMainFormHeight && !searchComponentHeight && !offsetHeight) {
return;
}
const tabHeight = 89;
const paginationHeight = this.props.tableProps.pagination ? 60 : 0;
let extraHeight = 0; /* 额外的区域 */
- if(commonUtils.isNotEmptyObject(location.pathname) && location.pathname.includes('commonListTab')) { /* 带Tab页签的列表 */
+ if (commonUtils.isNotEmptyObject(location.pathname) && location.pathname.includes("commonListTab")) {
+ /* 带Tab页签的列表 */
/* 有从表高度100，没有高度20 */
- const hasSlave = document.getElementsByClassName('hasSlave');
- if(commonUtils.isNotEmptyArr(hasSlave)) {
- extraHeight = 220;
- }else {
- extraHeight = 20;
+ const hasSlave = document.getElementsByClassName("hasSlave");
+ if (commonUtils.isNotEmptyArr(hasSlave)) {
+ extraHeight = 220;
+ } else {
+ extraHeight = 20;
}
}
if (this.props?.masterConfig?.sTableColorTs) {
extraHeight += this.colorInfo?.getBoundingClientRect()?.height || 80;
- if(location.pathname?.includes('productionScheduleTree')) {
+ if (location.pathname?.includes("productionScheduleTree")) {
extraHeight -= 34;
}
} else {
extraHeight += paginationHeight;
}
- const tableHeight = window.innerHeight - tabHeight - searchMainFormHeight - searchComponentHeight - tableHeaderHeight - footerHeight - offsetHeight - extraHeight;
+ const tableHeight =
+ window.innerHeight - tabHeight - searchMainFormHeight - searchComponentHeight - tableHeaderHeight - footerHeight - offsetHeight - extraHeight;
this.scrollY = tableHeight;
this.tableHeight = tableHeight + tableHeaderHeight + footerHeight;
- }
+ };
/** 计算th宽度（实现隐藏空td） */
- computedTdWidth = (refresh) => {
+ computedTdWidth = refresh => {
if (!this.props.formId || !this.props.config) {
return;
}
- if (!this.mydivFlag || refresh) { // 表格初始化或屏幕size改变时触发
+ if (!this.mydivFlag || refresh) {
+ // 表格初始化或屏幕size改变时触发
this.mydivTime = 0;
clearInterval(this.mydivTimer);
this.mydivTimer = null;
@@ -6178,10 +7201,12 @@ class CommonTableRc extends React.Component {
const { tableColumn, headerColumn } = this.state;
const sessionColumn = sessionStorage.getItem(`${this.props.formId}_${this.props.config.sId}`);
const column = sessionColumn ? JSON.parse(sessionColumn) : tableColumn;
- const oCol = this.mydiv.querySelector('colgroup');
+ const oCol = this.mydiv.querySelector("colgroup");
const oCols = oCol ? oCol.childNodes : [];
- const oColsWithList = Array.from(oCols).filter(item => !item.className).map(item => item.style.width);
- const tableLastEmptyIndex = column.findIndex(item => item.dataIndex === 'tableLastEmpty');
+ const oColsWithList = Array.from(oCols)
+ .filter(item => !item.className)
+ .map(item => item.style.width);
+ const tableLastEmptyIndex = column.findIndex(item => item.dataIndex === "tableLastEmpty");
if (tableLastEmptyIndex > 0 && oColsWithList[tableLastEmptyIndex]) {
const iIndex = tableLastEmptyIndex - 1; // tableColumn最后一位
this.mydivFlag = true;
@@ -6191,12 +7216,13 @@ class CommonTableRc extends React.Component {
const columnNew = [...column];
const columnExtraSize = column.reduce((result, cur) => {
if (commonUtils.isNotEmptyArr(cur.children)) {
- result += (cur.children.length - 1);
+ result += cur.children.length - 1;
}
return result;
- }, 0)
+ }, 0);
const widthExtra = parseInt(oColsWithList[tableLastEmptyIndex + columnExtraSize]);
- if (commonUtils.isNotEmptyArr(columnNew[iIndex].children)) { // 最后一个是双层表头
+ if (commonUtils.isNotEmptyArr(columnNew[iIndex].children)) {
+ // 最后一个是双层表头
const lastChildIndex = columnNew[iIndex].children.length - 1;
columnNew[iIndex].children[lastChildIndex].width += widthExtra;
if (!columnNew[iIndex].children[lastChildIndex].widthExtra) {
@@ -6209,7 +7235,8 @@ class CommonTableRc extends React.Component {
headerColumnNew[headerIndex].width = columnNew[iIndex].children[lastChildIndex].width;
headerColumnNew[headerIndex].widthExtra = columnNew[iIndex].children[lastChildIndex].widthExtra;
}
- } else { // 单表头
+ } else {
+ // 单表头
columnNew[iIndex].width += widthExtra;
if (!columnNew[iIndex].widthExtra) {
columnNew[iIndex].widthExtra = 0;
@@ -6233,7 +7260,7 @@ class CommonTableRc extends React.Component {
}
}, 100);
}
- }
+ };
/** 合并表头 */
mergeTableColumn = (title, column, tableColumn, index, bNotEmpty, styleObj) => {
@@ -6244,20 +7271,23 @@ class CommonTableRc extends React.Component {
const childTitleContent = title.substring(index + 1, title.length);
const renderTitle = () => {
-
- const titleCheckBox = this.bCheckBoxColumm({ ...column || {}, title: childTitleContent });
+ const titleCheckBox = this.bCheckBoxColumm({ ...(column || {}), title: childTitleContent });
if (titleCheckBox) {
return titleCheckBox;
}
- let childTitle = ''
+ let childTitle = "";
if (bNotEmpty) {
- childTitle =
);
- }
- handleFastSearch = (params) => {
+ };
+ handleFastSearch = params => {
const { sName, record, oldKey } = params;
const { config, searchRowKeys = [], onBtnSearch } = this.props;
const newKey = oldKey || commonUtils.createSid();
const sFirstFieldName = `sFirst-${newKey}`;
- const { masterData } = this.props.onChange('master', sFirstFieldName, { [sFirstFieldName]: sName }, null, null, true);
+ const { masterData } = this.props.onChange("master", sFirstFieldName, { [sFirstFieldName]: sName }, null, null, true);
const sFirstValue = masterData[sFirstFieldName];
- const firstDataIndex = commonUtils.isEmpty(sFirstValue) ? 's' : sFirstValue.substring(0, 1);
- const sSecondConditionPro = firstDataIndex === 's' && sFirstValue.endsWith('_pro');
+ const firstDataIndex = commonUtils.isEmpty(sFirstValue) ? "s" : sFirstValue.substring(0, 1);
+ const sSecondConditionPro = firstDataIndex === "s" && sFirstValue.endsWith("_pro");
const iIndex = config.gdsconfigformslave.findIndex(item => item.sName === sFirstValue);
- masterData[`sSecond-${newKey}`] = sSecondConditionPro && iIndex > -1 && config.gdsconfigformslave[iIndex].sDropDownType === 'sql' ?
- commonConfig.seaJudge.s_proDropDown[0].sId : sSecondConditionPro ?
- commonConfig.seaJudge.s_pro[0].sId : commonConfig.seaJudge[firstDataIndex][0].sId;
- masterData[`${firstDataIndex}Third-${newKey}`] = firstDataIndex === 'b' ? false : firstDataIndex === 't' ? moment().format('YYYY-MM-DD') : masterData[`${firstDataIndex}Third-${newKey}`];
+ masterData[`sSecond-${newKey}`] =
+ sSecondConditionPro && iIndex > -1 && config.gdsconfigformslave[iIndex].sDropDownType === "sql"
+ ? commonConfig.seaJudge.s_proDropDown[0].sId
+ : sSecondConditionPro
+ ? commonConfig.seaJudge.s_pro[0].sId
+ : commonConfig.seaJudge[firstDataIndex][0].sId;
+ masterData[`${firstDataIndex}Third-${newKey}`] =
+ firstDataIndex === "b" ? false : firstDataIndex === "t" ? moment().format("YYYY-MM-DD") : masterData[`${firstDataIndex}Third-${newKey}`];
const sThirdName = `${firstDataIndex}Third-${newKey}`;
masterData[`${sThirdName}`] = record[sName];
@@ -6566,7 +7602,7 @@ class CommonTableRc extends React.Component {
onBtnSearch();
});
};
- handleClearFastSearch = (oldKey) => {
+ handleClearFastSearch = oldKey => {
const { searchRowKeys = [], onBtnSearch, masterData = {} } = this.props;
if (searchRowKeys.length > 1) {
const searchRowKeysNew = searchRowKeys.filter(item => item !== oldKey);
@@ -6576,22 +7612,22 @@ class CommonTableRc extends React.Component {
} else if (searchRowKeys.length === 1) {
const sThirdName = Object.keys(masterData).find(key => key.indexOf(`Third-${oldKey}`) !== -1);
if (sThirdName) {
- masterData[sThirdName] = '';
+ masterData[sThirdName] = "";
this.props.onSaveState({ masterData }, () => {
onBtnSearch();
});
}
}
- }
+ };
// 进行拖动排序，数据展现必须按照iOrder 进行排序展现，必须进行选择才能拖动（废弃)
moveRowOld = (dragIndex, hoverIndex) => {
const { name } = this.props;
const { selectedRowKeys } = this.state;
if (commonUtils.isEmptyArr(selectedRowKeys)) {
- message.warning('请选择后进行拖动');
+ message.warning("请选择后进行拖动");
} else {
// let mHoverIndex = hoverIndex;
- selectedRowKeys.forEach((item) => {
+ selectedRowKeys.forEach(item => {
const { dataSource } = this.state;
const iIndex = dataSource.findIndex(newItem => item === newItem[this.rowKey]);
const dragRow = dataSource[iIndex];
@@ -6599,7 +7635,10 @@ class CommonTableRc extends React.Component {
const newState = update(this.state, {
dataSource: {
- $splice: [[iIndex, 1], [hoverIndex, 0, dragRow]],
+ $splice: [
+ [iIndex, 1],
+ [hoverIndex, 0, dragRow],
+ ],
},
});
this.setState(newState);
@@ -6608,37 +7647,37 @@ class CommonTableRc extends React.Component {
const { dataSource } = this.state;
dataSource.forEach((item, index) => {
if (commonUtils.isEmpty(item.handleType)) {
- item.handleType = 'update';
+ item.handleType = "update";
}
item.iOrder = index + 1;
});
this.setState(dataSource);
this.props.onRowMove({ [`${name}Data`]: dataSource });
}
- }
+ };
/* 拖拽改变对应层级 */
- moveRow = (dragIndex, hoverIndex,dragKey,hoverKey) => {
- if(this.props.onMoveRow) {
- this.props.onMoveRow(dragIndex, hoverIndex,dragKey,hoverKey);
+ moveRow = (dragIndex, hoverIndex, dragKey, hoverKey) => {
+ if (this.props.onMoveRow) {
+ this.props.onMoveRow(dragIndex, hoverIndex, dragKey, hoverKey, this.props);
}
};
BtnUploadDivProps = () => {
return {
- accept: this.BtnUploadDivPropsAttr.current?.sActiveKey || '*/*',
- beforeUpload: (file) => {
+ accept: this.BtnUploadDivPropsAttr.current?.sActiveKey || "*/*",
+ beforeUpload: file => {
const config = this.BtnUploadDivPropsAttr.current;
- if (config?.sActiveKey && typeof config?.sActiveKey === 'string') {
- const isAllow = config?.sActiveKey?.split(',').includes(file.type);
+ if (config?.sActiveKey && typeof config?.sActiveKey === "string") {
+ const isAllow = config?.sActiveKey?.split(",").includes(file.type);
if (!isAllow) {
- message.error(`请选择正确的文件类型,包含${config?.sActiveKey || ''}`);
+ message.error(`请选择正确的文件类型,包含${config?.sActiveKey || ""}`);
}
return isAllow;
}
return true;
- }
- }
- }
+ },
+ };
+ };
/** 渲染 */
render() {
@@ -6674,7 +7713,7 @@ class CommonTableRc extends React.Component {
if (commonUtils.isNotEmptyObject(previewImage)) {
if (commonUtils.isNotEmptyArr(this.props.data)) {
if (this.props.data[0].sPicturePath) {
- for(const item of this.props.data) {
+ for (const item of this.props.data) {
const dataUrl = `${commonConfig.file_host}file/download?savePathStr=${item.sPicturePath}&sModelsId=100&token=${token}`; /* 缩略图 */
data.push(dataUrl);
}
@@ -6689,9 +7728,9 @@ class CommonTableRc extends React.Component {
const divProps = {
action: `${commonConfig.file_host}file/upload?sModelsId=${formId}&token=${token}`,
onChange: this.handleUploadChange,
- accept: '*/*',
+ accept: "*/*",
showUploadList: false,
- multiple:true,
+ multiple: true,
beforeUpload: this.handleBeforeUpload,
};
/* 获取look的props */
@@ -6725,7 +7764,7 @@ class CommonTableRc extends React.Component {
/* 通用弹窗功能 */
let commonPopupProps = {};
- let commonPopupTitle = '选择弹窗';
+ let commonPopupTitle = "选择弹窗";
let bCommonPopup = false; /* 多列弹出窗11 */
let bCommonPopup1 = false; /* 单列弹出窗 */
let bCommonPopupTree = false; /* 树形列弹出窗 */
@@ -6734,35 +7773,59 @@ class CommonTableRc extends React.Component {
let commonPopupConfig = {};
const { config, sModelsId, app, selectedRowKeys } = this.props;
if (commonUtils.isNotEmptyObject(config)) {
- const iIndex = config.gdsconfigformslave.findIndex(item => commonUtils.isNotEmptyObject(item.sControlName) && (item.sControlName.includes('BtnPopup') || item.sControlName.includes('BtnHeadPopup')) && item.bVisible && item.sDropDownType === 'popup');
+ const iIndex = config.gdsconfigformslave.findIndex(
+ item =>
+ commonUtils.isNotEmptyObject(item.sControlName) &&
+ (item.sControlName.includes("BtnPopup") || item.sControlName.includes("BtnHeadPopup")) &&
+ item.bVisible &&
+ item.sDropDownType === "popup"
+ );
if (iIndex > -1) {
commonPopupConfig = config.gdsconfigformslave[iIndex];
- if(commonPopupShowConfig?.sControlName === 'BtnPopupsAlumiteBomBillNo' || commonPopupShowConfig?.sControlName === 'BtnChooseProcess') {
+ if (commonPopupShowConfig?.sControlName === "BtnPopupsAlumiteBomBillNo" || commonPopupShowConfig?.sControlName === "BtnChooseProcess") {
commonPopupConfig = commonPopupShowConfig;
- if(commonPopupShowConfig?.sControlName === 'BtnChooseProcess') {
+ if (commonPopupShowConfig?.sControlName === "BtnChooseProcess") {
bCommonPopupProcess = true;
}
}
- commonPopupTitle = commonUtils.isNotEmptyObject(commonPopupConfig) && commonUtils.isNotEmptyObject(commonPopupConfig.sActiveName) ? commonPopupConfig.sActiveName : commonPopupTitle;
- commonPopupTitle = commonUtils.isNotEmptyObject(commonPopupRecord) ? ( commonPopupConfig.sActiveId === '1' ? commonUtils.isEmpty(commonPopupRecord.sSrcFormName) ? commonPopupTitle : commonPopupRecord.sSrcFormName : commonPopupTitle ) : commonPopupTitle;
- const sFormId = commonUtils.isNotEmptyObject(commonPopupRecord) ? ( commonPopupConfig.sActiveId === '1' ? commonUtils.isEmpty(commonPopupRecord.sFormId) ? commonPopupRecord.sSrcFormId : commonPopupRecord.sFormId : commonPopupConfig.sActiveId ) : commonPopupConfig.sActiveId;
+ commonPopupTitle =
+ commonUtils.isNotEmptyObject(commonPopupConfig) && commonUtils.isNotEmptyObject(commonPopupConfig.sActiveName)
+ ? commonPopupConfig.sActiveName
+ : commonPopupTitle;
+ commonPopupTitle = commonUtils.isNotEmptyObject(commonPopupRecord)
+ ? commonPopupConfig.sActiveId === "1"
+ ? commonUtils.isEmpty(commonPopupRecord.sSrcFormName)
+ ? commonPopupTitle
+ : commonPopupRecord.sSrcFormName
+ : commonPopupTitle
+ : commonPopupTitle;
+ const sFormId = commonUtils.isNotEmptyObject(commonPopupRecord)
+ ? commonPopupConfig.sActiveId === "1"
+ ? commonUtils.isEmpty(commonPopupRecord.sFormId)
+ ? commonPopupRecord.sSrcFormId
+ : commonPopupRecord.sFormId
+ : commonPopupConfig.sActiveId
+ : commonPopupConfig.sActiveId;
commonPopupProps = {
app: {
...this.props.app,
currentPane: {
- name: 'commonPopup',
- bEdit: (commonUtils.isNotEmptyObject(app.currentPane) && commonUtils.isNotEmptyObject(app.currentPane.route) && app.currentPane.route.includes('commonBillDeliver')),
+ name: "commonPopup",
+ bEdit:
+ commonUtils.isNotEmptyObject(app.currentPane) &&
+ commonUtils.isNotEmptyObject(app.currentPane.route) &&
+ app.currentPane.route.includes("commonBillDeliver"),
config: commonPopupConfig,
conditonValues: this.props.getSqlCondition(commonPopupConfig),
- title:commonPopupTitle,
- route: '/indexPage/commonList',
- formRoute: '/indexPage/commonList',
+ title: commonPopupTitle,
+ route: "/indexPage/commonList",
+ formRoute: "/indexPage/commonList",
formId: sFormId,
key: sModelsId + commonPopupConfig.sId,
- sModelsType: bCommonPopupProcess ? 'search/commonProcess' : 'search/commonPopup',
- select:this.handleSelectCommonPopup,
- selectCancel: this.handleSelectCancel.bind(this, 'commonPopupVisible'),
+ sModelsType: bCommonPopupProcess ? "search/commonProcess" : "search/commonPopup",
+ select: this.handleSelectCommonPopup,
+ selectCancel: this.handleSelectCancel.bind(this, "commonPopupVisible"),
},
},
dispatch: this.props.dispatch,
@@ -6770,38 +7833,57 @@ class CommonTableRc extends React.Component {
id: randomId,
onOpenNewTab: this.onOpenNewTab,
outerMasterData: this.props.masterData,
- realizeHeight: this.props.realizeHeight, /* 拖动偏移高度 */
+ realizeHeight: this.props.realizeHeight /* 拖动偏移高度 */,
};
}
/* 多列弹出窗 */
- const commonPopupIndex = config.gdsconfigformslave.findIndex(item => commonUtils.isNotEmptyObject(item.sControlName) && (item.sControlName.includes('BtnPopup') || item.sControlName.includes('BtnHeadPopup') ) && !['BtnPopup1'].includes(item.sControlName) && !item.sControlName.startsWith('BtnPopupEdit') && item.bVisible && item.sDropDownType === 'popup');
+ const commonPopupIndex = config.gdsconfigformslave.findIndex(
+ item =>
+ commonUtils.isNotEmptyObject(item.sControlName) &&
+ (item.sControlName.includes("BtnPopup") || item.sControlName.includes("BtnHeadPopup")) &&
+ !["BtnPopup1"].includes(item.sControlName) &&
+ !item.sControlName.startsWith("BtnPopupEdit") &&
+ item.bVisible &&
+ item.sDropDownType === "popup"
+ );
if (commonPopupIndex > -1) {
bCommonPopup = true;
}
/* 单列弹出窗 */
- const commonPopupIndex1 = config.gdsconfigformslave.findIndex(item => commonUtils.isNotEmptyObject(item.sControlName) && item.sControlName.includes('BtnPopup1') && item.bVisible && item.sDropDownType === 'popup');
+ const commonPopupIndex1 = config.gdsconfigformslave.findIndex(
+ item =>
+ commonUtils.isNotEmptyObject(item.sControlName) &&
+ item.sControlName.includes("BtnPopup1") &&
+ item.bVisible &&
+ item.sDropDownType === "popup"
+ );
if (commonPopupIndex1 > -1) {
bCommonPopup1 = true;
bCommonPopup = false;
}
/* commonListTree弹出窗 */
- const commonPopupIndexTree = config.gdsconfigformslave.findIndex(item => commonUtils.isNotEmptyObject(item.sControlName) && item.sControlName === 'BtnPopupListTree' && item.bVisible && item.sDropDownType === 'popup');
+ const commonPopupIndexTree = config.gdsconfigformslave.findIndex(
+ item =>
+ commonUtils.isNotEmptyObject(item.sControlName) &&
+ item.sControlName === "BtnPopupListTree" &&
+ item.bVisible &&
+ item.sDropDownType === "popup"
+ );
if (commonPopupIndexTree > -1) {
bCommonPopupTree = true;
}
-
}
}
/* 字段弹窗功能 */
let commonFieldPopupProps = {};
let bFieldPopup = true; /* 多列弹出窗 */
- let commonFieldPopupTitle = '选择弹窗';
- const commonFileDownloadTitle = '附件列表弹窗';
- const isBtnPopupEdit = this.state.commonFieldPopupShowConfig?.sControlName?.startsWith('BtnPopupEdit');
+ let commonFieldPopupTitle = "选择弹窗";
+ const commonFileDownloadTitle = "附件列表弹窗";
+ const isBtnPopupEdit = this.state.commonFieldPopupShowConfig?.sControlName?.startsWith("BtnPopupEdit");
if (commonUtils.isNotEmptyObject(this.props)) {
let commonFieldPopupConfig = {};
const { config, sModelsId } = this.props;
@@ -6811,31 +7893,37 @@ class CommonTableRc extends React.Component {
iIndex = 0;
commonFieldPopupConfig = commonFieldPopupShowConfig;
} else {
- iIndex = config.gdsconfigformslave.findIndex(item => commonUtils.isNotEmptyObject(item.sName) && (item.sDropDownType === 'popup' || item.sDropDownType === 'popupSingle'));
+ iIndex = config.gdsconfigformslave.findIndex(
+ item => commonUtils.isNotEmptyObject(item.sName) && (item.sDropDownType === "popup" || item.sDropDownType === "popupSingle")
+ );
if (iIndex > -1) {
commonFieldPopupConfig = config.gdsconfigformslave[iIndex];
}
}
if (iIndex > -1) {
- if(commonFieldPopupConfig.sDropDownType === 'popupSingle') { /* 如果下拉类型是单列弹出窗 则为单列 */
+ if (commonFieldPopupConfig.sDropDownType === "popupSingle") {
+ /* 如果下拉类型是单列弹出窗 则为单列 */
bFieldPopup = false;
}
- commonFieldPopupTitle = commonUtils.isNotEmptyObject(commonFieldPopupConfig) && commonUtils.isNotEmptyObject(commonFieldPopupConfig.sActiveName) ? commonFieldPopupConfig.sActiveName : commonFieldPopupTitle;
+ commonFieldPopupTitle =
+ commonUtils.isNotEmptyObject(commonFieldPopupConfig) && commonUtils.isNotEmptyObject(commonFieldPopupConfig.sActiveName)
+ ? commonFieldPopupConfig.sActiveName
+ : commonFieldPopupTitle;
commonFieldPopupProps = {
app: {
...this.props.app,
currentPane: {
- name: 'commonPopup',
+ name: "commonPopup",
config: commonFieldPopupConfig,
- title:commonFieldPopupTitle,
- route: '/indexPage/commonList',
- formRoute: '/indexPage/commonList',
+ title: commonFieldPopupTitle,
+ route: "/indexPage/commonList",
+ formRoute: "/indexPage/commonList",
formId: commonFieldPopupConfig.sActiveId,
key: sModelsId + commonFieldPopupConfig.sId,
- sModelsType: 'search/commonPopup',
- select:this.handleSelectCommonFieldPopup,
- selectCancel: this.handleSelectCancel.bind(this, 'commonFieldPopupVisible'),
+ sModelsType: "search/commonPopup",
+ select: this.handleSelectCommonFieldPopup,
+ selectCancel: this.handleSelectCancel.bind(this, "commonFieldPopupVisible"),
},
},
dispatch: this.props.dispatch,
@@ -6843,16 +7931,20 @@ class CommonTableRc extends React.Component {
id: randomId,
onOpenNewTab: this.onOpenNewTab,
outerMasterData: this.props.masterData,
- realizeHeight: this.props.realizeHeight, /* 拖动偏移高度 */
+ realizeHeight: this.props.realizeHeight /* 拖动偏移高度 */,
};
- if (this.props.enabled && commonFieldPopupConfig?.sControlName?.includes('popupSingle_edit')) {
- commonFieldPopupProps.app.currentPane.conditonValues = this.props.getSqlCondition(commonFieldPopupConfig, this.props.name, commonFieldPopupShowRecord);
+ if (this.props.enabled && commonFieldPopupConfig?.sControlName?.includes("popupSingle_edit")) {
+ commonFieldPopupProps.app.currentPane.conditonValues = this.props.getSqlCondition(
+ commonFieldPopupConfig,
+ this.props.name,
+ commonFieldPopupShowRecord
+ );
} else {
commonFieldPopupProps.app.currentPane.conditonValues = this.props.getSqlCondition(commonFieldPopupConfig);
}
if (isBtnPopupEdit) {
const selectData = tableProps.dataSource[this.rowClickRef.current] || {};
- const sMemoData = selectData?.[this.state.commonFieldPopupShowConfig?.sActiveKey] || '[]';
+ const sMemoData = selectData?.[this.state.commonFieldPopupShowConfig?.sActiveKey] || "[]";
commonFieldPopupProps.app.sMemoData = JSON.parse(sMemoData);
commonFieldPopupProps.app.originSlaveData = selectData;
commonFieldPopupProps.app.currentPane.bEdit = isBtnPopupEdit;
@@ -6862,33 +7954,42 @@ class CommonTableRc extends React.Component {
}
}
-
/* 蓝色链接弹Modal窗功能 */
let commonModalProps = {};
- let commonModalTitle = '查看';
+ let commonModalTitle = "查看";
if (commonUtils.isNotEmptyObject(this.props)) {
const { config, sModelsId, app, selectedRowKeys, enabled } = this.props;
if (commonUtils.isNotEmptyObject(config)) {
- commonModalTitle = commonUtils.isNotEmptyObject(commonModalShowConfig) && commonUtils.isNotEmptyObject(commonModalShowConfig.sActiveName) ? commonModalShowConfig.sActiveName : commonModalTitle;
- const sFormId = commonUtils.isNotEmptyObject(commonModalRecord) && commonUtils.isNotEmptyObject(commonModalShowConfig) ? ( commonModalShowConfig.sActiveId === '1' ? commonUtils.isEmpty(commonModalRecord.sFormId) ? commonModalRecord.sSrcFormId : commonModalRecord.sFormId : commonModalShowConfig.sActiveId ) : commonModalShowConfig?.sActiveId;
+ commonModalTitle =
+ commonUtils.isNotEmptyObject(commonModalShowConfig) && commonUtils.isNotEmptyObject(commonModalShowConfig.sActiveName)
+ ? commonModalShowConfig.sActiveName
+ : commonModalTitle;
+ const sFormId =
+ commonUtils.isNotEmptyObject(commonModalRecord) && commonUtils.isNotEmptyObject(commonModalShowConfig)
+ ? commonModalShowConfig.sActiveId === "1"
+ ? commonUtils.isEmpty(commonModalRecord.sFormId)
+ ? commonModalRecord.sSrcFormId
+ : commonModalRecord.sFormId
+ : commonModalShowConfig.sActiveId
+ : commonModalShowConfig?.sActiveId;
commonModalProps = {
app: {
...this.props.app,
currentPane: {
- name: 'commonModal',
- bEdit: commonModalShowConfig?.sName === 'dStockAuxiliaryQty'? enabled:false,
+ name: "commonModal",
+ bEdit: commonModalShowConfig?.sName === "dStockAuxiliaryQty" ? enabled : false,
config: commonModalShowConfig,
- conditonValues: commonModalShowConfig ? this.props.getSqlCondition(commonModalShowConfig, this.props.name, commonModalRecord) :{},
- title:commonModalTitle,
- route: '/indexPage/commonList',
- formRoute: '/indexPage/commonList',
+ conditonValues: commonModalShowConfig ? this.props.getSqlCondition(commonModalShowConfig, this.props.name, commonModalRecord) : {},
+ title: commonModalTitle,
+ route: "/indexPage/commonList",
+ formRoute: "/indexPage/commonList",
formId: sFormId,
key: sModelsId + commonModalShowConfig?.sId,
- sModelsType: 'search/commonPopup',
- select:this.handleSelectCommonPopup,
- selectCancel: this.handleSelectCancel.bind(this, 'commonModalVisible'),
- slaveDataSource :commonModalShowConfig?.sName === 'dStockAuxiliaryQty'? [commonModalRecord]: [],
+ sModelsType: "search/commonPopup",
+ select: this.handleSelectCommonPopup,
+ selectCancel: this.handleSelectCancel.bind(this, "commonModalVisible"),
+ slaveDataSource: commonModalShowConfig?.sName === "dStockAuxiliaryQty" ? [commonModalRecord] : [],
},
},
dispatch: this.props.dispatch,
@@ -6896,30 +7997,29 @@ class CommonTableRc extends React.Component {
id: randomId,
onOpenNewTab: this.onOpenNewTab,
outerMasterData: this.props.masterData,
- realizeHeight: this.props.realizeHeight, /* 拖动偏移高度 */
- bEdit:commonModalShowConfig?.sName === 'dAvailableAuxiliaryQty'? enabled:false
+ realizeHeight: this.props.realizeHeight /* 拖动偏移高度 */,
+ bEdit: commonModalShowConfig?.sName === "dAvailableAuxiliaryQty" ? enabled : false,
};
// if(commonModalShowConfig?.sName === 'dSumCompleteAvailableStockQty' ){
// commonModalProps.data = commonModalData;
// }
-
}
}
-
/* 表格可展开明细 */
- let slaveTableProps = '';
- let expandedRow = '';
- if (this.props.setExpandedRowRender !== undefined && this.props.setExpandedRowRender.toString() === 'Y') {
+ let slaveTableProps = "";
+ let expandedRow = "";
+ if (this.props.setExpandedRowRender !== undefined && this.props.setExpandedRowRender.toString() === "Y") {
slaveTableProps = this.getSlaveTableProps();
- expandedRow = (record) => {
+ expandedRow = record => {
let filterData = 0;
- let columns = '';
+ let columns = "";
let planLoading = false;
- if (this.props.name === 'slave' || location.pathname === '/indexPage/commonCostomTabBill') { /* 过滤嵌套表 */
+ if (this.props.name === "slave" || location.pathname === "/indexPage/commonCostomTabBill") {
+ /* 过滤嵌套表 */
/* 获取loading 加载状态 */
const planLoadingSate = this.props.slaveInfo.tableProps.planLoadingSate;
- const planCurrentId = commonUtils.isNotEmptyObject(planLoadingSate) ? planLoadingSate.sId : '';
+ const planCurrentId = commonUtils.isNotEmptyObject(planLoadingSate) ? planLoadingSate.sId : "";
if (record[this.rowKey] === planCurrentId) {
planLoading = planLoadingSate.planLoading;
}
@@ -6928,26 +8028,32 @@ class CommonTableRc extends React.Component {
columns = this.state.tableInfoColumn;
const GetChildFilterData = this.props.onTableFilterData;
if (GetChildFilterData !== undefined) {
- const slaveInfoData = this.props.onTableFilterData('slave', AllData, record);
+ const slaveInfoData = this.props.onTableFilterData("slave", AllData, record);
if (commonUtils.isNotEmptyArr(slaveInfoData) && slaveInfoData.length > 0) {
filterData = slaveInfoData;
}
}
}
return (
-
- {sName}{ i + 1 === itemLength ? '' : {
- const { handleCheckBoxStatus } = this.props;
- typeof handleCheckBoxStatus === 'function' && handleCheckBoxStatus(e.target.checked, column?.dataIndex, this.props.name)
- }}
- />
- {column?.title}
-
+ return (
+ <>
+ {
+ const { handleCheckBoxStatus } = this.props;
+ typeof handleCheckBoxStatus === "function" && handleCheckBoxStatus(e.target.checked, column?.dataIndex, this.props.name);
+ }}
+ />
+ {column?.title}
+
+ );
}
- }
+ };
/** 获取table的表头信息(主要是table中的表头信息合并,[{title:1-1},{title:1-2}]变成[{title:1,children:[{title:1},{title:2}]}]) type：是否过滤 */
getTableColumn = (headerColumn, type, props) => {
// this.hasMergeHeader = false;
// 判断是否是表单详情
- const isSlaveInfo = props.name === 'slaveInfo' ||
- (
- location.pathname === '/indexPage/commonCostomTabBill' &&
+ const isSlaveInfo =
+ props.name === "slaveInfo" ||
+ (location.pathname === "/indexPage/commonCostomTabBill" &&
props.name &&
- props.name.includes('Info') &&
- commonUtils.isNotEmptyObject(this.props.slaveInfo)
- );
+ props.name.includes("Info") &&
+ commonUtils.isNotEmptyObject(this.props.slaveInfo));
const config = isSlaveInfo ? this.props.slaveInfo.config : this.props.config;
- const isSlaveInfoM = isSlaveInfo && commonUtils.isNotEmptyObject(config) ? config.showName === '工单物资评审' : false;
+ const isSlaveInfoM = isSlaveInfo && commonUtils.isNotEmptyObject(config) ? config.showName === "工单物资评审" : false;
/* 返回值声明 */
const tableColumn = [];
let iIndex = 0;
- const specialRoute = commonUtils.isNotEmptyObject(this.props.app.currentPane) ? this.props.app.currentPane.route : ''; /* 获取路由名称 */
+ const specialRoute = commonUtils.isNotEmptyObject(this.props.app.currentPane) ? this.props.app.currentPane.route : ""; /* 获取路由名称 */
/* 遍历每一个表头标题 */
for (const column of headerColumn) {
/* 表头标题 */
@@ -2656,44 +2979,65 @@ class CommonTableRc extends React.Component {
const width = column.width;
const bNotEmpty = column.bNotEmpty;
/* 带'-'的表头是需要合并滴 */
- const index = commonUtils.isNotEmptyObject(title) ? title.indexOf('-') : -1;
+ const index = commonUtils.isNotEmptyObject(title) ? title.indexOf("-") : -1;
/* 合并走合并的,不合并就直接push */
let columnNew = {};
let sorter;
let search = true;
- if (props.tableProps !== undefined && props.tableProps.rowKey !== undefined && props.tableProps.rowKey !== 'sId' && !props.tableProps.sortSelf) {
+ if (
+ props.tableProps !== undefined &&
+ props.tableProps.rowKey !== undefined &&
+ props.tableProps.rowKey !== "sId" &&
+ !props.tableProps.sortSelf
+ ) {
sorter = true;
} else {
const firstDataIndex = column.dataIndex.substring(0, 1);
- if (firstDataIndex === 'd' || firstDataIndex === 'i') {
- sorter = (a, b) => ((commonUtils.isEmpty(a[column.dataIndex]) ? 0 : a[column.dataIndex]) - (commonUtils.isEmpty(b[column.dataIndex]) ? 0 : b[column.dataIndex]));
- } else if (firstDataIndex === 't') {
- sorter = (a, b) => (moment(commonUtils.isEmpty(a[column.dataIndex]) ? '2000-01-01' : a[column.dataIndex]).diff(moment(commonUtils.isEmpty(b[column.dataIndex]) ? '2000-01-01' : b[column.dataIndex])));
+ if (firstDataIndex === "d" || firstDataIndex === "i") {
+ sorter = (a, b) =>
+ (commonUtils.isEmpty(a[column.dataIndex]) ? 0 : a[column.dataIndex]) -
+ (commonUtils.isEmpty(b[column.dataIndex]) ? 0 : b[column.dataIndex]);
+ } else if (firstDataIndex === "t") {
+ sorter = (a, b) =>
+ moment(commonUtils.isEmpty(a[column.dataIndex]) ? "2000-01-01" : a[column.dataIndex]).diff(
+ moment(commonUtils.isEmpty(b[column.dataIndex]) ? "2000-01-01" : b[column.dataIndex])
+ );
} else {
- sorter = (a, b) => ((commonUtils.isEmpty(a[column.dataIndex]) ? '0' : a[column.dataIndex]).localeCompare((commonUtils.isEmpty(b[column.dataIndex]) ? '1' : b[column.dataIndex])));
+ sorter = (a, b) =>
+ (commonUtils.isEmpty(a[column.dataIndex]) ? "0" : a[column.dataIndex]).localeCompare(
+ commonUtils.isEmpty(b[column.dataIndex]) ? "1" : b[column.dataIndex]
+ );
}
}
/* 工单、工艺卡、报价单 去掉排序 */
- if (this.props.name === 'sParam' || specialRoute.includes('workOrder') || specialRoute.includes('processCard') || specialRoute.includes('quotation')) {
+ if (
+ this.props.name === "sParam" ||
+ specialRoute.includes("workOrder") ||
+ specialRoute.includes("processCard") ||
+ specialRoute.includes("quotation")
+ ) {
sorter = false;
}
/* 默认字段是排序的 通过配置bNotSort来设置字段不排序 */
if (config && commonUtils.isNotEmptyStr(config.gdsconfigformslave.filter(item => item.sName === column.dataIndex))) {
- if(config.gdsconfigformslave.filter(item => item.sName === column.dataIndex).length > 0 && config.gdsconfigformslave.filter(item => item.sName === column.dataIndex)[0].bNotSort){
+ if (
+ config.gdsconfigformslave.filter(item => item.sName === column.dataIndex).length > 0 &&
+ config.gdsconfigformslave.filter(item => item.sName === column.dataIndex)[0].bNotSort
+ ) {
sorter = false;
}
}
if (config && commonUtils.isNotEmptyStr(config.gdsconfigformslave.filter(item => item.sName === column.dataIndex))) {
- if(config.gdsconfigformslave.filter(item => item.sName === column.dataIndex)[0].bNotSearch){
+ if (config.gdsconfigformslave.filter(item => item.sName === column.dataIndex)[0].bNotSearch) {
search = false;
}
}
if (column.dataIndex === "spicture" || column.dataIndex === "tableLastEmpty") {
sorter = false;
}
- let sTitleBgColor =commonUtils.isNotEmptyObject(column.sTitleBgColor) ? column.sTitleBgColor : ''; /* 标题背景颜色 */
- let sTitleColor =commonUtils.isNotEmptyObject(column.sTitleColor) ? column.sTitleColor : ''; /* 标题字体颜色 */
+ let sTitleBgColor = commonUtils.isNotEmptyObject(column.sTitleBgColor) ? column.sTitleBgColor : ""; /* 标题背景颜色 */
+ let sTitleColor = commonUtils.isNotEmptyObject(column.sTitleColor) ? column.sTitleColor : ""; /* 标题字体颜色 */
const styleObj = {};
if (commonUtils.isNotEmptyObject(sTitleBgColor)) {
styleObj.background = sTitleBgColor;
@@ -2703,7 +3047,7 @@ class CommonTableRc extends React.Component {
}
const renderTitle = () => {
// 树形表格在第一个column上加上全部展开/收起功能
- let expandedAllIcon = '';
+ let expandedAllIcon = "";
const columnIndex = headerColumn.findIndex(item => column.title === item.title);
let { data } = this.props;
let { expKeys } = this.state;
@@ -2712,41 +3056,45 @@ class CommonTableRc extends React.Component {
data = commonUtils.isNotEmptyArr(data) ? data : [];
const childrenList = [];
- const getChildrenList = (data) => {
+ const getChildrenList = data => {
data.forEach(item => {
- if (item && typeof item.children === 'object') {
+ if (item && typeof item.children === "object") {
childrenList.push(item);
getChildrenList(item.children);
}
});
- }
+ };
getChildrenList(data);
- if (columnIndex === 0 && childrenList.length) { // 第一个column并且数据中有children
+ if (columnIndex === 0 && childrenList.length) {
+ // 第一个column并且数据中有children
this.showExpAll = true;
this.tableCollapsed = !expKeys.length;
- const marginLeft = this.props.bMutiSelect ? '6px' : '2px';
+ const marginLeft = this.props.bMutiSelect ? "6px" : "2px";
expandedAllIcon = (
+ );
+ } else {
+ res = (
+
+ {sName}
+ {i + 1 === itemLength ? "" :
);
- })
+ });
return (
- {
- return
+ whiteSpace: "nowrap",
+ width: "auto",
+ maxWidth: "100%",
+ height: "29px",
+ overflow: "hidden",
+ lineHeight: "29px",
+ textOverflow: "ellipsis",
+ }}
+ >
+ {
+ return
);
}
@@ -1879,16 +2177,16 @@ class CommonTableRc extends React.Component {
}
let bPagination = true; /* 默认表格分页s */
if (commonUtils.isNotEmptyObject(this.props)) {
- bPagination = (commonUtils.isNotEmptyObject(this.props.tableProps) && commonUtils.isNotEmptyObject(this.props.tableProps.pagination));
+ bPagination = commonUtils.isNotEmptyObject(this.props.tableProps) && commonUtils.isNotEmptyObject(this.props.tableProps.pagination);
}
let noVlistController = false;
- if(this.props.config && this.props.config.gdsconfigformslave.filter(item => item.sControlName === 'bNoVlist')[0]) {
+ if (this.props.config && this.props.config.gdsconfigformslave.filter(item => item.sControlName === "bNoVlist")[0]) {
noVlistController = true;
}
/* 特殊情况的表格 在虚拟列表情况 会无法滑动 */
let noVlistTable = false;
- if(this.props.noVlistTable) {
+ if (this.props.noVlistTable) {
noVlistTable = true;
}
// 判断是否有合并单元格, 有的话默认关闭虚拟滚动
@@ -1909,22 +2207,26 @@ class CommonTableRc extends React.Component {
const { tableClassName } = this.state;
const oTable = document.querySelectorAll(`.${tableClassName}`)[0];
if (oTable) {
- const oBody = oTable.querySelector('.ant-table-body');
+ const oBody = oTable.querySelector(".ant-table-body");
oBody && (oBody.scrollTop = 0);
}
window.vlistNewSearh = null;
- this.Vcomponents = VListNew({height: this.scrollY, vid: this.uniqueId, onScroll: () => {
- setTimeout(() => {
- let divs = document.getElementsByClassName('noInputInsert');
- if (divs.length) {
- Array.prototype.forEach.call(divs, item => {
- item.parentNode.parentNode.parentNode.parentNode.classList.add('insertTd');
- });
- }
- }, 20);
- }});
+ this.Vcomponents = VListNew({
+ height: this.scrollY,
+ vid: this.uniqueId,
+ onScroll: () => {
+ setTimeout(() => {
+ let divs = document.getElementsByClassName("noInputInsert");
+ if (divs.length) {
+ Array.prototype.forEach.call(divs, item => {
+ item.parentNode.parentNode.parentNode.parentNode.classList.add("insertTd");
+ });
+ }
+ }, 20);
+ },
+ });
}
- components = {...this.Vcomponents, ...components};
+ components = { ...this.Vcomponents, ...components };
} else {
// vid是多个列表在同个页面中，同时渲染会促发问题
// vid不可以为随机数，随机数会导致双击时，点击的两个VList id不同
@@ -1935,46 +2237,51 @@ class CommonTableRc extends React.Component {
const { tableClassName } = this.state;
const oTable = document.querySelectorAll(`.${tableClassName}`)[0];
if (oTable) {
- const oBody = oTable.querySelector('.ant-table-body');
+ const oBody = oTable.querySelector(".ant-table-body");
oBody && (oBody.scrollTop = 0);
}
window.vlistNewSearh = null;
- this.Vcomponents1 = VList({ height: this.scrollY, vid: this.uniqueId, rowKey: this.rowKey, onScroll: () => {
- setTimeout(() => {
- let divs = document.getElementsByClassName('noInputInsert');
- if (divs.length) {
- Array.prototype.forEach.call(divs, item => {
- item.parentNode.parentNode.parentNode.parentNode.classList.add('insertTd');
- });
- }
- }, 20);
- } });
+ this.Vcomponents1 = VList({
+ height: this.scrollY,
+ vid: this.uniqueId,
+ rowKey: this.rowKey,
+ onScroll: () => {
+ setTimeout(() => {
+ let divs = document.getElementsByClassName("noInputInsert");
+ if (divs.length) {
+ Array.prototype.forEach.call(divs, item => {
+ item.parentNode.parentNode.parentNode.parentNode.classList.add("insertTd");
+ });
+ }
+ }, 20);
+ },
+ });
}
components = { ...this.Vcomponents1, ...components };
}
}
if (this.props.config && this.props.config.iFreezeColumn) {
tableColumn.forEach((val, index) => {
- if(tableColumn[index].fixedHelp) {
+ if (tableColumn[index].fixedHelp) {
tableColumn[index].fixed = false;
tableColumn[index].fixedHelp = false;
}
if (index < this.props.config.iFreezeColumn) {
- tableColumn[index].fixed = 'left';
+ tableColumn[index].fixed = "left";
tableColumn[index].fixedHelp = true;
}
});
}
// 处理拖拽排序
if (this.props.dragHandle) {
- const handleSortTitle = commonFunc.showMessage(this.props.app.commonConst, 'sort') || '排序' ;
- const handleSort = tableColumn.filter(item => item.dataIndex === 'handleSort').length;
+ const handleSortTitle = commonFunc.showMessage(this.props.app.commonConst, "sort") || "排序";
+ const handleSort = tableColumn.filter(item => item.dataIndex === "handleSort").length;
if (tableColumn[0]) {
function arrayMoveMutable(array, fromIndex, toIndex) {
const startIndex = fromIndex < 0 ? array.length + fromIndex : fromIndex;
if (startIndex >= 0 && startIndex < array.length) {
const endIndex = toIndex < 0 ? array.length + toIndex : toIndex;
- if(commonUtils.isNotEmptyObject(array[fromIndex].sWorkOrderUsed)) {
+ if (commonUtils.isNotEmptyObject(array[fromIndex].sWorkOrderUsed)) {
message.error(array[fromIndex].sWorkOrderUsed);
return;
}
@@ -1987,7 +2294,7 @@ class CommonTableRc extends React.Component {
arrayMoveMutable(array, fromIndex, toIndex);
return array;
}
- const DragHandle = sortableHandle(() => {content}
- }}>
- {content}
- {content}
;
+ }}
+ >
+ {content}
+
+ {(commonUtils.isNotEmptyObject(sName) && sName.substring(0, 1) === "b") || imgBox !== "" ? (
+ ""
+ ) : (
+ {sValue}}
+ >
+ this.onKeyDownDiv(e, sName)}
+ onCut={e => e.preventDefault()}
+ onPaste={e => e.preventDefault()}
+ suppressContentEditableWarning
+ contentEditable="true"
+ onClick={
+ commonUtils.isNotEmptyObject(linkStyle)
+ ? this.handleViewClick.bind(this, isSlaveInfo ? "slaveInfo" : this.props.name, showConfig.sName, record, index, showConfig)
+ : null
+ }
+ >
+ {" "}
+ {sValue}
+
+
+ )}
+ {bShow}
+ {imgBox}
+ {this.handleGetFastSearchBtn({ record, sName, isSlaveInfo })}
+
+ );
}
const cell = this.mergeTableCell(res, idx, sName, isSlaveInfo);
return cell;
- } else if ( commonUtils.isNotEmptyObject(showConfigObj) && !showConfigObj.bReadonly && (props.enabled || showConfigObj.iTag === 3 )
- && commonUtils.isEmptyObject(record.sDivRowNew) && (commonUtils.isNotEmptyArr(props.selectedRowKeys)
- && props.selectedRowKeys.toString().includes(record.sId) || props.name === 'sParam'
- || ( props.name ==='slaveInfo' && commonUtils.isNotEmptyArr(props.selectedRowKeys) && props.selectedRowKeys.toString().includes(record.sSlaveId) && showConfigObj.iTag === 3 ))
- || (this.getShowTypeProps(props, text, record, sName)?.enabled && record.sId === this.state.currentHoverSid)
- || (false && location.pathname.includes('productionScheduleTree') && this.getShowTypeProps(props, text, record, sName)?.enabled && record.sId === props.rowHoverSid)
- || (props.rootType === 'list' && props.selectedRowKeys.toString().includes(record.sSlaveId))) {
- res = (* {childTitleContent}
;
+ childTitle = (
+
+ * {childTitleContent}
+
+ );
} else {
childTitle = {childTitleContent}
;
}
return childTitle;
- }
+ };
/* 把原有表头都替换成子表头 */
column.title = renderTitle();
@@ -6269,15 +7299,17 @@ class CommonTableRc extends React.Component {
// 父表头已添加但是不是连续的
const bPrevObj = commonUtils.isNotEmptyObject(lastParentObj) && lastTableColumn.title != lastParentObj.title;
/* [{title:1-1},{title:1-2}]变成[{title:1,children:[{title:1},{title:2}]}] */
- if (commonUtils.isEmptyObject(lastParentObj) || bPrevObj) { /* 父表头未添加 */
+ if (commonUtils.isEmptyObject(lastParentObj) || bPrevObj) {
+ /* 父表头未添加 */
tableColumn.push({
title: parentTitle,
children: [column],
});
- } else { /* 父表头已添加 */
+ } else {
+ /* 父表头已添加 */
lastParentObj.children.push(column);
}
- }
+ };
/** 合并单元格 */
mergeTableCell = (text, index, sName, isSlaveInfo) => {
@@ -6287,7 +7319,7 @@ class CommonTableRc extends React.Component {
};
if (isSlaveInfo) {
if (this.mergeInfoCellStateMap && this.mergeInfoCellListMap && this.mergeInfoCellStateMap[sName] && this.mergeInfoCellListMap[sName]) {
- this.mergeInfoCellListMap[sName].forEach((item) => {
+ this.mergeInfoCellListMap[sName].forEach(item => {
item.forEach((item2, idx) => {
if (idx === 0) {
if (index === item2) {
@@ -6303,7 +7335,7 @@ class CommonTableRc extends React.Component {
});
}
} else if (this.mergeCellStateMap && this.mergeCellListMap && this.mergeCellStateMap[sName] && this.mergeCellListMap[sName]) {
- this.mergeCellListMap[sName].forEach((item) => {
+ this.mergeCellListMap[sName].forEach(item => {
item.forEach((item2, idx) => {
if (idx === 0) {
if (index === item2) {
@@ -6311,17 +7343,17 @@ class CommonTableRc extends React.Component {
}
} else if (index === item2) {
obj.props.rowSpan = item.length + 1 - idx;
- obj.props.className = 'vlist-td-display vlist-td-display1 ' + obj.props.rowSpan;
+ obj.props.className = "vlist-td-display vlist-td-display1 " + obj.props.rowSpan;
}
if (index === item[item.length - 1] + 1) {
obj.props.rowSpan = 1;
- obj.props.className = 'vlist-td-display vlist-td-display2 ' + obj.props.rowSpan;
+ obj.props.className = "vlist-td-display vlist-td-display2 " + obj.props.rowSpan;
}
});
});
}
return obj;
- }
+ };
/** 处理选择行发生改变 */
handleSelectRowChange = (name, selectedRowKeys, bCheckBoxClick) => {
@@ -6343,7 +7375,7 @@ class CommonTableRc extends React.Component {
}
/* 初始值为37(那个checkbox的宽度) */
const rowSelection = isInfo ? this.props.slaveInfo.tableProps.rowSelection : this.props.tableProps.rowSelection;
- let scrollX = (rowSelection === null || rowSelection == undefined) ? 0 : 37;
+ let scrollX = rowSelection === null || rowSelection == undefined ? 0 : 37;
/* 遍历每一个表头配置 */
for (const each of headerColumn) {
/* 没给宽度的默认120宽度 */
@@ -6351,7 +7383,7 @@ class CommonTableRc extends React.Component {
let iWidth = 120;
if (each.width) {
iWidth = parseFloat(each.width);
- } else if (each.dataIndex === 'tableLastEmpty') {
+ } else if (each.dataIndex === "tableLastEmpty") {
iWidth = 0;
}
/* 累加宽度 */
@@ -6367,7 +7399,7 @@ class CommonTableRc extends React.Component {
/* 计算操作行宽度 */
countOperate = () => {
let operateWidth = 0;
- if (this.props.setOpterationColumn === 'Y') {
+ if (this.props.setOpterationColumn === "Y") {
const setNoCommonOperate = this.props.tableProps.setNoCommonOperate; /* 没有默认的增加删除按钮 */
if (this.isAddShow) {
operateWidth += 40;
@@ -6395,22 +7427,22 @@ class CommonTableRc extends React.Component {
}
}
return operateWidth;
- }
+ };
/** 关闭弹窗 */
- handleModalCancel = (modelVisible) => {
+ handleModalCancel = modelVisible => {
this.setState({
[modelVisible]: false,
});
// this.props.onModalCancel();
};
// 获取进度条颜色
- handleGetStrokeColor = (percent) => {
+ handleGetStrokeColor = percent => {
if (percent < 30) {
- return '#F50';
+ return "#F50";
} else if (percent >= 30 && percent < 90) {
- return '#FF9900';
+ return "#FF9900";
} else {
- return '#87D068';
+ return "#87D068";
}
};
/** 上传文件改变时的状态 */
@@ -6418,33 +7450,31 @@ class CommonTableRc extends React.Component {
const { status, percent } = info.file;
if (status === undefined) return;
const percentNew = Number(percent.toFixed(2));
- if (['done', 'error'].includes(status)) {
+ if (["done", "error"].includes(status)) {
message.open({
- type: status === 'done' ? 'success' : 'error',
- content: status === 'done' ? '文件上传成功' : '文件上传失败',
- duration: 3
+ type: status === "done" ? "success" : "error",
+ content: status === "done" ? "文件上传成功" : "文件上传失败",
+ duration: 3,
});
} else {
message.open({
- key: 'xlyupload',
- type: percent === 100 ? 'success' : 'loading',
+ key: "xlyupload",
+ type: percent === 100 ? "success" : "loading",
content: (
<>
上传进度:
-
+
),
- duration: percent === 100 ? 3 : 0
+ duration: percent === 100 ? 3 : 0,
});
}
onUploadChange(info, this.props.name);
};
/** 上传前的校验 */
- handleBeforeUpload = (file) => {
+ handleBeforeUpload = file => {
if (this.props.uploadFileTypeVerification) {
return this.props.onBeforeUpload(file);
} else {
@@ -6452,66 +7482,68 @@ class CommonTableRc extends React.Component {
}
};
// 通过右键粘贴板导入文件
- handleUploadByClipboard = (event) => {
+ handleUploadByClipboard = event => {
const files = event.clipboardData.files;
- this.uploadRef.setAttribute('contenteditable', "false");
- this.uploadRef1.setAttribute('contenteditable', "false");
+ this.uploadRef.setAttribute("contenteditable", "false");
+ this.uploadRef1.setAttribute("contenteditable", "false");
if (commonUtils.isNotEmptyArr(files)) {
const file = files[0];
const formData = new FormData();
- formData.append('file', file);
+ formData.append("file", file);
const { formId } = this.props;
const { token } = this.props.app;
const url = `${commonConfig.file_host}file/upload?sModelsId=${formId}&token=${token}`;
fetch(url, {
- method: 'POST',
+ method: "POST",
body: formData,
- }).then(res => res.json()).then(response => {
- const info = { file: { name: file.name, size: file.size, type: file.type, response } };
- this.handleUploadChange(info);
})
+ .then(res => res.json())
+ .then(response => {
+ const info = { file: { name: file.name, size: file.size, type: file.type, response } };
+ this.handleUploadChange(info);
+ });
} else {
- message.warning('请确认复制的内容是文件类型！');
+ message.warning("请确认复制的内容是文件类型！");
}
};
- handleGetFastSearchBtn = ({record, sName, isSlaveInfo}) => {
- if (isSlaveInfo || !sName.startsWith('s') || this.props.name !== 'slave') {
- return '';
+ handleGetFastSearchBtn = ({ record, sName, isSlaveInfo }) => {
+ if (isSlaveInfo || !sName.startsWith("s") || this.props.name !== "slave") {
+ return "";
}
const iIndex = this.props.config.gdsconfigformslave.findIndex(item => item.sName === sName);
if (iIndex === -1) {
- return '';
+ return "";
}
const config = this.props.config.gdsconfigformslave[iIndex];
if (!config.bFind) {
- return '';
+ return "";
}
const { masterData, searchRowKeys } = this.props;
if (commonUtils.isEmptyObject(masterData) || commonUtils.isEmptyArr(searchRowKeys)) {
- return '';
+ return "";
}
const masterDataKeys = Object.keys(masterData);
let bInSearch = false;
- let oldKey = '';
+ let oldKey = "";
if (commonUtils.isNotEmptyArr(searchRowKeys)) {
for (let i = 0; i < masterDataKeys.length; i++) {
const keyName = masterDataKeys[i];
- if (!keyName.startsWith('sFirst-')) {
+ if (!keyName.startsWith("sFirst-")) {
continue;
}
const sFirstValue = masterData[keyName];
if (sFirstValue !== sName) {
continue;
}
- const key = keyName.substring('sFirst-'.length, keyName.length);
+ const key = keyName.substring("sFirst-".length, keyName.length);
if (!searchRowKeys.includes(key)) {
continue;
}
oldKey = key;
- const firstDataIndex = commonUtils.isEmpty(sFirstValue) ? 's' : sFirstValue.substring(0, 1);
+ const firstDataIndex = commonUtils.isEmpty(sFirstValue) ? "s" : sFirstValue.substring(0, 1);
const sThirdName = `${firstDataIndex}Third-${key}`;
const sThirdValue = masterData[sThirdName];
if (sThirdValue === record[sName]) {
@@ -6536,24 +7568,28 @@ class CommonTableRc extends React.Component {
{bInSearch ?
-
-
{ this.myInfoDiv = ref; }}>
+
+
+
+
-
{
+ this.myInfoDiv = ref;
+ }}
+ >
@@ -6959,7 +8065,7 @@ class CommonTableRc extends React.Component {
if (commonUtils.isNotEmptyArr(tableProps.columns)) {
const lastColumn = tableProps.columns[tableProps.columns.length - 1];
- if (lastColumn.title && typeof lastColumn.title === 'string' && lastColumn.title.indexOf('-') === -1) {
+ if (lastColumn.title && typeof lastColumn.title === "string" && lastColumn.title.indexOf("-") === -1) {
lastColumn.width && delete lastColumn.width;
}
}
@@ -6972,7 +8078,7 @@ class CommonTableRc extends React.Component {
bFullUrl: false,
onCancel: () => {
this.setState({ officePreviewVisible: false });
- }
+ },
};
let layoutScrollY;
@@ -6985,260 +8091,335 @@ class CommonTableRc extends React.Component {
layoutScrollY = this.props.fixedHeight;
}
let bShowBtnUpload = true;
- if(commonUtils.isNotEmptyObject(this.props.masterData) && commonUtils.isNotEmptyObject(this.props.masterData.sZczlxShowName)) {
- bShowBtnUpload = this.props.masterData.sZczlxShowName !== '删除' && this.props.masterData.sZczlxShowName !== '恢复';
+ if (commonUtils.isNotEmptyObject(this.props.masterData) && commonUtils.isNotEmptyObject(this.props.masterData.sZczlxShowName)) {
+ bShowBtnUpload = this.props.masterData.sZczlxShowName !== "删除" && this.props.masterData.sZczlxShowName !== "恢复";
}
const hasColorInfo = this.props?.masterConfig?.sTableColorTs;
const BtnUpload = commonFunc.showLocalMessage(this.props, "BtnUpload", "上传");
+ // 强制转换iorder
+ // tableProps.dataSource = tableProps.dataSource.sort((a, b) => {
+ // const hasA = a.hasOwnProperty("sName") && a.sName != null;
+ // const hasB = b.hasOwnProperty("sName") && b.sName != null;
+ // if (hasA && !hasB) return -1;
+ // if (!hasA && hasB) return 1;
+
+ // // 2. bVisible 为 true 的在前
+ // const visA = a.bVisible === true;
+ // const visB = b.bVisible === true;
+ // if (visA && !visB) return -1;
+ // if (!visA && visB) return 1;
+
+ // // 3. 最后按 iOrder 升序
+ // return a.iOrder - b.iOrder;
+ // });
+ const list = tableProps.dataSource?.filter(x => x.sName);
+
+ list.forEach((item, index) => {
+ if (item.iOrders === undefined || item.iOrders === null) {
+ // item.iOrder = (index + 1) * 10;
+ item.iOrders = item.iOrder;
+ item.isSettingFunctions = true;
+ }
+ });
+ let newTableProps = cloneDeep(tableProps);
+ // 强制转换展示iOrder
+ if (this.props.isSettingFunctions) {
+ newTableProps.dataSource = newTableProps.dataSource.map((item, index) => {
+ item.iOrder = (index + 1) * 10;
+ item.iOrders = tableProps.dataSource[index].iOrder;
+ item.isSettingFunctions = true;
+ return item;
+ });
+ }
+ // 排序
return (
-
- {
- this.props.name === 'picFile' || (commonUtils.isNotEmptyObject(this.props.name) && this.props.name.indexOf('file') > -1) ||
- (this.props.name.startsWith('slave') && this.findIsUpdByControlName(this.props, 'BtnUpload') && bShowBtnUpload ) ?
-
-
-
- : null }
+ {this.props.name === "picFile" ||
+ (commonUtils.isNotEmptyObject(this.props.name) && this.props.name.indexOf("file") > -1) ||
+ (this.props.name.startsWith("slave") && this.findIsUpdByControlName(this.props, "BtnUpload") && bShowBtnUpload) ? (
+
+
+
+ ) : null}
{
+ className={`xlyCommonTable ${tableClassName} ${this.hasSpanBgColor ? "tableNoPadding" : ""} ${this.props.enabled ? "tableEnabled" : ""}`}
+ style={{ height: isSmall ? "calc(100% - 44px)" : "" }}
+ ref={ref => {
this.mydiv = ref;
if (this.mydiv) {
this.computedTdWidth();
- if (false && commonUtils.isNotEmptyObject(location.pathname) && location.pathname.includes('commonListTab')) {
- this.mydiv.getElementsByClassName('ant-table-body')[0].style.height = this.tableHeight ? this.tableHeight + 'px': 80 + 'px';
+ if (false && commonUtils.isNotEmptyObject(location.pathname) && location.pathname.includes("commonListTab")) {
+ this.mydiv.getElementsByClassName("ant-table-body")[0].style.height = this.tableHeight ? this.tableHeight + "px" : 80 + "px";
}
if (layoutScrollY) {
- this.mydiv.getElementsByClassName('ant-table-body')[0].style.height = typeof layoutScrollY === 'number' ? layoutScrollY + 'px' : layoutScrollY;
+ this.mydiv.getElementsByClassName("ant-table-body")[0].style.height =
+ typeof layoutScrollY === "number" ? layoutScrollY + "px" : layoutScrollY;
}
}
}}
id={`table_${this.props.formId}_${this.props.config?.sId}`}
>
- {
- this.isDragAndDrop ?
-
-
- :
-
+
+
+ ) : (
+ this.colorInfo = e}>
- (this.colorInfo = e)}>
+ {this.onChange({ current: page, pageSize })}}
- /> }
+ {tableProps.pagination && (
+ {
+ this.onChange({ current: page, pageSize });
+ }}
+ />
+ )}
- }
-
+ )}
- {
- previewVisible ?
-
-
-
- }
+ {this.isDragAndDrop ? (
+
+
+
+ )}
- { hasColorInfo &&
-
- {/* 图片正常的列表显示 */}
-
+
+ ) : (
+ ""
+ )}
+ {commonPopupVisible ? (
- {bCommonPopup ?
+ {bCommonPopup ? (
- : ''
- }
- {
- commonFieldPopupVisible ?
-
- {[''].map(() => {
- if (commonFieldPopupShowConfig.sControlName?.includes("popupSingle")) {
- if (this.props.enabled && commonFieldPopupShowConfig.sControlName?.includes("edit")) {
- commonFieldPopupProps.editable = true;
- }
- return
+ {[""].map(() => {
+ if (commonFieldPopupShowConfig.sControlName?.includes("popupSingle")) {
+ if (this.props.enabled && commonFieldPopupShowConfig.sControlName?.includes("edit")) {
+ commonFieldPopupProps.editable = true;
}
- })}
-
- : ''
- }
+ return
+ ) : (
+ ""
+ )}
- {
- commonModalVisible ?
-
-
- : ''
- }
+ {commonModalVisible ? (
+
+
+ ) : (
+ ""
+ )}
- {
- commonFileDownloadVisible ?
- {
- const newList = [...commonFileDownloadList];
- const checkState = newList.find(item => !item.checked);
- newList.forEach(item => item.checked = checkState);
- this.setState({
- commonFileDownloadList: newList
- })
- }
- }>全选/取消全选,
- ,
+ ,
- ,
- ]}
- >
-
+ ) : (
+ ""
+ )}
+ {pdfFileVisible ? (
+ {
+ this.setState({
+ pdfFileVisible: false,
+ });
+ }}
+ >
+
+ ) : (
+ ""
+ )}
+ {bOperateMoreVisible ? (
+ {
+ this.setState({
+ bOperateMoreVisible: false,
+ });
+ }}
+ >
+
+ ) : (
+ ""
+ )}
this.setState({ simpleModalVisible: false, simpleModalWord: '' })}
- >
-
- }
+ {this.state.simpleModalVisible && (
+ this.setState({ simpleModalVisible: false, simpleModalWord: "" })}
+ >
+
+
+ )}
);
}
}
-const CommonTable = (props) => {
+const CommonTable = props => {
const { name, data = [] } = props;
const [headerColumn, setHeaderColumn] = useState([]);
const addState = {};
- if (name !== 'master') {
+ if (name !== "master") {
const config = props.onMergeSlaveConfig && props.onMergeSlaveConfig(props.config);
if (commonUtils.isNotEmptyObject(config)) {
addState.config = config;
@@ -7340,7 +8536,7 @@ const CommonTable = (props) => {
}, [JSON.stringify(data)]);
if (props.defaultExpandAllRows !== undefined && props.data === undefined) {
- return '';
+ return "";
}
const handleMoveLine = ({ index, direction }) => {
@@ -7359,11 +8555,11 @@ const CommonTable = (props) => {
data[indexNew].iOrder = iOrder1;
const tempItem = data[index];
- data[index] = {...data[indexNew], handleType: data[indexNew].handleType || "update"};
- data[indexNew] = {...tempItem, handleType: tempItem.handleType || "update"};
+ data[index] = { ...data[indexNew], handleType: data[indexNew].handleType || "update" };
+ data[indexNew] = { ...tempItem, handleType: tempItem.handleType || "update" };
props.onSaveState({
- [`${props.name}Data`]: data
+ [`${props.name}Data`]: data,
});
};
@@ -7375,15 +8571,15 @@ const CommonTable = (props) => {
delete props.tableProps.AutoTableHeight;
}
}
- const setTempFixedHeight = (height) => {
+ const setTempFixedHeight = height => {
sessionStorage.setItem(`${props.formId}_${props.config.sId}_tableHeight`, height);
window.vlistNewSearh = true;
setUpdateRowNumTime(pre => pre + 1);
- }
+ };
const uniqueTableId = `table_${props.formId}_${props.config?.sId}`;
return (
-
+
@@ -7393,12 +8589,12 @@ const CommonTable = (props) => {
const handleSetIRowNum = (data, props) => {
data.forEach((item, index) => {
item.iRowNum = index + 1;
- if (['12710101117007068710620'].includes(props?.app?.currentPane?.formId)) {
+ if (["12710101117007068710620"].includes(props?.app?.currentPane?.formId)) {
item.sVersionNum = item.iRowNum.toString().padStart(2, 0);
}
// 排除成品盘点、材料盘点（数据太多，循环页面卡死）
- if (props.name === 'slaveChild' && !['192116810113315264733417750', '192116810113315228128521360'].includes(props?.app?.currentPane?.formId)) {
+ if (props.name === "slaveChild" && !["192116810113315264733417750", "192116810113315228128521360"].includes(props?.app?.currentPane?.formId)) {
/* 序号根据sSqlConditonId分组 序号重排 */
const groupedData = commonUtils.groupBy(data, item => item.sSqlConditionId);
if (commonUtils.isNotEmptyObject(groupedData)) {
@@ -7407,28 +8603,26 @@ const handleSetIRowNum = (data, props) => {
if (commonUtils.isNotEmptyArr(eachData)) {
eachData.forEach((item, index) => {
/* 采购 */
- item.iRowNum = index +1;
+ item.iRowNum = index + 1;
const iIndex = data.findIndex(row => row.sId === item.sId);
- if(iIndex > -1) {
- data[iIndex] ={...data[iIndex], iRowNum: index +1}
+ if (iIndex > -1) {
+ data[iIndex] = { ...data[iIndex], iRowNum: index + 1 };
}
-
});
}
}
}
}
- if(location.pathname !== '/indexPage/commonClassify'){
+ if (location.pathname !== "/indexPage/commonClassify") {
if (commonUtils.isNotEmptyArr(item.children)) {
handleSetIRowNum(item.children, props);
}
}
});
-}
-
-const MoveLineComponent = (props) => {
+};
- if (!location.pathname.includes('commonSubBill')) {
+const MoveLineComponent = props => {
+ if (!location.pathname.includes("commonSubBill")) {
return "";
}
@@ -7443,28 +8637,28 @@ const MoveLineComponent = (props) => {
const initialBottom = position.bottom;
const initialY = e.clientY;
- const moveHandler = (moveEvent) => {
+ const moveHandler = moveEvent => {
const newY = moveEvent.clientY;
const newBottom = initialBottom - (newY - initialY);
setPosition({ bottom: newBottom });
};
const upHandler = () => {
- const preHeight = document.querySelector(`#${props.uniqueTableId}`).querySelector('.ant-table-body').getBoundingClientRect().height;
+ const preHeight = document.querySelector(`#${props.uniqueTableId}`).querySelector(".ant-table-body").getBoundingClientRect().height;
props.setTempFixedHeight(Math.max(preHeight - positionRef.current.bottom, 37));
setPosition({ bottom: 0 });
document.body.onselectstart = () => true;
- document.removeEventListener('mousemove', moveHandler);
- document.removeEventListener('mouseup', upHandler);
+ document.removeEventListener("mousemove", moveHandler);
+ document.removeEventListener("mouseup", upHandler);
};
document.body.onselectstart = () => false;
- document.addEventListener('mousemove', moveHandler);
- document.addEventListener('mouseup', upHandler);
- }
+ document.addEventListener("mousemove", moveHandler);
+ document.addEventListener("mouseup", upHandler);
+ },
};
return ;
-}
+};
export default CommonTable;
diff --git a/src/components/Common/commonBusiness.js b/src/components/Common/commonBusiness.js
index f9ab8c7..b6b4c2a 100644
--- a/src/components/Common/commonBusiness.js
+++ b/src/components/Common/commonBusiness.js
@@ -225,7 +225,6 @@ export async function saveData(param) {
token, value, sModelsId, baseSuccessFn,
} = param;
const { optName, data = [] } = value;
-
// 表单修改或删除时候，主表加上修改人（sUpdatePerson）和修改时间（tUpdate）
const masterDataIndex = data.findIndex(item => item.name === 'master' && commonUtils.isNotEmptyArr(item.column));
if (masterDataIndex !== -1 && data[masterDataIndex].column[0].handleType !== 'add') {
--
libgit2 0.22.2
- {commonUtils.isNotEmptyArr(data) ? data.map((item, i) => {
- return (
- // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
- 
this.showimg(i)}
- key={item}
- />
- );
- }) : ''}
-
- {/* 引入的image组件s */}
-
+ {/* 图片正常的列表显示 */}
+
+
+ {commonUtils.isNotEmptyArr(data)
+ ? data.map((item, i) => {
+ return (
+ // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
+ this.showimg(i)} key={item} />
+ );
+ })
+ : ""}
-
- : ''
- }{
- commonPopupVisible ?
+ {/* 引入的image组件s */}
+ {
- commonFileDownloadList.map(item => {
- const { url, checked } = item;
- const fileName = url.split('/').pop().split('_').pop();
- const fileType = fileName.split('.').pop().toLowerCase();
- const previewFileList = ['jpg', 'png', 'jepg', 'webp', 'svg', 'bmp', 'apng', 'pdf'];
- return (
-
-
+ );
+ })}
+
+
- {
- if (sessionStorage.previewFlag) {
- sessionStorage.removeItem('previewFlag');
- } else {
- const newList = [...commonFileDownloadList];
- newList.find(item => item.url === url).checked = e.target.checked;
- this.setState({
- commonFileDownloadList: newList
- })
- }
- }}
- >
- {
+ }}
+ >
+ 下载选中
+ ,
+ ,
+ ]}
+ >
+ {
- this.setState({
- pdfFileVisible: false
- });
- }}
- >
- : ''
- }
- {
- bOperateMoreVisible ?
- {
- this.setState({
- bOperateMoreVisible: false
- });
- }}
- >
- : ''
- }
+ }}
+ title="预览"
+ >
+
+
+
+ {commonFileDownloadList.map(item => {
+ const { url, checked } = item;
+ const fileName = url.split("/").pop().split("_").pop();
+ const fileType = fileName.split(".").pop().toLowerCase();
+ const previewFileList = ["jpg", "png", "jepg", "webp", "svg", "bmp", "apng", "pdf"];
+ return (
+
+
- )
- })
- }
-
- : ''
- }
- {
- pdfFileVisible ?
-
+ {
+ if (sessionStorage.previewFlag) {
+ sessionStorage.removeItem("previewFlag");
+ } else {
+ const newList = [...commonFileDownloadList];
+ newList.find(item => item.url === url).checked = e.target.checked;
+ this.setState({
+ commonFileDownloadList: newList,
+ });
+ }
+ }}
+ >
+ {
sessionStorage.previewFlag = 1;
- if (fileType === 'pdf') {
+ if (fileType === "pdf") {
this.setState({
pdfFileVisible: true,
pdfFileUrl: url,
@@ -7246,80 +8427,95 @@ class CommonTableRc extends React.Component {
} else {
this.handlePreviewImage(e, [url]);
}
- }} title="预览">
-
-
-
-
-
-
-
+
+
+
+
+