diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js index 70f0d9d..4324048 100644 --- a/src/components/Common/CommonComponent/index.js +++ b/src/components/Common/CommonComponent/index.js @@ -2969,8 +2969,9 @@ export default class CommonComponent extends Component { /* commonClassify 制单日期、制单人员新增时设置保存时自动生成 */ let speacilNote = ''; const { record } = this.props; + const afterSave = commonFunc.showLocalMessage(this.props, 'afterSave', '保存后自动生成'); if (commonUtils.isNotEmptyObject(record) && commonUtils.isEmptyObject(record[sName]) && commonUtils.isNotEmptyObject(sName) && (sName === 'tCreateDate' || sName === 'sMakePerson')) { - speacilNote = (
保存后自动生成
); + speacilNote = (
{afterSave}
); } /* 如果是图片类型 ,加载图片 */ diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js index 17ee1df..dc14a2c 100644 --- a/src/components/Common/CommonTable/index.js +++ b/src/components/Common/CommonTable/index.js @@ -8815,7 +8815,7 @@ class CommonTableRc extends React.Component { } > {" "} - {sValue}热热热 + {sValue} )} @@ -11893,6 +11893,8 @@ const useCommonTableEvent = props => { const Outputproduction = commonFunc.showLocalMessage(props, 'Outputproduction', '报工产量'); const Workinghours = commonFunc.showLocalMessage(props, 'Workinghours', '计时工时'); const pieceworkHours = commonFunc.showLocalMessage(props, 'pieceworkHours', '计件工时'); + const productQuantity = commonFunc.showLocalMessage(props, 'productQuantity', '成品数量(万套):'); + const sumSet = commonFunc.showLocalMessage(props, 'sumSet', '合计'); if ( (["12710101117087404588200", "12710101117260270570210"].includes( @@ -11969,8 +11971,8 @@ const useCommonTableEvent = props => { return (
-
合计
-
成品数量(万套):
+
{sumSet}
+
{productQuantity}
{commonUtils.convertFixNum(dProductionCount, maxDigits)}
diff --git a/src/components/Common/CommonView/index.js b/src/components/Common/CommonView/index.js index 3519ea8..a375a7b 100644 --- a/src/components/Common/CommonView/index.js +++ b/src/components/Common/CommonView/index.js @@ -7,6 +7,7 @@ import ShowType from '@/components/Common/CommonComponent'; import AntdDraggableModal from '@/components/Common/AntdDraggableModal'; import CommonListSelectTree from '@/components/Common/CommonListSelectTree'; import * as commonUtils from '@/utils/utils';/* 通用方法 */ +import * as commonFunc from "@/components/Common/commonFunc"; const FormItem = Form.Item; // const EachInputHeight = 32; @@ -136,6 +137,7 @@ export default class CommonView extends Component { render() { const { sModelsId, enabled, sUseInfo, app, sModelsType, tableConfigType, isEnabledPlcNo } = this.props; const { commonFieldPopupVisible, randomId, previewVisible, previewImage } = this.state; + const afterSave = commonFunc.showLocalMessage(this.props, 'afterSave', '保存后自动2222生成'); let { masterData } = this.props; const masterConfig = this.props.masterconfig ? this.props.masterconfig : this.props.masterConfig; masterData = masterData === undefined ? {} : masterData; @@ -241,7 +243,7 @@ export default class CommonView extends Component { {masterData !== undefined && commonUtils.isEmptyObject(masterData[child.sName]) && (child.sName === 'sBillNo' || child.sName === 'sMakePerson' || child.sName === 'tCheckDate' || child.sName === 'sCheckPerson') ? - {sModelsType !== 'smg/sendMailMsg' ? '保存后自动生成' : '发送消息无需生成单据号'} + {sModelsType !== 'smg/sendMailMsg' ? afterSave : '发送消息无需生成单据号'} : '' } ); diff --git a/src/default.less b/src/default.less index 332c04e..c00f473 100644 --- a/src/default.less +++ b/src/default.less @@ -936,13 +936,15 @@ } .masterLinkSpan { - width: auto; - height: 26px; - line-height: 26px; + font-size: 18px!important; + width: 120%; /* 设置宽度为100% */ + height: 100%; /* 设置高度为100% */ + //line-height: 26px; overflow: hidden; color: #2f54eb; position: absolute; padding-right: 2px; + background-color: #f3f9ff; /* 添加背景色 */ z-index: 10; cursor: pointer; } @@ -1012,4 +1014,4 @@ display: none; } } -} \ No newline at end of file +} diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js index d6f71cb..b62556b 100644 --- a/src/mes/common/commonModelComponent/index.js +++ b/src/mes/common/commonModelComponent/index.js @@ -1926,6 +1926,8 @@ const CommonRepairComponent = props => { const modalName = "commonRepairModal"; const { [`${modalName}Params`]: params = {} } = props; + const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消'); + const { visible, title, @@ -2050,7 +2052,7 @@ const CommonRepairComponent = props => { params.tableName=='slaveWyrj2'? : null }