From d5735af588816470768465cfce158b6fb80eef1d Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Tue, 23 Jan 2024 23:42:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=93=AA=E6=9C=89=E4=BB=80=E4=B9=88=E5=B2=81?=
 =?UTF-8?q?=E6=9C=88=E5=AE=89=E5=A5=BD=EF=BC=8C=E5=8F=AA=E4=B8=8D=E8=BF=87?=
 =?UTF-8?q?=E6=9C=89=E4=BA=BA=E6=9B=BF=E4=BD=A0=E8=B4=9F=E9=87=8D=E5=89=8D?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project_job_type.ts                   |    2 +
 src/components/contract/index.vue             |   11 +-
 .../index.vue                                 |   39 +-
 .../subcontracting.vue                        |   47 +-
 src/views/InvoicingRequests/edit.vue          |   18 +-
 src/views/bank_account/detail.vue             |   37 +-
 src/views/bank_account/edit.vue               |    8 +-
 src/views/bank_account/index.vue              |    6 +-
 src/views/bidbbond/detail.vue                 |   52 +-
 src/views/bidbbond/edit.vue                   |   35 +-
 src/views/bidbbond/index.vue                  |    4 +-
 src/views/finance_payment_apply/detail.vue    |  197 +--
 src/views/finance_payment_apply/edit.vue      |  186 +--
 src/views/finance_payment_apply/index.vue     |   12 +-
 src/views/finance_payment_plan/detail.vue     |   59 +-
 src/views/finance_payment_plan/edit.vue       |   55 +-
 src/views/finance_payment_plan/index.vue      |   10 +-
 src/views/finance_receipt_record/detail.vue   |   97 +-
 src/views/finance_receipt_record/edit.vue     |  103 +-
 src/views/finance_receipt_record/index.vue    |   12 +-
 src/views/finance_refund_record/detail.vue    |  100 +-
 src/views/finance_refund_record/edit.vue      |  191 +--
 src/views/finance_refund_record/index.vue     |   16 +-
 src/views/procurement_contract/detail.vue     |   60 +-
 src/views/procurement_contract/edit.vue       |    2 +-
 .../procurement_contract_detail/detail.vue    |   87 +-
 src/views/project_attendance_detail/edit.vue  |   31 +-
 src/views/project_document/edit.vue           |   10 +-
 src/views/project_document_set/edit.vue       |   19 +-
 .../project_insurance_management/edit.vue     |    1 +
 src/views/project_labor_contract/detail.vue   |    9 +-
 src/views/project_labor_contract/edit.vue     |    3 +-
 src/views/project_labor_contract/index.vue    |   21 +-
 .../project_list/components/Business.vue      |  270 ++++
 .../project_list/components/Collection.vue    |   87 ++
 .../project_list/components/Overview.vue      |   93 ++
 src/views/project_list/components/a.vue       |   36 +
 src/views/project_list/components/budget.vue  |  121 ++
 .../project_list/components/construction.vue  |    0
 .../project_list/components/contract.vue      |   99 ++
 .../project_list/components/documentation.vue |   33 +
 .../project_list/components/manpower.vue      |  187 +++
 src/views/project_list/components/myTable.vue |   39 +
 src/views/project_list/components/payment.vue |   87 ++
 .../project_list/components/procurement.vue   |   39 +
 .../project_list/components/subcontract.vue   |   60 +
 src/views/project_list/components/tender.vue  |  268 ++++
 src/views/project_list/detail.vue             | 1133 +++--------------
 src/views/project_list/index.vue              |  435 ++-----
 .../project_manager_appointment/edit.vue      |   23 +-
 .../project_manager_appointment/index.vue     |    4 -
 src/views/project_personnel/edit.vue          |   37 +-
 src/views/project_plan/edit.vue               |    6 +-
 src/views/project_profit_set/edit.vue         |    1 -
 src/views/project_salary_payment/detail.vue   |   13 +-
 src/views/project_salary_payment/edit.vue     |  153 +--
 src/views/project_salary_payment/index.vue    |    8 -
 src/views/project_wbs_set/edit.vue            |   26 +-
 src/views/project_wbs_set/index.vue           |   17 +-
 src/views/recordsPayment/detail.vue           |   32 +-
 src/views/recordsPayment/edit.vue             |    3 +-
 src/views/refund/edit.vue                     |   64 +-
 src/views/refundbidDeposit/detail.vue         |  107 +-
 src/views/refundbidDeposit/edit.vue           |   71 +-
 src/views/subcontracting_contract/detail.vue  |   96 +-
 src/views/subcontracting_contract/edit.vue    |    7 +-
 .../subcontracting_contract_detail/detail.vue |   62 +-
 .../subcontracting_contract_detail/index.vue  |    7 +-
 .../detail.vue                                |   43 +-
 .../edit.vue                                  |   33 +-
 .../index.vue                                 |    2 -
 71 files changed, 3108 insertions(+), 2234 deletions(-)
 create mode 100644 src/views/project_list/components/Business.vue
 create mode 100644 src/views/project_list/components/Collection.vue
 create mode 100644 src/views/project_list/components/Overview.vue
 create mode 100644 src/views/project_list/components/a.vue
 create mode 100644 src/views/project_list/components/budget.vue
 create mode 100644 src/views/project_list/components/construction.vue
 create mode 100644 src/views/project_list/components/contract.vue
 create mode 100644 src/views/project_list/components/documentation.vue
 create mode 100644 src/views/project_list/components/manpower.vue
 create mode 100644 src/views/project_list/components/myTable.vue
 create mode 100644 src/views/project_list/components/payment.vue
 create mode 100644 src/views/project_list/components/procurement.vue
 create mode 100644 src/views/project_list/components/subcontract.vue
 create mode 100644 src/views/project_list/components/tender.vue

diff --git a/src/api/project_job_type.ts b/src/api/project_job_type.ts
index 40b7f1f..2042674 100644
--- a/src/api/project_job_type.ts
+++ b/src/api/project_job_type.ts
@@ -30,3 +30,5 @@ export function projectjobtypeDetail(params: any) {
 export function projectjobtypeAll(params: any) {
     return request.get({ url: '/project.project_job_type/all', params })
 }
+
+
diff --git a/src/components/contract/index.vue b/src/components/contract/index.vue
index 6f07b33..8fe452e 100644
--- a/src/components/contract/index.vue
+++ b/src/components/contract/index.vue
@@ -17,7 +17,6 @@
                 <el-table :data="pager.lists" @cell-click="handleCurrentChange">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="序号" type="index" width="55" />
-                    <el-table-column label="流程编号" prop="" show-overflow-tooltip />
                     <el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
 
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
@@ -60,8 +59,10 @@
                     <el-table-column label="合同附件" prop="expire" show-overflow-tooltip>
                         <template #default="{ row }">
                             <div v-if="row.annex && row.annex.length > 0">
-                                <div v-for="(item, index) in row.annex" :key="index" style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</a>
+                                <div v-for="(item, index) in row.annex" :key="index"
+                                    style="margin-left: 5px;display: block;">
+                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item"
+                                        target="_blank">文件{{ index + 1 }}查看</a>
                                 </div>
                             </div>
                             <div v-else>暂无文件</div>
@@ -88,7 +89,7 @@ import { apiContractLists } from '@/api/contract'
 import { defineEmits } from "vue"
 import { timeFormat } from '@/utils/util'
 const props = defineProps({
-    productid: {
+    project_id: {
         type: String
     },
     custom_id: {
@@ -98,7 +99,7 @@ const props = defineProps({
 
 // 查询条件
 const queryParams = reactive({
-    project_id: props.productid,
+    project_id: props.project_id,
     custom_id: props.custom_id
 });
 const { dictData } = useDictData('contract_type,contract_pricing_method,contract_status')
diff --git a/src/components/procurementsubcontracting_selector/index.vue b/src/components/procurementsubcontracting_selector/index.vue
index 9ec4a8b..3772a85 100644
--- a/src/components/procurementsubcontracting_selector/index.vue
+++ b/src/components/procurementsubcontracting_selector/index.vue
@@ -16,25 +16,22 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @cell-click="handleCurrentChange">
                     <el-table-column type="selection" width="55" />
-                    <el-table-column label="序号" type="index" width="55" />
-                    <el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
-                    <el-table-column label="供应商编码" prop="department_id" show-overflow-tooltip />
-                    <el-table-column label="供应商合同号	" prop="department_id" show-overflow-tooltip />
+                    <el-table-column label="序号" type="index" width="55" 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_name" show-overflow-tooltip />
-                    <el-table-column label="合同类型" prop="contract_type">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.procurement_contract_type" :value="row.contract_type" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="合同金额" prop="signing_date" show-overflow-tooltip />
-                    <el-table-column label="实际合同金额" prop="pay_type" show-overflow-tooltip />
-                    <el-table-column label="合同金额" prop="amount" show-overflow-tooltip />
-                    <el-table-column label="已付款金额" prop="amount_daxie" show-overflow-tooltip />
-                    <el-table-column label="未付款金额" prop="amount_excluding_tax" show-overflow-tooltip />
-                    <el-table-column label="已开票金额" prop="retention_money" show-overflow-tooltip />
-                    <el-table-column label="未开票金额" prop="retention_money_rate" show-overflow-tooltip />
+                    <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
+                    <el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
+                    <el-table-column label="合同类型" prop="contract_type" show-overflow-tooltip />
+                    <el-table-column label="签订日期" prop="signing_date" show-overflow-tooltip />
+                    <el-table-column label="合同金额" prop="contract_amount" show-overflow-tooltip />
+                    <el-table-column label="已付款金额" prop="has_pay_amount" show-overflow-tooltip />
+                    <el-table-column label="已开票金额" prop="has_invoice_amount" show-overflow-tooltip />
+                    <el-table-column label="未付款金额" prop="not_pay_amount" show-overflow-tooltip />
+                    <el-table-column label="未开票金额" prop="not_invoice_amount" show-overflow-tooltip />
+                    <el-table-column label="退款金额" prop="refund_amount" show-overflow-tooltip />
+                    <el-table-column label="已入库数量" prop="has_storage_num" show-overflow-tooltip />
+                    <el-table-column label="未入库数量" prop="not_storage_num" show-overflow-tooltip />
+                    <el-table-column label="数量" prop="num" show-overflow-tooltip />
                 </el-table>
 
             </div>
@@ -49,13 +46,15 @@
 import { usePaging } from "@/hooks/usePaging"
 import { useDictData } from "@/hooks/useDictOptions"
 import { apiProcurementContractLists } from '@/api/procurement_contract'
+import { defineProps, defineEmits } from "vue"
 
-import { defineEmits } from "vue"
-
+const props = defineProps({
+    supplier_id: Number
+})
 // 查询条件
 const queryParams = reactive({
     project_id: '',
-    supplier_id: '',
+    supplier_id: props.supplier_id,
     contract_no: '',
     all: 1,
 });
diff --git a/src/components/procurementsubcontracting_selector/subcontracting.vue b/src/components/procurementsubcontracting_selector/subcontracting.vue
index 7ed4a63..5dbc3a7 100644
--- a/src/components/procurementsubcontracting_selector/subcontracting.vue
+++ b/src/components/procurementsubcontracting_selector/subcontracting.vue
@@ -15,26 +15,24 @@
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
             <div class="mt-4">
                 <el-table :data="pager.lists" @cell-click="handleCurrentChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="序号" type="index" width="55" />
-                    <el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
-                    <el-table-column label="供应商编码" prop="department_id" show-overflow-tooltip />
-                    <el-table-column label="供应商合同号	" prop="department_id" show-overflow-tooltip />
-                    <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
+                    <el-table-column label="项目SD名称" prop="project_name" show-overflow-tooltip />
                     <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
                     <el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
-                    <el-table-column label="合同类型" prop="contract_type">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.procurement_contract_type" :value="row.contract_type" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="合同金额" prop="signing_date" show-overflow-tooltip />
-                    <el-table-column label="实际合同金额" prop="pay_type" show-overflow-tooltip />
-                    <el-table-column label="合同金额" prop="amount" show-overflow-tooltip />
-                    <el-table-column label="已付款金额" prop="amount_daxie" show-overflow-tooltip />
-                    <el-table-column label="未付款金额" prop="amount_excluding_tax" show-overflow-tooltip />
-                    <el-table-column label="已开票金额" prop="retention_money" show-overflow-tooltip />
-                    <el-table-column label="未开票金额" prop="retention_money_rate" show-overflow-tooltip />
+                    <el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
+                    <el-table-column label="签订日期" prop="signing_date" show-overflow-tooltip />
+
+                    <el-table-column label="合同类型" prop="contract_type" show-overflow-tooltip />
+                    <el-table-column label="合同金额" prop="contract_amount" show-overflow-tooltip />
+                    <!-- <el-table-column label="税率" prop="tax_rate" show-overflow-tooltip /> -->
+                    <el-table-column label="洽商金额" prop="negotiation_amount" show-overflow-tooltip />
+                    <el-table-column label="不含税金额" prop="excluding_tax_amount" show-overflow-tooltip />
+                    <el-table-column label="实际合同金额" prop="reality_contract_amount" show-overflow-tooltip />
+                    <el-table-column label="已付款金额" prop="has_pay_amount" show-overflow-tooltip />
+                    <el-table-column label="未付款金额" prop="not_pay_amount" show-overflow-tooltip />
+                    <el-table-column label="已开票金额" prop="invoice_amount" show-overflow-tooltip />
+                    <el-table-column label="未开票金额" prop="not_invoice_amount" show-overflow-tooltip />
+                    <el-table-column label="已退款金额" prop="refund_amount" show-overflow-tooltip />
+                    <el-table-column label="结算差异" prop="settlement_difference" show-overflow-tooltip />
                 </el-table>
 
             </div>
@@ -48,14 +46,15 @@
 <script lang="ts" setup>
 import { usePaging } from "@/hooks/usePaging"
 import { useDictData } from "@/hooks/useDictOptions"
-import { apiSubcontractingContractDetailLists } from '@/api/subcontracting_contract_detail'
-
-import { defineEmits } from "vue"
-
+import { apiSubcontractingContractLists } from '@/api/subcontracting_contract.ts'
+import { defineEmits, defineProps } from "vue"
+const props = defineProps({
+    supplier_id: Number
+})
 // 查询条件
 const queryParams = reactive({
     project_id: '',
-    supplier_id: '',
+    supplier_id: props.supplier_id,
     contract_no: '',
     all: 1,
 });
@@ -71,7 +70,7 @@ const handleCurrentChange = (value: any) => {
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiSubcontractingContractDetailLists,
+    fetchFun: apiSubcontractingContractLists,
     params: queryParams,
 });
 
diff --git a/src/views/InvoicingRequests/edit.vue b/src/views/InvoicingRequests/edit.vue
index 010addd..a821532 100644
--- a/src/views/InvoicingRequests/edit.vue
+++ b/src/views/InvoicingRequests/edit.vue
@@ -92,7 +92,7 @@
                     <el-col :span="8">
                         <el-form-item label="开票金额(含税)" prop="invoicing_amount">
                             <el-input v-model="formData.invoicing_amount" clearable placeholder="请输入开票金额(含税)"
-                                @input="amountinput" />
+                                @change="amountinput" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -252,6 +252,7 @@ import { isEmail, isIdCard, isPhone } from '@/utils/validate'
 import type { PropType } from 'vue'
 import configs from "@/config"
 import useUserStore from "@/stores/modules/user";
+import { computed } from "vue"
 
 const base_url = configs.baseUrl + configs.urlPrefix
 const userStore = useUserStore();
@@ -263,7 +264,6 @@ const project_code = ref('')
 const project_amount = ref('')
 const contract_no = ref('')
 const custom_name = ref('')
-const invoicing_amount_daxie = ref('')
 const next = () => {
     if (active.value++ > 3) active.value = 0
 }
@@ -308,13 +308,13 @@ const userEmail = (rule: any, value: string, callback: (arg0: Error | undefined)
     }
 
 };
-//监听输入
-const amountinput = (e) => {
-    // console.log(e)
-    if (e && e > 0) {
-        invoicing_amount_daxie.value = toChinesNum(e)
-    }
-}
+
+
+let invoicing_amount_daxie = computed(() => {
+    return toChinesNum(formData.invoicing_amount)
+})
+
+
 // 删除上传的文件
 const delFileFn = (index: number) => {
     formDataannex.splice(index, 1)
diff --git a/src/views/bank_account/detail.vue b/src/views/bank_account/detail.vue
index 2bd3607..b9cf101 100644
--- a/src/views/bank_account/detail.vue
+++ b/src/views/bank_account/detail.vue
@@ -5,27 +5,22 @@
     <div class="detail-popup">
         <popup ref="popupRef" title="银行账户详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
             <el-descriptions :column="3" border>
-                <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">{{ formData.org_name }}</el-descriptions-item>
-                <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">{{ formData.dept_name }}</el-descriptions-item>
-                <el-descriptions-item label="账户编码" label-align="left" align="left" label-class-name="my-label">{{ formData.account_sn }}</el-descriptions-item>
-                <el-descriptions-item label="开户银行" label-align="left" align="left" label-class-name="my-label">{{ formData.deposit_bank }}</el-descriptions-item>
-                <el-descriptions-item label="开户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.account_name }}</el-descriptions-item>
-
-                <el-descriptions-item label="账号" label-align="left" align="left" label-class-name="my-label">{{ formData.account }}</el-descriptions-item>
-
-
-                <el-descriptions-item label="开户日期" label-align="left" align="left" label-class-name="my-label">{{ formData.account_opening_date }}</el-descriptions-item>
-
-
-                <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">{{ formData.remark }}</el-descriptions-item>
-
-                <el-descriptions-item label="添加人" label-align="left" align="left" label-class-name="my-label">{{ formData.competitor }}</el-descriptions-item>
-
-                <el-descriptions-item label="创建日期" label-align="left" align="left" label-class-name="my-label">{{ formData.is_margin }}</el-descriptions-item>
-                <el-descriptions-item label="更新人" label-align="left" align="left" label-class-name="my-label">{{ formData.margin_amount }}</el-descriptions-item>
-
-                <el-descriptions-item label="更新日期" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_opening_date }}</el-descriptions-item>
-
+                <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.org_name }}</el-descriptions-item>
+                <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.dept_name }}</el-descriptions-item>
+                <el-descriptions-item label="账户编码" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.account_sn }}</el-descriptions-item>
+                <el-descriptions-item label="开户银行" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.deposit_bank }}</el-descriptions-item>
+                <el-descriptions-item label="开户名称" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.account_name }}</el-descriptions-item>
+                <el-descriptions-item label="账号" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.account }}</el-descriptions-item>
+                <el-descriptions-item label="开户日期" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.account_opening_date }}</el-descriptions-item>
+                <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.remark }}</el-descriptions-item>
             </el-descriptions>
         </popup>
     </div>
diff --git a/src/views/bank_account/edit.vue b/src/views/bank_account/edit.vue
index 3e845c9..e2ab496 100644
--- a/src/views/bank_account/edit.vue
+++ b/src/views/bank_account/edit.vue
@@ -32,8 +32,7 @@
                     <el-col :span="24">
                         <el-form-item label="开户银行" prop="deposit_bank"
                             :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="formData.deposit_bank" clearable placeholder="请输入开户银行"
-                                @click="showDialog3 = true" />
+                            <el-input v-model="formData.deposit_bank" clearable placeholder="请输入开户银行" />
                         </el-form-item>
                     </el-col>
 
@@ -78,9 +77,9 @@
 
                 </el-row>
 
-                <el-dialog v-model="showDialog3" title="选择收款人信息" width="70%">
+                <!-- <el-dialog v-model="showDialog3" title="选择收款人信息" width="70%">
                     <bankaccountDialog @customEvent="customEvent3"></bankaccountDialog>
-                </el-dialog>
+                </el-dialog> -->
 
 
 
@@ -102,7 +101,6 @@ import { isEmail, isIdCard, isPhone } from '@/utils/validate'
 import type { PropType } from 'vue'
 import configs from "@/config"
 import useUserStore from "@/stores/modules/user";
-import bankaccountDialog from '@/components/bankaccount/index.vue'
 
 const list1 = reactive([])
 const list2 = reactive([])
diff --git a/src/views/bank_account/index.vue b/src/views/bank_account/index.vue
index f52e5f7..e6773fe 100644
--- a/src/views/bank_account/index.vue
+++ b/src/views/bank_account/index.vue
@@ -45,13 +45,13 @@
 
                     <el-table-column label="开户日期" prop="account_opening_date" show-overflow-tooltip />
                     <el-table-column label="期初金额" prop="opening_amount" show-overflow-tooltip />
-                    <el-table-column label="入账金额" prop="bidder_amount" show-overflow-tooltip />
+                    <!-- <el-table-column label="入账金额" prop="bidder_amount" show-overflow-tooltip />
                     <el-table-column label="出账金额" prop="bidder_amount" show-overflow-tooltip />
 
                     <el-table-column label="账户余额" prop="bidder_amount" show-overflow-tooltip />
                     <el-table-column label="账户资金余额" prop="bidder_amount" show-overflow-tooltip />
-                    <el-table-column label="汇票账户余额" prop="bidder_amount" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="bidder_amount" show-overflow-tooltip />
+                    <el-table-column label="汇票账户余额" prop="bidder_amount" show-overflow-tooltip /> -->
+                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
                     <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['bid.bid_result/edit']" type="primary" link @click="handleEdit(row)">
diff --git a/src/views/bidbbond/detail.vue b/src/views/bidbbond/detail.vue
index 6d601bd..ccddffa 100644
--- a/src/views/bidbbond/detail.vue
+++ b/src/views/bidbbond/detail.vue
@@ -3,30 +3,41 @@
     <div class="detail-popup">
         <popup ref="popupRef" title="投标保证金详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
             <el-descriptions title="基本信息" :column="3" border>
-                <el-descriptions-item label="投标编号" label-align="left" align="left" label-class-name="my-label">{{ formData.security_apply_code }}</el-descriptions-item>
-                <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.custom_name }}</el-descriptions-item>
-                <el-descriptions-item label="申请人" label-align="left" align="left" label-class-name="my-label">{{ formData.applier }}</el-descriptions-item>
-                <el-descriptions-item label="付款方式" label-align="left" align="left" label-class-name="my-label">{{ formData.pay_type_text }}</el-descriptions-item>
+                <el-descriptions-item label="投标编号" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.security_apply_code }}</el-descriptions-item>
+                <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.custom_name }}</el-descriptions-item>
+                <el-descriptions-item label="申请人" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.applier }}</el-descriptions-item>
+                <el-descriptions-item label="付款方式" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.pay_type_text }}</el-descriptions-item>
 
-                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">{{ formData.project_name }}</el-descriptions-item>
-                <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label">{{ formData.project_code }}</el-descriptions-item>
+                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.project_name }}</el-descriptions-item>
+                <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.project_code }}</el-descriptions-item>
 
 
 
-                <el-descriptions-item label="保证金金额" label-align="left" align="left" label-class-name="my-label">{{ formData.margin_amount }}</el-descriptions-item>
+                <el-descriptions-item label="保证金金额" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.margin_amount }}</el-descriptions-item>
                 <!-- <el-descriptions-item label="大写" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_opening_date }}</el-descriptions-item> -->
 
-                <el-descriptions-item label="投标时间" label-align="left" align="left" label-class-name="my-label">{{ formData.bidding_time
+                <el-descriptions-item label="投标时间" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.bidding_time
                 }}</el-descriptions-item>
 
-                <el-descriptions-item label="预计退还时间" label-align="left" align="left" label-class-name="my-label">{{ formData.refund_date }}</el-descriptions-item>
+                <el-descriptions-item label="预计退还时间" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.refund_date }}</el-descriptions-item>
 
-                <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">{{ formData.remark }}</el-descriptions-item>
+                <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.remark }}</el-descriptions-item>
                 <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
 
                     <div v-if="formData.annex.length > 0">
                         <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</a>
+                            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item"
+                                target="_blank">文件{{ index + 1 }}查看</a>
 
                         </div>
                     </div>
@@ -36,18 +47,21 @@
             </el-descriptions>
             <el-descriptions title="收款人信息" border>
 
-                <el-descriptions-item label=" 开户银行" label-align="left" align="left" label-class-name="my-label">{{ formData.deposit_bank }}</el-descriptions-item>
-                <el-descriptions-item label="开户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.account_name }}</el-descriptions-item>
-                <el-descriptions-item label="账号" label-align="left" align="left" label-class-name="my-label">{{ formData.account }}</el-descriptions-item>
+                <el-descriptions-item label=" 开户银行" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.deposit_bank }}</el-descriptions-item>
+                <el-descriptions-item label="开户名称" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.account_name }}</el-descriptions-item>
+                <el-descriptions-item label="账号" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.account }}</el-descriptions-item>
 
 
             </el-descriptions>
-            <el-descriptions title="付款账户信息" border>
+            <!-- <el-descriptions title="付款账户信息" border>
                 <el-descriptions-item label="账号编码" label-align="left" align="left" label-class-name="my-label">{{}}</el-descriptions-item>
                 <el-descriptions-item label="开户银行" label-align="left" align="left" label-class-name="my-label">{{ formData.deposit_bank }}</el-descriptions-item>
                 <el-descriptions-item label="开户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.account_name }}</el-descriptions-item>
                 <el-descriptions-item label="账号" label-align="left" align="left" label-class-name="my-label">{{ formData.account }}</el-descriptions-item>
-            </el-descriptions>
+            </el-descriptions> -->
         </popup>
     </div>
 </template>
@@ -129,13 +143,11 @@ defineExpose({
     getDetail
 })
 </script>
-<style lang="scss" scoped>
-.tit {
+<style lang="scss" scoped>.tit {
     font-size: 1.2em;
     margin-bottom: 10px;
 }
 
 :deep(.my-label) {
     width: 150px;
-}
-</style>
+}</style>
diff --git a/src/views/bidbbond/edit.vue b/src/views/bidbbond/edit.vue
index 41ad337..024da14 100644
--- a/src/views/bidbbond/edit.vue
+++ b/src/views/bidbbond/edit.vue
@@ -103,44 +103,35 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <div style="margin: 20px 0;">收款账户</div>
+                <div style="margin: 20px 0;">收款账户信息</div>
 
                 <el-row :gutter="10">
 
                     <el-col :span="8">
                         <el-form-item label="账号" prop="account" @click="showDialog2 = true"
                             :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="formData.account" clearable placeholder="请输入账号"
-                                @click="showDialog3 = true" />
+                            <el-input v-model="formData.account" clearable placeholder="请输入账号" />
                         </el-form-item>
-
                     </el-col>
-
                     <el-col :span="8">
                         <el-form-item label="开户银行" prop="deposit_bank"
                             :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.deposit_bank" clearable placeholder="请输入开户银行" />
                         </el-form-item>
-
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="开户名称" prop="account_name"
                             :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.account_name" clearable placeholder="请输入开户名称" />
                         </el-form-item>
-
                     </el-col>
-
-
                 </el-row>
-
-
                 <el-dialog v-model="showDialog" title="选择投标决策" width="70%">
                     <biddingDecisionDialog @customEvent="customEvent"></biddingDecisionDialog>
                 </el-dialog>
-                <el-dialog v-model="showDialog3" title="选择收款人信息" width="70%">
+                <!-- <el-dialog v-model="showDialog3" title="选择收款人信息" width="70%">
                     <bankaccountDialog @customEvent="customEvent3"></bankaccountDialog>
-                </el-dialog>
+                </el-dialog> -->
             </el-form>
         </popup>
 
@@ -243,15 +234,15 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
-    bidding_decision_id: '',
-    applier: '',
-    pay_type: '',
-    refund_date: "",
-    remark: "",
-    annex: [],
-    deposit_bank: "",
-    account_name: "",
-    account: ""
+    "bidding_decision_id": '',
+    "applier": "",
+    "pay_type": '',
+    "refund_date": "",
+    "remark": "",
+    "annex": "",
+    "deposit_bank": "",
+    "account_name": "",
+    "account": ""
 })
 
 
diff --git a/src/views/bidbbond/index.vue b/src/views/bidbbond/index.vue
index 7b67d2f..abae9a1 100644
--- a/src/views/bidbbond/index.vue
+++ b/src/views/bidbbond/index.vue
@@ -35,8 +35,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="" show-overflow-tooltip />
-                    <el-table-column label="流程编号" prop="security_apply_code" show-overflow-tooltip />
+                    <el-table-column label="投标编号" prop="security_apply_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="bidding_time" show-overflow-tooltip />
@@ -46,7 +45,6 @@
                     <el-table-column label="已退金额" prop="has_refund_amount" show-overflow-tooltip />
                     <el-table-column label="未退金额" prop="not_refund_amount" show-overflow-tooltip />
                     <el-table-column label="创建日期" prop="create_time" show-overflow-tooltip />
-
                     <el-table-column label="操作" width="150" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['refund.refund/edit']" type="primary" link @click="handleEdit(row)">
diff --git a/src/views/finance_payment_apply/detail.vue b/src/views/finance_payment_apply/detail.vue
index 6aad2a9..3e9b507 100644
--- a/src/views/finance_payment_apply/detail.vue
+++ b/src/views/finance_payment_apply/detail.vue
@@ -5,105 +5,148 @@
             <el-form ref="formRef" :model="formData" label-width="160px">
                 <el-card class="mb-2">
                     <el-row>
-                        <el-col :span="8">
-                            <el-form-item label="合同编号">
-                                {{ formData.contract ? formData.contract.contract_no : '暂无数据' }}
+
+                        <el-col :span="12">
+                            <el-form-item label="供应商名称">
+                                {{ formData.supplier_name }}
                             </el-form-item>
                         </el-col>
-
-
-                        <el-col :span="8">
+                        <el-col :span="12">
+                            <el-form-item label="供应商编码">
+                                {{ formData.supplier_code }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="合同名称">
+                                {{ formData.contract_name }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="合同编码">
+                                {{ formData.contract_no }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
                             <el-form-item label="项目名称">
-                                {{ formData.project ? formData.project.name : '暂无数据'
-                                }}
+                                {{ formData.project_name }}
                             </el-form-item>
                         </el-col>
-
-                        <el-col :span="8">
+                        <el-col :span="12">
                             <el-form-item label="项目编码">
-                                {{ formData.project.project_code
+                                {{ formData.project_code }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="合同类型">
+                                {{ formData.contract_type_text
                                 }}
                             </el-form-item>
                         </el-col>
-
-                        <!-- <el-col :span="8">
-                            <el-fgoorm-item label="供应商名称">
-                                {{ formData.custom.name
-                                }}
-                            </el-fgoorm-item>
-                        </el-col> -->
-                        <el-col :span="8">
+                        <el-col :span="12">
+                            <el-form-item label="付款单号">
+                                {{ formData.payment_apply_code }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
                             <el-form-item label="付款日期">
-                                {{ formData.pay_date
-                                }}
+                                {{ formData.pay_date }}
                             </el-form-item>
                         </el-col>
-
-                        <el-col :span="8">
-                            <el-form-item label="期次">
+                        <el-col :span="12">
+                            <el-form-item label="付款金额">
                                 {{ formData.amount }}
                             </el-form-item>
                         </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="付款性质">
-                                <dict-value :options="dictData.payment_natrue" :value="formData.payment_natrue" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
+                        <el-col :span="12">
                             <el-form-item label="付款方式">
-                                <dict-value :options="dictData.pay_type" :value="formData.pay_type" />
+                                {{ formData.pay_type_text }}
                             </el-form-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="12">
+                            <el-form-item label="付款性质">
+                                {{ formData.payment_nature_text }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="期次">
+                                {{ formData.period }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
                             <el-form-item label="申请人">
-                                {{ formData.applier }}
+                                {{ formData.apply_user }}
                             </el-form-item>
                         </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="开票状态">
-                                <dict-value :options="dictData.invoice_status" :value="formData.invoice_status" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="本次申请金额">
-                                {{ formData.amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="金额大写">
-                                {{ formData.amount_daxie }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="8">
-                            <el-form-item label="开户名称">
-                                {{ formData.account_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="账号">
-                                {{ formData.account }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="开户银行">
-                                {{ formData.bank }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="8">
+                        <el-col :span="12">
                             <el-form-item label="备注">
                                 {{ formData.remark }}
                             </el-form-item>
                         </el-col>
-
-
-
-
+                        <el-col :span="12">
+                            <el-form-item label="附件">
+                                <!-- {{ formData.remark }} -->
+                                <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
+                                        target="_blank">文件 {{ index + 1 }}</a>
+                                </div>
+                            </el-form-item>
+                        </el-col>
                     </el-row>
                 </el-card>
+
+                <el-card>
+                    <template #header>
+                        <div class="card-header">
+                            <span>收款人信息</span>
+                        </div>
+                    </template>
+                    <el-row>
+                        <el-col :span="12">
+                            <el-form-item label="收款开户银行">
+                                {{ formData.payee_bank }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="收款开户名称">
+                                {{ formData.payee_account_name }}
+                            </el-form-item>
+                        </el-col><el-col :span="12">
+                            <el-form-item label="收款账号">
+                                {{ formData.payee_account }}
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-card>
+                <el-card>
+                    <template #header>
+                        <div class="card-header">
+                            <span>付款银行信息</span>
+                        </div>
+                    </template>
+                    <el-row>
+                        <el-col :span="12">
+                            <el-form-item label="账户编码">
+                                {{ formData.bank_account_info?.account_sn }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="开户银行">
+                                {{ formData.bank_account_info?.deposit_bank }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="开户名称">
+                                {{ formData.bank_account_info?.account_name }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="开户账号">
+                                {{ formData.bank_account_info?.account }}
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-card>
+
             </el-form>
         </popup>
     </div>
@@ -125,27 +168,18 @@ defineProps({
 const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
-
 const datas = reactive({
     provinceOptions: [],
     cityOptions: [],
     areaOptions: [],
 });
 
-
 // 表单数据
 const formData = reactive({
-
 })
-
-
-
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     Object.assign(formData, data)
-
-
-
 }
 
 const getDetail = async (formData: Record<string, any>) => {
@@ -164,7 +198,6 @@ const handleSubmit = async () => {
 
 //打开弹窗
 const open = () => {
-    console.log('1111111')
     popupRef.value?.open()
 }
 
diff --git a/src/views/finance_payment_apply/edit.vue b/src/views/finance_payment_apply/edit.vue
index e10648e..0b8597c 100644
--- a/src/views/finance_payment_apply/edit.vue
+++ b/src/views/finance_payment_apply/edit.vue
@@ -25,8 +25,9 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="合同类型" prop="contract_cate">
-                            <el-select v-model="formData.contract_cate" placeholder="请选择">
+                        <el-form-item label="合同类型" prop="contract_cate"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-select v-model="formData.contract_cate" placeholder="请选择" @change="resetFormData">
                                 <el-option label="采购合同" :value="1"></el-option>
                                 <el-option label="分包合同" :value="2"></el-option>
                             </el-select>
@@ -65,14 +66,16 @@
                         <el-button @click="showDialog2 = true" type="primary">选择待付款计划</el-button>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="付款日期" prop="pay_date">
+                        <el-form-item label="付款日期" prop="pay_date"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-date-picker class="flex-1 !flex" v-model="formData.pay_date" clearable
                                 value-format="YYYY-MM-DD " placeholder="选择日期">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="付款性质" prop="payment_nature">
+                        <el-form-item label="付款性质" prop="payment_nature"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-select class="flex-1" v-model="formData.payment_nature" clearable placeholder="请选择付款性质">
                                 <el-option v-for="(item, index) in dictData.payment_natrue" :key="index" :label="item.name"
                                     :value="parseInt(item.value)" />
@@ -80,7 +83,8 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="付款方式" prop="pay_type">
+                        <el-form-item label="付款方式" prop="pay_type"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-select class="flex-1" v-model="formData.pay_type" clearable placeholder="请选择付款方式">
                                 <el-option v-for="(item, index) in dictData.pay_type" :key="index" :label="item.name"
                                     :value="parseInt(item.value)" />
@@ -88,13 +92,14 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="申请人" prop="applier">
-                            <el-input v-model="formData.applier" readonly clearable placeholder="请输入申请人" />
+                        <el-form-item label="申请人" prop="apply_user">
+                            <el-input v-model="formData.apply_user" clearable placeholder="请输入申请人" />
 
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="开票状态" prop="contacts">
+                        <el-form-item label="开票状态" prop="invoice_status"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-select class="flex-1" v-model="formData.invoice_status" clearable placeholder="请选择开票状态">
                                 <el-option v-for="(item, index) in dictData.invoice_status" :key="index" :label="item.name"
                                     :value="parseInt(item.value)" />
@@ -102,7 +107,8 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="本次申请金额" prop="amount">
+                        <el-form-item label="本次申请金额" prop="amount"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.amount" @input="amountinput" clearable placeholder="请输入本次申请金额" />
                         </el-form-item>
                     </el-col>
@@ -145,62 +151,75 @@
 
                     </el-col>
                 </el-row>
-                <div style="margin: 20px 0;">收款人信息</div>
+                <div style="margin: 20px 0;">客户收款信息</div>
+
                 <el-row :gutter="10">
                     <el-col :span="8">
-                        <el-form-item label="开户银行" prop="bank" @click="showDialog3 = true">
-                            <el-input v-model="formData.payee_bank" clearable placeholder="请输入开户银行" />
+                        <el-form-item label="收款开户银行" prop="payee_bank"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="formData.payee_bank" clearable placeholder="请输入收款账号" />
                         </el-form-item>
                     </el-col>
-
                     <el-col :span="8">
-                        <el-form-item label="开户名称" prop="payee_bank">
-                            <el-input v-model="formData.payee_account_name" clearable placeholder="请输入开户名称" />
+                        <el-form-item label="收款开户银行名称" prop="payee_account_name"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="formData.payee_account_name" clearable placeholder="请输入收款开户银行名称" />
                         </el-form-item>
-
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="账号" prop="payee_account">
-                            <el-input v-model="formData.payee_account" clearable placeholder="请输入账号" />
+                        <el-form-item label="收款账号" prop="payee_account"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="formData.payee_account" clearable placeholder="请输入收款账号" />
                         </el-form-item>
                     </el-col>
                 </el-row>
 
-
-                <!-- <el-input v-model="formData.desc" type="textarea" clearable placeholder="请输入备注" /> -->
-
-                <!-- <div>付款人信息</div>
+                <div style="margin: 20px 0;">付款银行信息</div>
                 <el-row :gutter="10">
                     <el-col :span="8">
-                        <el-form-item label="开户银行" prop="bank" @click="showDialog3 = true">
-                            <el-input v-model="formData.bank" clearable placeholder="请输入开户银行" />
+                        <el-form-item label="账户编码" prop="bank_account_info"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="formData.bank_account_info.account_sn" @click="showDialog4 = true" readonly
+                                clearable placeholder="请输入收款账号" />
                         </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="开户名称" prop="payee_bank">
-                            <el-input v-model="formData.payee_bank" clearable placeholder="请输入开户名称" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="账号" prop="payee_account">
-                            <el-input v-model="formData.payee_account" clearable placeholder="请输入账号" />
-                        </el-form-item>
-                    </el-col>
-                </el-row> -->
 
+                    </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="开户银行" prop="collection_bank">
+                            <el-input v-model="formData.bank_account_info.deposit_bank" clearable readonly
+                                placeholder="请输入收款银行" />
+                        </el-form-item>
+
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="开户名称" prop="collection_bank">
+                            <el-input v-model="formData.bank_account_info.account_name" clearable readonly
+                                placeholder="请输入收款银行" />
+                        </el-form-item>
+
+                    </el-col> <el-col :span="8">
+                        <el-form-item label="开户账号" prop="collection_bank">
+                            <el-input v-model="formData.bank_account_info.account" clearable readonly
+                                placeholder="请输入收款银行" />
+                        </el-form-item>
+
+                    </el-col>
+
+                </el-row>
                 <el-dialog v-model="showDialog" title="选择供应商" width="70%">
                     <suppliertable @customEvent="customEvent"></suppliertable>
                 </el-dialog>
-                <div v-if="formData.contract_cate == 1">
+                <div v-if="formData.contract_cate == 1 && showDialog1">
                     <el-dialog v-model="showDialog1" title="选择采购合同" width="70%">
-                        <subcontractingDialog @customEvent="customEvent1">
+                        <subcontractingDialog @customEvent="customEvent1" :supplier_id="formData.supplier_id">
                         </subcontractingDialog>
                     </el-dialog>
                 </div>
 
-                <div v-if="formData.contract_cate == 2">
+                <div v-if="formData.contract_cate == 2 && showDialog1">
                     <el-dialog v-model="showDialog1" title="选择分包合同" width="70%">
-                        <subcontracting @customEvent="customEvent1">
+                        <subcontracting @customEvent="customEvent1" :supplier_id="formData.supplier_id">
                         </subcontracting>
                     </el-dialog>
                 </div>
@@ -213,6 +232,7 @@
                 <el-dialog v-model="showDialog3" title="选择收款人信息" width="70%">
                     <bankaccountDialog @customEvent="customEvent3"></bankaccountDialog>
                 </el-dialog>
+
                 <el-dialog v-model="showDialog4" title="选择付款银行" width="70%">
                     <bankaccountDialog @customEvent="customEvent4"></bankaccountDialog>
                 </el-dialog>
@@ -228,9 +248,14 @@ import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 // import procurementDialog from '@/components/procurement/index.vue'
 import suppliertable from '@/components/supplier/index.vue'
+
+
 import subcontractingDialog from '@/components/procurementsubcontracting_selector/index.vue'
-import paylistDialog from '@/components/paylist/index.vue'
 import subcontracting from '@/components/procurementsubcontracting_selector/subcontracting.vue'
+
+
+
+import paylistDialog from '@/components/paylist/index.vue'
 const active = ref(0)
 import bankaccountDialog from '@/components/bankaccount/index.vue'
 import { paymentapplyAdd, paymentapplyEdit, paymentapplyDetail } from '@/api/paymentrequest'
@@ -281,19 +306,11 @@ const checkPhone = (rule: any, value: any, callback: (arg0: Error) => any) => {
 
 }
 const userEmail = (rule: any, value: string, callback: (arg0: Error | undefined) => void) => {
-
-    // const mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/
-    // // if (!value) {
-    // //     return callback(new Error('邮箱不能为空'))
-    // // }
-
-
     if (value && !mailReg.test(value)) {
         callback(new Error('请输入正确的邮箱格式'))
     } else {
         callback()
     }
-
 };
 // 删除上传的文件
 const delFileFn = (index: number) => {
@@ -318,9 +335,9 @@ const showDialog4 = ref(false)
 
 const customEvent = (e: any) => {
     formData.supplier_id = e.id;
-
     supplier_code.value = e.supplier_code
     supplier_name.value = e.supplier_name
+    resetFormData()
     showDialog.value = false;
 };
 const customEvent1 = (e: any) => {
@@ -350,10 +367,21 @@ const customEvent3 = (e: any) => {
     showDialog3.value = false
 };
 const customEvent4 = (e: any) => {
-    formData.bank_account_id = e.id
-    formData.bank_account_name = e.deposit_bank
+    formData.bank_account_id = e.id;
+    formData.bank_account_info.account_sn = e.account_sn
+    formData.bank_account_info.deposit_bank = e.deposit_bank
+    formData.bank_account_info.account_name = e.account_name
+    formData.bank_account_info.account = e.account
     showDialog4.value = false
 };
+const resetFormData = () => {
+    project_name.value = ""
+    project_code.value = ''
+    contract_no.value = ""
+    contract_name.value = ''
+    formData.period = ""
+}
+
 //监听输入
 const amountinput = (e) => {
     // console.log(e)
@@ -369,23 +397,30 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: "",
-    "supplier_id": 0,
-    "contract_cate": 0,
-    "contract_id": 0,
-    "finance_payment_plan_id": 0,
-    "pay_date": "string",
-    "payment_nature": 0,
-    "pay_type": 0,
-    "apply_user": "string",
-    "invoice_status": 0,
-    "amount": 0,
-    "desc": "string",
-    "remark": "string",
-    "annex": "string",
-    "payee_bank": "string",
-    "payee_account_name": "string",
-    "payee_account": "string",
-    "bank_account_id": 0
+    "supplier_id": '',
+    "contract_cate": '',
+    "contract_id": '',
+    "finance_payment_plan_id": '',
+    "pay_date": "",
+    "payment_nature": '',
+    "pay_type": '',
+    period: "",
+    "apply_user": "",
+    "invoice_status": '',
+    "amount": '',
+    "desc": "",
+    "remark": "",
+    "annex": [],
+    "payee_bank": "",
+    "payee_account_name": "",
+    "payee_account": "",
+    "bank_account_id": '',
+    "bank_account_info": {
+        "account_sn": "",
+        "deposit_bank": "",
+        "account_name": "",
+        "account": ""
+    }
 })
 
 
@@ -397,6 +432,7 @@ const formRules = reactive<any>({
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
+    console.log(data, "data")
     if (data.annex && data.annex.length > 0) {
 
         const arry1 = data.annex.map((item: any, index: any) => {
@@ -417,11 +453,13 @@ const setFormData = async (data: Record<any, any>) => {
         }
     }
 
-    project_name.value = data.project.name
-    project_code.value = data.project.project_code
-
-    contract_name.value = data.contract.contract_name;
-    contract_no.value = data.contract.contract_no
+    project_name.value = data.project_name
+    project_code.value = data.project_code
+    contract_name.value = data.contract_name;
+    contract_no.value = data.contract_no
+    supplier_name.value = data.supplier_name
+    supplier_code.value = data.supplier_code
+    formData.amount_daxie = toChinesNum(formData.amount)
 
 
 
diff --git a/src/views/finance_payment_apply/index.vue b/src/views/finance_payment_apply/index.vue
index 59010c2..2bbc4e3 100644
--- a/src/views/finance_payment_apply/index.vue
+++ b/src/views/finance_payment_apply/index.vue
@@ -52,21 +52,20 @@
                     <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="supplier_na" show-overflow-tooltip />
+                    <el-table-column label="付款单号" prop="payment_apply_code" show-overflow-tooltip />
+                    <el-table-column label="供应商名称" prop="supplier_name" 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="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 }">
-                            <dict-value :options="dictData.pay_type" :value="row.pay_type" />
+                            {{ row.pay_type_text }}
                         </template>
                     </el-table-column>
                     <el-table-column label="付款性质" prop="payment_natrue" show-overflow-tooltip>
                         <template #default="{ row }">
-                            <dict-value :options="dictData.payment_natrue" :value="row.payment_natrue" />
+                            {{ row.payment_nature_text }}
                         </template>
                     </el-table-column>
                     <el-table-column label="期次" prop="period" show-overflow-tooltip>
@@ -74,7 +73,7 @@
                             <dict-value :options="dictData.pay_period" :value="row.period" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="申请人" prop="applier" 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">
                         <template #default="{ row }">
@@ -156,7 +155,6 @@ const handleAdd = async () => {
 
 // 编辑
 const handleEdit = async (data: any) => {
-    console.log(data.id)
     let res = await paymentapplyDetail({ id: data.id })
     showEdit.value = true
     await nextTick()
diff --git a/src/views/finance_payment_plan/detail.vue b/src/views/finance_payment_plan/detail.vue
index 62c1b12..6403753 100644
--- a/src/views/finance_payment_plan/detail.vue
+++ b/src/views/finance_payment_plan/detail.vue
@@ -6,31 +6,45 @@
                 <el-card class="mb-2">
                     <el-row>
                         <el-col :span="12">
-                            <el-form-item label="合同编号">
-                                {{ formData.contract ? formData.contract.contract_no : '暂无数据' }}
+                            <el-form-item label="供应商名称">
+                                {{ formData.supplier_name }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="供应商编码">
+                                {{ formData.supplier_code }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="合同名称">
+                                {{ formData.contract_name }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="合同编码">
+                                {{ formData.contract_no }}
                             </el-form-item>
                         </el-col>
-
-
                         <el-col :span="12">
                             <el-form-item label="项目名称">
-                                {{ formData.project ? formData.project.name : '暂无数据'
-                                }}
+                                {{ formData.project_name }}
                             </el-form-item>
                         </el-col>
-
                         <el-col :span="12">
                             <el-form-item label="项目编码">
-                                {{ formData.project?.project_code || formData.project_code
+                                {{ formData.project_code }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="合同类型">
+                                {{ formData.contract_type_text
                                 }}
                             </el-form-item>
                         </el-col>
 
-
                         <el-col :span="12">
                             <el-form-item label="计划付款日期">
-                                {{ formData.pay_date
-                                }}
+                                {{ formData.pay_date }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
@@ -38,32 +52,27 @@
                                 {{ formData.amount }}
                             </el-form-item>
                         </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="金额大写">
-                                {{ formData.foreign_currency_remark
-                                }}
-                            </el-form-item>
-                        </el-col>
                         <el-col :span="12">
                             <el-form-item label="状态">
-                                <dict-value :options="dictData.pay_status" :value="formData.status" />
+                                {{ formData.status_text }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="期次">
-                                <dict-value :options="dictData.pay_period" :value="formData.period" />
+                                {{ formData.period_text }}
                             </el-form-item>
                         </el-col>
 
-
                         <el-col :span="12">
-                            <el-form-item label="备注">
-                                {{ formData.remark
-                                }}
+                            <el-form-item label="外币备注">
+                                {{ formData.foreign_currency_remark }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="备注">
+                                {{ formData.remark }}
                             </el-form-item>
                         </el-col>
-
-
                         <el-col :span="12">
                             <el-form-item label="附件">
                                 <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
diff --git a/src/views/finance_payment_plan/edit.vue b/src/views/finance_payment_plan/edit.vue
index 940d705..ed895c0 100644
--- a/src/views/finance_payment_plan/edit.vue
+++ b/src/views/finance_payment_plan/edit.vue
@@ -19,7 +19,7 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="合同类型" prop="contract_cate">
-                            <el-select v-model="formData.contract_cate" placeholder="请选择">
+                            <el-select v-model="formData.contract_cate" placeholder="请选择" @change="resetFormData">
                                 <el-option label="采购合同" :value="1"></el-option>
                                 <el-option label="分包合同" :value="2"></el-option>
                             </el-select>
@@ -27,10 +27,19 @@
                         </el-form-item>
                     </el-col>
 
-
                     <el-col :span="8">
-                        <el-form-item label="项目名称" prop="contract_id" @click="showDialog1 = true">
-                            <el-input v-model="project_name" clearable placeholder="请选择项目" />
+                        <el-form-item label="合同名称" prop="contract_no">
+                            <el-input v-model="contract_name" readonly @click="showDialog1 = true" placeholder="点击选择" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="合同编号" prop="contract_no">
+                            <el-input v-model="contract_no" clearable disabled placeholder="系统自动填写" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目名称" prop="contract_id">
+                            <el-input v-model="project_name" clearable disabled placeholder="请选择项目" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -39,11 +48,6 @@
                         </el-form-item>
                     </el-col>
 
-                    <el-col :span="8">
-                        <el-form-item label="合同编号" prop="contract_no">
-                            <el-input v-model="contract_no" clearable disabled placeholder="系统自动填写" />
-                        </el-form-item>
-                    </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="计划付款日期" prop="pay_date">
@@ -116,16 +120,16 @@
                 <el-dialog v-model="showDialog" title="选择供应商" width="70%">
                     <supplier @customEvent="customEvent"></supplier>
                 </el-dialog>
-                <div v-if="formData.contract_cate == 1">
+                <div v-if="formData.contract_cate == 1 && showDialog1">
                     <el-dialog v-model="showDialog1" title="选择采购合同" width="70%">
-                        <subcontractingDialog @customEvent="customEvent1">
+                        <subcontractingDialog @customEvent="customEvent1" :supplier_id="formData.supplier_id">
                         </subcontractingDialog>
                     </el-dialog>
                 </div>
 
-                <div v-if="formData.contract_cate == 2">
+                <div v-if="formData.contract_cate == 2 && showDialog1">
                     <el-dialog v-model="showDialog1" title="选择分包合同" width="70%">
-                        <subcontracting @customEvent="customEvent1">
+                        <subcontracting @customEvent="customEvent1" :supplier_id="formData.supplier_id">
                         </subcontracting>
                     </el-dialog>
                 </div>
@@ -224,6 +228,7 @@ const customEvent = (e: any) => {
     formData.supplier_id = e.id;
     supplier_name.value = e.supplier_name;
     supplier_code.value = e.supplier_code;
+    resetFormData()
     showDialog.value = false;
 };
 const customEvent1 = (e: any) => {
@@ -232,9 +237,15 @@ const customEvent1 = (e: any) => {
     project_code.value = e.project_code;
     contract_name.value = e.contract_name;
     contract_no.value = e.contract_no
+
     showDialog1.value = false;
 };
-
+const resetFormData = () => {
+    project_name.value = ""
+    project_code.value = ''
+    contract_no.value = ""
+    contract_name.value = ''
+}
 
 
 //监听输入
@@ -249,6 +260,8 @@ const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑付款计划表' : '新增付款计划表'
 })
 
+
+
 // 表单数据
 const formData = reactive({
     id: '',
@@ -273,13 +286,7 @@ const formRules = reactive<any>({
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
-
-
-
-
-
-
-
+    console.log(data)
     if (data.annex && data.annex.length > 0) {
 
         const arry1 = data.annex.map((item: any, index: any) => {
@@ -292,7 +299,6 @@ const setFormData = async (data: Record<any, any>) => {
 
     }
 
-
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
             //@ts-ignore
@@ -308,7 +314,6 @@ const setFormData = async (data: Record<any, any>) => {
     supplier_code.value = data.supplier_code;
     supplier_name.value = data.supplier_name;
     // supplier_code
-    console.log(supplier_name.value, data)
 
 }
 const getDetail = async (row: Record<string, any>) => {
@@ -324,11 +329,7 @@ const handleSubmit = async () => {
     if (formDataannex.length > 0) {
         formData.annex = formDataannex.map((item: any) => item.uri)
     }
-
-    console.log(formRef.value?.validate(), '22222222')
     await formRef.value?.validate()
-
-
     const data = { ...formData }
     mode.value == 'edit'
         ? await paymentplanEdit(data)
diff --git a/src/views/finance_payment_plan/index.vue b/src/views/finance_payment_plan/index.vue
index fbe4f4b..1e9046e 100644
--- a/src/views/finance_payment_plan/index.vue
+++ b/src/views/finance_payment_plan/index.vue
@@ -5,14 +5,16 @@
 
                 <el-form-item label="合同" prop="contract_id">
                     <el-select class="flex-1" v-model="queryParams.contract_id" clearable placeholder="请选择合同">
-                        <el-option v-for="(item, index) in list" :key="index" :label="item.contract_name" :value="parseInt(item.id)" />
+                        <el-option v-for="(item, index) in list" :key="index" :label="item.contract_name"
+                            :value="parseInt(item.id)" />
                     </el-select>
 
                 </el-form-item>
 
                 <el-form-item label="供应商" prop="supplier_id">
                     <el-select class="flex-1" v-model="queryParams.contract_id" clearable placeholder="请选择合同">
-                        <el-option v-for="(item, index) in list" :key="index" :label="item.contract_name" :value="parseInt(item.id)" />
+                        <el-option v-for="(item, index) in list" :key="index" :label="item.contract_name"
+                            :value="parseInt(item.id)" />
                     </el-select>
                 </el-form-item>
 
@@ -55,8 +57,8 @@
                             <dict-value :options="dictData.pay_status" :value="row.status" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="已付款" prop="refunder" show-overflow-tooltip />
-                    <el-table-column label="未付款" prop="refunder" 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 />
                     <el-table-column label="操作" width="150" fixed="right">
                         <template #default="{ row }">
diff --git a/src/views/finance_receipt_record/detail.vue b/src/views/finance_receipt_record/detail.vue
index 1d19c2e..26189cd 100644
--- a/src/views/finance_receipt_record/detail.vue
+++ b/src/views/finance_receipt_record/detail.vue
@@ -5,57 +5,55 @@
             <el-form ref="formRef" :model="formData" label-width="160px">
                 <el-card class="mb-2">
                     <el-row>
+
+                        <el-col :span="12">
+                            <el-form-item label="供应商名称">
+                                {{ formData.supplier_name }}
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="供应商编码">
+                                {{ formData.supplier_code }}
+                            </el-form-item>
+                        </el-col>
+
                         <el-col :span="12">
                             <el-form-item label="合同编号">
-                                {{ formData.contract ? formData.contract.contract_no : '暂无数据' }}
+                                {{ formData.contract_no }}
                             </el-form-item>
                         </el-col>
-
-
                         <el-col :span="12">
                             <el-form-item label="合同名称">
-                                {{ formData.contract ? formData.contract.contract_name : '暂无数据'
-                                }}
+                                {{ formData.contract_name }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="项目名称">
+                                {{ formData.project_name }}
                             </el-form-item>
                         </el-col>
-
                         <el-col :span="12">
                             <el-form-item label="项目编码">
-                                {{ formData.project?.project_code || formData.project_code
-                                }}
+                                {{ formData.project_code }}
                             </el-form-item>
                         </el-col>
 
-                        <!-- <el-col :span="12">
-                            <el-form-item label="供应商名称">
-                                {{ formData.custom.name
-                                }}
+
+                        <el-col :span="12">
+                            <el-form-item label="收票日期">
+                                {{ formData.receipt_date }}
                             </el-form-item>
-                        </el-col> -->
+                        </el-col>
+
                         <el-col :span="12">
                             <el-form-item label="开票日期">
-                                {{ formData.invoicing_date
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="提交人">
-                                {{ formData.commitor }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="金额大写">
-                                {{ formData.invoice_amount_daxie }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="发票类型">
-                                <dict-value :options="dictData.invoice_type" :value="formData.invoice_type" />
+                                {{ formData.invoicing_date }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="发票编号">
-                                {{ formData.invoice_sn }}
+                                {{ formData.invoice_no }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
@@ -63,33 +61,34 @@
                                 {{ formData.invoice_amount }}
                             </el-form-item>
                         </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="发票税率">
-                                {{ formData.invoice_tax_rate }}
-                            </el-form-item>
-                        </el-col>
 
-
-                        <el-col :span="12">
-                            <el-form-item label="税额">
-                                {{ formData.tax
-                                }}
-                            </el-form-item>
-                        </el-col>
                         <el-col :span="12">
                             <el-form-item label="不含税金额">
-                                {{ formData.amount_excluding_tax
-                                }}
+                                {{ formData.amount_excluding_tax }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="税额">
+                                {{ formData.tax_amount }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="提交人">
+                                {{ formData.commitor }}
                             </el-form-item>
                         </el-col>
 
                         <el-col :span="12">
-                            <el-form-item label="收票日期">
-                                {{ formData.receipt_date
-                                }}
+                            <el-form-item label="发票类型">
+                                {{ formData.invoice_type_text }}
                             </el-form-item>
                         </el-col>
-                        <el-col :span="24">
+                        <el-col :span="12">
+                            <el-form-item label="备注">
+                                {{ formData.remark }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
                             <el-form-item label="附件">
                                 <div>
                                     <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
diff --git a/src/views/finance_receipt_record/edit.vue b/src/views/finance_receipt_record/edit.vue
index 3f71f71..24077dc 100644
--- a/src/views/finance_receipt_record/edit.vue
+++ b/src/views/finance_receipt_record/edit.vue
@@ -18,33 +18,30 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="合同类型" prop="contract_cate">
-                            <el-select v-model="formData.contract_cate" placeholder="请选择">
+                            <el-select v-model="formData.contract_cate" placeholder="请选择" @change="resetFormData">
                                 <el-option label="采购合同" :value="1"></el-option>
                                 <el-option label="分包合同" :value="2"></el-option>
                             </el-select>
-
                         </el-form-item>
                     </el-col>
-
-                    <el-col :span="8">
-                        <el-form-item label="项目名称" prop="contract_id" @click="showDialog1 = true">
-                            <el-input v-model="project_name" clearable placeholder="请选择项目" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="项目编码" prop="contract_id">
-                            <el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
-                        </el-form-item>
-                    </el-col>
-
                     <el-col :span="8">
                         <el-form-item label="合同编号" prop="contract_no">
                             <el-input v-model="contract_no" clearable disabled placeholder="系统自动填写" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="合同名称" prop="contract_name">
-                            <el-input v-model="contract_name" clearable disabled placeholder="系统自动填写" />
+                        <el-form-item label="合同名称" prop="contract_id" @click="showDialog1 = true">
+                            <el-input v-model="contract_name" clearable placeholder="请选择项目" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目名称" prop="contract_name">
+                            <el-input v-model="project_name" clearable disabled placeholder="系统自动填写" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目编码" prop="contract_id">
+                            <el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -56,7 +53,7 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="提交人" prop="commitor">
-                            <el-input v-model="formData.commitor" readonly clearable placeholder="请输入提交人" />
+                            <el-input v-model="formData.commitor" clearable placeholder="请输入提交人" />
 
                         </el-form-item>
                     </el-col>
@@ -92,7 +89,7 @@
 
                     <el-col :span="8">
                         <el-form-item label="发票税率" prop="invoice_tax_rate">
-                            <el-select v-model="formData.invoice_tax_rate" placeholder="请选择">
+                            <el-select v-model="formData.invoice_tax_rate" placeholder="请选择" @change="amountinput">
                                 <el-option :label="item.name" :value="item.value"
                                     v-for="item in dictData.tax_rate"></el-option>
                             </el-select>
@@ -103,21 +100,20 @@
 
                     <el-col :span="8">
                         <el-form-item label="税额" prop="tax" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="formData.tax" clearable placeholder="请输入税额" />
+                            <el-input v-model="formData.tax" disabled clearable placeholder="请输入税额" />
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="不含税金额" prop="amount_excluding_tax"
                             :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="formData.amount_excluding_tax" clearable placeholder="请输入不含税金额" />
+                            <el-input v-model="formData.amount_excluding_tax" clearable disabled placeholder="请输入不含税金额" />
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="收票日期" prop="receipt_date"
                             :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
-                            <!-- <el-input v-model="formData.receipt_date" clearable placeholder="请输入收票日期" /> -->
                             <el-date-picker class="flex-1 !flex" v-model="formData.receipt_date" clearable
                                 value-format="YYYY-MM-DD" placeholder="选择收票日期">
                             </el-date-picker>
@@ -158,16 +154,16 @@
                     <suppliertable @customEvent="customEvent"></suppliertable>
                 </el-dialog>
 
-                <div v-if="formData.contract_cate == 1">
+                <div v-if="formData.contract_cate == 1 && showDialog1">
                     <el-dialog v-model="showDialog1" title="选择采购合同" width="70%">
-                        <subcontractingDialog @customEvent="customEvent1">
+                        <subcontractingDialog @customEvent="customEvent1" :supplier_id="formData.supplier_id">
                         </subcontractingDialog>
                     </el-dialog>
                 </div>
 
-                <div v-if="formData.contract_cate == 2">
+                <div v-if="formData.contract_cate == 2 && showDialog1">
                     <el-dialog v-model="showDialog1" title="选择分包合同" width="70%">
-                        <subcontracting @customEvent="customEvent1">
+                        <subcontracting @customEvent="customEvent1" :supplier_id="formData.supplier_id">
                         </subcontracting>
                     </el-dialog>
 
@@ -186,9 +182,6 @@ import Popup from '@/components/popup/index.vue'
 import suppliertable from '@/components/supplier/index.vue'
 import subcontractingDialog from '@/components/procurementsubcontracting_selector/index.vue'
 import subcontracting from '@/components/procurementsubcontracting_selector/subcontracting.vue'
-
-
-
 import { apifinancereceiptAdd, apifinancereceiptEdit, apifinancereceiptDetail } from '@/api/receiptrecord'
 import { toChinesNum } from "@/utils/util";
 import { getAllProjectTypes } from '@/api/projecttype'
@@ -233,22 +226,14 @@ const handleAvatarSuccess_four = (
 };
 //验证
 const checkPhone = (rule: any, value: any, callback: (arg0: Error) => any) => {
-
     if (value && !/^1\d{10}$/.test(value)) {
         callback(new Error('请输入正确的手机号码'));
     } else {
         callback()
     }
-
 }
 const userEmail = (rule: any, value: string, callback: (arg0: Error | undefined) => void) => {
 
-    // const mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/
-    // // if (!value) {
-    // //     return callback(new Error('邮箱不能为空'))
-    // // }
-
-
     if (value && !mailReg.test(value)) {
         callback(new Error('请输入正确的邮箱格式'))
     } else {
@@ -260,7 +245,7 @@ const userEmail = (rule: any, value: string, callback: (arg0: Error | undefined)
 const delFileFn = (index: number) => {
     formDataannex.splice(index, 1)
 }
-defineProps({
+const props = defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
         default: () => ({})
@@ -274,10 +259,17 @@ const amount_daxie = ref('')
 const showDialog = ref(false)
 const showDialog1 = ref(false)
 
+const resetFormData = () => {
+    project_name.value = ""
+    project_code.value = ''
+    contract_no.value = ""
+    contract_name.value = ''
+}
 const customEvent = (e: any) => {
     formData.supplier_id = e.id;
     supplier_code.value = e.supplier_code
     supplier_name.value = e.supplier_name
+    resetFormData()
     showDialog.value = false;
 };
 const customEvent1 = (e: any) => {
@@ -289,15 +281,20 @@ const customEvent1 = (e: any) => {
     showDialog1.value = false;
 };
 
-
+//获取税率Name
+const getTaxValue = (value) => {
+    let i = props.dictData.tax_rate.findIndex((item) => item.value == value)
+    return (props.dictData.tax_rate[i]?.name / 100) || 0
+}
 
 //监听输入
 const amountinput = (e) => {
-    // console.log(e)
-    if (e && e > 0) {
-        formData.invoice_amount_daxie = toChinesNum(e)
-    }
+    formData.tax = formData.invoice_amount * getTaxValue(formData.invoice_tax_rate)
+    formData.amount_excluding_tax = formData.invoice_amount - formData.tax
+    formData.invoice_amount_daxie = toChinesNum(formData.invoice_amount)
 }
+
+
 // 弹窗标题
 const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑收票记录表' : '新增收票记录表'
@@ -306,8 +303,8 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
-    supplier_id: 1,
-    contract_id: 1,
+    supplier_id: '',
+    contract_id: '',
     invoicing_date: "",
     commitor: '',
     invoice_type: '',
@@ -333,7 +330,6 @@ const formRules = reactive<any>({
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     if (data.return_desc && data.return_desc.length > 0) {
-
         const arry1 = data.return_desc.map((item: any, index: any) => {
             return {
                 name: `文件${index + 1}`,
@@ -341,26 +337,23 @@ const setFormData = async (data: Record<any, any>) => {
             };
         });
         Object.assign(formDataannex, arry1)
-
-
     }
     if (data.invoice_amount_daxie) {
         toChinesNum(data.invoice_amount_daxie)
     }
-
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
             //@ts-ignore
             formData[key] = data[key]
         }
     }
-    supplier_name.value = data.custom.name
-    project_name.value = data.project.name
-    project_code.value = data.project.project_code
-    project_amount.value = data.contract.amount
-    contract_name.value = data.contract.contract_name;
-    contract_no.value = data.contract.contract_code
-
+    supplier_name.value = data.supplier_name
+    supplier_code.value = data.supplier_code
+    contract_no.value = data.contract_no
+    contract_name.value = data.contract_name
+    project_name.value = data.project_name
+    project_code.value = data.project_code
+    amountinput()
 
 
 }
diff --git a/src/views/finance_receipt_record/index.vue b/src/views/finance_receipt_record/index.vue
index 130cd6f..13a4cee 100644
--- a/src/views/finance_receipt_record/index.vue
+++ b/src/views/finance_receipt_record/index.vue
@@ -35,20 +35,24 @@
                     <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_code" show-overflow-tooltip />
+                    <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
                     <el-table-column label="合同类型" prop="contract_type">
                         <template #default="{ row }">
-                            <dict-value :options="dictData.contract_type" :value="row.contract_type" />
+                            {{ row.contract_type == 1 ? "采购合同" : "分包合同" }}
                         </template>
                     </el-table-column>
                     <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" 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_amount" show-overflow-tooltip />
                     <el-table-column label="不含税金额" prop="amount_excluding_tax" show-overflow-tooltip />
-                    <el-table-column label="税额" prop="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" />
diff --git a/src/views/finance_refund_record/detail.vue b/src/views/finance_refund_record/detail.vue
index e50c7ad..682ebee 100644
--- a/src/views/finance_refund_record/detail.vue
+++ b/src/views/finance_refund_record/detail.vue
@@ -6,74 +6,112 @@
                 <el-card class="mb-2">
                     <el-row>
                         <el-col :span="12">
-                            <el-form-item label="合同编号">
+                            <el-form-item label="供应商名称">
+                                {{ formData.supplier_name }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="供应商编码">
+                                {{ formData.supplier_code }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="合同名称">
                                 {{ formData.contract_name }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project ? formData.project.name : '暂无数据'
-                                }}
+                            <el-form-item label="合同编码">
+                                {{ formData.contract_no }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="项目名称">
+                                {{ formData.project_name }}
                             </el-form-item>
                         </el-col>
-
                         <el-col :span="12">
                             <el-form-item label="项目编码">
-                                {{ formData.project_code
+                                {{ formData.project_code }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="合同类型">
+                                {{ formData.contract_type_text
                                 }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="退款日期">
-                                {{ formData.reason
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款原因">
                                 {{ formData.refund_date
-
                                 }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="退款金额">
-                                {{ formData.refund_amount }}
+                                {{ formData.refund_amount
+                                }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="金额大写">
-                                {{ formData.refund_amount_daxie }}
+                            <el-form-item label="退款原因">
+                                {{ formData.reason
+                                }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="退款方式">
-                                <dict-value :options="dictData.refund_type" :value="formData.refund_type" />
+                                {{ formData.refund_type_text
+                                }}
                             </el-form-item>
                         </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="开始计息日期">
-                                {{ formData.interest_calculation_start_date }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="是否计息">
-                                {{ formData.is_calculate_interest == 1 ? '是' : "否" }}
-                            </el-form-item>
-                        </el-col>
-
-
                         <el-col :span="12">
                             <el-form-item label="备注">
                                 {{ formData.remark
                                 }}
                             </el-form-item>
                         </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="附件">
+                                <!-- {{ formData.remark }} -->
+                                <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
+                                        target="_blank">文件 {{ index + 1 }}</a>
+                                </div>
+                            </el-form-item>
+                        </el-col>
 
 
 
-
+                    </el-row>
+                </el-card>
+                <el-card>
+                    <template #header>
+                        <div class="card-header">
+                            <span>付款银行信息</span>
+                        </div>
+                    </template>
+                    <el-row>
+                        <el-col :span="12">
+                            <el-form-item label="账户编码">
+                                {{ formData.bank_account_info?.account_sn }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="开户银行">
+                                {{ formData.bank_account_info?.deposit_bank }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="开户名称">
+                                {{ formData.bank_account_info?.account_name }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="开户账号">
+                                {{ formData.bank_account_info?.account }}
+                            </el-form-item>
+                        </el-col>
                     </el-row>
                 </el-card>
             </el-form>
diff --git a/src/views/finance_refund_record/edit.vue b/src/views/finance_refund_record/edit.vue
index a20b26b..4b0c47b 100644
--- a/src/views/finance_refund_record/edit.vue
+++ b/src/views/finance_refund_record/edit.vue
@@ -12,33 +12,25 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="供应商编码" prop="supplier_id"
-                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="供应商编码" prop="supplier_id">
                             <el-input v-model="supplier_code" clearable disabled placeholder="系统自动填写" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="退款日期" prop="refund_date">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.refund_date" clearable
-                                value-format="YYYY-MM-DD" placeholder="选择日期">
-                            </el-date-picker>
+                        <el-form-item label="合同类型" prop="contract_cate"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-select v-model="formData.contract_cate" placeholder="请选择" @change="resetFormData">
+                                <el-option label="采购合同" :value="1"></el-option>
+                                <el-option label="分包合同" :value="2"></el-option>
+                            </el-select>
                         </el-form-item>
                     </el-col>
 
-                    <el-col :span="8">
-                        <el-form-item label="项目名称" prop="contract_id" @click="showDialog1 = true">
-                            <el-input v-model="project_name" clearable placeholder="请选择项目" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="项目编码" prop="contract_id">
-                            <el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
-                        </el-form-item>
-                    </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="合同编号" prop="contract_no">
-                            <el-input v-model="contract_no" clearable disabled placeholder="系统自动填写" />
+                            <el-input v-model="contract_no" clearable @click="showDialog1 = true" readonly
+                                placeholder="点击选择" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -48,18 +40,39 @@
                     </el-col>
 
                     <el-col :span="8">
-                        <el-form-item label="退款金额" prop="refund_amount">
-                            <el-input v-model="formData.refund_amount" clearable placeholder="请输入退款金额"
+                        <el-form-item label="项目名称" prop="contract_id">
+                            <el-input v-model="project_name" clearable placeholder="请选择项目" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目编码" prop="contract_id">
+                            <el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="退款日期" prop="refund_date"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.refund_date" clearable
+                                value-format="YYYY-MM-DD" placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="退款金额" prop="refund_amount"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="formData.refund_amount" clearable placeholder="请输入退款金额" type="number"
                                 @input="amountinput" />
                         </el-form-item>
                     </el-col>
+
                     <el-col :span="8">
                         <el-form-item label="金额大写" prop="refund_amount_daxie">
                             <el-input v-model="formData.refund_amount_daxie" readonly clearable placeholder="请输入金额大写" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="退款方式" prop="contacts">
+                        <el-form-item label="退款方式" prop="refund_type"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-select class="flex-1" v-model="formData.refund_type" clearable placeholder="请选择退款方式">
                                 <el-option v-for="(item, index) in dictData.refund_type" :key="index" :label="item.name"
                                     :value="parseInt(item.value)" />
@@ -101,64 +114,50 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <div style="margin: 20px 0;">收款账户</div>
+                <div style="margin: 20px 0;">付款银行信息</div>
 
                 <el-row :gutter="10">
 
                     <el-col :span="8">
-                        <el-form-item label="账户编码" prop="invoicing_company_name" @click="showDialog2 = true">
-                            <el-input v-model="formData.invoicing_company_name" clearable placeholder="请输入账户编码" />
+                        <el-form-item label="账户编码" prop="bank_account_id" @click="showDialog2 = true"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="formData.bank_account_info.account_sn" readonly clearable
+                                placeholder="请输入账户编码" />
                         </el-form-item>
-
                     </el-col>
-
                     <el-col :span="8">
                         <el-form-item label="开户银行" prop="deposit_bank">
-                            <el-input v-model="formData.deposit_bank" clearable placeholder="请输入开户银行" />
-                        </el-form-item>
-
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="账号" prop="bank_accnout">
-                            <el-input v-model="formData.bank_accnout" clearable placeholder="请输入开票公司名称" />
-                        </el-form-item>
-
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="开户地址及电话" prop="address_phone">
-                            <el-input v-model="formData.address_phone" clearable placeholder="请输入开户地址及电话" />
-                        </el-form-item>
-
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item label="是否计息" prop="is_calculate_interest">
-                            <el-radio-group v-model="formData.is_calculate_interest" placeholder="请选择是否计息">
-                                <el-radio v-for="(item, index) in dictData.isaccrued" :key="index"
-                                    :label="parseInt(item.value)">
-                                    {{ item.name }}
-                                </el-radio>
-                            </el-radio-group>
+                            <el-input v-model="formData.bank_account_info.deposit_bank" disabled placeholder="请输入开户银行" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="开始计息日期" prop="interest_calculation_start_date">
-
-                            <el-date-picker class="flex-1 !flex" v-model="formData.interest_calculation_start_date"
-                                clearable value-format="YYYY-MM-DD" placeholder="选择日期">
-                            </el-date-picker>
-
+                        <el-form-item label="开户名称" prop="deposit_bank">
+                            <el-input v-model="formData.bank_account_info.account_name" disabled placeholder="请输入开户名称" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="开户账号" prop="bank_accnout">
+                            <el-input v-model="formData.bank_account_info.account" disabled placeholder="请输入开户账号" />
                         </el-form-item>
                     </el-col>
-
                 </el-row>
-
-
                 <el-dialog v-model="showDialog" title="选择供应商" width="70%">
                     <suppliertable @customEvent="customEvent"></suppliertable>
                 </el-dialog>
-                <el-dialog v-model="showDialog1" title="选择合同" width="70%">
-                    <subcontractingDialog @customEvent="customEvent1"></subcontractingDialog>
-                </el-dialog>
+
+                <div v-if="formData.contract_cate == 1 && showDialog1">
+                    <el-dialog v-model="showDialog1" title="选择采购合同" width="70%">
+                        <subcontractingDialog @customEvent="customEvent1" :supplier_id="formData.supplier_id">
+                        </subcontractingDialog>
+                    </el-dialog>
+                </div>
+
+                <div v-if="formData.contract_cate == 2 && showDialog1">
+                    <el-dialog v-model="showDialog1" title="选择分包合同" width="70%">
+                        <subcontracting @customEvent="customEvent1" :supplier_id="formData.supplier_id">
+                        </subcontracting>
+                    </el-dialog>
+                </div>
 
                 <el-dialog v-model="showDialog2" title="选择银行账户" width="70%">
                     <bankaccountDialog @customEvent="customEvent2"></bankaccountDialog>
@@ -175,6 +174,7 @@ import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import suppliertable from '@/components/supplier/index.vue'
 import subcontractingDialog from '@/components/procurementsubcontracting_selector/index.vue'
+import subcontracting from '@/components/procurementsubcontracting_selector/subcontracting.vue'
 import bankaccountDialog from '@/components/bankaccount/index.vue'
 import { apiFinancerefundAdd, apiFinancerefundEdit, apiFinancerefundDetail } from '@/api/refundrecord'
 import { toChinesNum } from "@/utils/util";
@@ -196,7 +196,6 @@ const contract_no = ref('')
 const supplier_name = ref('')
 const supplier_code = ref('')
 const userInfo = userStore.userInfo
-console.log(userInfo, '222222')
 // 上传文件
 const handleAvatarSuccess_four = (
     response,
@@ -227,13 +226,6 @@ const checkPhone = (rule: any, value: any, callback: (arg0: Error) => any) => {
 
 }
 const userEmail = (rule: any, value: string, callback: (arg0: Error | undefined) => void) => {
-
-    // const mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/
-    // // if (!value) {
-    // //     return callback(new Error('邮箱不能为空'))
-    // // }
-
-
     if (value && !mailReg.test(value)) {
         callback(new Error('请输入正确的邮箱格式'))
     } else {
@@ -260,6 +252,7 @@ const customEvent = (e: any) => {
     formData.supplier_id = e.id;
     supplier_code.value = e.supplier_code
     supplier_name.value = e.supplier_name
+    resetFormData()
     showDialog.value = false;
 };
 const customEvent1 = (e: any) => {
@@ -274,13 +267,19 @@ const customEvent1 = (e: any) => {
 
 
 const customEvent2 = (e) => {
-    formData.invoicing_company_name = e.account_sn
-    formData.deposit_bank = e.deposit_bank
-    formData.bank_accnout = e.account_name
-    formData.bank_account_id = e.id
+    formData.bank_account_id = e.id;
+    formData.bank_account_info.account_sn = e.account_sn
+    formData.bank_account_info.deposit_bank = e.deposit_bank
+    formData.bank_account_info.account_name = e.account_name
+    formData.bank_account_info.account = e.account
     showDialog2.value = false
 }
-
+const resetFormData = () => {
+    project_name.value = ""
+    project_code.value = ''
+    contract_no.value = ""
+    contract_name.value = ''
+}
 //监听输入
 const amountinput = (e) => {
     // console.log(e)
@@ -296,19 +295,23 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
-    supplier_id: 1,
-    contract_id: 0,
-    refund_amount: '',
-    refund_amount_daxie: '',
-    refund_date: "",
-    refund_type: 0,
-    reason: "",
-    remark: "",
-    annex: [],
-    bank_account_id: 0,
-    is_calculate_interest: '',
-    interest_calculation_start_date: "",
-    "contract_cate": 1,
+    "supplier_id": '',
+    "contract_cate": '',
+    "contract_id": '',
+    "refund_amount": '',
+    "refund_date": "",
+    "refund_type": '',
+    "reason": "",
+    "remark": "",
+    "annex": "",
+    "bank_account_id": '',
+    "bank_account_info": {
+        "account_sn": "",
+        "deposit_bank": "",
+        "account_name": "",
+        "account": ""
+    }
+
 
 })
 
@@ -341,13 +344,13 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-
-    project_name.value = data.project.name
-    project_code.value = data.project.project_code
-    contract_name.value = data.contract.contract_name;
-    contract_no.value = data.contract.contract_no
-
-
+    supplier_name.value = data.supplier_name
+    supplier_code.value = data.supplier_code
+    project_name.value = data.project_name
+    project_code.value = data.project_code
+    contract_name.value = data.contract_name;
+    contract_no.value = data.contract_no
+    formData.refund_amount_daxie = toChinesNum(formData.refund_amount)
 
 }
 const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/finance_refund_record/index.vue b/src/views/finance_refund_record/index.vue
index 1b4f868..25bf55f 100644
--- a/src/views/finance_refund_record/index.vue
+++ b/src/views/finance_refund_record/index.vue
@@ -4,19 +4,22 @@
             <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="退款方式" prop="contacts">
                     <el-select class="flex-1" 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="contract_id">
                     <el-select class="flex-1" v-model="queryParams.contract_id" clearable placeholder="请选择合同">
-                        <el-option v-for="(item, index) in list" :key="index" :label="item.contract_name" :value="parseInt(item.id)" />
+                        <el-option v-for="(item, index) in list" :key="index" :label="item.contract_name"
+                            :value="parseInt(item.id)" />
                     </el-select>
 
                 </el-form-item>
 
                 <el-form-item label="供应商" prop="supplier_id">
                     <el-select class="flex-1" v-model="queryParams.contract_id" clearable placeholder="请选择合同">
-                        <el-option v-for="(item, index) in list" :key="index" :label="item.contract_name" :value="parseInt(item.id)" />
+                        <el-option v-for="(item, index) in list" :key="index" :label="item.contract_name"
+                            :value="parseInt(item.id)" />
                     </el-select>
                 </el-form-item>
                 <el-form-item>
@@ -41,10 +44,10 @@
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="序号" type="index" width="55" />
                     <el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
-                    <el-table-column label="供应商编码" prop="supplier_no" show-overflow-tooltip />
+                    <el-table-column label="供应商编码" prop="supplier_code" show-overflow-tooltip />
                     <el-table-column label="合同类型" prop="contract_type">
                         <template #default="{ row }">
-                            <dict-value :options="dictData.contract_type" :value="row.contract_type" />
+                            {{ row.contract_type_text }}
                         </template>
                     </el-table-column>
                     <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
@@ -54,7 +57,8 @@
                     <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" />
+                            <!-- <dict-value :options="dictData.refund_type" :value="row.refund_type" /> -->
+                            {{ row.refund_type_text }}
                         </template>
                     </el-table-column>
 
diff --git a/src/views/procurement_contract/detail.vue b/src/views/procurement_contract/detail.vue
index 5ff0425..38f2f14 100644
--- a/src/views/procurement_contract/detail.vue
+++ b/src/views/procurement_contract/detail.vue
@@ -8,12 +8,18 @@
                         <el-descriptions :column="2" border>
 
 
-                            <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_name }}</el-descriptions-item>
-                            <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_code }}</el-descriptions-item>
-                            <el-descriptions-item label="合同名称" label-align="left" align="left" label-class-name="my-label">{{ formData.contract_name }}</el-descriptions-item>
-                            <el-descriptions-item label="合同编号" label-align="left" align="left" label-class-name="my-label">{{ formData.contract_no }}</el-descriptions-item>
-                            <el-descriptions-item label="供应商编码" label-align="left" align="left" label-class-name="my-label">{{ formData.supplier_code }}</el-descriptions-item>
-                            <el-descriptions-item label="供应商名称" label-align="left" align="left" label-class-name="my-label">{{ formData.supplier_name }}</el-descriptions-item>
+                            <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                                {{ formData.project_name }}</el-descriptions-item>
+                            <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label">
+                                {{ formData.project_code }}</el-descriptions-item>
+                            <el-descriptions-item label="合同名称" label-align="left" align="left"
+                                label-class-name="my-label">{{ formData.contract_name }}</el-descriptions-item>
+                            <el-descriptions-item label="合同编号" label-align="left" align="left"
+                                label-class-name="my-label">{{ formData.contract_no }}</el-descriptions-item>
+                            <el-descriptions-item label="供应商编码" label-align="left" align="left"
+                                label-class-name="my-label">{{ formData.supplier_code }}</el-descriptions-item>
+                            <el-descriptions-item label="供应商名称" label-align="left" align="left"
+                                label-class-name="my-label">{{ formData.supplier_name }}</el-descriptions-item>
                             <el-descriptions-item label="合同类型" label-align="left" align="left" label-class-name="my-label">
                                 {{ formData.contract_type_text }}
                             </el-descriptions-item>
@@ -39,7 +45,8 @@
                             <el-descriptions-item label="不含税金额" label-align="left" align="left" label-class-name="my-label">
                                 {{ formData.amount_excluding_tax }}
                             </el-descriptions-item>
-                            <el-descriptions-item label="质保金比例(％)" label-align="left" align="left" label-class-name="my-label">
+                            <el-descriptions-item label="质保金比例(％)" label-align="left" align="left"
+                                label-class-name="my-label">
                                 {{ formData.retention_money_rate }}
                             </el-descriptions-item>
                             <el-descriptions-item label="质保金" label-align="left" align="left" label-class-name="my-label">
@@ -51,7 +58,8 @@
                             <el-descriptions-item label="合同附件" label-align="left" align="left" label-class-name="my-label">
                                 <div v-if="formDataannex.length > 0">
                                     <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
-                                        <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">文件{{ index + 1 }}查看</el-link>
+                                        <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
+                                            :href="item.uri" target="_blank">文件{{ index + 1 }}查看</el-link>
 
                                     </div>
                                 </div>
@@ -81,7 +89,9 @@
                             </el-table>
                         </div>
                         <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager1.page_no" v-model:page-size="pager1.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange1" @current-change="handleCurrentChange1" />
+                            <el-pagination v-model:current-page="pager1.page_no" v-model:page-size="pager1.page_size"
+                                :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper"
+                                :total="total" @size-change="handleSizeChange1" @current-change="handleCurrentChange1" />
                         </div>
                     </el-tab-pane>
                     <el-tab-pane label="收票记录" name="demo-tabs-3">
@@ -99,7 +109,9 @@
                             </el-table>
                         </div>
                         <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager2.page_no" v-model:page-size="pager2.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total1" @size-change="handleSizeChange2" @current-change="handleCurrentChange2" />
+                            <el-pagination v-model:current-page="pager2.page_no" v-model:page-size="pager2.page_size"
+                                :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper"
+                                :total="total1" @size-change="handleSizeChange2" @current-change="handleCurrentChange2" />
                         </div>
                     </el-tab-pane>
                     <el-tab-pane label="付款计划" name="demo-tabs-4">
@@ -116,7 +128,9 @@
                             </el-table>
                         </div>
                         <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager3.page_no" v-model:page-size="pager3.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total2" @size-change="handleSizeChange3" @current-change="handleCurrentChange3" />
+                            <el-pagination v-model:current-page="pager3.page_no" v-model:page-size="pager3.page_size"
+                                :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper"
+                                :total="total2" @size-change="handleSizeChange3" @current-change="handleCurrentChange3" />
                         </div>
                     </el-tab-pane>
                     <el-tab-pane label="付款记录" name="demo-tabs-5">
@@ -136,7 +150,9 @@
                             </el-table>
                         </div>
                         <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager4.page_no" v-model:page-size="pager4.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total3" @size-change="handleSizeChange4" @current-change="handleCurrentChange4" />
+                            <el-pagination v-model:current-page="pager4.page_no" v-model:page-size="pager4.page_size"
+                                :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper"
+                                :total="total3" @size-change="handleSizeChange4" @current-change="handleCurrentChange4" />
                         </div>
                     </el-tab-pane>
                     <el-tab-pane label="退款记录" name="demo-tabs-6">
@@ -151,7 +167,9 @@
                             </el-table>
                         </div>
                         <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager5.page_no" v-model:page-size="pager5.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total4" @size-change="handleSizeChange5" @current-change="handleCurrentChange5" />
+                            <el-pagination v-model:current-page="pager5.page_no" v-model:page-size="pager5.page_size"
+                                :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper"
+                                :total="total4" @size-change="handleSizeChange5" @current-change="handleCurrentChange5" />
                         </div>
                     </el-tab-pane>
                 </el-tabs>
@@ -192,22 +210,30 @@ const pager1 = reactive({
 const pager2 = reactive({
     page_size: 10,
     page_no: 1,
-    contract_id: ""
+    contract_id: "",
+    contract_type: 1
+
 })
 const pager3 = reactive({
     page_size: 10,
     page_no: 1,
-    contract_id: ""
+    contract_id: "",
+    contract_type: 1
+
 })
 const pager4 = reactive({
     page_size: 10,
     page_no: 1,
-    contract_id: ""
+    contract_id: "",
+    contract_type: 1
+
 })
 const pager5 = reactive({
     page_size: 10,
     page_no: 1,
-    contract_id: ""
+    contract_id: "",
+    contract_type: 1
+
 })
 
 const total = ref(0)
diff --git a/src/views/procurement_contract/edit.vue b/src/views/procurement_contract/edit.vue
index 287a4ad..0627835 100644
--- a/src/views/procurement_contract/edit.vue
+++ b/src/views/procurement_contract/edit.vue
@@ -491,7 +491,7 @@ watch(
 )
 // 计算质保金
 const retention_money = computed(() => {
-    return amount.value * formData.retention_money_rate
+    return amount.value * (formData.retention_money_rate / 100)
 })
 
 
diff --git a/src/views/procurement_contract_detail/detail.vue b/src/views/procurement_contract_detail/detail.vue
index e796171..246b5cf 100644
--- a/src/views/procurement_contract_detail/detail.vue
+++ b/src/views/procurement_contract_detail/detail.vue
@@ -9,28 +9,92 @@
                         <el-col :span="12">
                             <el-form-item label="项目名称">
                                 {{ formData.project_name }}
-
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="客户名称">
-                                {{ formData.custom_name }}
+                            <el-form-item label="项目编码">
+                                {{ formData.project_code }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="合同名称">
+                                {{ formData.contract_name }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="合同编号">
-                                {{ formData.supplier_contract_no }}
+                                {{ formData.contract_no }}
                             </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="供应商合同号">
-
-                                {{ formData.supplier_contract_no }}
-
+                        </el-col> <el-col :span="12">
+                            <el-form-item label="合同类型">
+                                {{ formData.contract_type }}
                             </el-form-item>
                         </el-col>
 
                         <el-col :span="12">
+                            <el-form-item label="供应商名称">
+                                {{ formData.supplier_name }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="供应商编码">
+                                {{ formData.supplier_code }}
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="采购申请单号">
+                                {{ formData.material_purchase_request_code }}
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="材料名称">
+                                {{ formData.material_name }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="材料编码">
+                                {{ formData.material_code }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="规格型号">
+                                {{ formData.material_specs }}
+                            </el-form-item>
+                        </el-col> <el-col :span="12">
+                            <el-form-item label="品牌">
+                                {{ formData.material_brand }}
+                            </el-form-item>
+                        </el-col> <el-col :span="12">
+                            <el-form-item label="单位">
+                                {{ formData.material_unit }}
+                            </el-form-item>
+                        </el-col> <el-col :span="12">
+                            <el-form-item label="数量">
+                                {{ formData.num }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="含税单价">
+                                {{ formData.price }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="税率">
+                                {{ formData.tax_rate_text }}%
+                            </el-form-item>
+                        </el-col> <el-col :span="12">
+                            <el-form-item label="不含税金额">
+                                {{ formData.amount_excluding_tax }}
+                            </el-form-item>
+                        </el-col> <el-col :span="12">
+                            <el-form-item label="含税金额">
+                                {{ formData.amount_including_tax }}
+                            </el-form-item>
+                        </el-col>
+
+                        <!-- <el-col :span="12">
                             <el-form-item label="合同类型">
                                 <dict-value :options="dictData.procurement_contract_type" :value="formData.contract_type" />
                             </el-form-item>
@@ -66,7 +130,7 @@
                             <el-form-item label="不含税金额">
                                 {{ formData.amount_excluding_tax }}
                             </el-form-item>
-                        </el-col>
+                        </el-col> -->
 
 
                     </el-row>
@@ -109,6 +173,7 @@ const formData = reactive({
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
+    console.log(data)
     Object.assign(formData, data)
 
 
diff --git a/src/views/project_attendance_detail/edit.vue b/src/views/project_attendance_detail/edit.vue
index bb74220..699d210 100644
--- a/src/views/project_attendance_detail/edit.vue
+++ b/src/views/project_attendance_detail/edit.vue
@@ -23,7 +23,7 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="姓名" prop="person_id" @click="showDialog1 = true">
-                            <el-input v-model="name" clearable readonly placeholder="请选择人员"
+                            <el-input v-model="formData.people" clearable readonly placeholder="请选择人员"
                                 :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" />
                         </el-form-item>
                     </el-col>
@@ -42,16 +42,16 @@
 
                     <el-col :span="8">
                         <el-form-item label="上班时间" prop="work_start_time">
-                            <el-date-picker class="flex-1 !flex" clearable v-model="formData.work_start_time"
-                                value-format="YYYY-MM-DD " placeholder="选择日期">
-                            </el-date-picker>
+
+                            <el-time-select v-model="formData.work_start_time" start="06:30" step="00:15" end="23:30"
+                                placeholder="请选择" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="下班时间" prop="work_end_time">
-                            <el-date-picker class="flex-1 !flex" clearable v-model="formData.work_end_time"
-                                value-format="YYYY-MM-DD " placeholder="选择日期">
-                            </el-date-picker>
+
+                            <el-time-select v-model="formData.work_end_time" start="06:30" step="00:15" end="23:30"
+                                placeholder="请选择" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -130,13 +130,12 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
-
 const showDialog = ref(false)
 const showDialog1 = ref(false)
 const project_name = ref('')
 const project_code = ref('')
 const idcard = ref('')
-const name = ref('')
+const people = ref('')
 const work_type = ref('')
 import configs from "@/config"
 import useUserStore from "@/stores/modules/user";
@@ -150,12 +149,16 @@ const customEvent = (e) => {
     formData.project_id = e.id
     project_name.value = e.name
     project_code.value = e.project_code
+    idcard.value = ''
+    work_type.value = ''
     showDialog.value = false
+    formData.people = ''
+    console.log(people.value, "name")
 
 }
 const customEvent1 = (e) => {
     formData.person_id = e.id
-    name.value = e.name
+    formData.people = e.name
     idcard.value = e.idcard
     work_type.value = e.work_type_text
     showDialog1.value = false
@@ -199,6 +202,7 @@ const formData = reactive({
     daily_other: '',
     daily_income: '',
     remark: '',
+    people: ""
 
 })
 
@@ -234,7 +238,7 @@ const setFormData = async (data: Record<any, any>) => {
     project_name.value = data.project_name
     project_code.value = data.project_code
     idcard.value = data.person_idcard
-    name.value = data.person_name
+    // people.value = data.person_name
     work_type.value = data.work_type_text
 }
 
@@ -252,7 +256,10 @@ const handleSubmit = async () => {
         formData.annex = formDataannex.map((item: any) => item.uri)
     }
     await formRef.value?.validate()
-    const data = { ...formData, }
+    formData.work_start_time = formData.work_start_time ? formData.attendance_date + ` ${formData.work_start_time}` : ""
+    formData.work_end_time = formData.work_end_time ? formData.attendance_date + ` ${formData.work_end_time}` : ""
+    console.log(formData)
+    const data = { ...formData }
     mode.value == 'edit'
         ? await attendancedetailEdit(data)
         : await attendancedetailAdd(data)
diff --git a/src/views/project_document/edit.vue b/src/views/project_document/edit.vue
index b749b4d..2f0efe9 100644
--- a/src/views/project_document/edit.vue
+++ b/src/views/project_document/edit.vue
@@ -36,14 +36,14 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="文档编号" prop="document_no">
-                            <el-input v-model="document_no" readonly clearable placeholder="请输入文档编号" />
+                            <el-input v-model="document_no" disabled clearable placeholder="系统自动生成" />
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="文档名称" prop="name"
                             :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="formData.name" readonly clearable placeholder="请输入文档名称" />
+                            <el-input v-model="formData.name" clearable placeholder="请输入文档名称" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -172,7 +172,7 @@ const customEvent = (e: any) => {
     formData.classify_id = e.id;
     large_document.value = e.large_category;
     middle_document.value = e.middle_category;
-    formData.name = e.name;
+    // formData.name = e.name;
     showDialog.value = false;
 };
 
@@ -248,9 +248,7 @@ const getDetail = async (row: Record<string, any>) => {
 
 // 提交按钮
 const handleSubmit = async () => {
-    if (formDataannex.length > 0) {
-        formData.annex = formDataannex.map((item: any) => item.uri)
-    }
+    formData.annex = formDataannex.map((item: any) => item.uri)
 
     await formRef.value?.validate()
 
diff --git a/src/views/project_document_set/edit.vue b/src/views/project_document_set/edit.vue
index 370a821..7475fe3 100644
--- a/src/views/project_document_set/edit.vue
+++ b/src/views/project_document_set/edit.vue
@@ -4,18 +4,21 @@
             <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
                 <el-row>
                     <el-col :span="8">
-                        <el-form-item label="项目类型" prop="project_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+                        <el-form-item label="项目类型" prop="project_type_id" @click="showDialog = true"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
                             <el-select class="w-[280px]" v-model="formData.project_type_id" clearable placeholder="请选择项目类型">
-                                <el-option label="全部" value=""></el-option>
-                                <el-option v-for="(item, index) in list" :key="index" :label="item.name" :value="parseInt(item.id)" />
+                                <el-option v-for="(item, index) in list" :key="index" :label="item.name"
+                                    :value="parseInt(item.id)" />
                             </el-select>
                         </el-form-item> </el-col>
                     <el-col :span="8">
-                        <el-form-item label="文档大类" prop="formData.large_category" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="文档大类" prop="large_category"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.large_category" clearable placeholder="请选择文档大类" />
                         </el-form-item> </el-col>
                     <el-col :span="8">
-                        <el-form-item label="文档中类" prop="middle_category" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="文档中类" prop="middle_category"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.middle_category" clearable placeholder="请输入文档中类" />
                         </el-form-item> </el-col>
                     <el-col :span="8">
@@ -32,7 +35,8 @@
                         </el-form-item> </el-col>
 
                     <el-col :span="8">
-                        <el-form-item label="必传" prop="is_upload" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="必传" prop="is_upload"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-switch v-model="formData.is_upload" active-value="1" :inactive-value="2" />
                         </el-form-item>
                     </el-col>
@@ -41,7 +45,8 @@
 
 
                     <el-col :span="8">
-                        <el-form-item label="排序号" prop="sort" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="排序号" prop="sort"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.sort" clearable placeholder="请输入排序号" />
                         </el-form-item>
                     </el-col>
diff --git a/src/views/project_insurance_management/edit.vue b/src/views/project_insurance_management/edit.vue
index 070155d..ac146fa 100644
--- a/src/views/project_insurance_management/edit.vue
+++ b/src/views/project_insurance_management/edit.vue
@@ -147,6 +147,7 @@ const customEvent = (e) => {
     formData.project_id = e.id
     project_name.value = e.name
     project_code.value = e.project_code
+    person_name.value = ''
     showDialog.value = false
 
 }
diff --git a/src/views/project_labor_contract/detail.vue b/src/views/project_labor_contract/detail.vue
index 4edd658..26c2a90 100644
--- a/src/views/project_labor_contract/detail.vue
+++ b/src/views/project_labor_contract/detail.vue
@@ -33,11 +33,13 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="合同类别">
-                                <dict-value :options="dictData.labor_contract_type" :value="formData.contract_type" /> </el-form-item>
+                                <dict-value :options="dictData.labor_contract_type" :value="formData.contract_type" />
+                            </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="合同名称">
-                                <dict-value :options="dictData.labor_contract_name" :value="formData.contract_name" />
+                                <!-- <dict-value :options="dictData.labor_contract_name" :value="formData.contract_name" /> -->
+                                {{ formData.contract_title_text }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
@@ -80,7 +82,8 @@
                             <el-form-item label="合同附件">
                                 <div v-if="formDataannex.length > 0">
                                     <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
-                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
+                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
+                                            :href="item.uri" target="_blank">{{ item.name }}</a>
                                         <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
                                     </div>
                                 </div>
diff --git a/src/views/project_labor_contract/edit.vue b/src/views/project_labor_contract/edit.vue
index 7b07e1e..b2689ec 100644
--- a/src/views/project_labor_contract/edit.vue
+++ b/src/views/project_labor_contract/edit.vue
@@ -65,7 +65,7 @@
                         </el-form-item> </el-col>
                     <el-col :span="8">
                         <el-form-item label="试用期结束日期" prop="per_daily_living">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.plan_start_date" clearable type="date"
+                            <el-date-picker class="flex-1 !flex" v-model="formData.trial_end_date" clearable type="date"
                                 value-format="YYYY-MM-DD" placeholder="选择计划开始日期">
                             </el-date-picker>
                         </el-form-item> </el-col><el-col :span="8">
@@ -167,6 +167,7 @@ const customEvent = (e) => {
     formData.project_id = e.id
     project_name.value = e.name
     project_code.value = e.project_code
+    person_name.value = ''
     showDialog.value = false
 
 }
diff --git a/src/views/project_labor_contract/index.vue b/src/views/project_labor_contract/index.vue
index 5090987..75678ed 100644
--- a/src/views/project_labor_contract/index.vue
+++ b/src/views/project_labor_contract/index.vue
@@ -5,18 +5,21 @@
 
                 <el-form-item label="合同类型" prop="contract_type">
                     <el-select class="w-[280px]" v-model="queryParams.contract_type" clearable placeholder="请选择合同类型">
-                        <el-option v-for="(item, index) in dictData.labor_contract_type" :key="index" :label="item.name" :value="parseInt(item.value)" />
+                        <el-option v-for="(item, index) in dictData.labor_contract_type" :key="index" :label="item.name"
+                            :value="parseInt(item.value)" />
                     </el-select>
                 </el-form-item>
 
                 <el-form-item label="合同状态" prop="contract_status">
                     <el-select class="w-[280px]" v-model="queryParams.contract_status" clearable placeholder="请选择合同状态">
-                        <el-option v-for="(item, index) in dictData.labor_contract_status" :key="index" :label="item.name" :value="parseInt(item.value)" />
+                        <el-option v-for="(item, index) in dictData.labor_contract_status" :key="index" :label="item.name"
+                            :value="parseInt(item.value)" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="合同名称" prop="contract_title">
                     <el-select class="w-[280px]" v-model="queryParams.contract_title" clearable placeholder="请选择合同名称">
-                        <el-option v-for="(item, index) in dictData.labor_contract_name" :key="index" :label="item.name" :value="parseInt(item.value)" />
+                        <el-option v-for="(item, index) in dictData.labor_contract_name" :key="index" :label="item.name"
+                            :value="parseInt(item.value)" />
                     </el-select>
                 </el-form-item>
                 <el-form-item>
@@ -32,7 +35,8 @@
                 </template>
                 新增
             </el-button>
-            <el-button v-perms="['project.project/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+            <el-button v-perms="['project.project/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
                 删除
             </el-button>
 
@@ -55,10 +59,10 @@
                             <dict-value :options="dictData.labor_contract_type" :value="row.contract_type" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="合同名称" prop="per_daily_living" show-overflow-tooltip>
-                        <template #default="{ row }">
+                    <el-table-column label="合同名称" prop="contract_title_text" show-overflow-tooltip>
+                        <!-- <template #default="{ row }">
                             <dict-value :options="dictData.labor_contract_name" :value="row.contract_name" />
-                        </template>
+                        </template> -->
                     </el-table-column>
                     <el-table-column label="合同签定日期" prop="signing_date" show-overflow-tooltip />
 
@@ -78,7 +82,8 @@
                             <el-button v-perms="['project.project/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button v-perms="['project.project/delete']" type="danger" link @click="handleDelete(row.id)">
+                            <el-button v-perms="['project.project/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                             <el-button v-perms="['project.project/detail']" link @click="handledetail(row)">
diff --git a/src/views/project_list/components/Business.vue b/src/views/project_list/components/Business.vue
new file mode 100644
index 0000000..a39abc8
--- /dev/null
+++ b/src/views/project_list/components/Business.vue
@@ -0,0 +1,270 @@
+<template>
+    <div class="tit">项目跟进</div>
+    <div>
+        <el-table :data="tableData1" stripe style="width: 100%">
+            <el-table-column label="主题" prop='theme' width="180" />
+            <el-table-column label="日期" prop='follow_date' width="180" />
+            <el-table-column label="方案内容" prop='solution_content' />
+            <el-table-column label="类型" prop='follow_type_text' />
+            <el-table-column label="执行人" prop='executor' />
+            <el-table-column label="阶段" prop='follow_stage_text' />
+            <el-table-column label="状态" prop='follow_status_text' />
+            <el-table-column label="项目把握度" prop='project_assurance_text' />
+        </el-table>
+    </div>
+    <div style="margin: 20px 0;">
+        <el-pagination v-model:current-page="pager1.page_no" v-model:page-size="pager1.page_size"
+            :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total"
+            @current-change="handleCurrentChange1" />
+    </div>
+
+    <div class="tit">客户需求</div>
+    <div>
+        <el-table :data="tableData2" stripe style="width: 100%">
+            <el-table-column label="需求主题" prop='theme' width="180" />
+            <el-table-column label="重要程度" prop='importance_text' width="180" />
+            <el-table-column label="记录时间" prop='recording_time' />
+            <el-table-column label="需求内容" prop='demand_content' />
+            <el-table-column label="附件" prop="annex" show-overflow-tooltip>
+                <template #default="{ row }">
+                    <div v-if="row.annex && row.annex.length > 0">
+                        <div v-for="(item, i) in row.annex " :key='i'>
+                            <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
+                        </div>
+                    </div>
+                    <div v-else>
+                        暂无文件
+                    </div>
+                </template>
+            </el-table-column>
+        </el-table>
+    </div>
+    <div style="margin: 20px 0;">
+        <el-pagination v-model:current-page="pager2.page_no" v-model:page-size="pager2.page_size"
+            :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total1"
+            @size-change="handleSizeChange2" @current-change="handleCurrentChange2" />
+    </div>
+
+    <div class="tit">解决方案</div>
+    <div>
+        <el-table :data="tableData3" stripe style="width: 100%">
+            <el-table-column label="解决方案主题" prop='customer_demand_name' width="180" />
+            <el-table-column label="提交时间" prop='submission_time' width="180" />
+            <el-table-column label="方案内容" prop='solution_content' />
+            <el-table-column label="客户反馈" prop='customer_feedback' />
+            <el-table-column label="附件" prop="annex" show-overflow-tooltip>
+                <template #default="{ row }">
+                    <div v-if="row.annex && row.annex.length > 0">
+                        <div v-for="(item, i) in row.annex " :key='i'>
+                            <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
+                        </div>
+                    </div>
+                    <div v-else>
+                        暂无文件
+                    </div>
+                </template>
+            </el-table-column>
+        </el-table>
+    </div>
+    <div style="margin: 20px 0;">
+        <el-pagination v-model:current-page="pager3.page_no" v-model:page-size="pager3.page_size"
+            :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total2"
+            @size-change="handleSizeChange3" @current-change="handleCurrentChange3" />
+    </div>
+
+    <div class="tit">项目概算</div>
+    <div>
+        <el-table :data="tableData4" stripe style="width: 100%">
+            <el-table-column label="概算来源" prop='estimate_source_text' width="180" />
+            <el-table-column label="制单人" prop='create_user' width="180" />
+            <el-table-column label="报价日期" prop='quotation_date' />
+            <el-table-column label="技术人员" prop='technician_name' width="180" />
+            <el-table-column label="概算金额(万元)" prop='estimate_amount' width="180" />
+            <el-table-column label="要求" prop='ask' />
+            <el-table-column label="附件" prop="annex" show-overflow-tooltip>
+                <template #default="{ row }">
+                    <div v-if="row.annex && row.annex.length > 0">
+                        <div v-for="(item, i) in row.annex " :key='i'>
+                            <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
+                        </div>
+                    </div>
+                    <div v-else>
+                        暂无文件
+                    </div>
+                </template>
+            </el-table-column>
+        </el-table>
+    </div>
+    <div style="margin: 20px 0;">
+        <el-pagination v-model:current-page="pager4.page_no" v-model:page-size="pager4.page_size"
+            :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total3"
+            @size-change="handleSizeChange4" @current-change="handleCurrentChange4" />
+    </div>
+
+    <div class="tit">竞争对手</div>
+    <div>
+        <el-table :data="tableData5" stripe style="width: 100%">
+            <el-table-column label="竞争对手名称" prop='competitor_name' width="180" />
+            <el-table-column label="竞争对手联系人" prop='competitor_contacts' width="180" />
+            <el-table-column label="联系人电话" prop='competitor_contacts_phone' />
+            <el-table-column label="竞争能力" prop='competitive_power' />
+            <el-table-column label="竞争对手优势" prop='competitor_advantages' />
+            <el-table-column label="竞争对手劣势" prop='competitor_disadvantages' />
+            <el-table-column label="备注" prop='remark' />
+            <el-table-column label="附件" prop="annex" show-overflow-tooltip>
+                <template #default="{ row }">
+                    <div v-if="row.annex && row.annex.length > 0">
+                        <div v-for="(item, i) in row.annex " :key='i'>
+                            <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
+                        </div>
+                    </div>
+                    <div v-else>
+                        暂无文件
+                    </div>
+                </template>
+            </el-table-column>
+        </el-table>
+    </div>
+    <div style="margin: 20px 0;">
+        <el-pagination v-model:current-page="pager5.page_no" v-model:page-size="pager5.page_size"
+            :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total4"
+            @size-change="handleSizeChange5" @current-change="handleCurrentChange5" />
+    </div>
+</template>
+
+
+
+<script setup>
+
+import { ref, reactive, defineProps } from "vue"
+import { apiProjectFollowUpLists } from '@/api/project_follow_up'
+import { apiCustomerDemandLists } from '@/api/customer_demand'
+import { apiCustomerDemandSolutionLists } from '@/api/customer_demand_solution'
+import { apiProjectEstimateLists } from '@/api/project_estimate'
+import { apiCompetitorLists } from '@/api/competitor'
+
+
+const props = defineProps({
+    project_id: Number
+})
+
+
+
+
+const tableData1 = ref([])
+const tableData2 = ref([])
+const tableData3 = ref([])
+const tableData4 = ref([])
+const tableData5 = ref([])
+
+const total = ref(0)
+const total1 = ref(0)
+const total2 = ref(0)
+const total3 = ref(0)
+const total4 = ref(0)
+
+
+const pager1 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: props.project_id
+})
+const pager2 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: props.project_id
+})
+const pager3 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: props.project_id
+})
+const pager4 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: props.project_id
+})
+const pager5 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: props.project_id
+})
+
+
+// //获取客户跟进进路
+const followUpLists = () => {
+    apiProjectFollowUpLists(pager5).then((res) => {
+        tableData1.value = res.lists
+        total.value = res.count
+
+    })
+}
+//获取客户需求列表
+const demandList = () => {
+    apiCustomerDemandLists(pager5).then((res) => {
+        tableData2.value = res.lists
+        total1.value = res.count
+
+    })
+}
+
+// const handleSizeChange1 = (val: number) => {
+//     // pager1.page_size = val
+//     // followUpLists()
+// }
+
+
+// 解决方案列表
+const solutionLists = () => {
+    apiCustomerDemandSolutionLists(pager5).then((res) => {
+        tableData3.value = res.lists
+        total2.value = res.count
+
+    })
+}
+
+const estimateLists = () => {
+    apiProjectEstimateLists(pager4).then((res) => {
+        tableData4.value = res.lists
+        total3.value = res.count
+    })
+}
+
+const competitorLists = () => {
+    apiCompetitorLists(pager5).then((res) => {
+        tableData5.value = res.lists
+        total4.value = res.count
+    })
+}
+
+// const handleSizeChange2 = (val: number) => {
+//     pager2.page_size = val
+//     demandList()
+// }
+// const handleSizeChange3 = (val: number) => {
+//     pager3.page_size = val
+//     solutionLists()
+// }
+// const handleSizeChange4 = (val: number) => {
+//     pager4.page_size = val
+//     estimateLists()
+// }
+// const handleSizeChange5 = (val: number) => {
+//     pager5.page_size = val
+//     competitorLists()
+// }
+
+
+
+followUpLists()
+demandList()
+competitorLists()
+solutionLists()
+estimateLists()
+</script>
+<style lang="scss">
+.tit {
+    font-size: 1.2em;
+    margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/project_list/components/Collection.vue b/src/views/project_list/components/Collection.vue
new file mode 100644
index 0000000..73c5d49
--- /dev/null
+++ b/src/views/project_list/components/Collection.vue
@@ -0,0 +1,87 @@
+<template>
+    <myTable :baseData="baseData"></myTable>
+    <myTable :baseData="baseData1"></myTable>
+    <myTable :baseData="baseData2"></myTable>
+    <myTable :baseData="baseData3"></myTable>
+</template>
+
+<script setup>
+
+import { ref, reactive, defineProps } from "vue"
+import myTable from "./myTable.vue"
+import { apiinvoiceapplyLists } from '@/api/InvoicingRequests'
+import { apireturnedLists } from '@/api/remittance'
+import { apireturnedrecordLists } from '@/api/recordsPayment'
+import { apirefundapplyLists } from '@/api/refund'
+
+const props = defineProps({
+    project_id: Number
+})
+
+const baseData = reactive({
+    fetchFun: apiinvoiceapplyLists,
+    tit: "开票记录",
+    queryParams: { project_id: props.project_id },
+    columnList: [
+        { label: '开票单号', prop: 'invoicing_code' },
+        { label: '合同编号', prop: 'contract_code' },
+        { label: '合同名称', prop: 'contract_name' },
+        { label: '开票日期', prop: 'invoicing_date' },
+        { label: '期次', prop: 'period' },
+        { label: '发票类型', prop: 'invoice_type' },
+        { label: '发票编号', prop: 'tax' },
+        { label: '开票金额(含税)', prop: 'amount_including_tax' },
+        { label: '税率', prop: 'tax_rate' },
+        { label: '税额', prop: 'tax_amount' },
+    ]
+})
+
+const baseData1 = reactive({
+    fetchFun: apireturnedLists,
+    tit: "回款计划",
+    queryParams: { project_id: props.project_id },
+    columnList: [
+        { label: '合同编号', prop: 'contract_code' },
+        { label: '合同名称', prop: 'contract_name' },
+        { label: '期次', prop: 'period' },
+        { label: '计划日期', prop: 'return_date' },
+        { label: '状态', prop: 'return_status' },
+        { label: '金额', prop: 'amount' },
+        { label: '已回款', prop: 'has_return_amount' },
+        { label: '未回款', prop: 'not_return_amount' },
+
+
+    ]
+})
+
+const baseData2 = reactive({
+    fetchFun: apireturnedrecordLists,
+    tit: "回款记录",
+    queryParams: { project_id: props.project_id },
+    columnList: [
+        { label: '合同名称', prop: 'contract_name' },
+        { label: '合同编号', prop: 'contract_code' },
+        { label: '期次', prop: 'period' },
+        { label: '日期', prop: 'return_date' },
+        { label: '金额', prop: 'amount' },
+        { label: '收款人', prop: 'receiver' },
+    ]
+})
+
+const baseData3 = reactive({
+    fetchFun: apirefundapplyLists,
+    tit: "退款记录",
+    queryParams: { project_id: props.project_id },
+    columnList: [
+        { label: '退款单号', prop: 'refund_code' },
+        { label: '合同编号', prop: 'contract_code' },
+        { label: '合同名称', prop: 'contract_name' },
+        { label: '退款日期', prop: 'refund_date' },
+        { label: '退款原因', prop: 'reason' },
+        { label: '退款方式', prop: 'refund_type' },
+        { label: '退款金额', prop: 'amount' },
+        { label: '备注', prop: 'remark' },
+    ]
+})
+
+</script>
\ No newline at end of file
diff --git a/src/views/project_list/components/Overview.vue b/src/views/project_list/components/Overview.vue
new file mode 100644
index 0000000..ad3006a
--- /dev/null
+++ b/src/views/project_list/components/Overview.vue
@@ -0,0 +1,93 @@
+<template>
+    <el-descriptions :column="3" title="基本信息" border>
+        <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">{{ formData.org_name
+        }}</el-descriptions-item>
+        <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.dept_name }}</el-descriptions-item>
+        <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">{{ formData.name
+        }}</el-descriptions-item>
+        <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.project_code }}</el-descriptions-item>
+        <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.custom_name }}</el-descriptions-item>
+        <el-descriptions-item label="项目状态" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.status_text }}
+        </el-descriptions-item>
+        <el-descriptions-item label="项目类型" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.project_type_name }}</el-descriptions-item>
+        <el-descriptions-item label="立项日期" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.create_time }}</el-descriptions-item>
+        <el-descriptions-item label="项目所在地" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.project_address }}</el-descriptions-item>
+        <el-descriptions-item label="战略意义" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.strategic_significance_text }}</el-descriptions-item>
+        <el-descriptions-item label="所属行业" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.industry_text }}</el-descriptions-item>
+        <el-descriptions-item label="单位性质" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.unit_nature_text }}</el-descriptions-item>
+        <el-descriptions-item label="招标方式" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.bidding_method_text }}</el-descriptions-item>
+        <el-descriptions-item label="投标时间" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.bidding_time }}</el-descriptions-item>
+        <el-descriptions-item label="预计工期" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.estimated_construction }}</el-descriptions-item>
+        <el-descriptions-item label="项目估算(万元)" label-align="left" align="left" label-class-name="my-label"> {{
+            formData.project_estimation }}</el-descriptions-item>
+        <el-descriptions-item label="项目估算(外币)" label-align="left" align="left" label-class-name="my-label"> {{ formData.name
+        }}</el-descriptions-item>
+        <el-descriptions-item label="联系人" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.contacts }}</el-descriptions-item>
+        <el-descriptions-item label="联系人部门" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.department }}</el-descriptions-item>
+        <el-descriptions-item label="联系人职位" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.position }}</el-descriptions-item>
+        <el-descriptions-item label="关系度" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.telephone }}</el-descriptions-item>
+        <el-descriptions-item label="发现时间" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.discovery_time }}</el-descriptions-item>
+        <el-descriptions-item label="信息来源" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.information_sources_text }}</el-descriptions-item>
+        <el-descriptions-item label="负责人" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.person }}</el-descriptions-item>
+        <el-descriptions-item label="项目内容" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.project_content }}</el-descriptions-item>
+        <el-descriptions-item label="竞争对手" label-align="left" align="left" label-class-name="my-label">
+            {{ formData.competitor }}</el-descriptions-item>
+        <el-descriptions-item label="项目建设资金来源" label-align="left" align="left" label-class-name="my-label"> {{
+            formData.construction_funds_sources_text
+        }}</el-descriptions-item>
+        <el-descriptions-item label="建设单位付款方式" label-align="left" align="left" label-class-name="my-label"> {{
+            formData.construction_payment_method
+        }}</el-descriptions-item>
+        <el-descriptions-item label="建设单位财务状况" label-align="left" align="left" label-class-name="my-label"> {{
+            formData.construction_financial_status_text
+        }}</el-descriptions-item>
+        <el-descriptions-item label="建设单位对我方认可度" label-align="left" align="left" label-class-name="my-label"> {{
+            formData.construction_recognition_text
+        }}</el-descriptions-item>
+        <el-descriptions-item label="我方对建设单位认可度" label-align="left" align="left" label-class-name="my-label"> {{
+            formData.my_construction_recognition_text
+        }}</el-descriptions-item>
+        <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+            <div v-if="formData.annex && formData.annex.length > 0">
+                <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
+                        target="_blank">文件{{ index + 1 }} 查看</a>
+                </div>
+            </div>
+            <div v-else>
+                暂无文件
+            </div>
+        </el-descriptions-item>
+    </el-descriptions>
+</template>
+
+
+
+<script setup>
+
+import { ref, reactive, defineProps } from "vue"
+const props = defineProps({
+    formData: Object
+})
+</script>
\ No newline at end of file
diff --git a/src/views/project_list/components/a.vue b/src/views/project_list/components/a.vue
new file mode 100644
index 0000000..5e08c7c
--- /dev/null
+++ b/src/views/project_list/components/a.vue
@@ -0,0 +1,36 @@
+<template>
+    <myTable :baseData="baseData"></myTable>
+</template>
+
+
+
+<script setup>
+
+import { ref, reactive, defineProps } from "vue"
+import myTable from "./myTable.vue"
+import { subpackagdetailLists } from '@/api/project_subpackage_budget_detail'
+
+const props = defineProps({
+    project_id: Number
+})
+
+const baseData = reactive({
+    fetchFun: subpackagdetailLists,
+    tit: "竞争对手",
+    queryParams: { project_id: props.project_id },
+
+    columnList: [
+        { label: '工作类型', prop: 'work_type' },
+        { label: '工作内容', prop: 'work_content' },
+        { label: '项目特征', prop: 'project_features' },
+        { label: '单位', prop: 'unit' },
+        { label: '预算工作量', prop: 'num' },
+        { label: '单价', prop: 'price' },
+        { label: '金额', prop: 'amount' },
+        { label: '已分包量', prop: 'has_subcontract_num' },
+        { label: '剩余工作量', prop: 'residue_num' },
+    ]
+})
+
+
+</script>
\ No newline at end of file
diff --git a/src/views/project_list/components/budget.vue b/src/views/project_list/components/budget.vue
new file mode 100644
index 0000000..37a57c7
--- /dev/null
+++ b/src/views/project_list/components/budget.vue
@@ -0,0 +1,121 @@
+<template>
+    <myTable :baseData="baseData"></myTable>
+    <myTable :baseData="baseData1"></myTable>
+    <myTable :baseData="baseData2"></myTable>
+    <myTable :baseData="baseData3"></myTable>
+    <myTable :baseData="baseData4"></myTable>
+</template>
+
+<script setup>
+
+import { ref, reactive, defineProps } from "vue"
+import myTable from "./myTable.vue"
+import { apiProjectCostBudgetLists } from '@/api/project_cost_budget'
+import { MaterialbudgetDetailLists } from '@/api/project_material_budget_detail.ts'
+import { subpackagdetailLists } from '@/api/project_subpackage_budget_detail.ts'
+import { apiProjectEquipmentBudgetDetailLists } from '@/api/project_equipment_budget_detail.ts'
+import { apiProjectLaborBudgetDetailLists } from '@/api/project_labor_budget_detail.ts'
+
+
+const props = defineProps({
+    project_id: Number
+})
+
+const baseData = reactive({
+    fetchFun: apiProjectCostBudgetLists,
+    tit: "费用预算",
+    queryParams: { project_id: props.project_id },
+    columnList: [
+        { label: '一级科目', prop: 'first_level_subject' },
+        { label: '差?科目', prop: 'second_level_subject' },
+        { label: '单位', prop: 'unit' },
+        { label: '首次预算', prop: 'unit' },
+        { label: '预算调整', prop: 'num' },
+        { label: '预算金额', prop: 'amount' },
+        { label: '已支出', prop: 'amount' },
+        { label: '剩余预算', prop: 'has_subcontract_num' },
+        { label: '编制标准', prop: 'standard' },
+        { label: '备注', prop: 'remark' },
+    ]
+})
+
+
+const baseData1 = reactive({
+    fetchFun: MaterialbudgetDetailLists,
+    tit: "材料预算",
+    queryParams: { project_id: props.project_id },
+    columnList: [
+        { label: '材料名称', prop: 'material_name' },
+        { label: '材料编码', prop: 'material_code' },
+        { label: '规格单号', prop: 'material_budget_code' },
+        { label: '品牌', prop: 'material_brand' },
+        { label: '参数说明', prop: 'material_parameter_description' },
+        { label: '单位', prop: 'material_unit' },
+        { label: '预算数量', prop: 'num' },
+        { label: '单价', prop: 'price' },
+        { label: '金额', prop: 'amount' },
+        { label: '已申购量', prop: 'apply_num' },
+        { label: '剩余数量', prop: 'residual_num' },
+    ]
+})
+
+
+const baseData2 = reactive({
+    fetchFun: subpackagdetailLists,
+    tit: "分包预算",
+    queryParams: { project_id: props.project_id },
+    columnList: [
+        { label: '工作类型', prop: 'work_type' },
+        { label: '工作内容', prop: 'work_content' },
+        { label: '项目特征', prop: 'project_features' },
+        { label: '单位', prop: 'unit' },
+        { label: '首次预算量', prop: 'num' },
+        { label: '预算调正量', prop: 'price' },
+        { label: '预算工作量', prop: 'amount' },
+        { label: '单价', prop: 'price' },
+        { label: '金额', prop: 'amount' },
+        { label: '已分包量', prop: 'has_subcontract_num' },
+        { label: '剩余工作量', prop: 'residue_num' },
+    ]
+})
+
+const baseData3 = reactive({
+    fetchFun: apiProjectEquipmentBudgetDetailLists,
+    tit: "机具预算",
+    queryParams: { project_id: props.project_id },
+    columnList: [
+        { label: '机具类别', prop: 'type' },
+        { label: '机具名称', prop: 'name' },
+        { label: '规格型号', prop: 'spec' },
+        { label: '单位', prop: 'unit' },
+        { label: '首次预算量', prop: '' },
+        { label: '预算调整量', prop: '' },
+        { label: '预算总量', prop: '' },
+        { label: '单价', prop: 'price' },
+        { label: '金额', prop: 'amount' },
+        { label: '备注', prop: 'remark' },
+    ]
+})
+
+
+
+
+const baseData4 = reactive({
+    fetchFun: apiProjectLaborBudgetDetailLists,
+    tit: "人工预算",
+    queryParams: { project_id: props.project_id },
+    columnList: [
+        { label: '工种名称', prop: 'job_type_name' },
+        { label: '人工说明', prop: 'desc' },
+        { label: '单位', prop: 'unit' },
+        { label: '首次预算量', prop: '' },
+        { label: '预算调整量', prop: '' },
+        { label: '预算总量', prop: '' },
+        { label: '单价', prop: 'price' },
+        { label: '金额', prop: 'amount' },
+        { label: '备注', prop: 'remark' },
+    ]
+})
+
+
+</script>
\ No newline at end of file
diff --git a/src/views/project_list/components/construction.vue b/src/views/project_list/components/construction.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/project_list/components/contract.vue b/src/views/project_list/components/contract.vue
new file mode 100644
index 0000000..d8629df
--- /dev/null
+++ b/src/views/project_list/components/contract.vue
@@ -0,0 +1,99 @@
+<template>
+    <div class='tit'>主合同</div>
+    <div>
+        <el-table :data="tableData19" stripe style="width: 100%">
+            <el-table-column label="合同编号" prop='contract_name' width="180" />
+            <el-table-column label="合同名称" prop='contract_code' width="180" />
+            <el-table-column label="合同类型" prop='contract_type_text' />
+            <el-table-column label="负责人" prop='business_director_name' />
+            <el-table-column label="签约日期" prop='contract_date' />
+            <el-table-column label="合同金额" prop='amount' />
+            <el-table-column label="洽商金额" prop='negotiation_amount' />
+            <el-table-column label="实际合同金额" prop='reality_contract_amount' />
+            <el-table-column label="已回款" prop='returned_amount' />
+            <el-table-column label="未回款" prop='not_returned_amount' />
+            <el-table-column label="已开票" prop='invoicing_amount' />
+            <el-table-column label="未开票" prop='not_invoicing_amount' />
+        </el-table>
+    </div>
+    <div style="margin: 10px 0;">
+        <el-pagination v-model:current-page="pager19.page_no" v-model:page-size="pager19.page_size"
+            :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total18"
+            @size-change="handleSizeChange19" @current-change="handleCurrentChange19" />
+    </div>
+    <div class='tit' style="margin: 20px 0;">合同洽商</div>
+    <div>
+        <el-table :data="tableData20" stripe style="width: 100%">
+            <el-table-column label="洽商编号" prop='negotiation_no' width="180" />
+            <el-table-column label="洽商单名称" prop='negotiation_name' width="180" />
+            <el-table-column label="合同编号" prop='contract_code' />
+            <el-table-column label="洽商类别" prop='negotiation_type' />
+            <el-table-column label="签约日期" prop='contract_date' />
+            <el-table-column label="业务负责人" prop='business_director' />
+            <el-table-column label="洽商金额" prop='negotiation_amount' />
+        </el-table>
+    </div>
+    <div style="margin: 10px 0;">
+        <el-pagination v-model:current-page="pager20.page_no" v-model:page-size="pager20.page_size"
+            :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total19"
+            @size-change="handleSizeChange20" @current-change="handleCurrentChange20" />
+    </div>
+</template>
+
+
+
+<script setup>
+
+import { ref, reactive, defineProps } from "vue"
+import { apiContractLists } from '@/api/contract'
+import { apiContractNegotiationLists } from '@/api/contract_negotiation'
+const props = defineProps({
+    project_id: Number
+})
+
+
+
+
+const tableData19 = ref([])
+const tableData20 = ref([])
+const total18 = ref(0)
+const total19 = ref(0)
+const total20 = ref(0)
+const pager19 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: props.project_id
+})
+
+const pager20 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: props.project_id
+})
+
+//获取项目合同列表
+const contractLists = () => {
+    apiContractLists(pager19).then((res) => {
+        tableData19.value = res.lists
+        total18.value = res.count
+    })
+}
+
+//获取合同洽商列表
+const contcractNegotiationLists = () => {
+    apiContractNegotiationLists(pager20).then((res) => {
+        tableData20.value = res.lists
+        total19.value = res.count
+    })
+}
+
+
+contractLists()
+contcractNegotiationLists()
+</script>
+<style >
+.tit {
+    font-size: 1.2em;
+    margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/project_list/components/documentation.vue b/src/views/project_list/components/documentation.vue
new file mode 100644
index 0000000..dfca4be
--- /dev/null
+++ b/src/views/project_list/components/documentation.vue
@@ -0,0 +1,33 @@
+<template>
+    <myTable :baseData="baseData"></myTable>
+</template>
+
+<script setup>
+
+import { ref, reactive, defineProps } from "vue"
+import myTable from "./myTable.vue"
+import { apiProjectdocumentLists } from '@/api/project_document_set'
+
+const props = defineProps({
+    project_id: Number
+})
+
+
+
+const baseData = reactive({
+    fetchFun: apiProjectdocumentLists,
+    tit: "文档",
+    queryParams: { project_id: props.project_id },
+    columnList: [
+        { label: '排序号', prop: 'sort' },
+        { label: '文档大类', prop: 'large_category' },
+        { label: '文档中类', prop: 'middle_category' },
+        { label: '文档名称', prop: 'name' },
+        { label: '文档描述', prop: 'describe' },
+        { label: '必传', prop: 'is_upload' },
+        { label: '文档', prop: '' },
+    ]
+})
+
+</script>
+
diff --git a/src/views/project_list/components/manpower.vue b/src/views/project_list/components/manpower.vue
new file mode 100644
index 0000000..5d0f649
--- /dev/null
+++ b/src/views/project_list/components/manpower.vue
@@ -0,0 +1,187 @@
+<template>
+    <el-tabs v-model="active" class="demo-tabs">
+
+        <el-tab-pane label="项目人员" name="first-1">
+            <myTable :baseData="baseData" v-if="active == 'first-1'"></myTable>
+        </el-tab-pane>
+        <el-tab-pane label="劳动合同" name="first-2">
+            <!-- <myTable :baseData="baseData1" v-if="active == 'first-2'"></myTable> -->
+            <el-table :data="tableData13" stripe style="width: 100%">
+                <el-table-column label="姓名" prop='project_name' width="180" />
+                <el-table-column label="身份证号" prop='person_idcard' width="180" />
+                <el-table-column label="合同状态" prop='contract_status_text' />
+                <el-table-column label="合同类别" prop='contract_type_text' />
+                <el-table-column label="合同名称" prop='contract_title_text' />
+                <el-table-column label="合同签定日期" prop='signing_date' />
+                <el-table-column label="起始时间" prop='start_date' />
+                <el-table-column label="终止时间" prop='end_date' />
+
+                <el-table-column label="备注" prop='remark' />
+                <el-table-column label="合同附件" prop="annex" show-overflow-tooltip>
+                    <template #default="{ row }">
+                        <div v-if="row.annex && row.annex.length > 0">
+                            <div v-for="(item, i) in row.annex " :key='i'>
+                                <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
+                            </div>
+                        </div>
+                        <div v-else>
+                            暂无文件
+                        </div>
+                    </template>
+                </el-table-column>
+
+            </el-table>
+
+        </el-tab-pane>
+        <el-tab-pane label="保险记录" name="first-3">
+            <myTable :baseData="baseData1" v-if="active == 'first-3'"></myTable>
+        </el-tab-pane>
+        <el-tab-pane label="项目考勤" name="first-4">
+            <myTable :baseData="baseData2" v-if="active == 'first-4'"></myTable>
+        </el-tab-pane>
+        <el-tab-pane label="考勤明细" name="first-5">
+
+            <myTable :baseData="baseData3" v-if="active == 'first-5'"></myTable>
+
+        </el-tab-pane>
+
+
+        <el-tab-pane label="工资付款" name="first-6">
+
+            <myTable :baseData="baseData4" v-if="active == 'first-6'"></myTable>
+
+
+
+        </el-tab-pane>
+    </el-tabs>
+</template>
+
+
+
+<script setup>
+
+import { ref, reactive, defineProps } from "vue"
+import myTable from "./myTable.vue"
+import { projectpersonnelLists } from '@/api/project_personnel'
+import { projectlaborcontractLists } from '@/api/project_labor_contract'
+import { insurancemanagementLists } from '@/api/project_insurance_management'
+import { attendanceRecordLists } from '@/api/project_attendance_record'
+import { attendancedetailLists } from '@/api/project_attendance_detail'
+import { projectsalaryDetailLists } from '@/api/project_salary_detail'
+
+
+const props = defineProps({
+    project_id: Number
+})
+
+const baseData = reactive({
+    fetchFun: projectpersonnelLists,
+    tit: "",
+    queryParams: { project_id: props.project_id },
+    columnList: [
+        { label: '姓名', prop: 'name' },
+        { label: '身份证号', prop: 'idcard' },
+        { label: '手机号', prop: 'mobile' },
+        { label: '工种', prop: 'work_type_text' },
+        { label: '人工单价', prop: 'unit_price' },
+        { label: '每日生活费', prop: 'price' },
+        { label: '期初收入', prop: 'opening_income' },
+        { label: '日结收入', prop: 'daily_income' },
+        { label: '完工量收入', prop: 'work_income' },
+        { label: '总收入', prop: 'total_income' },
+        { label: '总支出', prop: 'pay_out' },
+        { label: '余额', prop: 'balance' },
+    ]
+})
+const baseData1 = reactive({
+    fetchFun: insurancemanagementLists,
+    tit: "",
+    queryParams: { project_id: props.project_id },
+    columnList: [
+        { label: '姓名', prop: 'project_name' },
+        { label: '身份证号', prop: 'person_idcard' },
+        { label: '投保日期', prop: 'insurance_date' },
+        { label: '到期日期', prop: 'due_date' },
+        { label: '保险种类', prop: 'type_text' },
+        { label: '保单号', prop: 'insurance_no' },
+        { label: '投保金额（万元）', prop: 'insured_amount' },
+        { label: '保险公司', prop: 'insurance_company' },
+
+    ]
+})
+
+
+const baseData2 = reactive({
+    fetchFun: attendanceRecordLists,
+    tit: "",
+    queryParams: { project_id: props.project_id },
+    columnList: [
+        { label: '日记工单号', prop: 'attendance_code' },
+        { label: '日期', prop: 'attendance_date' },
+        { label: '出勤人数', prop: 'competitor_contacts_phone' },
+        { label: '记工数量', prop: 'work_record_num_total' },
+        { label: '日工资合计', prop: 'daily_salary_total' },
+        { label: '日生活费合计', prop: 'daily_living_total' },
+        { label: '日补贴合计', prop: 'daily_subsidy_total' },
+        { label: '日其它合计', prop: 'daily_other_total' },
+        { label: '日收入合计', prop: 'daily_income_total' },
+        { label: '备注', prop: 'remark' },
+
+    ]
+})
+const baseData3 = reactive({
+    fetchFun: attendancedetailLists,
+    tit: "",
+    queryParams: { project_id: props.project_id },
+    columnList: [
+        { label: '日记工单号', prop: 'attendance_code' },
+        { label: '日期', prop: 'attendance_date' },
+        { label: '姓名', prop: 'person_name' },
+        { label: '身份证号', prop: 'person_idcard' },
+        { label: '工种', prop: 'work_type_text' },
+        { label: '上班时间', prop: 'work_start_time' },
+        { label: '下班时间', prop: 'work_end_time' },
+        { label: '记工数量', prop: 'work_record_num' },
+        { label: '日工资', prop: 'daily_salary' },
+        { label: '日生活费', prop: 'daily_living' },
+        { label: '日补贴', prop: 'daily_subsidy' },
+        { label: '日其它', prop: 'daily_other' },
+        { label: '日收入', prop: 'daily_income' },
+        { label: '备注', prop: 'remark' },
+
+    ]
+})
+const baseData4 = reactive({
+    fetchFun: projectsalaryDetailLists,
+    tit: "",
+    queryParams: { project_id: props.project_id },
+    columnList: [
+        { label: '工资付款单号', prop: 'payment_code' },
+        { label: '日期', prop: 'apply_date' },
+        { label: '姓名', prop: 'person_name' },
+        { label: '身份证号', prop: 'person_idcard' },
+        { label: '工种', prop: 'person_work_type_text' },
+        { label: '总收入', prop: 'total_income' },
+        { label: '总支出', prop: 'total_pay_out' },
+        { label: '未发放', prop: 'balance' },
+        { label: '本次付款金额', prop: 'apply_amount' },
+        { label: '备注', prop: 'remark' },
+
+    ]
+})
+const pager13 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: props.project_id
+})
+
+const tableData13 = ref("")
+
+const laborcontractLists = () => {
+    projectlaborcontractLists(pager13).then((res) => {
+        tableData13.value = res.lists
+    })
+}
+const active = ref('first-1')
+laborcontractLists()
+</script>
\ No newline at end of file
diff --git a/src/views/project_list/components/myTable.vue b/src/views/project_list/components/myTable.vue
new file mode 100644
index 0000000..060e16d
--- /dev/null
+++ b/src/views/project_list/components/myTable.vue
@@ -0,0 +1,39 @@
+<template>
+    <div class="tit" v-if="baseData.tit">{{ baseData.tit }}</div>
+    <el-table :data="pager.lists" style="width: 100%">
+        <el-table-column :label="item.label" :prop='item.prop' width="180" v-for="(item, index) in baseData.columnList"
+            :key="index" />
+    </el-table>
+    <div class="flex justify-end mt-4">
+        <pagination v-model="pager" @change="getLists" />
+    </div>
+</template>
+<script setup>
+import { ref, reactive, defineProps, toRaw } from "vue"
+import { usePaging } from '@/hooks/usePaging'
+const props = defineProps({
+    baseData: Object,
+})
+
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: props.baseData.fetchFun,
+    params: props.baseData.queryParams || ""
+
+})
+
+getLists()
+
+
+</script>
+<style lang="scss" scoped>
+.tit {
+    font-size: 1.2em;
+    margin-bottom: 10px;
+}
+
+:deep(.my-label) {
+    width: 150px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/project_list/components/payment.vue b/src/views/project_list/components/payment.vue
new file mode 100644
index 0000000..e55efc8
--- /dev/null
+++ b/src/views/project_list/components/payment.vue
@@ -0,0 +1,87 @@
+<template>
+    <myTable :baseData="baseData"></myTable>
+    <myTable :baseData="baseData1"></myTable>
+    <myTable :baseData="baseData2"></myTable>
+    <myTable :baseData="baseData3"></myTable>
+</template>
+
+<script setup>
+
+import { ref, reactive, defineProps } from "vue"
+import myTable from "./myTable.vue"
+import { apifinancereceiptLists } from '@/api/receiptrecord'
+import { paymentplanLists } from '@/api/paymentplan'
+import { paymentapplyLists } from '@/api/paymentrequest'
+import { apiFinancerefundLists } from '@/api/refundrecord'
+
+const props = defineProps({
+    project_id: Number
+})
+
+const baseData = reactive({
+    fetchFun: apifinancereceiptLists,
+    tit: "收票记录",
+    queryParams: { project_id: props.project_id },
+    columnList: [
+        { label: '开票日期', prop: 'invoicing_date' },
+        { label: '提交人', prop: 'commitor' },
+        { label: '发票类型', prop: 'invoice_type' },
+        { label: '发票编号', prop: 'invoice_no' },
+        { label: '发票税率(%)', prop: 'invoice_tax_rate' },
+        { label: '发票金额', prop: 'invoice_amount' },
+        { label: '不含税金额', prop: 'amount_excluding_tax' },
+        { label: '税额', prop: 'tax_amount' },
+    ]
+})
+
+const baseData1 = reactive({
+    fetchFun: paymentplanLists,
+    tit: "付款计划",
+    queryParams: { project_id: props.project_id },
+    columnList: [
+        { label: '计划付款日期', prop: 'pay_date' },
+        { label: '期次', prop: 'period' },
+        { label: '状态', prop: 'status' },
+        { label: '金额', prop: 'amount' },
+        { label: '已付款', prop: 'has_payment_amount' },
+        { label: '未付款', prop: 'not_payment_amoun' },
+        { label: '备注', prop: 'amount_excluding_tax' },
+        { label: '税额', prop: 'remark' },
+    ]
+})
+
+const baseData2 = reactive({
+    fetchFun: paymentapplyLists,
+    tit: "付款记录",
+    queryParams: { project_id: props.project_id },
+    columnList: [
+        { label: '付款单号', prop: 'competitor_name' },
+        { label: '合同编号', prop: 'contract_no' },
+        { label: '供应商名称', prop: 'supplier_name' },
+        { label: '合同类型', prop: 'contract_type' },
+        { label: '期次', prop: 'period' },
+        { label: '付款日期', prop: 'pay_date' },
+        { label: '付款性质', prop: 'payment_natrue' },
+        { label: '付款方式', prop: 'pay_type' },
+        { label: '付款金额', prop: 'amount' },
+    ]
+})
+
+
+const baseData3 = reactive({
+    fetchFun: apiFinancerefundLists,
+    tit: "退款记录",
+    queryParams: { project_id: props.project_id },
+    columnList: [
+        { label: '合同编号', prop: 'contract_no' },
+        { label: '合同名称', prop: 'contract_name' },
+        { label: '供应商名称', prop: 'supplier_name' },
+        { label: '合同类型', prop: 'contract_type' },
+        { label: '期次', prop: 'period' },
+        { label: '退款日期', prop: 'refund_date' },
+        { label: '退款原因', prop: 'reason' },
+        { label: '退款方式', prop: 'refund_type' },
+        { label: '退款金额', prop: 'refund_amount' },
+    ]
+})
+</script>
\ No newline at end of file
diff --git a/src/views/project_list/components/procurement.vue b/src/views/project_list/components/procurement.vue
new file mode 100644
index 0000000..d4ff6ec
--- /dev/null
+++ b/src/views/project_list/components/procurement.vue
@@ -0,0 +1,39 @@
+<template>
+    <myTable :baseData="baseData"></myTable>
+</template>
+
+<script setup>
+
+import { ref, reactive, defineProps } from "vue"
+import myTable from "./myTable.vue"
+import { apiProcurementContractLists } from '@/api/procurement_contract'
+
+const props = defineProps({
+    project_id: Number
+})
+
+
+const baseData = reactive({
+    fetchFun: apiProcurementContractLists,
+    tit: "采购合同",
+    queryParams: { project_id: props.project_id },
+
+    columnList: [
+        { label: '合同编号', prop: 'contract_no' },
+        { label: '供应商名称', prop: 'contract_name' },
+        { label: '合同类型', prop: 'contract_type' },
+        { label: '签订日期', prop: 'signing_date' },
+        { label: '合同金额', prop: 'contract_amount' },
+        { label: '已付款金额', prop: 'has_pay_amount' },
+        { label: '未付款金额', prop: 'not_pay_amount' },
+        { label: '已开票金额', prop: 'invoice_amount' },
+        { label: '未开票金额', prop: 'not_invoice_amount' },
+        { label: '已入库数量', prop: 'has_storage_num' },
+        { label: '未入库数量', prop: 'not_storage_num' },
+        { label: '数量', prop: 'num' },
+    ]
+})
+
+
+</script>
+<style ></style>
\ No newline at end of file
diff --git a/src/views/project_list/components/subcontract.vue b/src/views/project_list/components/subcontract.vue
new file mode 100644
index 0000000..544db46
--- /dev/null
+++ b/src/views/project_list/components/subcontract.vue
@@ -0,0 +1,60 @@
+<template>
+    <myTable :baseData="baseData"></myTable>
+    <myTable :baseData="baseData1"></myTable>
+</template>
+
+<script setup>
+
+import { ref, reactive, defineProps } from "vue"
+import myTable from "./myTable.vue"
+import { apiSubcontractingContractLists } from '@/api/subcontracting_contract'
+import { apinegotiationLists } from '@/api/subcontractor'
+
+const props = defineProps({
+    project_id: Number
+})
+
+const baseData1 = reactive({
+    fetchFun: apinegotiationLists,
+    tit: "分包洽商",
+    queryParams: { project_id: props.project_id },
+
+    columnList: [
+        { label: '洽商编号', prop: 'negotiation_no' },
+        { label: '合同编号', prop: 'contract_no' },
+        { label: '洽商单名称', prop: 'negotiation_name' },
+        { label: '项目名称', prop: 'project_name' },
+        { label: '项目编号', prop: 'project_code' },
+        { label: '供应商', prop: 'supplier_name' },
+        { label: '洽商类别', prop: 'negotiation_type_text' },
+        { label: '洽商报价金额', prop: 'warranty_amount' },
+        { label: '洽商质保金额', prop: 'negotiation_amount' },
+
+    ]
+})
+
+const baseData = reactive({
+    fetchFun: apiSubcontractingContractLists,
+    tit: "分包合同",
+    queryParams: { project_id: props.project_id },
+
+    columnList: [
+        { label: '项目名称', prop: 'project_name' },
+        { label: '合同编号', prop: 'contract_no' },
+        { label: '合同名称', prop: 'contract_name' },
+        { label: '供应商名称', prop: 'supplier_name' },
+        { label: '合同类型', prop: 'contract_type' },
+        { label: '合同金额', prop: 'contract_amount' },
+        { label: '洽商金额', prop: 'negotiation_amount' },
+        { label: '不含税金额', prop: 'excluding_tax_amount' },
+        { label: '实际合同金额', prop: 'reality_contract_amount' },
+        { label: '已付款金额', prop: 'has_pay_amount' },
+        { label: '已开票金额', prop: 'invoice_amount' },
+        { label: '未开票金额', prop: 'not_invoice_amount' },
+        { label: '已退款金额', prop: 'refund_amount' },
+        { label: '结算差异', prop: 'settlement_difference' },
+    ]
+})
+
+
+</script>
\ No newline at end of file
diff --git a/src/views/project_list/components/tender.vue b/src/views/project_list/components/tender.vue
new file mode 100644
index 0000000..50899ff
--- /dev/null
+++ b/src/views/project_list/components/tender.vue
@@ -0,0 +1,268 @@
+<template>
+    <div class="tit">投标决策</div>
+    <div>
+        <el-table :data="tableData6" stripe style="width: 100%">
+            <el-table-column label="流程编号" prop='code' width="180" />
+            <el-table-column label="项目估算(万元)" prop='project_estimation' width="180" />
+            <el-table-column label="资金来源" prop='bidding_project_fund_source' />
+            <el-table-column label="投标时间" prop='bidding_time' />
+            <el-table-column label="招标方式" prop='bid_type' />
+            <el-table-column label="有无保证金" prop='is_margin' />
+            <el-table-column label="保证金金额" prop='margin_amount' />
+            <el-table-column label="开标日期" prop='bid_opening_date' />
+            <el-table-column label="项目把握度" prop='project_assurance' />
+        </el-table>
+    </div>
+    <div style="margin: 20px 0;">
+        <el-pagination v-model:current-page="pager6.page_no" v-model:page-size="pager6.page_size"
+            :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total5"
+            @size-change="handleSizeChange6" @current-change="handleCurrentChange6" />
+    </div>
+
+    <div class="tit">购买标书</div>
+    <div>
+        <el-table :data="tableData7" stripe style="width: 100%">
+            <el-table-column label="流程编号" prop='code' width="180" />
+            <el-table-column label="投标公司名称" prop='bid_company_name' width="180" />
+            <el-table-column label="招标公司名称" prop='invite_tenders_company_name' />
+            <el-table-column label="标书编号" prop='bid_document_no' />
+            <el-table-column label="购买人员" prop='buyer' />
+            <el-table-column label="购买标书金额" prop='amount' />
+        </el-table>
+    </div>
+    <div style="margin: 20px 0;">
+        <el-pagination v-model:current-page="pager7.page_no" v-model:page-size="pager7.page_size"
+            :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total6"
+            @size-change="handleSizeChange7" @current-change="handleCurrentChange7" />
+    </div>
+
+    <div class="tit">标书审查</div>
+    <div>
+        <el-table :data="tableData8" stripe style="width: 100%">
+            <el-table-column label="流程编号" prop='code' width="180" />
+            <el-table-column label="标书编号" prop='bid_document_no' width="180" />
+            <el-table-column label="购买人员" prop='buyer' />
+            <el-table-column label="投标公司名称" prop='bid_company_name' />
+            <el-table-column label="投标时间" prop='bidding_time' />
+            <el-table-column label="开标日期" prop='bid_opening_date' />
+            <el-table-column label="总金额" prop='total_amount' />
+        </el-table>
+    </div>
+    <div style="margin: 20px 0;">
+        <el-pagination v-model:current-page="pager8.page_no" v-model:page-size="pager8.page_size"
+            :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total7"
+            @size-change="handleSizeChange8" @current-change="handleCurrentChange8" />
+    </div>
+
+    <div class="tit">投标结果</div>
+    <div>
+        <el-table :data="tableData9" stripe style="width: 100%">
+            <el-table-column label="投标编号" prop='bid_document_examination_code' width="180" />
+            <el-table-column label="投标时间" prop='bidding_time' width="180" />
+            <el-table-column label="开标日期" prop='bid_opening_date' />
+            <el-table-column label="是否中标" prop='is_successful_text' width="180" />
+            <el-table-column label="中标单位" prop='bidder_company' width="180" />
+            <el-table-column label="中标金额" prop='bidder_amount' />
+
+        </el-table>
+    </div>
+    <div style="margin: 20px 0;">
+        <el-pagination v-model:current-page="pager9.page_no" v-model:page-size="pager9.page_size"
+            :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total8"
+            @size-change="handleSizeChang9" @current-change="handleCurrentChange9" />
+    </div>
+
+    <div class="tit">投标保证金</div>
+    <div>
+        <el-table :data="tableData10" stripe style="width: 100%">
+            <el-table-column label="流程编号" prop='bidding_decision_code' width="180" />
+            <el-table-column label="投标时间" prop='bidding_time' width="180" />
+            <el-table-column label="预计退还时间" prop='refund_date' />
+            <el-table-column label="申请人" prop='applier' />
+            <el-table-column label="保证金金额	" prop='margin_amount' />
+            <el-table-column label="已退金额" prop='refund_amount' />
+            <el-table-column label="未退金额" prop='not_refund_amount' />
+        </el-table>
+    </div>
+    <div style="margin: 20px 0;">
+        <el-pagination v-model:current-page="pager10.page_no" v-model:page-size="pager10.page_size"
+            :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total9"
+            @size-change="handleSizeChange10" @current-change="handleCurrentChange10" />
+    </div>
+    <div class="tit">退投标保证金</div>
+    <div>
+        <el-table :data="tableData11" stripe style="width: 100%">
+            <el-table-column label="投标时间" prop='bidding_time' width="180" />
+            <el-table-column label="退款日期" prop='refund_date' width="180" />
+            <el-table-column label="账户编码" prop='bank_account_info.account_sn' />
+            <el-table-column label="开户银行" prop='bank_account_info.deposit_bank' />
+            <el-table-column label="退款金额" prop='refund_amount' />
+            <el-table-column label="客户名称" prop='custom_name' />
+            <el-table-column label="创建日期" prop='create_time' />
+        </el-table>
+    </div>
+    <div style="margin: 20px 0;">
+        <el-pagination v-model:current-page="pager11.page_no" v-model:page-size="pager11.page_size"
+            :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total10"
+            @size-change="handleSizeChange11" @current-change="handleCurrentChange11" />
+    </div>
+</template>
+
+
+
+<script setup>
+
+import { ref, reactive, defineProps } from "vue"
+import { apiBidBiddingDecisionLists } from '@/api/bid_bidding_decision'
+import { apiBidBuyBiddingDocumentLists } from '@/api/bid_buy_bidding_document'
+import { apiBidDocumentExaminationLists } from '@/api/bid_document_examination'
+import { apiBidResultLists } from '@/api/bid_result'
+import { bidapplyLists } from '@/api/bidbbond'
+import { bidrefundLists } from '@/api/refundbidDeposit'
+
+const props = defineProps({
+    project_id: Number
+})
+
+
+const total5 = ref(0)
+const total6 = ref(0)
+const total7 = ref(0)
+const total8 = ref(0)
+const total9 = ref(0)
+const total10 = ref(0)
+const total11 = ref(0)
+
+const tableData6 = ref([])
+const tableData7 = ref([])
+const tableData8 = ref([])
+const tableData9 = ref([])
+const tableData10 = ref([])
+const tableData11 = ref([])
+
+const pager6 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: props.project_id
+})
+const pager7 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: props.project_id
+})
+const pager8 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: props.project_id
+})
+const pager9 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: props.project_id
+})
+const pager10 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: props.project_id
+})
+const pager11 = reactive({
+    page_size: 10,
+    page_no: 1,
+    project_id: props.project_id
+})
+
+
+
+// const handleSizeChange6 = (val: number) => {
+//     pager6.page_size = val
+//     decisionLists()
+// }
+
+// const handleSizeChange7 = (val: number) => {
+
+//     pager7.page_size = val
+//     buydocumentLists()
+// }
+// const handleSizeChange8 = (val: number) => {
+
+//     pager8.page_size = val
+//     examinationLists()
+// }
+// const handleSizeChange9 = (val: number) => {
+
+//     pager9.page_size = val
+//     bidResultLists()
+// }
+// const handleSizeChange10 = (val: number) => {
+
+//     pager10.page_size = val
+//     applyLists()
+// }
+
+// const handleSizeChange11 = (val: number) => {
+
+//     pager11.page_size = val
+
+//     refundLists()
+// }
+
+//获取投标决策列表
+const decisionLists = () => {
+    apiBidBiddingDecisionLists(pager6).then((res) => {
+        tableData6.value = res.lists
+        total5.value = res.count
+    })
+}
+
+
+//获取购买标书列表
+const buydocumentLists = () => {
+    apiBidBuyBiddingDocumentLists(pager7).then((res) => {
+        tableData7.value = res.lists
+        total6.value = res.count
+    })
+}
+
+
+//获取标书审查列表
+const examinationLists = () => {
+    apiBidDocumentExaminationLists(pager8).then((res) => {
+        tableData8.value = res.lists
+        total7.value = res.count
+    })
+}
+
+//获取投标结果列表
+const bidResultLists = () => {
+    apiBidResultLists(pager9).then((res) => {
+        tableData9.value = res.lists
+        total8.value = res.count
+    })
+}
+//获取投标保证金列表
+const applyLists = () => {
+    bidapplyLists(pager10).then((res) => {
+        tableData10.value = res.lists
+        total9.value = res.count
+    })
+}
+//获取退投标保证金列表
+const refundLists = () => {
+    bidrefundLists(pager11).then((res) => {
+        tableData11.value = res.lists
+        total10.value = res.count
+    })
+}
+decisionLists()
+buydocumentLists()
+examinationLists()
+applyLists()
+bidResultLists()
+refundLists()
+</script>
+<style >
+.tit {
+    font-size: 1.2em;
+    margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/project_list/detail.vue b/src/views/project_list/detail.vue
index b4537d3..11a56dc 100644
--- a/src/views/project_list/detail.vue
+++ b/src/views/project_list/detail.vue
@@ -5,577 +5,52 @@
             <el-form ref="formRef" :model="formData" label-width="auto">
                 <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
                     <el-tab-pane label="概况" name="demo-1">
-
-
-                        <el-descriptions :column="3" title="基本信息" border>
-                            <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">{{ formData.org_name }}</el-descriptions-item>
-                            <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label"> {{ formData.dept_name }}</el-descriptions-item>
-                            <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">{{ formData.name }}</el-descriptions-item>
-                            <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_code }}</el-descriptions-item>
-                            <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label"> {{ formData.custom_name }}</el-descriptions-item>
-                            <el-descriptions-item label="项目状态" label-align="left" align="left" label-class-name="my-label">
-                                {{ formData.status_text }}
-                            </el-descriptions-item>
-                            <el-descriptions-item label="项目类型" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_type_name }}</el-descriptions-item>
-                            <el-descriptions-item label="立项日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.create_time }}</el-descriptions-item>
-                            <el-descriptions-item label="项目所在地" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_address }}</el-descriptions-item>
-                            <el-descriptions-item label="战略意义" label-align="left" align="left" label-class-name="my-label"> {{ formData.strategic_significance_text }}</el-descriptions-item>
-                            <el-descriptions-item label="所属行业" label-align="left" align="left" label-class-name="my-label"> {{ formData.industry_text }}</el-descriptions-item>
-                            <el-descriptions-item label="单位性质" label-align="left" align="left" label-class-name="my-label"> {{ formData.unit_nature_text }}</el-descriptions-item>
-                            <el-descriptions-item label="招标方式" label-align="left" align="left" label-class-name="my-label"> {{ formData.bidding_method_text }}</el-descriptions-item>
-                            <el-descriptions-item label="投标时间" label-align="left" align="left" label-class-name="my-label"> {{ formData.bidding_time }}</el-descriptions-item>
-                            <el-descriptions-item label="预计工期" label-align="left" align="left" label-class-name="my-label"> {{ formData.estimated_construction }}</el-descriptions-item>
-                            <el-descriptions-item label="项目估算(万元)" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_estimation }}</el-descriptions-item>
-                            <el-descriptions-item label="项目估算(外币)" label-align="left" align="left" label-class-name="my-label"> {{ formData.name }}</el-descriptions-item>
-                            <el-descriptions-item label="联系人" label-align="left" align="left" label-class-name="my-label"> {{ formData.contacts }}</el-descriptions-item>
-                            <el-descriptions-item label="联系人部门" label-align="left" align="left" label-class-name="my-label"> {{ formData.department }}</el-descriptions-item>
-                            <el-descriptions-item label="联系人职位" label-align="left" align="left" label-class-name="my-label"> {{ formData.position }}</el-descriptions-item>
-                            <el-descriptions-item label="关系度" label-align="left" align="left" label-class-name="my-label"> {{ formData.telephone }}</el-descriptions-item>
-                            <el-descriptions-item label="发现时间" label-align="left" align="left" label-class-name="my-label"> {{ formData.discovery_time }}</el-descriptions-item>
-                            <el-descriptions-item label="信息来源" label-align="left" align="left" label-class-name="my-label"> {{ formData.information_sources_text }}</el-descriptions-item>
-                            <el-descriptions-item label="负责人" label-align="left" align="left" label-class-name="my-label"> {{ formData.person }}</el-descriptions-item>
-                            <el-descriptions-item label="项目内容" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_content }}</el-descriptions-item>
-                            <el-descriptions-item label="竞争对手" label-align="left" align="left" label-class-name="my-label"> {{ formData.competitor }}</el-descriptions-item>
-                            <el-descriptions-item label="项目建设资金来源" label-align="left" align="left" label-class-name="my-label"> {{ formData.construction_funds_sources_text }}</el-descriptions-item>
-                            <el-descriptions-item label="建设单位付款方式" label-align="left" align="left" label-class-name="my-label"> {{ formData.construction_payment_method }}</el-descriptions-item>
-                            <el-descriptions-item label="建设单位财务状况" label-align="left" align="left" label-class-name="my-label"> {{ formData.construction_financial_status_text }}</el-descriptions-item>
-                            <el-descriptions-item label="建设单位对我方认可度" label-align="left" align="left" label-class-name="my-label"> {{ formData.construction_recognition_text }}</el-descriptions-item>
-                            <el-descriptions-item label="我方对建设单位认可度" label-align="left" align="left" label-class-name="my-label"> {{ formData.my_construction_recognition_text }}</el-descriptions-item>
-                            <!-- <el-descriptions-item label="项目开始日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.notes }}</el-descriptions-item>
-                            <el-descriptions-item label="项目交付日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.notes }}</el-descriptions-item> -->
-
-
-
-
-
-                            <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
-                                <div v-if="formData.annex && formData.annex.length > 0">
-                                    <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">文件{{ index + 1 }} 查看</a>
-                                    </div>
-                                </div>
-                                <div v-else>
-                                    暂无文件
-                                </div>
-                            </el-descriptions-item>
-
-
-                        </el-descriptions>
-
+                        <Overview :formData="formData" v-if="activeName == 'demo-1'"></Overview>
                     </el-tab-pane>
+
                     <el-tab-pane label="商机" name="demo-2">
-                        <div class="tit">项目跟进</div>
-                        <div>
-                            <el-table :data="tableData1" stripe style="width: 100%">
-                                <el-table-column label="主题" prop='theme' width="180" />
-                                <el-table-column label="日期" prop='follow_date' width="180" />
-                                <el-table-column label="方案内容" prop='solution_content' />
-                                <el-table-column label="类型" prop='follow_type_text' />
-                                <el-table-column label="执行人" prop='executor' />
-                                <el-table-column label="阶段" prop='follow_stage_text' />
-                                <el-table-column label="状态" prop='follow_status_text' />
-                                <el-table-column label="项目把握度" prop='project_assurance_text' />
-                            </el-table>
-                        </div>
-                        <div style="margin: 20px 0;">
-                            <el-pagination v-model:current-page="pager1.page_no" v-model:page-size="pager1.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange1" @current-change="handleCurrentChange1" />
-                        </div>
-
-                        <div class="tit">客户需求</div>
-                        <div>
-                            <el-table :data="tableData2" stripe style="width: 100%">
-                                <el-table-column label="需求主题" prop='theme' width="180" />
-                                <el-table-column label="重要程度" prop='importance_text' width="180" />
-                                <el-table-column label="记录时间" prop='recording_time' />
-                                <el-table-column label="需求内容" prop='demand_content' />
-                                <el-table-column label="附件" prop="annex" show-overflow-tooltip>
-                                    <template #default="{ row }">
-                                        <div v-if="row.annex && row.annex.length > 0">
-                                            <div v-for="(item, i) in row.annex " :key='i'>
-                                                <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
-                                            </div>
-                                        </div>
-                                        <div v-else>
-                                            暂无文件
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </div>
-                        <div style="margin: 20px 0;">
-                            <el-pagination v-model:current-page="pager2.page_no" v-model:page-size="pager2.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total1" @size-change="handleSizeChange2" @current-change="handleCurrentChange2" />
-                        </div>
-
-                        <div class="tit">解决方案</div>
-                        <div>
-                            <el-table :data="tableData3" stripe style="width: 100%">
-                                <el-table-column label="解决方案主题" prop='customer_demand_name' width="180" />
-                                <el-table-column label="提交时间" prop='submission_time' width="180" />
-                                <el-table-column label="方案内容" prop='solution_content' />
-                                <el-table-column label="客户反馈" prop='customer_feedback' />
-                                <el-table-column label="附件" prop="annex" show-overflow-tooltip>
-                                    <template #default="{ row }">
-                                        <div v-if="row.annex && row.annex.length > 0">
-                                            <div v-for="(item, i) in row.annex " :key='i'>
-                                                <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
-                                            </div>
-                                        </div>
-                                        <div v-else>
-                                            暂无文件
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </div>
-                        <div style="margin: 20px 0;">
-                            <el-pagination v-model:current-page="pager3.page_no" v-model:page-size="pager3.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total2" @size-change="handleSizeChange3" @current-change="handleCurrentChange3" />
-                        </div>
-
-                        <div class="tit">项目概算</div>
-                        <div>
-                            <el-table :data="tableData4" stripe style="width: 100%">
-                                <el-table-column label="概算来源" prop='estimate_source_text' width="180" />
-                                <el-table-column label="制单人" prop='create_user' width="180" />
-                                <el-table-column label="报价日期" prop='quotation_date' />
-                                <el-table-column label="技术人员" prop='technician_name' width="180" />
-                                <el-table-column label="概算金额(万元)" prop='estimate_amount' width="180" />
-                                <el-table-column label="要求" prop='ask' />
-                                <el-table-column label="附件" prop="annex" show-overflow-tooltip>
-                                    <template #default="{ row }">
-                                        <div v-if="row.annex && row.annex.length > 0">
-                                            <div v-for="(item, i) in row.annex " :key='i'>
-                                                <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
-                                            </div>
-                                        </div>
-                                        <div v-else>
-                                            暂无文件
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </div>
-                        <div style="margin: 20px 0;">
-                            <el-pagination v-model:current-page="pager4.page_no" v-model:page-size="pager4.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total3" @size-change="handleSizeChange4" @current-change="handleCurrentChange4" />
-                        </div>
-
-                        <div class="tit">竞争对手</div>
-                        <div>
-                            <el-table :data="tableData5" stripe style="width: 100%">
-                                <el-table-column label="竞争对手名称" prop='competitor_name' width="180" />
-                                <el-table-column label="竞争对手联系人" prop='competitor_contacts' width="180" />
-                                <el-table-column label="联系人电话" prop='competitor_contacts_phone' />
-                                <el-table-column label="竞争能力" prop='competitive_power' />
-                                <el-table-column label="竞争对手优势" prop='competitor_advantages' />
-                                <el-table-column label="竞争对手劣势" prop='competitor_disadvantages' />
-                                <el-table-column label="备注" prop='remark' />
-                                <el-table-column label="附件" prop="annex" show-overflow-tooltip>
-                                    <template #default="{ row }">
-                                        <div v-if="row.annex && row.annex.length > 0">
-                                            <div v-for="(item, i) in row.annex " :key='i'>
-                                                <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
-                                            </div>
-                                        </div>
-                                        <div v-else>
-                                            暂无文件
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </div>
-                        <div style="margin: 20px 0;">
-                            <el-pagination v-model:current-page="pager5.page_no" v-model:page-size="pager5.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total4" @size-change="handleSizeChange5" @current-change="handleCurrentChange5" />
-                        </div>
-
+                        <Business v-if="activeName == 'demo-2'" :project_id="project_id"></Business>
                     </el-tab-pane>
+
                     <el-tab-pane label="投标" name="demo-3">
-                        <div class="tit">投标决策</div>
-                        <div>
-                            <el-table :data="tableData6" stripe style="width: 100%">
-                                <el-table-column label="流程编号" prop='code' width="180" />
-                                <el-table-column label="项目估算(万元)" prop='project_estimation' width="180" />
-                                <el-table-column label="资金来源" prop='bidding_project_fund_source' />
-                                <el-table-column label="投标时间" prop='bidding_time' />
-                                <el-table-column label="招标方式" prop='bid_type' />
-                                <el-table-column label="有无保证金" prop='is_margin' />
-                                <el-table-column label="保证金金额" prop='margin_amount' />
-                                <el-table-column label="开标日期" prop='bid_opening_date' />
-                                <el-table-column label="项目把握度" prop='project_assurance' />
-                            </el-table>
-                        </div>
-                        <div style="margin: 20px 0;">
-                            <el-pagination v-model:current-page="pager6.page_no" v-model:page-size="pager6.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total5" @size-change="handleSizeChange6" @current-change="handleCurrentChange6" />
-                        </div>
-
-                        <div class="tit">购买标书</div>
-                        <div>
-                            <el-table :data="tableData7" stripe style="width: 100%">
-                                <el-table-column label="流程编号" prop='code' width="180" />
-                                <el-table-column label="投标公司名称" prop='bid_company_name' width="180" />
-                                <el-table-column label="招标公司名称" prop='invite_tenders_company_name' />
-                                <el-table-column label="标书编号" prop='bid_document_no' />
-                                <el-table-column label="购买人员" prop='buyer' />
-                                <el-table-column label="购买标书金额" prop='amount' />
-                            </el-table>
-                        </div>
-                        <div style="margin: 20px 0;">
-                            <el-pagination v-model:current-page="pager7.page_no" v-model:page-size="pager7.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total6" @size-change="handleSizeChange7" @current-change="handleCurrentChange7" />
-                        </div>
-
-                        <div class="tit">标书审查</div>
-                        <div>
-                            <el-table :data="tableData8" stripe style="width: 100%">
-                                <el-table-column label="流程编号" prop='code' width="180" />
-                                <el-table-column label="标书编号" prop='bid_document_no' width="180" />
-                                <el-table-column label="购买人员" prop='buyer' />
-                                <el-table-column label="投标公司名称" prop='bid_company_name' />
-                                <el-table-column label="投标时间" prop='bidding_time' />
-                                <el-table-column label="开标日期" prop='bid_opening_date' />
-                                <el-table-column label="总金额" prop='total_amount' />
-                            </el-table>
-                        </div>
-                        <div style="margin: 20px 0;">
-                            <el-pagination v-model:current-page="pager8.page_no" v-model:page-size="pager8.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total7" @size-change="handleSizeChange8" @current-change="handleCurrentChange8" />
-                        </div>
-
-                        <div class="tit">投标结果</div>
-                        <div>
-                            <el-table :data="tableData9" stripe style="width: 100%">
-                                <el-table-column label="投标编号" prop='bid_document_examination_code' width="180" />
-                                <el-table-column label="投标时间" prop='bidding_time' width="180" />
-                                <el-table-column label="开标日期" prop='bid_opening_date' />
-                                <el-table-column label="是否中标" prop='is_successful_text' width="180" />
-                                <el-table-column label="中标单位" prop='bidder_company' width="180" />
-                                <el-table-column label="中标金额" prop='bidder_amount' />
-
-                            </el-table>
-                        </div>
-                        <div style="margin: 20px 0;">
-                            <el-pagination v-model:current-page="pager9.page_no" v-model:page-size="pager9.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total8" @size-change="handleSizeChang9" @current-change="handleCurrentChange9" />
-                        </div>
-
-                        <div class="tit">投标保证金</div>
-                        <div>
-                            <el-table :data="tableData10" stripe style="width: 100%">
-                                <el-table-column label="流程编号" prop='bidding_decision_code' width="180" />
-                                <el-table-column label="投标时间" prop='bidding_time' width="180" />
-                                <el-table-column label="预计退还时间" prop='refund_date' />
-                                <el-table-column label="申请人" prop='applier' />
-                                <el-table-column label="保证金金额	" prop='margin_amount' />
-                                <el-table-column label="已退金额" prop='refund_amount' />
-                                <el-table-column label="未退金额" prop='not_refund_amount' />
-                            </el-table>
-                        </div>
-                        <div style="margin: 20px 0;">
-                            <el-pagination v-model:current-page="pager10.page_no" v-model:page-size="pager10.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total9" @size-change="handleSizeChange10" @current-change="handleCurrentChange10" />
-                        </div>
-                        <div class="tit">退投标保证金</div>
-                        <div>
-                            <el-table :data="tableData11" stripe style="width: 100%">
-                                <el-table-column label="投标时间" prop='bidding_time' width="180" />
-                                <el-table-column label="退款日期" prop='refund_date' width="180" />
-                                <el-table-column label="账户编码" prop='bank_account_info.account_sn' />
-                                <el-table-column label="开户银行" prop='bank_account_info.deposit_bank' />
-                                <el-table-column label="退款金额" prop='refund_amount' />
-                                <el-table-column label="客户名称" prop='custom_name' />
-                                <el-table-column label="创建日期" prop='create_time' />
-                            </el-table>
-                        </div>
-                        <div style="margin: 20px 0;">
-                            <el-pagination v-model:current-page="pager11.page_no" v-model:page-size="pager11.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total10" @size-change="handleSizeChange11" @current-change="handleCurrentChange11" />
-                        </div>
+                        <tender v-if="activeName == 'demo-3'" :project_id="project_id"></tender>
                     </el-tab-pane>
+
                     <el-tab-pane label="合同" name="demo-4">
-                        <div class='tit'>主合同</div>
-                        <div>
-                            <el-table :data="tableData19" stripe style="width: 100%">
-                                <el-table-column label="合同编号" prop='contract_name' width="180" />
-                                <el-table-column label="合同名称" prop='contract_code' width="180" />
-                                <el-table-column label="合同类型" prop='contract_type_text' />
-                                <el-table-column label="负责人" prop='business_director_name' />
-                                <el-table-column label="签约日期" prop='contract_date' />
-                                <el-table-column label="合同金额" prop='amount' />
-                                <el-table-column label="洽商金额" prop='negotiation_amount' />
-                                <el-table-column label="实际合同金额" prop='reality_contract_amount' />
-                                <el-table-column label="已回款" prop='returned_amount' />
-                                <el-table-column label="未回款" prop='not_returned_amount' />
-                                <el-table-column label="已开票" prop='invoicing_amount' />
-                                <el-table-column label="未开票" prop='not_invoicing_amount' />
-                            </el-table>
-                        </div>
-                        <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager19.page_no" v-model:page-size="pager19.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total18" @size-change="handleSizeChange19" @current-change="handleCurrentChange19" />
-                        </div>
-                        <div class='tit' style="margin: 20px 0;">合同洽商</div>
-                        <div>
-                            <el-table :data="tableData20" stripe style="width: 100%">
-                                <el-table-column label="洽商编号" prop='negotiation_no' width="180" />
-                                <el-table-column label="洽商单名称" prop='negotiation_name' width="180" />
-                                <el-table-column label="合同编号" prop='contract_code' />
-                                <el-table-column label="洽商类别" prop='negotiation_type' />
-                                <el-table-column label="签约日期" prop='contract_date' />
-                                <el-table-column label="业务负责人" prop='business_director' />
-                                <el-table-column label="洽商金额" prop='negotiation_amount' />
-                            </el-table>
-                        </div>
-                        <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager20.page_no" v-model:page-size="pager20.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total19" @size-change="handleSizeChange20" @current-change="handleCurrentChange20" />
-                        </div>
+                        <contract v-if="activeName == 'demo-4'" :project_id="project_id"></contract>
                     </el-tab-pane>
 
                     <el-tab-pane label="预算" name="demo-5">
-                        <div class='tit'>分包预算</div>
-                        <div>
-                            <el-table :data="tableData21" stripe style="width: 100%">
-                                <el-table-column label="工作类型" prop='work_type' width="180" />
-                                <el-table-column label="工作内容" prop='work_content' width="180" />
-                                <el-table-column label="项目特征" prop='project_features' />
-                                <el-table-column label="单位" prop='unit' />
-                                <!-- <el-table-column label="首次预算量" prop='classification' />
-                                <el-table-column label="预算调整量" prop='is_solve_text' /> -->
-                                <el-table-column label="预算工作量" prop='num' />
-                                <el-table-column label="单价" prop='price' />
-                                <el-table-column label="金额" prop='amount' />
-                                <el-table-column label="已分包量" prop='has_subcontract_num' />
-                                <el-table-column label="剩余工作量" prop='residue_num' />
-                            </el-table>
-                        </div>
-                        <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager21.page_no" v-model:page-size="pager21.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total20" @size-change="handleSizeChange21" @current-change="handleCurrentChange21" />
-                        </div>
-
+                        <budget v-if="activeName == 'demo-5'" :project_id="project_id"></budget>
                     </el-tab-pane>
+
                     <el-tab-pane label="采购" name="demo-8">
-                        <div class='tit'>采购合同</div>
-                        <div>
-                            <el-table :data="tableData26" stripe style="width: 100%">
-                                <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
-                                <el-table-column label="供应商名称" prop="contract_name" show-overflow-tooltip />
-                                <el-table-column label="合同类型" prop="contract_type" show-overflow-tooltip />
-                                <el-table-column label="签订日期" prop="signing_date" show-overflow-tooltip />
-                                <el-table-column label="合同金额" prop="contract_amount" show-overflow-tooltip />
-                                <!-- <el-table-column label="实际合同金额" prop="negotiation_amount" show-overflow-tooltip /> -->
-                                <el-table-column label="已付款金额" prop="has_pay_amount" show-overflow-tooltip />
-                                <el-table-column label="未付款金额" prop="not_pay_amount" show-overflow-tooltip />
-                                <el-table-column label="已开票金额" prop="invoice_amount" show-overflow-tooltip />
-                                <el-table-column label="未开票金额" prop="not_invoice_amount" show-overflow-tooltip />
-                                <el-table-column label="已入库数量" prop="has_storage_num" show-overflow-tooltip />
-                                <el-table-column label="未入库数量" prop="not_storage_num" show-overflow-tooltip />
-                                <el-table-column label="数量" prop="num" show-overflow-tooltip />
-                            </el-table>
-                        </div>
-                        <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager26.page_no" v-model:page-size="pager26.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total25" @size-change="handleSizeChange26" @current-change="handleCurrentChange26" />
-                        </div>
-
+                        <procurement v-if="activeName == 'demo-8'" :project_id="project_id"></procurement>
                     </el-tab-pane>
+
                     <el-tab-pane label="分包" name="demo-9">
-
-                        <div class='tit'>分包合同</div>
-                        <div>
-                            <el-table :data="tableData27" stripe style="width: 100%">
-                                <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_name" show-overflow-tooltip />
-                                <el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
-                                <el-table-column label="签订日期" prop="signing_date" show-overflow-tooltip />
-                                <el-table-column label="合同类型" prop="contract_type" show-overflow-tooltip />
-                                <el-table-column label="合同金额" prop="contract_amount" show-overflow-tooltip />
-                                <!-- <el-table-column label="税率" prop="tax_rate" show-overflow-tooltip /> -->
-                                <el-table-column label="洽商金额" prop="negotiation_amount" show-overflow-tooltip />
-                                <el-table-column label="不含税金额" prop="excluding_tax_amount" show-overflow-tooltip />
-                                <el-table-column label="实际合同金额" prop="reality_contract_amount" show-overflow-tooltip />
-                                <el-table-column label="已付款金额" prop="has_pay_amount" show-overflow-tooltip />
-                                <el-table-column label="未付款金额" prop="not_pay_amount" show-overflow-tooltip />
-                                <el-table-column label="已开票金额" prop="invoice_amount" show-overflow-tooltip />
-                                <el-table-column label="未开票金额" prop="not_invoice_amount" show-overflow-tooltip />
-                                <el-table-column label="已退款金额" prop="refund_amount" show-overflow-tooltip />
-                                <el-table-column label="结算差异" prop="settlement_difference" show-overflow-tooltip />
-
-                            </el-table>
-                        </div>
-                        <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager27.page_no" v-model:page-size="pager27.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total26" @size-change="handleSizeChange27" @current-change="handleCurrentChange27" />
-                        </div>
-                        <div class='tit' style="margin: 20px 0;">分包洽商</div>
-                        <div>
-                            <el-table :data="tableData28" stripe style="width: 100%">
-                                <el-table-column label="洽商编号" prop="negotiation_no" show-overflow-tooltip />
-                                <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
-                                <el-table-column label="洽商单名称" prop="negotiation_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="supplier_name" show-overflow-tooltip />
-                                <el-table-column label="洽商类别" prop="negotiation_type_text" show-overflow-tooltip />
-                                <el-table-column label="签订日期" prop="sign_date" show-overflow-tooltip />
-                                <el-table-column label="洽商报价金额" prop="warranty_amount" show-overflow-tooltip />
-                                <el-table-column label="洽商质保金额" prop="negotiation_amount" show-overflow-tooltip />
-                            </el-table>
-                        </div>
-                        <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager28.page_no" v-model:page-size="pager28.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total27" @size-change="handleSizeChange28" @current-change="handleCurrentChange28" />
-                        </div>
+                        <subcontract v-if="activeName == 'demo-9'" :project_id="project_id"></subcontract>
                     </el-tab-pane>
-                    <el-tab-pane label="收款" name="demo-14">
-                        <div class='tit'>开票记录</div>
-                        <div>
-                            <el-table :data="tableData29" stripe style="width: 100%">
-                                <el-table-column label="开票单号" prop='invoicing_code' width="180" />
-                                <el-table-column label="合同编号" prop='contract_code' width="180" />
-                                <el-table-column label="合同名称" prop='contract_name' />
-                                <el-table-column label="开票日期" prop='invoicing_date' width="180" />
-                                <el-table-column label="期次" prop='period' width="180" />
-                                <el-table-column label="发票类型" prop='invoice_type' />
-                                <!-- <el-table-column label="申请人" prop='amount_excluding_tax' /> -->
-                                <el-table-column label="发票编号" prop='tax' />
-                                <el-table-column label="开票金额(含税)	" prop='amount_including_tax' />
-                                <el-table-column label="开票金额(非税)" prop='invoicing_amount' />
-                                <el-table-column label="税率" prop='tax_rate' />
-                                <el-table-column label="税额" prop='tax_amount' />
-                            </el-table>
-                        </div>
-                        <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager29.page_no" v-model:page-size="pager29.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total28" @size-change="handleSizeChange29" @current-change="handleCurrentChange29" />
-                        </div>
 
-
-                        <div class='tit' style="margin:20px 0">回款计划</div>
-                        <div>
-                            <el-table :data="tableData30" stripe style="width: 100%">
-                                <el-table-column label="合同编号" prop='contract_code' width="180" />
-                                <el-table-column label="合同名称" prop='contract_name' width="180" />
-                                <el-table-column label="期次" prop='period' />
-                                <el-table-column label="计划日期" prop='return_date' />
-                                <el-table-column label="状态" prop='return_status' />
-                                <el-table-column label="金额" prop='amount' />
-                                <el-table-column label="已回款" prop='has_return_amount' />
-                                <el-table-column label="未回款" prop='not_return_amount' />
-
-                            </el-table>
-                        </div>
-                        <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager30.page_no" v-model:page-size="pager30.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total29" @size-change="handleSizeChange30" @current-change="handleCurrentChange30" />
-                        </div>
-
-
-                        <div class='tit' style="margin:20px 0">回款记录</div>
-                        <div>
-                            <el-table :data="tableData31" stripe style="width: 100%">
-                                <el-table-column label="合同名称" prop='contract_name' width="180" />
-                                <el-table-column label="合同编号" prop='contract_code' width="180" />
-                                <el-table-column label="期次" prop='period' />
-                                <el-table-column label="日期" prop='return_date' />
-                                <el-table-column label="金额" prop='amount' />
-                                <!-- <el-table-column label="累计回款" prop='is_solve_text' /> -->
-                                <el-table-column label="收款人" prop='receiver' />
-
-                            </el-table>
-                        </div>
-                        <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager31.page_no" v-model:page-size="pager31.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total30" @size-change="handleSizeChange31" @current-change="handleCurrentChange31" />
-                        </div>
-
-
-                        <div class='tit' style="margin:20px 0">退款记录</div>
-                        <div>
-                            <el-table :data="tableData32" stripe style="width: 100%">
-                                <el-table-column label="退款单号" prop='refund_code' width="180" />
-                                <el-table-column label="合同编号" prop='contract_code' width="180" />
-                                <el-table-column label="合同名称" prop='contract_nanme' width="180" />
-
-                                <el-table-column label="退款日期" prop='refund_date' width="180" />
-                                <el-table-column label="退款原因" prop='reason' />
-                                <el-table-column label="退款方式" prop='refund_type' />
-                                <el-table-column label="退款金额" prop='amount' />
-                                <el-table-column label="备注" prop='remark' />
-                            </el-table>
-                        </div>
-
-                        <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager32.page_no" v-model:page-size="pager32.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total31" @size-change="handleSizeChange32" @current-change="handleCurrentChange32" />
-                        </div>
-
-                    </el-tab-pane>
-                    <el-tab-pane label="付款" name="demo-15">
-                        <div class='tit'>收票记录</div>
-                        <div>
-                            <el-table :data="tableData22" stripe style="width: 100%">
-                                <el-table-column label="开票日期" prop='invoicing_date' width="180" />
-                                <el-table-column label="提交人" prop='commitor' width="180" />
-                                <el-table-column label="发票类型" prop='invoice_type' />
-                                <el-table-column label="发票编号" prop='invoice_no' width="180" />
-                                <el-table-column label="发票税率(%)" prop='invoice_tax_rate' width="180" />
-                                <el-table-column label="发票金额" prop='invoice_amount' />
-                                <el-table-column label="不含税金额" prop='amount_excluding_tax' />
-                                <el-table-column label="税额" prop='tax' />
-
-                            </el-table>
-                        </div>
-                        <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager22.page_no" v-model:page-size="pager22.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total21" @size-change="handleSizeChange22" @current-change="handleCurrentChange22" />
-                        </div>
-
-
-                        <div class='tit' style="margin:20px 0">付款计划</div>
-                        <div>
-                            <el-table :data="tableData23" stripe style="width: 100%">
-                                <el-table-column label="计划付款日期" prop='pay_date' width="180" />
-                                <el-table-column label="期次" prop='period' width="180" />
-                                <el-table-column label="状态" prop='status' />
-                                <el-table-column label="金额" prop='amount' />
-                                <el-table-column label="已付款" prop='has_payment_amount' />
-                                <el-table-column label="未付款" prop='not_payment_amoun' />
-                                <el-table-column label="备注" prop='remark' />
-
-                            </el-table>
-                        </div>
-                        <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager23.page_no" v-model:page-size="pager23.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total22" @size-change="handleSizeChange23" @current-change="handleCurrentChange23" />
-                        </div>
-
-
-                        <div class='tit' style="margin:20px 0">付款记录</div>
-                        <div>
-                            <el-table :data="tableData24" stripe style="width: 100%">
-                                <el-table-column label="付款单号" prop='competitor_name' width="180" />
-                                <el-table-column label="合同编号" prop='contract_no' width="180" />
-                                <el-table-column label="供应商名称" prop='supplier_name' />
-                                <el-table-column label="合同类型" prop='contract_type' />
-                                <el-table-column label="期次" prop='period' />
-                                <el-table-column label="付款日期" prop='pay_date' />
-                                <el-table-column label="付款性质" prop='payment_natrue' />
-                                <el-table-column label="付款方式" prop='pay_type' />
-                                <el-table-column label="开票状态" prop='' />
-                                <el-table-column label="付款金额" prop='amount' />
-
-                            </el-table>
-                        </div>
-                        <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager24.page_no" v-model:page-size="pager24.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total23" @size-change="handleSizeChange24" @current-change="handleCurrentChange24" />
-                        </div>
-
-
-                        <div class='tit' style="margin:20px 0">退款记录</div>
-                        <div>
-                            <el-table :data="tableData25" stripe style="width: 100%">
-                                <el-table-column label="合同编号" prop='contract_no' width="180" />
-                                <el-table-column label="合同名称" prop='contract_nanme' width="180" />
-                                <el-table-column label="供应商名称" prop='supplier_name' width="180" />
-                                <el-table-column label="合同类型" prop='contract_type' width="180" />
-                                <el-table-column label="退款日期" prop='refund_date' width="180" />
-                                <el-table-column label="退款原因" prop='reason' />
-                                <el-table-column label="退款方式" prop='refund_type' />
-                                <el-table-column label="退款金额" prop='refund_amount' />
-
-                            </el-table>
-                        </div>
-
-                        <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager25.page_no" v-model:page-size="pager25.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total24" @size-change="handleSizeChange25" @current-change="handleCurrentChange25" />
-                        </div>
-
-
-                    </el-tab-pane>
                     <el-tab-pane label="人力" name="demo-12">
+                        <manpower v-if="activeName == 'demo-12'" :project_id="project_id"></manpower>
+                    </el-tab-pane>
+
+                    <el-tab-pane label="收款" name="demo-14">
+                        <Collection v-if="activeName == 'demo-14'" :project_id="project_id"></Collection>
+                    </el-tab-pane>
+
+                    <el-tab-pane label="付款" name="demo-15">
+                        <payment v-if="activeName == 'demo-15'" :project_id="project_id"></payment>
+                    </el-tab-pane>
+
+                    <el-tab-pane label="文档" name="demo-16">
+                        <documentation v-if="activeName == 'demo-16'" :project_id="project_id"></documentation>
+                    </el-tab-pane>
+
+
+
+                    <!-- <el-tab-pane label="人力" name="demo-12">
 
                         <el-tabs v-model="active" class="demo-tabs">
                             <el-tab-pane label="项目人员" name="first-1">
@@ -596,7 +71,10 @@
                                     </el-table>
                                 </div>
                                 <div style="margin: 20px 0;">
-                                    <el-pagination v-model:current-page="pager12.page_no" v-model:page-size="pager12.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total11" @size-change="handleSizeChange12" @current-change="handleCurrentChange12" />
+                                    <el-pagination v-model:current-page="pager12.page_no"
+                                        v-model:page-size="pager12.page_size" :page-sizes="[10, 20, 30, 40]"
+                                        layout="total, sizes, prev, pager, next, jumper" :total="total11"
+                                        @size-change="handleSizeChange12" @current-change="handleCurrentChange12" />
                                 </div>
 
                             </el-tab-pane>
@@ -629,7 +107,10 @@
                                     </el-table>
                                 </div>
                                 <div style="margin: 20px 0;">
-                                    <el-pagination v-model:current-page="pager13.page_no" v-model:page-size="pager13.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total12" @size-change="handleSizeChange13" @current-change="handleCurrentChange13" />
+                                    <el-pagination v-model:current-page="pager13.page_no"
+                                        v-model:page-size="pager13.page_size" :page-sizes="[10, 20, 30, 40]"
+                                        layout="total, sizes, prev, pager, next, jumper" :total="total12"
+                                        @size-change="handleSizeChange13" @current-change="handleCurrentChange13" />
                                 </div>
                             </el-tab-pane>
                             <el-tab-pane label="保险记录" name="first-3">
@@ -648,7 +129,10 @@
                                     </el-table>
                                 </div>
                                 <div style="margin: 20px 0;">
-                                    <el-pagination v-model:current-page="pager14.page_no" v-model:page-size="pager14.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total13" @size-change="handleSizeChange14" @current-change="handleCurrentChange14" />
+                                    <el-pagination v-model:current-page="pager14.page_no"
+                                        v-model:page-size="pager14.page_size" :page-sizes="[10, 20, 30, 40]"
+                                        layout="total, sizes, prev, pager, next, jumper" :total="total13"
+                                        @size-change="handleSizeChange14" @current-change="handleCurrentChange14" />
                                 </div>
                             </el-tab-pane>
                             <el-tab-pane label="项目考勤" name="first-4">
@@ -670,7 +154,10 @@
                                     </el-table>
                                 </div>
                                 <div style="margin: 20px 0;">
-                                    <el-pagination v-model:current-page="pager15.page_no" v-model:page-size="pager15.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total14" @size-change="handleSizeChange15" @current-change="handleCurrentChange15" />
+                                    <el-pagination v-model:current-page="pager15.page_no"
+                                        v-model:page-size="pager15.page_size" :page-sizes="[10, 20, 30, 40]"
+                                        layout="total, sizes, prev, pager, next, jumper" :total="total14"
+                                        @size-change="handleSizeChange15" @current-change="handleCurrentChange15" />
                                 </div>
                             </el-tab-pane>
                             <el-tab-pane label="考勤明细" name="first-5">
@@ -694,7 +181,10 @@
                                     </el-table>
                                 </div>
                                 <div style="margin: 20px 0;">
-                                    <el-pagination v-model:current-page="pager16.page_no" v-model:page-size="pager16.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total15" @size-change="handleSizeChange16" @current-change="handleCurrentChange16" />
+                                    <el-pagination v-model:current-page="pager16.page_no"
+                                        v-model:page-size="pager16.page_size" :page-sizes="[10, 20, 30, 40]"
+                                        layout="total, sizes, prev, pager, next, jumper" :total="total15"
+                                        @size-change="handleSizeChange16" @current-change="handleCurrentChange16" />
                                 </div>
                             </el-tab-pane>
                             <el-tab-pane label="工资付款" name="first-6">
@@ -713,15 +203,18 @@
                                     </el-table>
                                 </div>
                                 <div style="margin: 20px 0;">
-                                    <el-pagination v-model:current-page="pager17.page_no" v-model:page-size="pager17.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total16" @size-change="handleSizeChange17" @current-change="handleCurrentChange17" />
+                                    <el-pagination v-model:current-page="pager17.page_no"
+                                        v-model:page-size="pager17.page_size" :page-sizes="[10, 20, 30, 40]"
+                                        layout="total, sizes, prev, pager, next, jumper" :total="total16"
+                                        @size-change="handleSizeChange17" @current-change="handleCurrentChange17" />
                                 </div>
                             </el-tab-pane>
                         </el-tabs>
 
 
 
-                    </el-tab-pane>
-                    <el-tab-pane label="计划" name="demo-6">Config</el-tab-pane>
+                    </el-tab-pane> -->
+                    <!-- <el-tab-pane label="计划" name="demo-6">Config</el-tab-pane>
                     <el-tab-pane label="材料" name="demo-7">Role</el-tab-pane>
 
 
@@ -731,8 +224,8 @@
                     <el-tab-pane label="机具" name="demo-13">Task</el-tab-pane>
                     <el-tab-pane label="费用" name="demo-16">Task</el-tab-pane>
                     <el-tab-pane label="文档" name="demo-17">Task</el-tab-pane>
-                    <el-tab-pane label="结算" name="demo-18">Task</el-tab-pane>
-                    <el-tab-pane label="售后" name="demo-19">
+                    <el-tab-pane label="结算" name="demo-18">Task</el-tab-pane> -->
+                    <!-- <el-tab-pane label="售后" name="demo-19">
                         <div>
                             <el-table :data="tableData18" stripe style="width: 100%">
                                 <el-table-column label="工单编号" prop='custom_service_code' width="180" />
@@ -746,12 +239,15 @@
                             </el-table>
                         </div>
                         <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager18.page_no" v-model:page-size="pager18.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total17" @size-change="handleSizeChange18" @current-change="handleCurrentChange18" />
+                            <el-pagination v-model:current-page="pager18.page_no" v-model:page-size="pager18.page_size"
+                                :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper"
+                                :total="total17" @size-change="handleSizeChange18"
+                                @current-change="handleCurrentChange18" />
                         </div>
 
 
                     </el-tab-pane>
-                    <el-tab-pane label="统计" name="demo-20">Task</el-tab-pane>
+                    <el-tab-pane label="统计" name="demo-20">Task</el-tab-pane> -->
 
                 </el-tabs>
             </el-form>
@@ -772,40 +268,28 @@ import { apiProjectFollowUpLists } from '@/api/project_follow_up'
 import { apiCustomerDemandSolutionLists } from '@/api/customer_demand_solution'
 import { apiProjectEstimateLists } from '@/api/project_estimate'
 import { apiCompetitorLists } from '@/api/competitor'
-import { apiBidBiddingDecisionLists } from '@/api/bid_bidding_decision'
-import { apiBidBuyBiddingDocumentLists } from '@/api/bid_buy_bidding_document'
-import { apiBidResultLists } from '@/api/bid_result'
-import { apiBidDocumentExaminationLists } from '@/api/bid_document_examination'
-import { bidapplyLists } from '@/api/bidbbond'
-import { bidrefundLists } from '@/api/refundbidDeposit'
-import { projectpersonnelLists } from '@/api/project_personnel'
-import { projectlaborcontractLists } from '@/api/project_labor_contract'
-import { insurancemanagementLists } from '@/api/project_insurance_management'
-import { attendanceRecordLists } from '@/api/project_attendance_record'
-import { attendancedetailLists } from '@/api/project_attendance_detail'
-import { projectsalaryDetailLists } from '@/api/project_salary_detail'
 import { apiCustomServiceLists } from '@/api/custom_service'
-import { apiContractLists } from '@/api/contract'
-import { apiContractNegotiationLists } from '@/api/contract_negotiation'
 import { subpackagdetailLists } from '@/api/project_subpackage_budget_detail'
+import Overview from "./components/Overview.vue"
+import Business from "./components/Business.vue"
+import tender from "./components/tender.vue"
+import contract from "./components/contract.vue"
+import budget from "./components/budget.vue"
+import procurement from "./components/procurement.vue"
+import subcontract from "./components/subcontract.vue"
+import manpower from "./components/manpower.vue"
+import Collection from "./components/Collection.vue"
+import payment from "./components/payment.vue"
+import documentation from "./components/documentation.vue"
+// import manpower from "./components/manpower.vue"
+
 
-import { paymentplanLists } from '@/api/paymentplan'
-import { apifinancereceiptLists } from '@/api/receiptrecord'
-import { paymentapplyLists } from '@/api/paymentrequest'
-import { apiFinancerefundLists } from '@/api/refundrecord'
-import { apiProcurementContractLists } from '@/api/procurement_contract'
 
-import { apiSubcontractingContractLists } from '@/api/subcontracting_contract'
 
-import { apinegotiationLists } from '@/api/subcontractor'
-import { apiinvoiceapplyLists } from '@/api/InvoicingRequests'
-import { apireturnedLists } from '@/api/remittance'
-import { apireturnedrecordLists } from '@/api/recordsPayment'
-import { apirefundapplyLists } from '@/api/refund'
 const active = ref('first-1')
 const activeName = ref('demo-1')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
-    console.log(tab, event)
+    // console.log(tab, event)
 }
 defineProps({
     dictData: {
@@ -823,61 +307,8 @@ const datas = reactive({
     areaOptions: [],
 });
 
-const pager1 = reactive({
-    page_size: 10,
-    page_no: 1,
-    project_id: ""
-})
-const pager2 = reactive({
-    page_size: 10,
-    page_no: 1,
-    project_id: ""
-})
-const pager3 = reactive({
-    page_size: 10,
-    page_no: 1,
-    project_id: ""
-})
-const pager4 = reactive({
-    page_size: 10,
-    page_no: 1,
-    project_id: ""
-})
-const pager5 = reactive({
-    page_size: 10,
-    page_no: 1,
-    project_id: ""
-})
-const pager6 = reactive({
-    page_size: 10,
-    page_no: 1,
-    project_id: ""
-})
-const pager7 = reactive({
-    page_size: 10,
-    page_no: 1,
-    project_id: ""
-})
-const pager8 = reactive({
-    page_size: 10,
-    page_no: 1,
-    project_id: ""
-})
-const pager9 = reactive({
-    page_size: 10,
-    page_no: 1,
-    project_id: ""
-})
-const pager10 = reactive({
-    page_size: 10,
-    page_no: 1,
-    project_id: ""
-})
-const pager11 = reactive({
-    page_size: 10,
-    page_no: 1,
-    project_id: ""
-})
+
+
 const pager12 = reactive({
     page_size: 10,
     page_no: 1,
@@ -916,17 +347,7 @@ const pager18 = reactive({
     project_id: ""
 })
 
-const pager19 = reactive({
-    page_size: 10,
-    page_no: 1,
-    project_id: ""
-})
 
-const pager20 = reactive({
-    page_size: 10,
-    page_no: 1,
-    project_id: ""
-})
 
 const pager21 = reactive({
     page_size: 10,
@@ -997,18 +418,7 @@ const pager32 = reactive({
 
 
 
-const total = ref(0)
-const total1 = ref(0)
-const total2 = ref(0)
-const total3 = ref(0)
-const total4 = ref(0)
-const total5 = ref(0)
-const total6 = ref(0)
-const total7 = ref(0)
-const total8 = ref(0)
-const total9 = ref(0)
-const total10 = ref(0)
-const total11 = ref(0)
+
 const total12 = ref(0)
 const total13 = ref(0)
 const total14 = ref(0)
@@ -1016,8 +426,7 @@ const total15 = ref(0)
 const total16 = ref(0)
 const total17 = ref(0)
 const total18 = ref(0)
-const total19 = ref(0)
-const total20 = ref(0)
+
 const total21 = ref(0)
 
 const total22 = ref(0)
@@ -1034,26 +443,14 @@ const total30 = ref(0)
 const total31 = ref(0)
 const total32 = ref(0)
 const total33 = ref(0)
-const tableData1 = ref([])
-const tableData2 = ref([])
-const tableData3 = ref([])
-const tableData4 = ref([])
-const tableData5 = ref([])
-const tableData6 = ref([])
-const tableData7 = ref([])
-const tableData8 = ref([])
-const tableData9 = ref([])
-const tableData10 = ref([])
-const tableData11 = ref([])
+
 const tableData12 = ref([])
 const tableData13 = ref([])
-const tableData14 = ref([])
 const tableData15 = ref([])
 const tableData16 = ref([])
 const tableData17 = ref([])
 const tableData18 = ref([])
-const tableData19 = ref([])
-const tableData20 = ref([])
+
 
 const tableData21 = ref([])
 const tableData22 = ref([])
@@ -1076,34 +473,7 @@ const formData = reactive({
 })
 
 //条数
-const handleSizeChange1 = (val: number) => {
-    pager1.page_size = val
-    followUpLists()
-}
-const handleSizeChange2 = (val: number) => {
 
-    pager2.page_size = val
-    demandList()
-}
-const handleSizeChange3 = (val: number) => {
-
-    pager3.page_size = val
-    solutionLists()
-}
-const handleSizeChange4 = (val: number) => {
-
-    pager4.page_size = val
-    estimateLists()
-}
-const handleSizeChange5 = (val: number) => {
-
-    pager5.page_size = val
-    competitorLists()
-}
-const handleSizeChange6 = (val: number) => {
-    pager6.page_size = val
-    decisionLists()
-}
 const handleSizeChange7 = (val: number) => {
 
     pager7.page_size = val
@@ -1285,62 +655,38 @@ const handleSizeChange32 = (val: number) => {
 
 
 //分页
-const handleCurrentChange1 = (val: number) => {
-    console.log(`current page: ${val}`)
-    pager1.page_no = val
-    followUpLists()
-}
-const handleCurrentChange2 = (val: number) => {
-    console.log(`current page: ${val}`)
-    pager2.page_no = val
-    demandList()
-}
-const handleCurrentChange3 = (val: number) => {
-    console.log(`current page: ${val}`)
-    pager3.page_no = val
-    solutionLists()
-}
-const handleCurrentChange4 = (val: number) => {
-    console.log(`current page: ${val}`)
-    pager4.page_no = val
-    estimateLists()
-}
-const handleCurrentChange5 = (val: number) => {
-    pager5.page_no = val
-    console.log(`current page: ${val}`)
-    decisionLists()
-}
-const handleCurrentChange6 = (val: number) => {
-    pager6.page_no = val
-    console.log(`current page: ${val}`)
-    decisionLists()
-}
-const handleCurrentChange7 = (val: number) => {
-    pager7.page_no = val
-    console.log(`current page: ${val}`)
-    buydocumentLists()
-}
-const handleCurrentChange8 = (val: number) => {
-    pager8.page_no = val
-    console.log(`current page: ${val}`)
-    examinationLists()
-}
-const handleCurrentChange9 = (val: number) => {
-    pager9.page_no = val
-    console.log(`current page: ${val}`)
-    bidResultLists()
-}
-const handleCurrentChange10 = (val: number) => {
-    pager10.page_no = val
-    console.log(`current page: ${val}`)
-    applyLists()
-}
-const handleCurrentChange11 = (val: number) => {
-    pager11.page_no = val
-    console.log(`current page: ${val}`)
 
-    refundLists()
-}
+// const handleCurrentChange6 = (val: number) => {
+//     pager6.page_no = val
+//     console.log(`current page: ${val}`)
+//     decisionLists()
+// }
+// const handleCurrentChange7 = (val: number) => {
+//     pager7.page_no = val
+//     console.log(`current page: ${val}`)
+//     buydocumentLists()
+// }
+// const handleCurrentChange8 = (val: number) => {
+//     pager8.page_no = val
+//     console.log(`current page: ${val}`)
+//     examinationLists()
+// }
+// const handleCurrentChange9 = (val: number) => {
+//     pager9.page_no = val
+//     console.log(`current page: ${val}`)
+//     bidResultLists()
+// }
+// const handleCurrentChange10 = (val: number) => {
+//     pager10.page_no = val
+//     console.log(`current page: ${val}`)
+//     applyLists()
+// }
+// const handleCurrentChange11 = (val: number) => {
+//     pager11.page_no = val
+//     console.log(`current page: ${val}`)
+
+//     refundLists()
+// }
 
 const handleCurrentChange12 = (val: number) => {
     pager12.page_no = val
@@ -1509,92 +855,10 @@ const handleCurrentChange32 = (val: number) => {
 
 
 
-//获取客户跟进进路
-const followUpLists = () => {
-    apiProjectFollowUpLists(pager5).then((res) => {
-        tableData1.value = res.lists
-
-        total.value = res.count
-
-    })
-}
-//获取客户需求列表
-const demandList = () => {
-    apiCustomerDemandLists(pager5).then((res) => {
-        tableData1.value = res.lists
-        total1.value = res.count
-
-    })
-}
 
 
-// 解决方案列表
-const solutionLists = () => {
-    apiCustomerDemandSolutionLists(pager5).then((res) => {
-        tableData3.value = res.lists
-        total2.value = res.count
 
-    })
-}
 
-// 获取项目概算列表
-const estimateLists = () => {
-    apiProjectEstimateLists(pager4).then((res) => {
-        tableData4.value = res.lists
-        total3.value = res.count
-    })
-}
-
-// 获取竞争对手列表
-const competitorLists = () => {
-    apiCompetitorLists(pager5).then((res) => {
-        tableData5.value = res.lists
-        total4.value = res.count
-    })
-}
-
-//获取投标决策列表
-const decisionLists = () => {
-    apiBidBiddingDecisionLists(pager6).then((res) => {
-        tableData6.value = res.lists
-        total5.value = res.count
-    })
-}
-//获取购买标书列表
-const buydocumentLists = () => {
-    apiBidBuyBiddingDocumentLists(pager7).then((res) => {
-        tableData7.value = res.lists
-        total6.value = res.count
-    })
-}
-//获取标书审查列表
-const examinationLists = () => {
-    apiBidDocumentExaminationLists(pager8).then((res) => {
-        tableData8.value = res.lists
-        total7.value = res.count
-    })
-}
-//获取投标结果列表
-const bidResultLists = () => {
-    apiBidResultLists(pager9).then((res) => {
-        tableData9.value = res.lists
-        total8.value = res.count
-    })
-}
-//获取投标保证金列表
-const applyLists = () => {
-    bidapplyLists(pager10).then((res) => {
-        tableData10.value = res.lists
-        total9.value = res.count
-    })
-}
-//获取退投标保证金列表
-const refundLists = () => {
-    bidrefundLists(pager11).then((res) => {
-        tableData11.value = res.lists
-        total10.value = res.count
-    })
-}
 //获取项目人员列表
 
 const personnelLists = () => {
@@ -1603,14 +867,7 @@ const personnelLists = () => {
         total11.value = res.count
     })
 }
-//获取劳动合同列表
 
-const laborcontractLists = () => {
-    projectlaborcontractLists(pager13).then((res) => {
-        tableData13.value = res.lists
-        total12.value = res.count
-    })
-}
 
 //获取保险管理列表
 
@@ -1654,21 +911,7 @@ const customServiceLists = () => {
     })
 }
 
-//获取项目合同列表
-const contractLists = () => {
-    apiContractLists(pager19).then((res) => {
-        tableData19.value = res.lists
-        total18.value = res.count
-    })
-}
 
-//获取合同洽商列表
-const contcractNegotiationLists = () => {
-    apiContractNegotiationLists(pager20).then((res) => {
-        tableData20.value = res.lists
-        total19.value = res.count
-    })
-}
 //获取分包预算列表
 const subpackagList = () => {
     subpackagdetailLists(pager21).then((res) => {
@@ -1766,9 +1009,14 @@ const refundapplyLists = () => {
     })
 }
 
+const project_id = ref(0)
+
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
+
+
+
     // for (const key in formData) {
     //     if (data[key] != null && data[key] != undefined) {
     //         //@ts-ignore
@@ -1777,85 +1025,75 @@ const setFormData = async (data: Record<any, any>) => {
     //     }
 
     // }
+    project_id.value = data.id
 
-    pager1.project_id = data.id
-    pager2.project_id = data.id
-    pager3.project_id = data.id
-    pager4.project_id = data.id
-    pager5.project_id = data.id
-    pager6.project_id = data.id
-    pager7.project_id = data.id
-    pager8.project_id = data.id
-    pager9.project_id = data.id
-    pager10.project_id = data.id
-    pager11.project_id = data.id
-    pager11.project_id = data.id
-    pager11.project_id = data.id
-    pager12.project_id = data.id
-    pager13.project_id = data.id
-    pager14.project_id = data.id
-    pager15.project_id = data.id
-    pager16.project_id = data.id
-    pager17.project_id = data.id
-    pager18.project_id = data.id
-    pager19.project_id = data.id
-    pager20.project_id = data.id
-    pager21.project_id = data.id
-    pager22.project_id = data.id
-    pager23.project_id = data.id
-    pager24.project_id = data.id
-    pager20.project_id = data.id
-    pager25.project_id = data.id
-    pager26.project_id = data.id
-    pager27.project_id = data.id
-    pager28.project_id = data.id
-    pager29.project_id = data.id
-    pager30.project_id = data.id
-    pager31.project_id = data.id
-    pager32.project_id = data.id
+    // pager11.project_id = data.id
+    // pager11.project_id = data.id
+    // pager12.project_id = data.id
+    // pager13.project_id = data.id
+    // pager14.project_id = data.id
+    // pager15.project_id = data.id
+    // pager16.project_id = data.id
+    // pager17.project_id = data.id
+    // pager18.project_id = data.id
+    // pager19.project_id = data.id
+    // pager20.project_id = data.id
+    // pager21.project_id = data.id
+    // pager22.project_id = data.id
+    // pager23.project_id = data.id
+    // pager24.project_id = data.id
+    // pager20.project_id = data.id
+    // pager25.project_id = data.id
+    // pager26.project_id = data.id
+    // pager27.project_id = data.id
+    // pager28.project_id = data.id
+    // pager29.project_id = data.id
+    // pager30.project_id = data.id
+    // pager31.project_id = data.id
+    // pager32.project_id = data.id
     Object.assign(formData, data)
 
-    if (data.annex && data.annex.length > 0) {
-        const arry1 = data.annex.map((item: any, index: any) => {
-            return {
-                name: `文件${index + 1}`,
-                uri: item
-            };
-        });
-        Object.assign(formDataannex, arry1)
-    }
-    followUpLists()
-    demandList()
-    competitorLists()
-    solutionLists()
-    estimateLists()
-    decisionLists()
-    buydocumentLists()
-    examinationLists()
-    bidResultLists()
-    applyLists()
-    refundLists()
-    personnelLists()
-    laborcontractLists()
-    insurancemanagementlists()
-    attendanceRecord()
-    attendancedetail()
-    salarypaymentLists()
-    customServiceLists()
-    contractLists()
-    contcractNegotiationLists()
-    subpackagList()
-    financereceiptLists()
-    planLists()
-    payapplyLists()
-    financerefundLists()
-    procurementContractLists()
-    subcontractingContractLists()
-    negotiationLists()
-    invoiceapplyLists()
-    returnedLists()
-    returnedrecordLists()
-    refundapplyLists()
+    // if (data.annex && data.annex.length > 0) {
+    //     const arry1 = data.annex.map((item: any, index: any) => {
+    //         return {
+    //             name: `文件${index + 1}`,
+    //             uri: item
+    //         };
+    //     });
+    //     Object.assign(formDataannex, arry1)
+    // }
+    // followUpLists()
+    // demandList()
+    // // competitorLists()
+    // solutionLists()
+    // estimateLists()
+    // decisionLists()
+    // buydocumentLists()
+    // examinationLists()
+    // bidResultLists()
+    // applyLists()
+    // refundLists()
+    // personnelLists()
+    // laborcontractLists()
+    // insurancemanagementlists()
+    // attendanceRecord()
+    // attendancedetail()
+    // salarypaymentLists()
+    // customServiceLists()
+    // contractLists()
+    // contcractNegotiationLists()
+    // subpackagList()
+    // financereceiptLists()
+    // planLists()
+    // payapplyLists()
+    // financerefundLists()
+    // procurementContractLists()
+    // subcontractingContractLists()
+    // negotiationLists()
+    // invoiceapplyLists()
+    // returnedLists()
+    // returnedrecordLists()
+    // refundapplyLists()
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -1874,7 +1112,6 @@ const handleSubmit = async () => {
 
 //打开弹窗
 const open = () => {
-    console.log('1111111')
     popupRef.value?.open()
 }
 
diff --git a/src/views/project_list/index.vue b/src/views/project_list/index.vue
index 14760d4..75f72c5 100644
--- a/src/views/project_list/index.vue
+++ b/src/views/project_list/index.vue
@@ -1,233 +1,122 @@
 <template>
-    <div><el-card>
-            <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
 
-                <el-tab-pane label="我参与的项目" name="first">
-                    <div class="first_list">
-                        <div v-for="(item, index) in toplist" :key="index" @click="(item)" class="first_list-item">
-                            <div class="first_list-item-a">{{ item.name }}</div>
-                            <div class="first_list-item-b">{{ item.value }}</div>
-                        </div>
-                    </div>
-                    <el-card class="!border-none mb-4" shadow="never">
-                        <el-form class="mb-[-16px]" :model="queryParams" inline label-width="auto">
-                            <el-form-item label="客户名称" prop="custom_name">
-                                <el-input class="w-[260px]" v-model="queryParams.custom_name" clearable placeholder="请输入客户昵称" />
-                            </el-form-item>
-                            <el-form-item label="负责人" prop="person">
-                                <el-input class="w-[260px]" v-model="queryParams.person" clearable placeholder="请输入负责人" />
-                            </el-form-item>
-                            <el-form-item label="项目编码" prop="project_code">
-                                <el-input class="w-[260px]" v-model="queryParams.project_code" clearable placeholder="请输入项目编码" />
-                            </el-form-item>
-                            <el-form-item label="项目名称" prop="name">
-                                <el-input class="w-[260px]" v-model="queryParams.name" clearable placeholder="请输入项目名称" />
-                            </el-form-item>
+            <el-form class="mb-[-16px]" :model="queryParams" inline label-width="auto">
 
-                            <el-form-item label="项目内容" prop="project_content">
-                                <el-select class="w-[260px]" v-model="queryParams.project_content" clearable placeholder="请选择战略意义">
-                                    <el-option label="全部" value=""></el-option>
-                                    <el-option v-for="(item, index) in dictData.project_content" :key="index" :label="item.name" :value="item.value" />
-                                </el-select>
-                            </el-form-item>
+                <el-form-item label="客户名称" prop="custom_name">
+                    <el-input class="w-[280px]" v-model="queryParams.custom_name" clearable placeholder="请输入客户名称" />
+                </el-form-item>
+                <el-form-item label="项目编码" prop="project_code">
+                    <el-input class="w-[280px]" v-model="queryParams.project_code" clearable placeholder="请输入项目编码" />
+                </el-form-item>
+                <el-form-item label="项目名称" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入项目名称" />
+                </el-form-item>
+                <el-form-item label="负责人" prop="person">
+                    <el-input class="w-[280px]" v-model="queryParams.person" clearable placeholder="请输入负责人" />
+                </el-form-item>
+                <el-form-item label="战略意义" prop="strategic_significance">
+                    <el-select class="w-[280px]" v-model="queryParams.strategic_significance" clearable
+                        placeholder="请选择战略意义">
+                        <el-option label="全部" value=""></el-option>
+                        <el-option v-for="(item, index) in dictData.strategic_significance" :key="index" :label="item.name"
+                            :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="所属行业" prop="industry">
+                    <el-select class="w-[280px]" v-model="queryParams.industry" clearable placeholder="请选择所属行业">
+                        <el-option label="全部" value=""></el-option>
+                        <el-option v-for="(item, index) in dictData.industry" :key="index" :label="item.name"
+                            :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="单位性质" prop="unit_nature">
+                    <el-select class="w-[280px]" v-model="queryParams.unit_nature" clearable placeholder="请选择单位性质">
+                        <el-option label="全部" value=""></el-option>
+                        <el-option v-for="(item, index) in dictData.unit_nature" :key="index" :label="item.name"
+                            :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="招标方式" prop="bidding_method">
+                    <el-select class="w-[280px]" v-model="queryParams.bidding_method" clearable placeholder="请选择招标方式">
+                        <el-option label="全部" value=""></el-option>
+                        <el-option v-for="(item, index) in dictData.bidding_method" :key="index" :label="item.name"
+                            :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="信息来源" prop="information_sources">
+                    <el-select class="w-[280px]" v-model="queryParams.information_sources" clearable placeholder="请选择信息来源">
+                        <el-option label="全部" value=""></el-option>
+                        <el-option v-for="(item, index) in dictData.information_sources" :key="index" :label="item.name"
+                            :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="项目类型" prop="project_type">
+                    <el-select class="w-[280px]" v-model="queryParams.project_type" clearable placeholder="请选择项目类型">
+                        <el-option label="全部" value=""></el-option>
+                        <el-option v-for="(item, index) in protype" :key="index" :label="item.name" :value="item.id" />
+                    </el-select>
+                </el-form-item>
 
-                            <el-form-item label="项目状态" prop="status">
-                                <el-input class="w-[260px]" v-model="queryParams.status" clearable placeholder="请输入项目状态" />
-                            </el-form-item>
-                            <el-form-item label="项目所在地址" prop="project_address">
-                                <el-input class="w-[260px]" v-model="queryParams.project_address" clearable placeholder="请输入客户昵称" />
-                            </el-form-item>
-
-                            <el-form-item label="战略意义" prop="strategic_significance">
-                                <el-select class="w-[260px]" v-model="queryParams.strategic_significance" clearable placeholder="请选择战略意义">
-                                    <el-option label="全部" value=""></el-option>
-                                    <el-option v-for="(item, index) in dictData.strategic_significance" :key="index" :label="item.name" :value="item.value" />
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="所属行业" prop="industry">
-                                <el-select class="w-[260px]" v-model="queryParams.industry" clearable placeholder="请选择所属行业">
-                                    <el-option label="全部" value=""></el-option>
-                                    <el-option v-for="(item, index) in dictData.industry" :key="index" :label="item.name" :value="item.value" />
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="单位性质" prop="unit_nature">
-                                <el-select class="w-[260px]" v-model="queryParams.unit_nature" clearable placeholder="请选择单位性质">
-                                    <el-option label="全部" value=""></el-option>
-                                    <el-option v-for="(item, index) in dictData.unit_nature" :key="index" :label="item.name" :value="item.value" />
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="招标方式" prop="bidding_method">
-                                <el-select class="w-[260px]" v-model="queryParams.bidding_method" clearable placeholder="请选择招标方式">
-                                    <el-option label="全部" value=""></el-option>
-                                    <el-option v-for="(item, index) in dictData.bidding_method" :key="index" :label="item.name" :value="item.value" />
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="信息来源" prop="information_sources">
-                                <el-select class="w-[260px]" v-model="queryParams.information_sources" clearable placeholder="请选择信息来源">
-                                    <el-option label="全部" value=""></el-option>
-                                    <el-option v-for="(item, index) in dictData.information_sources" :key="index" :label="item.name" :value="item.value" />
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="项目类型" prop="project_type">
-                                <el-select class="w-[260px]" v-model="queryParams.project_type" clearable placeholder="请选择项目类型">
-                                    <el-option label="全部" value=""></el-option>
-                                    <el-option v-for="(item, index) in protype" :key="index" :label="item.name" :value="item.id" />
-                                </el-select>
-                            </el-form-item>
-
-                            <el-form-item>
-                                <el-button type="primary" @click="resetPage">查询</el-button>
-                                <el-button @click="resetParams">重置</el-button>
-                            </el-form-item>
-                        </el-form>
-                    </el-card>
-                    <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-
-                        <div class="mt-4">
-                            <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="project_code" show-overflow-tooltip />
-                                <el-table-column label="项目名称" prop="name" show-overflow-tooltip />
-                                <el-table-column label="项目状态" prop="status" show-overflow-tooltip />
-                                <el-table-column label="立项日期" prop="create_time" show-overflow-tooltip />
-                                <el-table-column label="项目类型" prop="project_type" show-overflow-tooltip />
-                                <el-table-column label="实施进度" prop="project_type" show-overflow-tooltip />
-
-                                <el-table-column label="负责人" prop="person" show-overflow-tooltip />
-                                <el-table-column label="操作" width="160" fixed="right">
-                                    <template #default="{ row }">
-
-                                        <el-button v-perms="['project.project/detail']" link @click="handledetail(row)">
-                                            详情
-                                        </el-button>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </div>
-                        <div class="flex justify-end mt-4">
-                            <pagination v-model="pager" @change="getLists" />
-                        </div>
-                    </el-card>
-                </el-tab-pane>
-                <el-tab-pane label="我创建的项目" name="second">
-                    <div class="first_list">
-                        <div v-for="(item, index) in toplist" :key="index" @click="(item)" class="first_list-item">
-                            <div class="first_list-item-a">{{ item.name }}</div>
-                            <div class="first_list-item-b">{{ item.value }}</div>
-                        </div>
-                    </div>
-                    <el-card class="!border-none mb-4" shadow="never">
-
-                        <el-form class="mb-[-16px]" :model="queryParams" inline label-width="auto">
-                            <el-form-item label="客户名称" prop="custom_name">
-                                <el-input class="w-[260px]" v-model="queryParams.custom_name" clearable placeholder="请输入客户昵称" />
-                            </el-form-item>
-                            <el-form-item label="负责人" prop="person">
-                                <el-input class="w-[260px]" v-model="queryParams.person" clearable placeholder="请输入负责人" />
-                            </el-form-item>
-                            <el-form-item label="项目编码" prop="project_code">
-                                <el-input class="w-[260px]" v-model="queryParams.project_code" clearable placeholder="请输入项目编码" />
-                            </el-form-item>
-                            <el-form-item label="项目名称" prop="name">
-                                <el-input class="w-[260px]" v-model="queryParams.name" clearable placeholder="请输入项目名称" />
-                            </el-form-item>
-
-                            <el-form-item label="项目内容" prop="project_content">
-                                <el-select class="w-[260px]" v-model="queryParams.project_content" clearable placeholder="请选择战略意义">
-                                    <el-option label="全部" value=""></el-option>
-                                    <el-option v-for="(item, index) in dictData.project_content" :key="index" :label="item.name" :value="item.value" />
-                                </el-select>
-                            </el-form-item>
-
-                            <el-form-item label="项目状态" prop="status">
-                                <el-input class="w-[260px]" v-model="queryParams.status" clearable placeholder="请输入项目状态" />
-                            </el-form-item>
-                            <el-form-item label="项目所在地址" prop="project_address">
-                                <el-input class="w-[260px]" v-model="queryParams.project_address" clearable placeholder="请输入客户昵称" />
-                            </el-form-item>
-
-                            <el-form-item label="战略意义" prop="strategic_significance">
-                                <el-select class="w-[260px]" v-model="queryParams.strategic_significance" clearable placeholder="请选择战略意义">
-                                    <el-option label="全部" value=""></el-option>
-                                    <el-option v-for="(item, index) in dictData.strategic_significance" :key="index" :label="item.name" :value="item.value" />
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="所属行业" prop="industry">
-                                <el-select class="w-[260px]" v-model="queryParams.industry" clearable placeholder="请选择所属行业">
-                                    <el-option label="全部" value=""></el-option>
-                                    <el-option v-for="(item, index) in dictData.industry" :key="index" :label="item.name" :value="item.value" />
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="单位性质" prop="unit_nature">
-                                <el-select class="w-[260px]" v-model="queryParams.unit_nature" clearable placeholder="请选择单位性质">
-                                    <el-option label="全部" value=""></el-option>
-                                    <el-option v-for="(item, index) in dictData.unit_nature" :key="index" :label="item.name" :value="item.value" />
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="招标方式" prop="bidding_method">
-                                <el-select class="w-[260px]" v-model="queryParams.bidding_method" clearable placeholder="请选择招标方式">
-                                    <el-option label="全部" value=""></el-option>
-                                    <el-option v-for="(item, index) in dictData.bidding_method" :key="index" :label="item.name" :value="item.value" />
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="信息来源" prop="information_sources">
-                                <el-select class="w-[260px]" v-model="queryParams.information_sources" clearable placeholder="请选择信息来源">
-                                    <el-option label="全部" value=""></el-option>
-                                    <el-option v-for="(item, index) in dictData.information_sources" :key="index" :label="item.name" :value="item.value" />
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="项目类型" prop="project_type">
-                                <el-select class="w-[260px]" v-model="queryParams.project_type" clearable placeholder="请选择项目类型">
-                                    <el-option label="全部" value=""></el-option>
-                                    <el-option v-for="(item, index) in protype" :key="index" :label="item.name" :value="item.id" />
-                                </el-select>
-                            </el-form-item>
-
-                            <el-form-item>
-                                <el-button type="primary" @click="resetPage">查询</el-button>
-                                <el-button @click="resetParams">重置</el-button>
-                            </el-form-item>
-                        </el-form>
-                    </el-card>
-                    <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-
-                        <div class="mt-4">
-                            <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="project_code" show-overflow-tooltip />
-                                <el-table-column label="项目名称" prop="name" show-overflow-tooltip />
-                                <el-table-column label="项目状态" prop="status" show-overflow-tooltip />
-                                <el-table-column label="立项日期" prop="create_time" show-overflow-tooltip />
-                                <el-table-column label="项目类型" prop="project_type" show-overflow-tooltip />
-                                <el-table-column label="实施进度" prop="project_type" show-overflow-tooltip />
-
-                                <el-table-column label="负责人" prop="person" show-overflow-tooltip />
-                                <el-table-column label="操作" width="160" fixed="right">
-                                    <template #default="{ row }">
-
-                                        <el-button v-perms="['project.project/detail']" link @click="handledetail(row)">
-                                            详情
-                                        </el-button>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </div>
-                        <div class="flex justify-end mt-4">
-                            <pagination v-model="pager" @change="getLists" />
-                        </div>
-                    </el-card>
-                </el-tab-pane>
-
-            </el-tabs>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
         </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <!-- <el-button v-perms="['project.project/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['project.project/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
+                删除
+            </el-button> -->
 
-
-
+            <div class="mt-4">
+                <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="project_code" show-overflow-tooltip />
+                    <el-table-column label="项目名称" prop="name" show-overflow-tooltip />
+                    <el-table-column label="项目状态" prop="status" show-overflow-tooltip />
+                    <el-table-column label="项目所在地" prop="project_address" show-overflow-tooltip />
+                    <el-table-column label="项目类型" prop="project_type" show-overflow-tooltip />
+                    <el-table-column label="战略意义" prop="strategic_significance" show-overflow-tooltip />
+                    <el-table-column label="所属行业" prop="industry" show-overflow-tooltip />
+                    <el-table-column label="单位性质" prop="unit_nature" show-overflow-tooltip />
+                    <el-table-column label="招标方式" prop="bidding_method" show-overflow-tooltip />
+                    <el-table-column label="信息来源" prop="information_sources" show-overflow-tooltip />
+                    <el-table-column label="负责人" prop="person" show-overflow-tooltip />
+                    <el-table-column label="操作" width="160" fixed="right">
+                        <template #default="{ row }">
+                            <!-- <el-button v-perms="['project.project/edit']" type="primary" link @click="handleEdit(row)">
+                                编辑
+                            </el-button> -->
+                            <!-- <el-button v-perms="['project.project/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </el-button> -->
+                            <el-button v-perms="['project.project/detail']" link @click="handledetail(row)">
+                                详情
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <!-- <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" /> -->
+        <!-- <detail-popup v-if="showDtail" ref="detailRef" :dict-data="dictData" @close="showDtail = false" /> -->
         <detail-popup v-if="showDtail" ref="detailRef" :dict-data="dictData" @close="showDtail = false" />
+
     </div>
 </template>
 
@@ -240,64 +129,21 @@ import { getAllProjectTypes } from '@/api/projecttype'
 const protype = reactive([])
 import feedback from '@/utils/feedback'
 import DetailPopup from './detail.vue'
+
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
-import type { TabsPaneContext } from 'element-plus'
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 
-const activeName = ref('first')
-
-const handleClick = (tab: TabsPaneContext, event: Event) => {
-    console.log(tab.index, event)
-}
 // 是否显示编辑框
 const showEdit = ref(false)
 
 const showDtail = ref(false)
-const toplist = reactive([
-    {
-        name: '项目立项',
-        value: 10
-    },
-    {
-        name: '项目跟进',
-        value: 10
-    },
-    {
-        name: '招投标',
-        value: 10
-    },
-    {
-        name: '合同签约',
-        value: 10
-    },
-    {
-        name: '项目实施',
-        value: 10
-    },
-    {
-        name: '预算超支',
-        value: 10
-    },
-    {
-        name: '进度超期',
-        value: 10
-    },
-    {
-        name: '回款超期',
-        value: 10
-    },
-    {
-        name: '项目中止',
-        value: 10
-    },
-    {
-        name: '项目完成',
-        value: 10
-    }
-])
+
+
 
 
 // 查询条件
 const queryParams = reactive({
+
     custom_name: '',
     project_type: '',
     project_code: '',
@@ -333,6 +179,21 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
     params: queryParams
 })
 
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    let res = await apiProjectDetail({ id: data.id })
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(res)
+}
 
 // 删除
 const handleDelete = async (id: number | any[]) => {
@@ -358,36 +219,4 @@ list()
 
 getLists()
 </script>
-<style lang="scss" scoped>
-.first_list {
-    display: flex;
-    flex-wrap: wrap;
-    flex-direction: row;
-
-
-    .first_list-item {
-        background-color: #f3f7f9;
-        width: 260px;
-        height: 90px;
-        margin-right: 40px;
-        margin-bottom: 20px;
-
-        .first_list-item-a {
-            margin-top: 25px;
-            text-align: left;
-            padding-left: 20px;
-            color: #6C757D;
-        }
-
-        .first_list-item-b {
-            margin-top: 5px;
-            text-align: left;
-            padding-left: 30px;
-            color: #495057;
-            font-weight: bold;
-            font-size: 16px;
-        }
-    }
-}
-</style>
 
diff --git a/src/views/project_manager_appointment/edit.vue b/src/views/project_manager_appointment/edit.vue
index 13a739d..2ecac53 100644
--- a/src/views/project_manager_appointment/edit.vue
+++ b/src/views/project_manager_appointment/edit.vue
@@ -130,20 +130,25 @@
                     </el-col>
                 </el-row>
 
-
-
-
-
                 <!-- <el-dialog v-model="showDialog" title="选择客户" width="70%">
                     <customDialog @customEvent="customEvent"></customDialog>
                 </el-dialog> -->
-                <el-dialog v-model="showDialog1" title="选择合同" width="70%">
-                    <salescontractDialog @customEvent="customEvent1"></salescontractDialog>
-                </el-dialog>
 
+
+                <div v-if="showDialog1">
+                    <el-dialog v-model="showDialog1" title="选择合同" width="70%">
+                        <salescontractDialog @customEvent="customEvent1" :project_id="formData.project_id">
+                        </salescontractDialog>
+                    </el-dialog>
+                </div>
+
+
+                <!-- <div v-if="showDialog2"> -->
                 <el-dialog v-model="showDialog2" title="选择项目" width="70%">
                     <projectDialog @customEvent="customEvent2"></projectDialog>
                 </el-dialog>
+                <!-- </div> -->
+
                 <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
             </el-form>
         </popup>
@@ -155,7 +160,7 @@
 import customDialog from '@/components/custom-dialog/index.vue'
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
-import salescontractDialog from '@/components/salescontract/index.vue'
+import salescontractDialog from '@/components/contract/index.vue'
 import projectDialog from '@/components/project/index.vue'
 import { appointmentAdd, appointmentEdit, appointmentDetail } from '@/api/appointment'
 import { toChinesNum } from "@/utils/util";
@@ -258,6 +263,8 @@ const customEvent2 = (e: any) => {
     project_name.value = e.name;
     project_code.value = e.project_code;
     custom_name.value = e.custom_name;
+    contract_name.value = ''
+    contract_no.value = ''
     showDialog2.value = false;
 };
 //打开弹窗
diff --git a/src/views/project_manager_appointment/index.vue b/src/views/project_manager_appointment/index.vue
index 0e50973..18ece36 100644
--- a/src/views/project_manager_appointment/index.vue
+++ b/src/views/project_manager_appointment/index.vue
@@ -38,8 +38,6 @@
                 <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_code" show-overflow-tooltip />
-                    <el-table-column label="委任单号" prop="process_code" 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="contract_code" show-overflow-tooltip />
@@ -48,8 +46,6 @@
                     <el-table-column label="立项日期" prop="project_approval_date" show-overflow-tooltip />
                     <el-table-column label="项目开始日期" prop="start_date" show-overflow-tooltip />
                     <el-table-column label="项目交付日期" prop="delivery_date" show-overflow-tooltip />
-
-
                     <el-table-column label="操作" width="150" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['project.project_manager_appointment/edit']" type="primary" link
diff --git a/src/views/project_personnel/edit.vue b/src/views/project_personnel/edit.vue
index a0e5c87..e5b1bd2 100644
--- a/src/views/project_personnel/edit.vue
+++ b/src/views/project_personnel/edit.vue
@@ -7,47 +7,56 @@
 
                 <el-row :gutter="10">
                     <el-col :span="8">
-                        <el-form-item label="项目名称" prop="project_id" @click="showDialog2 = true" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="项目名称" prop="project_id" @click="showDialog2 = true"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="project_name" clearable readonly placeholder="请输入项目名称" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="项目编码" prop="project_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="项目编码" prop="project_id"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="project_code" clearable readonly placeholder="请输入项目编码" />
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
-                        <el-form-item label="姓名" prop="name" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="姓名" prop="name"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.name" clearable placeholder="请输入姓名" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="身份证号" prop="idcard" :rules="[{ required: true, validator: checkIDcard, trigger: 'blur' }]">
+                        <el-form-item label="身份证号" prop="idcard"
+                            :rules="[{ required: true, validator: checkIDcard, trigger: 'blur' }]">
                             <el-input v-model="formData.idcard" clearable placeholder="请输入身份证号" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="手机号" prop="mobile" :rules="[{ required: true, validator: checkPhone, trigger: 'blur' }]">
+                        <el-form-item label="手机号" prop="mobile"
+                            :rules="[{ required: true, validator: checkPhone, trigger: 'blur' }]">
                             <el-input v-model="formData.mobile" clearable placeholder="请输入手机号" />
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
-                        <el-form-item label="工种" prop="work_type" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+                        <el-form-item label="工种" prop="work_type"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
                             <el-select v-model="formData.work_type" clearable placeholder="请选择工种">
-                                <el-option v-for="(item, index) in dictData.work_type" :key="index" :label="item.name" :value="parseInt(item.value)" />
+                                <el-option v-for="(item, index) in allJobType" :key="index" :label="item.type_name"
+                                    :value="parseInt(item.id)" />
                             </el-select>
                         </el-form-item>
 
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="人工单价" prop="unit_price" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="人工单价" prop="unit_price"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.unit_price" clearable placeholder="请输入人工单价" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                        <el-form-item label="每日生活费" prop="daily_living_expenses" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="每日生活费" prop="daily_living_expenses"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.daily_living_expenses" clearable placeholder="请输入每日生活费" />
                         </el-form-item>
                     </el-col>
@@ -119,6 +128,7 @@ import { isEmail, isIdCard, isPhone } from '@/utils/validate'
 import { deptAll } from '@/api/org/department'
 import { getAll } from '@/api/org/organization'
 import type { PropType } from 'vue'
+import { projectjobtypeAll } from "@/api/project_job_type.ts"
 
 defineProps({
     dictData: {
@@ -128,8 +138,6 @@ defineProps({
 })
 const project_name = ref('')
 const project_code = ref('')
-
-
 const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
@@ -145,6 +153,13 @@ const customEvent2 = (e: any) => {
 };
 
 
+const allJobType = reactive([])
+const getallJobType = async () => {
+    let res = await projectjobtypeAll()
+    Object.assign(allJobType, res)
+}
+getallJobType()
+
 //验证
 const checkPhone = (rule: any, value: any, callback: (arg0: Error) => any) => {
     const phoneReg = /^1[3|4|5|7|8][0-9]{9}$/
diff --git a/src/views/project_plan/edit.vue b/src/views/project_plan/edit.vue
index 9ba6cad..3683f54 100644
--- a/src/views/project_plan/edit.vue
+++ b/src/views/project_plan/edit.vue
@@ -309,9 +309,9 @@ const getDetail = async (row: Record<string, any>) => {
 
 // 提交按钮
 const handleSubmit = async () => {
-    if (formDataannex.length > 0) {
-        formData.annex = formDataannex.map((item: any) => item.uri)
-    }
+    // if (formDataannex.length > 0) {
+    formData.annex = formDataannex.map((item: any) => item.uri)
+    // }
 
     await formRef.value?.validate()
 
diff --git a/src/views/project_profit_set/edit.vue b/src/views/project_profit_set/edit.vue
index 15b0d50..f1fa559 100644
--- a/src/views/project_profit_set/edit.vue
+++ b/src/views/project_profit_set/edit.vue
@@ -7,7 +7,6 @@
                         <el-form-item label="项目类型" prop="project_type_id" @click="showDialog = true"
                             :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
                             <el-select class="w-[280px]" v-model="formData.project_type_id" clearable placeholder="请选择项目类型">
-                                <el-option label="全部" value=""></el-option>
                                 <el-option v-for="(item, index) in list" :key="index" :label="item.name"
                                     :value="parseInt(item.id)" />
                             </el-select>
diff --git a/src/views/project_salary_payment/detail.vue b/src/views/project_salary_payment/detail.vue
index 582324c..8bd6997 100644
--- a/src/views/project_salary_payment/detail.vue
+++ b/src/views/project_salary_payment/detail.vue
@@ -20,11 +20,7 @@
                                 {{ formData.project_code }}
                             </el-form-item>
                         </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="姓名">
-                                {{ formData.person_name }}
-                            </el-form-item>
-                        </el-col>
+
                         <el-col :span="12">
                             <el-form-item label="付款类型">
                                 {{ formData.payment_type }}
@@ -50,16 +46,17 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="合计金额大写">
+                            <!-- <el-form-item label="合计金额大写">
                                 {{ formData.total_amount_uppercase
                                 }}
-                            </el-form-item>
+                            </el-form-item> -->
                         </el-col>
                         <el-col :span="24">
                             <el-form-item label="附件">
                                 <div v-if="formDataannex.length > 0">
                                     <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
-                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
+                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
+                                            :href="item.uri" target="_blank">{{ item.name }}</a>
                                         <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
                                     </div>
                                 </div>
diff --git a/src/views/project_salary_payment/edit.vue b/src/views/project_salary_payment/edit.vue
index 350b83b..3b08c39 100644
--- a/src/views/project_salary_payment/edit.vue
+++ b/src/views/project_salary_payment/edit.vue
@@ -4,15 +4,14 @@
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules" inline>
                 <el-row>
                     <el-col :span="8">
-                        <el-form-item label="项目编码" prop="project_id">
-                            <el-input v-model="project_code" clearable placeholder="请选择项目编码" @click="showDialog = true"
-                                :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" />
+                        <el-form-item label="项目编码" prop="project_id"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="project_code" clearable placeholder="请选择项目编码" @click="showDialog = true" />
                         </el-form-item> </el-col>
                     <el-col :span="8">
-                        <el-form-item label="项目名称" prop="project_id">
+                        <el-form-item label="项目名称">
                             <el-input v-model="project_name" clearable disabled placeholder="系统自动填写" />
                         </el-form-item> </el-col>
-
                     <el-col :span="24">
                         <el-form-item label="付款类型" prop="payment_type">
                             <el-radio-group v-model="formData.payment_type" placeholder="请选择付款类型">
@@ -23,10 +22,6 @@
                             </el-radio-group>
                         </el-form-item>
                     </el-col>
-
-
-
-
                     <el-col :span="8">
                         <el-form-item label="申请日期" prop="apply_date">
                             <el-date-picker class="flex-1 !flex" v-model="formData.apply_date" clearable type="date"
@@ -35,41 +30,21 @@
                         </el-form-item> </el-col>
                     <el-col :span="8">
                         <el-form-item label="合计金额(元)" prop="total_amount">
-                            <el-input v-model="formData.total_amount" clearable type="number" @input="amountinput"
-                                placeholder="请输入合计金额(元)" />
+                            <el-input v-model="formData.total_amount" type="number" disabled placeholder="系统自动计算" />
                         </el-form-item> </el-col>
                     <el-col :span="8">
                         <el-form-item label="合计金额大写(元)" prop="total_amount_uppercase">
-                            <el-input v-model="formData.total_amount_uppercase" clearable disabled
-                                placeholder="请输入合计金额大写(元)" />
+                            <el-input v-model="formData.total_amount_uppercase" disabled placeholder="系统自动计算" />
                         </el-form-item> </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="备注" prop="remark">
                             <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
                         </el-form-item> </el-col>
-
-
-
                     <el-col :span="24">
                         <el-form-item label="合同附件" prop="field127">
-                            <el-upload
-                                accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv"
-                                class="upload-demo" :show-file-list="false" aria-hidden="true"
-                                :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'"
-                                :on-success="handleAvatarSuccess_four" ref="upload">
-                                <el-button type="primary">
-                                    上传
-                                </el-button>
-                            </el-upload>
-                            <div>
-                                <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
-                                        target="_blank">{{ item.name }}</a>
-                                    <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
-                                </div>
-                            </div>
-
+                            <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+                                @delFile="delFileFn" />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -85,7 +60,8 @@
                         </el-table-column>
                         <el-table-column label="姓名" prop="name">
                             <template #default="{ row, $index }">
-                                <el-input v-model="row.name" @click="paymentdetail(row, $index)" />
+                                <el-input v-model="row.name" :disabled="!formData.project_id"
+                                    @click="paymentdetail(row, $index)" />
                             </template>
                         </el-table-column>
                         <el-table-column label="工种" prop="work_type_text">
@@ -95,24 +71,21 @@
                         <el-table-column label="银行卡号" prop="bank_no">
                             <template #default="{ row }"> <el-input v-model="row.bank_no" /> </template></el-table-column>
 
-                        <el-table-column label="总收入" prop="pay_amount">
-                            <template #default="{ row }"> <el-input v-model="row.pay_amount" />
+                        <el-table-column label="总收入" prop="total_income">
+                            <template #default="{ row }"> <el-input v-model="row.total_income" />
                             </template></el-table-column>
 
-                        <el-table-column label="总支出" prop="pay_amount">
-                            <template #default="{ row }"> <el-input v-model="row.pay_amount" />
+                        <el-table-column label="总支出" prop="total_pay_out">
+                            <template #default="{ row }"> <el-input v-model="row.total_pay_out" />
                             </template></el-table-column>
 
-                        <el-table-column label="未发放" prop="pay_amount">
-                            <template #default="{ row }"> <el-input v-model="row.pay_amount" />
+                        <el-table-column label="未发放" prop="balance">
+                            <template #default="{ row }"> <el-input v-model="row.balance" readonly />
                             </template></el-table-column>
 
-                        <el-table-column label="本次申请付款金额" prop="pay_amount">
+                        <el-table-column label="本次申请付款金额" prop="apply_amount">
                             <template #default="{ row }"> <el-input v-model="row.apply_amount" />
                             </template></el-table-column>
-
-
-
                         <el-table-column label="备注" prop="remark">
                             <template #default="{ row }">
                                 <el-input v-model="row.remark" />
@@ -130,7 +103,6 @@
                 <customDialog @customEvent="customEvent1" :project_id="formData.project_id"></customDialog>
             </el-dialog>
         </div>
-
     </div>
 </template>
 
@@ -141,8 +113,21 @@ import projectDialog from '@/components/project/index.vue'
 import { toChinesNum } from "@/utils/util";
 import { projectsalarypaymentAdd, projectsalarypaymentEdit, projectsalarypaymentDetail } from '@/api/project_salary_payment'
 import customDialog from '@/components/project_personnel/index.vue'
-import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
+import feedback from '@/utils/feedback'
+import { watch } from "vue"
+
+// 上传文件
+import annexUpload from "@/components/annexUpload/index.vue"
+const handleAvatarSuccess_four = (response: any) => {
+    // @ts-ignore
+    response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
+};
+
+// 删除上传的文件
+const delFileFn = (index: number) => { formData.annex.splice(index, 1) }
+
+
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
@@ -153,7 +138,6 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
-
 const showDialog = ref(false)
 const showDialog1 = ref(false)
 const project_name = ref('')
@@ -161,30 +145,26 @@ const project_code = ref('')
 const person_name = ref('')
 const idcard = ref('')
 const num = ref(0)
-import configs from "@/config"
-import useUserStore from "@/stores/modules/user";
-const base_url = configs.baseUrl + configs.urlPrefix
-const userStore = useUserStore();
 const formDataannex = reactive([])
-import feedback from '@/utils/feedback'
-const userInfo = userStore.userInfo
-const paymentlist = ref([{}])
+const paymentlist = reactive([{}])
+
 //获取值
 const customEvent = (e) => {
     formData.project_id = e.id
     project_name.value = e.name
     project_code.value = e.project_code
+    paymentlist.splice(0, 1, {});
+    paymentlist.splice(1, 99999);
+    // paymentlist = [{}]
     showDialog.value = false
 
 }
 const customEvent1 = (e) => {
-    paymentlist.value[num.value].person_id = e.id
-    paymentlist.value[num.value].name = e.name
-
-    paymentlist.value[num.value].bank_no = e.bank_no
-    paymentlist.value[num.value].work_type_text = e.work_type_text
+    paymentlist[num.value].person_id = e.id
+    paymentlist[num.value].name = e.name
+    paymentlist[num.value].bank_no = e.bank_no
+    paymentlist[num.value].work_type_text = e.work_type_text
     showDialog1.value = false
-
 }
 
 //打开人员弹窗
@@ -200,38 +180,20 @@ const paymentdetail = (row, index) => {
 }
 const handleAdd = (row: any) => {
     // 在 row 后面插入一行数据
-    const index = paymentlist.value.indexOf(row);
-    paymentlist.value.splice(index + 1, 0, {});
+    const index = paymentlist.indexOf(row);
+    paymentlist.splice(index + 1, 0, {});
 };
 
 const handleDelete = (row: any) => {
     // 删除 row
-    const index = paymentlist.value.indexOf(row);
-    paymentlist.value.splice(index, 1);
+    const index = paymentlist.indexOf(row);
+    paymentlist.splice(index, 1);
 };
 // 弹窗标题
 const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑工资付款' : '新增工资付款'
 })
-// 上传文件
-const handleAvatarSuccess_four = (
-    response,
-    uploadFile
-) => {
-    if (response.code == 0) {
-        ElMessage.error(response.msg);
-        return;
-    }
-    formDataannex.push(
-        { uri: response.data.uri, name: response.data.name }
 
-
-    );
-};
-// 删除上传的文件
-const delFileFn = (index: number) => {
-    formDataannex.splice(index, 1)
-}
 // 表单数据
 const formData = reactive({
     id: '',
@@ -245,22 +207,24 @@ const formData = reactive({
     annex: [],
 
 })
-
+//金额计算
+watch(
+    paymentlist,
+    () => {
+        formData.total_amount = 0
+        paymentlist.forEach(item => {
+            item.balance = (item.total_income - item.total_pay_out) || 0
+            formData.total_amount += (+item.apply_amount)
+        })
+        formData.total_amount_uppercase = toChinesNum(formData.total_amount)
+    },
+)
 
 // 表单验证
 const formRules = reactive<any>({
 
 })
 
-//监听金额大写输入
-const amountinput = (e) => {
-    // console.log(e)
-    if (e && e > 0) {
-        formData.total_amount_uppercase = toChinesNum(e)
-    }
-}
-
-
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     if (data.annex && data.annex.length > 0) {
@@ -298,8 +262,8 @@ const getDetail = async (row: Record<string, any>) => {
 
 // 提交按钮
 const handleSubmit = async () => {
-    if (paymentlist.value.length > 0) {
-        const arr1 = paymentlist.value.map(({ name, bank_no, work_type_text, ...rest }) => rest)
+    if (paymentlist.length > 0) {
+        const arr1 = paymentlist.map(({ name, bank_no, work_type_text, ...rest }) => rest)
         formData.payment_detail = arr1
     }
     if (formDataannex.length > 0) {
@@ -318,7 +282,6 @@ const handleSubmit = async () => {
 const open = (type = 'add') => {
     mode.value = type
     popupRef.value?.open()
-    formData.handler = userInfo.name
 }
 
 // 关闭回调
diff --git a/src/views/project_salary_payment/index.vue b/src/views/project_salary_payment/index.vue
index 75c816a..30cbcc5 100644
--- a/src/views/project_salary_payment/index.vue
+++ b/src/views/project_salary_payment/index.vue
@@ -48,14 +48,6 @@
                     <el-table-column label="付款类型" prop="payment_type" show-overflow-tooltip />
                     <el-table-column label="申请日期" prop="apply_date" show-overflow-tooltip />
                     <el-table-column label="合计金额" prop="total_amount" show-overflow-tooltip />
-                    <el-table-column label="合计金额大写" prop="total_amount_uppercase" show-overflow-tooltip />
-                    <el-table-column label="账户编码" prop="insurance" show-overflow-tooltip />
-                    <el-table-column label="投保金额（万元）" prop="insured_amount" show-overflow-tooltip />
-                    <el-table-column label="开户银行" prop="insurance_company" show-overflow-tooltip />
-                    <el-table-column label="账号" prop="insurance_detail" show-overflow-tooltip />
-                    <el-table-column label="开户名称" prop="invoice_no" show-overflow-tooltip />
-                    <el-table-column label="是否计息" prop="handler" show-overflow-tooltip />
-                    <el-table-column label="开始计息日期" prop="handler" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
                     <el-table-column label="附件" prop="annex" show-overflow-tooltip>
                         <template #default="{ row }">
diff --git a/src/views/project_wbs_set/edit.vue b/src/views/project_wbs_set/edit.vue
index 2efd2ba..463b58f 100644
--- a/src/views/project_wbs_set/edit.vue
+++ b/src/views/project_wbs_set/edit.vue
@@ -4,22 +4,25 @@
             <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
                 <el-row>
                     <el-col :span="8">
-                        <el-form-item label="项目类型" prop="project_type_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="项目类型" prop="project_type_id"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
 
                             <el-select class="w-[280px]" v-model="formData.project_type_id" clearable placeholder="请选择项目类型">
-                                <el-option label="全部" value=""></el-option>
-                                <el-option v-for="(item, index) in list" :key="index" :label="item.name" :value="parseInt(item.id)" />
+                                <el-option v-for="(item, index) in list" :key="index" :label="item.name"
+                                    :value="parseInt(item.id)" />
                             </el-select>
                         </el-form-item> </el-col><el-col :span="8">
                         <el-form-item label="父级WBS编码" prop="sup_wbs_code">
                             <el-input v-model="formData.sup_wbs_code" clearable placeholder="请输入父级WBS编码" />
                         </el-form-item> </el-col>
                     <el-col :span="8">
-                        <el-form-item label="WBS编码" prop="wbs_code" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="WBS编码" prop="wbs_code"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.wbs_code" clearable placeholder="请输入WBS编码" />
                         </el-form-item> </el-col>
                     <el-col :span="8">
-                        <el-form-item label="节点名称" prop="name" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="节点名称" prop="name"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.name" clearable placeholder="请输入节点名称" />
                         </el-form-item> </el-col>
                     <el-col :span="24">
@@ -30,7 +33,8 @@
                         <el-form-item label="负责角色" prop="wproject_role_id">
                             <el-select class="w-[280px]" v-model="formData.project_role_id" clearable placeholder="请选择负责角色">
                                 <el-option label="全部" value=""></el-option>
-                                <el-option v-for="(item, index) in list1" :key="index" :label="item.name" :value="parseInt(item.id)" />
+                                <el-option v-for="(item, index) in list1" :key="index" :label="item.name"
+                                    :value="parseInt(item.id)" />
                             </el-select>
                         </el-form-item>
 
@@ -42,12 +46,14 @@
                             <el-input v-model="formData.output_data" clearable placeholder="请输入输出资料" />
                         </el-form-item> </el-col>
                     <el-col :span="8">
-                        <el-form-item label="排序号" prop="sort" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="formData.sort" clearable placeholder="请输入排序号" />
+                        <el-form-item label="排序号" prop="sort"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="formData.sort" type="number" clearable placeholder="请输入排序号" />
                         </el-form-item> </el-col>
                     <el-col :span="8">
-                        <el-form-item label="权重" prop="weight" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="formData.weight" clearable placeholder="请输入权重" />
+                        <el-form-item label="权重" prop="weight"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="formData.weight" type="number" clearable placeholder="请输入权重" />
                         </el-form-item> </el-col>
 
                 </el-row>
diff --git a/src/views/project_wbs_set/index.vue b/src/views/project_wbs_set/index.vue
index 9fc6943..e1128d1 100644
--- a/src/views/project_wbs_set/index.vue
+++ b/src/views/project_wbs_set/index.vue
@@ -21,33 +21,32 @@
                 </template>
                 新增
             </el-button>
-            <el-button v-perms="['project.project/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+            <el-button v-perms="['project.project/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
                 删除
             </el-button>
 
             <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange" row-key="id" lazy :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange" row-key="id" lazy
+                    :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="序号" type="index" width="55" />
                     <el-table-column label="节点名称" prop="name" show-overflow-tooltip>
-                        <!-- <template #default="{ row }">
-                          <div>
-                            <div v-for="(item, i) in row" :key="i">{{ item.name }}</div>
-                          </div>
-                        </template> -->
                     </el-table-column>
+                    <el-table-column label="WBS编码" prop="wbs_code" show-overflow-tooltip />
+
                     <!-- <el-table-column label="节点名称" prop="name" show-overflow-tooltip /> -->
                     <el-table-column label="输出资料" prop="output_data" show-overflow-tooltip />
                     <el-table-column label="负责角色" prop="project_role_name" show-overflow-tooltip />
                     <el-table-column label="层级" prop="sort" show-overflow-tooltip />
                     <el-table-column label="本级权重" prop="weight" show-overflow-tooltip />
-                    <!-- <el-table-column label="整体权重" prop="sort" show-overflow-tooltip /> -->
                     <el-table-column label="操作" width="150" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['project.project/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button v-perms="['project.project/delete']" type="danger" link @click="handleDelete(row.id)">
+                            <el-button v-perms="['project.project/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                             <el-button v-perms="['project.project/detail']" link @click="handledetail(row)">
diff --git a/src/views/recordsPayment/detail.vue b/src/views/recordsPayment/detail.vue
index 53bcd76..22a646a 100644
--- a/src/views/recordsPayment/detail.vue
+++ b/src/views/recordsPayment/detail.vue
@@ -5,12 +5,17 @@
 
             <el-descriptions title="基本信息" :column="2" border>
 
-                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_name }}</el-descriptions-item>
-                <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_code }}</el-descriptions-item>
-                <el-descriptions-item label="合同名称" label-align="left" align="left" label-class-name="my-label">{{ formData.contract_name }}</el-descriptions-item>
-                <el-descriptions-item label="合同编号" label-align="left" align="left" label-class-name="my-label">{{ formData.contract_code }}</el-descriptions-item>
+                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label"> {{
+                    formData.project_name }}</el-descriptions-item>
+                <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{
+                    formData.project_code }}</el-descriptions-item>
+                <el-descriptions-item label="合同名称" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.contract_name }}</el-descriptions-item>
+                <el-descriptions-item label="合同编号" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.contract_code }}</el-descriptions-item>
 
-                <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.custom_name }}</el-descriptions-item>
+                <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.custom_name }}</el-descriptions-item>
                 <el-descriptions-item label="期次" label-align="left" align="left" label-class-name="my-label">
                     {{ formData.period }}
                 </el-descriptions-item>
@@ -43,7 +48,8 @@
                 <el-descriptions-item label="合同附件" label-align="left" align="left" label-class-name="my-label">
                     <div v-if="formData.annex.length > 0">
                         <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
+                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item"
+                                target="_blank">文件{{ index + 1 }}查看</el-link>
 
                         </div>
                     </div>
@@ -55,10 +61,13 @@
 
 
 
-            <el-descriptions title="收款账户" :column="3" style="margin: 20px 0;" border>
-                <el-descriptions-item label="账户编码" label-align="left" align="left" label-class-name="my-label"> {{ formData.bank_account_info.account_sn }}</el-descriptions-item>
-                <el-descriptions-item label="开户银行" label-align="left" align="left" label-class-name="my-label"> {{ formData.bank_account_info.deposit_bank }}</el-descriptions-item>
-                <el-descriptions-item label="账号" label-align="left" align="left" label-class-name="my-label">{{ formData.bank_account_info.account }}</el-descriptions-item>
+            <el-descriptions title="付款银行信息" :column="3" style="margin: 20px 0;" border>
+                <el-descriptions-item label="账户编码" label-align="left" align="left" label-class-name="my-label"> {{
+                    formData.bank_account_info.account_sn }}</el-descriptions-item>
+                <el-descriptions-item label="开户银行" label-align="left" align="left" label-class-name="my-label"> {{
+                    formData.bank_account_info.deposit_bank }}</el-descriptions-item>
+                <el-descriptions-item label="账号" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.bank_account_info.account }}</el-descriptions-item>
             </el-descriptions>
 
 
@@ -160,5 +169,4 @@ defineExpose({
 
 :deep(.my-label) {
     width: 150px;
-}
-</style>
+}</style>
diff --git a/src/views/recordsPayment/edit.vue b/src/views/recordsPayment/edit.vue
index 7cf29c3..2c77996 100644
--- a/src/views/recordsPayment/edit.vue
+++ b/src/views/recordsPayment/edit.vue
@@ -135,7 +135,7 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <div style="margin: 20px 0;">收款账户</div>
+                <div style="margin: 20px 0;">付款银行信息</div>
 
                 <el-row :gutter="10">
 
@@ -263,6 +263,7 @@ const customEvent1 = (e: any) => {
     custom_name.value = e.custom_name;
     contract_name.value = e.contract_name;
     contract_no.value = e.contract_code
+    formData.period = ''
     showDialog1.value = false;
 };
 const customEvent2 = (e: any) => {
diff --git a/src/views/refund/edit.vue b/src/views/refund/edit.vue
index 28f23fa..c4e7519 100644
--- a/src/views/refund/edit.vue
+++ b/src/views/refund/edit.vue
@@ -74,7 +74,7 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="退款人" prop="refund_user">
-                            <el-input v-model="formData.refund_user" readonly clearable placeholder="请输入退款人" />
+                            <el-input v-model="formData.refund_user" clearable placeholder="请输入退款人" />
 
                         </el-form-item>
                     </el-col>
@@ -111,28 +111,51 @@
                 <div style="margin: 20px 0;">客户收款信息</div>
 
                 <el-row :gutter="10">
-                    <el-col :span="8">
-                        <el-form-item label="付款银行账号" prop="bank_account_no" @click="showDialog = true">
-                            <el-input v-model="bank_account_no" readonly clearable placeholder="请输入付款银行账号" />
-                        </el-form-item>
-                    </el-col>
                     <el-col :span="8">
                         <el-form-item label="收款账号" prop="collection_account">
                             <el-input v-model="formData.collection_account" clearable placeholder="请输入收款账号" />
                         </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="收款银行" prop="collection_bank">
+                            <el-input v-model="formData.collection_bank" clearable placeholder="请输入收款银行" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <div style="margin: 20px 0;">付款银行信息</div>
+                <el-row :gutter="10">
+                    <el-col :span="8">
+                        <el-form-item label="账户编码" prop="collection_account">
+                            <el-input v-model="formData.bank_account_info.account_sn" @click="showDialog = true" readonly
+                                clearable placeholder="请输入收款账号" />
+                        </el-form-item>
 
                     </el-col>
 
                     <el-col :span="8">
-                        <el-form-item label="收款银行" prop="collection_bank">
-                            <el-input v-model="formData.collection_bank" clearable placeholder="请输入收款银行" />
+                        <el-form-item label="开户银行" prop="collection_bank">
+                            <el-input v-model="formData.bank_account_info.deposit_bank" clearable readonly
+                                placeholder="请输入收款银行" />
+                        </el-form-item>
+
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="开户名称" prop="collection_bank">
+                            <el-input v-model="formData.bank_account_info.account_name" clearable readonly
+                                placeholder="请输入收款银行" />
+                        </el-form-item>
+
+                    </el-col> <el-col :span="8">
+                        <el-form-item label="开户账号" prop="collection_bank">
+                            <el-input v-model="formData.bank_account_info.account" clearable readonly
+                                placeholder="请输入收款银行" />
                         </el-form-item>
 
                     </el-col>
 
                 </el-row>
 
-
                 <el-dialog v-model="showDialog" title="选择收款银行" width="70%">
                     <bankaccountDialog @customEvent="customEvent"></bankaccountDialog>
                 </el-dialog>
@@ -187,8 +210,6 @@ const handleAvatarSuccess_four = (
     }
     formDataannex.push(
         { uri: response.data.uri, name: response.data.name }
-
-
     );
 };
 
@@ -212,7 +233,10 @@ const showDialog1 = ref(false)
 
 const customEvent = (e: any) => {
     formData.bank_account_id = e.id;
-    bank_account_no.value = e.account;
+    formData.bank_account_info.account_sn = e.account_sn
+    formData.bank_account_info.deposit_bank = e.deposit_bank
+    formData.bank_account_info.account_name = e.account_name
+    formData.bank_account_info.account = e.account
     showDialog.value = false;
 
 };
@@ -243,20 +267,25 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
-
     contract_id: "",
-
     refund_date: "",
     reason: "",
     amount: 0,
-
     refund_type: "",
     refund_user: '',
-
     annex: "",
+    remark: "",
     bank_account_id: "",
     collection_bank: "",
-    collection_account: ""
+    collection_account: "",
+    "bank_account_info": {
+        "account_sn": "",
+        "deposit_bank": "",
+        "account_name": "",
+        "account": ""
+    }
+
+
 })
 
 
@@ -288,6 +317,7 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
+    console.log(formData, "fordATA")
     custom_name.value = data.custom_name
     project_name.value = data.project_name
     project_code.value = data.project_code
diff --git a/src/views/refundbidDeposit/detail.vue b/src/views/refundbidDeposit/detail.vue
index f7f3ae4..c5fb791 100644
--- a/src/views/refundbidDeposit/detail.vue
+++ b/src/views/refundbidDeposit/detail.vue
@@ -2,44 +2,85 @@
 <template>
     <div class="detail-popup">
         <popup ref="popupRef" title="退投标保证金" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-descriptions title="基本信息" :column="3" border>
-                <el-descriptions-item label="投标编号" label-align="left" align="left" label-class-name="my-label">{{ formData.bidding_decision_code }}</el-descriptions-item>
-                <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.custom_name }}</el-descriptions-item>
 
 
-                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">{{ formData.project_name }}</el-descriptions-item>
-                <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label">{{ formData.project_code }}</el-descriptions-item>
-
-                <el-descriptions-item label="投标时间" label-align="left" align="left" label-class-name="my-label">{{ formData.bidding_time
-                }}</el-descriptions-item>
-
-                <el-descriptions-item label="退款金额" label-align="left" align="left" label-class-name="my-label">{{ formData.margin_amount }}</el-descriptions-item>
-                <!-- <el-descriptions-item label="大写" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_opening_date }}</el-descriptions-item> -->
-
-
-
-                <el-descriptions-item label="退款日期" label-align="left" align="left" label-class-name="my-label">{{ formData.refund_date }}</el-descriptions-item>
-
-                <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">{{ formData.remark }}</el-descriptions-item>
-                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
-
-                    <div v-if="formData.annex.length > 0">
-                        <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</a>
-
-                        </div>
+            <el-card>
+                <template #header>
+                    <div class="card-header">
+                        <span>基本信息</span>
                     </div>
-                    <div v-else> 暂无附件</div>
-                </el-descriptions-item>
+                </template>
+                <el-descriptions title="" :column="3" border>
+                    <el-descriptions-item label="投标编号" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.bidding_decision_code }}</el-descriptions-item>
+                    <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.custom_name }}</el-descriptions-item>
 
-            </el-descriptions>
 
-            <el-descriptions title="收款账户信息" border>
-                <el-descriptions-item label="账号编码" label-align="left" align="left" label-class-name="my-label">{{ formData.bank_account_info.account_sn }}</el-descriptions-item>
-                <el-descriptions-item label="开户银行" label-align="left" align="left" label-class-name="my-label">{{ formData.bank_account_info.deposit_bank }}</el-descriptions-item>
-                <el-descriptions-item label="开户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.bank_account_info.account_name }}</el-descriptions-item>
-                <el-descriptions-item label="账号" label-align="left" align="left" label-class-name="my-label">{{ formData.bank_account_info.account }}</el-descriptions-item>
-            </el-descriptions>
+                    <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.project_name }}</el-descriptions-item>
+                    <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.project_code }}</el-descriptions-item>
+
+                    <el-descriptions-item label="投标时间" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.bidding_time
+                    }}</el-descriptions-item>
+
+                    <el-descriptions-item label="退款金额" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.refund_amount }}</el-descriptions-item>
+                    <el-descriptions-item label="退款日期" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.refund_date }}</el-descriptions-item>
+
+                    <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.remark }}</el-descriptions-item>
+                    <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+
+                        <div v-if="formData.annex.length > 0">
+                            <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+                                <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item"
+                                    target="_blank">文件{{ index + 1 }}查看</a>
+
+                            </div>
+                        </div>
+                        <div v-else> 暂无附件</div>
+                    </el-descriptions-item>
+
+                </el-descriptions>
+            </el-card>
+
+            <el-card>
+                <template #header>
+                    <div class="card-header">
+                        <span>付款银行信息</span>
+                    </div>
+                </template>
+                <el-descriptions title="" border>
+                    <el-descriptions-item label="账号编码" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.bank_account_info.account_sn }}</el-descriptions-item>
+                    <el-descriptions-item label="开户银行" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.bank_account_info.deposit_bank }}</el-descriptions-item>
+                    <el-descriptions-item label="开户名称" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.bank_account_info.account_name }}</el-descriptions-item>
+                    <el-descriptions-item label="账号" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.bank_account_info.account }}</el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <el-card>
+                <template #header>
+                    <div class="card-header">
+                        <span>收款账户信息</span>
+                    </div>
+                </template>
+                <el-descriptions title="" border>
+                    <el-descriptions-item label="收款账号" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.account }}</el-descriptions-item>
+                    <el-descriptions-item label="开户银行" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.deposit_bank }}</el-descriptions-item>
+                    <el-descriptions-item label="开户名称" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.account_name }}</el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+
         </popup>
     </div>
 </template>
diff --git a/src/views/refundbidDeposit/edit.vue b/src/views/refundbidDeposit/edit.vue
index 9a93031..6b4ec9e 100644
--- a/src/views/refundbidDeposit/edit.vue
+++ b/src/views/refundbidDeposit/edit.vue
@@ -6,7 +6,8 @@
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
                 <el-row :gutter="10">
                     <el-col :span="8">
-                        <el-form-item label="投标编号" prop="bid_security_apply_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                        <el-form-item label="投标编号" prop="bid_security_apply_id" @click="showDialog = true"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="bidding_code" clearable placeholder="请选择投标编号" />
                         </el-form-item>
                     </el-col>
@@ -29,14 +30,16 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="投标时间" prop="bidding_time">
-                            <el-date-picker class="flex-1 !flex" v-model="bidding_time" clearable type="date" value-format="YYYY-MM-DD" disabled placeholder="系统自动填写">
+                            <el-date-picker class="flex-1 !flex" v-model="bidding_time" clearable type="date"
+                                value-format="YYYY-MM-DD" disabled placeholder="系统自动填写">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="退款日期" prop="refund_date">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.refund_date" clearable type="date" value-format="YYYY-MM-DD" placeholder="请选择退款日期">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.refund_date" clearable type="date"
+                                value-format="YYYY-MM-DD" placeholder="请选择退款日期">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -44,7 +47,8 @@
 
                     <el-col :span="8">
                         <el-form-item label="退款金额" prop="refund_amount">
-                            <el-input v-model="formData.refund_amount" clearable placeholder="请输入退款金额" @input="amountinput" />
+                            <el-input v-model="formData.refund_amount" clearable placeholder="请输入退款金额"
+                                @input="amountinput" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -63,7 +67,11 @@
                     <el-col :span="24">
 
                         <el-form-item label="附件" prop="field127">
-                            <el-upload accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv" class="upload-demo" :show-file-list="false" aria-hidden="true" :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'" :on-success="handleAvatarSuccess_four" ref="upload">
+                            <el-upload
+                                accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv"
+                                class="upload-demo" :show-file-list="false" aria-hidden="true"
+                                :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'"
+                                :on-success="handleAvatarSuccess_four" ref="upload">
                                 <el-button type="primary">
                                     上传
                                 </el-button>
@@ -71,7 +79,8 @@
 
                             <div>
                                 <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
+                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
+                                        target="_blank">{{ item.name }}</a>
                                     <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
                                 </div>
                             </div>
@@ -79,36 +88,35 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <div style="margin: 20px 0;">收款账户</div>
-
+                <div style="margin: 20px 0;">付款银行信息</div>
                 <el-row :gutter="10">
-
                     <el-col :span="8">
-                        <el-form-item label="账户编码" prop="bank_account_id" @click="showDialog1 = true">
-                            <el-input v-model="accnout_sn" readonly clearable placeholder="请输入账户编码" />
+                        <el-form-item label="账户编码" prop="bank_account_info"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="formData.bank_account_info.account_sn" @click="showDialog1 = true" readonly
+                                clearable placeholder="请输入收款账号" />
                         </el-form-item>
 
                     </el-col>
 
                     <el-col :span="8">
-                        <el-form-item label="开户银行" prop="bank_account_id">
-                            <el-input v-model="deposit_bank" disabled clearable placeholder="请输入开户银行" />
+                        <el-form-item label="开户银行" prop="collection_bank">
+                            <el-input v-model="formData.bank_account_info.deposit_bank" clearable readonly
+                                placeholder="请输入收款银行" />
                         </el-form-item>
 
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="账号" prop="bank_account_id">
-                            <el-input v-model="bank_accnout" disabled clearable placeholder="请输入开票公司名称" />
+                        <el-form-item label="开户名称" prop="collection_bank">
+                            <el-input v-model="formData.bank_account_info.account_name" clearable readonly
+                                placeholder="请输入收款银行" />
                         </el-form-item>
-
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="开户地址及电话" prop="bank_account_id">
-                            <el-input v-model="address_phone" disabled clearable placeholder="请输入开户地址及电话" />
+                    </el-col> <el-col :span="8">
+                        <el-form-item label="开户账号" prop="collection_bank">
+                            <el-input v-model="formData.bank_account_info.account" clearable readonly
+                                placeholder="请输入收款银行" />
                         </el-form-item>
-
                     </el-col>
-
                 </el-row>
 
 
@@ -210,13 +218,12 @@ const customEvent = (e: any) => {
     showDialog.value = false;
 };
 const customEvent1 = (e: any) => {
-
-    formData.bank_account_id = e.id
-    accnout_sn.value = e.account_sn
-    bank_accnout.value = e.account
-    address_phone.value = e.account_sn
-    deposit_bank.value = e.deposit_bank
-    showDialog1.value = false;
+    formData.bank_account_id = e.id;
+    formData.bank_account_info.account_sn = e.account_sn
+    formData.bank_account_info.deposit_bank = e.deposit_bank
+    formData.bank_account_info.account_name = e.account_name
+    formData.bank_account_info.account = e.account
+    showDialog1.value = false
 };
 
 
@@ -242,6 +249,12 @@ const formData = reactive({
     remark: "",
     annex: "",
     bank_account_id: '',
+    "bank_account_info": {
+        "account_sn": "",
+        "deposit_bank": "",
+        "account_name": "",
+        "account": ""
+    }
 
 })
 
diff --git a/src/views/subcontracting_contract/detail.vue b/src/views/subcontracting_contract/detail.vue
index 480fbf1..e96b9b1 100644
--- a/src/views/subcontracting_contract/detail.vue
+++ b/src/views/subcontracting_contract/detail.vue
@@ -8,12 +8,18 @@
                         <el-descriptions :column="2" border>
 
 
-                            <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_name }}</el-descriptions-item>
-                            <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_code }}</el-descriptions-item>
-                            <el-descriptions-item label="合同名称" label-align="left" align="left" label-class-name="my-label">{{ formData.contract_name }}</el-descriptions-item>
-                            <el-descriptions-item label="合同编号" label-align="left" align="left" label-class-name="my-label">{{ formData.contract_no }}</el-descriptions-item>
-                            <el-descriptions-item label="供应商编码" label-align="left" align="left" label-class-name="my-label">{{ formData.supplier_code }}</el-descriptions-item>
-                            <el-descriptions-item label="供应商名称" label-align="left" align="left" label-class-name="my-label">{{ formData.supplier_name }}</el-descriptions-item>
+                            <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                                {{ formData.project_name }}</el-descriptions-item>
+                            <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label">
+                                {{ formData.project_code }}</el-descriptions-item>
+                            <el-descriptions-item label="合同名称" label-align="left" align="left"
+                                label-class-name="my-label">{{ formData.contract_name }}</el-descriptions-item>
+                            <el-descriptions-item label="合同编号" label-align="left" align="left"
+                                label-class-name="my-label">{{ formData.contract_no }}</el-descriptions-item>
+                            <el-descriptions-item label="供应商编码" label-align="left" align="left"
+                                label-class-name="my-label">{{ formData.supplier_code }}</el-descriptions-item>
+                            <el-descriptions-item label="供应商名称" label-align="left" align="left"
+                                label-class-name="my-label">{{ formData.supplier_name }}</el-descriptions-item>
                             <el-descriptions-item label="合同类型" label-align="left" align="left" label-class-name="my-label">
                                 {{ formData.contract_type_text }}
                             </el-descriptions-item>
@@ -39,7 +45,8 @@
                             <el-descriptions-item label="不含税金额" label-align="left" align="left" label-class-name="my-label">
                                 {{ formData.amount_excluding_tax }}
                             </el-descriptions-item>
-                            <el-descriptions-item label="质保金比例(％)" label-align="left" align="left" label-class-name="my-label">
+                            <el-descriptions-item label="质保金比例(％)" label-align="left" align="left"
+                                label-class-name="my-label">
                                 {{ formData.retention_money_rate }}
                             </el-descriptions-item>
                             <el-descriptions-item label="质保金" label-align="left" align="left" label-class-name="my-label">
@@ -51,7 +58,8 @@
                             <el-descriptions-item label="合同附件" label-align="left" align="left" label-class-name="my-label">
                                 <div v-if="formDataannex.length > 0">
                                     <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
-                                        <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">文件{{ index + 1 }}查看</el-link>
+                                        <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
+                                            :href="item.uri" target="_blank">文件{{ index + 1 }}查看</el-link>
 
                                     </div>
                                 </div>
@@ -64,24 +72,32 @@
                     <el-tab-pane label="采购明细" name="demo-tabs-2">
                         <div>
                             <el-table :data="tableData" stripe style="width: 100%">
-                                <el-table-column label="采购申请单号" prop='material_purchase_request_code' width="180" />
-                                <el-table-column label="材料名称" prop='material_name' width="180" />
-                                <el-table-column label="材料编码" prop='material_code' />
-                                <el-table-column label="规格型号" prop='material_specs' />
-                                <el-table-column label="品牌" prop='material_brand' />
-                                <el-table-column label="参数说明" prop='material_parameter_description' width="280" />
-                                <el-table-column label="单位" prop='material_unit' />
-                                <el-table-column label="数量" prop='num' />
-                                <el-table-column label="合税单价" prop='price' />
-                                <el-table-column label="不含税金额" prop='amount_excluding_tax' />
-                                <el-table-column label="含税金额" prop='amount_including_tax' />
-                                <el-table-column label="已入库数量" prop="has_storage_num" show-overflow-tooltip />
-                                <el-table-column label="未入库数量" prop="not_storage_num" 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="contract_no" show-overflow-tooltip />
+                                <el-table-column label="合同类型" prop="contract_type" show-overflow-tooltip />
+                                <!-- <el-table-column label="签订日期" prop="signing_date" show-overflow-tooltip /> -->
+                                <el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
+                                <el-table-column label="工作类型" prop="work_type" show-overflow-tooltip />
+                                <el-table-column label="工作内容" prop="work_content" show-overflow-tooltip />
+                                <el-table-column label="项目特征" prop="project_features" show-overflow-tooltip />
+                                <el-table-column label="单位" prop="unit" show-overflow-tooltip />
+                                <el-table-column label="税率(%)" prop="tax_rate">
+                                    <template #default="{ row }">
+                                        <dict-value :options="dictData.tax_rate" :value="row.tax_rate" />
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="工作量" prop="num" show-overflow-tooltip />
+                                <el-table-column label="不含税金额" prop="amount_excluding_tax" show-overflow-tooltip />
+                                <el-table-column label="含税金额" prop="amount_including_tax" show-overflow-tooltip />
 
+                                <el-table-column label="备注" prop="remark" show-overflow-tooltip />
                             </el-table>
                         </div>
                         <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager1.page_no" v-model:page-size="pager1.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange1" @current-change="handleCurrentChange1" />
+                            <el-pagination v-model:current-page="pager1.page_no" v-model:page-size="pager1.page_size"
+                                :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper"
+                                :total="total" @size-change="handleSizeChange1" @current-change="handleCurrentChange1" />
                         </div>
                     </el-tab-pane>
                     <el-tab-pane label="收票记录" name="demo-tabs-3">
@@ -99,7 +115,9 @@
                             </el-table>
                         </div>
                         <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager2.page_no" v-model:page-size="pager2.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total1" @size-change="handleSizeChange2" @current-change="handleCurrentChange2" />
+                            <el-pagination v-model:current-page="pager2.page_no" v-model:page-size="pager2.page_size"
+                                :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper"
+                                :total="total1" @size-change="handleSizeChange2" @current-change="handleCurrentChange2" />
                         </div>
                     </el-tab-pane>
                     <el-tab-pane label="付款计划" name="demo-tabs-4">
@@ -116,7 +134,9 @@
                             </el-table>
                         </div>
                         <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager3.page_no" v-model:page-size="pager3.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total2" @size-change="handleSizeChange3" @current-change="handleCurrentChange3" />
+                            <el-pagination v-model:current-page="pager3.page_no" v-model:page-size="pager3.page_size"
+                                :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper"
+                                :total="total2" @size-change="handleSizeChange3" @current-change="handleCurrentChange3" />
                         </div>
                     </el-tab-pane>
                     <el-tab-pane label="付款记录" name="demo-tabs-5">
@@ -136,7 +156,9 @@
                             </el-table>
                         </div>
                         <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager4.page_no" v-model:page-size="pager4.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total3" @size-change="handleSizeChange4" @current-change="handleCurrentChange4" />
+                            <el-pagination v-model:current-page="pager4.page_no" v-model:page-size="pager4.page_size"
+                                :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper"
+                                :total="total3" @size-change="handleSizeChange4" @current-change="handleCurrentChange4" />
                         </div>
                     </el-tab-pane>
                     <el-tab-pane label="退款记录" name="demo-tabs-6">
@@ -151,7 +173,9 @@
                             </el-table>
                         </div>
                         <div style="margin: 10px 0;">
-                            <el-pagination v-model:current-page="pager5.page_no" v-model:page-size="pager5.page_size" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total4" @size-change="handleSizeChange5" @current-change="handleCurrentChange5" />
+                            <el-pagination v-model:current-page="pager5.page_no" v-model:page-size="pager5.page_size"
+                                :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper"
+                                :total="total4" @size-change="handleSizeChange5" @current-change="handleCurrentChange5" />
                         </div>
                     </el-tab-pane>
                 </el-tabs>
@@ -172,7 +196,7 @@ import { paymentapplyLists } from '@/api/paymentrequest'
 import { apiFinancerefundLists } from '@/api/refundrecord'
 import { timeFormat } from '@/utils/util'
 import type { TabsPaneContext } from 'element-plus'
-
+import { apiSubcontractingContractDetailLists } from "@/api/subcontracting_contract_detail.ts"
 const activeName = ref('demo-tabs-1')
 
 import type { PropType } from 'vue'
@@ -191,22 +215,29 @@ const pager1 = reactive({
 const pager2 = reactive({
     page_size: 10,
     page_no: 1,
-    contract_id: ""
+    contract_id: "",
+    contract_type: 2
 })
 const pager3 = reactive({
     page_size: 10,
     page_no: 1,
-    contract_id: ""
+    contract_id: "",
+    contract_type: 2
+
 })
 const pager4 = reactive({
     page_size: 10,
     page_no: 1,
-    contract_id: ""
+    contract_id: "",
+    contract_type: 2
+
 })
 const pager5 = reactive({
     page_size: 10,
     page_no: 1,
-    contract_id: ""
+    contract_id: "",
+    contract_type: 2
+
 })
 
 const total = ref(0)
@@ -296,8 +327,9 @@ const handleCurrentChange5 = (val: number) => {
     financerefundLists()
 }
 // 采购明细列表
+
 const procurementContractDetailLists = () => {
-    apiProcurementContractDetailLists(pager1).then((res) => {
+    apiSubcontractingContractDetailLists(pager1).then((res) => {
         tableData.value = res.lists
         total.value = res.count
 
diff --git a/src/views/subcontracting_contract/edit.vue b/src/views/subcontracting_contract/edit.vue
index f7b1c94..b40df55 100644
--- a/src/views/subcontracting_contract/edit.vue
+++ b/src/views/subcontracting_contract/edit.vue
@@ -437,7 +437,7 @@ const customEvent1 = (e: any) => {
     showDialog1.value = false;
 };
 const customEvent2 = (e: any) => {
-    subcontractList.splice(0, subcontractList.length, {
+    subcontractList.push({
         'subpackage_budget_detail_id': e.id,
         'work_type': e.work_type,
         'work_content': e.work_content,
@@ -461,9 +461,7 @@ watch(
         amount.value = 0
         amount_excluding_tax.value = 0
         subcontractList.forEach(item => {
-            console.log(item.tax_rate, "taxreat")
             item.amount_including_tax = item.num * item.price || 0 //单个含税金额
-
             item.amount_excluding_tax = item.amount_including_tax * getTaxValue(item.tax_rate) || 0 //单个不含税金额
             amount.value += item.amount_including_tax || 0 //计算合同金额
             amount_excluding_tax.value += item.amount_excluding_tax || 0//计算总不含税金额
@@ -473,7 +471,8 @@ watch(
 )
 // 计算质保金
 const retention_money = computed(() => {
-    return amount.value * formData.retention_money_rate
+    return amount.value * (formData.retention_money_rate / 100)
+
 })
 
 
diff --git a/src/views/subcontracting_contract_detail/detail.vue b/src/views/subcontracting_contract_detail/detail.vue
index 86a7611..2004d66 100644
--- a/src/views/subcontracting_contract_detail/detail.vue
+++ b/src/views/subcontracting_contract_detail/detail.vue
@@ -7,12 +7,12 @@
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="项目名称">
-                                {{ formData.contract_name }}
+                                {{ formData.project_name }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="项目编码">
-                                {{ formData.contract_name }}
+                                {{ formData.project_code }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
@@ -22,51 +22,70 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="合同编号">
-                                {{ formData.contract_code }}
+                                {{ formData.contract_no }}
                             </el-form-item>
                         </el-col> <el-col :span="12">
                             <el-form-item label="合同类型">
-                                <dict-value :options="dictData.contract_type" :value="formData.contract_type" />
+                                {{ formData.contract_type }}
                             </el-form-item>
                         </el-col>
 
                         <el-col :span="12">
-                            <el-form-item label="付款方式">
-                                <dict-value :options="dictData.pay_type" :value="formData.pay_type" />
+                            <el-form-item label="供应商名称">
+                                {{ formData.supplier_name }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="账期">
-                                <dict-value :options="dictData.account_period" :value="formData.account_period" />
+                            <el-form-item label="供应商编码">
+                                {{ formData.supplier_code }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="工作类型">
+                                {{ formData.work_type }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="工作内容">
+                                {{ formData.work_content }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="项目特征">
+                                {{ formData.project_features }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="单位">
+                                {{ formData.num }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="工作量">
+                                {{ formData.unit }}
                             </el-form-item>
                         </el-col>
 
                         <el-col :span="12">
                             <el-form-item label="不含税金额">
-                                {{ formData.amount_daxie }}
+                                {{ formData.amount_excluding_tax }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="含税金额">
-                                {{ formData.labor_costs }}
+                                {{ formData.amount_including_tax }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="金额大写">
-                                {{ formData.amount_daxie }}
+                            <el-form-item label="含税单价">
+                                {{ formData.price }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="质保金比例">
-                                {{ formData.retention_money_rate }}
+                            <el-form-item label="税率">
+                                {{ formData.tax_rate_text }}%
                             </el-form-item>
                         </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="质保金">
-                                {{ formData.retention_mone }}
-                            </el-form-item>
-                        </el-col>
-
 
 
                     </el-row>
@@ -109,7 +128,10 @@ const formData = reactive({
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
+    // console.log(data, "res")
     Object.assign(formData, data)
+    console.log(formData)
+    // console.log("resdssd")
 
 
 
diff --git a/src/views/subcontracting_contract_detail/index.vue b/src/views/subcontracting_contract_detail/index.vue
index 62a8204..65f7114 100644
--- a/src/views/subcontracting_contract_detail/index.vue
+++ b/src/views/subcontracting_contract_detail/index.vue
@@ -15,7 +15,6 @@
                 <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="" 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="contract_no" show-overflow-tooltip />
@@ -56,8 +55,8 @@
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
-        <!-- <detail-popup v-if="showDtail" ref="detailRef" :dict-data="dictData" @close="showDtail = false" />
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" /> -->
+        <detail-popup v-if="showDtail" ref="detailRef" :dict-data="dictData" @close="showDtail = false" />
+        <!-- <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" /> -->
     </div>
 </template>
 
@@ -122,11 +121,11 @@ const handleDelete = async (id: number | any[]) => {
 }
 const handleDetail = async (data: any) => {
     let res = await apiSubcontractingContractDetailDetail({ id: data.id })
-    console.log(res, "res")
     showDtail.value = true
     await nextTick()
     detailRef.value?.open()
     detailRef.value?.setFormData(res)
+    console.log(res)
 }
 
 
diff --git a/src/views/subcontracting_contract_negotiation/detail.vue b/src/views/subcontracting_contract_negotiation/detail.vue
index 6469e84..32603ee 100644
--- a/src/views/subcontracting_contract_negotiation/detail.vue
+++ b/src/views/subcontracting_contract_negotiation/detail.vue
@@ -1,33 +1,34 @@
 
 <template>
     <div class="detail-popup">
-        <popup ref="popupRef" title="分包合同详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+        <popup ref="popupRef" title="分包洽商详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="120px">
                 <el-card class="mb-2">
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="项目名称">
-                                {{ formData.project.name }}
+                                {{ formData.project_name }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="项目编码">
-                                {{ formData.project ? formData.project.project_code : '暂无数据' }}
+                                {{ formData.project_code }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="合同名称">
-                                {{ formData.contract.contract_name }}
+                                {{ formData.contract_name }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="合同编号">
-                                {{ formData.contract ? formData.contract.contract_no : '暂无数据' }}
+                                {{ formData.contract_no }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="洽商类别">
-                                <dict-value :options="dictData.negotiation_type" :value="formData.negotiation_type" />
+                                <!-- <dict-value :options="dictData.negotiation_type" :value="formData.negotiation_type" /> -->
+                                {{ formData.negotiation_type_text }}
                             </el-form-item>
                         </el-col>
 
@@ -39,7 +40,7 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="签订日期">
-                                {{ formData.signing_date }}
+                                {{ formData.sign_date }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
@@ -54,12 +55,33 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="洽商质保到期时间">
-                                {{ formData.Warranty_expire_date }}
+                                {{ formData.warranty_expire_date }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="洽商内容">
+                                {{ formData.negotiation_content }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="洽商详情">
+                                {{ formData.negotiation_detail }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="签订保价表附件">
+                                <el-link :href="item" target="_blank" v-for="(item, index) in formData.negotiation_basis"
+                                    :key="index" type="primary"> 文件{{ index + 1 }}</el-link>
                             </el-form-item>
                         </el-col>
 
-
-
+                        <el-col :span="12">
+                            <el-form-item label="洽商依据附件">
+                                <el-link :href="item" target="_blank" type="primary"
+                                    v-for="(item, index) in formData.negotiation_quotation" :key="index"> 文件{{ index +
+                                        1 }}</el-link>
+                            </el-form-item>
+                        </el-col>
                     </el-row>
                 </el-card>
             </el-form>
@@ -101,6 +123,7 @@ const formData = reactive({
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     Object.assign(formData, data)
+    // console.log(data)
 
 
 
diff --git a/src/views/subcontracting_contract_negotiation/edit.vue b/src/views/subcontracting_contract_negotiation/edit.vue
index f275180..0651d27 100644
--- a/src/views/subcontracting_contract_negotiation/edit.vue
+++ b/src/views/subcontracting_contract_negotiation/edit.vue
@@ -57,7 +57,22 @@
                         <el-form-item label="洽商金额" prop="negotiation_amount"
                             :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
                             <el-input v-model="formData.negotiation_amount" clearable placeholder="请输入合同金额" />
-                        </el-form-item> </el-col>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="洽商内容" prop="negotiation_content">
+                            <el-input v-model="formData.negotiation_content" clearable placeholder="请输入洽商内容" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="具体说明" prop="negotiation_detail">
+                            <el-input v-model="formData.negotiation_detail" clearable placeholder="请输入具体说明" />
+                        </el-form-item>
+                    </el-col>
+
+
                     <el-col :span="24">
                         <el-form-item label="洽商类别" prop="negotiation_type">
                             <el-radio-group v-model="formData.negotiation_type" placeholder="请选择付款方式">
@@ -74,8 +89,8 @@
                             <el-input v-model="formData.warranty_amount" clearable placeholder="请输入不含税金额" />
                         </el-form-item> </el-col>
                     <el-col :span="8">
-                        <el-form-item label="洽商质保到期时间" prop="Warranty_expire_date">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.Warranty_expire_date" clearable
+                        <el-form-item label="洽商质保到期时间" prop="warranty_expire_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.warranty_expire_date" clearable
                                 value-format="YYYY-MM-DD" placeholder="选择洽商质保到期时间">
                             </el-date-picker>
                         </el-form-item> </el-col>
@@ -265,6 +280,8 @@ const formData = reactive({
     negotiation_content: '',
     negotiation_quotation: [],
     negotiation_basis: [],
+    negotiation_content: "",
+    negotiation_detail: "",
     "sign_date": "string",
 
 })
@@ -312,8 +329,11 @@ const setFormData = async (data: Record<any, any>) => {
         Object.assign(formDataannex1, arry1)
 
     }
-    project_name.value = data.project.name
-    project_code.value = data.project.project_code
+    project_name.value = data.project_name
+    project_code.value = data.project_code
+    contract_no.value = data.contract_no
+    supplier_name.value = data.supplier_name
+    supplier_code.value = data.supplier_code
 
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
@@ -322,8 +342,9 @@ const setFormData = async (data: Record<any, any>) => {
         }
     }
 
+    console.log(formData, "formdata")
     //@ts-ignore
-    formData.signing_date = timeFormat(formData.signing_date, 'YYYY-MM-DD ')
+    // formData.signing_date = timeFormat(formData.signing_date, 'YYYY-MM-DD ')
 }
 
 const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/subcontracting_contract_negotiation/index.vue b/src/views/subcontracting_contract_negotiation/index.vue
index 8fda5bd..a45a7e8 100644
--- a/src/views/subcontracting_contract_negotiation/index.vue
+++ b/src/views/subcontracting_contract_negotiation/index.vue
@@ -41,8 +41,6 @@
                 <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="negotiation_no" show-overflow-tooltip />
                     <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
                     <el-table-column label="洽商单名称" prop="negotiation_name" show-overflow-tooltip />