20221205

src/pages/repair/platform/RepairOrderHandle.jsx

@@ -2,7 +2,68 @@
  * @Author: Li Hanlin
  * @Date: 2022-12-05 11:13:26
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-05 11:15:35
+ * @Last Modified time: 2022-12-05 14:29:57
  */
 
 import React, { useState, useEffect } from 'react';
+import InitForm from '@/components/InitForm';
+const App = ({ type, id }) => {
+  let columns = [];
+  if (type == 'jd') {
+    columns = [
+      {
+        title: '协助维修人员',
+        dataIndex: 'repairAssistList',
+        key: 'repairAssistList',
+        valueType: 'select',
+        options: { path: '/repair/umRepairOrder/selection', params: { id } },
+      },
+    ];
+  } else if (type == 'pd') {
+    columns = [
+      {
+        title: '维修人员',
+        dataIndex: 'faultDescription',
+        key: 'faultDescription',
+        valueType: 'select',
+        options: { path: '/auth/sysUser/selection' },
+        formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
+      },
+      {
+        title: '协助维修人员',
+        dataIndex: 'faultDescription',
+        key: 'faultDescription',
+        valueType: 'select',
+        options: { path: '/repair/umRepairOrder/selection', params: { id } },
+      },
+    ];
+  }
+  return (
+    <>
+      <InitForm
+        fields={columns}
+        onFinish={async (vals) => {
+          console.log(vals);
+          let params = {
+            ...vals,
+            id,
+          };
+          let res = await doFetch({
+            url: urlParams.save,
+            params,
+          });
+          if (res.code === '0000') {
+            message.success('操作成功！');
+            setDrawer((s) => ({
+              ...s,
+              visible: false,
+            }));
+            actionRef.current.reload();
+          }
+        }}
+      />
+    </>
+  );
+};
+
+export default App;

src/pages/repair/platform/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-12-05 10:13:42
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-05 11:09:28
+ * @Last Modified time: 2022-12-05 13:17:26
  */
 
 import * as React from 'react';
@@ -13,6 +13,7 @@ import PremButton from '@/components/PremButton';
 import getcolumns from './columns';
 import { useRequest } from 'ahooks';
 import { doFetch } from '@/utils/doFetch';
+import OrderHandle from './RepairOrderHandle';
 
 function Platform(props) {
   const actionRef = useRef(),
@@ -71,7 +72,8 @@ function Platform(props) {
               open: true,
               item: row,
               title: '接单',
-              val: 'add',
+              val: 'only',
+              type: 'jd',
             }));
           },
         }}
@@ -128,10 +130,10 @@ function Platform(props) {
 
   function selectType(type) {
     switch (type) {
-      case 'rec':
-        return;
-        break;
-
+      case 'jd':
+        return <OrderHandle type="jd" id={drawer?.item.id} />;
+      case 'pd':
+        return <OrderHandle type="pd" id={drawer?.item.id} />;
       default:
         break;
     }

src/pages/setting/factory/columns.js

 function getcolumns(setdrawer) {
   return [
-    { title: '工厂编码', dataIndex: 'factoryCode', key: 'factoryCode' },
+    { title: '工厂编码', dataIndex: 'factoryCode', key: 'factoryCode', width: 200 },
     {
       title: '工厂名称',
       dataIndex: 'factoryName',
       key: 'factoryName',
+      width: 200,
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
     },
   ];

src/pages/setting/organization/columns.js

@@ -3,6 +3,7 @@ function getcolumns(setdrawer) {
     {
       title: '组织名称',
       dataIndex: 'title',
+      width: 180,
       key: 'departmentName',
       formItemProps: {
         rules: [
@@ -15,6 +16,7 @@ function getcolumns(setdrawer) {
     },
     {
       title: '组织类型',
+      width: 180,
       dataIndex: 'departmentTypeName',
       key: 'departmentTypeName',
       valueType: 'input',
@@ -25,6 +27,7 @@ function getcolumns(setdrawer) {
     },
     {
       title: '组织代码',
+      width: 180,
       dataIndex: 'departmentCode',
       key: 'departmentCode',
       formItemProps: {
@@ -38,6 +41,7 @@ function getcolumns(setdrawer) {
     },
     {
       title: '上级组织',
+      width: 180,
       dataIndex: 'parentKey',
       key: 'parentKey',
       formItemProps: {

src/pages/setting/production/columns.js

 function getcolumns(setdrawer) {
   return [
-    { title: '产线代码', dataIndex: 'productionLineCode', key: 'productionLineCode' },
+    { title: '产线代码', dataIndex: 'productionLineCode', key: 'productionLineCode', width: 180 },
     {
       title: '产线名称',
       dataIndex: 'productionLineName',
       key: 'productionLineName',
+      width: 180,
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
     },
     {
       title: '所属工厂',
       dataIndex: 'factoryName',
       key: 'factoryId',
+      width: 180,
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
       valueType: 'select',
       options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
@@ -19,6 +21,7 @@ function getcolumns(setdrawer) {
       title: '所属车间',
       dataIndex: 'shopName',
       key: 'shopId',
+      width: 180,
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
       valueType: 'select',
       options: {

src/pages/setting/section/columns.js

@@ -10,6 +10,7 @@ function getcolumns(setdrawer) {
     {
       title: '所属工厂',
       dataIndex: 'factoryName',
+      width: 180,
       key: 'factoryId',
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
       valueType: 'select',
@@ -18,6 +19,7 @@ function getcolumns(setdrawer) {
     {
       title: '所属车间',
       dataIndex: 'shopName',
+      width: 180,
       key: 'shopId',
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
       valueType: 'select',

src/pages/setting/workshop/columns.js

@@ -3,16 +3,19 @@ function getcolumns(setdrawer) {
     {
       title: '车间代码',
       dataIndex: 'shopCode',
+      width: 180,
       key: 'shopCode',
       formItemProps: { rules: [{ required: false, message: '此项为必填项' }] },
     },
     {
       title: '车间名称',
       dataIndex: 'shopName',
+      width: 180,
       key: 'shopName',
       formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
     },
     {
+      width: 180,
       title: '所属工厂',
       dataIndex: 'factoryName',
       key: 'factoryId',