diff --git a/.env.production b/.env.production index 45c212b..904ced3 100644 --- a/.env.production +++ b/.env.production @@ -6,5 +6,5 @@ VITE_API_URL1 = http://58.252.252.77:90 VITE_API_URL2 = https://maxcessth.gatedge.cn:91 VITE_API_File1 = https://maxcessth.gatedge.cn -VITE_API_File = https://maxcess.gatedge.cn -VITE_API_URL = https://maxcess.gatedge.cn:91 \ No newline at end of file +VITE_API_File = https://maxcessth.gatedge.cn +VITE_API_URL = https://maxcessth.gatedge.cn:91 \ No newline at end of file diff --git a/index.html b/index.html index aceab1f..896a252 100644 --- a/index.html +++ b/index.html @@ -24,7 +24,7 @@ * 从金蝶添加订单的GET请求(挂载到window,可在控制台直接调用) * @param {string} token 认证token */ - window.addOrderFromKingDee = function() { + window.getMaxcessData = function() { const apiUrl = 'https://maxcessth.gatedge.cn:91/api/Test2/AddOrderFromKingDee'; const token = document.cookie.split('; ').find(row => row.startsWith(`token=`))?.split('=')[1]; console.log(`正在请求 ${apiUrl}...`); // 提示请求开始 diff --git a/src/i18n/pages/materialReceiptNotice/en.ts b/src/i18n/pages/materialReceiptNotice/en.ts index 1064608..685469c 100644 --- a/src/i18n/pages/materialReceiptNotice/en.ts +++ b/src/i18n/pages/materialReceiptNotice/en.ts @@ -83,6 +83,8 @@ export default { qtxfph:'Input invoice #', fprq:'Invoice date#', qxzfprq:'Select Invoice date#', + organizationCode:'Organization Code', + organizationName:'Organization Name' }, tiaoma:{ pno:'P/NO', @@ -103,6 +105,8 @@ export default { qdyzddym:'Confirm to print out all', jcdwdypz:'Downloading printer driver', noMac:"Don't support Apple Mac computer", - gysjc:'Supplier Name' + gysjc:'Supplier Name', + tjdy:'Total print', + cgbz:'Remarks' } }; diff --git a/src/i18n/pages/materialReceiptNotice/zh-cn.ts b/src/i18n/pages/materialReceiptNotice/zh-cn.ts index a214e12..9d677e1 100644 --- a/src/i18n/pages/materialReceiptNotice/zh-cn.ts +++ b/src/i18n/pages/materialReceiptNotice/zh-cn.ts @@ -84,6 +84,8 @@ export default { qtxfph:'请填写发票号', fprq:'发票日期', qxzfprq:'请选择发票日期', + organizationCode:'组织代码', + organizationName:'组织名称' }, tiaoma:{ pno:'物料编码', @@ -104,6 +106,8 @@ export default { qdyzddym:'确定要打印整单吗', jcdwdypz:'检测到无打印插件,正在下载', noMac:'MAC无打印配置', - gysjc:'供应商简称' + gysjc:'供应商简称', + tjdy:'统计打印', + cgbz:'采购备注' } }; diff --git a/src/views/materialReceiptNotice/componentPrinting.vue b/src/views/materialReceiptNotice/componentPrinting.vue index 7275923..8ac41c0 100644 --- a/src/views/materialReceiptNotice/componentPrinting.vue +++ b/src/views/materialReceiptNotice/componentPrinting.vue @@ -54,6 +54,7 @@ {{ t('message.tiaoma.zddy') }} + {{ t('message.tiaoma.tjdy') }} {{ t('message.tiaoma.xzdyj') }} @@ -213,6 +214,8 @@ const getBaoShuTiaoMa = async (topId: any, ceseQty: any, i: number, t:number = - await listApi() .setBaoShuTiaoMa({ id: topId, cuseQty: ceseQty }) .then((res: any) => { + console.log(res) + debugger res.data.barCodeList.forEach((item:any) => { item.purchaseOrderFBillNo = item.purchaseBillNo item.packagingQuantity = item.qty @@ -261,11 +264,12 @@ const AddPrintContentZhuhai = (row: any, mainState: boolean = false) => { LODOP.ADD_PRINT_TEXT(10, 120, 300, 20, `供应商简称:${row.supplierName}`); LODOP.ADD_PRINT_TEXT(30, 120, 300, 20, `物料编码:${row.materialCode}`); LODOP.ADD_PRINT_TEXT(50, 120, 300, 20, `包装数量:${row.packagingQuantity}`); - LODOP.ADD_PRINT_TEXT(70, 120, 300, 20, `美塞斯批号:${row.mssSupplierLot}`); + LODOP.ADD_PRINT_TEXT(70, 120, 300, 20, `销售订单号:${row.fdemandbillno}`); LODOP.ADD_PRINT_TEXT(90, 120, 300, 20, `供应商批号:${row.fSupplierLot}`); LODOP.ADD_PRINT_TEXT(110, 120, 300, 20, `采购订单号:${row.purchaseOrderFBillNo}`); LODOP.ADD_PRINT_TEXT(130, 120, 300, 20, `送货日期:${state.indexRow.deliveryDate}`); LODOP.ADD_PRINT_TEXT(150, 120, 300, 20, `收料通知单单号:${state.indexRow.fBillNo}`); + LODOP.ADD_PRINT_TEXT(170, 120, 300, 20, `采购备注:${state.indexRow.fBillNo}`); }; //泰国模板 diff --git a/src/views/materialReceiptNotice/index.vue b/src/views/materialReceiptNotice/index.vue index b590407..1e59991 100644 --- a/src/views/materialReceiptNotice/index.vue +++ b/src/views/materialReceiptNotice/index.vue @@ -27,6 +27,11 @@
{{ row.supplierName }}
+