{"白粉青蓝橙绿黄红".split("").map((item, index) => {
@@ -11463,33 +8910,22 @@ class CommonTableRc extends React.Component {
{
- this.props.onDataChange(
- this.props.name,
- "sLabelColor",
- { sLabelColor: item },
- labelColorModalRecord.sId
- );
+ this.props.onDataChange(this.props.name, "sLabelColor", { sLabelColor: item }, labelColorModalRecord.sId);
this.setState(
{
- labelColorModalVisible: false
+ labelColorModalVisible: false,
},
() => {
const { showName, sOnChangeInstruct } =
- this.props.config.gdsconfigformslave.find(
- item => item.sName === "sLabelColor"
- ) || {};
- const sInstruct = commonUtils.convertStrToObj(
- sOnChangeInstruct,
- {}
- );
- const instructType =
- sInstruct.change || sInstruct.blur;
+ this.props.config.gdsconfigformslave.find(item => item.sName === "sLabelColor") || {};
+ const sInstruct = commonUtils.convertStrToObj(sOnChangeInstruct, {});
+ const instructType = sInstruct.change || sInstruct.blur;
if (this.props.parentProps.onExecInstructSet) {
this.props.parentProps.onExecInstructSet({
btnConfig: {
sInstruct: JSON.stringify(instructType),
- showName: `${showName}-选中`
- }
+ showName: `${showName}-选中`,
+ },
});
}
}
@@ -11514,8 +8950,7 @@ class CommonTableRc extends React.Component {
const useCommonTableEvent = props => {
const { data = [] } = props;
let addState = {};
- const config =
- props.onMergeTableConfig && props.onMergeTableConfig(props.config);
+ const config = props.onMergeTableConfig && props.onMergeTableConfig(props.config);
if (commonUtils.isNotEmptyObject(config)) {
addState.config = config;
addState.headerColumn = commonFunc.getHeaderConfig(config);
@@ -11526,22 +8961,12 @@ const useCommonTableEvent = props => {
const allTableData = commonFunc.getAllTableData(parentProps);
// 当前页面所有选中数据(为空时默认获取第一条)
- const [
- allTableSelectedData,
- allTableSelectedOneData,
- allTableSelectedOneNoDefaultData
- ] = Object.keys(allTableData).reduce(
+ const [allTableSelectedData, allTableSelectedOneData, allTableSelectedOneNoDefaultData] = Object.keys(allTableData).reduce(
([result, result1, result2], tableName) => {
let tableData = allTableData[tableName] || [];
tableData = Array.isArray(tableData) ? tableData : [tableData];
- const {
- [`${tableName}SelectedRowKeys`]: selectedRowKeys = []
- } = parentProps;
- let filterData = tableData.filter(
- item =>
- selectedRowKeys.includes(item.sSlaveId) ||
- selectedRowKeys.includes(item.sId)
- );
+ const { [`${tableName}SelectedRowKeys`]: selectedRowKeys = [] } = parentProps;
+ let filterData = tableData.filter(item => selectedRowKeys.includes(item.sSlaveId) || selectedRowKeys.includes(item.sId));
let bEmptyLine = false;
if (!filterData.length && tableData.length) {
bEmptyLine = true;
@@ -11549,17 +8974,17 @@ const useCommonTableEvent = props => {
}
result = {
...result,
- [tableName]: filterData
+ [tableName]: filterData,
};
result1 = {
...result1,
- [tableName]: filterData[0] || {}
+ [tableName]: filterData[0] || {},
};
result2 = {
...result2,
- [tableName]: bEmptyLine ? {} : filterData[0] || {}
+ [tableName]: bEmptyLine ? {} : filterData[0] || {},
};
return [result, result1, result2];
@@ -11568,23 +8993,15 @@ const useCommonTableEvent = props => {
);
const getBtnDisabled = params => {
- const {
- str,
- record: recordOld,
- defaultValue = false,
- noDefaultRow = false
- } = params;
- const bFirstOne =
- props.data?.findIndex(item => item.sId === recordOld.sId) === 0;
- const bLastOne =
- props.data?.findIndex(item => item.sId === recordOld.sId) ===
- props.data?.length - 1;
+ const { str, record: recordOld, defaultValue = false, noDefaultRow = false } = params;
+ const bFirstOne = props.data?.findIndex(item => item.sId === recordOld.sId) === 0;
+ const bLastOne = props.data?.findIndex(item => item.sId === recordOld.sId) === props.data?.length - 1;
const globalData = commonUtils.getAppData("globalData");
const commonData = {
userinfo: commonUtils.getAppData("userinfo"),
currentSelectedMachineTask: globalData.currentSelectedMachineTask,
currentStartWorkMachineTask: globalData.currentStartWorkMachineTask,
- currentWorkOrderInfo: globalData.currentWorkOrderInfo
+ currentWorkOrderInfo: globalData.currentWorkOrderInfo,
};
const record = { ...recordOld, bFirstOne, bLastOne };
@@ -11594,17 +9011,11 @@ const useCommonTableEvent = props => {
let strNew = str;
let tempData = {
- ...(noDefaultRow
- ? allTableSelectedOneNoDefaultData
- : allTableSelectedOneData),
+ ...(noDefaultRow ? allTableSelectedOneNoDefaultData : allTableSelectedOneData),
...commonData,
[name]: record,
currentRecord: record,
- userface:
- props.parentProps &&
- commonUtils.isNotEmptyArr(props.parentProps.userfaceData)
- ? props.parentProps.userfaceData[0]
- : {}
+ userface: props.parentProps && commonUtils.isNotEmptyArr(props.parentProps.userfaceData) ? props.parentProps.userfaceData[0] : {},
};
const allTableNew = {};
@@ -11612,32 +9023,19 @@ const useCommonTableEvent = props => {
if (str.includes("@")) {
for (const datasetOld of str.split("@")) {
if (!(datasetOld == str.split("@")[str.split("@").length - 1])) {
- const datasetName = datasetOld.split("(")[
- datasetOld.split("(").length - 1
- ];
+ const datasetName = datasetOld.split("(")[datasetOld.split("(").length - 1];
if (!allTableNew[datasetName]) {
- allTableNew[datasetName] =
- parentProps[datasetName + "Data"] || [];
+ allTableNew[datasetName] = parentProps[datasetName + "Data"] || [];
}
}
}
- const [
- allTableSelectedData,
- allTableSelectedOneData,
- allTableSelectedOneNoDefaultData
- ] = Object.keys(allTableNew).reduce(
+ const [allTableSelectedData, allTableSelectedOneData, allTableSelectedOneNoDefaultData] = Object.keys(allTableNew).reduce(
([result, result1, result2], tableName) => {
let tableData = allTableNew[tableName] || [];
tableData = Array.isArray(tableData) ? tableData : [tableData];
- const {
- [`${tableName}SelectedRowKeys`]: selectedRowKeys = []
- } = parentProps;
- let filterData = tableData.filter(
- item =>
- selectedRowKeys.includes(item.sSlaveId) ||
- selectedRowKeys.includes(item.sId)
- );
+ const { [`${tableName}SelectedRowKeys`]: selectedRowKeys = [] } = parentProps;
+ let filterData = tableData.filter(item => selectedRowKeys.includes(item.sSlaveId) || selectedRowKeys.includes(item.sId));
let bEmptyLine = false;
if (!filterData.length && tableData.length) {
bEmptyLine = true;
@@ -11645,17 +9043,17 @@ const useCommonTableEvent = props => {
}
result = {
...result,
- [tableName]: filterData
+ [tableName]: filterData,
};
result1 = {
...result1,
- [tableName]: filterData[0] || {}
+ [tableName]: filterData[0] || {},
};
result2 = {
...result2,
- [tableName]: bEmptyLine ? {} : filterData[0] || {}
+ [tableName]: bEmptyLine ? {} : filterData[0] || {},
};
return [result, result1, result2];
@@ -11665,9 +9063,7 @@ const useCommonTableEvent = props => {
tempData = {
...tempData,
- ...(noDefaultRow
- ? allTableSelectedOneNoDefaultData
- : allTableSelectedOneData)
+ ...(noDefaultRow ? allTableSelectedOneNoDefaultData : allTableSelectedOneData),
};
}
@@ -11675,9 +9071,7 @@ const useCommonTableEvent = props => {
const { parentProps = {} } = props;
if (commonUtils.isNotEmptyArr(parentProps.palletBatchMaterialData)) {
const iIndex = parentProps.palletBatchMaterialData.findIndex(
- item =>
- item.sMaterialsId === record.sMaterialsId &&
- item.sDefineNo === record.sDefineNo
+ item => item.sMaterialsId === record.sMaterialsId && item.sDefineNo === record.sDefineNo
);
return iIndex > -1;
}
@@ -11697,7 +9091,7 @@ const useCommonTableEvent = props => {
strNew,
tempData,
str,
- error
+ error,
});
}
}
@@ -11729,17 +9123,23 @@ const useCommonTableEvent = props => {
// 指令巡检/工艺巡检时,新增数据默认打勾
useGetXunjianDefaultData({
...props,
- ...xunjianParams
+ ...xunjianParams,
});
addState = { ...addState, ...xunjianParams };
+ // 工艺参数特殊处理
+ const gycsPrams = useGetGycsParams(props);
+ useGetGycsDefaultData({
+ ...props,
+ ...gycsPrams,
+ });
+ addState = { ...addState, ...gycsPrams };
+
// 选择版材按钮
const choosePlate = () => {
if (props.name !== "plateInfo") return "";
- const btnConfig = props.config?.gdsconfigformslave?.find(
- item => item.sControlName === "choosePlate"
- );
+ const btnConfig = props.config?.gdsconfigformslave?.find(item => item.sControlName === "choosePlate");
if (!btnConfig) return "";
const { showName } = btnConfig;
@@ -11750,7 +9150,7 @@ const useCommonTableEvent = props => {
size="large"
onClick={() => {
props.parentProps.onExecInstructSet({
- btnConfig
+ btnConfig,
});
}}
>
@@ -11791,21 +9191,14 @@ const useCommonTableEvent = props => {
if (keyCode === 37 && columnIndex > 0 && cursortPosition < 1) {
// 左移 则 列下标必须大于0, 且光标在最左侧
const lastId = `${tableColumn[columnIndex - 1].dataIndex}${record.sId}`;
- if (!commonUtils.focus(lastId))
- move(keyCode, cursortPosition, columnIndex - 1); // 递归
+ if (!commonUtils.focus(lastId)) move(keyCode, cursortPosition, columnIndex - 1); // 递归
}
if (keyCode === 39 && columnIndex < tableColumn.length - 1) {
// 右移 则 列下标必须小于列数量-1
- if (
- !record[sName] ||
- cursortPosition >= record[sName].toString().length
- ) {
+ if (!record[sName] || cursortPosition >= record[sName].toString().length) {
// 当前列为空 或 光标位置不小于当前值的长度
- const nextId = `${tableColumn[columnIndex + 1].dataIndex}${
- record.sId
- }`;
- if (!commonUtils.focus(nextId))
- move(keyCode, cursortPosition, columnIndex + 1); // 递归
+ const nextId = `${tableColumn[columnIndex + 1].dataIndex}${record.sId}`;
+ if (!commonUtils.focus(nextId)) move(keyCode, cursortPosition, columnIndex + 1); // 递归
}
}
};
@@ -11834,9 +9227,7 @@ const useCommonTableEvent = props => {
const currentElement = document.getElementById(`${sName}${record.sId}`); // 当前编辑框对象
if (currentElement) {
const cursortPosition = commonUtils.getCursortPosition(currentElement); // 光标位置
- const columnIndex = tableColumn.findIndex(
- item => item.dataIndex === sName
- ); // 当前列下标
+ const columnIndex = tableColumn.findIndex(item => item.dataIndex === sName); // 当前列下标
move(e.keyCode, cursortPosition, columnIndex);
}
}
@@ -11864,29 +9255,23 @@ const useCommonTableEvent = props => {
data[indexNew].handleType = data[indexNew].handleType || "update";
props.onSaveState({
- [`${props.name}Data`]: data
+ [`${props.name}Data`]: data,
});
};
function getDecimalPlaces(num) {
const match = num.toString().match(/(?:\.(\d+))?(?:[eE]([+-]?\d+))?$/);
if (!match) return 0;
- let decimalPlaces = Math.max(
- 0,
- (match[1] ? match[1].length : 0) - (match[2] ? +match[2] : 0)
- );
+ let decimalPlaces = Math.max(0, (match[1] ? match[1].length : 0) - (match[2] ? +match[2] : 0));
return decimalPlaces;
}
if (
- (["12710101117087404588200", "12710101117260270570210"].includes(
- props.formId
- ) &&
- props.name === "table0") ||
+ (["12710101117087404588200", "12710101117260270570210"].includes(props.formId) && props.name === "table0") ||
(props.formId === "12710101117087371044360" && props.name === "slave0")
) {
addState.getTotalDiv = () => {
- const { dWageHour, dTimeHour, dProcessQty, dReportQtySum } = data.reduce(
+ const { dWageHour, dTimeHour, dProcessQty } = data.reduce(
(pre, item) => {
if (item.dWageHour) {
pre.dWageHour += item.dWageHour;
@@ -11897,40 +9282,29 @@ const useCommonTableEvent = props => {
if (item.dProcessQty) {
pre.dProcessQty += item.dProcessQty;
}
- if (item.dReportQtySum && item.sPlcMachineStatus !== "waitingWork") {
- pre.dReportQtySum += item.dReportQtySum;
- }
return pre;
},
{
dWageHour: 0,
dTimeHour: 0,
dProcessQty: 0,
- dReportQtySum: 0
}
);
return (
已报合计
-
计件工时:
+ {/*
计件工时:
{dWageHour}
计时工时:
-
{dTimeHour}
+
{dTimeHour}
*/}
报工产量:
{dProcessQty}
-
托盘产量:
-
{dReportQtySum}
);
};
}
- if (
- ["12710101117087404588200", "12710101117260270570210"].includes(
- props.formId
- ) &&
- props.name === "tableS1"
- ) {
+ if (["12710101117087404588200", "12710101117260270570210"].includes(props.formId) && props.name === "tableS1") {
const { headerColumn = [] } = { ...props, ...addState };
if (headerColumn.find(item => item.dataIndex === "dProductionCount")) {
addState.getTotalDiv = () => {
@@ -11938,16 +9312,13 @@ const useCommonTableEvent = props => {
(pre, item) => {
if (item.dProductionCount) {
pre.dProductionCount += item.dProductionCount;
- pre.maxDigits = Math.max(
- pre.maxDigits,
- getDecimalPlaces(item.dProductionCount)
- );
+ pre.maxDigits = Math.max(pre.maxDigits, getDecimalPlaces(item.dProductionCount));
}
return pre;
},
{
dProductionCount: 0,
- maxDigits: 0
+ maxDigits: 0,
}
);
@@ -11955,9 +9326,7 @@ const useCommonTableEvent = props => {
合计
成品数量(万套):
-
- {commonUtils.convertFixNum(dProductionCount, maxDigits)}
-
+
{commonUtils.convertFixNum(dProductionCount, maxDigits)}
);
};
@@ -11970,16 +9339,13 @@ const useCommonTableEvent = props => {
(pre, item) => {
if (item.dProcessCalQty) {
pre.dProcessCalQty += item.dProcessCalQty;
- pre.maxDigits = Math.max(
- pre.maxDigits,
- getDecimalPlaces(item.dProcessCalQty)
- );
+ pre.maxDigits = Math.max(pre.maxDigits, getDecimalPlaces(item.dProcessCalQty));
}
return pre;
},
{
dProcessCalQty: 0,
- maxDigits: 0
+ maxDigits: 0,
}
);
@@ -11987,9 +9353,7 @@ const useCommonTableEvent = props => {
合计
上报数量:
-
- {commonUtils.convertFixNum(dProcessCalQty, maxDigits)}
-
+
{commonUtils.convertFixNum(dProcessCalQty, maxDigits)}
);
};
@@ -12011,12 +9375,12 @@ const useCommonTableEvent = props => {
overflow: "auto",
border: "1px solid #AAA",
padding: 10,
- marginLeft: -35
+ marginLeft: -35,
}}
dangerouslySetInnerHTML={{ __html: htmlString }}
/>
),
- okText: "关闭"
+ okText: "关闭",
});
};
@@ -12030,15 +9394,12 @@ const useCommonTableEvent = props => {
onCopyToNextLine: handleCopyToNextLine,
onKeyDown: hanldeKeyDown,
onMoveLine: handleMoveLine,
- onShowSimpleModal: handleShowSimpleModal
+ onShowSimpleModal: handleShowSimpleModal,
};
};
const CommonTable = baseProps => {
- if (
- baseProps.defaultExpandAllRows !== undefined &&
- baseProps.data === undefined
- ) {
+ if (baseProps.defaultExpandAllRows !== undefined && baseProps.data === undefined) {
return "";
}
@@ -12057,17 +9418,14 @@ const handleSetIRowNum = data => {
const handleSetCheckboxDisabled = props => {
const { config, data = [] } = props;
- const checkboxDisabled = config?.gdsconfigformslave?.find(
- item =>
- item.bVisible && item.sControlName?.toLowerCase() === "checkboxdisabled"
- );
+ const checkboxDisabled = config?.gdsconfigformslave?.find(item => item.bVisible && item.sControlName?.toLowerCase() === "checkboxdisabled");
if (checkboxDisabled) {
const { sDefault } = checkboxDisabled;
data.forEach(item => {
item.checkboxDisabled = !props.getBtnDisabled({
str: sDefault,
record: item,
- defaultValue: true
+ defaultValue: true,
});
});
}
@@ -12078,9 +9436,7 @@ const handleSetCostomEnabledList = (props, data) => {
if (!data?.length) return;
const { gdsconfigformslave = [] } = props?.config || {};
- const cellEnabledCondition = gdsconfigformslave.find(
- item => item.sControlName === "cellEnabledCondition" && item.bVisible
- );
+ const cellEnabledCondition = gdsconfigformslave.find(item => item.sControlName === "cellEnabledCondition" && item.bVisible);
if (!cellEnabledCondition) return;
const { sDefault } = cellEnabledCondition;
@@ -12092,7 +9448,7 @@ const handleSetCostomEnabledList = (props, data) => {
userinfo: commonUtils.getAppData("userinfo"),
currentSelectedMachineTask: globalData.currentSelectedMachineTask,
currentStartWorkMachineTask: globalData.currentStartWorkMachineTask,
- currentWorkOrderInfo: globalData.currentWorkOrderInfo
+ currentWorkOrderInfo: globalData.currentWorkOrderInfo,
};
const list = sDefault.split(",,");
@@ -12107,11 +9463,7 @@ const handleSetCostomEnabledList = (props, data) => {
...props.allTableSelectedOneData,
currentName,
currentRecord: record,
- userface:
- props.parentProps &&
- commonUtils.isNotEmptyArr(props.parentProps.userfaceData)
- ? props.parentProps.userfaceData[0]
- : {}
+ userface: props.parentProps && commonUtils.isNotEmptyArr(props.parentProps.userfaceData) ? props.parentProps.userfaceData[0] : {},
};
list.forEach(str => {
@@ -12133,7 +9485,7 @@ const handleSetCostomEnabledList = (props, data) => {
tempData,
strNew,
str,
- error
+ error,
});
}
});
@@ -12149,33 +9501,18 @@ const useGetTableBtnOprSetting = props => {
let result = {};
const { config = {} } = props;
const { gdsconfigformslave = [] } = config;
- const btnTableOprConfig =
- gdsconfigformslave.find(
- item => item.sControlName?.toLowerCase() === "btntableopr"
- ) || {};
+ const btnTableOprConfig = gdsconfigformslave.find(item => item.sControlName?.toLowerCase() === "btntableopr") || {};
let { sDefault = "" } = btnTableOprConfig;
- const btnTableDelConfig =
- gdsconfigformslave.find(
- item => item.sControlName?.toLowerCase() === "btntabledel"
- ) || {};
+ const btnTableDelConfig = gdsconfigformslave.find(item => item.sControlName?.toLowerCase() === "btntabledel") || {};
- if (
- commonUtils.isNotEmptyObject(btnTableDelConfig) &&
- !sDefault?.includes("del")
- ) {
+ if (commonUtils.isNotEmptyObject(btnTableDelConfig) && !sDefault?.includes("del")) {
sDefault = sDefault ? `${sDefault},del` : "del";
}
- const btnTableAddConfig =
- gdsconfigformslave.find(
- item => item.sControlName?.toLowerCase() === "btntableadd"
- ) || {};
+ const btnTableAddConfig = gdsconfigformslave.find(item => item.sControlName?.toLowerCase() === "btntableadd") || {};
- if (
- commonUtils.isNotEmptyObject(btnTableAddConfig) &&
- !sDefault?.includes("add")
- ) {
+ if (commonUtils.isNotEmptyObject(btnTableAddConfig) && !sDefault?.includes("add")) {
sDefault = sDefault ? `${sDefault},add` : "add";
}
@@ -12227,7 +9564,7 @@ const useGetTableBtnOprSetting = props => {
const disabled = props.getBtnDisabled({
str,
defaultValue: false,
- record: {}
+ record: {},
});
return (
@@ -12240,10 +9577,8 @@ const useGetTableBtnOprSetting = props => {
props.onMesTableLineAdd &&
props.onMesTableLineAdd({
...params,
- callback: props.bAddFirst
- ? scrollToTop(params.tableClassName)
- : scrollToBottom(params.tableClassName),
- bAddFirst: props.bAddFirst
+ callback: props.bAddFirst ? scrollToTop(params.tableClassName) : scrollToBottom(params.tableClassName),
+ bAddFirst: props.bAddFirst,
});
}}
/>
@@ -12256,7 +9591,7 @@ const useGetTableBtnOprSetting = props => {
const disabled = props.getBtnDisabled({
str,
defaultValue: false,
- record
+ record,
});
return (