12121648

src/components/AutoTable/mtable.jsx

@@ -209,6 +209,8 @@ const Mtable = (props) => {
       return {
         ...it,
         ...options,
+        key: it.searchKey ?? it?.key,
+        valueType: it.searchValueType ?? it?.valueType,
       };
     });
   }, [columns, newparames]);

src/components/RepaireDetail/DesItem.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { ProDescriptions } from '@ant-design/pro-components';
 import { Divider, Image } from 'antd';
 
-export default ({ index, title, dataSource, columns, hidden }) => {
+export default ({ index, title, dataSource, columns, hidden, navhidden = false }) => {
   const [flag, setflag] = useState(true);
   // 0：报修 1：接单 2：派单 3：完成维修  4：转追踪 5：转外协 6：转单 7：退单 8：追踪审核 9：外协审核 10：退单审核 11：效果验证
   const columns_mes = {
@@ -100,7 +100,8 @@ export default ({ index, title, dataSource, columns, hidden }) => {
           },
         },
       ],
-  };
+    },
+    columns_wxgd = {};
   useEffect(() => {
     setflag(hidden);
   }, []);
@@ -110,6 +111,7 @@ export default ({ index, title, dataSource, columns, hidden }) => {
       {flag ? (
         <div>
           {index == 0 ? (
+            navhidden ? (
               <div>
                 <div>
                   <h2 className="page-title">{title}</h2>
@@ -119,6 +121,33 @@ export default ({ index, title, dataSource, columns, hidden }) => {
                 <Divider orientation="left">故障信息</Divider>
                 <ProDescriptions dataSource={dataSource} columns={columns_mes['gzxx']} />
               </div>
+            ) : (
+              <div>
+                <div style={{ borderLeft: '1px solid #ccc' }}>
+                  <span
+                    style={{
+                      border: '1px solid #ccc',
+                      backgroundColor: 'white',
+                      borderRidus: '30%',
+                    }}
+                  >
+                    {index}
+                  </span>
+                </div>
+                <div>
+                  <div>
+                    <h2 className="page-title">{title}</h2>
+                  </div>
+                  <Divider orientation="left">设备信息</Divider>
+                  <ProDescriptions
+                    dataSource={dataSource?.equipment}
+                    columns={columns_mes['sbxx']}
+                  />
+                  <Divider orientation="left">故障信息</Divider>
+                  <ProDescriptions dataSource={dataSource} columns={columns_mes['gzxx']} />
+                </div>
+              </div>
+            )
           ) : (
             <div>
               <div style={{ borderLeft: '1px solid #ccc' }}>
@@ -128,7 +157,13 @@ export default ({ index, title, dataSource, columns, hidden }) => {
                   {index}
                 </span>
               </div>
-              <ProDescriptions dataSource={dataSource} columns={columns} />
+              <div>
+                <div>
+                  <h2 className="page-title">{dataSource?.operationTypeName}信息</h2>
+                </div>
+                <ProDescriptions dataSource={dataSource?.equipment} columns={columns_mes['sbxx']} />
+                <ProDescriptions dataSource={dataSource} columns={columns_mes['gzxx']} />
+              </div>
             </div>
           )}
         </div>

src/components/RepaireDetail/Detail.jsx

@@ -15,7 +15,45 @@ export default (props) => {
   console.log(request);
 
   const selectType = {
-    gzbx: <DesItem index="0" dataSource={request?.data} title="基本信息" hidden={true} />,
+    gzbx: (
+      <DesItem
+        type="gzbx"
+        index="0"
+        dataSource={request?.data}
+        title="基本信息"
+        hidden={true}
+        navhidden={true}
+      />
+    ),
+    wxgd: <Wxgd />,
+  };
+
+  // 维修工单
+  const Wxgd = () => {
+    return (
+      <>
+        <DesItem
+          type="wxgd"
+          dataSource={request?.data}
+          title="报修信息"
+          hidden={true}
+          navhidden={false}
+        />
+        {request?.data?.map((it, index) => {
+          return (
+            <>
+              <DesItem
+                type="wxgd"
+                dataSource={request?.data}
+                title="报修信息"
+                hidden={true}
+                navhidden={false}
+              />
+            </>
+          );
+        })}
+      </>
+    );
   };
   return (
     <>
@@ -26,7 +64,7 @@ export default (props) => {
       </div>
       <ProDescriptions columns={basecolumns} dataSource={request.data} />
       <Divider />
-      {selectType['gzbx']}
+      {selectType[type]}
     </>
   );
 };

src/pages/device/supplier/columns.js

@@ -84,7 +84,6 @@ function getcolumns(setdrawer) {
       title: '状态',
       dataIndex: 'status',
       key: 'status',
-      search: false,
       valueType: 'radio',
       formItemProps: {
         rules: [
@@ -134,8 +133,11 @@ function getcolumns(setdrawer) {
       key: 'score',
       width: 50,
       valueType: 'rate',
+      searchValueType: 'digit',
       fieldProps: {
         defaultValue: 1,
+        max: 5,
+        precision: 1,
       },
       formItemProps: {
         rules: [

src/pages/repair/order/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-12-02 11:41:03
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-12 14:20:44
+ * @Last Modified time: 2022-12-12 15:59:07
  */
 
 import * as React from 'react';
@@ -1045,7 +1045,7 @@ function Failure(props) {
   };
 
   const basecolumns = useMemo(() => {
-    if (activeTabKey == 1) {
+    if (activeTabKey == 3) {
       return [
         {
           title: '创建时间',
@@ -1064,8 +1064,13 @@ function Failure(props) {
         },
         {
           title: '最新维修人员',
-          dataIndex: 'repairNo',
-          key: 'repairNo',
+          dataIndex: 'newRepairUserName',
+          key: 'newRepairUserName',
+        },
+        {
+          title: '关单时间',
+          dataIndex: 'repairCloseTime',
+          key: 'repairCloseTime',
         },
       ];
     } else {
@@ -1081,15 +1086,14 @@ function Failure(props) {
           key: 'statusName',
         },
         {
-          title: '维修单号',
-          dataIndex: 'repairOrderNo',
-          key: 'repairOrderNo',
+          title: '报修单号',
+          dataIndex: 'repairNo',
+          key: 'repairNo',
         },
         {
-          title: '关单时间',
-          dataIndex: 'faultDescription',
-          key: 'faultDescription',
-          valueType: 'textarea',
+          title: '最新维修人员',
+          dataIndex: 'newRepairUserName',
+          key: 'newRepairUserName',
         },
       ];
     }