diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts index dd4201e32..290ca2697 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts @@ -446,7 +446,7 @@ export const PurchasePackaging = useCrudSchemas(reactive([ sort: 'custom', }, { - label: '采购计量单位', + label: '替代计量单位', field: 'purchaseUom', sort: 'custom', dictType: DICT_TYPE.UOM, @@ -458,15 +458,15 @@ export const PurchasePackaging = useCrudSchemas(reactive([ }, }, { - label: '采购数量', + label: '替代数量', field: 'purchaseQty', sort: 'custom', }, - { - label: '采购标包数量', - field: 'purchaseStdQty', - sort: 'custom', - }, + // { + // label: '采购标包数量', + // field: 'purchaseStdQty', + // sort: 'custom', + // }, { label: '转换率', field: 'convertRate', @@ -592,5 +592,10 @@ export const PurchasePackaging = useCrudSchemas(reactive([ width: 150 } }, + { + label: '操作', + field: 'aaa', + sort: 'custom', + }, ])) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 13db1dc06..af153e6b3 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -1208,7 +1208,7 @@ const clearInput = async (field, row, index) => { const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/1022297965884559360?token=' + getAccessToken()) -const src1 = ref(BASE_URL + '/jmreport/view/1027757375736582144?token=' + getAccessToken()) +const src1 = ref(BASE_URL + '/jmreport/view/1028150465710329856?token=' + getAccessToken()) getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage // 分页接口 // 标签打印 @@ -1263,7 +1263,7 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r if (array.length > 0) { window.open(src.value + '&asn_number=' + res) } - if (array1.length > 0) { + if (arrayTool.length > 0) { window.open(src1.value + '&asn_number=' + res) } })