From ab00cc4d03aa937de779d73bf1b5b505706d2859 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Mon, 2 Sep 2024 09:01:10 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E7=94=B3=E8=AF=B7=EF=BC=8C=E4=BC=98=E5=8C=96=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=EF=BC=8C=E9=80=89=E6=8B=A9=E5=AE=8C?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E4=BB=A3=E7=A0=81=E5=90=8E=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=8C=20=E9=80=89=E6=8B=A9=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=88=97=E5=AE=BD=E8=87=AA=E9=80=82=E5=BA=94?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E6=98=BE=E7=A4=BA=20=20HL-5763?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedissueRequestMain.data.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index 143586bf0..456d30ca6 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -307,6 +307,10 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ label: '领用原因描述', field: 'reasonDescRequisition', sort: 'custom', + isTableForm:false, + isForm: true, + isTable:false, + isDetail:false, table: { width: 150 }, From ed04f393aaeeabadb26ee742b98c398671b13db7 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 2 Sep 2024 09:35:11 +0800 Subject: [PATCH 02/11] =?UTF-8?q?HL-5769=E4=B8=8A=E6=9E=B6=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E7=82=B9=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=EF=BC=8C?= =?UTF-8?q?=E8=A7=84=E5=88=99=E9=85=8D=E7=BD=AE=E4=B8=AD=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=BA=93=E5=8C=BA=E6=88=96=E4=BB=93=E5=BA=93=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategySetting/strategy/upShelfStrategy/AddForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index e6ee9865e..76c190d5d 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -1153,7 +1153,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调 const submitForm = async () => { await blurWarehouse() - await blurTransactionType() + // await blurTransactionType() if(warehouseType.value == 'WarehouseCode' && !formData.value.configuration.WarehouseCode){ // 仓库 message.error('请选择仓库') From 5b03f447d25c23fb95f3e4e3cd5b32c5fbda615b Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 2 Sep 2024 09:41:46 +0800 Subject: [PATCH 03/11] =?UTF-8?q?HL-5774=E8=A3=85=E9=85=8D=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E3=80=81=E9=A2=84=E7=94=9F=E4=BA=A7=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=EF=BC=8C=E7=8F=AD=E6=AC=A1=E5=BA=94=E6=98=BE=E7=A4=BA=E6=B1=89?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptJobMain.data.ts | 18 ++++++++++++++++++ .../productreceiptRecordMain.data.ts | 18 ++++++++++++++++++ .../productreceiptAssembleJobMain.data.ts | 18 ++++++++++++++++++ .../productreceiptAssembleRecordMain.data.ts | 19 +++++++++++++++++++ 4 files changed, 73 insertions(+) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts index 45a93e713..d0891440f 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts @@ -73,6 +73,15 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '班组', + field: 'teamName', + sort: 'custom', + isTable:true, + table: { + width: 150 + }, + }, { label: '班次', field: 'shift', @@ -82,6 +91,15 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '班次', + field: 'shiftName', + sort: 'custom', + isTable:true, + table: { + width: 150 + }, + }, { label: '收货类型', field: 'type', diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts index a280d25da..2b3d1d629 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts @@ -69,6 +69,15 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ }, isTable: false }, + { + label: '班组', + field: 'teamName', + sort: 'custom', + table: { + width: 150 + }, + isTable: true + }, { label: '班次', field: 'shift', @@ -78,6 +87,15 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ }, isTable: false }, + { + label: '班次', + field: 'shiftName', + sort: 'custom', + table: { + width: 150 + }, + isTable: true + }, { label: '收货类型', field: 'type', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts index 029ec1ca1..bc9a69400 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts @@ -73,6 +73,15 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '班组', + field: 'teamName', + sort: 'custom', + isTable:true, + table: { + width: 150 + }, + }, { label: '班次', field: 'shift', @@ -82,6 +91,15 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '班次', + field: 'shiftName', + sort: 'custom', + isTable:true, + table: { + width: 150 + }, + }, { label: '收货类型', field: 'type', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts index e697dda38..daf572609 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts @@ -88,6 +88,16 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ }, isTable: false, + }, + { + label: '班组', + field: 'teamName', + sort: 'custom', + table: { + width: 150 + }, + isTable: true, + }, { label: '班次', @@ -98,6 +108,15 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ }, isTable: false, }, + { + label: '班次', + field: 'shiftName', + sort: 'custom', + isTable:true, + table: { + width: 150 + }, + }, { label: '收货类型', field: 'type', From c81a008a839730436d0ee3b1c22a4b0dce63cd30 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Mon, 2 Sep 2024 09:44:06 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E7=94=B3=E8=AF=B7=EF=BC=8C=E4=BC=98=E5=8C=96=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=EF=BC=8C=E9=80=89=E6=8B=A9=E5=AE=8C?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E4=BB=A3=E7=A0=81=E5=90=8E=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=8C=20=E9=80=89=E6=8B=A9=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=88=97=E5=AE=BD=E8=87=AA=E9=80=82=E5=BA=94?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E6=98=BE=E7=A4=BA=20=20HL-5763?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedissueJobMain/unplannedissueJobMain.data.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts index 5482ed0b7..caff1030b 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts @@ -60,6 +60,9 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ label: '领用描述', field: 'usageDescription', sort: 'custom', + isTableForm:false, + isForm: false, + isTable:false, table: { width: 150 }, From f18366b507e5063b4797b57ecaf3b2f50b191cc1 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 2 Sep 2024 10:25:32 +0800 Subject: [PATCH 05/11] =?UTF-8?q?HL-5548=E5=8A=A8=E6=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=A7=84=E5=88=99=EF=BC=8C=E9=80=89=E5=AE=9A=E7=BA=A7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicForm/src/BasicFormQmsCode.vue | 696 -------------- src/components/Detail/src/Detail.vue | 1 + src/components/Detail/src/DetailQmsCode.vue | 846 ------------------ src/views/qms/dynamicRule/index.vue | 51 +- .../selectedProject/selectedProject.data.ts | 2 +- src/views/qms/selectedSet/index.vue | 49 +- 6 files changed, 70 insertions(+), 1575 deletions(-) delete mode 100644 src/components/BasicForm/src/BasicFormQmsCode.vue delete mode 100644 src/components/Detail/src/DetailQmsCode.vue diff --git a/src/components/BasicForm/src/BasicFormQmsCode.vue b/src/components/BasicForm/src/BasicFormQmsCode.vue deleted file mode 100644 index 03ef9e308..000000000 --- a/src/components/BasicForm/src/BasicFormQmsCode.vue +++ /dev/null @@ -1,696 +0,0 @@ - - - diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 9b23fd110..3d83c25e0 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -810,6 +810,7 @@ detailAllSchemasRef.value = props.detailAllSchemas // 根据状态返回该按钮是否显示 const isShowMainButton = (row, val) => { + if(!val || val &&val.length == 0) return false; if (val.indexOf(row.status) > -1) { return false } else { diff --git a/src/components/Detail/src/DetailQmsCode.vue b/src/components/Detail/src/DetailQmsCode.vue deleted file mode 100644 index 819a401e1..000000000 --- a/src/components/Detail/src/DetailQmsCode.vue +++ /dev/null @@ -1,846 +0,0 @@ - - - - - diff --git a/src/views/qms/dynamicRule/index.vue b/src/views/qms/dynamicRule/index.vue index c10632a51..5b92d1745 100644 --- a/src/views/qms/dynamicRule/index.vue +++ b/src/views/qms/dynamicRule/index.vue @@ -66,26 +66,22 @@ :isSearchTableItem="true" /> + - - { /** 详情操作 */ const detailRef = ref() -const openDetail = (row: any, titleName: any, titleValue: any) => { +const openDetail =async (row: any, titleName: any, titleValue: any) => { detailMasterId.value = row.id + await InspectionStageApi.getInspectionStageNoPage({ masterId:row.id }).then((res) => { + detailList.value = res + }) detailRef.value.openDetail(row, titleName, titleValue, 'basicDynamicRule') } @@ -419,6 +418,7 @@ const validateIfRepeat = (type, data) => { detailList.value = detailList.value.filter((item) => item.id !== data.id) mergedArray = [data, ...detailList.value] } + console.log(mergedArray) const stageSet = new Set(mergedArray.map((item) => item.stage)) return stageSet.size === mergedArray.length } @@ -441,7 +441,26 @@ const validateNotRepetition = (data) => { } return true // 未发现重复，返回 true } +const handleDetailSubmitForm = async (formType, data) => { + let mydata = { ...data } + const rs = await detailValidate(formType,data) + if (!rs) return + console.log(data) + if (data.code) { + mydata.dynamicModifyCode = data.code + } + if (formType === 'create') { + await InspectionStageApi.createInspectionStage(data) + message.success(t('common.createSuccess')) + + } else { + await InspectionStageApi.updateInspectionStage(data) + message.success(t('common.updateSuccess')) + } + detailRef.value.submitUpdateList() + +} /** 初始化 **/ onMounted(async () => { tableObject.params = { diff --git a/src/views/qms/selectedProject/selectedProject.data.ts b/src/views/qms/selectedProject/selectedProject.data.ts index cd273c428..3127a57f3 100644 --- a/src/views/qms/selectedProject/selectedProject.data.ts +++ b/src/views/qms/selectedProject/selectedProject.data.ts @@ -6,7 +6,7 @@ import * as DictTypeApi from '@/api/system/dict/dict.type' // 表单校验 export const SelectedProjectRules = reactive({ - code: [required], + // code: [required], // dictionaryTypeAndCode: [required], estimateCode: [required], defectLevel: [required], diff --git a/src/views/qms/selectedSet/index.vue b/src/views/qms/selectedSet/index.vue index 632e19234..e6d6c27e2 100644 --- a/src/views/qms/selectedSet/index.vue +++ b/src/views/qms/selectedSet/index.vue @@ -68,24 +68,19 @@ /> - @@ -279,6 +274,11 @@ const formsSuccess = async (formType, data) => { const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { selectDictType.value = row.classification + SelectedProjectApi.getSelectedProjectNoPage(row.id).then((res) => { + if (res.length > 0) { + existValue.value = res + } + }) detailRef.value.openDetail(row, titleName, titleValue, 'basicSelectedSet') } @@ -448,9 +448,26 @@ const detailOpenForm = (type, row, masterParmas) => { } } -const detailBasiFormOnChange = (field, val, detailFormRef) => {} +const handleDetailSubmitForm = async (formType, data) => { + let mydata = { ...data } + const rs = await detailValidate(formType,data) + if (!rs) return + console.log(data) + if (data.code) { + mydata.dynamicModifyCode = data.code + } + if (formType === 'create') { + await SelectedProjectApi.createSelectedProject(data) + message.success(t('common.createSuccess')) + + } else { + await SelectedProjectApi.updateSelectedProject(data) + message.success(t('common.updateSuccess')) + } + detailRef.value.submitUpdateList() + -const formSelectChange = (a, b, c, d) => {} +} /** 初始化 **/ onMounted(async () => { From dc0e350acc4ca081c9640c62e0379e8017019014 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 2 Sep 2024 10:48:22 +0800 Subject: [PATCH 06/11] =?UTF-8?q?HL-57971.=E8=AE=A1=E5=88=92=E5=A4=96?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1=EF=BC=8C=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E6=88=90=E6=9C=AC=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E3=80=81=E7=A7=91=E7=9B=AE=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E6=88=90=E6=9C=AC=E4=B8=AD=E5=BF=83=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=9C=89=E4=B8=A4=E4=B8=AA=EF=BC=8C=E5=88=B0=E5=BA=93=E5=8C=BA?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=8C=83=E5=9B=B4=E7=8E=B0=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BA=94=E6=98=BE=E7=A4=BA=E3=80=822.?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BB=8E=E5=BA=93=E5=8C=BA=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E5=BA=94=E6=98=BE=E7=A4=BA=E5=87=BA=EF=BC=8C=E4=BB=8E=E6=9C=88?= =?UTF-8?q?=E5=8F=B0=E4=BB=A3=E7=A0=81=E3=80=81=E5=85=A5=E5=BA=93=E4=BA=8B?= =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=E5=BA=94=E5=8E=BB?= =?UTF-8?q?=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedissueJobMain.data.ts | 32 +++++++++---------- .../unplannedissueRecordMain.data.ts | 32 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts index caff1030b..5aeef622f 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts @@ -872,22 +872,22 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '成本中心代码', - field: 'costcentreCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '科目代码', - field: 'qadProjectCode', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '成本中心代码', + // field: 'costcentreCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '科目代码', + // field: 'qadProjectCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '货主代码', field: 'ownerCode', diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts index d1100c8fa..f40ba7322 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts @@ -304,14 +304,14 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '从月台代码', - field: 'fromDockCode', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '从月台代码', + // field: 'fromDockCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '领用代码', field: 'usageCode', @@ -338,14 +338,14 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '入库事务类型', - field: 'inTransactionType', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '入库事务类型', + // field: 'inTransactionType', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '业务类型', field: 'businessType', From 9725831c69487dc4f76c29ff4f5b71f26f22ef5b Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 2 Sep 2024 11:34:07 +0800 Subject: [PATCH 07/11] =?UTF-8?q?HL-5741=E6=A3=80=E9=AA=8C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=B8=AD=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=9C=AA=E5=8F=91=E5=B8=83=E7=9A=84=E9=83=BD=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionRecord/index.vue | 2 +- src/views/qms/inspectionRecord/inspectionRecordMain.data.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index 9ac06b624..88c78d50f 100644 --- a/src/views/qms/inspectionRecord/index.vue +++ b/src/views/qms/inspectionRecord/index.vue @@ -223,7 +223,7 @@ const isShowEditBtn = (row, val) => { if (val.indexOf(row.inspectionType) > -1) { return true } else { - return row.useDecision + return row.isPublished } } const isShowPackageBtn = (row, val) => { diff --git a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts index 9c106671b..b40337a96 100644 --- a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts +++ b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts @@ -603,7 +603,7 @@ export const InspectionRecordMain = useCrudSchemas( isForm: false, isDetail: false, table: { - width: 300, + width: 340, fixed: 'right' } } From 0cf1cb3baa6f5cd960aa59bac88068b573e4392b Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 2 Sep 2024 11:59:37 +0800 Subject: [PATCH 08/11] =?UTF-8?q?HL-5799=E8=A3=85=E9=85=8D=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5&=E9=A2=84=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E3=80=81=E4=BB=BB=E5=8A=A1=E3=80=81=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=8F=AD=E6=AC=A1=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=EF=BC=8C=E8=A3=85=E9=85=8D=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5&=E9=A2=84=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E3=80=81=E8=AE=B0=E5=BD=95=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E6=A0=8F=E5=A2=9E=E5=8A=A0=E7=8F=AD=E6=AC=A1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptJobMain.data.ts | 13 ++++++ .../productreceiptRecordMain.data.ts | 15 ++++++- .../productreceiptRequestMain.data.ts | 40 +++++++------------ .../productreceiptAssembleJobMain.data.ts | 15 ++++++- .../productreceiptAssembleRecordMain.data.ts | 13 ++++++ .../productreceiptAssembleRequestMain.data.ts | 38 ++++++------------ 6 files changed, 80 insertions(+), 54 deletions(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts index d0891440f..200841c0a 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts @@ -1,5 +1,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' +import * as ShiftApi from '@/api/wms/shift' +const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'}) /** * @returns {Array} 制品收货任务主表 @@ -99,6 +101,17 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isSearch: true, + search: { + component:'Select', + componentProps:{ + options:shiftList.list, + optionsAlias: { + labelField: 'name', + valueField: 'name' + }, + } + } }, { label: '收货类型', diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts index 2b3d1d629..c6791cdac 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts @@ -1,5 +1,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' +import * as ShiftApi from '@/api/wms/shift' +const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'}) /** * @returns {Array} 制品收货记录主表 @@ -94,7 +96,18 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: true + isTable: true, + isSearch: true, + search: { + component:'Select', + componentProps:{ + options:shiftList.list, + optionsAlias: { + labelField: 'name', + valueField: 'name' + }, + } + } }, { label: '收货类型', diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 122cf480e..85e460036 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -262,31 +262,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ }], // 失去焦点校验参数 } } - // 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: '班次', @@ -296,7 +272,19 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ width: 150 }, isForm:false, - sortTableDefault: 1001 + sortTableDefault: 1001, + isSearch: true, + search: { + component:'Select', + componentProps:{ + options:shiftList.list, + optionsAlias: { + labelField: 'name', + valueField: 'name' + }, + } + } + }, { label: '收货类型', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts index bc9a69400..bed0e1d08 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts @@ -1,6 +1,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' - +import * as ShiftApi from '@/api/wms/shift' +const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'}) +console.log('shiftList',shiftList) /** * @returns {Array} 制品收货任务主表 */ @@ -96,9 +98,20 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'shiftName', sort: 'custom', isTable:true, + isSearch:true, table: { width: 150 }, + search: { + component:'Select', + componentProps:{ + options:shiftList.list, + optionsAlias: { + labelField: 'name', + valueField: 'name' + }, + } + } }, { label: '收货类型', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts index daf572609..e3b004cc2 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts @@ -1,5 +1,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' +import * as ShiftApi from '@/api/wms/shift' +const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'}) /** * @returns {Array} 制品收货记录主表 @@ -112,10 +114,21 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ label: '班次', field: 'shiftName', sort: 'custom', + isSearch:true, isTable:true, table: { width: 150 }, + search: { + component:'Select', + componentProps:{ + options:shiftList.list, + optionsAlias: { + labelField: 'name', + valueField: 'name' + }, + } + } }, { label: '收货类型', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index 643d79520..2c1becb57 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -271,31 +271,6 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ }], // 失去焦点校验参数 } } - // 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: '班次', @@ -304,8 +279,19 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isSearch:true, isForm:false, - sortTableDefault: 1001 + sortTableDefault: 1001, + search: { + component:'Select', + componentProps:{ + options:shiftList.list, + optionsAlias: { + labelField: 'name', + valueField: 'name' + }, + } + } }, { label: '收货类型', From db3429082688c1758a6b95cbf97fe2def5a2f775 Mon Sep 17 00:00:00 2001 From: tengxiaofei <302828528@qq.com> Date: Mon, 2 Sep 2024 13:18:15 +0800 Subject: [PATCH 09/11] =?UTF-8?q?HL-5424=EF=BC=9A=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=BA=BA=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRecordMain.data.ts | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts index 74fedc839..c1d6e643e 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts @@ -353,7 +353,7 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 180 }, - isTable: true, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -362,7 +362,7 @@ export const DeliverRecordMain = useCrudSchemas( valueFormat: 'x' } }, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -379,7 +379,7 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: true + isTable: false }, // { // label: '代码', @@ -757,15 +757,24 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + valueFormat: 'x' } }, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + }, + }, }, { label: '创建者', @@ -774,7 +783,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, // { // label: '任务明细ID', From f34a07f197bc9e9b80c80b7428da10d1de4a3317 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 2 Sep 2024 15:49:50 +0800 Subject: [PATCH 10/11] =?UTF-8?q?HL-5741=EF=BC=8C=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E7=BB=93=E6=9E=9C=E5=8F=98=E8=BF=87?= =?UTF-8?q?=E6=9D=A5=E4=BA=86=E6=B2=A1=E9=97=AE=E9=A2=98=EF=BC=8C=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=87=8C=E6=B2=A1=E6=9C=89=E5=8F=98=E8=BF=87=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail/src/Detail.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 3d83c25e0..e589f0cdc 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -45,7 +45,7 @@ :columns="2" /> - + Date: Mon, 2 Sep 2024 15:56:43 +0800 Subject: [PATCH 11/11] =?UTF-8?q?HL-5745=E6=88=90=E5=93=81=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=EF=BC=8C=E6=88=90=E5=93=81=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E4=BB=BB=E5=8A=A1=E3=80=81=E5=AF=84=E5=94=AE=E5=BA=93?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=8F=91=E8=B4=A7=E3=80=81=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E5=BA=93=E5=8F=91=E8=B4=A7.=E6=89=A7=E8=A1=8C=E6=97=B6?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=8E=89=E7=AC=AC=E4=BA=8C=E4=BD=8D=E6=98=AF?= =?UTF-8?q?Z=E7=9A=84=E5=AE=A2=E6=88=B7=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliver/deliverRequestMain/deliverRequestMain.data.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 11eb1d0c1..9b36f3867 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -98,6 +98,11 @@ export const DeliverRequestMain = useCrudSchemas( key: 'available', value: 'TRUE', isMainValue: false + }, + { + key: 'type', + value: 'DEFAULT', + isMainValue: false } ], verificationParams: [