From aa8bcaaabe009b26f2b9d5e88a9915e15e2b91aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=99=93=E9=B9=8F?= <jialanbaiyue@163.com>
Date: Fri, 6 Jun 2025 15:51:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                                 |  4 ++--
 index.html                                      |  2 +-
 src/i18n/pages/materialReceiptNotice/en.ts      |  6 +++++-
 src/i18n/pages/materialReceiptNotice/zh-cn.ts   |  6 +++++-
 .../materialReceiptNotice/componentPrinting.vue |  6 +++++-
 src/views/materialReceiptNotice/index.vue       |  8 ++++++++
 .../materialReceiptNotice/selectedData.vue      | 17 +++++++++++------
 src/views/mssPurchaseOrder/index.vue            | 12 +++++++++++-
 src/views/mssPurchaseOrder/purchaseDetails.vue  |  4 +++-
 vite.config.ts                                  |  2 +-
 10 files changed, 52 insertions(+), 15 deletions(-)

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 @@
 						</el-select>
 					</div>
 					<el-button type="primary" size="default" @click="printCheckAllFun">{{ t('message.tiaoma.zddy') }}</el-button>
+					<el-button type="primary" size="default" @click="printCheckAllFun">{{ t('message.tiaoma.tjdy') }}</el-button>
 					<el-button type="primary" size="default" @click="defaultPrinterFun">{{ t('message.tiaoma.xzdyj') }}</el-button>
           <!-- <el-button type="danger" size="default" v-if="state.timer !== null" @click="printCheckDangerFun">取消打印</el-button> -->
 				</div>
@@ -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 @@
 						<div class="multi-line-omit">{{ row.supplierName }}</div>
 					</el-tooltip>
 				</template>
+        <template #remark="{ row }">
+          <el-tooltip :content="row.remark" placement="top">
+            <div class="multi-line-omit">{{ row.remark }}</div>
+          </el-tooltip>
+        </template>
 				<template #menu-left>
 					<div class="selectBoxes">
 						<div class="selectItem">
@@ -93,6 +98,7 @@ const state = reactive({
 		pageSize: 30,
 	},
 	option: {
+    // excelBtn: true,
 		tip: false,
     rowSort: false,
 		index: false,
@@ -111,6 +117,7 @@ const state = reactive({
 			{ label: computed(() => t('message.index.deliveryNoteNumber2')), prop: 'sheet', width: '135' },
 			{ label: computed(() => t('message.index.sltzddh')), prop: 'fBillNo', width: '135' },
 			{ label: computed(() => t('message.index.PO1')), prop: 'purchaseOrderFBillNo', width: '135' },
+			{ label: computed(() => t('message.index.xsddh')), prop: 'fdemandbillno', width: '135' },
 			{ label: computed(() => t('message.index.maxcessLot')), prop  : 'mssSupplierLot' },
 			{ label: computed(() => t('message.index.supplierLot')), prop: 'fSupplierLot' },
 			{ label: computed(() => t('message.index.partNumber')), prop: 'materialCode', width: '120' },
@@ -121,6 +128,7 @@ const state = reactive({
 			{ label: computed(() => t('message.index.shipmentQTY')), prop: 'qty' },
 			// { label: computed(() => t('message.index.POQTY')), prop: 'purchaseQty' },
 			{ label: computed(() => t('message.index.unit')), prop: 'unitName' },
+      { label: computed(() => t('message.tiaoma.cgbz')), prop: 'remark', width: 140 },
 			{ label: computed(() => t('message.index.print')), prop: 'print', width: 80 },
 			{ label: computed(() => t('message.index.deleteText')), prop: 'deleteText', width: 80 },
 		],
diff --git a/src/views/materialReceiptNotice/selectedData.vue b/src/views/materialReceiptNotice/selectedData.vue
index 8d21caf..a8ee6c7 100644
--- a/src/views/materialReceiptNotice/selectedData.vue
+++ b/src/views/materialReceiptNotice/selectedData.vue
@@ -67,7 +67,7 @@
 								{{ t('message.index.deliveryQTY') }}
 							</td>
 							<td style="text-align: center; font-size: 18px; padding: 4px; color: black; border-left: 2px solid black" colspan="4">
-								{{ t('message.index.maxcessLot') }}
+								{{ t('message.index.xsddh') }}
 							</td>
 							<td style="text-align: center; font-size: 18px; padding: 4px; color: black; border-left: 2px solid black" colspan="6">
 								{{ t('message.index.supplierLot') }}
@@ -93,7 +93,7 @@
 								{{ item.qty }}
 							</td>
 							<td style="text-align: center; font-size: 18px; padding: 4px; color: black; border-left: 2px solid black" colspan="4">
-								{{ item.mssSupplierLot }}
+								{{ item.fdemandbillno }}
 							</td>
 							<td style="text-align: center; font-size: 18px; padding: 4px; color: black; border-left: 2px solid black" colspan="6">
 								{{ item.fSupplierLot }}
@@ -168,10 +168,10 @@ import htmlToPdfmake from 'html-to-pdfmake';
 pdfMake.vfs = pdfFonts.vfs;
 pdfMake.fonts = {
 	AlibabaPuHuiTi: {
-		normal: import.meta.env.import.meta.env.VITE_API_URL + '/SimHei.ttf',
-		bold: import.meta.env.import.meta.env.VITE_API_URL + '/SimHei.ttf',
-		italics: import.meta.env.import.meta.env.VITE_API_URL + '/SimHei.ttf',
-		bolditalics: import.meta.env.import.meta.env.VITE_API_URL + '/SimHei.ttf',
+		normal: import.meta.env.VITE_API_File + '/SimHei.ttf',
+		bold: import.meta.env.VITE_API_File + '/SimHei.ttf',
+		italics: import.meta.env.VITE_API_File + '/SimHei.ttf',
+		bolditalics: import.meta.env.VITE_API_File + '/SimHei.ttf',
 	},
 };
 const printInitBoxRef = ref();
@@ -194,13 +194,18 @@ const splitArrayInto10Parts = (arr:any) => {
         resultMin = []
       }
     })
+    if (resultMin.length > 0) {
+      result.push(resultMin);
+    }
   } else {
     result.push(arr)
   }
   return result;
 }
 const showFun = (list: any) => {
+  console.log(list)
 	state.dataList = splitArrayInto10Parts(list);
+  console.log(state.dataList)
 	state.show = true;
 };
 const printElement = () => {
diff --git a/src/views/mssPurchaseOrder/index.vue b/src/views/mssPurchaseOrder/index.vue
index eb50bd9..b797e4f 100644
--- a/src/views/mssPurchaseOrder/index.vue
+++ b/src/views/mssPurchaseOrder/index.vue
@@ -22,9 +22,14 @@
 				<template #fCancelStatus="{ row }">
 					{{ row.ifHidden === 0 ? (row.fCancelStatus === 'A' ? t('message.index.unclosed') : t('message.index.unclosed')) : '' }}
 				</template>
-				<template #materialName="{ row }">
+        <template #materialName="{ row }">
           <el-tooltip :content="row.materialName" placement="top">
             <div class="multi-line-omit">{{ row.materialName }}</div>
+          </el-tooltip>
+        </template>
+				<template #receiveorgName="{ row }">
+          <el-tooltip :content="row.receiveorgName" placement="top">
+            <div class="multi-line-omit">{{ row.receiveorgName }}</div>
           </el-tooltip>
 				</template>
 				<template #chengNuoJiaoQi="{ row }">
@@ -178,6 +183,11 @@ const state = reactive({
 			{ label: computed(() => t('message.index.materialName')), prop: 'materialName', width: '240',filters: true, },
 			{ label: computed(() => t('message.index.unit')), prop: 'unitName', width: '110',filters: true, },
 			{ label: computed(() => t('message.index.qty')), prop: 'qty', width: '110',filters: true },
+
+
+			{ label: computed(() => t('message.index.organizationCode')), prop: 'receiveorgCode', width: '180',filters: true },
+			{ label: computed(() => t('message.index.organizationName')), prop: 'receiveorgName', width: '180',filters: true },
+
 			{ label: computed(() => t('message.index.requestDate')), prop: 'fDeliveryDate', width: '165',filters: true },
 			{
 				label: computed(() => t('message.index.DocStatus')),
diff --git a/src/views/mssPurchaseOrder/purchaseDetails.vue b/src/views/mssPurchaseOrder/purchaseDetails.vue
index 578546f..057d9a7 100644
--- a/src/views/mssPurchaseOrder/purchaseDetails.vue
+++ b/src/views/mssPurchaseOrder/purchaseDetails.vue
@@ -164,7 +164,9 @@ const state = reactive({
 	topId: '',
 });
 const selectionChange = (list: any) => {
-	state.selectedData = list;
+  nextTick(() => {
+    state.selectedData = JSON.parse(JSON.stringify(list));
+  });
 };
 
 const chengNuoJiaoQiPFun = (e: string) => {
diff --git a/vite.config.ts b/vite.config.ts
index fbded0c..9372e16 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -29,7 +29,7 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
 			hmr: true,
 			proxy: {
 				'/api': {
-					target: 'https://maxcessth.gatedge.cn:91',
+					target: 'https://maxcess.gatedge.cn:91',
 					ws: true,
 					changeOrigin: true,
 					rewrite: (path) => path.replace(/^\/api/, ''),