From 505580219f59673714d4369d7d576d80a3d549b4 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 4 Sep 2024 10:12:29 +0800 Subject: [PATCH 01/21] =?UTF-8?q?WMS=20bug=EF=BC=9AHL-5766=20=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=A4=96=E5=87=BA=E5=BA=93=E8=AE=B0=E5=BD=95=E4=B8=BB?= =?UTF-8?q?=E5=AD=90=E5=A4=87=E6=B3=A8=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedissueRecordMain/unplannedissueRecordMain.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts index c34c3a9f2..a1155d066 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts @@ -374,7 +374,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ }, }, { - label: '备注', + label: '单据备注', field: 'remarkMain', sort: 'custom', table: { @@ -777,7 +777,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive( }, }, { - label: '备注', + label: '明细备注', field: 'remark', sort: 'custom', table: { From 12a384639b38c293dce1abc9d7ea54dc387089af Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 4 Sep 2024 11:28:36 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E6=8D=A2=E5=AD=97=E6=AE=B5=E5=90=8D?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demandforecastingMain/demandforecastingMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts index 406aeb737..ee80b26df 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts @@ -76,7 +76,7 @@ export const Supplier1 = useCrudSchemas(reactive([ export const Version = useCrudSchemas(reactive([ { label: '供应商代码', - field: 'supplerCodes', + field: 'supplierCodes', sort: 'custom', isSearch:true, }, From a897442fd0f8a2ad95115d567e6e3d72b54ddd28 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 4 Sep 2024 11:40:10 +0800 Subject: [PATCH 03/21] =?UTF-8?q?HL-5838=E8=B4=A8=E6=A3=80=E6=98=8E?= =?UTF-8?q?=E7=BB=86-=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=E5=8F=AA?= =?UTF-8?q?=E6=9C=89status=3D8=E9=9A=90=E8=97=8F=EF=BC=8C=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E9=83=BD=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/index.vue | 56 ++++++++++--------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 6e46ec13a..91205da4b 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -100,32 +100,7 @@ { tableColumns.value = val @@ -790,6 +791,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { .get(CACHE_KEY.DEPT) .find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) + annexInspectionDetail.value.hiddenDelete = row.status==8 //HL-5838质检明细-删除按钮只有status=8隐藏，其他都展示 detailRef.value.openDetail(row, titleName, titleValue, 'requestSupplierdeliverMain') } //添加/修改操作 From cd427ea3fec6d472b567285e2bf51f12af6e8aed Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 4 Sep 2024 13:42:24 +0800 Subject: [PATCH 04/21] =?UTF-8?q?HL-5831=E5=88=B6=E5=93=81=E5=AD=90?= =?UTF-8?q?=E4=BB=B6=E6=8A=A5=E5=BA=9F=E3=80=81=E6=8A=A5=E5=BA=9F=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E6=92=A4=E9=94=80=E7=94=9F=E6=88=90=E6=96=B0=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrap/scrapRecordMain/scrapRecordMain.data.ts | 8 ++++++++ .../productscrapRecordMain/productscrapRecordMain.data.ts | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts index 1411a2dcf..b6c76379b 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts @@ -399,6 +399,14 @@ export const ScrapRecordMain = useCrudSchemas( // } } }, + { + label: '关联单据号', + field: 'relateRecordNumber', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts index c195119cc..fc5a31ada 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts @@ -298,6 +298,14 @@ export const ProductscrapRecordMain = useCrudSchemas( // } } }, + { + label: '关联单据号', + field: 'relateRecordNumber', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '创建者', field: 'creator', From eff73134dbe2cc1e3b9c008d8781b1bd921a1649 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 4 Sep 2024 14:05:31 +0800 Subject: [PATCH 05/21] =?UTF-8?q?HL-5827SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E4=B8=8A=E4=BC=A0=E7=9A=84=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E6=8A=A5=E5=91=8A=E9=99=90=E5=88=B6=E5=8F=AA=E8=83=BD?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0PDF=E6=A0=BC=E5=BC=8F=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverInspectionDetail.data.ts | 2 +- .../supplierdeliver/supplierdeliverRequestMain/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts index 3a5bb522d..de8ce0f18 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts @@ -15,7 +15,7 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive Date: Wed, 4 Sep 2024 14:23:58 +0800 Subject: [PATCH 06/21] =?UTF-8?q?HL-5838SCP=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=EF=BC=8C=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=8A=A5=E5=91=8A=E7=9B=AE=E5=89=8D=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=8A=A5=E5=91=8A=E4=B8=8A=E4=BC=A0=E5=B9=B6=E9=9D=9E?= =?UTF-8?q?=E8=83=BD=E5=92=8C=E9=9B=B6=E4=BB=B6=E4=B8=80=E4=B8=80=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=EF=BC=8C=E9=9C=80=E8=A6=81=E5=BC=80=E5=8F=91=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=A0=A1=E9=AA=8C=EF=BC=8C=E6=8C=89=E7=85=A7=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E9=9B=B6=E4=BB=B6=E5=8F=B7=E6=98=8E=E7=BB=86=E8=A1=8C?= =?UTF-8?q?=E6=95=B0=E9=87=8F=EF=BC=88=E5=90=8C=E4=B8=80=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=90=8C=E6=89=B9=E6=AC=A1=EF=BC=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E4=BE=9B=E5=BA=94=E5=95=86=E5=88=86=E5=88=AB=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=8A=A5=E5=91=8A=EF=BC=89=E6=A0=B8=E5=AF=B9=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E4=B8=8A=E4=BC=A0=E6=95=B0=E9=87=8F=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=8A=A5=E5=91=8A=E6=95=B0=E9=87=8F=E5=B0=91=E4=BA=8E?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E6=95=B0=E9=87=8F=EF=BC=8C=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E5=8F=91=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Annex/src/Annex.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue index a9f8b472b..e89826f8a 100644 --- a/src/components/Annex/src/Annex.vue +++ b/src/components/Annex/src/Annex.vue @@ -4,7 +4,9 @@
+ @update:modelValue="handleAnnexSuccess" v-if="showAddBtn"/> + +
From 591e05e6e881b9b83face9d78060a9324a3b04e8 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 4 Sep 2024 14:27:14 +0800 Subject: [PATCH 07/21] =?UTF-8?q?WMS=20bug=EF=BC=9AHL-5766=20=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=A4=96=E5=85=A5=E5=BA=93=E7=94=B3=E8=AF=B7.?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1.=E8=AE=B0=E5=BD=95=E4=B8=BB=E5=AD=90?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptJobMain.data.ts | 6 +++--- .../unplannedreceiptRecordMain.data.ts | 6 +++--- .../unplannedreceiptRequestMain.data.ts | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts index d6f590e93..8e2fe9647 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts @@ -351,13 +351,13 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ // }, // }, { - label: '备注', + label: '单据备注', field: 'remarkMain', sort: 'custom', table: { width: 150 }, - isTable: false, + isTable: true, }, { label: '自动完成', @@ -1026,7 +1026,7 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive([ }, }, { - label: '备注', + label: '明细备注', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index bc4712099..8fcf73b5e 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -358,9 +358,9 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( }, }, { - label: '备注', + label: '单据备注', field: 'remarkMain', - isTable:false, + isTable:true, sort: 'custom', table: { width: 150 @@ -840,7 +840,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive } }, { - label: '备注', + label: '单据备注', field: 'remarkMain', sort: 'custom', table: { width: 150 }, - isTable:false, - sortTableDefault: 1000, + isTable:true, + //sortTableDefault: 1000, }, { label: '创建时间', @@ -668,7 +668,7 @@ export const UnplannedreceiptRequestMainRules = reactive({ directCreateRecord: [ { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' } ], - remark: [ + remarkMain: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], usageDescription:[ @@ -1244,7 +1244,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive Date: Wed, 4 Sep 2024 16:51:06 +0800 Subject: [PATCH 08/21] =?UTF-8?q?Q2=E9=80=9A=E7=9F=A5=E5=8D=95=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84=20=20HL-5740?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionQ2/index.vue | 118 +++++++++++---- .../qms/inspectionQ2/inspectionQ2.data.ts | 137 ++++++++++++++++-- 2 files changed, 218 insertions(+), 37 deletions(-) diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index 035970ae9..92cec2464 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -49,7 +49,7 @@ { const { claimAddress } = formModel formRef.value.setValues({ @@ -63,19 +63,28 @@ :apiUpdate="Q2Api.updateQ2" :apiCreate="Q2Api.createQ2" @searchTableSuccess="searchTableSuccess" + @clearSearchInput="clearSearchInput" :isBusiness="false" @onChange="onChange" > - @@ -105,6 +114,7 @@ import * as SupplierApi from '@/api/wms/supplier' import * as ItembasicApi from '@/api/wms/itembasic' import { useUserStore } from '@/store/modules/user' import { usePageLoading } from '@/hooks/web/usePageLoading' +import { log } from 'console' const { loadStart, loadDone } = usePageLoading() const userStore = useUserStore() @@ -117,7 +127,42 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref(Q2.allSchemas.tableColumns) - +const clearSearchInput = (formField) => { + if (formField == 'itemCode') { + basicFormRef.value.formRef.setValues({ + itemName: '', + SupplierCode: '', + SupplierName: '' + }) + } + if (formField == 'lightItemCode') { + basicFormRef.value.formRef.setValues({ + standardCostPrice: '', + lightQty: 0, + claimAmount: '', + otherClaimAmount: 0, + summaryAmount: 0, + disbursementAmount: 0, + remainingAmount: 0 + }) + const params2 = { + by: 'ASC', + filters: [{ column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }], + pageNo: 1, + pageSize: 500, + sort: '' + } + params2.isSearch = true + StdcostpriceApi.getStdcostpricePage(params2).then((res) => { + if (res.list?.length > 0) { + priceObj.value = res.list[0] + basicFormRef.value.formRef.setValues({ + standardCostPrice: priceObj.value.price + }) + } + }) + } +} // 查询页面返回 const priceObj = ref() const searchTableSuccess = (formField, searchField, val, formRef) => { @@ -147,7 +192,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { if (formField == 'purchaseReceiptNumber') { let result = '' for (var i = 0; i < val.length; i++) { - result += val[i].number + ',' + result += val[i].receiptNumber + ',' } if (result.endsWith(',')) { result = result.substring(0, result.length - 1) @@ -187,7 +232,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { formRef.setValues(setV) } - if (formField == 'q1Number') { + if (formField == 'q1Number') { setV['q1Number'] = val[0].code setV[formField] = val[0][searchField] formRef.setValues(setV) @@ -248,6 +293,32 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { }) } }) + + if (val[0].lightItemCode == null) { + setV['standardCostPrice'] = '' + setV['lightQty'] = 0 + setV['claimAmount'] = '' + setV['otherClaimAmount'] = 0 + setV['summaryAmount'] = 0 + setV['disbursementAmount'] = 0 + setV['remainingAmount'] = 0 + const params2 = { + by: 'ASC', + filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode }], + pageNo: 1, + pageSize: 500, + sort: '' + } + params2.isSearch = true + StdcostpriceApi.getStdcostpricePage(params2).then((res) => { + if (res.list?.length > 0) { + priceObj.value = res.list[0] + formRef.setValues({ + standardCostPrice: priceObj.value.price + }) + } + }) + } setV[formField] = val[0][searchField] formRef.setValues(setV) } @@ -255,8 +326,6 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { } const onChange = (field, e) => { - console.log('onChange',field) - console.log(basicFormRef.value.formRef.formModel) if (field == 'lightQty') { basicFormRef.value.formRef.formModel.claimAmount = ( parseFloat(basicFormRef.value.formRef.formModel.lightQty) * @@ -265,7 +334,7 @@ const onChange = (field, e) => { ).toFixed(6) basicFormRef.value.formRef.formModel.summaryAmount = ( parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + - parseFloat(basicFormRef.value.formRef.formModel.otherClaimAmount||0) + parseFloat(basicFormRef.value.formRef.formModel.otherClaimAmount || 0) ).toFixed(6) basicFormRef.value.formRef.formModel.remainingAmount = ( parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) - @@ -440,7 +509,7 @@ const handleFinish = async (id: number) => { /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { - if (row && row.claimAddress?.trim()) { + if (row && row.claimAddress?.trim()) { row.filePathList = row.claimAddress.split(',') } @@ -454,8 +523,8 @@ const openForm = (type: string, row?: any) => { } basicFormRef.value.open(type, row) - if(!row || !row.claimAmount){ - nextTick(() => { + if (!row || !row.claimAmount) { + nextTick(() => { basicFormRef.value.formRef.setValues({ claimAmount: '' }) @@ -470,11 +539,9 @@ const openForm = (type: string, row?: any) => { disbursementAmount: 0 }) }) - const currentTime = new Date().getTime() + const currentTime = new Date().getTime() const fileId = Q2.allSchemas.formSchema.find((item) => item.field == 'fileId') - const uploadFile = Q2.allSchemas.formSchema.find( - (item) => item.field == 'claimAddress' - ) + const uploadFile = Q2.allSchemas.formSchema.find((item) => item.field == 'claimAddress') if (fileId) { fileId['value'] = currentTime } @@ -482,11 +549,8 @@ const openForm = (type: string, row?: any) => { uploadFile['componentProps']['upData']['tableId'] = currentTime uploadFile['componentProps']['modelValue'] = [] } - } - else if (type == 'update') { - const uploadFile = Q2.allSchemas.formSchema.find( - (item) => item.field == 'claimAddress' - ) + } else if (type == 'update') { + const uploadFile = Q2.allSchemas.formSchema.find((item) => item.field == 'claimAddress') uploadFile['componentProps']['modelValue'] = row.filePathListView } } @@ -503,10 +567,10 @@ const formsSuccess = async (formType, data) => { return } } - if (data.lightQty == 0) { - message.error('整灯数量不能为0') - return - } + // if (data.lightQty == 0) { + // message.error('数量不能为0') + // return + // } if (!data.standardCostPrice) { message.error('标准成本价格不能为0或空') return diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index ea33b0796..9f1652a69 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -10,8 +10,7 @@ import { Q1 } from '@/views/qms/inspectionQ1/inspectionQ1.data' import * as SupplieritemApi from '@/api/wms/supplieritem' import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data' -import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail' -import { PurchasereceiptRecordDetail } from '@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data' +import * as PurchasereturnRequestDetailApi from '@/api/wms/purchasereturnRequestDetail' import * as ItembasicApi from '@/api/wms/itembasic' import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' @@ -28,8 +27,7 @@ export const Q2Rules = reactive({ { max: 255, message: '不得超过255个字符', trigger: 'blur' } ], claimTime: [{ required: true, message: '请选择索赔日期', trigger: 'change' }], - lightItemCode: [{ required: true, message: '请选择整灯物料代码', trigger: 'change' }], - lightQty: [{ required: true, message: '请选择整灯数量', trigger: 'change' }], + lightQty: [{ required: true, message: '请选择数量', trigger: 'change' }], code: [{ required: true, message: '请选择缺陷代码', trigger: 'change' }], priority: [{ required: true, message: '请选择优先级', trigger: 'change' }], claimMultiple: [{ required: true, message: '请选择索赔倍数', trigger: 'change' }], @@ -39,6 +37,123 @@ export const Q2Rules = reactive({ handleTime: [{ required: true, message: '请选择选择处理时间', trigger: 'change' }] }) +export const Q2result = useCrudSchemas( + reactive([ + { + label: '收货日期', + field: 'currentDeliveryDate', + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + label: '收货单号', + field: 'receiptNumber', + sort: 'custom', + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '发货单号', + field: 'asnNumber', + sort: 'custom', + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + } + ]) +) + export const Q2 = useCrudSchemas( reactive([ { @@ -175,8 +290,8 @@ export const Q2 = useCrudSchemas( searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本 searchField: 'number', // 查询弹窗赋值字段 searchTitle: '采购收货记录', // 查询弹窗标题 - searchAllSchemas: PurchasereceiptRecordDetail.allSchemas, // 查询弹窗所需类 - searchPage: PurchasereceiptRecordDetailApi.pageForQ2, // 查询弹窗所需分页方法 + searchAllSchemas: Q2result.allSchemas, // 查询弹窗所需类 + searchPage: PurchasereturnRequestDetailApi.getPurchasereturnPurchasereceiptRecordByItemCode, // 查询弹窗所需分页方法 searchCondition: [ { key: 'supplierCode', @@ -238,8 +353,8 @@ export const Q2 = useCrudSchemas( isMainValue: false }, { - key: 'type', - value: 'CCP', + key: 'typeQ2', + value: 'CCP,BCP', isMainValue: false } ], @@ -276,7 +391,7 @@ export const Q2 = useCrudSchemas( } }, { - label: '整灯数量', + label: '数量', field: 'lightQty', sort: 'custom', isTable: true, @@ -624,7 +739,7 @@ export const Q2 = useCrudSchemas( tableName: 'basicInspectionQ2', tableId: '' }, - fileType: ['doc', 'xls', 'ppt', 'txt'], + fileType: ['doc', 'xls', 'ppt', 'txt', 'pdf'], modelValue: [] } } @@ -759,3 +874,5 @@ export const Q2 = useCrudSchemas( } ]) ) + + From 5caca911491d6104ce5845b34e2441e35324e5f8 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Wed, 4 Sep 2024 17:33:10 +0800 Subject: [PATCH 09/21] =?UTF-8?q?Q2=E9=80=9A=E7=9F=A5=E5=8D=95=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84=20=20HL-5740?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionQ2/inspectionQ2.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index 9f1652a69..898bb7f94 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -23,7 +23,7 @@ export const Q2Rules = reactive({ itemCode: [{ required: true, message: '请选择供应商物料代码', trigger: 'change' }], supplierCode: [{ required: true, message: '请选择供应商代码', trigger: 'change' }], purchaseReceiptNumber: [ - { required: true, message: '请选择采购收货单号', trigger: 'change' }, + // { required: true, message: '请选择采购收货单号', trigger: 'change' }, { max: 255, message: '不得超过255个字符', trigger: 'blur' } ], claimTime: [{ required: true, message: '请选择索赔日期', trigger: 'change' }], From ae44d72c311876e54d737e334eb0983970439c99 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 4 Sep 2024 17:36:16 +0800 Subject: [PATCH 10/21] =?UTF-8?q?WMS=20bug=EF=BC=9AHL-5766=20=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7.=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1.=E8=AE=B0=E5=BD=95=E4=B8=BB=E5=AD=90=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrap/scrapJobMain/scrapJobMain.data.ts | 6 +- .../scrapRecordMain/scrapRecordMain.data.ts | 6 +- .../scrapRequestMain/scrapRequestMain.data.ts | 6 +- .../unplannedissueRecordMain.data.ts | 152 +++++++++--------- .../unplannedreceiptJobMain.data.ts | 74 ++++----- .../unplannedreceiptRecordMain.data.ts | 118 +++++++------- 6 files changed, 181 insertions(+), 181 deletions(-) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts index 0d0a935b4..d5d6db4d1 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts @@ -370,8 +370,8 @@ export const ScrapJobMain = useCrudSchemas( } }, { - label: '备注', - field: 'remark', + label: '单据备注', + field: 'remarkMain', sort: 'custom', table: { width: 150 @@ -904,7 +904,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive([ // }, // }, { - label: '备注', + label: '明细备注', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts index b6c76379b..dd6322a27 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts @@ -373,8 +373,8 @@ export const ScrapRecordMain = useCrudSchemas( } }, { - label: '备注', - field: 'remark', + label: '单据备注', + field: 'remarkMain', sort: 'custom', table: { width: 150 @@ -736,7 +736,7 @@ export const ScrapRecordDetail = useCrudSchemas(reactive([ // }, // }, { - label: '备注', + label: '明细备注', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index 39c29353d..28840c4ea 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -625,8 +625,8 @@ export const ScrapRequestMain = useCrudSchemas( } }, { - label: '备注', - field: 'remark', + label: '单据备注', + field: 'remarkMain', sort: 'custom', table: { width: 150 @@ -1171,7 +1171,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ isForm: false, }, { - label: '备注', + label: '明细备注', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts index a1155d066..ad8dfa80a 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts @@ -409,43 +409,43 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - 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: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '创建时间', + // field: 'createTime', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // 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: '创建者', + // field: 'creator', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '最后更新时间', field: 'updateTime', @@ -488,26 +488,26 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ // width: 150 // }, // }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: false, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - } - }, + // { + // label: '是否可用', + // field: 'available', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', + // isSearch: false, + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE' + // } + // } + // }, { label: '操作', field: 'action', @@ -757,25 +757,25 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive( width: 150 }, }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '项目代码', + // field: 'projectCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '接口类型', + // field: 'interfaceType', + // dictType: DICT_TYPE.INTERFACE_TYPE, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '明细备注', field: 'remark', diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts index 8e2fe9647..5a1ff9987 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts @@ -625,43 +625,43 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - 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: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '创建时间', + // field: 'createTime', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // 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: '创建者', + // field: 'creator', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '最后更新时间', field: 'updateTime', diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index 8fcf73b5e..65fe27451 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -393,45 +393,45 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( width: 150 }, }, - { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - isTable:false, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - isSearch: true, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'datetimerange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - isTable:false, - table: { - width: 150 - }, - }, + // { + // label: '创建时间', + // field: 'createTime', + // formatter: dateFormatter, + // isTable:false, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // isSearch: true, + // search: { + // component: 'DatePicker', + // componentProps: { + // valueFormat: 'YYYY-MM-DD HH:mm:ss', + // type: 'datetimerange', + // defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + // } + // }, + // }, + // { + // label: '创建者', + // field: 'creator', + // sort: 'custom', + // isTable:false, + // table: { + // width: 150 + // }, + // }, { label: '最后更新时间', field: 'updateTime', @@ -474,26 +474,26 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( // width: 150 // }, // }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: false, - isTable: false, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - } - }, + // { + // label: '是否可用', + // field: 'available', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', + // isSearch: false, + // isTable: false, + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE' + // } + // } + // }, { label: '操作', field: 'action', From 9828c1a62f46034a5dbf1509437c55da6bf214cc Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Sep 2024 09:36:19 +0800 Subject: [PATCH 11/21] =?UTF-8?q?HL-5830=E8=A6=81=E8=B4=A7=E9=A2=84?= =?UTF-8?q?=E6=B5=8B-=E8=AE=A1=E5=88=92=E5=91=98=EF=BC=8C=E5=8F=AA?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/demandforecastingDetail/index.ts | 4 ++++ src/api/wms/demandforecastingMain/index.ts | 4 ++++ .../demandforecastingMain/demandforecastingMain.data.ts | 2 +- .../supplierdeliver/demandforecastingMain/index.vue | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts index 309422d37..a2de6e22b 100644 --- a/src/api/wms/demandforecastingDetail/index.ts +++ b/src/api/wms/demandforecastingDetail/index.ts @@ -35,6 +35,10 @@ const getPageParams = (params)=>{ params.endDate = params.dueDate[1].format('YYYY-MM-DD') } } + if (!params.dueDate || params.dueDate.length == 0) { + params.startDate = '' + params.endDate = '' + } params.dueDate = '' //计划员 diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts index 0433af12c..95049aa46 100644 --- a/src/api/wms/demandforecastingMain/index.ts +++ b/src/api/wms/demandforecastingMain/index.ts @@ -85,6 +85,10 @@ const getPageParams = (params)=>{ params.endDate = params.dueDate[1].format('YYYY-MM-DD') } } + if (!params.dueDate || params.dueDate.length == 0) { + params.startDate = '' + params.endDate = '' + } params.dueDate = '' //计划员 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts index ee80b26df..ea3762b98 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts @@ -265,7 +265,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ isForm: false, search: { component: 'DatePicker', - value: [dayjs(), dayjs().subtract(-3,'month')], + // value: [dayjs(), dayjs().subtract(-3,'month')], componentProps: { valueFormat: 'YYYY-MM-DD', type: 'daterange', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue index 094a5d307..0d02568a3 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue @@ -171,7 +171,7 @@ const onSearchChange = (field, value)=>{ } } const searchClick = async (data)=>{ - console.log('searchClick',data) + console.log('3444',tableObject.params) await setSearchParamsHead(data) // updateDateTableColumns() setSearchParams(data) From 16edf83d5ddd02213b40c7fb2f7d0c9dc9e433c6 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 5 Sep 2024 09:48:54 +0800 Subject: [PATCH 12/21] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5729=E9=80=80?= =?UTF-8?q?=E8=B4=A7=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnJobMain/purchasereturnJobMain.data.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts index eaf2e2a4e..b68f7d8cb 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts @@ -723,7 +723,8 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isSearch: true, + isTable:false, + isSearch: false, sortTableDefault: 10, }, { @@ -733,6 +734,8 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, + isSearch: false, sortTableDefault: 10, }, { @@ -746,6 +749,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ hiddenInMain:true, isTableForm: false, isForm: false, + isTable:false, }, // { // label: '器具号', @@ -820,6 +824,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ }, sortTableDefault: 16, hiddenInMain:true, + isTable:false, }, { label: '到货主代码', @@ -830,6 +835,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ }, sortTableDefault: 16, hiddenInMain:true, + isTable:false, }, { label: '订单号', From a049b66ca9b7959ae635b5b22ba7a52d777b158e Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 5 Sep 2024 10:54:00 +0800 Subject: [PATCH 13/21] =?UTF-8?q?HL-5785=E5=88=B6=E5=93=81=E5=AD=90?= =?UTF-8?q?=E4=BB=B6=E6=8A=A5=E5=BA=9F=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productscrapRecordMain.data.ts | 82 +++++++++---------- .../productscrapRequestMain/index.vue | 3 + 2 files changed, 44 insertions(+), 41 deletions(-) diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts index fc5a31ada..2261f19a7 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts @@ -100,22 +100,22 @@ export const ProductscrapRecordMain = useCrudSchemas( width: 150 } }, - { - label: '班组', - field: 'team', - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '班次', - field: 'shift', - sort: 'custom', - table: { - width: 150 - } - }, + // { + // label: '班组', + // field: 'team', + // sort: 'custom', + // table: { + // width: 150 + // } + // }, + // { + // label: '班次', + // field: 'shift', + // sort: 'custom', + // table: { + // width: 150 + // } + // }, { label: '报废原因', field: 'scrappingReason', @@ -270,15 +270,15 @@ export const ProductscrapRecordMain = useCrudSchemas( }, isTable: false }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false + // }, { label: '是否已撤销', field: 'revokeFlag', @@ -729,22 +729,22 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive([ }, isTable: false, }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - search: { - component: 'Input', - componentProps: { - placeholder: '请输入备注' - } - }, - isTable: true, - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isSearch: true, + // search: { + // component: 'Input', + // componentProps: { + // placeholder: '请输入备注' + // } + // }, + // isTable: true, + // }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index b92bb9d2b..51c90e5f1 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -390,6 +390,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // 明细查询页赋值 if(formField == 'productionLineCode'){ row['productionLineCode'] = val[0]['code'] + tableData.value = [] }else if(formField == 'fromLocationCode'){ // val.forEach(item=>{ // const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) @@ -458,6 +459,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => //成本中心代码 //成本中心类型 setV['costCenterType'] = val[0]['costcentreType'] + }else if(formField == 'productionLineCode'){ + tableData.value = [] } formRef.setValues(setV) } From 33f76087a3a0bbae3e2fd2b6b08e6407b35723fe Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Thu, 5 Sep 2024 11:17:20 +0800 Subject: [PATCH 14/21] =?UTF-8?q?Q2=E9=80=9A=E7=9F=A5=E5=8D=95=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84=20=20HL-5740?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionQ2/index.vue | 127 ++++++++++++++++++++++----- 1 file changed, 104 insertions(+), 23 deletions(-) diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index 92cec2464..5dc3edbb4 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -127,17 +127,25 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref(Q2.allSchemas.tableColumns) + const clearSearchInput = (formField) => { if (formField == 'itemCode') { basicFormRef.value.formRef.setValues({ itemName: '', - SupplierCode: '', - SupplierName: '' + supplierCode: '', + supplierName: '', + purchaseReceiptNumber: '' + }) + Q2.allSchemas.formSchema.forEach((item) => { + if (item.field == 'supplierCode') { + item.componentProps.options = [] + } }) } if (formField == 'lightItemCode') { basicFormRef.value.formRef.setValues({ standardCostPrice: '', + lightItemName: '', lightQty: 0, claimAmount: '', otherClaimAmount: 0, @@ -147,7 +155,9 @@ const clearSearchInput = (formField) => { }) const params2 = { by: 'ASC', - filters: [{ column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }], + filters: [ + { column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode } + ], pageNo: 1, pageSize: 500, sort: '' @@ -212,22 +222,22 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { setV['summaryAmount'] = 0 setV['disbursementAmount'] = 0 setV['remainingAmount'] = 0 -  const params2 = { -        by: 'ASC', -        filters: [{ column: 'itemCode', action: '==', value: val[0].code }], -        pageNo: 1, -        pageSize: 500, -        sort: '' -      } -      params2.isSearch = true -      StdcostpriceApi.getStdcostpricePage(params2).then((res) => { -        if (res.list?.length > 0) { -          priceObj.value = res.list[0] -          formRef.setValues({ -            standardCostPrice: priceObj.value.price -          }) -        } -      }) + const params2 = { + by: 'ASC', + filters: [{ column: 'itemCode', action: '==', value: val[0].code }], + pageNo: 1, + pageSize: 500, + sort: '' + } + params2.isSearch = true + StdcostpriceApi.getStdcostpricePage(params2).then((res) => { + if (res.list?.length > 0) { + priceObj.value = res.list[0] + formRef.setValues({ + standardCostPrice: priceObj.value.price + }) + } + }) setV[formField] = val[0][searchField] formRef.setValues(setV) } @@ -245,8 +255,8 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { } if (formField == 'itemCode') { - setV['SupplierCode'] = '' - setV['SupplierName'] = '' + setV['supplierCode'] = '' + setV['supplierName'] = '' setV['itemName'] = '' setV['uom'] = val[0].supplierUom @@ -293,8 +303,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { }) } }) - - if (val[0].lightItemCode == null) { + if (basicFormRef.value.formRef.formModel.lightItemCode == null|| + basicFormRef.value.formRef.formModel.lightItemCode == '' + ) { setV['standardCostPrice'] = '' setV['lightQty'] = 0 setV['claimAmount'] = '' @@ -403,6 +414,76 @@ const onChange = (field, e) => { } }) } + + // if (field == 'itemCode') { + // basicFormRef.value.formRef.formModel.supplierCode = '' + // basicFormRef.value.formRef.formModel.supplierName = '' + // basicFormRef.value.formRef.formModel.itemName = '' + + // Q2Api.getEmail().then((res) => { + // if (res) { + // basicFormRef.value.formRef.formModel.cashierEmail =res + // } + // }) + + // const supplieritemParams = { + // by: 'ASC', + // filters: [{ column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }], + // pageNo: 1, + // pageSize: 500, + // sort: '' + // } + // supplieritemParams.isSearch = true + // SupplieritemApi.getSupplieritemPage(supplieritemParams).then((res) => { + // if (res.list?.length > 0) { + // basicFormRef.value.formRef.formModel.supplierCode = res.list[0].supplierCode + // basicFormRef.value.formRef.formModel.supplierName = res.list[0].supplierName + // Q2.allSchemas.formSchema.forEach((item) => { + // if (item.field == 'supplierCode') { + // item.componentProps.options = res.list + // } + // }) + // } + // }) + // const itembasicParams = { + // by: 'ASC', + // filters: [{ column: 'code', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }], + // pageNo: 1, + // pageSize: 500, + // sort: '' + // } + + // itembasicParams.isSearch = true + // ItembasicApi.getItembasicPage(itembasicParams).then((res) => { + // if (res.list?.length > 0) { + // basicFormRef.value.formRef.formModel.itemName = res.list[0].name + // } + // }) + + // if (basicFormRef.value.formRef.formModel.lightItemCode == null) { + // basicFormRef.value.formRef.formModel.standardCostPrice = '' + // basicFormRef.value.formRef.formModel.lightQty = 0 + // basicFormRef.value.formRef.formModel.claimAmount= '' + // basicFormRef.value.formRef.formModel.otherClaimAmount = 0 + // basicFormRef.value.formRef.formModel.summaryAmount= 0 + // basicFormRef.value.formRef.formModel.disbursementAmount = 0 + // basicFormRef.value.formRef.formModel.remainingAmount = 0 + // const params2 = { + // by: 'ASC', + // filters: [{ column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }], + // pageNo: 1, + // pageSize: 500, + // sort: '' + // } + // params2.isSearch = true + // StdcostpriceApi.getStdcostpricePage(params2).then((res) => { + // if (res.list?.length > 0) { + // priceObj.value = res.list[0] + // basicFormRef.value.formRef.formModel.standardCostPrice = priceObj.value.price + // } + // }) + // } + // } } // 字段设置 更新主列表字段 From 3418c48f3ee5d697e0e0ecbd3ab09dd9bdf59e2f Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 5 Sep 2024 11:20:35 +0800 Subject: [PATCH 15/21] =?UTF-8?q?HL-5801=E5=8F=91=E6=96=99=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=96=B0=E5=A2=9E=EF=BC=8C=E7=B2=98=E8=B4=B4=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=90=8E=E4=B8=8D=E8=A6=81=E6=8C=89=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=8C=E7=B2=98=E8=B4=B4=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E6=98=AF=E4=BB=80=E4=B9=88=E5=B0=B1=E6=98=AF=E4=BB=80=E4=B9=88?= =?UTF-8?q?=EF=BC=8C=E5=8C=85=E6=8B=AC=E5=88=9B=E5=BB=BA=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=AF=BC=E5=87=BA=E7=9A=84=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E4=B9=9F=E4=B8=8D=E8=A6=81=E6=94=B9=E5=8F=98=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/issueManage/issue/issueRequestMain/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue index 6c84aa7c4..0aca9f690 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue @@ -487,6 +487,9 @@ const submitForm = async (formType, submitData) => { if(data.masterId){ data.id = data.masterId } + tableData.value.forEach((item,index)=>{ + item['orderNumber'] = index+1 + }) data.subList = tableData.value // 拼接子表数据参数 if(tableData.value.find(item => (item.qty <= 0))) { message.warning('数量必须大于0') From 08c2f6cb6b271c3640e7b73751c33b0c13a247ca Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Sep 2024 11:38:02 +0800 Subject: [PATCH 16/21] =?UTF-8?q?HL-5830SCP-=E8=A6=81=E8=B4=A7=E9=A2=84?= =?UTF-8?q?=E6=B5=8B-=E8=AE=A1=E5=88=92=E5=91=98=EF=BC=8C=E5=8F=AA?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BC=A0=E5=8F=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/demandforecastingDetail/index.ts | 4 ++-- src/api/wms/demandforecastingMain/index.ts | 2 +- .../demandforecastingMain/demandforecastingMain.data.ts | 2 +- .../supplierdeliver/demandforecastingMain/index.vue | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts index a2de6e22b..753c999d9 100644 --- a/src/api/wms/demandforecastingDetail/index.ts +++ b/src/api/wms/demandforecastingDetail/index.ts @@ -35,11 +35,12 @@ const getPageParams = (params)=>{ params.endDate = params.dueDate[1].format('YYYY-MM-DD') } } + console.log(params.dueDate) if (!params.dueDate || params.dueDate.length == 0) { params.startDate = '' params.endDate = '' } - params.dueDate = '' + // params.dueDate = '' //计划员 if(params.planerId&¶ms.planerId.length>0){ @@ -83,7 +84,6 @@ export const getDemandforecastingDetailPage = async (params) => { return await request.post({ url: '/wms/demandforecasting-detail/senior', data }) } else { params = getPageParams(params) - console.log('params',params) return await request.get({ url: `/wms/demandforecasting-detail/page`, params }) } } diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts index 95049aa46..cbb7bfb59 100644 --- a/src/api/wms/demandforecastingMain/index.ts +++ b/src/api/wms/demandforecastingMain/index.ts @@ -89,7 +89,7 @@ const getPageParams = (params)=>{ params.startDate = '' params.endDate = '' } - params.dueDate = '' + // params.dueDate = '' //计划员 if(params.planerId&¶ms.planerId.length>0){ diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts index ea3762b98..ee80b26df 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts @@ -265,7 +265,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ isForm: false, search: { component: 'DatePicker', - // value: [dayjs(), dayjs().subtract(-3,'month')], + value: [dayjs(), dayjs().subtract(-3,'month')], componentProps: { valueFormat: 'YYYY-MM-DD', type: 'daterange', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue index 0d02568a3..9db63afdf 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue @@ -171,7 +171,6 @@ const onSearchChange = (field, value)=>{ } } const searchClick = async (data)=>{ - console.log('3444',tableObject.params) await setSearchParamsHead(data) // updateDateTableColumns() setSearchParams(data) From eb6184adf8b2225745f9449578265145a256e844 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 5 Sep 2024 11:54:31 +0800 Subject: [PATCH 17/21] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/inventoryManage/balanceSummary/balanceSummary.data.ts | 4 ++++ src/views/wms/inventoryManage/balanceSummary/index.vue | 1 + 2 files changed, 5 insertions(+) diff --git a/src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts b/src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts index 1cd6491d4..452c19a7e 100644 --- a/src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts +++ b/src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts @@ -63,6 +63,10 @@ export const BalanceSummary = useCrudSchemas( label: ' ', field: 'name', sort: 'custom', + align: 'left', + table:{ + width: 350 + } }, { label: '总数', diff --git a/src/views/wms/inventoryManage/balanceSummary/index.vue b/src/views/wms/inventoryManage/balanceSummary/index.vue index 40db7b901..e74f526f6 100644 --- a/src/views/wms/inventoryManage/balanceSummary/index.vue +++ b/src/views/wms/inventoryManage/balanceSummary/index.vue @@ -26,6 +26,7 @@