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

陈鑫涛
2 parents f63da69c 32c85d75
Showing 8 changed files with 65 additions and 21 deletions
src/components/Common/AffixMenu.js
src/components/Common/CommonBase.js
src/components/Common/CommonTable/index.js
src/components/Common/PersonCenter/PersonCenter.js
src/components/FaceDetect/index.js
src/components/QuickQuote/index.jsx
src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js
src/routes/tab/tab.js
@@ -349,7 +349,12 @@ class AffixMenuComponent extends Component {
     const columniFitWidth = commonFunc.showMessage(app.commonConst, 'columniFitWidth');/* 宽度 */
     const columnbVisible = commonFunc.showMessage(app.commonConst, 'columnbVisible');/* 是否显示 */
     const columnsName = commonFunc.showMessage(app.commonConst, 'columnsName');/* 字段名 */
+    const columnsReadOnly = commonFunc.showMessage(app.commonConst, 'columnsReadOnly') || '是否只读';/* 是否自读 */
+    const columnsFontColor = commonFunc.showMessage(app.commonConst, 'columnsFontColor') || '字体颜色';/* 字体颜色 */
     const isDefault = commonFunc.showMessage(app.commonConst, 'isDefault');/* 是否设置默认 */
+    const BtnSure = commonFunc.showMessage(app.commonConst, 'BtnSure') || '确认';/* 按钮确认 */
+    const BtnCancel = commonFunc.showMessage(app.commonConst, 'BtnCancel') || '取消';/* 按钮取消 */
+    const selectAll = commonFunc.showMessage(app.commonConst, 'selectAll') || '全选';/* 全选 */
     // eslint-disable-next-line no-unused-vars
     Object.keys(modalData).forEach((child, i) => {
       const splitArr = commonUtils.isNotEmptyObject(child) && commonUtils.isNotEmptyArr(child.split('_')) ? child.split('_') : [];
@@ -404,11 +409,11 @@ class AffixMenuComponent extends Component {
             visible += 1;
           }
         }
-        checkAll = <span>全选&nbsp;&nbsp;<Checkbox indeterminate={visible !== len && visible} defaultChecked={visible === len} onChange={e => this.onCheckAll(e, child, count, configId)} /></span>;
+        checkAll = <span>{selectAll}&nbsp;&nbsp;<Checkbox indeterminate={visible !== len && visible} defaultChecked={visible === len} onChange={e => this.onCheckAll(e, child, count, configId)} /></span>;
       }
       if (this.props.app.userinfo.sType === 'sysadmin' || true) { /* 管理员设置列是否可修改 */
         columns.push({
-          title: '是否只读',
+          title: columnsReadOnly,
           dataIndex: 'bReadonly',
           render: (text, record) => this.renderColumns(text, 'bReadonly', configId, record),
           width: 80,
@@ -416,7 +421,7 @@ class AffixMenuComponent extends Component {
       }
       if (this.props.app.userinfo.sType === 'sysadmin' || true) { /* 管理员设置列颜色 */
         columns.push({
-          title: '字体颜色',
+          title: columnsFontColor,
           dataIndex: 'sFontColor',
           render: (text, record) => this.renderColumns(text, 'sFontColor', configId, record),
           width: 80,
@@ -484,6 +489,8 @@ class AffixMenuComponent extends Component {
                 onCancel={this.handlePpopUpPaneCancel.bind(this)}
                 onOk={this.handleOk.bind(this)}
                 width={1000}
+                okText={BtnSure}
+                cancelText={BtnCancel}
               >
                 <div className={styles.modalsContent}>
                   {
@@ -981,6 +981,9 @@ export default (ChildComponent) =&gt; {
            * 原代码：
            */
           let billNum = '';
+          let footTotalStr = '';
+          const footTotal =commonFunc.showMessage(this.props.app.commonConst, 'footTotal') ||
+            '当前显示 共${billNum}个单据 共${total}条记录';
           if (dataReturn.dataset.billNum) {
             billNum = `共${dataReturn.dataset.billNum}个单据 `;
           }
@@ -993,8 +996,9 @@ export default (ChildComponent) =&gt; {
             current: dataReturn.dataset.currentPageNo,
             pageSize: pageSize,
             showTotal: (total) => {
+              footTotalStr =  footTotal.replace('${billNum}', dataReturn.dataset.billNum).replace('${total}', total);
               return (
-                <span style={{fontWeight: 'bold'}}>{`当前显示 ${billNum}共${total}条记录`}</span>
+                <span style={{fontWeight: 'bold'}}>{footTotalStr}</span>
               );
             },
           };
@@ -2858,6 +2858,7 @@ class CommonTableRc extends React.Component {
       let sAlumitePopup = false; /* 选择电化铝 */
       let bCopyMore = false; /* 复制多行 */
       let bReplace = false; /* 替换数据 */
+      const setOperation = commonFunc.showMessage(props.app.commonConst, 'operation') || '操作';
       const bShowTreeAdd = props.tableProps.bShowTreeAdd && this.findIsExistByControlName(props, 'BtnAdd'); /* 添加树节点 */
       const bShowTreeAddChild = props.tableProps.bShowTreeAddChild && this.findIsExistByControlName(props, 'BtnAddChildNode'); /* 添加树节点 */
       const bShowTreeDel = props.tableProps.bShowTreeDel && this.findIsExistByControlName(props, 'BtnDel'); /* 添加树节点 */
@@ -3185,7 +3186,7 @@ class CommonTableRc extends React.Component {
             style={{
               width: '100%', height: '100%', display: 'flex', justifyContent: 'left', textDecoration: 'none',
             }}
-          >操作 {uploadIcon ? <Upload {...divProps} disabled={!this.props.enabled}>
+          >{setOperation} {uploadIcon ? <Upload {...divProps} disabled={!this.props.enabled}>
             <a {...uploadProps}
                contenteditable="true"
                ref={(ref) => {this.uploadRef1 = ref;}}
@@ -4344,6 +4345,8 @@ class CommonTableRc extends React.Component {
     const { tableColumn, totalData, totalData1 } = this.state;
     const {  dNetMoney, dNetPrice } = this.props.app.decimals;
     const sModelsType = commonUtils.isNotEmptyObject(this.props) && commonUtils.isNotEmptyObject(this.props.app) ? this.props.app.currentPane.sModelsType : '';
+    const sumset = commonFunc.showMessage(this.props.app.commonConst, 'sumSet') || '合计';
+
     let colSpan = 0;
     if ((!totalData.length && !totalData1.length) || this.props.footer !== undefined) {
       return (<></>);
@@ -4363,7 +4366,7 @@ class CommonTableRc extends React.Component {
       let summaryCellTotal = '';
       summaryCellTotal = (
         <Table.Summary.Cell key={0} colSpan={colSpan ? colSpan: 1} index={0}>
-          <span className={styles.summaryCellTotal}>合计</span>
+          <span className={styles.summaryCellTotal}>{sumset}</span>
         </Table.Summary.Cell>
       );
       // if(this.props.slaveInfo) {
@@ -115,8 +115,9 @@ class PersonCenter extends Component {
       };
       dispatch({ type: 'app/addPane', payload: { pane } });
     } else if (e.key === 'clearOption') {
+      const recordDeletion = commonFunc.showMessage(this.props.app.commonConst, 'recordDeletion') || '记录删除';/* 人脸采集 */
       sessionStorage.clear();
-      this.clearSocket({ optName: '记录删除' });
+      this.clearSocket({ optName: recordDeletion });
       commonUtils.clearStoreDropDownData();
     } else if (e.key === 'about') {
       this.handleShowAbout();
@@ -858,7 +859,8 @@ const PersonCenterOnlineUser = Form.create({
     onlineUserState = {},
     onExitTbRow,
   } = props;
-  const OnlineUserName = '在线用户';
+  const OnlineUsers = commonFunc.showMessage(props.app.commonConst, 'OnlineUsers');/* 在线用户 */
+  const OnlineUserName = { OnlineUsers };
   // const ModifyPassword = commonFunc.showMessage(app.commonConst, 'ModifyPassword');/* 修改密码 */
   const onlineUserDataNew = commonUtils.isNotEmptyObject(onlineUserData) ? onlineUserData : {};
   const onlineUserConfig = {
@@ -6,6 +6,7 @@ import { Progress, message } from &#39;antd-v4&#39;;
 import * as commonServices from "../../services/services";
 import config from '@/utils/config';
 import './index.less';
+import * as commonFunc from "../Common/commonFunc";
  
 let token = '92d3bf5f3edcb55c731acb11b7f28202'; // 测试的删除token
  
@@ -407,7 +408,8 @@ class FaceDetect extends Component {
  
   render() {
     const enable = ((this.props.enabled && this.user_id !== '' )|| this.props.actionType === 'identifyFace');
-    return  (
+    const faceCollection = commonFunc.showMessage(this.props.app.commonConst, 'faceCollection') || '人脸采集';/* 人脸采集 */
+    return (
       <>
         <div className="face-recognition-container">
           <div className="face-recognition">
@@ -420,21 +422,28 @@ class FaceDetect extends Component {
               </div>
               <div className="tips">
                 <span>{this.state.statusContent}</span>
-                {
-                  (this.state.currentPercent > 0) && <Progress type="circle" percent={this.state.currentPercent} status={this.state.percentStatus}  width={20} strokeWidth={10} format={() => ''}/>
-                }
+                {this.state.currentPercent > 0 && (
+                  <Progress
+                    type="circle"
+                    percent={this.state.currentPercent}
+                    status={this.state.percentStatus}
+                    width={20}
+                    strokeWidth={10}
+                    format={() => ""}
+                  />
+                )}
               </div>
               <video id="video" autoPlay="autoplay"></video>
-              { this.state.thumbImg !== '' && <img src={this.state.thumbImg} className={"thumb-img"} alt=""/>}
+              {this.state.thumbImg !== "" && <img src={this.state.thumbImg} className={"thumb-img"} alt="" />}
               <div className="canvas-wrapper">
                 <canvas id="canvas" width="268" height="214"></canvas>
               </div>
-              <div className={`action ${enable ? '' : 'action_disabled'}`}>
+              <div className={`action ${enable ? "" : "action_disabled"}`}>
                 <div onClick={() => this.handleEvent(enable)} className="action-item">
                   <span className="action-item-icon">
                     <VideoCameraOutlined />
                   </span>
-                  <span>人脸采集</span>
+                  <span>{faceCollection}</span>
                 </div>
               </div>
             </div>
@@ -447,7 +456,7 @@ class FaceDetect extends Component {
         {/*  <Button onClick={this.getFaceList}>用户列表</Button>*/}
         {/*</div>*/}
       </>
-    )
+    );
   }
 }
  
@@ -436,7 +436,7 @@ const QuickQuoteEvent = props =&gt; {
         loading: true,
       },
       () => {
-        props.onButtonClick("BtnDraft");
+        props.onButtonClick("BtnDraft", true);
       }
     );
   };
@@ -763,6 +763,17 @@ const QuickQuoteEvent = props =&gt; {
           processAfterDataRow.sId = commonUtils.createSid();
           processAfterDataRow.sParentId = masterData.sId;
           processAfterDataRow.sControlId = partsDataRow.sId;
+
+          const sBackendParams = process.sBackendParams || [];
+          if (sBackendParams.length) {
+            const sQuoParams = sBackendParams.map(item => ({
+              sParamName: item.sParam,
+              sParamValue: item.value !== undefined ? item.value : "",
+              bSelfCbx: !(item.value === "" || item.value === undefined),
+            }));
+            processAfterDataRow.sQuoParams = JSON.stringify(sQuoParams);
+          }
+
           // processAfterDataRow.sSlaveId = ' ';
           processData.push(processAfterDataRow);
           // 配套工序
@@ -2340,6 +2340,7 @@ class QuotationPackTableTree extends Component {
     if(commonUtils.isNotEmptyObject(manyqtysConfig)) {
       data.push(commonBusiness.mergeData('manyqtys', `${manyqtysConfig.sTbName.toLowerCase()}_tmp`, manyqtysData?.map(item => {
         delete item.manyData;
+        item.handleType = item.handleType || 'update';
         return item;
       }), [], true));
     }
@@ -2389,11 +2390,12 @@ class QuotationPackTableTree extends Component {
       processData = this.sortData(controlData, processData);
       const addState = {};
       if(commonUtils.isNotEmptyObject(manyqtysConfig)) {
+        const manyqtysDataOld = cloneDeep(manyqtysData);
         manyqtysData = valueReturn[`${manyqtysConfig.sTbName.toLowerCase()}_tmp`]?.map((item, index) => {
           return {
             ...item,
             sId: manyqtysData[index] ? manyqtysData[index].sId : item.sId,
-            handleType: dQuickQuoteProductQty ? 'add' : item.handleType
+            handleType: dQuickQuoteProductQty ? 'add' : (manyqtysDataOld[index].handleType || item.handleType)
           }
         });
         if (cacheIndex === -1 && manyqtysData?.some(item => item.manyData)) {
@@ -6755,9 +6757,9 @@ class QuotationPackTableTree extends Component {
               }
             }
           } else { /* packData没数据时 */
-            const packDataRow = this.handlePackDataAdd(slaveItem, 0, tableDataRow.sId, 'add');
+            const packDataRow = this.handlePackDataAdd(slaveDataRow, 0, tableDataRow.sId, 'add');
             packDataRow.dCombineQty = tableDataRow.dSinglePQty;
-            packDataRow.dFactProductQty =  commonUtils.isNull(slaveItem.dProductQty, 0); /* 排版数为1时，实际生产数 = 产品数 */
+            packDataRow.dFactProductQty =  commonUtils.isNull(slaveDataRow.dProductQty, 0); /* 排版数为1时，实际生产数 = 产品数 */
             if (tableDataRow.dSinglePQty > 0) {
               const { sId, sProductNo, dProductQty, dCombineQty, dFactProductQty,sCombinePartsName  }= packDataRow;
               const tableCombineSelectedData =[];
@@ -75,6 +75,7 @@ import CommonNewListBill from &quot;@/routes/common/commonNewListBill&quot;; /* é€šç”¨å•æ
 import CommonGroupBill from "@/routes/common/commonGroupBill"; /* é€šç”¨å•æ®é¡µ */
 import PrintPdf from "../printPdf/printPdf"; /* å•é¢„è§ˆ */
 import Feedback from '../feedback/feedback';
+import * as commonFunc from "@/components/Common/commonFunc";
 /* è®¡ç®—æ–¹æ¡ˆs */
 const { confirm } = Modal;
 const { TabPane } = Tabs;
@@ -269,9 +270,12 @@ function Tab({ dispatch, app }) {
       }
     }
     if (app.diffMap && removePane[0] && app.diffMap.get(removePane[0].key)) {
+      const contentStr =  commonFunc.showMessage(app.commonConst, 'isLeave') || 'å†…å®¹æœªä¿å˜ï¼Œæ˜¯å¦ç¦»å¼€ï¼Ÿ';/* å†…å®¹æœªä¿å˜ï¼Œæ˜¯å¦ç¦»å¼€ï¼Ÿ */
+      const BtnSure = commonFunc.showMessage(app.commonConst, 'BtnSure') || 'ç¡®è®¤';/* æŒ‰é’®ç¡®è®¤ */
+      const BtnCancel = commonFunc.showMessage(app.commonConst, 'BtnCancel') || 'å–æ¶ˆ';/* æŒ‰é’®å–æ¶ˆ */
       confirm({
         icon: <ExclamationCircleOutlined />,
-        content: "å†…å®¹æœªä¿å˜ï¼Œæ˜¯å¦ç¦»å¼€ï¼Ÿ",
+        content: contentStr,
         onOk() {
           removeData.forEach(i => {
             clearWebSocketMsg(i);
@@ -281,6 +285,8 @@ function Tab({ dispatch, app }) {
         onCancel() {
           console.log("å–æ¶ˆå…³é—");
         },
+        okText:BtnSure,
+        cancelText:BtnCancel
       });
     } else {
       removeData.forEach(i => {