1111

src/components/InitForm/Diyrule/index.jsx

@@ -351,9 +351,10 @@ let Diyrule = (props) => {
                   <Checkbox
                     checked={other.increaseList && other.increaseList.indexOf(it?.id) != -1}
                     onChange={(e) => {
+                      console.log(e, other, value);
                       let checked = e.target.checked;
                       if (checked) {
-                        let newlist = [...other.increaseList];
+                        let newlist = [...other?.increaseList];
                         newlist.push(it?.id);
                         onChange({
                           value: value,

src/components/InitForm/FormItems.jsx

@@ -1417,7 +1417,7 @@ function Diyrules({ item, colProps, formRef }) {
         convertValue={(value) => {
           if (value?.other) return value;
           let nrList = {
-            other: {},
+            other: { increaseList: [] },
             value: [],
           };
           value?.forEach?.((it) => {

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-01-30 10:13:54
+ * @Last Modified time: 2023-01-30 14:34:25
  */
 
 import * as React from 'react';
@@ -138,7 +138,7 @@ function Failure(props) {
                       ...s,
                       open: true,
                       type: 'wcwx',
-                      item: row,
+                      item: { ...row, isShutdown: 1 },
                       val: 'only',
                       title: '完成维修',
                     }));
@@ -154,15 +154,17 @@ function Failure(props) {
             label: (
               <PremButton
                 access="umRepairOrder_transferTracking"
-                onClick={() => {
-                  setdrawer((s) => ({
-                    ...s,
-                    open: true,
-                    type: 'zzz',
-                    item: row,
-                    val: 'only',
-                    title: '转追踪',
-                  }));
+                btn={{
+                  onClick: () => {
+                    setdrawer((s) => ({
+                      ...s,
+                      open: true,
+                      type: 'zzz',
+                      item: row,
+                      val: 'only',
+                      title: '转追踪',
+                    }));
+                  },
                 }}
               >
                 转追踪
@@ -377,7 +379,7 @@ function Failure(props) {
                       ...s,
                       open: true,
                       type: 'wcwx',
-                      item: row,
+                      item: { ...row, isShutdown: 1 },
                       val: 'only',
                       title: '完成维修',
                     }));
@@ -393,15 +395,17 @@ function Failure(props) {
             label: (
               <PremButton
                 access="umRepairOrder_transferTracking"
-                onClick={() => {
-                  setdrawer((s) => ({
-                    ...s,
-                    open: true,
-                    type: 'zzz',
-                    item: row,
-                    val: 'only',
-                    title: '转追踪',
-                  }));
+                btn={{
+                  onClick: () => {
+                    setdrawer((s) => ({
+                      ...s,
+                      open: true,
+                      type: 'zzz',
+                      item: row,
+                      val: 'only',
+                      title: '转追踪',
+                    }));
+                  },
                 }}
               >
                 转追踪
@@ -649,6 +653,7 @@ function Failure(props) {
         title: '故障类型',
         dataIndex: 'faultSettingId',
         key: 'faultSettingId',
+        formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
         valueType: 'select',
         options: {
           path: '/repair/umFaultSetting/selected/queryList',
@@ -662,6 +667,7 @@ function Failure(props) {
         dataIndex: 'faultDetailId',
         key: 'faultDetailId',
         valueType: 'select',
+        formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
         options: {
           path: '/repair/umFaultSettingDetail/selected/queryList',
           linkParams: {
@@ -672,6 +678,7 @@ function Failure(props) {
       {
         title: '故障原因',
         dataIndex: 'faultCause',
+        formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
         key: 'faultCause',
         valueType: 'textarea',
         formItemProps: {
@@ -695,6 +702,7 @@ function Failure(props) {
         title: '维修类型',
         dataIndex: 'repairType',
         key: 'repairType',
+        formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
         valueType: 'select',
         options: {
           path: '/base/sysInitData/queryChildrenSelection',
@@ -714,6 +722,7 @@ function Failure(props) {
       {
         title: '是否停机维修',
         dataIndex: 'isShutdown',
+        formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
         key: 'isShutdown',
         valueType: 'radio',
         options: [
@@ -739,6 +748,7 @@ function Failure(props) {
         title: '维修内容',
         dataIndex: 'repairContent',
         key: 'repairContent',
+        formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
         valueType: 'textarea',
         formItemProps: {
           rules: [
@@ -754,7 +764,10 @@ function Failure(props) {
         dataIndex: 'repairAssistList',
         key: 'repairAssistList',
         valueType: 'select',
-        options: { path: '/repair/umRepairOrder/selection', params: { id: drawer?.item.id } },
+        options: {
+          path: '/repair/umRepairOrder/selection',
+          params: { id: drawer?.item.id, permission: 'umRepairOrder:completeRepair' },
+        },
         fieldProps: {
           placeholder: '请选择',
           showSearch: true,

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: 2023-01-19 09:43:15
+ * @Last Modified time: 2023-01-30 14:38:08
  */
 
 import React, { useState, useEffect } from 'react';
@@ -17,7 +17,10 @@ const App = ({ type, id, actionRef, url, setdrawer }) => {
         dataIndex: 'repairAssistList',
         key: 'repairAssistList',
         valueType: 'select',
-        options: { path: '/repair/umRepairOrder/selection', params: { id } },
+        options: {
+          path: '/repair/umRepairOrder/selection',
+          params: { id, permission: 'umRepairOrder:orderReceiving' },
+        },
         fieldProps: {
           placeholder: '请选择',
           showSearch: true,
@@ -39,7 +42,10 @@ const App = ({ type, id, actionRef, url, setdrawer }) => {
         dataIndex: 'repairAssistList',
         key: 'repairAssistList',
         valueType: 'select',
-        options: { path: '/repair/umRepairOrder/selection', params: { id } },
+        options: {
+          path: '/repair/umRepairOrder/selection',
+          params: { id, permission: 'umRepairOrder:dispatchById' },
+        },
         fieldProps: {
           placeholder: '请选择',
           showSearch: true,

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-01-30 11:12:49
+ * @Last Modified time: 2023-01-30 14:33:09
  */
 
 import * as React from 'react';
@@ -407,7 +407,12 @@ function Failure(props) {
                     ...s,
                     open: true,
                     type: 'track',
-                    item: { ...row, trackCycle: String(row?.trackCycle) },
+                    item: {
+                      ...row,
+                      trackCycle: String(row?.trackCycle),
+                      trackResult: '1',
+                      isFinishTrack: '1',
+                    },
                     // detailpath: '/repair/umTrackTraceinfo/queryByTrackOrderId',
                     // params: { trackOrderId: row?.id },
                     val: 'only',

src/pages/system/rules/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-11-09 14:44:44
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2023-01-30 10:30:44
+ * @Last Modified time: 2023-01-30 13:10:55
  */
 
 import * as React from 'react';
@@ -185,6 +185,7 @@ function Rules(props) {
                 title: '新增',
                 val: 'add',
                 onFinish: async (vals) => {
+                  console.log(vals);
                   let params = { ...vals };
                   params.nrList = [];
                   params.nrList = params.nrList.concat(vals?.nrList.value);