From 29772aa67f57d7f467e8cccdcd0fe35391505841 Mon Sep 17 00:00:00 2001 From: bjang03 Date: Sat, 8 Jun 2024 10:22:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81=E9=95=BF?= =?UTF-8?q?=E6=98=A5=E6=B5=B7=E6=8B=89=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=AD=E6=9C=89=E5=85=B3=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=9A=84=E9=A1=B9=E5=80=BC=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=98=AF?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=88=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 3533aaab0..d32125a62 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -237,8 +237,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ field: 'invoiceTime', isTable: true, formatter: dateFormatter, - deatil: { - dateFormatter: 'YYYY-MM-DD HH:mm:ss' + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', table: { @@ -293,8 +293,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ isTable:false, isTableForm:false, formatter: dateFormatter, - deatil: { - dateFormatter: 'YYYY-MM-DD HH:mm:ss' + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', table: { @@ -306,9 +306,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ field: 'activeDate', isTable:false, isTableForm:false, - formatter: dateFormatter2, - deatil: { - dateFormatter: 'YYYY-MM-DD' + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -321,8 +321,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ isTable:false, isTableForm:false, formatter: dateFormatter, - deatil: { - dateFormatter: 'YYYY-MM-DD HH:mm:ss' + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', table: { @@ -335,8 +335,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ isTable:false, isTableForm:false, formatter: dateFormatter, - deatil: { - dateFormatter: 'YYYY-MM-DD HH:mm:ss' + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', table: { From 95a06b6418fd46773ead9936b8fe0124e1084add Mon Sep 17 00:00:00 2001 From: chenfang Date: Sat, 8 Jun 2024 11:08:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain.data.ts | 9 +- .../customerreturnRequestMain/index.vue | 101 ++++++++++++------ 2 files changed, 76 insertions(+), 34 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 0163db4ff..4931bfa92 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -928,6 +928,11 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive key: 'businessType', value: 'CustomerReject', isMainValue: false + }, + { + key: 'isIn', + value: 'in', + isMainValue: false }] }, }, @@ -1097,7 +1102,9 @@ export const CustomerreturnRequestDetailRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], - + packQty: [ + { required: true, message: '请选择包装数量', trigger: 'blur' } + ], }) export const CustomerReturnRequestDetailLabel = useCrudSchemas(reactive([ diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 0f31f34ef..e138e2dce 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -188,6 +188,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['fromLocationCode'] = val[0]['locationCode'] row['itemCode'] = val[0]['itemCode'] row['uom'] = val[0]['uom'] + }else if(formField == 'packQty'){ + row['packUnit'] = val[0]['packUnit'] + row['packQty'] = val[0]['packQty'] }else if(formField == 'toLocationCode') { //到库位代码 row['toLocationCode'] = val[0]['code'] @@ -422,7 +425,7 @@ const buttonTableClick = async (val, row) => { formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题 } else if (val == 'point') { // 标签打印 - labelPrint(row) + handlePoint(row) } } // 生成标签 @@ -452,29 +455,78 @@ const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL const labelType = ref('') // 标签类别 采购还是制造等 // 标签打印 const showLabelRef = ref() -const labelPrint = async (row) => { - console.log(row.packingNumber,445555555555555); - PackageApi.getBalanceToPackage(row.packingNumber).then(res => { - console.log(777,res); - if (res.productionLineCode != null) { +const handlePoint = async (row) => { +// 查询是否已创建过标签 +await PackageApi.getPackagePage({ + requestNumber: row.number + }).then((res) => { + if(res.list.length > 0) { + isCreateLabel.value = true + if (res.list[0].productionLineCode != null) { labelType.value = 'zz' } else { labelType.value = 'cg' } - PackageApi.batchPrintingLable((res.number)).then((resLable) =>{ - console.log(159,resLable ) - // 判断是采购还是制造 - if (labelType.value == 'cg') { - const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) - console.log(159,resLable ) - window.open(src.value+'&asn_number='+resLable) + } else { + isCreateLabel.value = false + } + }).catch(err => { + isCreateLabel.value = false + console.log(err) + }) + // 判断是采购还是制造 + if (isCreateLabel.value) { + labelPrint(row) } else { - const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) - window.open(src.value+'&asn_number='+resLable) + message.warning('请先创建标签') } - }) +} + + +// +const labelPrint = async (row) => { + tableObject.loading = true + const defaultParams = {'moduleName':'customerreturn_request','recordNumber':row.number} + const {tableObject:tableObjectPrint ,tableMethods} = useTable({ + defaultParams, + getListApi: PackageApi.getLabelDetailPage // 分页接口 + }) + + // 获得表格的各种操作 + const { getList:getListPrint } = tableMethods + getListPrint() + tableObject.loading = false + const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns + tableColumns.forEach((item) => { + item.width = item.table?.width || 150 + }) + showLabelRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true) +} + +// 批量打印---客户退货申请 +const showLabelSuccess = async (formField, searchField, val, formRef, type, row) => { + console.log('批量打印',val) + // let rows:any = [] + // val.forEach(item=>{ + // rows = [...rows,...item.selectionRows.map(item1=>item1.number)] + // }) + if(val.length == 0){ + message.warning("请先选择要打印的数据!") + return + } + // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(',')) + await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => { + console.log(res) + if (labelType.value == 'cg') { + const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) + window.open(src.value+'&asn_number='+res) + } else { + const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) + window.open(src.value+'&asn_number='+res) + } }).catch(err => { console.log(err) + message.error('创建标签失败') }) } @@ -705,23 +757,6 @@ const searchFormClick = (searchData) => { getList() // 刷新当前列表 } -// 批量打印---采购收货申请 -const showLabelSuccess = async (formField, searchField, val, formRef, type, row) => { - console.log('批量打印',val) - - if(val.length == 0){ - message.warning("请先选择要打印的数据!") - return - } - await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => { - console.log(res) - window.open(src.value + '&asn_number=' + res) - }).catch(err => { - console.log(err) - message.error('创建标签失败') - }) -} - /** 初始化 **/ onMounted(async () => { getList() From fb0b01a3142f5c0f268cc33abbf7d84309c670ec Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Sat, 8 Jun 2024 12:22:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain.data.ts | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index bc8110edc..59d243d78 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -511,6 +511,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( } }, }, + { label: '采购价格审批人', field: 'procurementCreator', @@ -519,7 +520,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( width: 150 }, isForm: true, - isTable: false, + isTable:true, form: { component: 'Select', api: () => procurementCreators.list, @@ -547,16 +548,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( // } } }, - { - label: '采购价格审批人', - field: 'procurementCreatorName', - sortTableDefault:1003, - table: { - width: 150 - }, - isTable:true, - isForm: false, - }, + { label: '采购审批时间', field: 'procurementCreateTime', From b79bb9af292ed3aa0df496cba4117afead53acfa Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Sat, 8 Jun 2024 12:46:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=90=8D=E7=A7=B0packNam?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/itempackage/itempackage.data.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts index 8aef96e18..465d47ca5 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts @@ -82,6 +82,19 @@ export const Itempackaging = useCrudSchemas(reactive([ } } }, + { + label: '包装名称', + field: 'packName', + sort: 'custom', + isSearch: true, + table: { + width: 120 + }, + isTable:true, + isTableForm:false, + isForm:false, + isDetail:false + }, { label: '包装数量', field: 'packQty',