xiaodai2017 2 년 전
부모
커밋
ae04468ad1

+ 5 - 5
src/utils/details/inv-open.ts

@@ -21,14 +21,14 @@ export const OPEN_TYPE = [
 ];
 
 export const INV_OPEN_STATUS = [
-  { value: "0", label: "待财务开票/待金税开票", type: "" },
+  // { value: "0", label: "待财务开票/待金税开票", type: "" },
   { value: "1", label: "待财务审核", type: "warning" },
-  { value: "2", label: "开票中/验票", type: "warning" },
+  { value: "2", label: "开票验票", type: "warning" },
   { value: "3", label: "开票完成", type: "warning" },
   { value: "4", label: "财务驳回 ", type: "warning" },
-  { value: "5", label: "开票失败/开票驳回", type: "warning" },
-  { value: "6", label: "退票/废弃", type: "warning" },
-  { value: "7", label: "已撤回", type: "warning" }
+  { value: "5", label: "开票异常", type: "warning" },
+  { value: "6", label: "已退票或已作废", type: "warning" },
+  { value: "7", label: "已取消申请", type: "warning" }
 ];
 
 export const INV_OPEN_COLUMNS: DescriptionColumns = [

+ 7 - 3
src/utils/details/inv-return.ts

@@ -7,13 +7,17 @@ import { createTooltip } from "../tootip";
 import { DescriptionColumns } from "/@/components/BasicDescriptions";
 
 export const RETURN_TYPE = [
+  {
+    value: "0",
+    label: "未选择退票方式"
+  },
   {
     value: "1",
-    label: "金税"
+    label: "金税线上退票"
   },
   {
     value: "2",
-    label: "线下"
+    label: "线下退票上传"
   }
 ];
 
@@ -24,7 +28,7 @@ export const RETURN_STATUS = [
   },
   {
     value: "1",
-    label: "退票"
+    label: "退票"
   },
   {
     value: "2",

+ 6 - 8
src/views/InvoiceSales/invoiceApply/config/content.config.ts

@@ -34,7 +34,7 @@ const columns = [
   {
     label: "状态",
     prop: "status",
-    minWidth: 180,
+    width: 125,
     cellRenderer: ({ row }) => {
       return h(ElTag, null, {
         default: () => {
@@ -49,7 +49,7 @@ const columns = [
   {
     label: "发票类型",
     prop: "status",
-    minWidth: 140,
+    minWidth: 160,
     cellRenderer: ({ row }) => {
       return h(ElTag, null, {
         default: () =>
@@ -66,7 +66,7 @@ const columns = [
   {
     label: "发票代码",
     prop: "inv_code",
-    width: 130
+    width: 100
   },
   {
     label: "申请人",
@@ -75,15 +75,13 @@ const columns = [
   },
   {
     label: "创建时间",
-    width: 145,
-    prop: "addtime",
-    formatter: ({ addtime }) =>
-      addtime ? dayjs(addtime).format("YYYY-MM-DD HH:mm:ss") : ""
+    width: 140,
+    prop: "addtime"
   },
   {
     label: "操作",
     fixed: "right",
-    width: 100,
+    width: 80,
     slot: "operation"
   }
 ];

+ 29 - 18
src/views/InvoiceSales/returnTicket/config/content.config.ts

@@ -1,35 +1,43 @@
 import { ContentConfig } from "/@/components/PageContent";
 import { httpList } from "/@/api/InvoiceSales/returnTicket";
 
-import dayjs from "dayjs";
 import { ElTag } from "element-plus";
 import { h } from "vue";
 import { RETURN_STATUS, RETURN_TYPE } from "/@/utils/details/inv-return";
 import { invoiceTypeList } from "/@/utils/status";
 
 const columns = [
+  // {
+  //   type: "selection",
+  //   width: 55,
+  //   hide: ({ checkList }) => !checkList.includes("勾选列")
+  // },
+  // {
+  //   label: "序号",
+  //   type: "index",
+  //   width: 70,
+  //   hide: ({ checkList }) => !checkList.includes("序号列")
+  // },
   {
-    type: "selection",
-    width: 55,
-    hide: ({ checkList }) => !checkList.includes("勾选列")
+    label: "退票编号",
+    prop: "returnCode",
+    minWidth: 160
   },
   {
-    label: "序号",
-    type: "index",
-    width: 70,
-    hide: ({ checkList }) => !checkList.includes("序号列")
+    label: "发票申请编号",
+    prop: "invNo",
+    minWidth: 160
   },
   {
-    label: "退票编号",
-    prop: "returnCode"
-  },
-  {
-    label: "发票编号",
-    prop: "invNo"
+    label: "发票金额",
+    prop: "inv_value",
+    minWidth: 110
   },
+
   {
-    label: "状态",
+    label: "退票状态",
     prop: "status",
+    minWidth: 100,
     cellRenderer: ({ row }) => {
       return h(ElTag, null, {
         default: () =>
@@ -40,6 +48,7 @@ const columns = [
   {
     label: "发票类型",
     prop: "inv_type",
+    minWidth: 160,
     cellRenderer: ({ row }) => {
       return h(ElTag, null, {
         default: () =>
@@ -51,6 +60,7 @@ const columns = [
   {
     label: "退票方式",
     prop: "return_type",
+    minWidth: 130,
     cellRenderer: ({ row }) => {
       return h(ElTag, null, {
         default: () =>
@@ -61,17 +71,18 @@ const columns = [
   },
   {
     label: "申请人",
-    prop: "apply_name"
+    prop: "apply_name",
+    minWidth: 70
   },
   {
     label: "申请时间",
     prop: "addtime",
-    formatter: ({ addtime }) => dayjs(addtime).format("YYYY-MM-DD HH:mm:ss")
+    width: 145
   },
   {
     label: "操作",
     fixed: "right",
-    width: 80,
+    width: 50,
     slot: "operation"
   }
 ];