From 7a19af0dbf49b061957d90a8b720eafa10d60cab Mon Sep 17 00:00:00 2001 From: pengm <674192343@qq.com> Date: Tue, 2 Jun 2026 11:33:14 +0800 Subject: [PATCH] 1.修复产品提醒的展示 --- src/mes/scheduledTasks/prenatalReminderInfo1/index.js | 96 +++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------- src/mes/scheduledTasks/prenatalReminderInfo1/index.less | 2 ++ 2 files changed, 51 insertions(+), 47 deletions(-) diff --git a/src/mes/scheduledTasks/prenatalReminderInfo1/index.js b/src/mes/scheduledTasks/prenatalReminderInfo1/index.js index 1426ad4..8c30d4f 100644 --- a/src/mes/scheduledTasks/prenatalReminderInfo1/index.js +++ b/src/mes/scheduledTasks/prenatalReminderInfo1/index.js @@ -77,55 +77,57 @@ const PrenatalReminderInfo = function(baseProps) { 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 ( +
+ {memoListFilter.map(function(item, index) { + const title = item.showName; + let dataValueNew = viewRow[item.sName] || ""; + dataValueNew = dataValueNew.replace(/\\n,/g, '\n'); + const child = { + sId: commonUtils.createSid(), + sName: item.sName, + sControlName: item.sControlName, + bVisible: true, + showName: title + }; + const showTypeProps = { + app: 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 + }; - return React.createElement("div", { className: styles.prenatalReminderInfo }, renderItems); + const key = item.iIncrement !== undefined ? item.iIncrement : index; + return ( +
+
{title}
+
+ +
+
+ ); + })} +
+ ); }; -export default PrenatalReminderInfo; +export default PrenatalReminderInfo; \ No newline at end of file diff --git a/src/mes/scheduledTasks/prenatalReminderInfo1/index.less b/src/mes/scheduledTasks/prenatalReminderInfo1/index.less index 2c735e6..a431fb6 100644 --- a/src/mes/scheduledTasks/prenatalReminderInfo1/index.less +++ b/src/mes/scheduledTasks/prenatalReminderInfo1/index.less @@ -116,6 +116,8 @@ text-indent: 0; color: #000; padding: 10px; + white-space: pre-wrap; + word-break: break-all; } .ant-form-item { -- libgit2 0.22.2