1111

src/components/RepaireDetail/DesItem.jsx

@@ -643,7 +643,7 @@ export default (props) => {
               dataSource={dataSource}
               columns={columns_zzgd[dataSource?.operationType]}
             />
-            {dataSource?.trackProcessList ? (
+            {dataSource?.trackProcessList?.length > 0 ? (
               <Collapse expandIconPosition={'end'}>
                 <Panel header={<span style={{ fontSize: 16, fontWeight: 600 }}>验证信息</span>}>
                   <ProDescriptions

src/pages/maintain/plan/columns.js

@@ -539,6 +539,9 @@ function getcolumns(setdrawer) {
               },
             ],
           },
+          render: (_, row) => {
+            return row?.isCycle == 1 ? '单次' : '周期';
+          },
         },
         {
           title: '关单日期',

src/pages/repair/track/index.jsx

@@ -3,7 +3,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-12-02 11:41:03
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2023-02-08 14:50:08
+ * @Last Modified time: 2023-02-09 10:41:27
  */
 
 import * as React from 'react';
@@ -77,7 +77,6 @@ function Failure(props) {
               formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
               fieldProps: {
                 placeholder: '请选择',
-                mode: 'multiple',
               },
               key: 'trackAssistList',
               valueType: 'select',
@@ -89,7 +88,7 @@ function Failure(props) {
           ]}
           onFinish={async (vals) => {
             let params = {
-              trackAssistList: vals?.trackAssistList.map((it) => ({ assistUserId: it })),
+              trackAssistList: [{ assistUserId: vals?.trackAssistList }],
               id: drawer?.item?.id,
             };
             let res = await doFetch({
@@ -424,11 +423,11 @@ function Failure(props) {
                     item: {
                       ...row,
                       trackCycle: String(row?.trackCycle),
-                      trackResult: '1',
-                      isFinishTrack: '2',
+                      trackResult: 1,
+                      isFinishTrack: 2,
                     },
-                    detailpath: '/repair/umTrackTraceinfo/queryByTrackOrderId',
-                    params: { trackOrderId: row?.id },
+                    // detailpath: '/repair/umTrackTraceinfo/queryByTrackOrderId',
+                    // params: { trackOrderId: row?.id },
                     val: 'only',
                     title: '追踪信息',
                   }));

src/pages/spare/outstore/columns.js

@@ -209,6 +209,15 @@ function getcolumns(setdrawer) {
           },
           hideInForm: true,
         },
+        {
+          title: '工单状态',
+          dataIndex: 'statusName',
+          key: 'statusName',
+          span: 3,
+          hideInSearch: true,
+          hideInTable: true,
+          hideInForm: true,
+        },
         {
           title: '备件信息',
           dataIndex: 'details',
@@ -419,6 +428,16 @@ function getcolumns(setdrawer) {
           },
           hideInForm: true,
         },
+        {
+          title: '工单状态',
+          dataIndex: 'statusName',
+          key: 'statusName',
+          hideInSearch: true,
+          hideInTable: true,
+          hideInForm: true,
+          span: 2,
+        },
+
         {
           title: '备件信息',
           dataIndex: 'details',

src/pages/spare/record/columns.js

@@ -5,13 +5,23 @@ function getcolumns(setdrawer) {
         title: '操作时间',
         dataIndex: 'operateTime',
         key: 'operateTimeList',
-        valueType: 'dateRange',
+        valueType: 'dateTimeRange',
+        fieldProps: {
+          showTime: {
+            format: 'HH:mm',
+          },
+          format: 'YYYY-MM-DD HH:mm',
+        },
       },
       {
         title: '操作人',
         dataIndex: 'operateUserName',
         key: 'operateUserId',
         valueType: 'select',
+        fieldProps: {
+          dropdownMatchSelectWidth: 120,
+          showSearch: true,
+        },
         options: {
           path: '/auth/sysUser/selection',
           params: {},

src/pages/spare/requisition/columns.js

@@ -164,6 +164,9 @@ function getcolumns(type, fullName) {
           dataIndex: 'statusName',
           key: 'status',
           hideInForm: true,
+          fieldProps: {
+            dropdownMatchSelectWidth: 120,
+          },
           valueType: 'select',
           span: 3,
           options: [

src/pages/spare/spareback/columns.js

@@ -179,6 +179,10 @@ function getcolumns(type, fullName) {
           title: '状态',
           dataIndex: 'statusName',
           key: 'status',
+          fieldProps: {
+            dropdownMatchSelectWidth: 120,
+          },
+          span: 3,
           hideInForm: true,
           valueType: 'select',
           options: [
@@ -418,8 +422,12 @@ function getcolumns(type, fullName) {
         {
           title: '状态',
           dataIndex: 'statusName',
+          span: 2,
           key: 'status',
           hideInForm: true,
+          fieldProps: {
+            dropdownMatchSelectWidth: 120,
+          },
           valueType: 'select',
           options: [
             {