1219

config/proxy.js

@@ -13,7 +13,7 @@ export default {
   dev: {
     [defaultSetting.proxypath]: {
       // 要代理的地址
-      target: 'http://192.168.40.64:28000', //jf哥
+      target: 'http://192.168.40.64:28001', //jf哥
       // target: 'http://192.168.40.203:8000', //dj哥
       changeOrigin: true,
     },

src/components/RightContent/AvatarDropdown.jsx

@@ -151,11 +151,6 @@ const AvatarDropdown = ({ menu }) => {
 
   const menuHeaderDropdown = (
     <Menu className={styles.menu} selectedKeys={[]} onClick={onMenuClick}>
-      <Menu.Item key="changepwd">
-        <LockOutlined />
-        修改密码
-      </Menu.Item>
-      <Menu.Divider />
       <Menu.Item key="logout">
         <LogoutOutlined />
         退出登录

src/global.less

@@ -58,13 +58,14 @@ ol {
     width: 100%;
     overflow-x: auto;
 
-    &-thead > tr,
-    &-tbody > tr {
-      > th,
-      > td {
+    &-thead>tr,
+    &-tbody>tr {
+
+      >th,
+      >td {
         white-space: pre;
 
-        > span {
+        >span {
           display: block;
         }
       }
@@ -313,7 +314,7 @@ ol {
 }
 
 .lightblue {
-  > td:first-child {
+  >td:first-child {
     position: relative;
 
     &::before {
@@ -335,14 +336,14 @@ ol {
   width: 100%;
   padding-left: 0 !important;
 
-  > span:first-child {
+  >span:first-child {
     flex: 1;
 
-    > span:first-child {
+    >span:first-child {
       display: none !important;
     }
 
-    > .ant-spin-nested-loading {
+    >.ant-spin-nested-loading {
       width: 100%;
     }
   }
@@ -396,7 +397,7 @@ ol {
 }
 
 .runtime-keep-alive-layout {
-  > div {
+  >div {
     height: 100% !important;
   }
 }
@@ -444,7 +445,7 @@ ol {
   min-height: 100% !important;
   overflow: hidden !important;
 
-  > div {
+  >div {
     height: 100%;
     min-height: calc(100vh - 96px);
   }
@@ -456,12 +457,12 @@ ol {
 
 // 横向滚动条
 .scrollHoriz {
-  > div {
+  >div {
     display: flex !important;
     flex-wrap: nowrap !important;
     align-items: center !important;
 
-    > div {
+    >div {
       flex-shrink: 0 !important;
     }
   }
@@ -473,3 +474,15 @@ ol {
     padding-left: 16px;
   }
 }
+
+.ant-layout {
+  aside {
+    z-index: 9999;
+  }
+}
+
+.runtime-keep-alive-layout {
+  aside {
+    z-index: 998;
+  }
+}
\ No newline at end of file

src/pages/device/account/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-11-10 09:39:56
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-19 10:45:52
+ * @Last Modified time: 2022-12-19 15:56:45
  */
 
 import * as React from 'react';
@@ -76,11 +76,11 @@ function Model(props) {
         },
         {
           title: '上传文件',
-          key: 'urlIds ',
+          key: 'urlIds',
           valueType: 'uploadDragger',
           // colProps: { span: 24 },
           fieldProps: {
-            limit: 5,
+            maxCount: 5,
           },
           formItemProps: {
             rules: [
@@ -124,7 +124,7 @@ function Model(props) {
         },
         {
           title: '',
-          key: 'urlIds ',
+          key: 'urlIds',
           valueType: 'uploadDragger',
           // colProps: { span: 24 },
           formItemProps: {
@@ -136,7 +136,7 @@ function Model(props) {
             ],
           },
           fieldProps: {
-            limit: 5,
+            maxCount: 5,
           },
           render: (text, row) => {
             return row?.urlIds.map((it) => {
@@ -690,6 +690,8 @@ function Model(props) {
       const [request, setrequest] = useState();
       useEffect(() => {
         const fn = async () => {
+            console.log('d');
+
             let res = await doFetch({
               url: '/base/paFormField/queryList',
               params: {
@@ -710,6 +712,7 @@ function Model(props) {
             }
           },
           fn2 = async () => {
+            console.log('d');
             const res = await doFetch({
               url: urlParams.detail,
               params: { id: drawer?.item?.id },
@@ -1467,11 +1470,11 @@ function Model(props) {
         },
         {
           title: '上传文件（上限为5个）',
-          key: 'urlIds ',
+          key: 'urlIds',
           valueType: 'UploadDragger',
           // colProps: { span: 24 },
           fieldProps: {
-            limit: 5,
+            maxCount: 5,
             name: 'file',
           },
           formItemProps: {
@@ -1501,7 +1504,7 @@ function Model(props) {
         },
         {
           title: '上传文件（上限为5个）',
-          key: 'urlIds ',
+          key: 'urlIds',
           valueType: 'UploadDragger',
           formItemProps: {
             rules: [
@@ -1513,7 +1516,7 @@ function Model(props) {
           },
           fieldProps: {
             name: 'file',
-            limit: 5,
+            maxCount: 5,
           },
         },
       ],
@@ -2208,15 +2211,12 @@ function Model(props) {
       </Layout>
       <DrawerPro
         fields={columns}
-        // detailpath="/ngic-auth/sysUser/query/detail"
-        // params={{ id: drawer?.item?.id }}
         formRef={formRef}
         placement="right"
         onClose={() => {
           setDrawer((s) => ({
             ...s,
             visible: false,
-            detailpath: '',
           }));
         }}
         {...drawer}

src/pages/device/supplier/columns.js

@@ -2,7 +2,7 @@ import { doFetch } from '@/utils/doFetch';
 import { Switch } from 'antd';
 import fieldsDetail from '@/utils/fieldsDetail';
 
-function getcolumns(setdrawer) {
+function getcolumns(ifs) {
   return [
     {
       title: '供应商编号',
@@ -103,12 +103,16 @@ function getcolumns(setdrawer) {
           value: 2,
         },
       ],
+      fieldProps: {
+        disabled: ifs,
+      },
       render: (text, row) => {
         return (
           <Switch
             checkedChildren="启用"
             unCheckedChildren="禁用"
             defaultChecked={row.status == 1}
+            disabled={row?.statusChangeable == 1 ? false : true}
             onChange={(flag) => {
               // //console.log(e);
               if (flag) {

src/pages/device/supplier/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-11-09 14:44:44
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-19 11:14:04
+ * @Last Modified time: 2022-12-19 14:18:44
  */
 
 import * as React from 'react';
@@ -116,6 +116,7 @@ function Supplier(props) {
       </PremButton>
     );
   };
+
   const Details = () => {
     const columns = [
       {
@@ -206,7 +207,6 @@ function Supplier(props) {
                 key: el.id,
               });
             });
-            console.log('1214', column);
             setnewfieldscolumns(column);
           }
         },
@@ -215,15 +215,11 @@ function Supplier(props) {
             url: urlParams.detail,
             params: { id: drawer?.item?.id },
           });
-          //console.log(res?.data?.data);
           let obj = {};
           res?.data?.data['equipmentSupplierCharList']?.forEach((it) => {
             obj[it?.fieldId] = it?.fieldRealValue;
           });
-          console.log('drawerpro:', {
-            ...(res?.data?.data ?? {}),
-            ...obj,
-          });
+
           setrequest(
             {
               ...(res?.data?.data ?? {}),
@@ -377,11 +373,10 @@ function Supplier(props) {
       case 'edit':
         return (
           <ExtendField
-            // defaultFormValue={drawer?.item}
             setDrawer={setDrawer}
             drawer={drawer}
             actionRef={actionRef}
-            columns={columns}
+            columns={drawer?.item?.statusChangeable == 1 ? getcolumns(false) : getcolumns(true)}
             formId={'3'}
             urlParams={urlParams}
             onFinish={async (vals) => {

src/pages/setting/production/columns.js

@@ -11,12 +11,11 @@ function getcolumns(ifs) {
     {
       title: '所属工厂',
       dataIndex: 'factoryName',
-      key: 'factoryId',
-      search: false,
-      width: 180,
       fieldProps: {
-        disabled: ifs,
+        showSearch: true,
       },
+      key: 'factoryId',
+      width: 180,
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
       valueType: 'select',
       options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
@@ -24,10 +23,9 @@ function getcolumns(ifs) {
     {
       title: '所属车间',
       dataIndex: 'shopName',
-      search: false,
       key: 'shopId',
       fieldProps: {
-        disabled: ifs,
+        showSearch: true,
       },
       width: 180,
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
@@ -45,6 +43,7 @@ function getcolumns(ifs) {
       key: 'factoryId',
       width: 180,
       hideInTable: true,
+      search: false,
       hideInForm: true,
       fieldProps: {
         disabled: ifs,
@@ -58,6 +57,7 @@ function getcolumns(ifs) {
       dataIndex: 'shopName',
       key: 'shopId',
       hideInTable: true,
+      search: false,
       hideInForm: true,
       fieldProps: {
         disabled: ifs,

src/pages/setting/section/columns.js

@@ -43,6 +43,9 @@ function getcolumns(ifs) {
       dataIndex: 'factoryName',
       width: 180,
       key: 'factoryId',
+      fieldProps: {
+        showSearch: true,
+      },
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
       valueType: 'select',
       hideInTable: true,
@@ -56,6 +59,9 @@ function getcolumns(ifs) {
       key: 'shopId',
       hideInTable: true,
       hideInForm: true,
+      fieldProps: {
+        showSearch: true,
+      },
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
       valueType: 'select',
       options: {

src/pages/setting/users/columns.js

@@ -147,6 +147,10 @@ function getcolumns(setDrawer, ifs, formRef) {
       width: 120,
       key: 'organizationId',
       valueType: 'select',
+      fieldProps: {
+        placeholder: '请选择',
+        showSearch: true,
+      },
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
       options: { path: '/auth/sysDepartment/query/organization/selectbox', params: {} },
     },
@@ -156,6 +160,10 @@ function getcolumns(setDrawer, ifs, formRef) {
       align: 'center',
       valueType: 'treeSelect',
       dataIndex: 'departmentName',
+      fieldProps: {
+        placeholder: '请选择',
+        showSearch: true,
+      },
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
       key: 'departmentId',
       options: {