fix:dialog在打开后请求

src/api/purchase/ticketReturn/index.ts

@@ -6,25 +6,25 @@ const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
 
 //发票回票列表
 export const httpList = (data: object): any => {
-  return http.request("post", `${yewuApi}/invlist`, { data });
+  return http.request("post", `${yewuApi}invlist`, { data });
 };
 
 //发票回票添加
 export const httpAdd = (data: object): any => {
-  return http.request("post", `${yewuApi}/invadd`, { data });
+  return http.request("post", `${yewuApi}invadd`, { data });
 };
 
 //发票回票审核状态
 export const httpStatus = (data: object): any => {
-  return http.request("post", `${yewuApi}/invstatus`, { data });
+  return http.request("post", `${yewuApi}invstatus`, { data });
 };
 
 //发票回票详情
 export const httpInfo = (data: object): any => {
-  return http.request("post", `${yewuApi}/hpinfo`, { data });
+  return http.request("post", `${yewuApi}hpinfo`, { data });
 };
 
 //发票回票删除
 export const httpDelete = (data: object): any => {
-  return http.request("post", `${yewuApi}/invdel`, { data });
+  return http.request("post", `${yewuApi}invdel`, { data });
 };

src/components/BasicDescriptions/src/types.ts

@@ -21,6 +21,7 @@ export type DescriptionColumn = {
   field: string;
   label: string;
   span?: number;
+  width?: string;
   render?: (data: any) => VNode;
 };
 

src/components/OrderRecordDetail/src/index.vue

@@ -13,7 +13,7 @@ import {
 
 const props = defineProps<{
   payNo: string;
-  isInv: boolean;
+  isInv?: boolean;
 }>();
 
 const hiddenInvColumns = [

src/utils/details/inv-return.ts

@@ -20,7 +20,7 @@ export const RETURN_TYPE = [
 export const RETURN_STATUS = [
   {
     value: "0",
-    label: "待审核"
+    label: "待财务审核"
   },
   {
     value: "1",
@@ -32,7 +32,7 @@ export const RETURN_STATUS = [
   },
   {
     value: "3",
-    label: "驳回"
+    label: "审核驳回"
   },
   {
     value: "4",

src/utils/details/tragelog.ts

@@ -27,15 +27,13 @@ export const CAPITAL_STATUS = [
 export const CAPITAL_COLUMNS: DescriptionColumns = [
   {
     field: "tradNo",
-    label: "资金编号"
+    label: "资金编号",
+    width: "160px"
   },
   {
     field: "logNo",
-    label: "认领编号"
-  },
-  {
-    field: "trade_time",
-    label: "交易时间"
+    label: "认领编号",
+    width: "160px"
   },
   {
     field: "total_fee",
@@ -69,7 +67,12 @@ export const CAPITAL_COLUMNS: DescriptionColumns = [
   },
   {
     field: "used_fee",
-    label: "资金使用金额"
+    label: "资金使用金额",
+    width: "110px"
+  },
+  {
+    field: "trade_time",
+    label: "交易时间"
   },
   {
     field: "remark",

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

@@ -81,17 +81,18 @@ onMounted(() => reuquestSalelist());
     title="销售单列表"
     width="1040px"
     @close="() => (selectSaleOrder = [])"
+    center
   >
     <div class="w-[85%]" flex gap-5 mb-1>
       <el-input
+        w-100
         size="small"
-        w-150
         v-model="data.sequenceNo"
         placeholder="订单编号"
       />
       <el-input
+        w-100
         size="small"
-        w-150
         v-model="data.companyNo"
         placeholder="业务公司编号"
       />
@@ -140,7 +141,7 @@ onMounted(() => reuquestSalelist());
         :prop="col.field"
         :label="col.label"
         :key="index"
-        :width="col.width"
+        :width="col.width + 'px'"
         :type="col.type"
         show-overflow-tooltip
       >

src/views/InvoiceSales/invoiceApply/components/add-edit-form/order-dialog.vue

@@ -1,12 +1,12 @@
 <script setup lang="ts">
 import { reactive, ref, unref } from "vue";
 import { httpOrderList } from "/@/api/InvoiceSales/invoiceApply";
-import { responseHandle } from "/@/utils/responseHandle";
-import { useNav } from "/@/layout/hooks/nav";
-import { useColumns } from "./columns";
 import { PageSearch, usePageSearch } from "/@/components/PageSearch";
 import searchFormConfig from "./../../config/search.config";
+import { responseHandle } from "/@/utils/responseHandle";
+import { useNav } from "/@/layout/hooks/nav";
 import { ElMessage } from "element-plus";
+import { useColumns } from "./columns";
 
 const { columns } = useColumns();
 const { logout } = useNav();
@@ -15,6 +15,10 @@ const loading = ref(false);
 const dataList = ref([]);
 const tableRef = ref();
 const handleSelection = ref([]);
+const initform = {
+  page: 1,
+  size: 10
+};
 
 const pagination = reactive({
   total: 0,
@@ -25,10 +29,6 @@ const pagination = reactive({
 
 const emit = defineEmits(["reload", "save-btn-click"]);
 let otherParams: Record<any, any> = {};
-const initform = {
-  page: 1,
-  size: 10
-};
 const ruleForm = ref({ ...initform });
 const companyNo = ref("");
 const { handleSearchClick, handleResetClick } = usePageSearch(
@@ -73,8 +73,8 @@ async function onSearch() {
   const { code, data, message } = await httpOrderList({
     companyNo: companyNo.value,
     cat_status: "1",
-    inv_status: "0",
     inv_is: "1",
+    inv_status: "0",
     ...otherParams,
     ...ruleForm.value
   });
@@ -100,11 +100,8 @@ function handleConfirm() {
 
   //商品数量或开票金额为空
   const noConfirm = selectList.filter(o => o.winv_fee === "0.00");
-
   const noInvNum = selectList.filter(o => String(o.winv_num) === "0");
 
-  console.log(noInvNum);
-
   if (noConfirm.length !== 0) {
     return ElMessage.error(`销售单 ${noConfirm[0].sequenceNo} 开票金额为零`);
   }

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

@@ -23,11 +23,6 @@ const columns = [
     prop: "invNo",
     width: 200
   },
-  {
-    prop: "buyer_title",
-    label: "客户发票抬头",
-    width: 200
-  },
   {
     label: "业务企业编号",
     prop: "inv_out",
@@ -35,7 +30,13 @@ const columns = [
   },
   {
     label: "业务公司名称",
-    prop: "inv_company"
+    prop: "inv_company",
+    width: 200
+  },
+  {
+    prop: "buyer_title",
+    label: "客户发票抬头",
+    width: 200
   },
   {
     label: "税后金额",
@@ -60,12 +61,11 @@ const columns = [
   },
   {
     label: "申请人",
-    prop: "apply_name",
-    width: 80
+    prop: "apply_name"
   },
   {
     label: "申请时间",
-    width: 165,
+    width: 170,
     prop: "addtime",
     formatter: ({ addtime }) =>
       addtime ? dayjs(addtime).format("YYYY-MM-DD HH:mm:ss") : ""

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

@@ -11,12 +11,7 @@ const searchFormConfig: FormConfig = {
     {
       field: "inv_out",
       type: "input",
-      placeholder: "业务企业公司"
-    },
-    {
-      field: "buyer_name",
-      type: "input",
-      placeholder: "客户发票抬头"
+      placeholder: "业务企业公司编号"
     },
     {
       field: "timer",

src/views/InvoiceSales/invoicePool/index.vue

@@ -20,8 +20,8 @@ const searchCallback = ({ timer }) => {
   const [start, end] = timer;
 
   const result = {
-    start: dayjs(start).format("YYYY-MM-DD"),
-    end: dayjs(end).format("YYYY-MM-DD")
+    start: start ? dayjs(start).format("YYYY-MM-DD") : "",
+    end: end ? dayjs(end).format("YYYY-MM-DD") : ""
   };
 
   return {

src/views/InvoiceSales/refund/components/approval-process/img-upload.vue

@@ -61,7 +61,7 @@ const handleRemove: UploadProps["beforeRemove"] = uploadFile => {
     :before-upload="onBeforeReturnImageUpload"
     :http-request="handleRequeset"
     :before-remove="handleRemove"
-    list-type="picture"
+    multiple
   >
     <el-button type="primary">上传图片</el-button>
     <template #tip>

src/views/InvoiceSales/refund/components/create-refund/capital-modal.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref, unref } from "vue";
+import { ref, unref } from "vue";
 import { ElTable } from "element-plus";
 import { useAsync } from "/@/hooks";
 import { httpTradeList } from "/@/api/InvoiceSales/refund";
@@ -8,6 +8,8 @@ import { CAPITAL_COLUMNS } from "/@/utils/details/tragelog";
 const visible = ref(false);
 const selectOrder = ref<Array<Record<string, string>>>([]);
 
+const columns = CAPITAL_COLUMNS.filter(({ field }) => field !== "status");
+
 const emit = defineEmits(["on-add-order"]);
 const tableRef = ref<InstanceType<typeof ElTable>>(null);
 
@@ -21,8 +23,15 @@ const { run, data, getPaginationParams, loading, pagination } = useAsync({
   }
 });
 
+const params = ref({
+  tradNo: "",
+  logNo: ""
+});
+
 const requestPaymentlist = () => {
-  run(httpTradeList({ status: "2", ...getPaginationParams() }));
+  run(
+    httpTradeList({ status: "2", ...params.value, ...getPaginationParams() })
+  );
 };
 
 function handleConfirm() {
@@ -41,15 +50,44 @@ function handleSelectionChange(values) {
   }
 }
 
+function onSearch(_isReset = false) {
+  if (_isReset) {
+    params.value = {
+      tradNo: "",
+      logNo: ""
+    };
+  }
+
+  pagination.currentPage = 1;
+  requestPaymentlist();
+}
+
 defineExpose({
   onDisplay: () => (visible.value = true)
 });
-
-onMounted(() => requestPaymentlist());
 </script>
 
 <template>
-  <el-dialog v-model="visible" title="资金认领" center>
+  <el-dialog
+    v-model="visible"
+    title="资金认领"
+    center
+    @open="() => requestPaymentlist()"
+  >
+    <div flex mb-2>
+      <div flex flex-1 gap="5" pr="20px">
+        <el-input placeholder="资金编号" size="small" v-model="params.tradNo" />
+        <el-input placeholder="认领编号" size="small" v-model="params.logNo" />
+      </div>
+
+      <div flex width="120px">
+        <el-button size="small" type="primary" @click="() => onSearch()"
+          >搜索</el-button
+        >
+        <el-button size="small" @click="() => onSearch(true)">重置</el-button>
+      </div>
+    </div>
+
     <el-table
       border
       ref="tableRef"
@@ -61,9 +99,11 @@ onMounted(() => requestPaymentlist());
     >
       <el-table-column type="selection" width="55" />
       <el-table-column
-        v-for="({ field }, index) in CAPITAL_COLUMNS"
-        :key="index"
+        v-for="{ field, label, width } in columns"
+        :key="field"
         :prop="field"
+        :label="label"
+        :width="width"
         show-overflow-tooltip
       />
     </el-table>

src/views/InvoiceSales/returnTicket/components/approval-process/approval-pending.vue

@@ -7,7 +7,7 @@ const emit = defineEmits(["changeStatus"]);
 const formData = reactive({
   return_type: "",
   return_reason: "",
-  exam_remark: "",
+  remark: "",
   status: ""
 });
 
@@ -71,7 +71,7 @@ const handlePaymentReceipt = () => {
       </el-select>
     </el-form-item>
 
-    <el-form-item label="红冲原因">
+    <el-form-item label="红冲原因" prop="return_reason">
       <el-select w-300px v-model="formData.return_reason">
         <el-option label="销货退回" value="1" />
         <el-option label="开票有误" value="2" />
@@ -80,8 +80,8 @@ const handlePaymentReceipt = () => {
       </el-select>
     </el-form-item>
 
-    <el-form-item label="备注" prop="exam_remark" w-400px>
-      <el-input type="textarea" v-model="formData.exam_remark" />
+    <el-form-item label="备注" prop="remark" w-400px>
+      <el-input type="textarea" v-model="formData.remark" />
     </el-form-item>
 
     <el-form-item w-full flex justify-end>

src/views/InvoiceSales/returnTicket/components/create-return-ticket/capital-modal.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, reactive, ref, unref } from "vue";
+import { reactive, ref, unref } from "vue";
 import { ElTable } from "element-plus";
 import { useResponseHandle } from "/@/hooks";
 import { httpList } from "/@/api/InvoiceSales/invoiceApply";
@@ -8,6 +8,12 @@ import { inv_columns } from "../../config/configs";
 const paymentList = ref<Array<Record<string, string>>>([]);
 const selectOrder = ref<Array<Record<string, string>>>([]);
 
+const params = ref({
+  invNo: "",
+  inv_out: "",
+  inv_company: ""
+});
+
 const loading = ref(false);
 const visible = ref(false);
 
@@ -27,14 +33,14 @@ async function requestPaymentList() {
   const { code, message, data } = await httpList({
     status: "3",
     size,
-    page
+    page,
+    ...params.value
   });
 
   responseHandle({
     code,
     message,
     handler: () => {
-      console.log(data.count);
       pagination.total = data.count;
       paymentList.value = data.list;
     }
@@ -59,15 +65,59 @@ function handleSelectionChange(values) {
   }
 }
 
+function onSearch(_isReset = false) {
+  if (_isReset) {
+    params.value = {
+      invNo: "",
+      inv_out: "",
+      inv_company: ""
+    };
+  }
+
+  pagination.currentPage = 1;
+  requestPaymentList();
+}
+
 defineExpose({
   onDisplay: () => (visible.value = true)
 });
-
-onMounted(() => requestPaymentList());
 </script>
 
 <template>
-  <el-dialog v-model="visible" title="发票列表" center>
+  <el-dialog
+    v-model="visible"
+    title="发票列表"
+    center
+    @open="() => requestPaymentList()"
+  >
+    <div flex mb-2>
+      <div flex flex-1 gap="5" pr="20px">
+        <el-input
+          placeholder="发票申请编号"
+          size="small"
+          v-model="params.invNo"
+        />
+        <el-input
+          placeholder="业务公司编号"
+          size="small"
+          v-model="params.inv_out"
+        />
+
+        <el-input
+          placeholder="业务公司名称"
+          size="small"
+          v-model="params.inv_company"
+        />
+      </div>
+
+      <div flex width="120px">
+        <el-button size="small" type="primary" @click="() => onSearch()"
+          >搜索</el-button
+        >
+        <el-button size="small" @click="() => onSearch(true)">重置</el-button>
+      </div>
+    </div>
+
     <el-table
       v-loading="loading"
       border

src/views/InvoiceSales/returnTicket/components/create-return-ticket/index.vue

@@ -99,7 +99,7 @@ function handleCreate() {
       />
     </el-form-item>
 
-    <Invoice mt-5 v-if="invNumber" :inv-number="invNumber" type="sale" />
+    <Invoice mt-5 v-if="invNumber" :inv-number="invNumber" type="sale" mb-5 />
 
     <el-form-item label="红冲原因" prop="return_reason" w-480px>
       <el-select w-300px v-model="formData.return_reason">

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

@@ -2,12 +2,7 @@ export const inv_columns = [
   {
     label: "发票申请编号",
     prop: "invNo",
-    width: 140
-  },
-  {
-    label: "发票额度",
-    prop: "inv_value",
-    width: 110
+    width: 150
   },
   {
     label: "业务公司编码",
@@ -16,9 +11,14 @@ export const inv_columns = [
   },
   {
     label: "业务公司名称",
-    prop: "email",
+    prop: "inv_company",
     width: 140
   },
+  {
+    label: "发票额度",
+    prop: "inv_value",
+    width: 110
+  },
   {
     label: "申请人",
     prop: "apply_name",

src/views/purchase/purchPay/component/create-payment/add-order-modal.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref, unref, reactive } from "vue";
+import { ref, unref, reactive } from "vue";
 import { columns } from "../../config/configs";
 import { ElTable } from "element-plus";
 import { useResponseHandle } from "/@/hooks";
@@ -80,12 +80,16 @@ function handleSearch(_isReset?: boolean) {
 defineExpose({
   onDisplay: () => (visible.value = true)
 });
-
-onMounted(() => requestPaymentList());
 </script>
 
 <template>
-  <el-dialog v-model="visible" title="订单对账" center width="1040px">
+  <el-dialog
+    v-model="visible"
+    title="订单对账"
+    center
+    width="1040px"
+    @open="() => requestPaymentList()"
+  >
     <div flex justify-between mb-2>
       <div flex gap-2>
         <el-input

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

@@ -1,47 +1,70 @@
 <script setup lang="ts">
 import { ref } from "vue";
+import { ElForm, FormRules } from "element-plus";
 import TicketForm from "./ticket-form.vue";
 import OrderRecordDetail from "/@/components/OrderRecordDetail";
+import { httpAdd } from "/@/api/purchase/ticketReturn";
+import { useRouter } from "vue-router";
+import { useResponseHandle } from "/@/hooks";
 import PaymentTable from "./payment-table.vue";
+import { inv_type } from "./../../config/configs";
 
 const ticketFormRef = ref<InstanceType<typeof TicketForm>>(null);
 const paymentTableRef = ref<InstanceType<typeof PaymentTable>>(null);
+const formRef = ref<InstanceType<typeof ElForm>>(null);
+const responseHandle = useResponseHandle();
+const { push } = useRouter();
 
 const formData = ref({
   payNo: "",
-  arr: []
+  invArr: []
 });
 
+const rules: FormRules = {
+  payNo: {
+    trigger: "change",
+    required: true,
+    message: "请选择订单"
+  },
+  invArr: {
+    required: true,
+    message: "请上传发票",
+    validator(_, value: Array<any>) {
+      return value.length !== 0;
+    }
+  }
+};
+
 function handleTicketChange(ticketInfo) {
   Array.isArray(ticketInfo)
-    ? (formData.value.arr = [...formData.value.arr, ...ticketInfo])
-    : formData.value.arr.push(ticketInfo);
+    ? (formData.value.invArr = [...formData.value.invArr, ...ticketInfo])
+    : formData.value.invArr.push(ticketInfo);
 }
 
 function handleDelete({ $index }) {
-  formData.value.arr.splice($index, 1);
+  formData.value.invArr.splice($index, 1);
 }
 
 function handleSave() {
-  console.log(formData.value);
+  formRef.value.validate(async isValid => {
+    if (!isValid) return;
+
+    const { code, message } = await httpAdd(formData.value);
+
+    responseHandle({
+      code,
+      message,
+      handler: () => push("/purchase/ticketReturn")
+    });
+  });
 }
 </script>
 
 <template>
   <h1 text-xl font-bold mb-5>新建采购回票申请</h1>
 
-  <el-form :model="formData" label-width="100px">
-    <el-form-item
-      prop="payNo"
-      label="订单对账"
-      :rules="[
-        {
-          required: true,
-          message: '请选择一个订单',
-          trigger: 'change'
-        }
-      ]"
-    >
+  <el-form :model="formData" label-width="100px" ref="formRef" :rules="rules">
+    <el-form-item prop="payNo" label="订单对账">
       <div flex w-full justify-end>
         <el-button
           type="primary"
@@ -61,13 +84,23 @@ function handleSave() {
       </div>
     </el-form-item>
 
-    <el-form-item label="发票">
+    <el-form-item label="发票" prop="invArr">
       <div flex w-full justify-end mb-5>
         <el-button type="primary" link @click="() => ticketFormRef.onDisplay()"
           >添加</el-button
         >
       </div>
-      <el-table size="small" :data="formData.arr" border>
+      <el-table size="small" :data="formData.invArr" border>
+        <el-table-column type="index" width="50" />
+
+        <el-table-column label="上传方式" prop="invType" show-overflow-tooltip>
+          <template #="{ row }">
+            <el-tag>{{
+              inv_type.find(t => t.value === row.invType)?.label
+            }}</el-tag>
+          </template>
+        </el-table-column>
+
         <el-table-column
           label="发票号码"
           prop="invNumber"
@@ -90,7 +123,12 @@ function handleSave() {
         />
         <el-table-column label="发票图片" prop="inv_img" show-overflow-tooltip>
           <template #="{ row }">
-            <el-image :src="row.inv_img" style="height: 30px" />
+            <el-image
+              :src="row.inv_img"
+              :preview-src-list="[row.inv_img]"
+              style="height: 30px"
+              preview-teleported
+            />
           </template>
         </el-table-column>
         <el-table-column label="税前金额" prop="subtotal_amount" />
@@ -101,7 +139,7 @@ function handleSave() {
           show-overflow-tooltip
         />
 
-        <el-table-column label="操作">
+        <el-table-column label="操作" width="60px">
           <template #="scope">
             <el-button link type="primary" @click="() => handleDelete(scope)"
               >删除</el-button

src/views/purchase/ticketReturn/components/create-ticket/payment-table.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref, reactive } from "vue";
+import { ref, reactive } from "vue";
 import { purchase_columns } from "../../config/configs";
 import { ElTable } from "element-plus";
 import { useResponseHandle } from "/@/hooks";
@@ -72,8 +72,6 @@ function handleSearch(_isReset?: boolean) {
   requestPurchaseList();
 }
 
-onMounted(() => requestPurchaseList());
-
 defineExpose({
   onDisplay() {
     visible.value = true;
@@ -82,7 +80,13 @@ defineExpose({
 </script>
 
 <template>
-  <el-dialog v-model="visible" title="订单对账" center width="1040px">
+  <el-dialog
+    v-model="visible"
+    title="订单对账"
+    center
+    width="1040px"
+    @open="() => requestPurchaseList()"
+  >
     <div flex justify-between mb-2>
       <div flex gap-2>
         <el-input

src/views/purchase/ticketReturn/components/create-ticket/ticket-form.vue

@@ -2,7 +2,6 @@
 import { dayjs, ElForm, ElInput, ElMessage, UploadProps } from "element-plus";
 import { ticketFormItems, ticketAddRules } from "../../config/configs";
 import { computed, ref, watch } from "vue";
-// import { httpAdd } from "/@/api/purchase/ticketReturn";
 import { useResponseHandle } from "/@/hooks";
 import { httpImageUpload, baseUrl } from "/@/api/other";
 import { useUserStore } from "/@/store/modules/user";
@@ -210,7 +209,7 @@ defineExpose({
 
         <template v-else-if="item.prop === 'inv_img'">
           <!-- list-type="picture" -->
-          <div>
+          <div w-full>
             <el-upload
               class="upload-demo"
               v-model:file-list="fileList"

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

@@ -189,15 +189,15 @@ export const process_rules = {
 
 export const inv_type = [
   {
-    value: "0",
+    value: "1",
     label: "手工添加"
   },
   {
-    value: "1",
+    value: "2",
     label: "ocr识别"
   },
   {
-    value: "2",
+    value: "3",
     label: "金税识别"
   }
 ];