From 79ee33de653db7cf93d2cd14cfbd0322631dc102 Mon Sep 17 00:00:00 2001 From: pengm <674192343@qq.com> Date: Tue, 2 Jun 2026 11:22:37 +0800 Subject: [PATCH] 1.产前提醒按照设定完成功能 --- src/mes/scheduledTasks/prenatalReminderInfo1/index.js | 247 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ src/mes/scheduledTasks/prenatalReminderInfo1/index.less | 13 +++---------- 2 files changed, 76 insertions(+), 184 deletions(-) diff --git a/src/mes/scheduledTasks/prenatalReminderInfo1/index.js b/src/mes/scheduledTasks/prenatalReminderInfo1/index.js index a849c97..1426ad4 100644 --- a/src/mes/scheduledTasks/prenatalReminderInfo1/index.js +++ b/src/mes/scheduledTasks/prenatalReminderInfo1/index.js @@ -1,16 +1,14 @@ import React, { useEffect } from "react"; import * as commonUtils from "@/utils/utils"; import useCommonBase from "@/components/Common/CommonHooks/useCommonBase"; - import ShowType from "@/components/Common/CommonComponent"; - import styles from "./index.less"; -const usePrenatalReminderInfoEvent = props => { - const { formData } = props; +const usePrenatalReminderInfoEvent = function(props) { + const formData = props.formData; useEffect( - async () => { + async function() { if (commonUtils.isNotEmptyArr(formData)) { const result = await handleGetData(formData[0]); const result1 = await handleGetData(formData[1], 1); @@ -29,20 +27,18 @@ const usePrenatalReminderInfoEvent = props => { [formData] ); - // 获取数据集 - const handleGetData = async (config, index = "") => { - const { app } = props; - const { userinfo = {} } = app; - const globalData = commonUtils.convertStrToObj( - localStorage.xlybusinessglobalData - ); - const { sWorkshopId } = userinfo; - const { currentSelectedMachineTaskDataRow = {} } = globalData; - const { sOrderId } = currentSelectedMachineTaskDataRow; + const handleGetData = async function(config, index) { + if (index === undefined) index = ""; + const app = props.app; + const userinfo = app.userinfo || {}; + const globalData = commonUtils.convertStrToObj(localStorage.xlybusinessglobalData); + const sWorkshopId = userinfo.sWorkshopId; + const currentSelectedMachineTaskDataRow = globalData.currentSelectedMachineTaskDataRow || {}; + const sOrderId = currentSelectedMachineTaskDataRow.sOrderId; const conditonValues = props.onGetSqlConditionValues(config); const addState = (await props.onGetDataSet({ - name: `slave${index}`, + name: "slave" + index, configData: config, condition: { sSqlCondition: { @@ -56,17 +52,19 @@ const usePrenatalReminderInfoEvent = props => { return addState; }; - return { - ...props - }; + return { ...props }; }; -const PrenatalReminderInfo = baseProps => { +const PrenatalReminderInfo = function(baseProps) { const props = usePrenatalReminderInfoEvent(useCommonBase(baseProps)); - const { bFinish } = props; + const bFinish = props.bFinish; if (!bFinish) return ""; - const { app, slaveData, slave1Data, slave2Data, slaveConfig, slave1Config, slave2Config } = props; + const app = props.app; + const slaveData = props.slaveData; + const slave1Data = props.slave1Data; + const slave2Data = props.slave2Data; + const slaveConfig = props.slaveConfig; const viewRow1 = commonUtils.isNotEmptyArr(slaveData) ? slaveData[0] : {}; const viewRow2 = commonUtils.isNotEmptyArr(slave1Data) ? slave1Data[0] : {}; @@ -74,159 +72,60 @@ const PrenatalReminderInfo = baseProps => { const viewRow = { ...viewRow1, ...viewRow2, ...viewRow3 }; const tableName = "slave"; - const memoListFilter = - slaveConfig?.gdsconfigformslave - .filter(item => item.sControlName?.includes("_")); - console.log('memoListFilter', memoListFilter, slave2Config?.gdsconfigformslave, slaveConfig, slave1Config, slave2Config); - - const leftSize = Math.ceil(memoListFilter.length / 2); - const rightSize = memoListFilter.length - leftSize; - const leftMemoList = memoListFilter.slice(0, leftSize); - const rightMemoList = memoListFilter.slice(leftSize, memoListFilter.length); - - return ( -
- {[ - "技术评审汇签", - "客户投诉", - "本批生产注意事项", - "不合格报告", - "车间产前提醒" - ].map((title, index) => { - let dataValueNew = ""; - const child = { - sId: commonUtils.createSid(), - sName: `sTempMemo${index}`, - sControlName: "", - bVisible: true, - showName: title - }; - - const memoList = new Array(20) - .fill("") - .map((_, i) => viewRow[`sNoteMemo${i + 1}`]); - - const getMemoValue = (from, to) => { - const tempList = memoList - .slice(from, to) - .filter(item => item !== undefined) - .map((item, i) => `${i + 1}) ${item}`); - return tempList.join("\n"); - }; - - if (title === "客户投诉") { - dataValueNew = getMemoValue(0, 4); - } else if (title === "不合格报告") { - dataValueNew = getMemoValue(4, 8); - } else if (title === "车间产前提醒") { - dataValueNew = viewRow.sMemo; - } else if (title === "本批生产注意事项") { - dataValueNew = getMemoValue(16, 20); - } else if (title === "技术评审汇签") { - const dataValue1 = leftMemoList - .map( - ({ sName, showName }) => `${showName}：${viewRow[sName] || ""}` - ) - .join("\n"); - - const dataValue2 = rightMemoList - .map( - ({ sName, showName }) => `${showName}：${viewRow[sName] || ""}` - ) - .join("\n"); - const showTypeProps1 = { - app, - className: styles.showType, - iColValue: 24, - name: tableName, - record: viewRow, - sId: commonUtils.createSid(), - getSqlDropDownData: props.getSqlDropDownData, - getSqlCondition: props.getSqlCondition, - handleSqlDropDownNewRecord: props.handleSqlDropDownNewRecord, - getFloatNum: props.getFloatNum, - onChange: props.onDataChange, - showConfig: { ...child, costomStyle: styles.hideRightBorder }, - slaveConfig: props[`${tableName}Config`], - formItemLayout: { labelCol: { span: 0 }, wrapperCol: { span: 24 } }, - textArea: true, - enabled: false, - dataValue: dataValue1, - bTable: true, - bViewTable: true, - formRoute: props.formRoute, - getDateFormat: props.getDateFormat - }; - - const showTypeProps2 = { - app, - className: styles.showType, - iColValue: 24, - name: tableName, - record: viewRow, - sId: commonUtils.createSid(), - getSqlDropDownData: props.getSqlDropDownData, - getSqlCondition: props.getSqlCondition, - handleSqlDropDownNewRecord: props.handleSqlDropDownNewRecord, - getFloatNum: props.getFloatNum, - onChange: props.onDataChange, - showConfig: { ...child, costomStyle: styles.hideLeftBorder }, - slaveConfig: props[`${tableName}Config`], - formItemLayout: { labelCol: { span: 0 }, wrapperCol: { span: 24 } }, - textArea: true, - enabled: false, - dataValue: dataValue2, - bTable: true, - bViewTable: true, - formRoute: props.formRoute, - getDateFormat: props.getDateFormat - }; - - return ( -
-
{title}
-
- - -
-
- ); - } - const showTypeProps = { - app, - className: styles.showType, - iColValue: 24, - name: tableName, - record: viewRow, - sId: commonUtils.createSid(), - getSqlDropDownData: props.getSqlDropDownData, - getSqlCondition: props.getSqlCondition, - handleSqlDropDownNewRecord: props.handleSqlDropDownNewRecord, - getFloatNum: props.getFloatNum, - onChange: props.onDataChange, - showConfig: child, - slaveConfig: props[`${tableName}Config`], - formItemLayout: { labelCol: { span: 0 }, wrapperCol: { span: 24 } }, - textArea: true, - enabled: false, - dataValue: dataValueNew, - bTable: true, - bViewTable: true, - formRoute: props.formRoute, - getDateFormat: props.getDateFormat - }; + const gdsconfigformslave = slaveConfig ? (slaveConfig.gdsconfigformslave || []) : []; + const memoListFilter = gdsconfigformslave.filter(function(item) { + return item && item.sControlName && item.sControlName.includes("_") && item.bVisible; + }); + + const renderItems = []; + + memoListFilter.forEach(function(item, index) { + const title = item.showName; + console.log('nihaoaoaoao ', title, item); + const dataValueNew = viewRow[item.sName] || ""; + const child = { + sId: commonUtils.createSid(), + sName: item.sName, + sControlName: item.sControlName, + bVisible: true, + showName: title + }; + const showTypeProps = { + app: app, + className: styles.showType, + iColValue: item.iColValue || 24, + name: tableName, + record: viewRow, + sId: commonUtils.createSid(), + getSqlDropDownData: props.getSqlDropDownData, + getSqlCondition: props.getSqlCondition, + handleSqlDropDownNewRecord: props.handleSqlDropDownNewRecord, + getFloatNum: props.getFloatNum, + onChange: props.onDataChange, + showConfig: child, + slaveConfig: props[tableName + "Config"], + formItemLayout: { labelCol: { span: 0 }, wrapperCol: { span: 24 } }, + textArea: true, + enabled: false, + dataValue: dataValueNew, + bTable: true, + bViewTable: true, + formRoute: props.formRoute, + getDateFormat: props.getDateFormat + }; + + const key = item.iIncrement !== undefined ? item.iIncrement : index; + renderItems.push( + React.createElement("div", { key: key }, + React.createElement("div", { className: styles.title }, title), + React.createElement("div", { className: styles.content }, + React.createElement(ShowType, showTypeProps) + ) + ) + ); + }); - return ( -
-
{title}
-
- -
-
- ); - })} -
- ); + return React.createElement("div", { className: styles.prenatalReminderInfo }, renderItems); }; export default PrenatalReminderInfo; diff --git a/src/mes/scheduledTasks/prenatalReminderInfo1/index.less b/src/mes/scheduledTasks/prenatalReminderInfo1/index.less index 7694349..2c735e6 100644 --- a/src/mes/scheduledTasks/prenatalReminderInfo1/index.less +++ b/src/mes/scheduledTasks/prenatalReminderInfo1/index.less @@ -2,13 +2,10 @@ .prenatalReminderInfo { .size(); - // border: 1px solid red; display: grid; - /* 创建两列，每列宽度自动分配 */ - grid-template-columns: repeat(2, 1fr); - /* 创建三行，每行最小高度为100px，自动扩展 */ - grid-template-rows: repeat(3, minmax(100px, auto)); - /* 设置行列间距均为10px */ + /* 创建单列布局，每行占满整行 */ + grid-template-columns: 1fr; + /* 设置行间距为10px */ gap: 10px; @@ -62,10 +59,6 @@ } } - >div:first-child { - grid-column: span 2; - } - >div:nth-child(1) .title { background: url(./assets/1.png) no-repeat; background-position-x: -10px; -- libgit2 0.22.2