HL-5734装配报工&预生产报工申请中班次字段修改

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

@@ -42,7 +42,8 @@ const queryParams = {
 }
 const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
 const requestsettingData = data?.list[0] || {}
-
+const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'})
+console.log('shiftList',shiftList)
 // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
 import { TableColumn } from '@/types/table'
@@ -232,20 +233,13 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault: 1001,
     form: {
-      // labelMessage: '信息提示说明！！！',
+      component:'Select',
       componentProps:{
-        enterSearch: true,
+          options:shiftList.list,
-        isSearchList: true,
+          optionsAlias: {
-        searchListPlaceholder: '请选择班次',
+            labelField: 'code',
-        searchField: 'code',
+            valueField: 'code'
-        searchTitle: '班次信息',
+          },
-        searchAllSchemas: Shift.allSchemas,
-        searchPage: ShiftApi.getShiftPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
           verificationParams: [{
             key: 'code',
             action: '==',
@@ -256,6 +250,31 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           }], // 失去焦点校验参数
       }
     }
+    // form: {
+    //   // labelMessage: '信息提示说明！！！',
+    //   componentProps: {
+    //     enterSearch: true,
+    //     isSearchList: true,
+    //     searchListPlaceholder: '请选择班次',
+    //     searchField: 'code',
+    //     searchTitle: '班次信息',
+    //     searchAllSchemas: Shift.allSchemas,
+    //     searchPage: ShiftApi.getShiftPage,
+    //     searchCondition: [{
+    //       key: 'available',
+    //       value: 'TRUE',
+    //       isMainValue: false
+    //     }],
+    //     verificationParams: [{
+    //       key: 'code',
+    //       action: '==',
+    //       value: '',
+    //       isMainValue: false,
+    //       isSearch: true,
+    //       isFormModel: true,
+    //     }], // 失去焦点校验参数
+    //   }
+    // }
   },
   {
     label: '收货类型',
@@ -575,9 +594,9 @@ export const ProductreceiptRequestMainRules = reactive({
   // team: [
   //   { required: true, message: '请选择班组代码', trigger: 'change' }
   // ],
-  // shift: [
+  shift: [
-  //   { required: true, message: '请选择班次代码', trigger: 'change' }
+    { required: true, message: '请选择班次代码', trigger: 'change' }
-  // ],
+  ],
   // departmentCode: [
   //   { required: true, message: '请输入部门', trigger: 'blur' }
   // ],

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts

@@ -43,6 +43,8 @@ const queryParams = {
  const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
  const requestsettingData =data?.list[0]||{}
 
+ const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'})
+ console.log('shiftList',shiftList)
  // 获取当前操作人的部门
  import { useUserStore } from '@/store/modules/user'
  import { TableColumn } from '@/types/table'
@@ -240,20 +242,13 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault: 1001,
     form: {
-      // labelMessage: '信息提示说明！！！',
+      component:'Select',
       componentProps:{
-        enterSearch: true,
+          options:shiftList.list,
-        isSearchList: true,
+          optionsAlias: {
-        searchListPlaceholder: '请选择班次',
+            labelField: 'code',
-        searchField: 'code',
+            valueField: 'code'
-        searchTitle: '班次信息',
+          },
-        searchAllSchemas: Shift.allSchemas,
-        searchPage: ShiftApi.getShiftPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
           verificationParams: [{
             key: 'code',
             action: '==',
@@ -264,6 +259,31 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           }], // 失去焦点校验参数
       }
     }
+    // form: {
+    //   // labelMessage: '信息提示说明！！！',
+    //   componentProps: {
+    //     enterSearch: true,
+    //     isSearchList: true,
+    //     searchListPlaceholder: '请选择班次',
+    //     searchField: 'code',
+    //     searchTitle: '班次信息',
+    //     searchAllSchemas: Shift.allSchemas,
+    //     searchPage: ShiftApi.getShiftPage,
+    //     searchCondition: [{
+    //       key: 'available',
+    //       value: 'TRUE',
+    //       isMainValue: false
+    //     }],
+    //     verificationParams: [{
+    //       key: 'code',
+    //       action: '==',
+    //       value: '',
+    //       isMainValue: false,
+    //       isSearch: true,
+    //       isFormModel: true,
+    //     }], // 失去焦点校验参数
+    //   }
+    // }
   },
   {
     label: '收货类型',
@@ -585,9 +605,9 @@ export const ProductreceiptRequestMainRules = reactive({
   // team: [
   //   { required: true, message: '请选择班组代码', trigger: 'change' }
   // ],
-  // shift: [
+  shift: [
-  //   { required: true, message: '请选择班次代码', trigger: 'change' }
+    { required: true, message: '请选择班次代码', trigger: 'change' }
-  // ],
+  ],
   // departmentCode: [
   //   { required: true, message: '请输入部门', trigger: 'blur' }
   // ],
@@ -1096,13 +1116,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 6
+        max:9999,
+        // precision: 6
       },
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6
+      max:9999,
+      // precision: 6
     }
   },
   {