bug

src/global.less

@@ -525,10 +525,8 @@ ol {
   z-index: 1;
 }
 
-main {
-  >div:first-child {
-    .tags_container {
-      z-index: 1001 !important;
-    }
+.ant-pro-layout-container>main {
+  >div:first-child>div {
+    z-index: 1001 !important;
   }
 }
\ No newline at end of file

src/pages/device/account/columns.js

@@ -272,9 +272,20 @@ function getcolumns(setdrawer) {
       hideInForm: true,
       render: (text, row) => {
         if (row?.qrCodeUrl == null) {
-          return '暂无图片';
+          return (
+            <div
+              style={{
+                height: 50,
+                display: 'flex',
+                justifyContent: 'center',
+                alignItems: 'center',
+              }}
+            >
+              <span>暂无图片</span>
+            </div>
+          );
         } else {
-          return <Image width={70} src={row.qrCodeUrl} />;
+          return <Image width={50} src={row.qrCodeUrl} />;
         }
       },
     },

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: 2023-02-02 10:16:20
+ * @Last Modified time: 2023-02-03 10:01:31
  */
 
 import * as React from 'react';
@@ -618,7 +618,7 @@ function Model(props) {
     const [activeTab, setactiveTab] = useState(1);
     // 基础信息
     const BaseInfo = () => {
-      const columns = [
+      const columns1 = [
         {
           title: '设备编号',
           dataIndex: 'equipmentNo',
@@ -650,6 +650,8 @@ function Model(props) {
           key: 'statusName',
           span: 2,
         },
+      ];
+      const columns2 = [
         {
           title: '公司名称',
           dataIndex: 'organizationName',
@@ -680,6 +682,8 @@ function Model(props) {
           dataIndex: 'productLineName',
           key: 'productLineName',
         },
+      ];
+      const columns3 = [
         {
           title: '供应商',
           dataIndex: 'supplierName',
@@ -781,9 +785,12 @@ function Model(props) {
       }, []);
       return (
         <>
-          <ProDescriptions dataSource={request} columns={columns} />
-          <Divider />
-          <h3 className="page-title" style={{ marginBottom: 16 }}>
+          <ProDescriptions dataSource={request} columns={columns1} />
+          <Divider style={{ marginTop: 0 }} />
+          <ProDescriptions dataSource={request} columns={columns2} />
+          <Divider style={{ marginTop: 0 }} />
+          <ProDescriptions dataSource={request} columns={columns3} />
+          <h3 className="page-title" style={{ marginBottom: 24 }}>
             扩展字段
           </h3>
           <ProDescriptions dataSource={request} columns={newfieldscolumns} />

src/pages/maintain/plan/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2023-01-16 15:35:00
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2023-02-02 17:04:15
+ * @Last Modified time: 2023-02-03 10:36:00
  */
 
 import * as React from 'react';

src/pages/maintain/workOrder/columns.js

@@ -456,16 +456,20 @@ function getcolumns(setdrawer) {
           mode: 'radio',
           options: [
             {
-              label: '待接单',
-              value: '1',
+              label: '已关单',
+              value: '7',
             },
             {
-              label: '保养中',
-              value: '2',
+              label: '已完成',
+              value: '3',
             },
             {
-              label: '待验证',
-              value: '5',
+              label: '超时关单',
+              value: '0',
+            },
+            {
+              label: '超时处理',
+              value: '6',
             },
           ],
         },

src/pages/maintain/workOrder/detailColumns.js

@@ -204,23 +204,23 @@ const getcolumns = {
   4: [
     {
       title: '验证人员',
-      dataIndex: 'reviewerName',
-      key: 'reviewerName',
+      dataIndex: 'approveUserName',
+      key: 'approveUserName',
     },
     {
       title: '验证时间',
-      dataIndex: 'reviewerName',
-      key: 'reviewerName',
+      dataIndex: 'approveTime',
+      key: 'approveTime',
     },
     {
       title: '验证结果',
-      dataIndex: 'reviewerName',
-      key: 'reviewerName',
+      dataIndex: 'approveStatusName',
+      key: 'approveStatusName',
     },
     {
       title: '备注',
-      dataIndex: 'reviewerName',
-      key: 'reviewerName',
+      dataIndex: 'approveContent',
+      key: 'approveContent',
     },
   ],
 };

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-01 17:08:23
+ * @Last Modified time: 2023-02-03 10:40:38
  */
 
 import * as React from 'react';
@@ -112,13 +112,13 @@ function Failure(props) {
               dataIndex: 'otherUnitsHours',
               key: 'otherUnitsHours',
               valueType: 'digit',
-              precision: 0,
+              precision: 3,
             },
             {
               title: '外协费用',
               dataIndex: 'otherUnitsCost',
               valueType: 'digit',
-              precision: 0,
+              precision: 3,
               key: 'otherUnitsCost',
             },
             {
@@ -161,7 +161,7 @@ function Failure(props) {
             {
               title: '最新外协人员',
               dataIndex: 'newRepairUserName',
-              formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
+              formItemProps: { rules: [{ required: false, message: '此项为必填项' }] },
               fieldProps: { disabled: true },
               key: 'newRepairUserName',
             },