editer

src/app.jsx

@@ -53,6 +53,7 @@ export async function getInitialState() {
     const currentUserData = await fetchUserInfo();
     let menuData;
     if (currentUserData?.data?.username) {
+      console.log(1);
       menuData = await getmenuData();
     }
     return {

src/components/RightContent/AvatarDropdown.jsx

@@ -25,7 +25,7 @@ const loginOut = async () => {
   if (window.location.pathname !== '/user/login' && !redirect) {
     localStorage.clear();
     // history.replace(logoutRedirectUrl);
-    window.location.href(logoutRedirectUrl);
+    window.location.href = logoutRedirectUrl;
   }
 };
 

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-16 09:28:06
+ * @Last Modified time: 2022-12-16 15:40:58
  */
 
 import * as React from 'react';
@@ -744,7 +744,6 @@ function Model(props) {
               url: urlParams.detail,
               params: { id: drawer?.item?.id },
             });
-            //console.log(res?.data?.data);
             let obj = {};
             res?.data?.data['equipmentCharList']?.forEach((it) => {
               obj[it?.fieldId] = it?.fieldRealValue;
@@ -1774,6 +1773,7 @@ function Model(props) {
       <>
         <ProDescriptions
           request={async () => {
+            console.log('cc');
             const { data } = await doFetch({
               url: urlParams.detail,
               params: { id: drawer?.item?.id },
@@ -1862,6 +1862,7 @@ function Model(props) {
                     });
                     if (res.code === '0000') {
                       message.success('登记成功！');
+                      console.log(drawer);
                       setDrawer((s) => ({
                         ...s,
                         visible: false,
@@ -2194,6 +2195,7 @@ function Model(props) {
           setDrawer((s) => ({
             ...s,
             visible: false,
+            detailpath: '',
           }));
         }}
         {...drawer}

src/pages/setting/production/columns.js

-function getcolumns(setdrawer) {
+function getcolumns(ifs) {
   return [
     { title: '产线代码', dataIndex: 'productionLineCode', key: 'productionLineCode', width: 180 },
     {
@@ -12,7 +12,11 @@ function getcolumns(setdrawer) {
       title: '所属工厂',
       dataIndex: 'factoryName',
       key: 'factoryId',
+      search: false,
       width: 180,
+      fieldProps: {
+        disabled: ifs,
+      },
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
       valueType: 'select',
       options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
@@ -20,7 +24,44 @@ function getcolumns(setdrawer) {
     {
       title: '所属车间',
       dataIndex: 'shopName',
+      search: false,
       key: 'shopId',
+      fieldProps: {
+        disabled: ifs,
+      },
+      width: 180,
+      formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
+      valueType: 'select',
+      options: {
+        path: '/auth/sysShop/getShopSelectionByFactory',
+        linkParams: {
+          factoryId: '', //key 后面如果存在value 则该value会在调用接口时format
+        },
+      },
+    },
+    {
+      title: '所属工厂',
+      dataIndex: 'factoryName',
+      key: 'factoryId',
+      width: 180,
+      hideInTable: true,
+      hideInForm: true,
+      fieldProps: {
+        disabled: ifs,
+      },
+      formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
+      valueType: 'select',
+      options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
+    },
+    {
+      title: '所属车间',
+      dataIndex: 'shopName',
+      key: 'shopId',
+      hideInTable: true,
+      hideInForm: true,
+      fieldProps: {
+        disabled: ifs,
+      },
       width: 180,
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
       valueType: 'select',

src/pages/setting/production/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-11-09 14:43:54
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-11-30 13:16:10
+ * @Last Modified time: 2022-12-16 16:07:33
  */
 
 import * as React from 'react';
@@ -56,11 +56,16 @@ function Section(props) {
       <PremButton
         btn={{
           size: 'small',
-          onClick: () => {
+          onClick: async () => {
+            let { data } = await doFetch({
+              url: '/auth/sysProductionLine/checkProductLineRelation',
+              params: { id: drawer?.id },
+            });
             setdrawer((s) => ({
               ...s,
               visible: true,
               title: '编辑',
+              fields: getcolumns(data),
               params: { id: row.id },
               detailpath: urlParams.detail,
               val: 'edit',

src/pages/setting/section/columns.js

-function getcolumns(setdrawer) {
+function getcolumns(ifs) {
   return [
     { title: '工段代码', dataIndex: 'sectionCode', key: 'sectionCode' },
     {
@@ -10,10 +10,43 @@ function getcolumns(setdrawer) {
     {
       title: '所属工厂',
       dataIndex: 'factoryName',
+      search: false,
       width: 180,
       key: 'factoryId',
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
       valueType: 'select',
+      fieldProps: {
+        disabled: ifs,
+      },
+      options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
+    },
+    {
+      title: '所属车间',
+      dataIndex: 'shopName',
+      width: 180,
+      search: false,
+      key: 'shopId',
+      fieldProps: {
+        disabled: ifs,
+      },
+      formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
+      valueType: 'select',
+      options: {
+        path: '/auth/sysShop/getShopSelectionByFactory',
+        linkParams: {
+          factoryId: '', //key 后面如果存在value 则该value会在调用接口时format
+        },
+      },
+    },
+    {
+      title: '所属工厂',
+      dataIndex: 'factoryName',
+      width: 180,
+      key: 'factoryId',
+      formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
+      valueType: 'select',
+      hideInTable: true,
+      hideInForm: true,
       options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
     },
     {
@@ -21,6 +54,8 @@ function getcolumns(setdrawer) {
       dataIndex: 'shopName',
       width: 180,
       key: 'shopId',
+      hideInTable: true,
+      hideInForm: true,
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
       valueType: 'select',
       options: {

src/pages/setting/section/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-11-09 14:43:54
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-11-30 13:15:45
+ * @Last Modified time: 2022-12-16 16:02:16
  */
 
 import * as React from 'react';
@@ -56,12 +56,17 @@ function Section(props) {
       <PremButton
         btn={{
           size: 'small',
-          onClick: () => {
+          onClick: async () => {
+            let { data } = await doFetch({
+              url: '/auth/sysSection/checkSectionRelation',
+              params: { id: drawer?.id },
+            });
             setdrawer((s) => ({
               ...s,
               visible: true,
               title: '编辑',
               params: { id: row.id },
+              fields: getcolumns(data),
               detailpath: '/auth/sysSection/getById',
               val: 'edit',
               onFinish: async (vals) => {

src/pages/setting/workshop/columns.js

@@ -20,12 +20,24 @@ function getcolumns(ifs) {
       dataIndex: 'factoryName',
       key: 'factoryId',
       valueType: 'select',
+      search: false,
       options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
       fieldProps: {
         disabled: ifs,
       },
     },
+    {
+      width: 180,
+      title: '所属工厂',
+      dataIndex: 'factoryName',
+      key: 'factoryId',
+      valueType: 'select',
+      options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
+      formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
+      hideInForm: true,
+      hideInTable: true,
+    },
   ];
 }
 

src/pages/setting/workshop/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-11-09 14:44:18
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-07 16:37:56
+ * @Last Modified time: 2022-12-16 15:53:09
  */
 
 import * as React from 'react';
@@ -57,15 +57,18 @@ function Factory(props) {
         btn={{
           size: 'small',
           onClick: async () => {
-            // let res = await doFetch({ url: '', params: {} });
-
+            let { data } = await doFetch({
+              url: '/auth/sysShop/checkShopRelation',
+              params: { id: drawer?.id },
+            });
+            console.log(data);
             setdrawer((s) => ({
               ...s,
               visible: true,
               item: row,
               title: '编辑',
               val: 'edit',
-              fields: getcolumns(true),
+              fields: getcolumns(data),
               onFinish: async (vals) => {
                 let params = {
                   ...vals,