fix:采购回票添加后reload

src/api/InvoiceSales/capitalPool/index.ts

@@ -14,7 +14,7 @@ export const httpAdd = (data: object): ResponseType => {
 };
 // 列表
 export const httpList = (data: object): ResponseType => {
-  return http.request("post", `${yewuApi}orderpaylist`, { data });
+  return http.request("post", `${yewuApi}tradeList`, { data });
 };
 // 详情
 export const httpDetail = (data: object): ResponseType => {

src/components/PageContent/src/types.ts

@@ -2,13 +2,13 @@ import { PropType, ExtractPropTypes } from "vue";
 import PageContent from "./page-content";
 
 /***
- * @param {title} 标题
- * @param {apis} 请求
- * @param {columns} 列数据
- * @param {notReuqiredInit} 首次加载是否需要请求列表
- * @param {notPagination} 不需要分页器
- * @param {isTree} 是否为tree
- * @param {powers} 功能权限
+ * @param title 标题
+ * @param apis 请求
+ * @param columns 列数据
+ * @param notReuqiredInit 首次加载是否需要请求列表
+ * @param notPagination 不需要分页器
+ * @param isTree 是否为tree
+ * @param powers 功能权限
  */
 export interface ContentConfig {
   title: string;

src/views/InvoiceSales/capitalClaim/components/basic-claim/receipt-payment.vue

@@ -13,7 +13,7 @@ defineProps<{
   <div flex gap-10>
     <el-descriptions title="付款方" :column="1" border flex-1 size="small">
       <el-descriptions-item
-        v-for="(item, index) in description_columns_in"
+        v-for="(item, index) in description_columns_out"
         :key="index"
         :label="item.label"
         >{{ tradeInfo[item.field] }}</el-descriptions-item
@@ -22,7 +22,7 @@ defineProps<{
 
     <el-descriptions title="收款方" :column="1" border flex-1 size="small">
       <el-descriptions-item
-        v-for="(item, index) in description_columns_out"
+        v-for="(item, index) in description_columns_in"
         :key="index"
         :label="item.label"
         >{{ tradeInfo[item.field] }}</el-descriptions-item

src/views/InvoiceSales/capitalClaim/components/basic-claim/related-order.vue

@@ -1,11 +1,16 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { computed, ref } from "vue";
 import { order_columns, order_status } from "../../config/configs";
 import SalesModal from "./sales-modal.vue";
 
+const props = defineProps<{
+  readonly?: boolean;
+}>();
+
 const emit = defineEmits(["create-btn-click"]);
 const saleOrderList = ref<Array<Record<string, string>>>([]);
 const tradFeeMap = ref<Record<string, string>>({});
+const disabled = computed(() => !props.readonly);
 
 const saleModalRef = ref<InstanceType<typeof SalesModal>>(null);
 
@@ -26,8 +31,6 @@ function handleCreate() {
     })
   );
 
-  console.log(orderArr);
-
   emit("create-btn-click", orderArr);
 }
 </script>
@@ -35,7 +38,10 @@ function handleCreate() {
 <template>
   <div flex justify-between items-center>
     <h1 my-4>关联订单:</h1>
-    <el-button type="primary" @click="() => saleModalRef.onDisplay()"
+    <el-button
+      v-if="disabled"
+      type="primary"
+      @click="() => saleModalRef.onDisplay()"
       >添加</el-button
     >
   </div>
@@ -63,7 +69,7 @@ function handleCreate() {
     </el-table-column>
   </el-table>
 
-  <div flex justify-end mt-3>
+  <div flex justify-end mt-3 v-if="disabled">
     <el-button type="primary" @click="handleCreate">保存</el-button>
   </div>
 

src/views/InvoiceSales/capitalClaim/components/execl-upload.vue

@@ -1,4 +1,7 @@
 <script setup lang="ts">
+/**
+ * execl上传
+ */
 import { ref } from "vue";
 import { ElMessage, ElUpload, UploadFile, UploadProps } from "element-plus";
 import { httpUpload } from "/@/api/InvoiceSales/capitalClaim";

src/views/InvoiceSales/capitalClaim/config/configs.ts

@@ -61,19 +61,6 @@ export const order_columns = [
   }
 ];
 
-export const description_columns_in = [
-  {
-    label: "单位名称",
-    field: "trade_in"
-  },
-  {
-    label: "银行账号"
-  },
-  {
-    label: "银行名称"
-  }
-];
-
 export const order_status = [
   {
     value: "0",
@@ -93,16 +80,35 @@ export const order_status = [
   }
 ];
 
+//收款方
+export const description_columns_in = [
+  {
+    label: "单位名称",
+    field: "trade_in"
+  },
+  {
+    label: "银行账号",
+    field: "trade_in_account"
+  },
+  {
+    label: "银行名称",
+    field: "trade_in_blank"
+  }
+];
+
+//付款方
 export const description_columns_out = [
   {
     label: "单位名称",
     field: "trade_out"
   },
   {
-    label: "银行账号"
+    label: "银行账号",
+    field: "trade_account"
   },
   {
-    label: "银行名称"
+    label: "银行名称",
+    field: "trade_bank"
   }
 ];
 
@@ -250,3 +256,19 @@ export const sale_source = [
     label: "售后补换货"
   }
 ];
+
+//认领状态
+export const capital_status = [
+  {
+    value: "1",
+    label: "未认领"
+  },
+  {
+    value: "2",
+    label: "部分认领"
+  },
+  {
+    value: "3",
+    label: "已认领"
+  }
+];

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

@@ -2,6 +2,9 @@ import { ContentConfig } from "/@/components/PageContent";
 import { httpList } from "/@/api/InvoiceSales/capitalClaim";
 
 import dayjs from "dayjs";
+import { h } from "vue";
+import { ElTag } from "element-plus";
+import { capital_status } from "./configs";
 
 const columns = [
   {
@@ -30,11 +33,11 @@ const columns = [
     prop: "trade_out",
     width: 120
   },
-  {
-    label: "付款账号",
-    prop: "invoice_mobile",
-    width: 120
-  },
+  // {
+  //   label: "付款账号",
+  //   prop: "trade_account",
+  //   width: 120
+  // },
   {
     label: "汇款金额",
     prop: "total_fee",
@@ -55,6 +58,21 @@ const columns = [
   //   prop: "apply_name",
   //   width: 100
   // },
+  {
+    label: "状态",
+    prop: "status",
+    width: 80,
+    cellRenderer: ({ row, props }) =>
+      h(
+        ElTag,
+        {
+          size: props.size
+        },
+        {
+          default: () => capital_status.find(s => row.status === s.value)?.label
+        }
+      )
+  },
   {
     label: "未核销",
     prop: "balance",

src/views/InvoiceSales/capitalClaim/detail.vue

@@ -35,6 +35,7 @@ async function requesetTradeDetail() {
   });
 }
 
+
 async function requesetTradeOrderList() {
   const { code, message, data } = await httpOrderList({
     tradNo: tradNo.value
@@ -89,11 +90,22 @@ onMounted(() => initalData());
 
 <template>
   <div class="invoice__content" bg-white>
-    <el-collapse v-model="collapses">
-      <!-- 详情 -->
+    <!-- 认领 -->
+    <div v-if="true">
+      <h1 text-xl font-bold mb-2>资金认领</h1>
+      <PaymentReceipt :trade-info="treadeDetail" />
+      <RelatedOrder
+        :trade-order-list="treadOrderList"
+        @create-btn-click="requesetCreateSalePay"
+      />
+    </div>
+
+    <!-- 审核 -->
+    <el-collapse v-model="collapses" v-else>
       <el-collapse-item title="资金认领详情" name="1">
         <PaymentReceipt :trade-info="treadeDetail" />
         <RelatedOrder
+          readonly
           :trade-order-list="treadOrderList"
           @create-btn-click="requesetCreateSalePay"
         />

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

@@ -1,5 +1,5 @@
 import { ContentConfig } from "/@/components/PageContent";
-import { httpList } from "/@/api/parameter/clients";
+import { httpList } from "/@/api/InvoiceSales/capitalPool";
 
 import dayjs from "dayjs";
 
@@ -48,7 +48,6 @@ const columns = [
 const contentConfig: ContentConfig = {
   title: "资金公海池",
   powers: ["001", "002", "003", "004", "005", "006", "007", "008"],
-  notReuqiredInit: true,
   columns,
   apis: {
     httpList

src/views/InvoiceSales/capitalPool/config/search.config.ts

@@ -8,30 +8,30 @@ const searchFormConfig: FormConfig = {
       placeholder: "请选择资金状态"
     },
     {
-      field: "dd_range",
+      field: "bank",
       type: "input",
       placeholder: "请输入银行卡号"
     },
+    // {
+    //   field: "dd_range",
+    //   type: "input",
+    //   placeholder: "请输入单位名称"
+    // },
+    // {
+    //   field: "je_range",
+    //   type: "range",
+    //   otherOptions: {
+    //     startPlaceholder: "金额开始范围",
+    //     endPlaceholder: "金额结束范围"
+    //   }
+    // },
+    // {
+    //   field: "contactor",
+    //   type: "select",
+    //   placeholder: "请选择发票关联状态"
+    // },
     {
-      field: "dd_range",
-      type: "input",
-      placeholder: "请输入单位名称"
-    },
-    {
-      field: "je_range",
-      type: "range",
-      otherOptions: {
-        startPlaceholder: "金额开始范围",
-        endPlaceholder: "金额结束范围"
-      }
-    },
-    {
-      field: "contactor",
-      type: "select",
-      placeholder: "请选择发票关联状态"
-    },
-    {
-      field: "contactor",
+      field: "status",
       type: "select",
       placeholder: "请选择关联确认单状态"
     },
@@ -40,8 +40,8 @@ const searchFormConfig: FormConfig = {
       type: "date_picker",
       otherOptions: {
         type: "daterange",
-        startPlaceholder: "开始时间",
-        endPlaceholder: "结束时间"
+        startPlaceholder: "认领起始时间",
+        endPlaceholder: "认领结束时间"
       }
     }
   ]

src/views/InvoiceSales/capitalPool/index.vue

@@ -10,20 +10,17 @@ defineOptions({
   name: "invoiceheader"
 });
 
-function searchCallback({ whx_range, dd_range }) {
-  const [start, end] = whx_range;
-  const [dstart, dend] = dd_range;
+function searchCallback({ timer }) {
+  const [start, end] = timer;
 
   const result = {
     start,
-    end,
-    dstart,
-    dend
+    end
   };
 
   return {
     result,
-    deleteProps: ["whx_range", "dd_range"]
+    deleteProps: ["timer"]
   };
 }
 

src/views/purchase/porder/index.vue

@@ -156,6 +156,7 @@ onMounted(() => {
             v-model="form.input"
             placeholder="关键字"
             class="input-with-select"
+            clearable
           >
             <template #prepend>
               <el-select

src/views/purchase/ticketReturn/components/create-ticket-dialog/index.vue

@@ -13,6 +13,11 @@ function handleAdd({ payNo }) {
   ticketDialogRef.value.onDisplay(payNo);
 }
 
+function handleReload() {
+  emit("reload");
+  visible.value = false;
+}
+
 defineExpose({
   onDisplay: () => (visible.value = true)
 });
@@ -22,6 +27,6 @@ defineExpose({
   <el-dialog v-model="visible" title="新建采购回票" center destroy-on-close>
     <PaymentTable @add-btn-click="handleAdd" />
 
-    <CreateTicketDialog @reload="() => emit('reload')" ref="ticketDialogRef" />
+    <CreateTicketDialog @reload="handleReload" ref="ticketDialogRef" />
   </el-dialog>
 </template>

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

@@ -336,10 +336,6 @@ export const detailColumns = [
     field: "checkNumber",
     label: "校验码"
   },
-  {
-    field: "pay_apply_id",
-    label: "对账申请人"
-  },
   {
     field: "pay_apply_name",
     label: "对账申请人"