12091607

src/pages/device/account/columns.js

@@ -158,7 +158,7 @@ function getcolumns(setdrawer) {
       formItemProps: {
         rules: [
           {
-            required: true,
+            required: false,
             message: '此项为必填项',
           },
         ],

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: 2022-12-08 15:08:04
+ * @Last Modified time: 2022-12-09 15:56:35
  */
 
 import * as React from 'react';
@@ -2071,7 +2071,7 @@ function Model(props) {
             drawer={drawer}
             actionRef={actionRef}
             columns={columns}
-            urlParams={urlParams}
+            // urlParams={urlParams}
             formId={'2'}
             onFinish={async (vals) => {
               let equipmentCharReqList = [];

src/pages/device/model/columns.js

@@ -19,11 +19,12 @@ function getcolumns(setdrawer) {
       dataIndex: 'modelDescription',
       key: 'modelDescription',
       initialValue: '默认值',
+      width: 250,
       hideInForm: false,
       search: false,
     },
     {
-      title: '设备图片',
+      title: '图片',
       dataIndex: 'pictureUrl',
       key: 'picList',
       search: false,

src/pages/repair/fault/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-12-07 11:19:30
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-08 16:06:42
+ * @Last Modified time: 2022-12-09 16:05:25
  */
 
 import * as React from 'react';

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-09 13:50:18
+ * @Last Modified time: 2022-12-09 14:23:40
  */
 
 import * as React from 'react';
@@ -15,6 +15,7 @@ import { useRequest } from 'ahooks';
 import { doFetch } from '@/utils/doFetch';
 import { Dropdown, Menu, Button, message } from 'antd';
 import InitForm from '@/components/InitForm';
+import OrderHandle from '../platform/RepairOrderHandle';
 
 function Failure(props) {
   const actionRef = useRef(),
@@ -114,29 +115,10 @@ function Failure(props) {
                   setdrawer((s) => ({
                     ...s,
                     open: true,
-                    type: 'editChildEquipment',
+                    type: 'jd',
                     item: row,
                     val: 'only',
-                    title: '编辑子设备',
-                    // onFinish: async (vals) => {
-                    //   //console.log(1);
-                    //   let params = {
-                    //     ...vals,
-                    //     id: row.id,
-                    //   };
-                    //   let res = await doFetch({
-                    //     url: urlParams.save,
-                    //     params,
-                    //   });
-                    //   if (res.code === '0000') {
-                    //     message.success('新增成功！');
-                    //     setdrawer((s) => ({
-                    //       ...s,
-                    //       open: false,
-                    //     }));
-                    //     actionRef.current.reload();
-                    //   }
-                    // },
+                    title: '接单',
                   }));
                 }}
               >
@@ -333,7 +315,29 @@ function Failure(props) {
 
   // ++++++下拉菜单+++++++
   // 接单
-  const Recevive = () => {};
+  const Recevive = () => {
+    return (
+      <OrderHandle
+        type="wxjd"
+        id={drawer?.item.id}
+        actionRef={actionRef}
+        url="/repair/umRepairOrder/orderReceiving"
+        setdrawer={setdrawer}
+      />
+    );
+  };
+  // 派单
+  const disp = () => {
+    return (
+      <OrderHandle
+        type="wxpd"
+        id={drawer?.item.id}
+        actionRef={actionRef}
+        url="/repair/umRepairOrder/dispatchById"
+        setdrawer={setdrawer}
+      />
+    );
+  };
   // 完成维修
   const Finishrepair = () => {
     const columns = [
@@ -817,7 +821,7 @@ function Failure(props) {
               formItemProps: {
                 rules: [
                   {
-                    required: true,
+                    required: false,
                     message: '此项为必填项',
                   },
                 ],
@@ -896,7 +900,7 @@ function Failure(props) {
               formItemProps: {
                 rules: [
                   {
-                    required: true,
+                    required: false,
                     message: '此项为必填项',
                   },
                 ],
@@ -975,7 +979,7 @@ function Failure(props) {
               formItemProps: {
                 rules: [
                   {
-                    required: true,
+                    required: false,
                     message: '此项为必填项',
                   },
                 ],
@@ -1041,6 +1045,7 @@ function Failure(props) {
 
   const selectType = {
     jd: <Recevive />,
+    pd: <disp />,
     wcwx: <Finishrepair />,
     zzz: <Toracking />,
     zwx: <Toout />,
@@ -1055,12 +1060,16 @@ function Failure(props) {
   const columns = useMemo(() => {
     let defcolumn = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.columns;
     let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
+    if (activeTabKey == 1) {
       return defcolumn.concat({
         title: '操作',
         valueType: 'option',
         width: 150,
         render: (text, row, _, action) => [more(text, row, _, action)],
       });
+    } else {
+      return defcolumn;
+    }
   }, [activeTabKey]);
 
   const pathconfig = useMemo(() => {

src/pages/setting/users/columns.js

@@ -412,6 +412,7 @@ function getcolumns(setdrawer) {
       hideInTable: true,
       dataIndex: 'remarks',
       valueType: 'textarea',
+      width: 120,
       key: 'remarks',
       search: false,
     },