Merge remote-tracking branch 'origin/master_hella' into master_hella

src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts

@@ -106,20 +106,20 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       value: 'BY_INEVNEOTY'
     }
   },
-  {
-    label: '限值',
-    field: 'limitedValue',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps:{
-        disabled:false
-      }
-    }
-  },
+  // {
+  //   label: '限值',
+  //   field: 'limitedValue',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps:{
+  //       disabled:false
+  //     }
+  //   }
+  // },
   {
     label: '物料忽略名单',
     field: 'ignoreListOfItem',

src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts

@@ -566,7 +566,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       },{
         key: 'productionLineCode',
         value: 'productionLineCode',
-        message: '请填写生产线代码！',
+        message: '请选择返修生产线代码！',
         isMainValue: true
       }]
     },
@@ -586,7 +586,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
         },{
           key: 'productionLineCode',
           value: 'productionLineCode',
-          message: '请填写生产线代码！',
+          message: '请选择返修生产线代码！',
           isMainValue: true
         }]
       }