1209

src/pages/device/model/columns.js

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

src/pages/device/type/columns.js

@@ -4,7 +4,6 @@ function getcolumns(setdrawer) {
       title: '设备类型',
       dataIndex: 'title',
       key: 'title',
-      search: false,
       formItemProps: {
         rules: [
           {

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 11:07:32
+ * @Last Modified time: 2022-12-09 13:50:18
  */
 
 import * as React from 'react';
@@ -388,7 +388,12 @@ function Failure(props) {
         dataIndex: 'repairType',
         key: 'repairType',
         valueType: 'select',
-        options: { path: '/asset/equipment/selection/user/shop', params: {} },
+        options: {
+          path: '/base/sysInitData/queryChildrenSelection',
+          params: {
+            parentId: 1,
+          },
+        },
         formItemProps: {
           rules: [
             {
@@ -454,10 +459,11 @@ function Failure(props) {
         <InitForm
           fields={columns}
           onFinish={async (vals) => {
+            console.log(vals);
             let params = {
               repairComplete: {
-                faultType: vals.faultType,
-                faultName: vals.faultName,
+                faultType: vals.faultSettingId,
+                faultName: vals.faultDetailId,
                 faultCause: vals.faultCause,
                 repairType: vals.repairType,
                 isShutdown: vals.isShutdown,
@@ -585,6 +591,12 @@ function Failure(props) {
               dataIndex: 'reviewerType',
               key: 'reviewerType',
               valueType: 'select',
+              options: {
+                path: '/base/sysInitData/queryChildrenSelection',
+                params: {
+                  parentId: 2,
+                },
+              },
               formItemProps: {
                 rules: [
                   {
@@ -686,6 +698,7 @@ function Failure(props) {
               title: '故障描述',
               dataIndex: 'faultDescription',
               key: 'faultDescription',
+              valueType: 'textarea',
               fieldProps: {
                 disabled: true,
               },
@@ -699,6 +712,7 @@ function Failure(props) {
               },
             },
             {
+              valueType: 'textarea',
               title: '故障原因',
               dataIndex: 'faultDescription',
               key: 'faultDescription',
@@ -715,6 +729,7 @@ function Failure(props) {
               },
             },
             {
+              valueType: 'textarea',
               title: '维修内容',
               dataIndex: 'faultDescription',
               key: 'faultDescription',