1213

src/components/DetailPro/index.jsx

@@ -23,7 +23,7 @@ function DetailPro(props) {
           if (props?.extendField) {
             let obj = {};
             res?.data?.data[props.extendField]?.forEach((it) => {
-              obj[it?.fieldId] = it?.fieldRealValue;
+              obj[it?.fieldId] = it?.fieldRealValueList;
             });
             //console.log('extendField:', obj);
             setcuritem({

src/components/InitForm/index.jsx

@@ -125,7 +125,7 @@ function InitForm({
           if (extendField) {
             let obj = {};
             res?.data?.data[extendField]?.forEach((it) => {
-              obj[it?.fieldId] = it?.fieldRealValue;
+              obj[it?.fieldId] = it?.fieldRealValueList;
             });
             //console.log('extendField:', obj);
             return {

src/components/RepaireDetail/DesItem.jsx

@@ -351,8 +351,8 @@ export default ({ index, title, dataSource, columns, hidden, navhidden = false,
       1: [
         {
           title: '追踪人员',
-          dataIndex: 'repairName',
-          key: 'repairName',
+          dataIndex: 'trackerName',
+          key: 'trackerName',
         },
         {
           title: '接单时间',
@@ -373,8 +373,8 @@ export default ({ index, title, dataSource, columns, hidden, navhidden = false,
         },
         {
           title: '追踪人员',
-          dataIndex: 'repairName',
-          key: 'repairName',
+          dataIndex: 'trackerName',
+          key: 'trackerName',
         },
       ],
       3: [
@@ -390,45 +390,48 @@ export default ({ index, title, dataSource, columns, hidden, navhidden = false,
         },
         {
           title: '追踪人员',
-          dataIndex: 'repairName',
-          key: 'repairName',
+          dataIndex: 'trackerName',
+          key: 'trackerName',
         },
       ],
       4: [
         {
           title: '追踪人员',
-          dataIndex: 'reviewerName',
-          key: 'reviewerName',
+          dataIndex: 'trackerName',
+          key: 'trackerName',
         },
         {
           title: '计划追踪日期',
-          dataIndex: 'reviewerTime',
-          key: 'reviewerTime',
+          dataIndex: 'planTrackTime',
+          key: 'planTrackTime',
         },
         {
           title: '实际追踪日期',
-          dataIndex: 'reason',
-          key: 'reason',
+          dataIndex: 'trackerTime',
+          key: 'trackerTime',
         },
         {
           title: '追踪结果',
-          dataIndex: 'reviewerName',
-          key: 'reviewerName',
+          dataIndex: 'trackResults',
+          key: 'trackResults',
         },
         {
           title: '是否完成追踪',
-          dataIndex: 'reviewerTime',
-          key: 'reviewerTime',
+          dataIndex: 'isFinishTrack',
+          key: 'isFinishTrack',
+          render: (text, row, _, action) => {
+            return row?.isFinishTrack === 1 ? '是' : '否';
+          },
         },
         {
           title: '追踪周期（天）',
-          dataIndex: 'reason',
-          key: 'reason',
+          dataIndex: 'trackCycle',
+          key: 'trackCycle',
         },
         {
           title: '追踪内容',
-          dataIndex: 'reason',
-          key: 'reason',
+          dataIndex: 'trackContents',
+          key: 'trackContents',
         },
       ],
       yz: [

src/pages/device/account/index.jsx

@@ -802,7 +802,7 @@ function Model(props) {
             //console.log(res?.data?.data);
             let obj = {};
             res?.data?.data['equipmentCharList']?.forEach((it) => {
-              obj[it?.fieldId] = it?.fieldRealValue;
+              obj[it?.fieldId] = it?.fieldRealValueList;
             });
             console.log('drawerpro:', {
               ...(res?.data?.data ?? {}),
@@ -2079,7 +2079,7 @@ function Model(props) {
                 if (!isNaN(Number(i))) {
                   equipmentCharReqList.push({
                     fieldId: i,
-                    fieldRealValue: vals[i],
+                    fieldRealValueList: vals[i],
                   });
                   delete vals[i];
                 }
@@ -2124,7 +2124,7 @@ function Model(props) {
                 if (!isNaN(Number(i))) {
                   equipmentCharReqList.push({
                     fieldId: i,
-                    fieldRealValue: vals[i],
+                    fieldRealValueList: vals[i],
                   });
                   delete vals[i];
                 }

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-12 15:01:27
+ * @Last Modified time: 2022-12-13 17:09:31
  */
 
 import * as React from 'react';
@@ -217,7 +217,7 @@ function Supplier(props) {
           //console.log(res?.data?.data);
           let obj = {};
           res?.data?.data['equipmentSupplierCharReqList']?.forEach((it) => {
-            obj[it?.fieldId] = it?.fieldRealValue;
+            obj[it?.fieldId] = it?.fieldRealValueList;
           });
           // console.log('drawerpro:', {
           //   ...(res?.data?.data ?? {}),
@@ -339,7 +339,7 @@ function Supplier(props) {
                 if (!isNaN(Number(i))) {
                   equipmentSupplierCharReqList.push({
                     fieldId: i,
-                    fieldRealValue: vals[i],
+                    fieldRealValueList: vals[i],
                   });
                   delete vals[i];
                 }
@@ -385,7 +385,7 @@ function Supplier(props) {
                 if (!isNaN(Number(i))) {
                   equipmentSupplierCharReqList.push({
                     fieldId: i,
-                    fieldRealValue: vals[i],
+                    fieldRealValueList: vals[i],
                   });
                   delete vals[i];
                 }

src/pages/repair/failure/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 13:22:33
+ * @Last Modified time: 2022-12-13 16:07:17
  */
 
 import * as React from 'react';

src/pages/repair/outsourcing/columns.js

@@ -8,6 +8,25 @@ function getcolumns(setdrawer) {
           title: '外协单号',
           dataIndex: 'otherUnitsOrderNo',
           key: 'otherUnitsOrderNo',
+          render: (text, row, _, action) => {
+            return (
+              <a
+                onClick={() => {
+                  setdrawer((s) => ({
+                    ...s,
+                    open: true,
+                    title: '详情',
+                    val: 'only',
+                    type: 'detail',
+                    title: '详细信息',
+                    item: row,
+                  }));
+                }}
+              >
+                {row?.otherUnitsOrderNo}
+              </a>
+            );
+          },
         },
         {
           title: '设备编号',
@@ -83,6 +102,25 @@ function getcolumns(setdrawer) {
           title: '外协单号',
           dataIndex: 'otherUnitsOrderNo',
           key: 'otherUnitsOrderNo',
+          render: (text, row, _, action) => {
+            return (
+              <a
+                onClick={() => {
+                  setdrawer((s) => ({
+                    ...s,
+                    open: true,
+                    title: '详情',
+                    val: 'only',
+                    type: 'detail',
+                    title: '详细信息',
+                    item: row,
+                  }));
+                }}
+              >
+                {row?.otherUnitsOrderNo}
+              </a>
+            );
+          },
         },
         {
           title: '设备编号',
@@ -158,6 +196,25 @@ function getcolumns(setdrawer) {
           title: '外协单号',
           dataIndex: 'otherUnitsOrderNo',
           key: 'otherUnitsOrderNo',
+          render: (text, row, _, action) => {
+            return (
+              <a
+                onClick={() => {
+                  setdrawer((s) => ({
+                    ...s,
+                    open: true,
+                    title: '详情',
+                    val: 'only',
+                    type: 'detail',
+                    title: '详细信息',
+                    item: row,
+                  }));
+                }}
+              >
+                {row?.otherUnitsOrderNo}
+              </a>
+            );
+          },
         },
         {
           title: '设备编号',

src/pages/repair/outsourcing/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-08 14:35:09
+ * @Last Modified time: 2022-12-13 16:22:18
  */
 
 import * as React from 'react';
@@ -16,6 +16,7 @@ import { doFetch } from '@/utils/doFetch';
 import Addform from '@/components/Addform';
 import { Menu, Dropdown, Button, message } from 'antd';
 import InitForm from '@/components/InitForm';
+import Detail from '@/components/RepaireDetail/Detail';
 
 function Failure(props) {
   const actionRef = useRef(),
@@ -404,6 +405,81 @@ function Failure(props) {
     return defpath;
   }, [activeTabKey]);
 
+  const basecolumns = useMemo(() => {
+    if (activeTabKey == 3) {
+      return [
+        {
+          title: '创建人',
+          dataIndex: 'createUserName',
+          key: 'createUserName',
+        },
+        {
+          title: '创建时间',
+          dataIndex: 'createTime',
+          key: 'createTime',
+        },
+        {
+          title: '工单状态',
+          dataIndex: 'statusName',
+          key: 'statusName',
+        },
+        {
+          title: '来源工单',
+          dataIndex: 'dataSourcesNo',
+          key: 'dataSourcesNo',
+        },
+        {
+          title: '来源类型',
+          dataIndex: 'dataSourcesName',
+          key: 'dataSourcesName',
+        },
+        {
+          title: '最新外协人员',
+          dataIndex: 'newRepairUserName',
+          key: 'newRepairUserName',
+        },
+        {
+          title: '关单时间',
+          dataIndex: 'repairCloseTime',
+          key: 'repairCloseTime',
+        },
+      ];
+    } else {
+      return [
+        {
+          title: '创建人',
+          dataIndex: 'createUserName',
+          key: 'createUserName',
+        },
+        {
+          title: '创建时间',
+          dataIndex: 'createTime',
+          key: 'createTime',
+        },
+        {
+          title: '工单状态',
+          dataIndex: 'statusName',
+          key: 'statusName',
+        },
+        {
+          title: '来源工单',
+          dataIndex: 'dataSourcesNo',
+          key: 'dataSourcesNo',
+        },
+        {
+          title: '来源类型',
+          dataIndex: 'dataSourcesName',
+          key: 'dataSourcesName',
+        },
+        {
+          title: '最新外协人员',
+          dataIndex: 'newRepairUserName',
+          key: 'newRepairUserName',
+        },
+      ];
+    }
+  }, [activeTabKey]);
+
   const selectType = (type) => {
     switch (type) {
       case 'add':
@@ -420,6 +496,18 @@ function Failure(props) {
         return <Reassig />;
       case 'wxpd':
         return <Wxpd />;
+      case 'detail':
+        return (
+          <Detail
+            title="外协单号"
+            titleno={drawer?.item.repairNo}
+            detailpath="/repair/umOtherUnitsOperation/queryOperationList"
+            params={{ otherUnitsOrderId: drawer?.item.id }}
+            baseRow={drawer?.item}
+            basecolumns={basecolumns}
+            type="wgd"
+          />
+        );
       default:
         break;
     }

src/pages/setting/users/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-09 13:13:57
+ * @Last Modified time: 2022-12-13 17:09:41
  */
 
 import * as React from 'react';
@@ -163,7 +163,7 @@ function User(props) {
                 if (!isNaN(Number(i))) {
                   userCharReqList.push({
                     fieldId: i,
-                    fieldRealValue: vals[i],
+                    fieldRealValueList: vals[i],
                   });
                   delete vals[i];
                 }
@@ -211,7 +211,7 @@ function User(props) {
                 if (!isNaN(Number(i))) {
                   userCharReqList.push({
                     fieldId: i,
-                    fieldRealValue: vals[i],
+                    fieldRealValueList: vals[i],
                   });
                   delete vals[i];
                 }