From aebc19dc1067d654f740e30de02a2fbf0147cebe Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 29 Nov 2024 13:13:41 +0800 Subject: [PATCH 01/11] =?UTF-8?q?YT-1353=E6=96=B0=E5=A2=9E=E5=90=8E?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=96=B0=E5=A2=9E=EF=BC=8C=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=B8=85=E7=A9=BA=EF=BC=8C=E5=BA=94=E6=B8=85?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inducedProduct/deliverRecordMain/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue index 3d481bad0..843613967 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue @@ -308,6 +308,9 @@ const handleCreate = async (type : string, row?: object) => { item.value = 'InducedProduct' } }) + if (type == 'create') { + tableData.value = [] + } formRef.value.open(type,row) } From fd6dd5526f44fe83e4890c93d6a1e43474d6ac7a Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Fri, 29 Nov 2024 13:25:06 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E4=BF=AE=E6=94=B9=E7=A7=AF=E6=9C=A8ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/supplierdeliverRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 05ba7a993..963d0b55f 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -1186,7 +1186,7 @@ const clearInput = async (field, row, index) => { } const BASE_URL = getJmreportBaseUrl() -const src = ref(BASE_URL + '/jmreport/view/1016548504713515008?token=' + getAccessToken()) +const src = ref(BASE_URL + '/jmreport/view/1022297965884559360?token=' + getAccessToken()) getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage // 分页接口 // 标签打印 From ea92614562147327a1c257f4422781631f07ee94 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 29 Nov 2024 14:34:37 +0800 Subject: [PATCH 03/11] =?UTF-8?q?YT-1374=E5=BA=93=E5=AD=98=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=94=B3=E8=AF=B7=EF=BC=8C=E7=AE=A1=E7=90=86=E7=B2=BE?= =?UTF-8?q?=E5=BA=A6=EF=BC=8C=E6=95=B0=E9=87=8F=E2=80=94=E2=80=94=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=EF=BC=8C=E6=95=B0=E9=87=8F=E2=80=94=E2=80=94=E6=95=B0?= =?UTF-8?q?=E9=87=8F=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=B8=8D=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=BB=8E=E6=89=B9=E6=AC=A1=EF=BC=8C=E6=8F=90=E7=A4=BA=E8=AF=B7?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BB=8E=E6=89=B9=E6=AC=A1=EF=BC=9B=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=BB=8E=E6=89=B9=E6=AC=A1=E6=8F=90=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=B2=A1=E6=9C=89=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMainMOVE/index.vue | 18 ++++----- .../inventorymoveRequestMain.data.ts | 38 +++++-------------- 2 files changed, 18 insertions(+), 38 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue index a84c7e501..5cd26d295 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue @@ -340,12 +340,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => }).then((res) => { toManagementPrecision.value = res[0].ManagementPrecision }) - if (fromManagementPrecision.value == 'BY_QUANTITY' && toManagementPrecision.value == 'BY_BATCH') { - row['fromBatchFormItemType'] = 'FormDate' - row['disabled_fromBatch'] = false - } else { - row['fromBatchFormItemType'] = '' - row['disabled_fromBatch'] = true + if (toManagementPrecision.value == 'BY_BATCH') { + row['toBatchFormItemType'] = 'FormDate' + row['disabled_toBatch'] = false + } else if (toManagementPrecision.value == 'BY_QUANTITY') { + row['toBatchFormItemType'] = '' + row['disabled_toBatch'] = true } } else { row[formField] = val[0][searchField] @@ -701,10 +701,10 @@ const submitForm = async (formType, submitData) => { message.warning('从库位和到库位不能相同') return } - let batchList = tableData.value.filter(item=>item.fromBatchFormItemType&&item.fromBatchFormItemType == 'FormDate') - let noBatch = batchList.some(item => !item.fromBatch) + let batchList = tableData.value.filter(item=>item.toBatchFormItemType&&item.toBatchFormItemType == 'FormDate') + let noBatch = batchList.some(item => !item.toBatch) if(noBatch){ - message.warning('请选择从批次') + message.warning('请选择到批次') return } data.subList = tableData.value // 拼接子表数据参数 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts index e24af8017..5d000afc4 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts @@ -561,33 +561,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( isTableForm: false, isForm: false, }, - { - label: '生产日期', - field: 'produceDate', - formatter: dateFormatter2, - detail: { - dateFormat: 'YYYY-MM-DD' - }, - sort: 'custom', - table: { - width: 180 - }, - sortTableDefault:7, - form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'date', - format: 'YYYY-MM-DD', - valueFormat: 'x', - } - }, - tableForm: { - type: 'FormDate', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x', - } - }, + { label: '从批次', field: 'fromBatch', @@ -595,7 +569,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, - isTable:false, + isTable:true, tableForm: { disabled: true, placeholder: '请选择从批次', @@ -621,8 +595,14 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, - isTableForm: false, + isTableForm: true, isForm: false, + tableForm: { + disabled: true, + placeholder: '请选择从批次', + valueFormat: 'YYYYMMDD', + format: 'YYYYMMDD', + }, }, { label: '从包装号', From f63e15fb80daee8ed26f5057535001f903966665 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 29 Nov 2024 15:00:03 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliver/deliverRequestMain/deliverRequestMain.data.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 98bad9367..e26dc5738 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -996,7 +996,8 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ min: 0, max:999999, // precision: 6 - } + }, + isTableForm:false, }, { label: '班次', @@ -1013,6 +1014,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ type: 'Select', disabled: true }, + isTableForm: false, }, { label: '包装号', From dab19a83c2a27a486a4c160a177074e6a8119802 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 29 Nov 2024 15:16:37 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/inventoryManage/balance/index.vue | 88 ++++++++++--------- 1 file changed, 48 insertions(+), 40 deletions(-) diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index d4b4d477c..27fab2eea 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -353,11 +353,12 @@ const handlePoint = async (row) => { const row1 = cloneDeep(row) await getLabelDetailPage(row1, false) console.log(row1) - labelPointFormRef.value.open('create', row1, null, 'createLabel') //创建标签页面 createLabel 标题 } const searchTableRef = ref() const enableBuyOrenableMake = ref()//是可制造还是可采购 +const enableMake = ref('')//可制造 +const enableBuy = ref('')//可采购 const getLabelDetailPage = async (row, useToPackingNumber) => { ////英泰项目没有包装号 所以只能通过物料号，批次，到库位代码去查询对应的包装 // let defaultParams = { @@ -391,50 +392,55 @@ const getLabelDetailPage = async (row, useToPackingNumber) => { if (res.list.length > 0) { // 判断物料 可采购 detailListTableColumnsRules.value = cloneDeep(detailListTableColumnsRules) - enableBuyOrenableMake.value = res.list[0].enableBuy == "TRUE" ? 'enableBuy' : res.list[0].enableMake == "TRUE" ? 'enableMake' :'' - if (res.list[0].enableBuy == "TRUE") { - detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCodePackage') - delete detailListTableColumnsRules.value.productionLineCodePackage - // 修改 tableform 属性 - await SupplieritemApi.getSupplieritemPage({ - pageSize: 10, - pageNo: 1, - itemCode: row.itemCode, - sort: '', - by: 'ASC', - }).then(response => { - detailListTableColumns.tableFormColumns.map(itemColumns => { - if(itemColumns.field == 'supplierItemCode') { - row.supplierItemCode = response?.list[0]?.supplierCode - } - }) - - }) - } - // 判断物料 可制造 - if (res.list[0].enableMake == "TRUE") { - // 修改 tableform 属性 - detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item => item.field != 'supplierItemCode') - delete detailListTableColumnsRules.value.supplierItemCode - await ProductionlineitemApi.getProductionlineitemPage({ - pageNo: 1, - itemCode: row.itemCode, - sort: '', - by: 'ASC', - }).then(response => { - detailListTableColumns.tableFormColumns.map(itemColumns => { - if(itemColumns.field == 'productionLineCodePackage') { - row.productionLineCodePackage = response?.list[0]?.productionLineCode - } - }) - }) - } + enableBuyOrenableMake.value = res.list[0].enableBuy == "TRUE" ? 'enableBuy' : res.list[0].enableMake == "TRUE" ? 'enableMake' : '' + enableBuy.value = res.list[0].enableBuy + enableMake.value = res.list[0].enableMake + } else { message.warning('没有查询到物料代码：【' + row.itemCode + '】') return } }) + if (enableBuy.value == "TRUE" && enableMake.value == "FALSE") { + detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCodePackage') + delete detailListTableColumnsRules.value.productionLineCodePackage + // 修改 tableform 属性 + await SupplieritemApi.getSupplieritemPage({ + pageSize: 10, + pageNo: 1, + itemCode: row.itemCode, + sort: '', + by: 'ASC', + }).then(response => { + detailListTableColumns.tableFormColumns.map(itemColumns => { + if(itemColumns.field == 'supplierItemCode') { + row.supplierItemCode = response?.list[0]?.supplierCode + } + }) + }) + }// 判断物料 可制造 + else if (enableMake.value == "TRUE"&& enableBuy.value == "FALSE") { + // 修改 tableform 属性 + detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item => item.field != 'supplierItemCode') + delete detailListTableColumnsRules.value.supplierItemCode + await ProductionlineitemApi.getProductionlineitemPage({ + pageNo: 1, + itemCode: row.itemCode, + sort: '', + by: 'ASC', + }).then(response => { + detailListTableColumns.tableFormColumns.map(itemColumns => { + if(itemColumns.field == 'productionLineCodePackage') { + row.productionLineCodePackage = response?.list[0]?.productionLineCode + } + }) + }) + } else { + message.error('物料基础信息错误，不可以创建标签') + console.log(1111) + return + } detatableData1.value=[]//不走打印详情接口,用主数据 detatableData1.value.push(row) @@ -447,7 +453,9 @@ const getLabelDetailPage = async (row, useToPackingNumber) => { item['disabled_batch'] = false } }) - // searchTableRef.value.openData('标签信息', tableObjectPrint, { tableColumns }, true) + console.log(1111) + + labelPointFormRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题 } // 批量打印--预生产收货 From 1d2a141a1e9bb43f1effac798ada4d15813dee4b Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 29 Nov 2024 15:47:12 +0800 Subject: [PATCH 06/11] =?UTF-8?q?YT-1378WMS=20=E6=8A=A5=E5=BA=9F=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E7=94=B3=E8=AF=B7=EF=BC=8C=E6=98=8E=E7=BB=86=E4=B8=AD?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E3=80=81=E5=88=A0=E9=99=A4=20=E8=BF=99=E4=B8=89=E4=B8=AA?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/inventoryjobManage/scrap/scrapRequestMain/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index 01f7a54c2..e93575430 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -92,6 +92,9 @@ @detailBasicFormOnChange="qtyOnChange" :detailValidate="detailValidate" @onBlur="onBlur" + :detailButtonIsShowAdd="false" + :detailButtonIsShowEdit="false" + :detailButtonIsShowDelete="false" /> From 87ccd569580a00049d52a9593eaaf8b457bab605 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 29 Nov 2024 15:51:58 +0800 Subject: [PATCH 07/11] =?UTF-8?q?YT-1379WMS=20=E6=8A=A5=E5=BA=9F=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E7=94=B3=E8=AF=B7=EF=BC=8C=E5=88=97=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BB=8E=E4=BB=93=E5=BA=93=E4=BB=A3=E7=A0=81=E4=B8=BA?= =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrap/scrapRequestMain/index.vue | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index e93575430..b5512d576 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -591,6 +591,11 @@ const openForm = async (type: string, row?: any) => { item.componentProps.isSearchList = true item.componentProps.disabled = false } + if (item.field == 'fromWarehouseCode') { + item.componentProps.enterSearch = true + item.componentProps.isSearchList = true + item.componentProps.disabled = false + } }) } else { if (row.q1Number) { @@ -644,6 +649,13 @@ const openForm = async (type: string, row?: any) => { } }) } + ScrapRequestMain.allSchemas.formSchema.forEach((item) => { + if (item.field == 'fromWarehouseCode') { + item.componentProps.enterSearch = false + item.componentProps.isSearchList = false + item.componentProps.disabled = true + } + }) } tableData.value = [] // 重置明细数据 From fcea214ba6db69ee1ea97322abe1c2c0c28b50ba Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 29 Nov 2024 15:57:29 +0800 Subject: [PATCH 08/11] =?UTF-8?q?YT-1381=E5=BA=93=E5=AD=98=E4=BD=99?= =?UTF-8?q?=E9=A2=9D=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A1=B5=E9=9D=A2=E7=82=B9=E7=A1=AE=E5=AE=9A?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E5=8A=A0loading=E9=81=AE=E7=BD=A9=EF=BC=8C?= =?UTF-8?q?=E7=9B=AE=E5=89=8D=E6=A0=87=E7=AD=BE=E5=87=BA=E7=8E=B0=E6=AF=94?= =?UTF-8?q?=E8=BE=83=E6=85=A2=20=E8=BF=98=E6=B2=A1=E6=9C=89loading?= =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E8=AF=AF=E4=BB=A5=E4=B8=BA=E6=B2=A1=E7=82=B9?= =?UTF-8?q?=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/inventoryManage/balance/index.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index 27fab2eea..a4e625302 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -584,7 +584,9 @@ const pointLabel = async () => { // printQty:item.printQty, // } // }) - const obj = { + labelPointFormRef.value.formLoading = true + try { + const obj = { itemCode:detatableData1.value[0].itemCode, batch:detatableData1.value[0].batch, printQty:detatableData1.value[0].printQty, @@ -613,6 +615,10 @@ const pointLabel = async () => { console.log(err) message.error('创建标签失败') }) + } finally { + labelPointFormRef.value.formLoading = false + } + } /** 初始化 **/ onMounted(async () => { From bfa322a0a825419d92a950e9b172b7b6302c714d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 29 Nov 2024 15:59:31 +0800 Subject: [PATCH 09/11] =?UTF-8?q?YT-1390=E5=8F=B7=E5=8F=A3=E5=93=81?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E7=94=B3=E8=AF=B7=E6=98=8E=E7=BB=86=E4=B8=AD?= =?UTF-8?q?=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=9C=89=E6=96=B0=E5=A2=9E=EF=BC=8C?= =?UTF-8?q?=E7=BC=96=E8=BE=91=EF=BC=8C=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptAssembleRequestMain/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 4a4966bca..3ab14a670 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -85,6 +85,9 @@ :buttondataTable="buttondataTable" @tableFormButton="tableFormButton" :detailValidate="detailValidate" + :detailButtonIsShowAdd="false" + :detailButtonIsShowEdit="false" + :detailButtonIsShowDelete="false" /> From d8b1aec156b139a6494cf0982cf50480c1523d03 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Fri, 29 Nov 2024 16:18:04 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=A8=A1=E7=89=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/inventoryManage/balance/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index a4e625302..74ed90f3d 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -606,7 +606,7 @@ const pointLabel = async () => { // src.value = BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()+'&asn_number='+res//制造标签模板 if (enableBuyOrenableMake.value == 'enableBuy') { - src.value = BASE_URL + '/jmreport/view/1021666059319578624?token=' + getAccessToken()+'&asn_number='+res//采购标签模板 + src.value = BASE_URL + '/jmreport/view/1022349139354537984?token=' + getAccessToken()+'&asn_number='+res//采购标签模板 } else if(enableBuyOrenableMake.value == 'enableMake') { src.value = BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()+'&asn_number='+res//制造标签模板 } From c2dbb1c0018c673a293d9ed7482b623e46e7bdf2 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 29 Nov 2024 16:26:36 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inducedProduct/deliverRecordMain/deliverRecordMain.data.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts index 54d906965..7cb520ca5 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts @@ -693,7 +693,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ field: 'classes', dictType: DICT_TYPE.CLASS_ITEM, dictClass: 'string', - isTable: false, + isTable: true, + isDetail: true, sort: 'custom', table: { width: 150