1111

src/pages/maintain/criterion/columns.js

@@ -60,6 +60,7 @@ function getcolumns(equipmentModelId) {
         title: '备注',
         dataIndex: 'remark',
         key: 'remark',
+        span: 24,
         valueType: 'textarea',
         hideInSearch: true,
       },

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-01-18 15:20:30
+ * @Last Modified time: 2023-01-18 16:36:26
  */
 
 import * as React from 'react';
@@ -556,6 +556,7 @@ function Plan(props) {
           // access: 'sysDepartment_save',
           btn: {
             disabled: false,
+            type: 'primary',
             onClick: () => {
               setdrawer((s) => ({
                 ...s,

src/pages/maintain/workOrder/columns.js

@@ -115,6 +115,13 @@ function getcolumns(setdrawer) {
           title: '保养人员',
           dataIndex: 'maintainUserName',
           key: 'maintainUserName',
+          valueType: 'select',
+          fieldProps: {
+            showSearch: true,
+          },
+          options: {
+            path: '/auth/sysUser/selection',
+          },
         },
         {
           title: '状态',
@@ -266,6 +273,13 @@ function getcolumns(setdrawer) {
           title: '保养人员',
           dataIndex: 'maintainUserName',
           key: 'maintainUserName',
+          valueType: 'select',
+          fieldProps: {
+            showSearch: true,
+          },
+          options: {
+            path: '/auth/sysUser/selection',
+          },
         },
         {
           title: '状态',
@@ -423,6 +437,13 @@ function getcolumns(setdrawer) {
           title: '保养人员',
           dataIndex: 'maintainUserName',
           key: 'maintainUserName',
+          valueType: 'select',
+          fieldProps: {
+            showSearch: true,
+          },
+          options: {
+            path: '/auth/sysUser/selection',
+          },
         },
         {
           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: 2023-01-06 14:21:36
+ * @Last Modified time: 2023-01-18 17:46:04
  */
 
 import * as React from 'react';
@@ -494,6 +494,7 @@ function Failure(props) {
             url={'/repair/umOtherUnitsOrder/save'}
             setdrawer={setdrawer}
             actionRef={actionRef}
+            drawer={drawer}
           />
         );
       case 'comouts':

src/pages/repair/platform/RepairOrderHandle.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-12-05 11:13:26
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2023-01-06 16:28:51
+ * @Last Modified time: 2023-01-18 17:39:50
  */
 
 import React, { useState, useEffect } from 'react';
@@ -71,16 +71,18 @@ const App = ({ type, id, actionRef, url, setdrawer }) => {
   const finishHandle = {
     wxjd: async (vals) => {
       //console.log(vals);
+      let params = {};
+      if (vals.repairAssistList) {
         vals.repairAssistList = vals?.repairAssistList.map((it) => ({
           assistUserId: it,
         }));
-      let params = {
-        ...vals,
-        id,
-      };
+      }
       let res = await doFetch({
         url,
-        params,
+        params: {
+          ...params,
+          id,
+        },
       });
       if (res.code === '0000') {
         message.success('操作成功！');
@@ -92,19 +94,20 @@ const App = ({ type, id, actionRef, url, setdrawer }) => {
       }
     },
     wxpd: async (vals) => {
-      //console.log(vals);
-      vals.repairAssistList = vals?.repairAssistList.map((it) => {
+      console.log(vals, url);
+      let params = {};
+      console.log(params);
+      if (vals.repairAssistList) {
+        params.repairAssistList = vals?.repairAssistList.map((it) => {
           return {
             assistUserId: it,
           };
         });
-      let params = {
-        ...vals,
-        id,
-      };
+      }
+      console.log(params);
       let res = await doFetch({
         url,
-        params,
+        params: { ...params, id },
       });
       if (res.code === '0000') {
         message.success('操作成功！');

src/pages/repair/track/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-12-02 11:41:03
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2023-01-06 16:09:52
+ * @Last Modified time: 2023-01-18 17:45:01
  */
 
 import * as React from 'react';
@@ -602,7 +602,12 @@ function Failure(props) {
     switch (type) {
       case 'add':
         return (
-          <Addform url={'/repair/umTrackOrder/save'} setdrawer={setdrawer} actionRef={actionRef} />
+          <Addform
+            url={'/repair/umTrackOrder/save'}
+            setdrawer={setdrawer}
+            actionRef={actionRef}
+            drawer={drawer}
+          />
         );
       case 'track':
         return <TrackForm />;