From 37aeb6959dbe80d68b9156f15aacf096b6cfb387 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Tue, 30 Jan 2024 16:28:29 +0800
Subject: [PATCH] 111

---
 src/views/InvoicingRequests/index.vue         |  2 +-
 src/views/finance_payment_apply/index.vue     | 18 +++-----------
 src/views/finance_payment_plan/index.vue      | 12 ++--------
 src/views/finance_receipt_record/index.vue    | 18 +++-----------
 src/views/finance_refund_record/index.vue     | 16 +++----------
 .../Collection/Remittance.vue                 | 24 ++++++++++++-------
 src/views/recordsPayment/index.vue            | 22 +++++++----------
 src/views/refund/index.vue                    |  5 ++--
 src/views/remittance/index.vue                |  7 +-----
 9 files changed, 41 insertions(+), 83 deletions(-)

diff --git a/src/views/InvoicingRequests/index.vue b/src/views/InvoicingRequests/index.vue
index 5b1fda5..0b2b513 100644
--- a/src/views/InvoicingRequests/index.vue
+++ b/src/views/InvoicingRequests/index.vue
@@ -44,7 +44,7 @@
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="序号" type="index" width="55" />
-                    <el-table-column label="客户" prop="custom_name" show-overflow-tooltip />
+                    <el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
                     <el-table-column label="项目编码" prop="project_code" show-overflow-tooltip />
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
                     <el-table-column label="开票日期" prop="invoicing_date" show-overflow-tooltip />
diff --git a/src/views/finance_payment_apply/index.vue b/src/views/finance_payment_apply/index.vue
index 2bbc4e3..b03055c 100644
--- a/src/views/finance_payment_apply/index.vue
+++ b/src/views/finance_payment_apply/index.vue
@@ -58,21 +58,9 @@
                     <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
                     <el-table-column label="付款日期" prop="pay_date" show-overflow-tooltip />
                     <el-table-column label="付款金额" prop="amount" show-overflow-tooltip />
-                    <el-table-column label="付款方式" prop="pay_type" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            {{ row.pay_type_text }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="付款性质" prop="payment_natrue" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            {{ row.payment_nature_text }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="期次" prop="period" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.pay_period" :value="row.period" />
-                        </template>
-                    </el-table-column>
+                    <el-table-column label="付款方式" prop="pay_type_text" show-overflow-tooltip />
+                    <el-table-column label="付款性质" prop="payment_nature_text" show-overflow-tooltip />
+                    <el-table-column label="期次" prop="period" show-overflow-tooltip />
                     <el-table-column label="申请人" prop="apply_user" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
                     <el-table-column label="操作" width="150" fixed="right">
diff --git a/src/views/finance_payment_plan/index.vue b/src/views/finance_payment_plan/index.vue
index b5cf433..2ab9f7a 100644
--- a/src/views/finance_payment_plan/index.vue
+++ b/src/views/finance_payment_plan/index.vue
@@ -45,16 +45,8 @@
                     <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
                     <el-table-column label="计划付款日期" prop="pay_date" show-overflow-tooltip />
                     <el-table-column label="金额" prop="amount" show-overflow-tooltip />
-                    <el-table-column label="期次" prop="period" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.pay_period" :value="row.period" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="状态" prop="period" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.pay_status" :value="row.status" />
-                        </template>
-                    </el-table-column>
+                    <el-table-column label="期次" prop="period_text" show-overflow-tooltip />
+                    <el-table-column label="状态" prop="status_text" show-overflow-tooltip />
                     <el-table-column label="已付款" prop="has_payment_amount" show-overflow-tooltip />
                     <el-table-column label="未付款" prop="not_payment_amount" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
diff --git a/src/views/finance_receipt_record/index.vue b/src/views/finance_receipt_record/index.vue
index 13a4cee..075bafc 100644
--- a/src/views/finance_receipt_record/index.vue
+++ b/src/views/finance_receipt_record/index.vue
@@ -36,28 +36,16 @@
                     <el-table-column label="序号" type="index" width="55" />
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
                     <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
-                    <el-table-column label="合同类型" prop="contract_type">
-                        <template #default="{ row }">
-                            {{ row.contract_type == 1 ? "采购合同" : "分包合同" }}
-                        </template>
-                    </el-table-column>
+                    <el-table-column label="合同类型" prop="contract_type" show-overflow-tooltip />
                     <el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
                     <el-table-column label="收票日期" prop="receipt_date" show-overflow-tooltip />
                     <el-table-column label="开票日期" prop="invoicing_date" show-overflow-tooltip />
                     <el-table-column label="提交人" prop="commitor" show-overflow-tooltip />
-                    <el-table-column label="发票税率" prop="invoice_tax_rate_text" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            {{ row.invoice_tax_rate_text }}%
-                        </template>
-                    </el-table-column>
+                    <el-table-column label="发票税率" prop="invoice_tax_rate_text" show-overflow-tooltip />
                     <el-table-column label="发票金额" prop="invoice_amount" show-overflow-tooltip />
                     <el-table-column label="不含税金额" prop="amount_excluding_tax" show-overflow-tooltip />
                     <el-table-column label="税额" prop="tax_amount" show-overflow-tooltip />
-                    <el-table-column label="发票类型" prop="invoice_type">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.invoice_type" :value="row.invoice_type" />
-                        </template>
-                    </el-table-column>
+                    <el-table-column label="发票类型" prop="invoice_type_text" show-overflow-tooltip />
                     <el-table-column label="发票编号" prop="invoice_no" show-overflow-tooltip />
 
                     <el-table-column label="操作" width="150" fixed="right">
diff --git a/src/views/finance_refund_record/index.vue b/src/views/finance_refund_record/index.vue
index 25bf55f..d124b89 100644
--- a/src/views/finance_refund_record/index.vue
+++ b/src/views/finance_refund_record/index.vue
@@ -45,23 +45,13 @@
                     <el-table-column label="序号" type="index" width="55" />
                     <el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
                     <el-table-column label="供应商编码" prop="supplier_code" show-overflow-tooltip />
-                    <el-table-column label="合同类型" prop="contract_type">
-                        <template #default="{ row }">
-                            {{ row.contract_type_text }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
+                    <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
+                    <el-table-column label="合同类型" prop="contract_type_text" show-overflow-tooltip />
                     <el-table-column label="退款日期" prop="refund_date" show-overflow-tooltip />
                     <el-table-column label="退款金额" prop="refund_amount" show-overflow-tooltip />
                     <el-table-column label="退款原因" prop="reason" show-overflow-tooltip />
-                    <el-table-column label="退款方式" prop="refund_type" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <!-- <dict-value :options="dictData.refund_type" :value="row.refund_type" /> -->
-                            {{ row.refund_type_text }}
-                        </template>
-                    </el-table-column>
-
+                    <el-table-column label="退款方式" prop="refund_type_text" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
                     <el-table-column label="操作" width="150" fixed="right">
                         <template #default="{ row }">
diff --git a/src/views/financialManagement/Collection/Remittance.vue b/src/views/financialManagement/Collection/Remittance.vue
index 4fcd13b..a3b0082 100644
--- a/src/views/financialManagement/Collection/Remittance.vue
+++ b/src/views/financialManagement/Collection/Remittance.vue
@@ -3,21 +3,26 @@
         <el-card>
             <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px" label-position="left">
                 <el-form-item label="客户名称" prop="field101">
-                    <el-input v-model="formData.field101" placeholder="点击选择客户" :disabled='true' clearable :style="{ width: '100%' }"></el-input>
+                    <el-input v-model="formData.field101" placeholder="点击选择客户" :disabled='true' clearable
+                        :style="{ width: '100%' }"></el-input>
                 </el-form-item>
                 <el-form-item label="合同编号" prop="field102">
-                    <el-input v-model="formData.field102" placeholder="选择销售合同" :disabled='true' clearable :style="{ width: '100%' }"></el-input>
+                    <el-input v-model="formData.field102" placeholder="选择销售合同" :disabled='true' clearable
+                        :style="{ width: '100%' }"></el-input>
                 </el-form-item>
                 <el-form-item label="合同名称" prop="field103">
-                    <el-input v-model="formData.field103" placeholder="系统自动填写" :disabled='true' clearable :style="{ width: '100%' }"></el-input>
+                    <el-input v-model="formData.field103" placeholder="系统自动填写" :disabled='true' clearable
+                        :style="{ width: '100%' }"></el-input>
                 </el-form-item>
                 <el-form-item label="期次" prop="field106">
                     <el-select v-model="formData.field106" placeholder="请选择期次" clearable :style="{ width: '100%' }">
-                        <el-option v-for="(item, index) in field106Options" :key="index" :label="item.label" :value="item.value" :disabled="item.disabled"></el-option>
+                        <el-option v-for="(item, index) in field106Options" :key="index" :label="item.label"
+                            :value="item.value" :disabled="item.disabled"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="计划回款日期" prop="field107">
-                    <el-date-picker v-model="formData.field107" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :style="{ width: '100%' }" placeholder="请选择计划回款日期" clearable></el-date-picker>
+                    <el-date-picker v-model="formData.field107" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                        :style="{ width: '100%' }" placeholder="请选择计划回款日期" clearable></el-date-picker>
                 </el-form-item>
                 <el-form-item label="金额" prop="field108">
                     <el-input v-model="formData.field108" placeholder="请输入金额" clearable :style="{ width: '100%' }">
@@ -25,18 +30,21 @@
                 </el-form-item>
                 <el-form-item label="是否回款" prop="field109">
                     <el-radio-group v-model="formData.field109" size="medium">
-                        <el-radio v-for="(item, index) in field109Options" :key="index" :label="item.value" :disabled="item.disabled">{{ item.label }}</el-radio>
+                        <el-radio v-for="(item, index) in field109Options" :key="index" :label="item.value"
+                            :disabled="item.disabled">{{ item.label }}</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="回款责任人" prop="field110">
-                    <el-input v-model="formData.field110" placeholder="点击指定责任人" :disabled='true' clearable :style="{ width: '100%' }"></el-input>
+                    <el-input v-model="formData.field110" placeholder="点击指定责任人" :disabled='true' clearable
+                        :style="{ width: '100%' }"></el-input>
                 </el-form-item>
                 <el-form-item label="备注" prop="field111">
                     <el-input v-model="formData.field111" placeholder="请输入备注" clearable :style="{ width: '100%' }">
                     </el-input>
                 </el-form-item>
                 <el-form-item label="附件" prop="field112">
-                    <el-upload ref="field112" :file-list="field112fileList" :action="field112Action" :before-upload="field112BeforeUpload">
+                    <el-upload ref="field112" :file-list="field112fileList" :action="field112Action"
+                        :before-upload="field112BeforeUpload">
                         <el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
                     </el-upload>
                 </el-form-item>
diff --git a/src/views/recordsPayment/index.vue b/src/views/recordsPayment/index.vue
index e8488fe..23fb045 100644
--- a/src/views/recordsPayment/index.vue
+++ b/src/views/recordsPayment/index.vue
@@ -23,7 +23,8 @@
                 </template>
                 新增
             </el-button>
-            <el-button v-perms="['recordsPayment.recordsPayment/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+            <el-button v-perms="['recordsPayment.recordsPayment/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
                 删除
             </el-button>
 
@@ -31,29 +32,24 @@
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="序号" type="index" width="55" />
-                    <el-table-column label="客户名称" prop="project_name" show-overflow-tooltip />
-                    <el-table-column label="合同编号" prop="project_name" show-overflow-tooltip />
+                    <el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
-
+                    <el-table-column label="合同编号" prop="contract_code" show-overflow-tooltip />
                     <el-table-column label="日期" prop="return_date" show-overflow-tooltip />
-                    <el-table-column label="期次" prop="industry">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.pay_period" :value="row.period" />
-                        </template>
-                    </el-table-column>
-
+                    <el-table-column label="期次" prop="period" show-overflow-tooltip />
                     <el-table-column label="金额" prop="amount" show-overflow-tooltip />
                     <el-table-column label="开票状态" prop="invoice_status" show-overflow-tooltip />
                     <el-table-column label="付款方式" prop="pay_type" show-overflow-tooltip />
                     <el-table-column label="收款性质" prop="collection_type" show-overflow-tooltip />
                     <el-table-column label="收款人" prop="receiver" show-overflow-tooltip />
-                    <el-table-column label="开户银行" prop="bank_account_info.deposit_bank" show-overflow-tooltip />
                     <el-table-column label="操作" width="150" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['recordsPayment.recordsPayment/edit']" type="primary" link @click="handleEdit(row)">
+                            <el-button v-perms="['recordsPayment.recordsPayment/edit']" type="primary" link
+                                @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button v-perms="['recordsPayment.recordsPayment/delete']" type="danger" link @click="handleDelete(row.id)">
+                            <el-button v-perms="['recordsPayment.recordsPayment/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                             <el-button v-perms="['recordsPayment.recordsPayment/detail']" link @click="handledetail(row)">
diff --git a/src/views/refund/index.vue b/src/views/refund/index.vue
index 2ae30fa..e18e4c6 100644
--- a/src/views/refund/index.vue
+++ b/src/views/refund/index.vue
@@ -4,7 +4,8 @@
             <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="退款方式" prop="refund_type">
                     <el-select class="w-[280px]" v-model="queryParams.refund_type" clearable placeholder="请选择退款方式">
-                        <el-option v-for="(item, index) in dictData.refund_type" :key="index" :label="item.name" :value="parseInt(item.value)" />
+                        <el-option v-for="(item, index) in dictData.refund_type" :key="index" :label="item.name"
+                            :value="parseInt(item.value)" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="退款人" prop="refund_user">
@@ -34,7 +35,7 @@
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="序号" type="index" width="55" />
                     <el-table-column label="退款单号" prop="refund_code" show-overflow-tooltip />
-                    <el-table-column label="客户名称" prop="project_code" show-overflow-tooltip />
+                    <el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
                     <el-table-column label="合同编号" prop="contract_code" show-overflow-tooltip />
                     <el-table-column label="退款原因" prop="reason" show-overflow-tooltip />
diff --git a/src/views/remittance/index.vue b/src/views/remittance/index.vue
index 7c74a33..da72550 100644
--- a/src/views/remittance/index.vue
+++ b/src/views/remittance/index.vue
@@ -38,13 +38,8 @@
                     <el-table-column label="合同类型" prop="contract_type" show-overflow-tooltip />
                     <el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
-
                     <el-table-column label="项目编码" prop="project_code" show-overflow-tooltip />
-                    <el-table-column label="期次" prop="period">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.pay_period" :value="row.period" />
-                        </template>
-                    </el-table-column>
+                    <el-table-column label="期次" prop="period" show-overflow-tooltip />
                     <el-table-column label="计划回款日期" prop="return_date" show-overflow-tooltip />
                     <el-table-column label="状态" prop="return_status" show-overflow-tooltip />
                     <el-table-column label="金额" prop="amount" show-overflow-tooltip />