点检计划

src/pages/check/order/index.jsx

@@ -140,10 +140,7 @@ function Order(props) {
       title: '操作',
       valueType: 'option',
       width: 120,
-      render: (text, row, _, action) => [
-        order(text, row, _, action),
-        close(text, row, _, action)
-      ],
+      render: (text, row, _, action) => [order(text, row, _, action), close(text, row, _, action)],
     });
   }, []);
 
@@ -168,7 +165,7 @@ function Order(props) {
         hideInForm: true,
       },
     ];
-    if (drawer?.val == "detail") {
+    if (drawer?.val == 'detail') {
       return [
         {
           title: '计划信息',
@@ -222,7 +219,7 @@ function Order(props) {
           title: '点检截止日期',
           dataIndex: 'checkCloseDate',
           key: 'checkCloseDate',
-          span: 2
+          span: 2,
         },
         {
           title: '点检项目',
@@ -245,15 +242,15 @@ function Order(props) {
               />
             );
           },
-        }
-      ]
+        },
+      ];
     }
   }, [drawer?.val, drawer?.item?.id]);
 
   return (
     <div style={{ position: 'relative' }}>
       <AutoTable
-        pagetitle="点检接单"
+        pagetitle={<h3 className="page-title">点检接单</h3>}
         columns={columns}
         actionRef={actionRef}
         path={pathconfig?.list || '/ngic-auth/sysUser/query/page'}
@@ -277,7 +274,7 @@ function Order(props) {
       />
 
       <DrawerPro
-        fields={drawer.val == "detail" ? detailsColumns : columns}
+        fields={drawer.val == 'detail' ? detailsColumns : columns}
         params={{ id: drawer?.item?.id }}
         formRef={formRef}
         placement="right"
@@ -303,4 +300,4 @@ function Order(props) {
   );
 }
 
-export default Order;
+export default Order;
\ No newline at end of file

src/pages/check/standard/columns.js

@@ -38,6 +38,7 @@ function getcolumns(id) {
         title: '设备型号',
         dataIndex: 'equipmentModelName',
         key: 'equipmentModelId',
+        hideInSearch: true,
         formItemProps: {
           rules: [
             {
@@ -60,6 +61,30 @@ function getcolumns(id) {
           showSearch: true,
         },
       },
+      {
+        title: '设备型号',
+        dataIndex: 'equipmentModelName',
+        key: 'equipmentModelId',
+        hideInForm: true,
+        hideInTable: true,
+        formItemProps: {
+          rules: [
+            {
+              required: true,
+              message: '此项为必填项',
+            },
+          ],
+        },
+        valueType: 'select',
+        mode: 'radio',
+        options: {
+          path: '/asset/equipmentModel/query/selection',
+        },
+        fieldProps: {
+          placeholder: '请选择',
+          showSearch: true,
+        },
+      },
       {
         title: '备注',
         dataIndex: 'remark',

src/pages/check/standard/index.jsx

@@ -135,7 +135,7 @@ function Standard(props) {
   return (
     <div style={{ position: 'relative' }}>
       <AutoTable
-        pagetitle=" 点检标准"
+        pagetitle={<h3 className="page-title">点检标准</h3>}
         columns={columns}
         actionRef={actionRef}
         path={pathconfig?.list || '/ngic-auth/sysUser/query/page'}

src/pages/maintain/criterion/columns.js

@@ -40,6 +40,7 @@ function getcolumns(equipmentModelId) {
         dataIndex: 'equipmentModelName',
         key: 'equipmentModelId',
         valueType: 'select',
+        hideInSearch: true,
         fieldProps: {
           showSearch: true,
         },
@@ -55,13 +56,36 @@ function getcolumns(equipmentModelId) {
         options: {
           path: '/maintain/umMaintainStandard/selected/queryList',
           linkParams: {
-            maintainType: 'maintainType',
+            maintainType: '',
           },
           extraParams: {
             equipmentModelId,
           },
         },
       },
+      {
+        title: '设备型号',
+        dataIndex: 'equipmentModelName',
+        key: 'equipmentModelId',
+        hideInForm: true,
+        hideInTable: true,
+        valueType: 'select',
+        fieldProps: {
+          showSearch: true,
+        },
+        formItemProps: {
+          rules: [
+            {
+              required: true,
+              message: '此项为必填项',
+            },
+          ],
+        },
+        mode: 'radio',
+        options: {
+          path: '/asset/equipmentModel/query/selection',
+        },
+      },
       {
         title: '备注',
         dataIndex: 'remark',

src/pages/repair/outsourcing/index.jsx

@@ -3,7 +3,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-12-02 11:41:03
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2023-02-08 11:45:14
+ * @Last Modified time: 2023-02-08 14:50:40
  */
 
 import * as React from 'react';
@@ -18,8 +18,9 @@ import Addform from '@/components/Addform';
 import { Menu, Dropdown, Button, message } from 'antd';
 import InitForm from '@/components/InitForm';
 import Detail from '@/components/RepaireDetail/Detail';
-
+import { useModel } from '@umijs/max';
 function Failure(props) {
+  const { initialState, setInitialState } = useModel('@@initialState');
   const actionRef = useRef(),
     containderef = useRef(),
     formRef = useRef();

src/pages/repair/track/index.jsx

@@ -3,7 +3,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-12-02 11:41:03
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2023-02-08 13:30:00
+ * @Last Modified time: 2023-02-08 14:50:08
  */
 
 import * as React from 'react';
@@ -19,8 +19,9 @@ import { Menu, Dropdown, Button, message } from 'antd';
 import InitForm from '@/components/InitForm';
 import Detail from '@/components/RepaireDetail/Detail';
 import OrderHandle from '../platform/RepairOrderHandle';
-
+import { useModel } from '@umijs/max';
 function Failure(props) {
+  const { initialState, setInitialState } = useModel('@@initialState');
   const actionRef = useRef(),
     containderef = useRef(),
     formRef = useRef();

src/pages/spare/supplier/columns.js

@@ -107,6 +107,35 @@ function getcolumns(changeState) {
         title: '状态',
         dataIndex: 'statusName',
         key: 'status',
+        hideInSearch: true,
+        hideInTable: true,
+        hideInForm: true,
+        valueType: 'select',
+        mode: 'radio',
+        options: [
+          {
+            label: '启用',
+            value: 1,
+          },
+          {
+            label: '停用',
+            value: 2,
+          },
+        ],
+        formItemProps: {
+          rules: [
+            {
+              required: true,
+              message: '此项为必填项',
+            },
+          ],
+        },
+      },
+      {
+        title: '状态',
+        dataIndex: 'statusName',
+        key: 'status',
+        hideInDescriptions: true,
         valueType: 'select',
         mode: 'radio',
         options: [
@@ -140,10 +169,12 @@ function getcolumns(changeState) {
           );
         },
       },
+
       {
         title: '联系信息',
         valueType: 'formList',
         dataIndex: 'userList',
+        span: 3,
         colProps: {
           xs: 24,
           sm: 24,