From 27f7df690d32f2d58c2b345fa930b68dcc6c6d49 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 30 Apr 2024 14:56:28 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=B8=A4=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliver/deliverRequestMain/deliverRequestMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 745515889..caf69fc42 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -1072,6 +1072,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ width: 150, fixed: 'right' }, + hiddenInMain:true, isTableForm:false, } ])) From 7922344f9b655b0fe0aca83c0ea7285aee05f33b Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 30 Apr 2024 15:05:06 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturn/purchasereturnRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 6fb742c7a..84486e1c7 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -210,7 +210,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => tableData.value.forEach((item) => { item.batch = item.toBatch - item.packingNumber = '' + item.packingNumber = item.toPackingNumber item.containerNumber = item.toContainerNumber item.receiptQty = item.qty item.toLocationGroupCode = null From 65407efc1d9b5a243d86ac998a0814989227e10c Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 30 Apr 2024 15:16:00 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparereceiptRequestMain/sparereceiptRequestMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts index 0bea96be7..4178a1fa4 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts @@ -803,7 +803,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive Date: Tue, 30 Apr 2024 15:32:58 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptJobMain/purchasereceiptJobMain.data.ts | 2 +- .../purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts | 2 +- .../sparereceiptJobMain/sparereceiptJobMain.data.ts | 2 +- .../sparereceiptRecordMain/sparereceiptRecordMain.data.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts index d382e7092..7463ebd68 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -1028,7 +1028,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ }, { label: '收货数量', - field: 'receivedQty', + field: 'qty', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 894b61c00..0cf8a39b0 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -677,7 +677,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, { label: '收货数量', - field: 'receivedQty', + field: 'qty', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts index 5a0770710..ff11ee943 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts @@ -1026,7 +1026,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ }, { label: '收货数量', - field: 'receivedQty', + field: 'qty', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts index 96b73bb0d..1fdca55d9 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts @@ -676,7 +676,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, { label: '收货数量', - field: 'receivedQty', + field: 'qty', sort: 'custom', table: { width: 150 From 1c5bc1f8d088d9c1000458bd8baf5600ffd613ff Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 30 Apr 2024 15:46:30 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7=20=20?= =?UTF-8?q?=20=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/deliverRecordDetail/index.ts | 5 +++++ .../customerreturnRequestMain.data.ts | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/api/wms/deliverRecordDetail/index.ts b/src/api/wms/deliverRecordDetail/index.ts index 2c6eaa2c1..28ea53b04 100644 --- a/src/api/wms/deliverRecordDetail/index.ts +++ b/src/api/wms/deliverRecordDetail/index.ts @@ -73,4 +73,9 @@ export const exportDeliverRecordDetail = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/deliver-record-detail/get-import-template' }) +} + +// 查询发货记录子列表 +export const getDeliverRecordDetailListToRepeat = async (params) => { + return await request.get({ url: `/wms/deliver-record-detail/listToRepeat`, params }) } \ No newline at end of file diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index d76ff8722..e6c424e58 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -552,9 +552,9 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ //表单校验 export const CustomerreturnRequestMainRules = reactive({ - // deliverRecordNumber: [ - // { required: true, message: '请选择发货记录单号', trigger: 'change' } - // ], + deliverRecordNumber: [ + { required: true, message: '请选择发货记录单号', trigger: 'change' } + ], customerCode: [ { required: true, message: '请选择客户代码', trigger: 'blur' } ], @@ -1051,6 +1051,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive fixed: 'right' }, isTableForm:false, + hiddenInMain:true } ])) From 9986fb095f4c62208d3dfdc6f31a0a73db2b1aac Mon Sep 17 00:00:00 2001 From: zhousq Date: Tue, 30 Apr 2024 15:55:43 +0800 Subject: [PATCH 6/6] =?UTF-8?q?2024-04-30=20=20=E5=B7=A5=E5=BA=8F=E4=B8=AD?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=89=A9=E6=96=99=E9=85=8D=E7=BD=AE=E9=A1=B9?= =?UTF-8?q?=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/process/process.data.ts | 8 +++---- .../processroute/components/configDialog.vue | 22 +++++-------------- src/views/mes/workScheduling/index.vue | 2 +- 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/src/views/mes/process/process.data.ts b/src/views/mes/process/process.data.ts index 0f6dce604..93008e46c 100644 --- a/src/views/mes/process/process.data.ts +++ b/src/views/mes/process/process.data.ts @@ -423,10 +423,10 @@ export const TabsList = [ label: "模具", prop: 'PatternTab', }, - { - label: "物料", - prop: 'ItembasicTab', - } + // { + // label: "物料", + // prop: 'ItembasicTab', + // } ] diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue index 571e045fb..589d36a19 100644 --- a/src/views/mes/processroute/components/configDialog.vue +++ b/src/views/mes/processroute/components/configDialog.vue @@ -259,7 +259,7 @@ const deleteNode=(row)=>{ const openDetail = (row: any) => { rowData.value = row - console.log('rowData',rowData.value) + //console.log('rowData',rowData.value) titleNameRef.value = rowData.value.processName titleValueRef.value =rowData.value.processrouteCode processRouteId.value = rowData.value.id @@ -498,33 +498,26 @@ const deleteAnnexSuccess = async () => { const handleCurrentChange=(value: number)=>{ let index=(value-1)*page.value.size page.value.current=value - //console.log('index',index) showProcessNodeData.value=processData.value.slice(index,index+page.value.size) - //console.log('processData.value-472',processData.value) - //console.log('showProcessNodeData.value-472',showProcessNodeData.value) + } const handlePrevClick=(value: number)=>{ page.value.current=value-1 if(page.value.current==0) { page.value.current=1 } - // let index=(value-1)*page.value.size - // showProcessNodeData.value=processData.value.slice(index,page.value.size) - // console.log('showProcessNodeData.value-472',showProcessNodeData.value) + } const handleNextClick=(value: number)=>{ page.value.current=value+1 if(page.value.current>page.value.total/page.value.size) { page.value.current=page.value.total/page.value.size -1 } - // let index=(value+1)*page.value.size - // showProcessNodeData.value=processData.value.slice(index,page.value.size) - // console.log('showProcessNodeData.value-472',showProcessNodeData.value) + } const handleCurrentChangeM=(value: number)=>{ let index=(value-1)*pageM.value.size pageM.value.current=value - //console.log('index',index) showMaterialsData.value=materialData.value.slice(index,index+pageM.value.size) } @@ -533,18 +526,13 @@ const handlePrevClickM=(value: number)=>{ if(pageM.value.current==0) { pageM.value.current=1 } - // let index=(value-1)*page.value.size - // showProcessNodeData.value=processData.value.slice(index,page.value.size) - // console.log('showProcessNodeData.value-472',showProcessNodeData.value) + } const handleNextClickM=(value: number)=>{ pageM.value.current=value+1 if(pageM.value.current>pageM.value.total/page.value.size) { pageM.value.current=page.value.total/pageM.value.size -1 } - // let index=(value+1)*page.value.size - // showProcessNodeData.value=processData.value.slice(index,page.value.size) - // console.log('showProcessNodeData.value-472',showProcessNodeData.value) } // 验证图形 onUnmounted?.(() => {}) diff --git a/src/views/mes/workScheduling/index.vue b/src/views/mes/workScheduling/index.vue index e89edeacf..19577fe7a 100644 --- a/src/views/mes/workScheduling/index.vue +++ b/src/views/mes/workScheduling/index.vue @@ -29,7 +29,7 @@ >