1711

src/global.less

@@ -432,7 +432,7 @@ ol {
     width: 5px;
     /*高宽分别对应横竖滚动条的尺寸*/
 
-    height: 5px;
+    height: 8px;
 
   }
 

src/pages/lease/devicedata/index.jsx

@@ -159,7 +159,7 @@ const Devicedata = () => {
         </div>
         <div className={styles.ledgercontent}>
             <div className={`${styles.ledgerleft} boxcontianbox`}>
-                <TreeRender url="/auth/sysFactory/getTree" onselected={onselecteTree} noaction={true} maxWidth={215} />
+                <TreeRender url="/auth/sysFactory/getFactoryTree" onselected={onselecteTree} noaction={true} maxWidth={215} />
             </div>
             <div className={`${styles.ledgerright} ledgerf boxcontianbox`}>
                 <Tabs destroyInactiveTabPane activeKey={activeKey} onChange={(key) => {

src/pages/lease/ledger/columns.js

@@ -139,7 +139,7 @@ function getcolumns(setdrawer) {
                 hideInTable: true,
                 hideInDescriptions: true,
                 colProps: { span: 8 },
-                options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
+                options: { path: '/auth/sysFactory/getFactorySelectBox', params: {} },
                 formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
                 fieldProps: {
                     disabled: true
@@ -150,7 +150,7 @@ function getcolumns(setdrawer) {
                 dataIndex: 'factoryName',
                 key: 'factoryId',
                 valueType: 'select',
-                options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
+                options: { path: '/auth/sysFactory/getFactorySelectBox', params: {} },
                 hideInForm: true,
                 colProps: { span: 8 },
                 fieldProps: {
@@ -165,7 +165,7 @@ function getcolumns(setdrawer) {
                 hideInSearch: true,
                 hideInTable: true,
                 valueType: 'select',
-                options: { path: '/auth/sysShop/getShopSelectionByFactory', linkParams: { factoryId: '' } },
+                options: { path: '/auth/sysShop/getShopSelectBox', linkParams: { factoryId: '' } },
                 formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
                 colProps: { span: 8 },
                 fieldProps: {
@@ -181,7 +181,7 @@ function getcolumns(setdrawer) {
                 hideInTable: true,
                 valueType: 'select',
                 options: {
-                    path: '/auth/sysSection/getAllSectionSelectionByShop',
+                    path: '/auth/sysSection/getSectionSelectBox',
                     linkParams: { shopId: '' },
                 },
                 colProps: { span: 8 }
@@ -194,7 +194,7 @@ function getcolumns(setdrawer) {
                 hideInSearch: true,
                 hideInTable: true,
                 options: {
-                    path: '/auth/sysProductionLine/getAllProductLineSelectionByShop',
+                    path: '/auth/sysProductionLine/getProductLineSelectBox',
                     linkParams: { shopId: '' },
                 },
                 colProps: { span: 8 }

src/pages/lease/ledger/index.jsx

@@ -342,7 +342,7 @@ const Ledger = () => {
         </div>
         <div className={styles.ledgercontent}>
             <div className={`${styles.ledgerleft} boxcontianbox`}>
-                <TreeRender url="/auth/sysFactory/getTree" onselected={onselecteTree} noaction={true} maxWidth={215} />
+                <TreeRender url="/auth/sysFactory/getFactoryTree" onselected={onselecteTree} noaction={true} maxWidth={215} />
             </div>
             <div className={`${styles.ledgerright} boxcontianbox`}>
                 <AutoTable

src/pages/setting/users/columns.js

@@ -291,6 +291,34 @@ function getcolumns(setDrawer, ifs, formRef, isLease) {
       hideInForm: true,
       hideInTable: true,
     },
+    {
+      title: '负责工厂',
+      dataIndex: 'factoryNames',
+      key: 'factoryIdList',
+      fieldProps: {
+        placeholder: '请选择',
+        showSearch: true,
+        mode: 'multiple',
+        disabled: true
+      },
+      width: 120,
+      valueType: 'select',
+      options: {
+        linkParams: {
+          customerId: 'id',
+        },
+        path: '/lease/umLeaseCustomer/getFactorySelectionByCustomerId'
+      },
+      showAll: true,
+      hideInTable: true,
+      hideInSearch: true,
+      hideInDescriptions: true,
+      hideInForm: {
+        customerType: {
+          reverse: [2],
+        },
+      },
+    },
     {
       title: '负责工厂',
       dataIndex: 'factoryNames',
@@ -305,7 +333,12 @@ function getcolumns(setDrawer, ifs, formRef, isLease) {
       searchKey: 'factoryNames',
       searchValueType: 'input',
       options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
-      showAll: true
+      showAll: true,
+      hideInForm: {
+        customerType: {
+          reverse: [1],
+        },
+      },
     },
     {
       title: '负责车间',

src/pages/setting/users/index.jsx

@@ -155,8 +155,19 @@ function User(props) {
           }
         });
       }
+      if (i == 'customerId') {
+        console.log(changedValues[i]);
+        doFetch({ url: '/lease/umLeaseCustomer/getFactorySelectionByCustomerId', params: { id: changedValues[i] } }).then(res => {
+          if (res.code == '0000') {
+            setDrawer((s) => ({
+              ...s,
+              item: { ...(s?.item ?? {}), factoryIdList: res?.data?.dataList?.map(it => it.value) ?? [] }
+            }));
+            formRef?.current?.setFieldsValue({ factoryIdList: res?.data?.dataList?.map(it => it.value) ?? [] });
+          }
+        })
+      }
     }
-
   }
   function selectType(type) {
     switch (type) {
@@ -301,6 +312,7 @@ function User(props) {
       />
 
       <DrawerPro
+        {...drawer}
         fields={columns}
         // detailpath={urlParams.detail}
         // params={{ id: drawer?.item?.id }}
@@ -313,7 +325,6 @@ function User(props) {
             visible: false,
           }));
         }}
-        {...drawer}
       >
         {selectType(drawer?.type)}
       </DrawerPro>