feat

src/utils/status.ts

@@ -169,7 +169,8 @@ export const sendStatusOptions = [
 
 export const cgdStatusOptions = [
   { value: "0", label: "未对账" },
-  { value: "1", label: "已对账" }
+  { value: "1", label: "已对账" },
+  { value: "2", label: "无需结算" }
 ];
 
 export const tyStatusOptions = [

src/views/InvoiceSales/capitalClaim/components/basic-claim/sales-modal.vue

@@ -55,7 +55,6 @@ const handleSelectChange = values => (selectSaleOrder.value = values);
 const reuquestSalelist = () => {
   const { currentPage: page, pageSize: size } = pagination;
   const { timer, ...rest } = data.value;
-
   salelistRun(
     httpSaleList({
       pay_status: "0",
@@ -64,6 +63,7 @@ const reuquestSalelist = () => {
       companyNo: currentCompany.value.companyNo,
       start: timer[0],
       end: timer[1],
+      status: '3',
       ...rest
     })
   );

src/views/InvoiceSales/invoiceApply/components/add-edit-form/search-batch-main.vue

@@ -42,6 +42,7 @@ async function onSearch(sequenceNo = []) {
     inv_is: "1",
     cat_status: "2",
     inv_status: "0",
+    status: '3',
     page,
     size
   });

src/views/InvoiceSales/invoiceApply/components/add-edit-form/search-batch.vue

@@ -42,6 +42,7 @@ async function onSearch(sequenceNo = []) {
     inv_is: "1",
     cat_status: "2",
     inv_status: "0",
+    status: '3',
     page,
     size
   });

src/views/InvoiceSales/invoiceApply/components/add-edit-form/search-check.vue

@@ -73,6 +73,7 @@ async function onSearch() {
     inv_is: "1",
     cat_status: "2",
     inv_status: "0",
+    status: '3',
     cxCode: cxCode ? [cxCode] : cxCode,
     ...restParameter,
     page,

src/views/InvoiceSales/invoiceApply/components/currentcy-form/search-batch-main.vue

@@ -43,6 +43,7 @@ async function onSearch(sequenceNo = []) {
     inv_is: "1",
     cat_status: "2",
     inv_status: "0",
+    status: '3',
     page,
     size
   });

src/views/InvoiceSales/invoiceApply/components/currentcy-form/search-batch.vue

@@ -43,6 +43,7 @@ async function onSearch(sequenceNo = []) {
     inv_is: "1",
     cat_status: "2",
     inv_status: "0",
+    status: '3',
     page,
     size
   });

src/views/InvoiceSales/invoiceApply/components/currentcy-form/search-check.vue

@@ -74,6 +74,7 @@ async function onSearch() {
     inv_is: "1",
     cat_status: "2",
     inv_status: "0",
+    status: '3',
     cxCode: cxCode? [cxCode] : cxCode,
     ...restParameter,
     page,

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

@@ -241,14 +241,16 @@ const contentConfig: ContentConfig = {
     type: "4"
   },
   // 付款标签
-  showPayTagFn: ({ is_comon }, permissions) => permissions.includes("016"),
+  showPayTagFn: ({ status, is_comon }, permissions) => status != '2' && permissions.includes("016"),
   // 回票标签
-  showReturnTagFn: ({ is_comon }, permissions) => permissions.includes("015"),
+  showReturnTagFn: ({ status, is_comon }, permissions) => status != '2' && permissions.includes("015"),
   // 解除付款标签
   showUnPayTagFn: ({ status, is_comon }, permissions) => permissions.includes("061"),
   // 解除回票标签
   showUnReturnTagFn: ({ status, is_comon }, permissions) => permissions.includes("062"),
-  apis: { httpList }
+  apis: { httpList:(data = {}) => {
+    return httpList({ ...data })
+  } }
 };
 
 export default contentConfig;

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

@@ -46,6 +46,11 @@ const columns = [
     width: 145,
     ...renderIconLabelLeft("supplierNo","supplierName","卖出方公司编码:")
   },
+  {
+    label: "回票金额",
+    width: "110px",
+    prop: "inv_fee"
+  },
   {
     label: "发票税前金额",
     width: "110px",

src/views/purchase/ticketReturn/index.vue

@@ -46,7 +46,8 @@ const invoiceModalRef = ref<InstanceType<typeof InvoiceModal>>(null);
 const excelUploadRef = ref<InstanceType<typeof ExcelUpload>>(null);
 const excelUploadInvRef = ref<InstanceType<typeof ExcelUploadInv>>(null);
 const excelUploadRelationRef = ref<InstanceType<typeof ExcelUploadRelation> | null>(null)
-const data = ref({ inv_subtotal_amount: "", total: "" });
+  const data = ref({ inv_subtotal_amount: "", total: "", inv_fee: "" });
+
 
 const { run: approval, loading: approvalLoading } = useAsync({
   success: () => {
@@ -78,11 +79,12 @@ const events: PageEvents = {
   content: {
     preview: ({ hpNo }) => push(`${baseUrl}?id=${hpNo}`),
     create: () => push(baseUrl),
-    result: ({ inv_subtotal_amount, total }) => {
+    result: ({ inv_subtotal_amount, total, inv_fee }) => {
       const params = (pageContentRef.value as any).getBasicParams();
       state.hpNo = params.hpNo;
       state.payNo = params.payNo;
       data.value.inv_subtotal_amount = inv_subtotal_amount;
+      data.value.inv_fee = inv_fee;
       data.value.total = total;
     }
   }
@@ -225,7 +227,7 @@ function handleRefresh(row){
     >
       <template #content_table_header>
         <p v-if="state.payNo || state.hpNo">
-          合计:发票税前金额:{{ data.inv_subtotal_amount }},价税合计:{{ data.total }}
+          合计:回票金额:{{ data.inv_fee }},发票税前金额:{{ data.inv_subtotal_amount }},价税合计:{{ data.total }}
         </p>
       </template>