bug

src/pages/maintain/orders/columns.js

@@ -77,7 +77,7 @@ function getcolumns(setdrawer) {
             value: '3',
           },
           {
-            label: '一年',
+            label: '年度',
             value: '4',
           },
         ],

src/pages/maintain/plan/columns.js

@@ -262,7 +262,7 @@ function getcolumns(setdrawer) {
               value: '3',
             },
             {
-              label: '一年',
+              label: '年度',
               value: '4',
             },
           ],
@@ -509,7 +509,7 @@ function getcolumns(setdrawer) {
               value: '3',
             },
             {
-              label: '一年',
+              label: '年度',
               value: '4',
             },
           ],

src/pages/maintain/plan/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2023-01-16 15:35:00
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2023-02-08 13:22:09
+ * @Last Modified time: 2023-02-09 13:46:49
  */
 
 import * as React from 'react';
@@ -138,7 +138,7 @@ function Plan(props) {
             value: 3,
           },
           {
-            label: '一年',
+            label: '年度',
             value: 4,
           },
         ],
@@ -516,7 +516,7 @@ function Plan(props) {
                         ...s,
                         open: true,
                         item: row,
-                        title: '调整日期',
+                        title: '启用保养计划',
                         val: 'detailaddon',
                         id: row?.id,
                         from: 'tq',

src/pages/maintain/workOrder/columns.js

@@ -79,7 +79,7 @@ function getcolumns(setdrawer) {
               value: '3',
             },
             {
-              label: '一年',
+              label: '年度',
               value: '4',
             },
           ],
@@ -238,7 +238,7 @@ function getcolumns(setdrawer) {
               value: '3',
             },
             {
-              label: '一年',
+              label: '年度',
               value: '4',
             },
           ],
@@ -397,7 +397,7 @@ function getcolumns(setdrawer) {
               value: '3',
             },
             {
-              label: '一年',
+              label: '年度',
               value: '4',
             },
           ],

src/pages/spare/outstore/columns.js

@@ -445,7 +445,6 @@ function getcolumns(setdrawer) {
           valueType: 'split',
         },
         {
-          title: '备件',
           dataIndex: 'taskSpareList',
           key: 'taskSpareList',
           valueType: 'formSelectList',
@@ -483,10 +482,14 @@ function getcolumns(setdrawer) {
           valueType: 'split',
           title: '出库/关单信息',
           key: 'splisa',
+          hideInForm: true,
         },
         {
           dataIndex: 'statusName',
           valueType: 'select',
+          fieldProps: {
+            dropdownMatchSelectWidth: 120,
+          },
           title: '状态',
           key: 'status',
           options: [

src/pages/spare/outstore/index.jsx

@@ -124,10 +124,6 @@ function Outstore(props) {
     return defpath;
   }, [activeTabKey]);
 
-  console.log('====================================');
-  console.log(value);
-  console.log('====================================');
-
   return (
     <div style={{ position: 'relative' }}>
       <AutoTable

src/pages/spare/requisition/columns.js

@@ -66,6 +66,14 @@ function getcolumns(type, fullName) {
           valueType: 'select',
           searchValueType: 'input',
           searchKey: 'applyReasonName',
+          formItemProps: {
+            rules: [
+              {
+                required: true,
+                message: '此项为必填项',
+              },
+            ],
+          },
           options: [
             {
               label: '备库领用',
@@ -99,6 +107,14 @@ function getcolumns(type, fullName) {
           key: 'inWarehouseId',
           valueType: 'select',
           searchValueType: 'input',
+          formItemProps: {
+            rules: [
+              {
+                required: true,
+                message: '此项为必填项',
+              },
+            ],
+          },
           searchKey: 'inWarehouseName',
           options: {
             path: '/auth/sysShop/getUserShopSelection',
@@ -109,6 +125,14 @@ function getcolumns(type, fullName) {
         {
           title: '出库仓库',
           dataIndex: 'nosubmits',
+          formItemProps: {
+            rules: [
+              {
+                required: true,
+                message: '此项为必填项',
+              },
+            ],
+          },
           initialValue: '备件仓库',
           valueType: 'nosubmit',
           hideInDescriptions: true,
@@ -283,6 +307,14 @@ function getcolumns(type, fullName) {
           key: 'applyReason',
           valueType: 'select',
           searchValueType: 'input',
+          formItemProps: {
+            rules: [
+              {
+                required: true,
+                message: '此项为必填项',
+              },
+            ],
+          },
           searchKey: 'applyReasonName',
           options: [
             {
@@ -308,6 +340,14 @@ function getcolumns(type, fullName) {
           dataIndex: 'nosubmit',
           initialValue: fullName,
           valueType: 'nosubmit',
+          formItemProps: {
+            rules: [
+              {
+                required: true,
+                message: '此项为必填项',
+              },
+            ],
+          },
           hideInForm: type !== 1,
           hideInDescriptions: true,
         },
@@ -317,6 +357,14 @@ function getcolumns(type, fullName) {
           key: 'inWarehouseId',
           valueType: 'select',
           searchValueType: 'input',
+          formItemProps: {
+            rules: [
+              {
+                required: true,
+                message: '此项为必填项',
+              },
+            ],
+          },
           searchKey: 'inWarehouseName',
           options: {
             path: '/auth/sysShop/getUserShopSelection',
@@ -328,6 +376,14 @@ function getcolumns(type, fullName) {
           title: '出库仓库',
           dataIndex: 'nosubmits',
           initialValue: '备件仓库',
+          formItemProps: {
+            rules: [
+              {
+                required: true,
+                message: '此项为必填项',
+              },
+            ],
+          },
           valueType: 'nosubmit',
           hideInDescriptions: true,
         },
@@ -392,6 +448,9 @@ function getcolumns(type, fullName) {
           title: '状态',
           dataIndex: 'statusName',
           key: 'status',
+          fieldProps: {
+            dropdownMatchSelectWidth: 120,
+          },
           hideInForm: true,
           valueType: 'select',
           span: 3,