build

src/views/purchase/orderRecord/config/xls-template.ts

@@ -1,10 +1,13 @@
 export const template = {
+  买方公司编码: "",
+  买方公司名称: "",
   卖方公司编码: "",
+  卖方公司名称: "",
   对账编码: "",
   发票类型: "",
   发票代码: "",
   发票号码: "",
   发票税前金额: "",
   开票日期: "",
-  "校验码(电子票必填,全电票不需要)": ""
+  "校验码": ""
 };

src/views/purchase/orderRecord/index.vue

@@ -78,14 +78,17 @@ function onDownloadTemplate() {
   }
 
   const _data: any = [];
-  for (const { status, payNo, supplierNo } of selectlist.value) {
+  for (const { status, payNo, supplierNo, supplierName,companyNo,companyName } of selectlist.value) {
     if (String(status) !== "2") {
       ElMessage.error(`对账单 ${payNo},未通过审核`);
       return;
     } else {
       _data.push({
         ...template,
+        ['买方公司编码']: companyNo,
+        ['买方公司名称']: companyName,
         ["卖方公司编码"]: supplierNo,
+        ['卖方公司名称']:supplierName,
         ["对账编码"]: payNo
       });
     }

src/views/purchase/ticketReturn/components/execl-files-upload-inv/columns-config.ts

@@ -1,23 +1,29 @@
 const initheaders = [
+  "买方公司编码",
+  "买方公司名称",
   "卖方公司编码",
+  "卖方公司名称",
   "对账编码",
   "发票类型",
   "发票代码",
   "发票号码",
   "发票税前金额",
   "开票日期",
-  "校验码(电子票必填,全电票不需要)"
+  "校验码"
 ];
 
 export const mapProp = {
-  value0: "supplierNo",
-  value1: "payNo",
-  value2: "invoiceType",
-  value3: "invoiceCode",
-  value4: "invoiceNumber",
-  value5: "inv_subtotal_amount",
-  value6: "open_time",
-  value7: "checkNumber"
+  value0: "companyNo",
+  value1: "companyName",
+  value2: "supplierNo",
+  value3: "supplierName",
+  value4: "payNo",
+  value5: "invoiceType",
+  value6: "invoiceCode",
+  value7: "invoiceNumber",
+  value8: "inv_subtotal_amount",
+  value9: "open_time",
+  value10: "checkNumber"
 };
 
 export const requireHeaders = [];

src/views/purchase/ticketReturn/components/execl-files-upload-inv/index.vue

@@ -194,6 +194,8 @@ const handleSubmit = async () => {
       data.push(obj);
     });
 
+    console.log(data)
+
     const typeErrors: string[] = [];
     const checkErrors: string[] = [];
     const codeErrors: string[] = [];
@@ -280,24 +282,32 @@ const handleSubmit = async () => {
       return;
     }
 
-    const buyers = data.map(({ supplierNo }) => supplierNo);
-    const setBuyers = [...new Set(buyers)];
+    const sellers = data.map(({ companyNo }) => companyNo);
+    const setSellers = [...new Set(sellers)];
 
-    if (setBuyers.length > 1) {
-      ElMessage.error("卖方公司编码不一致");
+    if (setSellers.length > 1) {
+      ElMessage.error("买方公司编码不一致");
       loading.value = false;
       return;
     }
 
-    const supplierNo = data[0].supplierNo;
+    const companyNo = data[0].companyNo;
+
+    if(companyNo != currentCompany.value.companyNo){
+      ElMessage.error("买方公司编码与当前选中的公司不一致");
+      loading.value = false;
+      return;
+    }
 
     data.forEach(item => {
       delete item["supplierNo"];
+      delete item["supplierName"];
+      delete item["companyName"];
+      delete item["companyNo"];
     });
 
     const { code, message } = await httpBatchAdd({
       list: data,
-      supplierNo,
       companyNo:currentCompany.value.companyNo,
       relaComNo: currentCompany.value.companyNo
     });

src/views/supply/orderRecord/config/xls-template.ts

@@ -1,10 +1,13 @@
 export const template = {
+  买方公司编码: "",
+  买方公司名称: "",
   卖方公司编码: "",
+  卖方公司名称: "",
   对账编码: "",
   发票类型: "",
   发票代码: "",
   发票号码: "",
   发票税前金额: "",
   开票日期: "",
-  "校验码(电子票必填,全电票不需要)": ""
+  "校验码": ""
 };

src/views/supply/orderRecord/index.vue

@@ -47,14 +47,17 @@ function onDownloadTemplate() {
   }
 
   const _data: any = [];
-  for (const { status, payNo, supplierNo } of selectlist.value) {
+  for (const { status, payNo, supplierNo,supplierName,companyNo,companyName } of selectlist.value) {
     if (String(status) !== "2") {
       ElMessage.error(`对账单 ${payNo},未通过审核`);
       return;
     } else {
       _data.push({
         ...template,
+        ['买方公司编码']: companyNo,
+        ['买方公司名称']: companyName,
         ["卖方公司编码"]: supplierNo,
+        ['卖方公司名称']:supplierName,
         ["对账编码"]: payNo
       });
     }

src/views/supply/ticketReturn/components/execl-files-upload/columns-config.ts

@@ -1,23 +1,29 @@
 const initheaders = [
+  "买方公司编码",
+  "买方公司名称",
   "卖方公司编码",
+  "卖方公司名称",
   "对账编码",
   "发票类型",
   "发票代码",
   "发票号码",
   "发票税前金额",
   "开票日期",
-  "校验码(电子票必填,全电票不需要)"
+  "校验码"
 ];
 
 export const mapProp = {
-  value0: "supplierNo",
-  value1: "payNo",
-  value2: "invoiceType",
-  value3: "invoiceCode",
-  value4: "invoiceNumber",
-  value5: "inv_subtotal_amount",
-  value6: "open_time",
-  value7: "checkNumber"
+  value0: "companyNo",
+  value1: "companyName",
+  value2: "supplierNo",
+  value3: "supplierName",
+  value4: "payNo",
+  value5: "invoiceType",
+  value6: "invoiceCode",
+  value7: "invoiceNumber",
+  value8: "inv_subtotal_amount",
+  value9: "open_time",
+  value10: "checkNumber"
 };
 
 export const requireHeaders = [];

src/views/supply/ticketReturn/components/execl-files-upload/index.vue

@@ -291,10 +291,18 @@ const handleSubmit = async () => {
 
     const companyNo = data[0].supplierNo;
 
+    if(companyNo != currentCompany.value.companyNo){
+      ElMessage.error("卖方公司编码与当前选中的公司不一致");
+      loading.value = false;
+      return;
+    }
+
     data.forEach(item => {
       delete item["supplierNo"];
+      delete item["supplierName"];
+      delete item["companyName"];
+      delete item["companyNo"];
     });
-
     const { code, message } = await httpBatchAdd({
       list: data,
       companyNo