xlyErp / xlyUmi

Commit a72df219ebd236df45a5b046cb138864dd20bc75

Authored by 陈鑫涛
2 parents a923d960 d0c2c748

Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main

Inline Side-by-side
Showing 16 changed files with 221 additions and 71 deletions
src/components/Common/CommonBill/index.js
  View file @a72df21
... ... @@ -2529,9 +2529,12 @@ const BillComponent = Form.create({
2529 2529 }
2530 2530  
2531 2531 return Object.keys(controlGroup).map((tabNameKey) => {
2532   - const tabName = tabNameKey.replace(/\d+/g, "");
  2532 + let tabName = tabNameKey.replace(/\d+/g, "");
2533 2533 const num = tabNameKey.replace(/[^\d]/g, "").trim();
2534   -
  2534 + const tableConfigArr = config?.gdsconfigformslave.filter(row => row.sControlName === tabNameKey.trim());
  2535 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2536 + tabName= tableConfigArr[0].showName;
  2537 + }
2535 2538 const viewProps = {
2536 2539 ...props,
2537 2540 viewConfigs: controlGroup[tabNameKey],
... ...
src/components/Common/CommonComponent/index.js
  View file @a72df21
... ... @@ -2961,6 +2961,8 @@ export default class CommonComponent extends Component {
2961 2961 </div>);
2962 2962 }
2963 2963 const sModelsType = commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ? this.props.app.currentPane.sModelsType : '';
  2964 + const pleaseSelect = commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'pleaseSelect') : '请选择' ;
  2965 + const combinedInfo = commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'CombinedInfo') : '合版信息' ;
2964 2966 let bParamColor = false;
2965 2967 if (this.props && sName === 'sParamValue' && this.props.dataValue) {
2966 2968 if (this.props.dataValue === '选择色序' || this.props.record.sParamKey === 'sParam1001') {
... ... @@ -2985,7 +2987,7 @@ export default class CommonComponent extends Component {
2985 2987 });
2986 2988 sValue = commonUtils.isNotEmptyObject(sValue) ? sValue.substr(0, sValue.length - 1) : '';
2987 2989 }
2988   - } else if (sName === 'sColorSerialMemo' || bSColorSerialMemo || sName === 'sPositiveColor' || sName === 'sOppositeColor' || bParamColor) {
  2990 + } else if (sName === "sColorSerialMemo" || bSColorSerialMemo || sName === "sPositiveColor" || sName === "sOppositeColor" || bParamColor) {
2989 2991 let JsonData = [];
2990 2992 if (commonUtils.isNotEmptyObject(this.props.dataValue)) {
2991 2993 try {
... ... @@ -2994,13 +2996,13 @@ export default class CommonComponent extends Component {
2994 2996 JsonData = [];
2995 2997 }
2996 2998 }
2997   - if (typeof JsonData === 'object' && commonUtils.isNotEmptyArr(JsonData)) {
2998   - JsonData.forEach((item) => {
  2999 + if (typeof JsonData === "object" && commonUtils.isNotEmptyArr(JsonData)) {
  3000 + JsonData.forEach(item => {
2999 3001 sValue += `${item.sName}+`;
3000 3002 });
3001   - sValue = commonUtils.isNotEmptyObject(sValue) ? sValue.substr(0, sValue.length - 1) : '';
  3003 + sValue = commonUtils.isNotEmptyObject(sValue) ? sValue.substr(0, sValue.length - 1) : "";
3002 3004 }
3003   - } else if (sName === 'sParams' || sName === 'sQuoParams' || sName === 'sParamsNew') {
  3005 + } else if (sName === "sParams" || sName === "sQuoParams" || sName === "sParamsNew") {
3004 3006 if (this.props.onGetParamsValue) {
3005 3007 // 页面自行处理sparams的sValue
3006 3008 sValue = this.props.onGetParamsValue({ sName, sValue: this.props.dataValue, record: this.props.record });
... ... @@ -3014,13 +3016,13 @@ export default class CommonComponent extends Component {
3014 3016 }
3015 3017 }
3016 3018 if (commonUtils.isNotEmptyArr(JsonData)) {
3017   - JsonData.forEach((item) => {
  3019 + JsonData.forEach(item => {
3018 3020 if (item.bSelfCbx) {
3019   - const strValue = commonUtils.isNotEmptyObject(item.sParamValue) ? item.sParamValue : '';
  3021 + const strValue = commonUtils.isNotEmptyObject(item.sParamValue) ? item.sParamValue : "";
3020 3022 sValue += `${item.sParamName}:${strValue},`;
3021 3023 }
3022 3024 });
3023   - sValue = commonUtils.isNotEmptyObject(sValue) ? sValue.substr(0, sValue.length - 1) : '';
  3025 + sValue = commonUtils.isNotEmptyObject(sValue) ? sValue.substr(0, sValue.length - 1) : "";
3024 3026 }
3025 3027 }
3026 3028 } else {
... ... @@ -3043,15 +3045,16 @@ export default class CommonComponent extends Component {
3043 3045 style={{
3044 3046 width: '100%', overflow: 'hidden', color: '#2f54eb', background: 'transparent',
3045 3047 }}
3046   - > {commonUtils.isNotEmptyObject(sValue) ? sValue : sName === 'sCombinedMemo' ? '合版信息' : '请选择'}
  3048 + > {commonUtils.isNotEmptyObject(sValue) ? sValue : sName === 'sCombinedMemo' ? combinedInfo : pleaseSelect}
3047 3049 </span>
3048 3050 </div>);
3049 3051 }
3050 3052 /* commonClassify 制单日期、制单人员新增时设置保存时自动生成 */
3051 3053 let speacilNote = '';
3052 3054 const { record } = this.props;
  3055 + const afterSave = commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'afterSave') : '保存后自动生成';
3053 3056 if (commonUtils.isNotEmptyObject(record) && commonUtils.isEmptyObject(record[sName]) && commonUtils.isNotEmptyObject(sName) && (sName === 'tCreateDate' || sName === 'sMakePerson')) {
3054   - speacilNote = (<div className="speacialNote" style={{ position: 'absolute', padding: '0px 4px' }}> 保存后自动生成</div>);
  3057 + speacilNote = (<div className="speacialNote" style={{ position: 'absolute', padding: '0px 4px' }}> {afterSave}</div>);
3055 3058 }
3056 3059  
3057 3060 const bShowMemo = false && commonUtils.isNotEmptyObject(sName) && sName.indexOf('sMemo') > -1 && !sName.includes('ProcessMemo'); /* 非编辑状态下 备注以蓝色链接呈现 */
... ...
src/components/Common/CommonComponent/index_new.js
  View file @a72df21
... ... @@ -1150,8 +1150,9 @@ function CommonComponent(props) {
1150 1150 }
1151 1151 let speacilNote = '';
1152 1152 const { record } = props;
  1153 + const afterSave = commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'afterSave') : '保存后自动生成';
1153 1154 if (commonUtils.isNotEmptyObject(record) && commonUtils.isEmptyObject(record[sName]) && commonUtils.isNotEmptyObject(sName) && (sName === 'tCreateDate' || sName === 'sMakePerson')) {
1154   - speacilNote = (<div className="speacialNote" style={{ position: 'absolute', padding: '0px 4px' }}> 保存后自动生成</div>);
  1155 + speacilNote = (<div className="speacialNote" style={{ position: 'absolute', padding: '0px 4px' }}> {afterSave}</div>);
1155 1156 }
1156 1157 let imgBox = '';
1157 1158 if (commonUtils.isNotEmptyObject(sName) && sName.indexOf('picture') > -1) {
... ...
src/components/Common/CommonGroupBill.js
  View file @a72df21
... ... @@ -2065,7 +2065,11 @@ const BillComponent = Form.create({
2065 2065 // 匹配数字
2066 2066 // eslint-disable-next-line no-unused-vars
2067 2067 let num = item.replace(/[^\d]/g, '').trim();
2068   - const tabName = item.replace(/\d+/g,'');
  2068 + let tabName = item.replace(/\d+/g,'');
  2069 + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
  2070 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2071 + tabName=tableConfigArr[0].showName;
  2072 + }
2069 2073 return (
2070 2074 <TabPane tab={tabName} key={num} className="xly-bill-list">
2071 2075 <div>
... ... @@ -2103,7 +2107,11 @@ const BillComponent = Form.create({
2103 2107 // 匹配数字
2104 2108 // eslint-disable-next-line no-unused-vars
2105 2109 let num = item.replace(/[^\d]/g, '').trim();
2106   - const tabName = item.replace(/\d+/g,'');
  2110 + let tabName = item.replace(/\d+/g,'');
  2111 + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
  2112 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2113 + tabName=tableConfigArr[0].showName;
  2114 + }
2107 2115 return (
2108 2116 <TabPane tab={tabName} key={num} className="xly-bill-list">
2109 2117 <div>
... ... @@ -2139,7 +2147,11 @@ const BillComponent = Form.create({
2139 2147 // 匹配数字
2140 2148 // eslint-disable-next-line no-unused-vars
2141 2149 let num = item.replace(/[^\d]/g, '').trim();
2142   - const tabName = item.replace(/\d+/g,'');
  2150 + let tabName = item.replace(/\d+/g,'');
  2151 + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
  2152 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2153 + tabName=tableConfigArr[0].showName;
  2154 + }
2143 2155 return (
2144 2156 <TabPane tab={tabName} key={num} className="xly-bill-list">
2145 2157 <div>
... ... @@ -2175,7 +2187,11 @@ const BillComponent = Form.create({
2175 2187 // 匹配数字
2176 2188 // eslint-disable-next-line no-unused-vars
2177 2189 let num = item.replace(/[^\d]/g, '').trim();
2178   - const tabName = item.replace(/\d+/g,'');
  2190 + let tabName = item.replace(/\d+/g,'');
  2191 + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
  2192 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2193 + tabName=tableConfigArr[0].showName;
  2194 + }
2179 2195 return (
2180 2196 <TabPane tab={tabName} key={num} className="xly-bill-list">
2181 2197 <div>
... ... @@ -2211,7 +2227,11 @@ const BillComponent = Form.create({
2211 2227 // 匹配数字
2212 2228 // eslint-disable-next-line no-unused-vars
2213 2229 let num = item.replace(/[^\d]/g, '').trim();
2214   - const tabName = item.replace(/\d+/g,'');
  2230 + let tabName = item.replace(/\d+/g,'');
  2231 + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
  2232 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2233 + tabName=tableConfigArr[0].showName;
  2234 + }
2215 2235 return (
2216 2236 <TabPane tab={tabName} key={num} className="xly-bill-list">
2217 2237 <div>
... ... @@ -2247,7 +2267,11 @@ const BillComponent = Form.create({
2247 2267 // 匹配数字
2248 2268 // eslint-disable-next-line no-unused-vars
2249 2269 let num = item.replace(/[^\d]/g, '').trim();
2250   - const tabName = item.replace(/\d+/g,'');
  2270 + let tabName = item.replace(/\d+/g,'');
  2271 + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
  2272 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2273 + tabName=tableConfigArr[0].showName;
  2274 + }
2251 2275 return (
2252 2276 <TabPane tab={tabName} key={num} className="xly-bill-list">
2253 2277 <div>
... ...
src/components/Common/CommonNewBill.js
  View file @a72df21
... ... @@ -2622,7 +2622,12 @@ const BillComponent = Form.create({
2622 2622 // 匹配数字
2623 2623 // eslint-disable-next-line no-unused-vars
2624 2624 let num = item.replace(/[^\d]/g, '').trim();
2625   - const tabName = item.replace(/\d+/g,'');
  2625 + let tabName = item.replace(/\d+/g,'');
  2626 + /* 从主表配置 找到控件名=tabName,否则取他的showName */
  2627 + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
  2628 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2629 + tabName =tableConfigArr[0].showName;
  2630 + }
2626 2631 return (
2627 2632 <TabPane tab={tabName} key={num} className="xly-bill-list">
2628 2633 <div>
... ... @@ -2699,7 +2704,12 @@ const BillComponent = Form.create({
2699 2704 // 匹配数字
2700 2705 // eslint-disable-next-line no-unused-vars
2701 2706 let num = item.replace(/[^\d]/g, '').trim();
2702   - const tabName = item.replace(/\d+/g,'');
  2707 + let tabName = item.replace(/\d+/g,'');
  2708 + /* 从主表配置 找到控件名=tabName,否则取他的showName */
  2709 + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
  2710 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2711 + tabName =tableConfigArr[0].showName;
  2712 + }
2703 2713 return (
2704 2714 <TabPane tab={tabName} key={num} className="xly-bill-list">
2705 2715 <div>
... ... @@ -2784,7 +2794,12 @@ const BillComponent = Form.create({
2784 2794 // 匹配数字
2785 2795 // eslint-disable-next-line no-unused-vars
2786 2796 let num = item.replace(/[^\d]/g, '').trim();
2787   - const tabName = item.replace(/\d+/g,'');
  2797 + let tabName = item.replace(/\d+/g,'');
  2798 + /* 从主表配置 找到控件名=tabName,否则取他的showName */
  2799 + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
  2800 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2801 + tabName =tableConfigArr[0].showName;
  2802 + }
2788 2803 return (
2789 2804 <TabPane tab={tabName} key={num} className="xly-bill-list">
2790 2805 <div>
... ... @@ -2830,7 +2845,12 @@ const BillComponent = Form.create({
2830 2845 // 匹配数字
2831 2846 // eslint-disable-next-line no-unused-vars
2832 2847 let num = item.replace(/[^\d]/g, '').trim();
2833   - const tabName = item.replace(/\d+/g,'');
  2848 + let tabName = item.replace(/\d+/g,'');
  2849 + /* 从主表配置 找到控件名=tabName,否则取他的showName */
  2850 + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
  2851 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2852 + tabName =tableConfigArr[0].showName;
  2853 + }
2834 2854 return (
2835 2855 <TabPane tab={tabName} key={num} className="xly-bill-list">
2836 2856 <div>
... ... @@ -2876,7 +2896,12 @@ const BillComponent = Form.create({
2876 2896 // 匹配数字
2877 2897 // eslint-disable-next-line no-unused-vars
2878 2898 let num = item.replace(/[^\d]/g, '').trim();
2879   - const tabName = item.replace(/\d+/g,'');
  2899 + let tabName = item.replace(/\d+/g,'');
  2900 + /* 从主表配置 找到控件名=tabName,否则取他的showName */
  2901 + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
  2902 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2903 + tabName = tableConfigArr[0].showName;
  2904 + }
2880 2905 return (
2881 2906 <TabPane tab={tabName} key={num} className="xly-bill-list">
2882 2907 <div>
... ...
src/components/Common/CommonNewListBill.js
  View file @a72df21
... ... @@ -2345,7 +2345,11 @@ const BillComponent = Form.create({
2345 2345 // 匹配数字
2346 2346 // eslint-disable-next-line no-unused-vars
2347 2347 let num = item.replace(/[^\d]/g, '').trim();
2348   - const tabName = item.replace(/\d+/g,'');
  2348 + let tabName = item.replace(/\d+/g,'');
  2349 + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
  2350 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2351 + tabName=tableConfigArr[0].showName;
  2352 + }
2349 2353 return (
2350 2354 <TabPane tab={tabName} key={num} className="xly-bill-list">
2351 2355 <div>
... ... @@ -2385,7 +2389,11 @@ const BillComponent = Form.create({
2385 2389 // 匹配数字
2386 2390 // eslint-disable-next-line no-unused-vars
2387 2391 let num = item.replace(/[^\d]/g, '').trim();
2388   - const tabName = item.replace(/\d+/g,'');
  2392 + let tabName = item.replace(/\d+/g,'');
  2393 + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
  2394 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2395 + tabName=tableConfigArr[0].showName;
  2396 + }
2389 2397 return (
2390 2398 <TabPane tab={tabName} key={num} className="xly-bill-list">
2391 2399 <div>
... ... @@ -2469,7 +2477,11 @@ const BillComponent = Form.create({
2469 2477 // 匹配数字
2470 2478 // eslint-disable-next-line no-unused-vars
2471 2479 let num = item.replace(/[^\d]/g, '').trim();
2472   - const tabName = item.replace(/\d+/g,'');
  2480 + let tabName = item.replace(/\d+/g,'');
  2481 + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
  2482 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2483 + tabName=tableConfigArr[0].showName;
  2484 + }
2473 2485 return (
2474 2486 <TabPane tab={tabName} key={num} className="xly-bill-list">
2475 2487 <div>
... ... @@ -2547,7 +2559,11 @@ const BillComponent = Form.create({
2547 2559 // 匹配数字
2548 2560 // eslint-disable-next-line no-unused-vars
2549 2561 let num = item.replace(/[^\d]/g, '').trim();
2550   - const tabName = item.replace(/\d+/g,'');
  2562 + let tabName = item.replace(/\d+/g,'');
  2563 + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
  2564 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2565 + tabName=tableConfigArr[0].showName;
  2566 + }
2551 2567 return (
2552 2568 <TabPane tab={tabName} key={num} className="xly-bill-list">
2553 2569 <div>
... ... @@ -2586,7 +2602,11 @@ const BillComponent = Form.create({
2586 2602 // 匹配数字
2587 2603 // eslint-disable-next-line no-unused-vars
2588 2604 let num = item.replace(/[^\d]/g, '').trim();
2589   - const tabName = item.replace(/\d+/g,'');
  2605 + let tabName = item.replace(/\d+/g,'');
  2606 + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
  2607 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2608 + tabName=tableConfigArr[0].showName;
  2609 + }
2590 2610 return (
2591 2611 <TabPane tab={tabName} key={num} className="xly-bill-list">
2592 2612 <div>
... ... @@ -2625,7 +2645,11 @@ const BillComponent = Form.create({
2625 2645 // 匹配数字
2626 2646 // eslint-disable-next-line no-unused-vars
2627 2647 let num = item.replace(/[^\d]/g, '').trim();
2628   - const tabName = item.replace(/\d+/g,'');
  2648 + let tabName = item.replace(/\d+/g,'');
  2649 + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
  2650 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2651 + tabName=tableConfigArr[0].showName;
  2652 + }
2629 2653 return (
2630 2654 <TabPane tab={tabName} key={num} className="xly-bill-list">
2631 2655 <div>
... ...
src/components/Common/CommonNewTabBill.js
  View file @a72df21
... ... @@ -2386,7 +2386,11 @@ const BillComponent = Form.create({
2386 2386 // 匹配数字
2387 2387 // eslint-disable-next-line no-unused-vars
2388 2388 let num = item.replace(/[^\d]/g, '').trim();
2389   - const tabName = item.replace(/\d+/g,'');
  2389 + let tabName = item.replace(/\d+/g,'');
  2390 + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
  2391 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2392 + tabName =tableConfigArr[0].showName;
  2393 + }
2390 2394 return (
2391 2395 <TabPane tab={tabName} key={num} className="xly-bill-list">
2392 2396 <div>
... ...
src/components/Common/CommonTable/index.js
  View file @a72df21
... ... @@ -1967,6 +1967,7 @@ class CommonTableRc extends React.Component {
1967 1967 }
1968 1968 // 处理拖拽排序
1969 1969 if (this.props.dragHandle) {
  1970 + const handleSortTitle = commonFunc.showMessage(this.props.app.commonConst, 'sort') || '排序' ;
1970 1971 const handleSort = tableColumn.filter(item => item.dataIndex === 'handleSort').length;
1971 1972 if (tableColumn[0]) {
1972 1973 function arrayMoveMutable(array, fromIndex, toIndex) {
... ... @@ -2029,7 +2030,7 @@ class CommonTableRc extends React.Component {
2029 2030 }
2030 2031 tableColumn.unshift(
2031 2032 {
2032   - title: '排序',
  2033 + title: handleSortTitle,
2033 2034 dataIndex: 'handleSort',
2034 2035 fixed: 'left',
2035 2036 width: 40,
... ... @@ -4924,17 +4925,20 @@ class CommonTableRc extends React.Component {
4924 4925 /** 删除行 */
4925 4926 handleDelRow = (index, record) => {
4926 4927 if(this.props.name !== 'slaveFilter') {
  4928 + const sureDel = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'SureDel') : '确认要删除吗？' ;
  4929 + const BtnSure = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'BtnSure') : '确定？' ;
  4930 + const BtnCancel = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'BtnCancel') : '确定？' ;
4927 4931 const _this = this;
4928 4932 confirm({
4929   - title: '确认要删除吗？',
  4933 + title: sureDel,
4930 4934 onOk() {
4931 4935 _this.handleDelOkRow(index, record);
4932 4936 },
4933 4937 onCancel() {
4934 4938 return false;
4935 4939 },
4936   - okText: '确定',
4937   - cancelText: '取消'
  4940 + okText: BtnSure,
  4941 + cancelText: BtnCancel
4938 4942 });
4939 4943 } else {
4940 4944 this.handleDelOkRow(index, record);
... ... @@ -5575,6 +5579,10 @@ class CommonTableRc extends React.Component {
5575 5579 let clickEvent = '';
5576 5580 /* 选择合版产品弹窗 */
5577 5581 const sModelsType = commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyObject(props.app) ? props.app.currentPane.sModelsType : '';
  5582 + const combinedInfo = commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'CombinedInfo') : '合版信息' ;
  5583 +
  5584 + const pleaseSelect = commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'pleaseSelect') : '请选择' ;
  5585 +
5578 5586 if (commonUtils.isNotEmptyObject(sName) && ( sName === 'sCombinedMemo' || sName ==='sCombineProductNameNew' || sName === 'sColorSerialMemo' || sName === 'sPositiveColor' || sName === 'sOppositeColor' || sName === 'sParams' || sName === 'sParamsNew'|| sName === 'sQuoParams' || (commonUtils.isNotEmptyObject(sModelsType) && !sModelsType.includes('Set') && sName === 'sCombinePartsNameNew'))) {
5579 5587 linkStyle = 'linksActiveIdStyle';
5580 5588 clickEvent = 'onViewChoose';
... ... @@ -5651,7 +5659,7 @@ class CommonTableRc extends React.Component {
5651 5659 }
5652 5660 }
5653 5661 }
5654   - sValue = commonUtils.isEmpty(sValue) ? sName === 'sCombinedMemo' ? '合版信息' : '请选择' : sValue;
  5662 + sValue = commonUtils.isEmpty(sValue) ? sName === 'sCombinedMemo' ? combinedInfo : pleaseSelect : sValue;
5655 5663 } else if ((!props.enabled) && sName.indexOf('Memo') > -1 && showConfigObj.iTag !== 3 ) {
5656 5664 linkStyle = 'linksActiveIdStyle';
5657 5665 clickEvent = 'onMemoShow';
... ... @@ -6715,7 +6723,7 @@ class CommonTableRc extends React.Component {
6715 6723 /* 通用弹窗功能 */
6716 6724 let commonPopupProps = {};
6717 6725 let commonPopupTitle = '选择弹窗';
6718   - let bCommonPopup = false; /* 多列弹出窗 */
  6726 + let bCommonPopup = false; /* 多列弹出窗11 */
6719 6727 let bCommonPopup1 = false; /* 单列弹出窗 */
6720 6728 let bCommonPopupTree = false; /* 树形列弹出窗 */
6721 6729 let bCommonPopupProcess = false;
... ...
src/components/Common/ToolBar/ToolBarNew.js
  View file @a72df21
... ... @@ -2154,8 +2154,9 @@ class ToolBarComponent extends Component {
2154 2154 }
2155 2155 } else if (key === "BtnDel") {
2156 2156 /* 删除 */
  2157 + const sureDelTitle = commonUtils.isNotEmptyObject(this.props?.app) ? commonFunc.showMessage(this.props.app.commonConst, "SureDel") : "SureDel";
2157 2158 obj = {
2158   - title: "确定要删除",
  2159 + title: sureDelTitle,
2159 2160 };
2160 2161 this.props.onDel(obj);
2161 2162 } else if (key === "BtnGetGoods") {
... ...
src/components/CommonElementEvent/SisformulaInfo.js
  View file @a72df21
... ... @@ -25,6 +25,14 @@ class SisformulaInfoComponent extends Component {
25 25 this.state = {
26 26 };
27 27 this.form = {}; /* 表单对象 */
  28 + // 删除sessionStorage里key值已sModelsId开头的值
  29 + const { sModelsId } = props;
  30 + for (let i = 0; i < sessionStorage.length; i++) {
  31 + const key = sessionStorage.key(i);
  32 + if (key.startsWith(`${sModelsId}_`)) {
  33 + sessionStorage.removeItem(key);
  34 + }
  35 + }
28 36 }
29 37  
30 38 // onDoubleClick = (record) => { /* 双击行 将参数名 @参数名放到公式框里 */
... ...
src/components/CommonElementEvent/StatementInfo.js
  View file @a72df21
... ... @@ -36,18 +36,20 @@ export default class StatementInfo extends Component {
36 36 let { reportColumn } = nextProps;
37 37 const { app, visibleStatement } = nextProps;
38 38 const reportName = commonFunc.showMessage(app.commonConst, 'reportName');/* 设计功能 */
  39 + const sTemplateName= commonFunc.showMessage(app.commonConst, 'sTemplateName') || '模板名称' ;
  40 + const sReportName= commonFunc.showMessage(app.commonConst, 'sReportName') || '报表名称' ;
39 41 if (commonUtils.isEmptyArr(reportColumn) && visibleStatement) {
40 42 const reportConfig = {};
41 43 reportConfig.gdsconfigformslave = [{
42 44 bVisible: true,
43 45 sName: 'sReportName',
44 46 bNotEmpty: true,
45   - showName: '报表名称',
  47 + showName: sReportName,
46 48 }, {
47 49 bVisible: true,
48 50 sName: 'sReportPath',
49 51 bReadOnly: true,
50   - showName: '模板名称',
  52 + showName: sTemplateName,
51 53 iTag: 1,
52 54 }];
53 55 reportColumn = [{
... ... @@ -55,7 +57,7 @@ export default class StatementInfo extends Component {
55 57 dataIndex: 'sReportName',
56 58 width: 200,
57 59 }, {
58   - title: '模板名称',
  60 + title: sTemplateName,
59 61 dataIndex: 'sReportPath',
60 62 width: 239,
61 63 }];
... ...
src/components/Manufacture/ProcessCardPack/ProcessCardPackTableTree.js
  View file @a72df21
... ... @@ -7665,7 +7665,7 @@ const ProcessCardComponent = Form.create({
7665 7665 if(commonUtils.isNotEmptyObject(processShowLeft)) {
7666 7666  
7667 7667 if(processShowLeft.bVisible) {
7668   - processShowTitle = processShowLeft.sChinese;
  7668 + processShowTitle = processShowLeft.showName;
7669 7669 }
7670 7670  
7671 7671 }
... ... @@ -8236,6 +8236,9 @@ const ProcessCardComponent = Form.create({
8236 8236 height: 50,
8237 8237 }
8238 8238 }
  8239 +
  8240 + const deleteAll = commonFunc.showMessage(props.app.commonConst, 'deleteAll') || '删除' ;
  8241 +
8239 8242 const autoHeight = `calc( 100vh - 92px )`;
8240 8243  
8241 8244 const renderByLayout = () => {
... ... @@ -8405,7 +8408,7 @@ const ProcessCardComponent = Form.create({
8405 8408 materialsChildTableProps = materialsChildTablePropsList[`${item}ChildTableProps`];
8406 8409 sWidth = '58.5%';
8407 8410 sRightWidth = '42%';
8408   - materialsChildTableTitle = commonUtils.isNotEmptyObject(materialsChildTableProps) && commonUtils.isNotEmptyObject(materialsChildTableProps.config) ? materialsChildTableProps.config.sChinese : '';
  8411 + materialsChildTableTitle = commonUtils.isNotEmptyObject(materialsChildTableProps) && commonUtils.isNotEmptyObject(materialsChildTableProps.config) ? materialsChildTableProps.config.showName : '';
8409 8412 } else {
8410 8413 sWidth = '100%';
8411 8414 }
... ... @@ -8422,7 +8425,7 @@ const ProcessCardComponent = Form.create({
8422 8425 <div className='dlhStyle'>
8423 8426 <div style={{ position: "relative", width: sWidth }}>
8424 8427 <StaticEditTable {...materialsOtherPropsType} setOpterationColumn="Y" noVlist dragHandle={bMaterialsSort} selfTableHeight={82}/>
8425   - {index === 0 ? <div className={selfstyles.delAll}><Button type='primary' disabled={!props.enabled} onClick={props.onDeleteAllMaterials.bind(this, materialsOtherPropsType.data)}>删除全部</Button></div> : ""}
  8428 + {index === 0 ? <div className={selfstyles.delAll}><Button type='primary' disabled={!props.enabled} onClick={props.onDeleteAllMaterials.bind(this, materialsOtherPropsType.data)}>{deleteAll}</Button></div> : ""}
8426 8429 </div>
8427 8430 {
8428 8431 commonUtils.isNotEmptyObject(materialsChildTableProps)?
... ...
src/components/Manufacture/ProcessCardPackTableTreeNew/index.js
  View file @a72df21
... ... @@ -3776,8 +3776,8 @@ const OtherComponent = props =&gt; {
3776 3776 const dailyInfo = commonFunc.showMessage(commonConst, "dailyInfo"); // 日志信息
3777 3777 const visionInfo = commonUtils.isNotEmptyObject(commonFunc.showMessage(commonConst, "visionInfo")) ?
3778 3778 commonFunc.showMessage(commonConst, "visionInfo") : '改版记录';
3779   - const colorInfo = commonUtils.isNotEmptyObject(colorConfig) && commonUtils.isNotEmptyObject(colorConfig.sChinese ) ?
3780   - colorConfig.sChinese :
  3779 + const colorInfo = commonUtils.isNotEmptyObject(colorConfig) && commonUtils.isNotEmptyObject(colorConfig.showName ) ?
  3780 + colorConfig.showName :
3781 3781 commonUtils.isNotEmptyObject(commonFunc.showMessage(commonConst, "colorInfo")) ?
3782 3782 commonFunc.showMessage(commonConst, "colorInfo") : '工艺颜色'; // "工艺颜色";
3783 3783  
... ... @@ -3878,13 +3878,13 @@ const OtherComponent = props =&gt; {
3878 3878 <MaterialsComponent {...props} materialsTabValue={materialsTabValue} />
3879 3879 </Panel>
3880 3880 {materialsChildInfoListFilter.map(tablename => {
3881   - const { sChinese } = props[`${tablename}Config`];
  3881 + const { showName } = props[`${tablename}Config`];
3882 3882 return (
3883 3883 <Panel
3884 3884 collapsible="header"
3885 3885 header={getHeaderIcon(tablename)}
3886 3886 showArrow={false}
3887   - extra={panelExtra("", { selfName: sChinese, selfId: tablename })}
  3887 + extra={panelExtra("", { selfName: showName, selfId: tablename })}
3888 3888 key={tablename}
3889 3889 >
3890 3890 <MaterialsChildComponent {...props} materialsChildName={tablename} />
... ... @@ -3955,7 +3955,7 @@ const ProcessComponent = props =&gt; {
3955 3955 const showLeftConfig = processConfig.gdsconfigformslave.find(item => item.sControlName === "bShowLeft");
3956 3956  
3957 3957 if (showLeftConfig) {
3958   - const { iColValue, sChinese: processShowTitle } = showLeftConfig;
  3958 + const { iColValue, showName: processShowTitle } = showLeftConfig;
3959 3959  
3960 3960 const processTitleWidth = processConfig.gdsconfigformslave.find(item => item.sControlName === "titleWidth")?.sDefault;
3961 3961 const commonViewDragableProps = {
... ... @@ -4059,7 +4059,7 @@ const MaterialsComponent = props =&gt; {
4059 4059 materialsChildTableProps = materialsChildTablePropsList[`${item}ChildTableProps`];
4060 4060 sWidth = "58.5%";
4061 4061 sRightWidth = "42%";
4062   - materialsChildTableTitle = materialsChildTableProps.config.sChinese || "";
  4062 + materialsChildTableTitle = materialsChildTableProps.config.showName || "";
4063 4063 }
4064 4064 } else {
4065 4065 sWidth = "100%";
... ...
src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js
  View file @a72df21
... ... @@ -8190,7 +8190,7 @@ const WorkOrderComponent = Form.create({
8190 8190 if(commonUtils.isNotEmptyObject(processShowLeft)) {
8191 8191  
8192 8192 if(processShowLeft.bVisible) {
8193   - processShowTitle = processShowLeft.sChinese;
  8193 + processShowTitle = processShowLeft.showName;
8194 8194 }
8195 8195  
8196 8196 }
... ... @@ -8738,7 +8738,7 @@ const WorkOrderComponent = Form.create({
8738 8738 let visionTableTitle = '改版记录';
8739 8739 const { visionConfig } = props;
8740 8740 if (commonUtils.isNotEmptyObject(visionConfig)) {
8741   - visionTableTitle = visionConfig.sChinese;
  8741 + visionTableTitle = visionConfig.showName;
8742 8742 }
8743 8743 str = <Radio.Group defaultValue={1} >
8744 8744 <Radio value={1}>{visionTableTitle}</Radio>
... ... @@ -8901,7 +8901,7 @@ const WorkOrderComponent = Form.create({
8901 8901 const iIndex = materialsChildInfoList.findIndex(child => child.includes(item));
8902 8902 if(iIndex > -1) {
8903 8903 materialsChildTableProps = materialsChildTablePropsList[`${item}ChildTableProps`];
8904   - materialsChildTableTitle = commonUtils.isNotEmptyObject(materialsChildTableProps) && commonUtils.isNotEmptyObject(materialsChildTableProps.config) ? materialsChildTableProps.config.sChinese : '';
  8904 + materialsChildTableTitle = commonUtils.isNotEmptyObject(materialsChildTableProps) && commonUtils.isNotEmptyObject(materialsChildTableProps.config) ? materialsChildTableProps.config.showName : '';
8905 8905 }
8906 8906 }
8907 8907 return (
... ... @@ -9348,7 +9348,14 @@ const WorkOrderComponent = Form.create({
9348 9348 // 工艺参数弹窗
9349 9349 const ModalComponent = props => {
9350 9350 const modalName = 'sWorkParamsModalVisible'; // commonParamVisible
9351   - const sProcessParams = "工单参数";
  9351 + const sProcessParams = commonFunc.showMessage(props.app.commonConst, 'workParam') || '工单参数' ;
  9352 + const BtnFirst= commonFunc.showMessage(props.app.commonConst, 'BtnFirst') || '首条' ;
  9353 +
  9354 + const BtnLast= commonFunc.showMessage(props.app.commonConst, 'Btnlast') || '末条' ;
  9355 +
  9356 + const BtnPrior= commonFunc.showMessage(props.app.commonConst, 'BtnPrior') || '上一条' ;
  9357 +
  9358 + const BtnNext= commonFunc.showMessage(props.app.commonConst, 'BtnNext') || '下一条' ;
9352 9359 return props[modalName] ?
9353 9360 <Modal
9354 9361 width="80%"
... ... @@ -9371,10 +9378,10 @@ const ModalComponent = props =&gt; {
9371 9378 >
9372 9379 <div>
9373 9380 <div className='oper'>
9374   - <Button type='primary' onClick={() => { props.onBtnParamPage(props, props.processTableId, 'first')}} >首条</Button>
9375   - <Button type='primary' onClick={() => { props.onBtnParamPage(props, props.processTableId, 'before')}} >上一条</Button>
9376   - <Button type='primary' onClick={() => { props.onBtnParamPage(props, props.processTableId, 'next')}} >下一条</Button>
9377   - <Button type='primary' onClick={() => { props.onBtnParamPage(props, props.processTableId, 'last')}} >末条</Button>
  9381 + <Button type='primary' onClick={() => { props.onBtnParamPage(props, props.processTableId, 'first')}} >{BtnFirst}</Button>
  9382 + <Button type='primary' onClick={() => { props.onBtnParamPage(props, props.processTableId, 'before')}} >{BtnPrior}</Button>
  9383 + <Button type='primary' onClick={() => { props.onBtnParamPage(props, props.processTableId, 'next')}} >{BtnNext}</Button>
  9384 + <Button type='primary' onClick={() => { props.onBtnParamPage(props, props.processTableId, 'last')}} >{BtnLast}</Button>
9378 9385 </div>
9379 9386 {
9380 9387 [''].map(() => {
... ...
src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js
  View file @a72df21
... ... @@ -8998,6 +8998,14 @@ const WorkOrderComponent = Form.create({
8998 8998 const ModalComponent = props => {
8999 8999 const modalName = 'sWorkParamsModalVisible'; // commonParamVisible
9000 9000 const sProcessParams = "工单参数";
  9001 + const BtnFirst= commonFunc.showMessage(props.app.commonConst, 'BtnFirst') || '首条' ;
  9002 +
  9003 + const BtnLast= commonFunc.showMessage(props.app.commonConst, 'Btnlast') || '末条' ;
  9004 +
  9005 + const BtnPrior= commonFunc.showMessage(props.app.commonConst, 'BtnPrior') || '上一条' ;
  9006 +
  9007 + const BtnNext= commonFunc.showMessage(props.app.commonConst, 'BtnNext') || '下一条' ;
  9008 +
9001 9009 return props[modalName] ?
9002 9010 <Modal
9003 9011 width="80%"
... ... @@ -9020,10 +9028,10 @@ const ModalComponent = props =&gt; {
9020 9028 >
9021 9029 <div>
9022 9030 <div className='oper'>
9023   - <Button type='primary' onClick={() => { props.onBtnParamPage(props, props.processTableId, 'first')}} >首条</Button>
9024   - <Button type='primary' onClick={() => { props.onBtnParamPage(props, props.processTableId, 'before')}} >上一条</Button>
9025   - <Button type='primary' onClick={() => { props.onBtnParamPage(props, props.processTableId, 'next')}} >下一条</Button>
9026   - <Button type='primary' onClick={() => { props.onBtnParamPage(props, props.processTableId, 'last')}} >末条</Button>
  9031 + <Button type='primary' onClick={() => { props.onBtnParamPage(props, props.processTableId, 'first')}} >{BtnFirst}</Button>
  9032 + <Button type='primary' onClick={() => { props.onBtnParamPage(props, props.processTableId, 'before')}} >{BtnPrior}</Button>
  9033 + <Button type='primary' onClick={() => { props.onBtnParamPage(props, props.processTableId, 'next')}} >{BtnNext}</Button>
  9034 + <Button type='primary' onClick={() => { props.onBtnParamPage(props, props.processTableId, 'last')}} >{BtnLast}</Button>
9027 9035 </div>
9028 9036 {
9029 9037 [''].map(() => {
... ... @@ -9052,4 +9060,5 @@ const ModalComponent = props =&gt; {
9052 9060  
9053 9061 };
9054 9062  
  9063 +
9055 9064 export default CommonBase(CommonSales(WorkOrderPack));
... ...
src/components/QuickQuote/index.jsx
  View file @a72df21
... ... @@ -1106,6 +1106,7 @@ const TreeComponent = props =&gt; {
1106 1106 // 内容组件
1107 1107 const ContentComponent = props => {
1108 1108 const { selectedNode = {}, extraParts = {} } = props.state;
  1109 + const manyqtysInfo= commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'manyqtysInfo') : '多数量报价' ;
1109 1110 const { showName } = selectedNode;
1110 1111 const extraPartsList = extraParts[showName] || [];
1111 1112 let { sAllPartsName = "" } = selectedNode;
... ... @@ -1208,7 +1209,7 @@ const ContentComponent = props =&gt; {
1208 1209 })}
1209 1210 />
1210 1211 <BackendParamsExtraComponent {...props} />
1211   - <Divider {...dividerProps}>多数量报价</Divider>
  1212 + <Divider {...dividerProps}>{manyqtysInfo}</Divider>
1212 1213 <ManyComponent {...props} />
1213 1214 </>
1214 1215 );
... ... @@ -1730,6 +1731,8 @@ const BoxComponent = props =&gt; {
1730 1731 showNew: 1,
1731 1732 };
1732 1733 const isShowImg = boxList.find(x => x.sName === "盒身")?.type !== "" || false;
  1734 + const PrintingParameters = commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'PrintingParameters') : '印刷参数' ;
  1735 +
1733 1736 return (
1734 1737 <Tabs
1735 1738 key={boxModel}
... ... @@ -1746,7 +1749,7 @@ const BoxComponent = props =&gt; {
1746 1749 const cailiaoyinshuaDiv = (
1747 1750 <>
1748 1751 <Divider {...dividerProps} orientationMargin="10px">
1749   - 印刷参数
  1752 + {PrintingParameters}
1750 1753 </Divider>
1751 1754 <div className={styles.viewTable1}>
1752 1755 <CommonViewTable {...upViewProps12} />
... ... @@ -2030,6 +2033,16 @@ const ManyComponent = props =&gt; {
2030 2033 const [submitLoading, setSubmitLoading] = useState(false);
2031 2034 const [processPercent, setProcessPercent] = useState(0);
2032 2035  
  2036 + const BtnNewQuotation= commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'BtnNewQuotation') : '新报价' ;
  2037 +
  2038 + const BtnDraft= commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'BtnDraft') : '存草稿' ;
  2039 +
  2040 + const BtnPriceverification= commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'BtnPriceverification') : '核价' ;
  2041 +
  2042 + const BtnConfirmQuantity= commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'BtnConfirmQuantity') : '确认下单数量' ;
  2043 +
  2044 + const btnOrdering= commonUtils.isNotEmptyObject(props.app) ? commonFunc.showMessage(props.app.commonConst, 'btnOrdering') : '下单中...' ;
  2045 +
2033 2046 // 核价事件
2034 2047 const onCalcPrice = () => {
2035 2048 const addState = {
... ... @@ -2118,7 +2131,7 @@ const ManyComponent = props =&gt; {
2118 2131 {enabled && (
2119 2132 <div className={styles.btns}>
2120 2133 <Button type="primary" size="large" loading={loading} onClick={props.onAdd}>
2121   - 新报价
  2134 + {BtnNewQuotation}
2122 2135 </Button>
2123 2136 <Button
2124 2137 type="primary"
... ... @@ -2128,10 +2141,10 @@ const ManyComponent = props =&gt; {
2128 2141 props.onSaveDraft();
2129 2142 }}
2130 2143 >
2131   - 存草稿
  2144 + {BtnDraft}
2132 2145 </Button>
2133 2146 <Button type="primary" size="large" loading={loading || calcPriceLoading} className={styles.calcPrice} onClick={onCalcPrice}>
2134   - {calcPriceLoading ? `核价中【进度${processPercent}%】...` : "核价"}
  2147 + {calcPriceLoading ? `核价中【进度${processPercent}%】...` : BtnPriceverification}
2135 2148 </Button>
2136 2149 <Button
2137 2150 type="primary"
... ... @@ -2158,7 +2171,7 @@ const ManyComponent = props =&gt; {
2158 2171 );
2159 2172 }}
2160 2173 >
2161   - {submitLoading ? `下单中...` : "确认下单数量"}
  2174 + {submitLoading ? btnOrdering : BtnConfirmQuantity}
2162 2175 </Button>
2163 2176 </div>
2164 2177 )}
... ... @@ -2426,9 +2439,9 @@ const BackendParamsExtraComponent = props =&gt; {
2426 2439  
2427 2440 const viewConfigs = backendParamsConfig.map((item, index) => ({
2428 2441 ...item,
2429   - sName: `sParams${index}`,
  2442 + sName: item.sFieldName || `sParams${index}`,
2430 2443 showName: item.sParam,
2431   - sDropDownType: "sql",
  2444 + sDropDownType: item.sParamDropDown ? "sql" : "",
2432 2445 iColValue: 4,
2433 2446 }));
2434 2447  
... ... @@ -2467,7 +2480,15 @@ const BackendParamsExtraComponent = props =&gt; {
2467 2480 onDataChange: (name, sFieldName, changeValue, sId, dropDownData, isWait) => {
2468 2481 const iIndex = slaveData.findIndex(item => item.sId === slaveRowData.sId);
2469 2482 const iIndex1 = slaveData[iIndex].sBackProcessData.findIndex(item => item[sParentFieldsName]);
2470   - const dropDownDataSelected = dropDownData.find(item => item.sId === changeValue[sFieldName]);
  2483 + const showConfig = viewConfigs.find(item => item.sName === sFieldName);
  2484 + const dropDownDataSelected = dropDownData?.length
  2485 + ? dropDownData.find(item => item.sId === changeValue[sFieldName])
  2486 + : {
  2487 + sId: commonUtils.createSid(),
  2488 + value: changeValue[sFieldName],
  2489 + sParam: showConfig.sParam,
  2490 + [sFieldName]: changeValue[sFieldName],
  2491 + };
2471 2492 const { sParam } = dropDownDataSelected;
2472 2493 const { sBackendParams = [] } = slaveData[iIndex].sBackProcessData[iIndex1];
2473 2494 const iIndex2 = sBackendParams.findIndex(item => item.sParam === sParam);
... ... @@ -2477,6 +2498,13 @@ const BackendParamsExtraComponent = props =&gt; {
2477 2498 sBackendParams.push(dropDownDataSelected);
2478 2499 }
2479 2500 slaveData[iIndex].sBackProcessData[iIndex1].sBackendParams = sBackendParams;
  2501 + if (!showConfig.sName?.startsWith("sParams")) {
  2502 + slaveData[iIndex].sBackProcessData[iIndex1][showConfig.sName] = dropDownDataSelected[showConfig.sName];
  2503 + const { dManualLength, dManualWidth } = slaveData[iIndex].sBackProcessData[iIndex1];
  2504 + if (dManualLength !== undefined && dManualWidth !== undefined) {
  2505 + slaveData[iIndex].sBackProcessData[iIndex1].dManualValue = dManualLength * dManualWidth;
  2506 + }
  2507 + }
2480 2508 props.setState(pre => ({ ...pre, slaveData }));
2481 2509 },
2482 2510 };
... ...