1230

src/components/InitForm/Diyrule/index.jsx

@@ -32,7 +32,7 @@ let Diyrule = (props) => {
       );
     }, [defval?.other]);
 
-  //console.log(other);
+  console.log(other, 'other');
 
   let { data, loading } = useRequest(() => {
     return doFetch({ url: '/base/bmNoRule/querySelect', params: {} });
@@ -520,7 +520,7 @@ let Diyrule = (props) => {
               options={Object.keys(Array.apply(null, { length: value ? value.length : 0 })).map(
                 (it, i) => ({
                   label: `第${i + 1}个`,
-                  value: i + 1,
+                  value: i + 2,
                 }),
               )}
               onChange={(val) => {

src/components/InitForm/FormItems.jsx

@@ -733,6 +733,7 @@ function NolinkTreeSelect({ item, colProps }) {
       <ProFormTreeSelect
         fieldProps={{
           ...item?.fieldProps,
+          allowClear: true,
           fieldNames: { label: 'title', value: 'key', children: 'children' },
           showSearch: true,
         }}
@@ -1235,7 +1236,7 @@ function UploadImg({ value, onChange, fieldProps }) {
     },
     onRemove(file) {
       let uid = file?.response?.data?.dataList[0]?.uid ?? file?.uid;
-      let newvalue = value.filter((it) => it.uid != uid);
+      let newvalue = value?.filter((it) => it.uid != uid);
       onChange(newvalue);
     },
     onPreview(file) {

src/pages/repair/failure/columns.js

@@ -51,7 +51,7 @@ function getcolumns(setdrawer) {
         },
         {
           title: '报修时间',
-          dataIndex: 'repairTimeList',
+          dataIndex: 'repairTime',
           key: 'repairTimeList',
           valueType: 'dateTimeRange',
         },
@@ -140,7 +140,8 @@ function getcolumns(setdrawer) {
         {
           title: '报修时间',
           dataIndex: 'repairTime',
-          key: 'repairTime',
+          key: 'repairTimeList',
+          valueType: 'dateTimeRange',
         },
         {
           title: '关单时间',

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: 2022-12-08 15:07:19
+ * @Last Modified time: 2022-12-30 10:16:39
  */
 
 import React, { useState, useEffect } from 'react';
@@ -63,7 +63,7 @@ const App = ({ type, id, actionRef, url, setdrawer }) => {
         dataIndex: 'otherUnitsAssistList',
         key: 'otherUnitsAssistList',
         valueType: 'select',
-        options: { path: '/repair/umOtherUnitsOrder/selection' },
+        options: { path: '/repair/umOtherUnitsOrder/selection', params: { id } },
         formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
       },
     ],