Merge branch 'v3.0' into sit

.gitignore

@@ -3,6 +3,8 @@ node_modules
 dist
 ./dist/**
 
+/dist/assets
+
 
 dist-ssr
 *.local

src/components/PageContent/src/actions/action-delete.tsx

@@ -2,6 +2,7 @@ import { defineComponent } from "vue";
 import { actionProps } from "../types";
 import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
 import { useResponseHandle } from "/@/hooks/core/useAsync";
+import { ElMessage } from "element-plus";
 
 const ActionDelete = defineComponent({
   name: "ActionDelete",
@@ -31,7 +32,10 @@ const ActionDelete = defineComponent({
       responseHandle({
         code,
         message,
-        handler: () => emit("reload")
+        handler: () => {
+          ElMessage.success('删除成功!');
+          emit("reload")
+        }
       });
     }
 

src/components/PageContent/src/actions/action-status.tsx

@@ -3,6 +3,8 @@ import { actionProps } from "../types";
 import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
 import { useResponseHandle } from "/@/hooks/core/useAsync";
 
+import { ElMessage } from "element-plus";
+
 const ActionStatus = defineComponent({
   name: "ActionDelete",
   props: {
@@ -38,7 +40,10 @@ const ActionStatus = defineComponent({
       responseHandle({
         code,
         message,
-        handler: () => emit("reload")
+        handler: () => {
+          ElMessage.success(props.row.status === '1' ? '禁用成功!' : '启用成功')
+          emit("reload")
+        }
       });
     }
 

src/components/PageContent/src/actions/action-tag.tsx

@@ -14,7 +14,8 @@ import {
   ElInputNumber,
   ElOption,
   ElSelect,
-  ElTooltip
+  ElTooltip,
+  ElMessage
 } from "element-plus";
 
 const defaultFormData = {
@@ -89,6 +90,7 @@ const ActionTag = defineComponent({
 
     const { run: addtagRun, loading: addtagLoading } = useAsync({
       success: () => {
+        ElMessage.success('标签添加成功!')
         visible.value = false;
         emit("reload");
       }

src/components/PageContent/src/actions/action-un-tag.tsx

@@ -15,7 +15,8 @@ import {
   ElOption,
   ElPopconfirm,
   ElSelect,
-  ElTooltip
+  ElTooltip,
+  ElMessage
 } from "element-plus";
 
 const defaultFormData = {
@@ -70,6 +71,7 @@ const ActionUnTag = defineComponent({
 
     const { run: addtagRun, loading: addtagLoading } = useAsync({
       success: () => {
+        ElMessage.success('标签解除成功!')
         visible.value = false;
         emit("reload");
       }
@@ -105,6 +107,7 @@ const ActionUnTag = defineComponent({
         onConfirm={onAddTagWithCode}
         v-slots={{
           reference: () => (
+<<<<<<< HEAD
             <ElButton
               link
               class="reset-margin"
@@ -114,6 +117,19 @@ const ActionUnTag = defineComponent({
                 coinIconTypes.includes(props.tagProps.type) ? "coin" : "stamp"
               )}
             />
+=======
+            <ElTooltip placement="top" content={`解除${title.value}标签`}>
+              <ElButton
+                link
+                class="reset-margin"
+                type="default"
+                onClick={onAddTagWithCode}
+                icon={useRenderIcon(
+                  coinIconTypes.includes(props.tagProps.type) ? "coin" : "stamp"
+                )}
+              />
+            </ElTooltip>
+>>>>>>> v3.0
           )
         }}
       />

src/utils/status.ts

@@ -103,7 +103,8 @@ export const invoiceTypeList = [
   // eslint-disable-next-line prettier/prettier
   { label: "电子发票（增值税专用发票）", value: "fully_digitalized_special_electronic", scanValue: "31" },
   // eslint-disable-next-line prettier/prettier
-  { label: "电子发票（增值税普通发票）", value: "fully_digitalized_normal_electronic", scanValue: "32" }
+  { label: "电子发票（增值税普通发票）", value: "fully_digitalized_normal_electronic", scanValue: "32" },
+  { label: "区块链电子发票", value: "blockchain_electronic", scanValue: "16" }
 ];
 
 /**
@@ -118,7 +119,8 @@ export const cg_inv_type_list = [
   // eslint-disable-next-line prettier/prettier
   { label: "电子发票（增值税专用发票）", value: "fully_digitalized_special_electronic", scanValue: "31" },
   // eslint-disable-next-line prettier/prettier
-  { label: "电子发票（增值税普通发票）", value: "fully_digitalized_normal_electronic", scanValue: "32" }
+  { label: "电子发票（增值税普通发票）", value: "fully_digitalized_normal_electronic", scanValue: "32" },
+  { label: "区块链电子发票", value: "blockchain_electronic", scanValue: "16" }
 ];
 
 /**

src/views/InvoiceSales/currentcyOrderRecord/components/batch.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref } from "vue"
+import { ref } from "vue";
 import { httpList } from "/@/api/InvoiceSales/currentcyAssOrderRecord";
 import { tyStatusOptions } from "/@/utils/status";
 import { useAsync } from "/@/hooks/core"
@@ -25,6 +25,8 @@ const initialParams = {
   status: [0],
 }
 
+const state = ref(1)
+
 const list = ref<any[]>([]);
 const params = ref({ ...initialParams });
 
@@ -43,7 +45,8 @@ const requestList = async (orderCode: string[]) => run(httpList({
   ...params.value,
   platform_type: props.platformType,
   customerNo: props.customerNo,
-  companyNo: props.companyNo
+  companyNo: props.companyNo,
+  status: Number(state.value) === -1 ? [-1, ...params.value.status] : params.value.status
 }));
 
 
@@ -77,6 +80,18 @@ async function handleEnter() {
   sourceText.value = "";
 }
 
+
+const retrun_status = [
+  {
+    value: 1,
+    label: "已回款"
+  },
+  {
+    value: -1,
+    label: "无回款限制"
+  },
+];
+
 </script>
 
 <template>
@@ -84,6 +99,12 @@ async function handleEnter() {
     placeholder="销售单编码(小于100条)，系统支持的分割符为逗号(,)、句号(.)、分号(;)、顿号(、)，回车后开始解析。" type="textarea"
     @keydown.enter="handleEnter" />
 
+  <ElCol :span="4" style="width:100%">
+    <ElSelect v-model="state" size="small" placeholder="关联已回款状态">
+      <ElOption v-for="{ label, value } in retrun_status" :label="label" :value="value" :key="value" />
+    </ElSelect>
+  </ElCol>
+
   <ElTable ref="tableRef" border size="small" :data="data" class="mt-[10px]" @selection-change="val => list = val"
     v-loading="loading" max-height="500px">
     <ElTableColumn label="通用订单编号" min-width="160" prop="tyCode" show-overflow-tooltip />
@@ -98,21 +119,30 @@ async function handleEnter() {
       <template #default="scope"> {{ scope.row.qrd ? scope.row.qrd.goodNum : "" }}</template>
     </ElTableColumn>
     <ElTableColumn label="销售单价" width="80" prop="goodPrice" show-overflow-tooltip>
-
       <template #default="scope">{{ scope.row.qrd ? scope.row.qrd.goodPrice : "" }}</template>
     </ElTableColumn>
-    <ElTableColumn label="对账状态" width="80" prop="status" show-overflow-tooltip>
 
+    <!-- 
+    <ElTableColumn label="关联已回款状态" width="110" prop="pay_status" show-overflow-tooltip>
       <template #default="scope">
         <ElTag>
-          {{ tyStatusOptions.find(c => c.value == scope.row.status)?.label || '--' }}
+          {{ retrun_status.find(c => c.value == scope.row.qrd.pay_status)?.label || '--' }}
+        </ElTag>
+      </template>
+    </ElTableColumn> 
+    -->
+
+    <ElTableColumn label="关联已回款状态" width="110" prop="pay_status" show-overflow-tooltip>
+      <template #default="scope">
+        <ElTag>
+          {{ String(scope.row.status) === '-1' ? '未回款' : '已回款' }}
         </ElTag>
       </template>
     </ElTableColumn>
 
     <ElTableColumn label="税率" width="80" prop="goodPrice" show-overflow-tooltip>
-          <template #default="scope">{{ scope.row.qrd ? `${scope.row.qrd.tax}%` : "" }}</template>
-     </ElTableColumn>
+      <template #default="scope">{{ scope.row.qrd ? `${scope.row.qrd.tax}%` : "" }}</template>
+    </ElTableColumn>
 
     <ElTableColumn label="下单时间" width="100" prop="addtime" show-overflow-tooltip />
   </ElTable>

src/views/InvoiceSales/currentcyOrderRecord/components/order-form.vue

@@ -28,9 +28,9 @@ function handleList(val: Record<string, any>[]) {
 }
 
 async function handleCreate() {
-  if(list.value.length > 150) {
+  if (list.value.length > 150) {
     ElMessage.warning('通用订单数量不能超过150条')
-    return
+    return;
   }
 
   try {

src/views/InvoiceSales/currentcyOrderRecord/components/single.vue

@@ -26,9 +26,10 @@ const initialParams = {
   size: 15,
   total: 0,
   status: [0],
-  pay_status: '1'
 }
 
+const state = ref(1)
+
 const list = ref<any[]>([]);
 const params = ref({ ...initialParams });
 
@@ -43,12 +44,27 @@ function handleList() {
   tableRef.value?.clearSelection();
 }
 
-const requestList = () => run(httpList({
-  ...params.value,
-  platform_type: props.platformType,
-  customerNo: props.customerNo,
-  companyNo: props.companyNo
-}));
+const requestList = () => {
+
+  run(httpList({
+   ...params.value,
+   platform_type: props.platformType,
+   customerNo: props.customerNo,
+   companyNo: props.companyNo,
+   status: Number(state.value) === -1 ?  [-1, ...params.value.status] :  params.value.status
+  })
+);
+}
+const retrun_status = [
+  {
+    value: 1,
+    label: "已回款"
+  },
+  {
+    value: -1,
+    label: "无回款限制"
+  },
+];
 
 
 onMounted(() => requestList());
@@ -61,10 +77,21 @@ defineExpose({
 
 <template>
   <ElRow class="mb-[10px]">
-    <ElCol :span="8">
-      <ElSelect :modelValue="String(params.status[0])" size="small" disabled>
+    <!-- <ElCol :span="4" style="margin-right: 10px">
+      <ElSelect style="width:100%" :modelValue="String(params.status[0])" size="small" disabled>
         <ElOption v-for="{ label, value } in tyStatusOptions" :label="label" :value="value" :key="value" />
       </ElSelect>
+    </ElCol> -->
+
+    <ElCol :span="4" style="width:100%">
+      <ElSelect v-model="state" size="small" placeholder="关联已回款状态">
+        <ElOption v-for="{ label, value } in retrun_status" :label="label" :value="value" :key="value" />
+      </ElSelect>
+    </ElCol>
+
+    <ElCol :span="19" class="fr">
+      <el-button style="float:right" size="small" type="primary" @click="() => {requestList()}">搜索</el-button>
+      <el-button style="float:right;margin-right:10px" size="small" @click="() =>{ params = initialParams;state = 1;requestList()}">重置</el-button>
     </ElCol>
   </ElRow>
 
@@ -86,14 +113,24 @@ defineExpose({
 
       <template #default="scope">{{ scope.row.qrd ? scope.row.qrd.goodPrice : "" }}</template>
     </ElTableColumn>
-    <ElTableColumn label="对账状态" width="80" prop="status" show-overflow-tooltip>
+
+ <ElTableColumn label="关联已回款状态" width="110" prop="pay_status" show-overflow-tooltip>
+  <template #default="scope">
+        <ElTag>
+          {{String(scope.row.status) === '-1' ? '未回款' : '已回款' }}
+        </ElTag>
+      </template>
+ </ElTableColumn>
+
+
+    <!-- <ElTableColumn label="对账状态" width="80" prop="status" show-overflow-tooltip>
 
       <template #default="scope">
         <ElTag>
           {{ tyStatusOptions.find(c => c.value == scope.row.status)?.label || '--' }}
         </ElTag>
       </template>
-    </ElTableColumn>
+    </ElTableColumn> -->
 
     <ElTableColumn label="税率" width="80" prop="goodPrice" show-overflow-tooltip>
           <template #default="scope">{{ scope.row.qrd ? `${scope.row.qrd.tax}%` : "" }}</template>

src/views/InvoiceSales/currentcyOrderRecord/config/content.config.ts

@@ -67,7 +67,7 @@ const columns = [
   {
     label: "操作",
     fixed: "right",
-    width: 140, //后期修改
+    width: 205, //后期修改
     slot: "operation"
   }
 ];
@@ -93,7 +93,11 @@ const contentConfig: ContentConfig = {
   showPayTagFn: ({ status, is_comon }, permissions) =>
     String(status) === "2" && permissions.includes("013") && String(is_comon) === "1",
   showReturnTagFn: ({ status, is_comon }, permissions) =>
-    String(status) === "2" && permissions.includes("014") && String(is_comon) === "1"
+    String(status) === "2" && permissions.includes("014") && String(is_comon) === "1",
+  showUnPayTagFn: ({ status, is_comon }, permissions) =>
+    String(status) === "2" && permissions.includes("055") && String(is_comon) === "1",
+  showUnReturnTagFn: ({ status, is_comon }, permissions) =>
+    String(status) === "2" && permissions.includes("056") && String(is_comon) === "1",
 };
 
 export default contentConfig;

src/views/interest/role/index.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { reactive, ref, onMounted, watch } from "vue";
 import { useColumns } from "./columns";
-import { httpList, httpStatus } from "/@/api/interest/role";
+import { httpList, httpStatus, httpDetail, httpAdd } from "/@/api/interest/role";
 import { type FormInstance } from "element-plus";
 import { ElMessage } from "element-plus";
 import { TableProBar } from "/@/components/ReTable";
@@ -124,6 +124,31 @@ const resetForm = (formEl: FormInstance | undefined) => {
   onSearch();
 };
 
+async function setRoles() {
+  const { data } = await httpList({ level: "2", size: 1000, companyNo: 'GS2203161855277894' });
+  const { list } = data;
+
+  for (const item of list) {
+    const { data: detail } = await httpDetail({ roleid: item.id });
+
+    const {
+      action,
+      private_data,
+      role_name,
+    } = detail;
+
+    const params = {
+      action:Array.isArray(action) ? action :action.split(','),
+      level: 2,
+      companyNo: currentCompany.value.companyNo,
+      role_name,
+      private_data: Array.isArray(private_data) ? private_data : private_data.split(',')
+    };
+
+    await httpAdd(params);
+  }
+}
+
 onMounted(() => {
   powers.value = useUserStoreHook().getMenuActions("role");
   if (powers.value.some(i => i == "001")) {
@@ -139,137 +164,64 @@ watch(
 
 <template>
   <div class="main role">
+    <el-button @click="setRoles">设置角色</el-button>
+
     <div v-show="powers.some(i => i == '001')">
-      <el-form
-        ref="formRef"
-        :inline="true"
-        :model="form"
-        size="small"
-        :label-width="0"
-        class="bg-white w-99/100 pl-8 pt-4"
-      >
+      <el-form ref="formRef" :inline="true" :model="form" size="small" :label-width="0"
+        class="bg-white w-99/100 pl-8 pt-4">
         <el-form-item prop="status">
-          <el-select
-            v-model="form.status"
-            style="width: 100%"
-            placeholder="角色状态"
-            clearable
-          >
-            <el-option
-              v-for="(si, sii) in statusList"
-              :key="'status' + si.value + sii"
-              :label="si.label"
-              :value="si.value"
-            />
+          <el-select v-model="form.status" style="width: 100%" placeholder="角色状态" clearable>
+            <el-option v-for="(si, sii) in statusList" :key="'status' + si.value + sii" :label="si.label"
+              :value="si.value" />
           </el-select>
         </el-form-item>
         <el-form-item prop="role_name">
           <el-input v-model="form.role_name" placeholder="角色名称" clearable />
         </el-form-item>
         <el-form-item>
-          <el-button
-            type="primary"
-            :icon="useRenderIcon('search')"
-            :loading="loading"
-            @click="resetSearch"
-          >
+          <el-button type="primary" :icon="useRenderIcon('search')" :loading="loading" @click="resetSearch">
             搜索
           </el-button>
-          <el-button
-            :icon="useRenderIcon('refresh')"
-            @click="resetForm(formRef)"
-          >
+          <el-button :icon="useRenderIcon('refresh')" @click="resetForm(formRef)">
             重置
           </el-button>
         </el-form-item>
       </el-form>
 
-      <TableProBar
-        title="公司角色管理"
-        :loading="loading"
-        :dataList="dataList"
-        @refresh="onSearch"
-      >
+      <TableProBar title="公司角色管理" :loading="loading" :dataList="dataList" @refresh="onSearch">
         <template #buttons>
-          <el-button
-            type="primary"
-            size="small"
-            v-if="powers.some(i => i == '002')"
-            :icon="useRenderIcon('add')"
-            @click="editItem('', 'add')"
-          >
+          <el-button type="primary" size="small" v-if="powers.some(i => i == '002')" :icon="useRenderIcon('add')"
+            @click="editItem('', 'add')">
             新增角色
           </el-button>
         </template>
         <template v-slot="{ size, checkList }">
-          <PureTable
-            border
-            align="left"
-            showOverflowTooltip
-            table-layout="auto"
-            size="small"
-            :data="dataList"
-            :columns="columns"
-            :checkList="checkList"
-            :pagination="pagination"
+          <PureTable border align="left" showOverflowTooltip table-layout="auto" size="small" :data="dataList"
+            :columns="columns" :checkList="checkList" :pagination="pagination"
             :paginationSmall="size === 'small' ? true : false"
-            :header-cell-style="{ background: '#fafafa', color: '#606266' }"
-            @selection-change="handleSelectionChange"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          >
+            :header-cell-style="{ background: '#fafafa', color: '#606266' }" @selection-change="handleSelectionChange"
+            @size-change="handleSizeChange" @current-change="handleCurrentChange">
             <template #operation="{ row }">
-              <el-button
-                class="reset-margin"
-                link
-                type="primary"
-                v-if="powers.some(i => i == '007')"
-                :size="size"
-                @click="editItem(row.id, 'view')"
-                :icon="useRenderIcon('eye-view')"
-              />
-              <el-button
-                class="reset-margin"
-                link
-                type="primary"
-                :size="size"
-                v-if="powers.some(i => i == '005')"
-                @click="editItem(row.id, 'edit')"
-                :icon="useRenderIcon('edits')"
-              />
-              <el-popconfirm
-                :title="row.status === '1' ? '改为禁用？' : '改为启用？'"
-                v-if="
-                  (powers.some(i => i == '004') && row.status + '' === '1') ||
-                  (powers.some(i => i == '003') && row.status + '' === '0')
-                "
-                @confirm="handleStatus(row)"
-              >
+              <el-button class="reset-margin" link type="primary" v-if="powers.some(i => i == '007')" :size="size"
+                @click="editItem(row.id, 'view')" :icon="useRenderIcon('eye-view')" />
+              <el-button class="reset-margin" link type="primary" :size="size" v-if="powers.some(i => i == '005')"
+                @click="editItem(row.id, 'edit')" :icon="useRenderIcon('edits')" />
+              <el-popconfirm :title="row.status === '1' ? '改为禁用？' : '改为启用？'" v-if="(powers.some(i => i == '004') && row.status + '' === '1') ||
+      (powers.some(i => i == '003') && row.status + '' === '0')
+      " @confirm="handleStatus(row)">
                 <template #reference>
-                  <el-button
-                    class="reset-margin"
-                    link
-                    type="primary"
-                    :size="size"
-                    :icon="
-                      useRenderIcon(
-                        row.status === '1'
-                          ? 'close-circle-line'
-                          : 'checkbox-circle-line'
-                      )
-                    " /></template
-              ></el-popconfirm>
+                  <el-button class="reset-margin" link type="primary" :size="size" :icon="useRenderIcon(
+      row.status === '1'
+        ? 'close-circle-line'
+        : 'checkbox-circle-line'
+    )
+      " /></template></el-popconfirm>
             </template>
           </PureTable>
         </template>
       </TableProBar>
-      <addEdit
-        :itemId="itemId"
-        :isDetails="isDetails"
-        :show-model="showModel"
-        @refresh="submitRefresh"
-        @cancel="submitCancel"
-      />
+      <addEdit :itemId="itemId" :isDetails="isDetails" :show-model="showModel" @refresh="submitRefresh"
+        @cancel="submitCancel" />
     </div>
     <NoAuth v-show="!powers.some(i => i == '001')" />
   </div>

src/views/purchase/orderRecord/index.vue

@@ -23,7 +23,10 @@ const { push } = useRouter();
 const contentRef = ref<any>(null);
 
 const { run: revoke } = useAsync({
-  success: () => contentRef.value.onSearch()
+  success: () => {
+    ElMessage.success("撤销对账成功");
+    contentRef.value.onSearch();
+  }
 });
 
 const { hasPermissionWithCode } = usePermission("orderRecord");
@@ -32,10 +35,12 @@ const hooks: PageHooks = {
   pageSearchHook: () => usePageSearch(undefined, undefined, searchConfig)
 };
 
-const handleRevoke = ({payNo, pay_tag_id}) => {
-  if(Number(pay_tag_id) !== 0){
+const handleRevoke = (props: any = {}) => {
+  const { payNo } = props;
+
+  if('pay_tag_id' in props && Number(props.pay_tag_id) !== 0){
     ElMessage.warning('请先解除付款标签再撤销对账单')
-    return
+    return;
   }
 
   revoke(

src/views/purchase/ticketReturn/components/choose-modal.vue

@@ -24,6 +24,7 @@ const pagination = reactive({
 });
 
 const formData = ref<Record<string, any>>({
+  is_comon: '0',
   currentValue: "",
   inv_status: "0",
   supplierNo: "",

src/views/purchase/ticketReturn/index.vue

@@ -21,7 +21,7 @@ import ExcelUploadInv from "./components/execl-files-upload-inv/index.vue";
 
 const PageName = "ticketReturn";
 const baseUrl = "/purchase/ticketReturnDetail";
-const invStatus = ["4", "10"];
+const invStatus = ['2','3',"4", '6','7', "10"];
 
 // { code: "017", name: "导出回票数据" },
 // { code: "018", name: "批量导入认证结果" },

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

@@ -99,7 +99,7 @@ const columns = [
   {
     label: "操作",
     fixed: "right",
-    width: 80,
+    width: 140,
     slot: "operation"
   }
 ];
@@ -116,7 +116,15 @@ const contentConfig: ContentConfig = {
   companyProp: "supplierNo",
   superUserNoAction: true,
   listNoRelation: true,
-  showDelete: ({ status }) => false
+  payProps: {
+    prop: "payNo",
+    type: "1"
+  },
+  returnProps: {
+    prop: "payNo",
+    type: "2"
+  },
+  showDelete: ({ status }) => false,
 };
 
 export default contentConfig;

src/views/supply/orderRecord/detail.vue

@@ -32,7 +32,7 @@ function handleCreate({ cids }: any) {
   create(httpAdd(params));
 }
 
-onMounted(() => { 
+onMounted(() => {
   console.log(permissions.value);
 })
 

src/views/supply/orderRecord/index.vue

@@ -36,7 +36,10 @@ const events: PageEvents = {
 
 const contentRef = ref<any>(null);
 const { run: revoke } = useAsync({
-  success: () => contentRef.value.onSearch()
+  success: () => {
+    ElMessage.success('撤销对账成功!');
+    contentRef.value.onSearch()
+  }
 });
 
 //导出模板
@@ -96,15 +99,15 @@ async function onDownloadPayInfo() {
   });
 }
 
-const handleRevoke = ({payNo, pay_tag_id}) => {
-  if(Number(pay_tag_id) !== 0){
+const handleRevoke = (props) => {
+  if('pay_tag_id' in props && Number(props.pay_tag_id) !== 0){
     ElMessage.warning('请先解除付款标签再撤销对账单')
     return;
   }
 
   revoke(
     httpStatus({
-      payNo,
+      payNo:props.payNo,
       status: "4"
     })
   );

src/views/supply/ticketReturn/components/choose-modal.vue

@@ -25,6 +25,7 @@ const pagination = reactive({
 });
 
 const formData = ref<Record<string, any>>({
+  is_comon: "0",
   inv_status: "0",
   companyNo: "",
   currentValue: "",

src/views/supply/ticketReturn/index.vue

@@ -18,7 +18,7 @@ import { template } from "./config/xls-template";
 
 const pageName = "supplyTicketReturn";
 const baseUrl = "/supply/supplyTicketReturnDetail";
-const invStatus = ["4", "10"];
+const invStatus = ['2','3',"4", '6','7', "10"];
 const loading = ref(false);
 
 // { code: "032", name: "导出对账开票数据" },