1

src/components/RepaireDetail/DesItem.jsx

@@ -232,7 +232,7 @@ export default ({ index, title, dataSource, columns, hidden, navhidden = false,
       ],
       4: [
         {
-          title: '申请人员',
+          title: '申请追踪人员',
           dataIndex: 'reviewerName',
           key: 'reviewerName',
         },
@@ -249,7 +249,7 @@ export default ({ index, title, dataSource, columns, hidden, navhidden = false,
       ],
       5: [
         {
-          title: '外协人员',
+          title: '申请外协人员',
           dataIndex: 'reviewerName',
           key: 'reviewerName',
         },
@@ -553,14 +553,16 @@ export default ({ index, title, dataSource, columns, hidden, navhidden = false,
               dataSource={dataSource}
               columns={columns_zzgd[dataSource?.operationType]}
             />
-            <Collapse expandIconPosition={'end'}>
-              <Panel header={<span style={{ fontSize: 16, fontWeight: 600 }}>验证信息</span>}>
-                <ProDescriptions
-                  dataSource={dataSource?.trackProcessList?.[0]}
-                  columns={columns_zzgd['yz']}
-                />
-              </Panel>
-            </Collapse>
+            {dataSource?.trackProcessList ? (
+              <Collapse expandIconPosition={'end'}>
+                <Panel header={<span style={{ fontSize: 16, fontWeight: 600 }}>验证信息</span>}>
+                  <ProDescriptions
+                    dataSource={dataSource?.trackProcessList?.[0]}
+                    columns={columns_zzgd['yz']}
+                  />
+                </Panel>
+              </Collapse>
+            ) : null}
           </div>
         </div>
       </div>

src/pages/repair/order/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-01 14:33:41
+ * @Last Modified time: 2023-02-01 15:23:18
  */
 
 import * as React from 'react';
@@ -654,7 +654,7 @@ function Failure(props) {
         title: '故障类型',
         dataIndex: 'faultSettingId',
         key: 'faultSettingId',
-        formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
+        formItemProps: { rules: [{ required: false, message: '此项为必填项' }] },
         valueType: 'select',
         options: {
           path: '/repair/umFaultSetting/selected/queryList',
@@ -668,7 +668,7 @@ function Failure(props) {
         dataIndex: 'faultDetailId',
         key: 'faultDetailId',
         valueType: 'select',
-        formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
+        formItemProps: { rules: [{ required: false, message: '此项为必填项' }] },
         options: {
           path: '/repair/umFaultSettingDetail/selected/queryList',
           linkParams: {
@@ -807,7 +807,7 @@ function Failure(props) {
                 repairContent: vals.repairContent,
               },
               id: drawer?.item.id,
-              repairAssistList: vals?.repairAssistList,
+              repairAssistList: vals?.repairAssistList?.map((it) => ({ assistUserId: it })),
             };
             let res = await doFetch({
               url: '/repair/umRepairOrder/completeRepair',

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-01 14:02:32
+ * @Last Modified time: 2023-02-01 14:50:04
  */
 
 import * as React from 'react';
@@ -385,7 +385,7 @@ function Failure(props) {
         {
           label: (
             <PremButton
-              // access="umTrackOrder:dispatchById"
+              access="umTrackOrder:dispatchById"
               btn={{
                 onClick: () => {
                   setdrawer((s) => ({