From bc7fcab963fe181f6db04cb253ba2c60f6159733 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 28 Aug 2024 15:52:59 +0800 Subject: [PATCH] =?UTF-8?q?HL-5734=E8=A3=85=E9=85=8D=E6=8A=A5=E5=B7=A5&?= =?UTF-8?q?=E9=A2=84=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E4=B8=AD=E7=8F=AD=E6=AC=A1=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptRequestMain.data.ts | 71 ++++++++++------- .../productreceiptAssembleRequestMain.data.ts | 76 ++++++++++++------- 2 files changed, 94 insertions(+), 53 deletions(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 94ceaf6d2..fecce8199 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/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,30 +233,48 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ }, sortTableDefault: 1001, 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, - }], // 失去焦点校验参数 + component:'Select', + componentProps:{ + options:shiftList.list, + optionsAlias: { + labelField: 'code', + valueField: 'code' + }, + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } + // 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: [ - // { required: true, message: '请选择班次代码', trigger: 'change' } - // ], + shift: [ + { required: true, message: '请选择班次代码', trigger: 'change' } + ], // departmentCode: [ // { required: true, message: '请输入部门', trigger: 'blur' } // ], diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index c9aa9a4e1..de84e7135 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/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,30 +242,48 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ }, sortTableDefault: 1001, 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, - }], // 失去焦点校验参数 + component:'Select', + componentProps:{ + options:shiftList.list, + optionsAlias: { + labelField: 'code', + valueField: 'code' + }, + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } + // 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: [ - // { required: true, message: '请选择班次代码', trigger: 'change' } - // ], + shift: [ + { required: true, message: '请选择班次代码', trigger: 'change' } + ], // departmentCode: [ // { required: true, message: '请输入部门', trigger: 'blur' } // ], @@ -1096,13 +1116,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 } }, {