snow 2 lat temu
rodzic
commit
897d7ed27f

+ 2 - 1
src/utils/details/inv-open.ts

@@ -27,7 +27,8 @@ export const INV_OPEN_STATUS = [
   { value: "3", label: "开票完成", type: "warning" },
   { value: "4", label: "财务驳回 ", type: "warning" },
   { value: "5", label: "开票失败/开票驳回", type: "warning" },
-  { value: "6", label: "退票/废弃", type: "warning" }
+  { value: "6", label: "退票/废弃", type: "warning" },
+  { value: "7", label: "已撤回", type: "warning" }
 ];
 
 export const INV_OPEN_COLUMNS: DescriptionColumns = [

+ 0 - 1
src/views/InvoiceSales/invoiceApply/detail.vue

@@ -9,7 +9,6 @@ import InvoiceDetailVue from "./components/invoice-detail/index.vue";
 import AddEditForm from "./components/add-edit-form/add-edit-form.vue";
 import { useUserInfo } from "/@/hooks/core/useUser";
 import { usePermission } from "/@/hooks/core/usePermission";
-import { httpSupplierall } from "/@/api/user";
 
 import {
   httpSetPost,

+ 1 - 8
src/views/invoice/query/components/purchase.vue

@@ -85,13 +85,6 @@ const resetForm = (formEl: FormInstance | undefined) => {
   onSearch();
 };
 
-function resetType() {
-  form.page = 1;
-  form.inv_type = "";
-  form.timer = [];
-  onSearch();
-}
-
 function toDetail(data) {
   const id = formData.value.type === "0" ? data["invNo"] : data["hpNo"];
   push(toPath.value + "?id=" + id + "&back=/invoice/query");
@@ -166,7 +159,7 @@ onMounted(() => {
 
             <ElTag v-else-if="c.slot === 'status'">
               {{
-                returnStatus.find(s => s.value === scope.row["status"])
+                returnStatus.find(s => s.value === String(scope.row["status"]))
                   ?.label || "--"
               }}
             </ElTag>

+ 4 - 18
src/views/invoice/query/components/sale.vue

@@ -7,16 +7,10 @@ import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
 import { useCompany } from "/@/hooks/core/useCompany";
 import { httpXSList, httpCGList } from "/@/api/invoice/query";
 import { INV_OPEN_STATUS } from "/@/utils/details/inv-open";
-import { STATUS_OPTIONS as returnStatus } from "/@/utils/details/ticket-return";
 import { useNav } from "/@/layout/hooks/nav";
 import { useRouter } from "vue-router";
 
-import {
-  cgInvTypeOptions,
-  xsInvTypeOptions,
-  xsOpenType,
-  cgOpenType
-} from "./../options";
+import { xsOpenType } from "./../options";
 import { xs_inv_type_list } from "/@/utils/status";
 
 const { logout } = useNav();
@@ -44,8 +38,6 @@ const { currentCompany } = useCompany();
 
 const columns = computed(() => xsColumns.value);
 
-const statusOptions = computed(() => INV_OPEN_STATUS);
-
 const toPath = computed(() => "/InvoiceSales/invoiceApplyDetail");
 
 const pagination = reactive<PaginationProps>({
@@ -102,13 +94,6 @@ const resetForm = (formEl: FormInstance | undefined) => {
   onSearch();
 };
 
-function resetType() {
-  form.page = 1;
-  form.inv_type = "";
-  form.timer = [];
-  onSearch();
-}
-
 function toDetail(data) {
   const id = formData.value.type === "0" ? data["invNo"] : data["hpNo"];
   push(toPath.value + "?id=" + id + "&back=/invoice/query");
@@ -183,8 +168,9 @@ onMounted(() => {
 
             <ElTag v-else-if="c.slot === 'status'">
               {{
-                statusOptions.find(s => s.value === scope.row["status"])
-                  ?.label || "--"
+                INV_OPEN_STATUS.find(
+                  s => s.value === String(scope.row["status"])
+                )?.label || "--"
               }}
             </ElTag>