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

陈鑫涛
2 parents 3b7be223 2b8dc8a6
Showing 7 changed files with 104 additions and 84 deletions
src/components/Common/CommonBillEvent.js
src/components/Common/CommonJurisdictionNewEvent.js
src/components/Common/Tree/StaticTree.js
src/components/CommonSystemSettingEvent/TabSysParamsIcon.js
src/components/JurisdictionAllotEvent/SystemPermissionInfo.js
src/components/QuickQuote/index.jsx
src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js
@@ -6884,7 +6884,7 @@ export default (ChildComponent) =&gt; {
           /* 要把数据以表格的形式显示出来 */
           const sParamJsonObj = JSON.parse(paramType);
           for (const key of Object.keys(sParamJsonObj)) {
-            if (key.includes('sParam') && !key.includes('DropDown') && !key.includes('Default')) {
+            if (key.includes('sParam') && !key.includes('DropDown') && !key.includes('Default') && !key.includes('FieldName')) {
               const obj = {};
               obj.sId = commonUtils.createSid();
               obj.sParamKey = key;
@@ -348,6 +348,8 @@ export default (ChildComponent) =&gt; {
     }
     // 模拟config的 gdsconfigformslave 配置
     imitateTableConfig = (title, dataIndex, width) => {
+      console.log('222app',this.props.app);
+      const {userinfo} = this.props.app;
       return {
         bCanInput: false,
         bFilter: false,
@@ -370,8 +372,8 @@ export default (ChildComponent) =&gt; {
         sId: commonUtils.createSid(),
         sParentId: '11811781131121915102156308120',
         sSubsidiaryId: '1111111111',
-        showName: title,
-        sName: dataIndex,
+        showName: dataIndex,
+        sName: userinfo.sLanguage === 'sEnglish' ? dataIndex : title,
       };
     }
     // 根据模拟列，模拟列配置
@@ -636,6 +638,8 @@ export default (ChildComponent) =&gt; {
     }
     /** 按钮操作事件 */
     handleButtonClick = (name, isFresh) => {
+      const selectUserPermission = commonFunc.showLocalMessage(this.props, 'selectUserPermission', '选择用户权限');
+      const selectGroupPerssion = commonFunc.showLocalMessage(this.props, 'selectGroupPerssion', '选择组权限');
       if (name.includes('BtnRepairGroup')) {
         const { sJurisdictionClassifyId } = this.props;
         if (commonUtils.isNotEmptyArr(sJurisdictionClassifyId)) {
@@ -651,7 +655,7 @@ export default (ChildComponent) =&gt; {
             }
           }
         } else {
-          message.error('请选择组权限');
+          message.error(selectGroupPerssion);
         }
       } else if (name.includes('BtnRepairUser')) {
         const { userViewSelectedRowKeys } = this.props;
@@ -668,7 +672,7 @@ export default (ChildComponent) =&gt; {
             }
           }
         } else {
-          message.error('请选择用户权限');
+          message.error(selectUserPermission);
         }
       } else if (name === 'BtnOut') {
         this.handleOut();
@@ -12,6 +12,7 @@ import StaticEditTable from &#39;../CommonTable&#39;;/* 可编辑表格 */
 import * as commonUtils from '../../../utils/utils';
 import styles from './Tree.css';
 import AntdDraggableModal from '../AntdDraggableModal';
+import * as commonFunc from "@/components/Common/commonFunc";
 const SearchModule = Input.Search;
@@ -324,13 +325,15 @@ class TreeComponent extends Component {
   };
   render() {
     const treeProps = this.getTreeProps();
+    const PermissionContent = commonFunc.showLocalMessage(this.props, 'PermissionContent', '权限内容');
+    const pleaseInputKeyWord = commonFunc.showLocalMessage(this.props, "pleaseInputKeyWord", "请输入你想要搜索的关键字");
     return (
       <FormItem className={styles.subForm}>
         <div className={styles.tableOption}>
           <div id="staticEditTree" ref={ref => { this.treeRef = ref; }}>
             {this.props.isSearch ?
               <SearchModule
-                placeholder="请输入你想要搜索的关键字"
+                placeholder={pleaseInputKeyWord}
                 disabled={false}
                 onChange={this.handleChange}
                 onSearch={this.handleSearch}
@@ -344,7 +347,7 @@ class TreeComponent extends Component {
             {
               this.props.isSearch ?
                 <div className={styles.advColTitle} >
-                  <div className={styles.advColCt}> <Checkbox style={{ marginRight:'5px' }} onChange={e => this.handleButtonClick(e,e.target.checked ? 'checkedAll' : 'unChecked')} /> 权限内容</div>
+                  <div className={styles.advColCt}> <Checkbox style={{ marginRight:'5px' }} onChange={e => this.handleButtonClick(e,e.target.checked ? 'checkedAll' : 'unChecked')} /> {PermissionContent}</div>
                   <div className={styles.advColExpand}>
                     <button
                       className={`table-expAllIcon ant-table-row-expand-icon ${this.tableCollapsed ? 'ant-table-row-expand-icon-collapsed' : ''}`}
@@ -2,6 +2,7 @@
 import React, { useEffect, useState } from "react";
 import { Form, Col, Upload, Image as ImageNew, message } from "antd-v4";
 import commonConfig from "@/utils/config";
+import * as commonFunc from "@/components/Common/commonFunc";
 // 判断图片是否存在
 const checkImgExists = (imgUrl, success, error) => {
@@ -24,14 +25,21 @@ const TabSysParamIcon = props =&gt; {
   const refresh = () => {
     setRefresher(pre => pre + 1);
   };
+  const WebHeadIcon = commonFunc.showLocalMessage(props, 'WebHeadIcon', '标签页icon');
+  const LoginIcon = commonFunc.showLocalMessage(props, 'LoginIcon', '登录页icon');
+  const copyrightLogo = commonFunc.showLocalMessage(props, 'copyrightLogo', '版权logo');
+  const IndexPageLogo = commonFunc.showLocalMessage(props, 'WebHeadIcon', '主页logo');
+  const backSysLogo = commonFunc.showLocalMessage(props, 'backSysLogo', '后台登录logo');
+  const backSysNavLogo = commonFunc.showLocalMessage(props, 'backSysNavLogo', '后台导航logo');
+
   const [iconData, setIconData] = useState([
-    { title: "标签页icon", imageUrl: "" },
-    { title: "登录页logo", imageUrl: "" },
-    { title: "主页logo", imageUrl: "" },
-    { title: "版权logo", imageUrl: "" },
-    { title: "后台登陆logo", imageUrl: "" },
-    { title: "后台导航logo", imageUrl: "" }
+    { title: WebHeadIcon, imageUrl: "" },
+    { title: LoginIcon, imageUrl: "" },
+    { title: IndexPageLogo, imageUrl: "" },
+    { title: copyrightLogo, imageUrl: "" },
+    { title: backSysLogo, imageUrl: "" },
+    { title: backSysNavLogo, imageUrl: "" }
   ]);
   // 获取默认数据
@@ -115,6 +115,11 @@ const SystemPermissionComponent = Form.create({
   const sCopyGroup = commonUtils.isNotEmptyObject(commonFunc.showMessage(app.commonConst, 'sCopyGroup')) ? commonFunc.showMessage(app.commonConst, 'sCopyGroup') : '复制组权限';/* 复制组权限 */
   const sCopyUser = commonUtils.isNotEmptyObject(commonFunc.showMessage(app.commonConst, 'sCopyUser')) ? commonFunc.showMessage(app.commonConst, 'sCopyUser') : '复制人员权限';/* 复制组权限 */
+  const tabLookUserPermission = commonFunc.showLocalMessage(props, 'tabLookUserPermission', '查看用户权限');
+  const searchUserPermission = commonFunc.showLocalMessage(props, 'searchUserPermission', '查询用户权限');
+  const searchGroupPermission = commonFunc.showLocalMessage(props, 'searchGroupPermission', '查询用户权限');
+  const GroupPermisson = commonFunc.showLocalMessage(props, 'GroupPermisson', '组权限');
+
   /*   回带表单   */
   onReturnForm(form);
   return (
@@ -123,7 +128,7 @@ const SystemPermissionComponent = Form.create({
         <Header className={styles.header}>
           <Toolbar {...props} />
         </Header>
-        <Layout className={selfstyles.clayout} >
+        <Layout className={selfstyles.clayout}>
           <Content className={styles.content}>
             <Layout className={styles.clayoutJur} id="SysPermissionList">
               <div style={{
@@ -133,32 +138,32 @@ const SystemPermissionComponent = Form.create({
               <Row type="flex" justify="space-between">
                 <Col span={9} style={{ }}>
                   <div id="slaveTabs">
-                    <Tabs onChange={props.onTabChange} className={styles.slaveTabs} size="large" tabBarStyle={{ margin: '10 0px' }}>
-                      <TabPane tab="组权限" key={2} >
+                    <Tabs onChange={props.onTabChange} className={styles.slaveTabs} size="large" tabBarStyle={{ margin: "10 0px" }}>
+                      <TabPane tab={GroupPermisson} key={2}>
                         <Row>
-                          <Search placeholder="查询组权限" allowClear onSearch={props.onSearchGroup} style={{ width: '64%', margin: '10px 1px' }} />
+                          <Search placeholder={searchGroupPermission} allowClear onSearch={props.onSearchGroup} style={{ width: "64%", margin: "10px 1px" }} />
                         </Row>
                         <Row>
-                          <Col span={24} key="1" >
+                          <Col span={24} key="1">
                             <div className="xly-bill-list">
                               <StaticEditTable {...groupProps} noVlist footer="hidden" />
                             </div>
                           </Col>
                         </Row>
-                        <Row style={{ marginTop: '8px' }}>
-                          <Col span={24} key="2" >
+                        <Row style={{ marginTop: "8px" }}>
+                          <Col span={24} key="2">
                             <div className="xly-bill-list">
                               <StaticEditTable {...userGroupProps} footer="hidden" />
                             </div>
                           </Col>
                         </Row>
                       </TabPane>
-                      <TabPane tab="查看用户权限" key={3} >
+                      <TabPane tab={tabLookUserPermission} key={3}>
                         <Row>
-                          <Search placeholder="查询用户权限" allowClear onSearch={props.onSearchUser} style={{ width: '64%', margin: '10px 1px' }} />
+                          <Search placeholder={searchUserPermission} allowClear onSearch={props.onSearchUser} style={{ width: "64%", margin: "10px 1px" }} />
                         </Row>
                         <Row>
-                          <Col span={24} key="3" >
+                          <Col span={24} key="3">
                             <div className="xly-bill-list">
                               <StaticEditTable {...userProps} footer="hidden" />
                             </div>
@@ -173,9 +178,9 @@ const SystemPermissionComponent = Form.create({
                     </Tabs>
                   </div>
                 </Col>
-                <Col span={15} style={{ marginTop: 40, paddingLeft: '17px' }}>
+                <Col span={15} style={{ marginTop: 40, paddingLeft: "17px" }}>
                   <Row>
-                    <Col span={24} className="xly-jurisdiction" >
+                    <Col span={24} className="xly-jurisdiction">
                       <StaticEditTree {...treeProps} />
                     </Col>
                   </Row>
@@ -184,23 +189,22 @@ const SystemPermissionComponent = Form.create({
             </Layout>
           </Content>
           <div>
-            {
-              (groupModalVisible) ?
-                <AntdDraggableModal
-                  title={sCopyGroup}
-                  visible={groupModalVisible}
-                  onOk={props.onCopyGroupModalOk}
-                  onCancel={props.onModalCance.bind(this, 'groupModalVisible')}
-                  width={800}
-                  bodyStyle={{ height: 350, zIndex: 2000 }}
-                  okButtonProps={{ style: { marginRight: '5px' } }}
-                >
-                  <div className="contextMenuStyle" >
-                    <FormItem className="searchMainForm">
-                      <Row type="flex" style={{ height: 'auto', overflow: 'hidden' }}>
-                        { commonUtils.isNotEmptyArr(sToGroupConfig) ?
-                          sToGroupConfig.map((child) => {
-                            const sMemo = child.sName.toLowerCase().endsWith('memo');
+            {groupModalVisible ? (
+              <AntdDraggableModal
+                title={sCopyGroup}
+                visible={groupModalVisible}
+                onOk={props.onCopyGroupModalOk}
+                onCancel={props.onModalCance.bind(this, "groupModalVisible")}
+                width={800}
+                bodyStyle={{ height: 350, zIndex: 2000 }}
+                okButtonProps={{ style: { marginRight: "5px" } }}
+              >
+                <div className="contextMenuStyle">
+                  <FormItem className="searchMainForm">
+                    <Row type="flex" style={{ height: "auto", overflow: "hidden" }}>
+                      {commonUtils.isNotEmptyArr(sToGroupConfig)
+                        ? sToGroupConfig.map(child => {
+                            const sMemo = child.sName.toLowerCase().endsWith("memo");
                             let enabledNew = !child.bReadonly;
                             if (child.iTag === 1) {
                               enabledNew = false;
@@ -208,7 +212,7 @@ const SystemPermissionComponent = Form.create({
                               enabledNew = true;
                             }
                             const showTypeProps = {
-                              name: 'slave',
+                              name: "slave",
                               form,
                               record: {},
                               sId: commonUtils.createSid(),
@@ -221,42 +225,42 @@ const SystemPermissionComponent = Form.create({
                               showConfig: child,
                               textArea: sMemo,
                               enabled: enabledNew,
-                              dataValue: commonUtils.isNotEmptyObject(masterData) ? masterData[child.sName] : '',
+                              dataValue: commonUtils.isNotEmptyObject(masterData) ? masterData[child.sName] : "",
                               bTable: true,
                               formRoute: props.formRoute,
                               formItemLayout: {},
                             };
                             return (
-                              <Col key={child.sId} span={24} order={child.iOrder} className="ContextMenuCol" style={{ border: '1px solid #d3d3d3' }}>
+                              <Col key={child.sId} span={24} order={child.iOrder} className="ContextMenuCol" style={{ border: "1px solid #d3d3d3" }}>
                                 <ShowType {...showTypeProps} />
                               </Col>
                             );
-                          }) : ''
-                        }
-                      </Row>
-                    </FormItem>
-                  </div>
-                </AntdDraggableModal>
-                : ''
-            }
+                          })
+                        : ""}
+                    </Row>
+                  </FormItem>
+                </div>
+              </AntdDraggableModal>
+            ) : (
+              ""
+            )}
-            {
-              (userModalVisible) ?
-                <AntdDraggableModal
-                  title={sCopyUser}
-                  visible={userModalVisible}
-                  onOk={props.onCopyUserModalOk}
-                  onCancel={props.onModalCance.bind(this, 'userModalVisible')}
-                  width={800}
-                  bodyStyle={{ height: 350, zIndex: 2000 }}
-                  okButtonProps={{ style: { marginRight: '5px' } }}
-                >
-                  <div className="contextMenuStyle" >
-                    <FormItem className="searchMainForm">
-                      <Row type="flex" style={{ height: 'auto', overflow: 'hidden' }}>
-                        { commonUtils.isNotEmptyArr(sToUserConfig) ?
-                          sToUserConfig.map((child) => {
-                            const sMemo = child.sName.toLowerCase().endsWith('memo');
+            {userModalVisible ? (
+              <AntdDraggableModal
+                title={sCopyUser}
+                visible={userModalVisible}
+                onOk={props.onCopyUserModalOk}
+                onCancel={props.onModalCance.bind(this, "userModalVisible")}
+                width={800}
+                bodyStyle={{ height: 350, zIndex: 2000 }}
+                okButtonProps={{ style: { marginRight: "5px" } }}
+              >
+                <div className="contextMenuStyle">
+                  <FormItem className="searchMainForm">
+                    <Row type="flex" style={{ height: "auto", overflow: "hidden" }}>
+                      {commonUtils.isNotEmptyArr(sToUserConfig)
+                        ? sToUserConfig.map(child => {
+                            const sMemo = child.sName.toLowerCase().endsWith("memo");
                             let enabledNew = !child.bReadonly;
                             if (child.iTag === 1) {
                               enabledNew = false;
@@ -264,7 +268,7 @@ const SystemPermissionComponent = Form.create({
                               enabledNew = true;
                             }
                             const showTypeProps = {
-                              name: 'slave',
+                              name: "slave",
                               form,
                               record: {},
                               sId: commonUtils.createSid(),
@@ -277,24 +281,25 @@ const SystemPermissionComponent = Form.create({
                               showConfig: child,
                               textArea: sMemo,
                               enabled: enabledNew,
-                              dataValue: commonUtils.isNotEmptyObject(masterData) ? masterData[child.sName] : '',
+                              dataValue: commonUtils.isNotEmptyObject(masterData) ? masterData[child.sName] : "",
                               bTable: true,
                               formRoute: props.formRoute,
                               formItemLayout: {},
                             };
                             return (
-                              <Col key={child.sId} span={24} order={child.iOrder} className="ContextMenuCol" style={{ border: '1px solid #d3d3d3' }}>
+                              <Col key={child.sId} span={24} order={child.iOrder} className="ContextMenuCol" style={{ border: "1px solid #d3d3d3" }}>
                                 <ShowType {...showTypeProps} />
                               </Col>
                             );
-                          }) : ''
-                        }
-                      </Row>
-                    </FormItem>
-                  </div>
-                </AntdDraggableModal>
-                : ''
-            }
+                          })
+                        : ""}
+                    </Row>
+                  </FormItem>
+                </div>
+              </AntdDraggableModal>
+            ) : (
+              ""
+            )}
           </div>
@@ -2497,8 +2497,8 @@ const BackendParamsExtraComponent = props =&gt; {
   const viewConfigs = backendParamsConfig.map((item, index) => ({
     ...item,
-    sName0: `sParams${index + 1}`,
-    sName: item.sFieldName || `sParams${index + 1}`,
+    sName0: `sParam${index + 1}`,
+    sName: item.sFieldName || `sParam${index + 1}`,
     showName: item.sParam,
     sDropDownType: item.sParamDropDown ? "sql" : "",
     iColValue: 4,
@@ -2395,7 +2395,7 @@ class QuotationPackTableTree extends Component {
           return {
             ...item,
             sId: manyqtysData[index] ? manyqtysData[index].sId : item.sId,
-            handleType: dQuickQuoteProductQty ? 'add' : (manyqtysDataOld[index].handleType || item.handleType)
+            handleType: dQuickQuoteProductQty ? 'add' : (manyqtysDataOld[index]?.handleType || item.handleType)
           }
         });
         if (cacheIndex === -1 && manyqtysData?.some(item => item.manyData)) {