fix

src/components/PageContent/src/page-content.tsx

@@ -79,7 +79,9 @@ const PageConent = defineComponent({
         returnProps,
         isRequesetArray,
         superUserNoAction,
-        superUserNoPerview
+        superUserNoPerview,
+        showPayTagFn,
+        showReturnTagFn
       } = contentConfig;
 
       const view = showPreview ? showPreview(row) : true;
@@ -92,6 +94,9 @@ const PageConent = defineComponent({
       const noPerview =
         (superUserNoPerview && !isSuperUser.value) || !superUserNoPerview;
 
+      const showPay = showPayTagFn ? showPayTagFn(row, powers) : true;
+      const showRerturn = showReturnTagFn ? showReturnTagFn(row, powers) : true;
+
       return (
         <>
           {!notPreview && view && noPerview && powers.some(i => i == "007") && (
@@ -103,7 +108,7 @@ const PageConent = defineComponent({
 
           {slots.custom && slots.custom(row)}
 
-          {returnProps && noAction && (
+          {returnProps && noAction && showRerturn && (
             <Operation.Tag
               row={row}
               tagProps={returnProps}
@@ -111,7 +116,7 @@ const PageConent = defineComponent({
             />
           )}
 
-          {payProps && noAction && (
+          {payProps && noAction && showPay && (
             <Operation.Tag
               row={row}
               tagProps={payProps}

src/router/index.ts

@@ -93,7 +93,6 @@ router.beforeEach((to: toRouteType, _from, next) => {
       else document.title = `${item.meta.title}`;
     });
   if (list === 0) {
-    console.log(to.path);
     if (to.query.error === "1") {
       setTimeout(() => {
         ElMessageBox({

src/utils/status.ts

@@ -44,6 +44,33 @@ const xs_order_source_options = [
   { value: "6", label: "售后补换货" }
 ];
 
+export const inv_type_ls_cg = [
+  {
+    label: "增值税专用发票",
+    value: "special"
+  },
+  {
+    label: "增值税普通发票",
+    value: "normal"
+  },
+  {
+    label: "增值税普通发票（卷式）",
+    value: "roll"
+  },
+  {
+    label: "增值税电子专用发票",
+    value: "special_electronic"
+  },
+  {
+    label: "增值税电子普通发票",
+    value: "electronic"
+  },
+  {
+    label: "增值税电子普通发票（通行费）",
+    value: "toll"
+  }
+];
+
 /**
  * @value 金税发票类型
  * @hwy_value 华为云发票类型(扫码枪一致)
@@ -71,30 +98,46 @@ const inv_type_list = [
   }
 ];
 
-export const inv_type_ls_cg = [
+export const invoiceTypeList = [
   {
     label: "增值税专用发票",
-    value: "special"
+    value: "special",
+    scanValue: "01"
   },
   {
     label: "增值税普通发票",
-    value: "normal"
-  },
-  {
-    label: "增值税普通发票（卷式）",
-    value: "roll"
+    value: "normal",
+    scanValue: "04"
   },
   {
     label: "增值税电子专用发票",
-    value: "special_electronic"
+    value: "special_electronic",
+    scanValue: "20"
   },
   {
     label: "增值税电子普通发票",
-    value: "electronic"
+    value: "electronic",
+    scanValue: "10"
   },
   {
     label: "增值税电子普通发票（通行费）",
-    value: "toll"
+    value: "toll",
+    scanValue: ""
+  },
+  {
+    label: "增值税普通发票（卷式）",
+    value: "roll",
+    scanValue: ""
+  },
+  {
+    label: "电子发票（增值税专用发票）",
+    value: "fully_digitalized_special_electronic",
+    scanValue: "31"
+  },
+  {
+    label: "电子发票（增值税普通发票）",
+    value: "fully_digitalized_normal_electronic",
+    scanValue: ""
   }
 ];
 

src/views/InvoiceSales/invoiceApply/index.vue

@@ -76,7 +76,7 @@ async function onDownloadOpenInv() {
   }
 
   await httpRequsetExport({
-    url: "/orderinvdown",
+    url: "/ipe",
     name: "开票信息",
     params: {
       invNo: selects.value.map(({ invNo }) => invNo)

src/views/purchase/orderRecord/config/content.config.ts

@@ -99,7 +99,13 @@ const contentConfig: ContentConfig = {
   returnProps: {
     prop: "payNo",
     type: "2"
-  }
+  },
+  // { code: "013", name: "添加采购对账付款标签" },
+  // { code: "014", name: "添加采购对账回票标签" },
+  showPayTagFn: ({ status }, permissions) =>
+    String(status) === "2" && permissions.includes("013"),
+  showReturnTagFn: ({ status }, permissions) =>
+    String(status) === "2" && permissions.includes("014")
 };
 
 export default contentConfig;

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

@@ -1,5 +1,5 @@
 const initheaders = [
-  "卖方公司编码",
+  "买方公司编码",
   "回票申请编码",
   "对账编号",
   "审核状态",

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

@@ -4,6 +4,7 @@ import { ElMessage } from "element-plus";
 import { execlUpload } from "/@/components/execlUpload";
 import { httpBatchimport } from "/@/api/purchase/ticketReturn";
 import { useResponseHandle } from "/@/hooks";
+import { result } from "lodash-unified";
 
 import {
   initheaders,
@@ -11,7 +12,6 @@ import {
   mapProp,
   requireHeaders
 } from "./columns-config";
-import { result } from "lodash-unified";
 
 const visible = ref(false);
 const loading = ref(false);

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

@@ -1,9 +1,7 @@
 export const template = {
-  卖方公司编码: "",
+  买方公司编码: "",
   回票申请编码: "",
   对账编号: "",
   审核状态: "",
   审核备注: ""
 };
-
-