From d2be9bcbb33571dc9561df018feb74f57e5934d8 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 19 Dec 2023 17:43:05 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AE=8C=E6=88=90=E8=B4=A2=E5=8A=A1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=B8=8B=E4=BB=98=E6=AC=BE=E7=AE=A1=E7=90=86=E4=B8=8B?=
 =?UTF-8?q?=E6=94=B6=E7=A5=A8=E8=AE=B0=E5=BD=95=EF=BC=8C=EF=BC=8C=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=E8=AE=A1=E5=88=92=EF=BC=8C=E4=BB=98=E6=AC=BE=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=EF=BC=8C=E9=80=80=E6=AC=BE=E8=AE=B0=E5=BD=95=E5=A2=9E?=
 =?UTF-8?q?=E5=88=A0=E6=94=B9=E6=9F=A5=E5=8A=9F=E8=83=BD=20=202.=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=AE=A1=E5=88=92=E4=B8=8B=E7=9A=84=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92,=20,=E9=A1=B9=E7=9B=AE=E9=87=8C=E7=A8=8B?=
 =?UTF-8?q?=E7=A2=91=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bidbbond.ts                           |  26 ++
 src/api/paymentplan.ts                        |  26 ++
 src/api/paymentrequest.ts                     |  26 ++
 src/api/project_milestones.ts                 |  26 ++
 src/api/project_plan.ts                       |  26 ++
 src/api/receiptrecord.ts                      |  27 ++
 src/api/refundbidDeposit.ts                   |  26 ++
 src/api/refundrecord.ts                       |  26 ++
 src/components/biddingDecision/index.vue      |  85 ++++
 src/components/paylist/index.vue              |  81 ++++
 .../index.vue                                 |  78 ++++
 src/views/bid_bidding_decision/index.vue      |   4 +-
 src/views/bidbbond/detail.vue                 | 161 ++++++++
 src/views/bidbbond/edit.vue                   | 346 +++++++++++++++++
 src/views/bidbbond/index.vue                  | 145 +++++++
 src/views/paymentplan/detail.vue              |  63 +--
 src/views/paymentplan/edit.vue                | 156 ++++----
 src/views/paymentplan/index.vue               |  73 ++--
 src/views/paymentrequest/detail.vue           |  90 +++--
 src/views/paymentrequest/edit.vue             | 231 +++++++----
 src/views/paymentrequest/index.vue            |  87 +++--
 src/views/procurement_contract/index.vue      |   7 +-
 .../project_manager_appointment/detail.vue    |  43 +--
 .../project_manager_appointment/edit.vue      |  34 +-
 .../project_manager_appointment/index.vue     |  55 ++-
 src/views/project_milestones/detail.vue       | 123 ++++++
 src/views/project_milestones/edit.vue         | 144 +++++++
 src/views/project_milestones/index.vue        |  56 ++-
 src/views/project_plan/detail.vue             | 123 ++++++
 src/views/project_plan/edit.vue               | 340 ++++++++++++++++
 src/views/project_plan/index.vue              | 180 +++++++++
 src/views/receiptrecord/edit.vue              | 140 +++----
 src/views/receiptrecord/index.vue             |  61 +--
 src/views/refundbidDeposit/detail.vue         | 161 ++++++++
 src/views/refundbidDeposit/edit.vue           | 362 ++++++++++++++++++
 src/views/refundbidDeposit/index.vue          | 145 +++++++
 src/views/refundrecord/detail.vue             |  31 +-
 src/views/refundrecord/edit.vue               | 157 ++++----
 src/views/refundrecord/index.vue              |  73 ++--
 39 files changed, 3457 insertions(+), 587 deletions(-)
 create mode 100644 src/api/bidbbond.ts
 create mode 100644 src/api/paymentplan.ts
 create mode 100644 src/api/paymentrequest.ts
 create mode 100644 src/api/project_milestones.ts
 create mode 100644 src/api/project_plan.ts
 create mode 100644 src/api/receiptrecord.ts
 create mode 100644 src/api/refundbidDeposit.ts
 create mode 100644 src/api/refundrecord.ts
 create mode 100644 src/components/biddingDecision/index.vue
 create mode 100644 src/components/paylist/index.vue
 create mode 100644 src/components/procurementsubcontracting_selector/index.vue
 create mode 100644 src/views/bidbbond/detail.vue
 create mode 100644 src/views/bidbbond/edit.vue
 create mode 100644 src/views/bidbbond/index.vue
 create mode 100644 src/views/project_milestones/detail.vue
 create mode 100644 src/views/project_milestones/edit.vue
 create mode 100644 src/views/project_plan/detail.vue
 create mode 100644 src/views/project_plan/edit.vue
 create mode 100644 src/views/refundbidDeposit/detail.vue
 create mode 100644 src/views/refundbidDeposit/edit.vue
 create mode 100644 src/views/refundbidDeposit/index.vue

diff --git a/src/api/bidbbond.ts b/src/api/bidbbond.ts
new file mode 100644
index 0000000..abba309
--- /dev/null
+++ b/src/api/bidbbond.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 投标保证金表列表
+export function bidapplyLists(params: any) {
+    return request.get({ url: '/bid.bid_security_apply/lists', params })
+}
+
+// 添加投标保证金
+export function bidapplyAdd(params: any) {
+    return request.post({ url: '/bid.bid_security_apply/add', params })
+}
+
+// 编辑投标保证金
+export function bidapplyEdit(params: any) {
+    return request.post({ url: '/bid.bid_security_apply/edit', params })
+}
+
+// 删除投标保证金
+export function bidapplyDelete(params: any) {
+    return request.post({ url: '/bid.bid_security_apply/delete', params })
+}
+
+// 投标保证金详情
+export function bidapplyDetail(params: any) {
+    return request.get({ url: '/bid.bid_security_apply/detail', params })
+}
diff --git a/src/api/paymentplan.ts b/src/api/paymentplan.ts
new file mode 100644
index 0000000..0c62dd2
--- /dev/null
+++ b/src/api/paymentplan.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 付款计划表列表
+export function paymentplanLists(params: any) {
+    return request.get({ url: '/finance.finance_payment_plan/lists', params })
+}
+
+// 添加付款计划
+export function paymentplanAdd(params: any) {
+    return request.post({ url: '/finance.finance_payment_plan/add', params })
+}
+
+// 编辑付款计划
+export function paymentplanEdit(params: any) {
+    return request.post({ url: '/finance.finance_payment_plan/edit', params })
+}
+
+// 删除付款计划
+export function paymentplanDelete(params: any) {
+    return request.post({ url: '/finance.finance_payment_plan/delete', params })
+}
+
+// 付款计划详情
+export function paymentplanDetail(params: any) {
+    return request.get({ url: '/finance.finance_payment_plan/detail', params })
+}
diff --git a/src/api/paymentrequest.ts b/src/api/paymentrequest.ts
new file mode 100644
index 0000000..fa585ea
--- /dev/null
+++ b/src/api/paymentrequest.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 付款计划表列表
+export function paymentapplyLists(params: any) {
+    return request.get({ url: '/finance.finance_payment_apply/lists', params })
+}
+
+// 添加付款计划
+export function paymentapplyAdd(params: any) {
+    return request.post({ url: '/finance.finance_payment_apply/add', params })
+}
+
+// 编辑付款计划
+export function paymentapplyEdit(params: any) {
+    return request.post({ url: '/finance.finance_payment_apply/edit', params })
+}
+
+// 删除付款计划
+export function paymentapplyDelete(params: any) {
+    return request.post({ url: '/finance.finance_payment_apply/delete', params })
+}
+
+// 付款计划详情
+export function paymentapplyDetail(params: any) {
+    return request.get({ url: '/finance.finance_payment_apply/detail', params })
+}
diff --git a/src/api/project_milestones.ts b/src/api/project_milestones.ts
new file mode 100644
index 0000000..36ab61b
--- /dev/null
+++ b/src/api/project_milestones.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 项目里程碑列表
+export function apimilestonesLists(params: any) {
+    return request.get({ url: '/project.project_milestones/lists', params })
+}
+
+// 添加项目计划
+export function apimilestonesAdd(params: any) {
+    return request.post({ url: '/project.project_milestones/add', params })
+}
+
+// 编辑项目计划
+export function apimilestonesEdit(params: any) {
+    return request.post({ url: '/project.project_milestones/edit', params })
+}
+
+// 删除项目计划
+export function apimilestonesDelete(params: any) {
+    return request.post({ url: '/project.project_milestones/delete', params })
+}
+
+// 项目计划详情
+export function apimilestonesDetail(params: any) {
+    return request.get({ url: '/project.project_milestones/detail', params })
+}
diff --git a/src/api/project_plan.ts b/src/api/project_plan.ts
new file mode 100644
index 0000000..83e060f
--- /dev/null
+++ b/src/api/project_plan.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 项目计划表列表
+export function apiProjectplanLists(params: any) {
+    return request.get({ url: '/project.project_plan/lists', params })
+}
+
+// 添加项目计划
+export function apiProjectplanAdd(params: any) {
+    return request.post({ url: '/project.project_plan/add', params })
+}
+
+// 编辑项目计划
+export function apiProjectplanEdit(params: any) {
+    return request.post({ url: '/project.project_plan/edit', params })
+}
+
+// 删除项目计划
+export function apiProjectplanDelete(params: any) {
+    return request.post({ url: '/project.project_plan/delete', params })
+}
+
+// 项目计划详情
+export function apiProjectplanDetail(params: any) {
+    return request.get({ url: '/project.project_plan/detail', params })
+}
diff --git a/src/api/receiptrecord.ts b/src/api/receiptrecord.ts
new file mode 100644
index 0000000..3c3bcf8
--- /dev/null
+++ b/src/api/receiptrecord.ts
@@ -0,0 +1,27 @@
+
+import request from '@/utils/request'
+
+// 收票记录列表
+export function apifinancereceiptLists(params: any) {
+    return request.get({ url: '/finance.finance_receipt_record/lists', params })
+}
+
+// 添加收票记录
+export function apifinancereceiptAdd(params: any) {
+    return request.post({ url: '/finance.finance_receipt_record/add', params })
+}
+
+// 编辑收票记录
+export function apifinancereceiptEdit(params: any) {
+    return request.post({ url: '/finance.finance_receipt_record/edit', params })
+}
+
+// 删除收票记录
+export function apifinancereceiptDelete(params: any) {
+    return request.post({ url: '/finance.finance_receipt_record/delete', params })
+}
+
+// 收票记录详情
+export function apifinancereceiptDetail(params: any) {
+    return request.get({ url: '/finance.finance_receipt_record/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/refundbidDeposit.ts b/src/api/refundbidDeposit.ts
new file mode 100644
index 0000000..f051d8f
--- /dev/null
+++ b/src/api/refundbidDeposit.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 退投标保证金列表
+export function bidrefundLists(params: any) {
+    return request.get({ url: '/bid.bid_security_refund/lists', params })
+}
+
+// 添加退投标保证金
+export function bidrefundAdd(params: any) {
+    return request.post({ url: '/bid.bid_security_refund/add', params })
+}
+
+// 编辑退投标保证金
+export function bidrefundEdit(params: any) {
+    return request.post({ url: '/bid.bid_security_refund/edit', params })
+}
+
+// 删除退投标保证金
+export function bidrefundDelete(params: any) {
+    return request.post({ url: '/bid.bid_security_refund/delete', params })
+}
+
+// 退投标保证金详情
+export function bidrefundDetail(params: any) {
+    return request.get({ url: '/bid.bid_security_refund/detail', params })
+}
diff --git a/src/api/refundrecord.ts b/src/api/refundrecord.ts
new file mode 100644
index 0000000..d10e22a
--- /dev/null
+++ b/src/api/refundrecord.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 退款记录列表
+export function apiFinancerefundLists(params: any) {
+    return request.get({ url: '/finance.finance_refund_record/lists', params })
+}
+
+// 添加退款记录
+export function apiFinancerefundAdd(params: any) {
+    return request.post({ url: '/finance.finance_refund_record/add', params })
+}
+
+// 编辑退款记录
+export function apiFinancerefundEdit(params: any) {
+    return request.post({ url: '/finance.finance_refund_record/edit', params })
+}
+
+// 删除退款记录
+export function apiFinancerefundDelete(params: any) {
+    return request.post({ url: '/finance.finance_refund_record/delete', params })
+}
+
+// 退款记录详情
+export function apiFinancerefundDetail(params: any) {
+    return request.get({ url: '/finance.finance_refund_record/detail', params })
+}
diff --git a/src/components/biddingDecision/index.vue b/src/components/biddingDecision/index.vue
new file mode 100644
index 0000000..40e44be
--- /dev/null
+++ b/src/components/biddingDecision/index.vue
@@ -0,0 +1,85 @@
+<template>
+    <div>
+        <!-- <el-card class="!border-none" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="客户名称" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入客户名称" />
+                </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" @cell-click="handleCurrentChange">
+                    <el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
+                    <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
+                    <el-table-column label="项目估算(万元)" prop="project_estimation" show-overflow-tooltip />
+                    <el-table-column label="招标项目资金来源" prop="bidding_project_fund_source">
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.construction_funds_sources" :value="row.bidding_project_fund_source" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="投标时间" prop="bidding_time" show-overflow-tooltip />
+                    <el-table-column label="购买标书时间" prop="buy_bid_document_date" show-overflow-tooltip />
+                    <el-table-column label="招标方式" prop="bid_type">
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.bidding_method" :value="row.bid_type" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="竞争对手" prop="competitor" show-overflow-tooltip />
+                    <!-- <el-table-column label="是否需要保证金" prop="is_margin">
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.whether_status" :value="row.is_margin" />
+                        </template>
+                    </el-table-column> -->
+                    <el-table-column label="保证金金额" prop="margin_amount" show-overflow-tooltip />
+                    <el-table-column label="开标日期" prop="bid_opening_date" show-overflow-tooltip />
+                    <el-table-column label="保证金退还时间" prop="margin_amount_return_date" show-overflow-tooltip />
+                    <el-table-column label="有无内部资源" prop="is_internal_resources">
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.whether_status" :value="row.is_internal_resources" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="项目把握度" prop="project_assurance" show-overflow-tooltip />
+                </el-table>
+
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+    </div>
+</template>
+  
+<script lang="ts" setup>
+import { usePaging } from "@/hooks/usePaging"
+import { useDictData } from "@/hooks/useDictOptions"
+import { apiBidBiddingDecisionLists } from '@/api/bid_bidding_decision'
+import { defineEmits } from "vue"
+
+// 查询条件
+const queryParams = reactive({
+    name: ''
+});
+
+// 获取字典数据
+const { dictData } = useDictData('construction_funds_sources,bidding_method,whether_status')
+// 选中数据
+const emits = defineEmits(["customEvent"]);
+
+// 选中数据子父传递
+const handleCurrentChange = (value: any) => {
+    emits("customEvent", value);
+};
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiBidBiddingDecisionLists,
+    params: queryParams,
+});
+
+getLists();
+</script>
\ No newline at end of file
diff --git a/src/components/paylist/index.vue b/src/components/paylist/index.vue
new file mode 100644
index 0000000..41d736f
--- /dev/null
+++ b/src/components/paylist/index.vue
@@ -0,0 +1,81 @@
+<template>
+    <div>
+        <el-card class="!border-none" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="查询" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.contract_no" clearable placeholder="请输入内容" />
+                </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" @cell-click="handleCurrentChange">
+                    <el-table-column type="selection" width="55" />
+
+                    <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="period" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.pay_period" :value="row.period" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="状态" prop="period" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.pay_status" :value="row.status" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="已付款" prop="refunder" show-overflow-tooltip />
+                    <el-table-column label="未付款" prop="refunder" show-overflow-tooltip />
+                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
+                </el-table>
+
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+    </div>
+</template>
+  
+<script lang="ts" setup>
+import { usePaging } from "@/hooks/usePaging"
+import { useDictData } from "@/hooks/useDictOptions"
+import { paymentplanLists } from '@/api/paymentplan'
+
+import { defineEmits } from "vue"
+import { timeFormat } from '@/utils/util'
+
+// 查询条件
+const queryParams = reactive({
+    status: 1,
+});
+
+// 获取字典数据
+const { dictData } = useDictData('pay_status,pay_period')
+// 选中数据
+const emits = defineEmits(["customEvent"]);
+
+// 选中数据子父传递
+const handleCurrentChange = (value: any) => {
+    emits("customEvent", value);
+};
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: paymentplanLists,
+    params: queryParams,
+
+});
+
+getLists();
+</script>
\ No newline at end of file
diff --git a/src/components/procurementsubcontracting_selector/index.vue b/src/components/procurementsubcontracting_selector/index.vue
new file mode 100644
index 0000000..0e5e075
--- /dev/null
+++ b/src/components/procurementsubcontracting_selector/index.vue
@@ -0,0 +1,78 @@
+<template>
+    <div>
+        <el-card class="!border-none" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="查询" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入内容" />
+                </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" @cell-click="handleCurrentChange">
+                    <el-table-column type="selection" 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="合同编号" 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.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>
+
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+    </div>
+</template>
+  
+<script lang="ts" setup>
+import { usePaging } from "@/hooks/usePaging"
+import { useDictData } from "@/hooks/useDictOptions"
+import { apiProcurementContractLists } from '@/api/procurement_contract'
+
+import { defineEmits } from "vue"
+
+// 查询条件
+const queryParams = reactive({
+    project_id: '',
+    supplier_id: '',
+    contract_no: '',
+    all: 1,
+});
+
+const { dictData } = useDictData('contract_type,account_period,tax_rate,pay_type,pay_period ')
+// 选中数据
+const emits = defineEmits(["customEvent"]);
+
+// 选中数据子父传递
+const handleCurrentChange = (value: any) => {
+    emits("customEvent", value);
+};
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiProcurementContractLists,
+    params: queryParams,
+});
+
+getLists();
+</script>
\ No newline at end of file
diff --git a/src/views/bid_bidding_decision/index.vue b/src/views/bid_bidding_decision/index.vue
index ffe4f32..437f39e 100644
--- a/src/views/bid_bidding_decision/index.vue
+++ b/src/views/bid_bidding_decision/index.vue
@@ -2,9 +2,9 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="项目" prop="invite_tenders_company_name">
+                <!-- <el-form-item label="项目" prop="invite_tenders_company_name">
                     <el-input class="w-[280px]" v-model="queryParams.invite_tenders_company_name" clearable placeholder="请输入招标公司名称" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="招标项目资金来源" prop="bidding_project_fund_source">
                     <el-select class="flex-1" v-model="queryParams.bidding_project_fund_source" clearable placeholder="请选择类型">
                         <el-option v-for="(item, index) in dictData.construction_funds_sources" :key="index" :label="item.name" :value="parseInt(item.value)" />
diff --git a/src/views/bidbbond/detail.vue b/src/views/bidbbond/detail.vue
new file mode 100644
index 0000000..b1880b4
--- /dev/null
+++ b/src/views/bidbbond/detail.vue
@@ -0,0 +1,161 @@
+
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" title="投标保证金详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+            <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.custom.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
+                                }}
+                            </el-form-item>
+                        </el-col>
+
+
+                        <el-col :span="12">
+                            <el-form-item label="投标时间">
+                                {{ formData.decision.bidding_time
+
+
+                                }}
+                            </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.decision.margin_amount
+
+
+                                }}
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="申请人">
+                                {{ formData.applier }}
+                            </el-form-item>
+                        </el-col>
+
+
+                        <el-col :span="12">
+                            <el-form-item label="备注">
+                                {{ formData.remark
+                                }}
+                            </el-form-item>
+                        </el-col>
+
+
+
+
+                    </el-row>
+                </el-card>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiCustomDetail } from '@/api/custom'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+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 (row: Record<string, any>) => {
+    const data = await apiCustomDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    popupRef.value?.close()
+
+}
+
+//打开弹窗
+const open = () => {
+    console.log('1111111')
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+
+
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
+<style lang="scss">
+.tit {
+    font-size: 1.2em;
+    margin-bottom: 10px;
+}
+</style>
diff --git a/src/views/bidbbond/edit.vue b/src/views/bidbbond/edit.vue
new file mode 100644
index 0000000..eab2afb
--- /dev/null
+++ b/src/views/bidbbond/edit.vue
@@ -0,0 +1,346 @@
+<template>
+    <div class="edit-popup">
+
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+            <el-steps :active="active" align-center style="margin-bottom: 20px;">
+                <el-step title="销售" />
+                <el-step title="事业部总经理" />
+                <el-step title="财务负责人" />
+                <el-step title="出纳" />
+            </el-steps>
+            <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
+                <el-row :gutter="10">
+                    <el-col :span="8">
+                        <el-form-item label="投标编号" prop="bidding_decision_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="supplier_name" clearable placeholder="请选择投标编号" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="申请人" prop="applier">
+                            <el-input v-model="formData.applier" clearable placeholder="请选择申请人" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8">
+                        <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_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 placeholder="请输入项目编码" />
+                        </el-form-item>
+                    </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="datetime" value-format="YYYY-MM-DD HH:mm:ss" 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="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="保证金金额" prop="refund_amount">
+                            <el-input v-model="refund_amount" clearable placeholder="请输入保证金金额" @input="amountinput" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="金额大写" prop="refund_amount_daxie">
+                            <el-input v-model="refund_amount_daxie" readonly clearable placeholder="请输入金额大写" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="付款方式" prop="pay_type">
+                            <el-radio-group v-model="formData.pay_type" placeholder="请选择付款方式">
+                                <el-radio v-for="(item, index) in dictData.pay_type" :key="index" :label="parseInt(item.value)">
+                                    {{ item.name }}
+                                </el-radio>
+                            </el-radio-group>
+                        </el-form-item> </el-col>
+
+
+                    <el-col :span="12">
+                        <el-form-item label="备注" prop="remark">
+                            <el-input v-model="formData.remark" type="textarea" clearable placeholder="请输入备注" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+
+                        <el-form-item label="附件" prop="field127">
+                            <el-upload accept=".pdf" 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>
+
+                        </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="account" @click="showDialog2 = true" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <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-form>
+        </popup>
+
+    </div>
+</template>
+
+<script lang="ts" setup name="projectEdit">
+import customDialog from '@/components/custom-dialog/index.vue'
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import biddingDecisionDialog from '@/components/biddingDecision/index.vue'
+import { bidapplyAdd, bidapplyEdit, bidapplyDetail } from '@/api/bidbbond'
+import { toChinesNum } from "@/utils/util";
+import { getAllProjectTypes } from '@/api/projecttype'
+import { timeFormat } from '@/utils/util'
+import { isEmail, isIdCard, isPhone } from '@/utils/validate'
+import type { PropType } from 'vue'
+import configs from "@/config"
+import useUserStore from "@/stores/modules/user";
+const active = reactive(0)
+
+const base_url = configs.baseUrl + configs.urlPrefix
+const userStore = useUserStore();
+const formDataannex = reactive([])
+const contract_name = ref('')
+const project_name = ref('')
+const bidding_time = ref('')
+const project_code = ref('')
+const contract_no = ref('')
+const supplier_name = ref('')
+const userInfo = userStore.userInfo
+console.log(userInfo, '222222')
+// 上传文件
+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 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 {
+        callback()
+    }
+
+};
+// 删除上传的文件
+const delFileFn = (index: number) => {
+    formDataannex.splice(index, 1)
+}
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+const refund_amount = ref('')
+const refund_amount_daxie = ref('')
+const showDialog = ref(false)
+
+const customEvent = (e: any) => {
+    formData.bidding_decision_id = e.id;
+    project_name.value = e.project_name
+    project_code.value = e.project_code
+    bidding_time.value = e.bidding_time;
+    refund_amount.value = e.margin_amount
+    showDialog.value = false;
+    amountinput(e.margin_amount)
+};
+
+
+
+//监听输入
+const amountinput = (e) => {
+    // console.log(e)
+    if (e && e > 0) {
+        refund_amount_daxie.value = toChinesNum(e)
+    }
+}
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑投标保证金表' : '新增投标保证金表'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    approve_id: 0,
+    bidding_decision_id: 0,
+    applier: userInfo.name,
+    pay_type: 0,
+    refund_date: "",
+    remark: "",
+    annex: "",
+    deposit_bank: "",
+    account_name: "",
+    account: ""
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    if (data.annex && data.annex.length > 0) {
+        if (data.annex.includes(",")) {
+            const arry1 = data.annex.split(',').map((item: any, index: any) => {
+                return {
+                    name: `文件${index + 1}`,
+                    uri: item
+                };
+            });
+            Object.assign(formDataannex, arry1)
+        } else {
+            const arry1 = [{ name: `文件1`, uri: data.annex }]
+            Object.assign(formDataannex, arry1)
+            console.log(formDataannex)
+
+        }
+    }
+
+
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+    project_name.value = data.project.name
+    project_code.value = data.project.project_code
+    bidding_time.value = data.decision.bidding_time;
+    refund_amount.value = data.decision.margin_amount
+    amountinput(data.decision.margin_amount)
+
+
+
+
+}
+const getDetail = async (row: Record<string, any>) => {
+    const data = await bidapplyDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    if (formDataannex.length > 0) {
+        formData.annex = formDataannex.map((item: any) => item.uri).toString()
+    }
+    console.log(formRef.value?.validate(), '22222222')
+    await formRef.value?.validate()
+
+
+    const data = { ...formData }
+    mode.value == 'edit'
+        ? await bidapplyEdit(data)
+        : await bidapplyAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+
+
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/bidbbond/index.vue b/src/views/bidbbond/index.vue
new file mode 100644
index 0000000..a2179a4
--- /dev/null
+++ b/src/views/bidbbond/index.vue
@@ -0,0 +1,145 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="申请人" prop="applier">
+                    <el-input class="w-[280px]" v-model="queryParams.applier" clearable placeholder="请输入申请人" />
+                </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">
+            <el-button v-perms="['refund.refund/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['refund.refund/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="处理流程" prop="supplier_name" show-overflow-tooltip />
+                    <el-table-column label="流程步骤" prop="approve_step" show-overflow-tooltip />
+                    <el-table-column label="流程编号" prop="approve_no" show-overflow-tooltip />
+                    <el-table-column label="客户名称" prop="customer_name" show-overflow-tooltip />
+                    <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
+                    <el-table-column label="投标时间" prop="bidding_time" show-overflow-tooltip />
+                    <el-table-column label="预计退还时间" prop="refund_date" show-overflow-tooltip />
+                    <el-table-column label="保证金金额" prop="margin_amount" show-overflow-tooltip />
+                    <el-table-column label="申请人" prop="applier" show-overflow-tooltip />
+                    <el-table-column label="已退金额" prop="reason" show-overflow-tooltip />
+                    <el-table-column label="未退金额" prop="reason" show-overflow-tooltip />
+                    <!-- <el-table-column label="创建日期" prop="reason" 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)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['refund.refund/delete']" type="danger" link @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                            <el-button v-perms="['refund.refund/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" />
+    </div>
+</template>
+
+<script lang="ts" setup name="projectLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { bidapplyLists, bidapplyDelete, bidapplyDetail } from '@/api/bidbbond'
+import { timeFormat } from '@/utils/util'
+import { getAllProjectTypes } from '@/api/projecttype'
+const protype = reactive([])
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+import DetailPopup from './detail.vue'
+const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+const showDtail = ref(false)
+
+// 查询条件
+const queryParams = reactive({
+    applier: ''
+
+
+})
+
+
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('pay_type')
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: bidapplyLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+
+// 编辑
+const handleEdit = async (data: any) => {
+    console.log(data.id)
+    let res = await bidapplyDetail({ id: data.id })
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(res)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await bidapplyDelete({ id })
+    getLists()
+}
+const handledetail = async (data: any) => {
+    let res = await bidapplyDetail({ id: data.id })
+    showDtail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+
+getLists()
+</script>
+
diff --git a/src/views/paymentplan/detail.vue b/src/views/paymentplan/detail.vue
index a5e7a98..71b93fa 100644
--- a/src/views/paymentplan/detail.vue
+++ b/src/views/paymentplan/detail.vue
@@ -7,7 +7,7 @@
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="合同编号">
-                                {{ formData.contract.contract_name }}
+                                {{ formData.contract.contract_no }}
                             </el-form-item>
                         </el-col>
 
@@ -26,46 +26,32 @@
                             </el-form-item>
                         </el-col>
 
+
                         <el-col :span="12">
-                            <el-form-item label="客户名称">
-                                {{ formData.custom.name
+                            <el-form-item label="计划付款日期">
+                                {{ formData.pay_date
                                 }}
                             </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="退款金额">
+                            <el-form-item label="金额">
                                 {{ formData.amount }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="金额大写">
-                                {{ formData.amount_daxie }}
+                                {{ formData.foreign_currency_remark
+                                }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="退款方式">
-                                <dict-value :options="dictData.refund_type" :value="formData.refund_type" />
+                            <el-form-item label="状态">
+                                <dict-value :options="dictData.pay_status" :value="formData.status" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="退款人">
-                                {{ formData.refunder }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款账号">
-                                {{ formData.collection_acccount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款银行">
-                                {{ formData.collection_bank }}
+                            <el-form-item label="期次">
+                                <dict-value :options="dictData.pay_period" :value="formData.period" />
                             </el-form-item>
                         </el-col>
 
@@ -78,7 +64,14 @@
                         </el-col>
 
 
-
+                        <el-col :span="12">
+                            <el-form-item label="附件">
+                                <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>
+                            </el-form-item>
+                        </el-col>
 
                     </el-row>
                 </el-card>
@@ -103,7 +96,7 @@ defineProps({
 const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
-
+const formDataannex = reactive([])
 const datas = reactive({
     provinceOptions: [],
     cityOptions: [],
@@ -121,6 +114,22 @@ const formData = reactive({
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     Object.assign(formData, data)
+    if (data.annex && data.annex.length > 0) {
+        if (data.annex.includes(",")) {
+            const arry1 = data.annex.split(',').map((item: any, index: any) => {
+                return {
+                    name: `文件${index + 1}`,
+                    uri: item
+                };
+            });
+            Object.assign(formDataannex, arry1)
+        } else {
+            const arry1 = [{ name: `文件1`, uri: data.annex }]
+            Object.assign(formDataannex, arry1)
+            console.log(formDataannex)
+
+        }
+    }
 
 
 
diff --git a/src/views/paymentplan/edit.vue b/src/views/paymentplan/edit.vue
index 692ee14..9d4d3d3 100644
--- a/src/views/paymentplan/edit.vue
+++ b/src/views/paymentplan/edit.vue
@@ -2,26 +2,21 @@
     <div class="edit-popup">
 
         <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-steps :active="active" align-center style="margin-bottom: 20px;">
-                <el-step title="商务部发起" />
-                <el-step title="商务总监" />
-                <el-step title="财务经理" />
-                <el-step title="总经理" />
-            </el-steps>
+
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
                 <el-row :gutter="10">
                     <el-col :span="8">
-                        <el-form-item label="客户名称" prop="customer_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="custom_name" @click="showDialog = true" clearable placeholder="请选择客户" />
+                        <el-form-item label="供应商名称" prop="supplier_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="supplier_name" clearable placeholder="请选择客户" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="供应商编码" prop="supplier_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="supplier_name" clearable placeholder="请选择客户" />
                         </el-form-item>
                     </el-col>
 
-                    <el-col :span="8">
-                        <el-form-item label="退款日期" prop="return_date">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.return_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
+
 
                     <el-col :span="8">
                         <el-form-item label="项目名称" prop="contract_id" @click="showDialog1 = true">
@@ -39,38 +34,37 @@
                             <el-input v-model="contract_no" clearable placeholder="请输入合同编号" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="合同名称" prop="contract_name">
-                            <el-input v-model="contract_name" clearable placeholder="请输入合同名称" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="退款原因" prop="reason">
-                            <el-input v-model="formData.reason" type='textarea' clearable placeholder="请输入退款原因" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="退款金额" prop="amount">
-                            <el-input v-model="formData.amount" clearable placeholder="请输入退款金额" @input="amountinput" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="金额大写" prop="amount_daxie">
-                            <el-input v-model="formData.amount_daxie" readonly clearable placeholder="请输入金额大写" />
 
+                    <el-col :span="8">
+                        <el-form-item label="计划付款日期" prop="pay_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.pay_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
+                            </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="退款方式" prop="contacts">
-                            <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)" />
+                        <el-form-item label="期次" prop="period" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+                            <el-select class="flex-1" v-model="formData.period" clearable placeholder="请选择期次">
+                                <el-option v-for="(item, index) in dictData.pay_period" :key="index" :label="item.name" :value="parseInt(item.value)" />
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="退款人" prop="refunder">
-                            <el-input v-model="formData.refunder" readonly clearable placeholder="请输入退款人" />
 
+                    <el-col :span="8">
+                        <el-form-item label="金额" prop="amount">
+                            <el-input v-model="formData.amount" clearable placeholder="请输入金额" @input="amountinput" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="外币备注" prop="foreign_currency_remark">
+                            <el-input v-model="formData.foreign_currency_remark" readonly clearable placeholder="请输入外币备注" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="状态" prop="status">
+                            <el-select class="flex-1" v-model="formData.status" clearable placeholder="请选择状态">
+                                <el-option v-for="(item, index) in dictData.pay_status" :key="index" :label="item.name" :value="parseInt(item.value)" />
+                            </el-select>
                         </el-form-item>
                     </el-col>
 
@@ -98,32 +92,13 @@
                         </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_acccount" @click="showDialog2 = true">
-                            <el-input v-model="formData.collection_acccount" 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>
 
 
-                <el-dialog v-model="showDialog" title="选择客户" width="70%">
-                    <customDialog @customEvent="customEvent"></customDialog>
+                <el-dialog v-model="showDialog" title="选择供应商" width="70%">
+                    <procurementDialog @customEvent="customEvent"></procurementDialog>
                 </el-dialog>
                 <el-dialog v-model="showDialog1" title="选择合同" width="70%">
-                    <salescontractDialog @customEvent="customEvent1"></salescontractDialog>
+                    <subcontractingDialog @customEvent="customEvent1"></subcontractingDialog>
                 </el-dialog>
 
 
@@ -138,9 +113,10 @@
 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 procurementDialog from '@/components/procurement/index.vue'
+import subcontractingDialog from '@/components/procurementsubcontracting_selector/index.vue'
 
-import { apirefundapplyAdd, apirefundapplyEdit, apirefundapplyDetail } from '@/api/refund'
+import { paymentplanAdd, paymentplanEdit, paymentplanDetail } from '@/api/paymentplan'
 import { toChinesNum } from "@/utils/util";
 import { getAllProjectTypes } from '@/api/projecttype'
 import { timeFormat } from '@/utils/util'
@@ -151,14 +127,13 @@ import useUserStore from "@/stores/modules/user";
 const protype = reactive([])
 const base_url = configs.baseUrl + configs.urlPrefix
 const userStore = useUserStore();
-const active = ref(0)
 const formDataannex = reactive([])
 const contract_name = ref('')
 const project_name = ref('')
 const project_code = ref('')
 const project_amount = ref('')
 const contract_no = ref('')
-const custom_name = ref('')
+const supplier_name = ref('')
 const userInfo = userStore.userInfo
 console.log(userInfo, '222222')
 // 上传文件
@@ -215,13 +190,13 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
-const amount_daxie = ref('')
+const foreign_currency_remark = ref('')
 const showDialog = ref(false)
 const showDialog1 = ref(false)
 
 const customEvent = (e: any) => {
-    formData.customer_id = e.id;
-    custom_name.value = e.name;
+    formData.supplier_id = e.id;
+    supplier_name.value = e.name;
     showDialog.value = false;
 };
 const customEvent1 = (e: any) => {
@@ -229,7 +204,7 @@ const customEvent1 = (e: any) => {
     project_name.value = e.project_name;
     project_code.value = e.project_code;
     contract_name.value = e.contract_name;
-    contract_no.value = e.contract_code
+    contract_no.value = e.contract_no
     showDialog1.value = false;
 };
 
@@ -239,30 +214,26 @@ const customEvent1 = (e: any) => {
 const amountinput = (e) => {
     // console.log(e)
     if (e && e > 0) {
-        formData.amount_daxie = toChinesNum(e)
+        formData.foreign_currency_remark = toChinesNum(e)
     }
 }
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑退款申请表' : '新增退款申请表'
+    return mode.value == 'edit' ? '编辑付款计划表' : '新增付款计划表'
 })
 
 // 表单数据
 const formData = reactive({
     id: '',
-    customer_id: "",
+    supplier_id: 1,
     contract_id: "",
-    approve_id: 0,
-    refund_date: "",
-    reason: "",
-    amount: 0,
-    amount_daxie: "",
-    refund_type: "",
-    refunder: userInfo.name,
-    return_total_amount: "",
-    return_desc: "",
-    collection_bank: "",
-    collection_acccount: ""
+    pay_date: '',
+    period: "",
+    amount: "",
+    foreign_currency_remark: "",
+    status: '',
+    remark: "",
+    annex: ""
 })
 
 
@@ -274,9 +245,9 @@ const formRules = reactive<any>({
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
-    if (data.return_desc && data.return_desc.length > 0) {
-        if (data.return_desc.includes(",")) {
-            const arry1 = data.return_desc.split(',').map((item: any, index: any) => {
+    if (data.annex && data.annex.length > 0) {
+        if (data.annex.includes(",")) {
+            const arry1 = data.annex.split(',').map((item: any, index: any) => {
                 return {
                     name: `文件${index + 1}`,
                     uri: item
@@ -284,7 +255,7 @@ const setFormData = async (data: Record<any, any>) => {
             });
             Object.assign(formDataannex, arry1)
         } else {
-            const arry1 = [{ name: `文件1`, uri: data.return_desc }]
+            const arry1 = [{ name: `文件1`, uri: data.annex }]
             Object.assign(formDataannex, arry1)
             console.log(formDataannex)
 
@@ -298,18 +269,19 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    custom_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
+    contract_no.value = data.contract.contract_no
+
 
 
 
 }
 const getDetail = async (row: Record<string, any>) => {
-    const data = await apirefundapplyDetail({
+    const data = await paymentplanDetail({
         id: row.id
     })
     setFormData(data)
@@ -319,7 +291,7 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
     if (formDataannex.length > 0) {
-        formData.return_desc = formDataannex.map((item: any) => item.uri).toString()
+        formData.annex = formDataannex.map((item: any) => item.uri).toString()
     }
     console.log(formRef.value?.validate(), '22222222')
     await formRef.value?.validate()
@@ -327,8 +299,8 @@ const handleSubmit = async () => {
 
     const data = { ...formData }
     mode.value == 'edit'
-        ? await apirefundapplyEdit(data)
-        : await apirefundapplyAdd(data)
+        ? await paymentplanEdit(data)
+        : await paymentplanAdd(data)
     popupRef.value?.close()
     emit('success')
 }
diff --git a/src/views/paymentplan/index.vue b/src/views/paymentplan/index.vue
index b9a5140..8bff3c2 100644
--- a/src/views/paymentplan/index.vue
+++ b/src/views/paymentplan/index.vue
@@ -2,11 +2,18 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="合同编号" prop="project_name">
-                    <el-input class="w-[280px]" v-model="queryParams.contract_no" clearable placeholder="请输入合同编号" />
+
+                <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-select>
+
                 </el-form-item>
-                <el-form-item label="合同名称" prop="project_role_name">
-                    <el-input class="w-[280px]" v-model="queryParams.contract_name" clearable placeholder="请输入合同名称" />
+
+                <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-select>
                 </el-form-item>
 
 
@@ -30,19 +37,25 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" 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="project_role_name" show-overflow-tooltip />
-                    <el-table-column label="合同编号" prop="admin_name" show-overflow-tooltip />
-                    <el-table-column label="退款原因" prop="reason" show-overflow-tooltip />
-                    <el-table-column label="退款日期" prop="refund_date" show-overflow-tooltip />
-                    <el-table-column label="退款金额" prop="amount" show-overflow-tooltip />
-                    <el-table-column label="退款方式" prop="refund_type" 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="period" show-overflow-tooltip>
                         <template #default="{ row }">
-                            <dict-value :options="dictData.refund_type" :value="row.refund_type" />
+                            <dict-value :options="dictData.pay_period" :value="row.period" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="退款人" prop="refunder" show-overflow-tooltip />
+                    <el-table-column label="状态" prop="period" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.pay_status" :value="row.status" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="已付款" prop="refunder" show-overflow-tooltip />
+                    <el-table-column label="未付款" prop="refunder" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
                     <el-table-column label="操作" width="150" fixed="right">
                         <template #default="{ row }">
@@ -72,7 +85,8 @@
 <script lang="ts" setup name="projectLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apirefundapplyLists, apirefundapplyDelete, apirefundapplyDetail } from '@/api/refund'
+import { paymentplanLists, paymentplanDelete, paymentplanDetail } from '@/api/paymentplan'
+import { apiProcurementContractLists } from '@/api/procurement_contract'
 import { timeFormat } from '@/utils/util'
 import { getAllProjectTypes } from '@/api/projecttype'
 const protype = reactive([])
@@ -84,11 +98,12 @@ const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
 const showDtail = ref(false)
+const list = ref([])
 
 // 查询条件
 const queryParams = reactive({
-    contract_no: '',
-    contract_name: '',
+    contract_id: '',
+    supplier_id: '',
 
 })
 
@@ -103,10 +118,10 @@ const handleSelectionChange = (val: any[]) => {
 }
 
 // 获取字典数据
-const { dictData } = useDictData('refund_type')
+const { dictData } = useDictData('pay_status,pay_period')
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apirefundapplyLists,
+    fetchFun: paymentplanLists,
     params: queryParams
 })
 
@@ -121,7 +136,7 @@ const handleAdd = async () => {
 // 编辑
 const handleEdit = async (data: any) => {
     console.log(data.id)
-    let res = await apirefundapplyDetail({ id: data.id })
+    let res = await paymentplanDetail({ id: data.id })
     showEdit.value = true
     await nextTick()
     editRef.value?.open('edit')
@@ -131,18 +146,28 @@ const handleEdit = async (data: any) => {
 // 删除
 const handleDelete = async (id: number | any[]) => {
     await feedback.confirm('确定要删除？')
-    await apirefundapplyDelete({ id })
+    await paymentplanDelete({ id })
     getLists()
 }
 const handledetail = async (data: any) => {
-    let res = await apirefundapplyDetail({ id: data.id })
+    let res = await paymentplanDetail({ id: data.id })
     showDtail.value = true
     await nextTick()
     detailRef.value?.open()
     detailRef.value?.setFormData(res)
 }
-
-
+//查询合同
+const getlist1 = () => {
+    apiProcurementContractLists({
+        project_id: '',
+        supplier_id: '',
+        contract_no: '',
+        all: 1,
+    }).then((res) => {
+        list.value = res.lists
+    })
+}
+getlist1()
 getLists()
 </script>
 
diff --git a/src/views/paymentrequest/detail.vue b/src/views/paymentrequest/detail.vue
index a5e7a98..a58c117 100644
--- a/src/views/paymentrequest/detail.vue
+++ b/src/views/paymentrequest/detail.vue
@@ -1,79 +1,101 @@
 
 <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="160px">
                 <el-card class="mb-2">
                     <el-row>
-                        <el-col :span="12">
+                        <el-col :span="8">
                             <el-form-item label="合同编号">
-                                {{ formData.contract.contract_name }}
+                                {{ formData.contract.contract_no }}
                             </el-form-item>
                         </el-col>
 
 
-                        <el-col :span="12">
+                        <el-col :span="8">
                             <el-form-item label="项目名称">
                                 {{ formData.project.name
                                 }}
                             </el-form-item>
                         </el-col>
 
-                        <el-col :span="12">
+                        <el-col :span="8">
                             <el-form-item label="项目编码">
                                 {{ formData.project.project_code
                                 }}
                             </el-form-item>
                         </el-col>
 
-                        <el-col :span="12">
-                            <el-form-item label="客户名称">
+                        <!-- <el-col :span="8">
+                            <el-fgoorm-item label="供应商名称">
                                 {{ formData.custom.name
                                 }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款日期">
-                                {{ formData.reason
+                            </el-fgoorm-item>
+                        </el-col> -->
+                        <el-col :span="8">
+                            <el-form-item label="付款日期">
+                                {{ formData.pay_date
                                 }}
                             </el-form-item>
                         </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款金额">
+
+                        <el-col :span="8">
+                            <el-form-item label="期次">
                                 {{ formData.amount }}
                             </el-form-item>
                         </el-col>
-                        <el-col :span="12">
+                        <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-form-item label="付款方式">
+                                <dict-value :options="dictData.pay_type" :value="formData.pay_type" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="申请人">
+                                {{ formData.applier }}
+                            </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="12">
-                            <el-form-item label="退款方式">
-                                <dict-value :options="dictData.refund_type" :value="formData.refund_type" />
+
+
+                        <el-col :span="8">
+                            <el-form-item label="开户名称">
+                                {{ formData.account_name }}
                             </el-form-item>
                         </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="退款人">
-                                {{ formData.refunder }}
+                        <el-col :span="8">
+                            <el-form-item label="账号">
+                                {{ formData.account }}
                             </el-form-item>
                         </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款账号">
-                                {{ formData.collection_acccount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款银行">
-                                {{ formData.collection_bank }}
+                        <el-col :span="8">
+                            <el-form-item label="开户银行">
+                                {{ formData.bank }}
                             </el-form-item>
                         </el-col>
 
 
-                        <el-col :span="12">
+                        <el-col :span="8">
                             <el-form-item label="备注">
-                                {{ formData.remark
-                                }}
+                                {{ formData.remark }}
                             </el-form-item>
                         </el-col>
 
@@ -126,9 +148,9 @@ const setFormData = async (data: Record<any, any>) => {
 
 }
 
-const getDetail = async (row: Record<string, any>) => {
+const getDetail = async (formData: Record<string, any>) => {
     const data = await apiCustomDetail({
-        id: row.id
+        id: formData.id
     })
     setFormData(data)
 }
diff --git a/src/views/paymentrequest/edit.vue b/src/views/paymentrequest/edit.vue
index 692ee14..7a7a3ac 100644
--- a/src/views/paymentrequest/edit.vue
+++ b/src/views/paymentrequest/edit.vue
@@ -3,39 +3,28 @@
 
         <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
             <el-steps :active="active" align-center style="margin-bottom: 20px;">
-                <el-step title="商务部发起" />
-                <el-step title="商务总监" />
-                <el-step title="财务经理" />
-                <el-step title="总经理" />
+                <el-step title="发起人" />
+                <el-step title="部门领导审核
+" />
+                <el-step title="财务负责人审核" />
+                <el-step title="总经理审批
+" />
             </el-steps>
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
                 <el-row :gutter="10">
                     <el-col :span="8">
-                        <el-form-item label="客户名称" prop="customer_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="custom_name" @click="showDialog = true" clearable placeholder="请选择客户" />
+                        <el-form-item label="供应商名称" prop="supplier_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="custom_name" clearable placeholder="请选择客户" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="供应商编码" prop="supplier_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="custom_name" clearable placeholder="请选择客户" />
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
-                        <el-form-item label="退款日期" prop="return_date">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.return_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
-                            </el-date-picker>
-                        </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 placeholder="请输入项目编码" />
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :span="8">
-                        <el-form-item label="合同编号" prop="contract_no">
+                        <el-form-item label="合同编号" prop="contract_no" @click="showDialog1 = true">
                             <el-input v-model="contract_no" clearable placeholder="请输入合同编号" />
                         </el-form-item>
                     </el-col>
@@ -45,32 +34,84 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="退款原因" prop="reason">
-                            <el-input v-model="formData.reason" type='textarea' 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="amount">
-                            <el-input v-model="formData.amount" clearable placeholder="请输入退款金额" @input="amountinput" />
+                        <el-form-item label="项目编码" prop="contract_id">
+                            <el-input v-model="project_code" clearable placeholder="请输入项目编码" />
+                        </el-form-item>
+                    </el-col>
+
+
+                    <el-col :span="8">
+                        <el-form-item label="累计已支付" prop="reason">
+                            <el-input v-model="reason" clearable placeholder="请输入累计已支付" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="付款日期" prop="pay_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.pay_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="累计已开票" prop="reason">
+                            <el-input v-model="reason" readonly clearable placeholder="请输入累计已开票" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="期次" prop="period" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+                            <el-select class="flex-1" v-model="formData.period" clearable placeholder="请选择期次">
+                                <el-option v-for="(item, index) in dictData.pay_period" :key="index" :label="item.name" :value="parseInt(item.value)" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-button @click="showDialog2 = true" type="primary">选择待付款计划</el-button>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="付款性质" prop="payment_natrue">
+                            <el-select class="flex-1" v-model="formData.payment_natrue" clearable placeholder="请选择付款性质">
+                                <el-option v-for="(item, index) in dictData.payment_natrue" :key="index" :label="item.name" :value="parseInt(item.value)" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="付款方式" prop="pay_type">
+                            <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)" />
+                            </el-select>
+                        </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>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="开票状态" prop="contacts">
+                            <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)" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="本次申请金额" prop="amount">
+                            <el-input v-model="formData.amount" @input="amountinput" clearable placeholder="请输入本次申请金额" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="金额大写" prop="amount_daxie">
                             <el-input v-model="formData.amount_daxie" readonly clearable placeholder="请输入金额大写" />
-
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="退款方式" prop="contacts">
-                            <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)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="退款人" prop="refunder">
-                            <el-input v-model="formData.refunder" readonly clearable placeholder="请输入退款人" />
-
+                    <el-col :span="12">
+                        <el-form-item label="款项说明" prop="desc">
+                            <el-input v-model="formData.desc" type="textarea" clearable placeholder="请输入备注" />
                         </el-form-item>
                     </el-col>
 
@@ -98,49 +139,59 @@
                         </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="collection_acccount" @click="showDialog2 = true">
-                            <el-input v-model="formData.collection_acccount" clearable placeholder="请输入收款账号" />
+                        <el-form-item label="开户银行" prop="bank" @click="showDialog2 = true">
+                            <el-input v-model="formData.bank" 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="account_name">
+                            <el-input v-model="formData.account_name" clearable placeholder="请输入开户名称" />
                         </el-form-item>
 
                     </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="账号" prop="account">
+                            <el-input v-model="formData.account" clearable placeholder="请输入账号" />
+                        </el-form-item>
 
+                    </el-col>
                 </el-row>
 
-
-                <el-dialog v-model="showDialog" title="选择客户" width="70%">
-                    <customDialog @customEvent="customEvent"></customDialog>
+                <el-dialog v-model="showDialog" title="选择供应商" width="70%">
+                    <procurementDialog @customEvent="customEvent"></procurementDialog>
                 </el-dialog>
                 <el-dialog v-model="showDialog1" title="选择合同" width="70%">
-                    <salescontractDialog @customEvent="customEvent1"></salescontractDialog>
+                    <subcontractingDialog @customEvent="customEvent1"></subcontractingDialog>
                 </el-dialog>
 
-
+                <el-dialog v-model="showDialog2" title="选择待付款计划" width="70%">
+                    <paylistDialog @customEvent="customEvent2"></paylistDialog>
+                </el-dialog>
 
             </el-form>
         </popup>
 
     </div>
 </template>
-
+<!-- paylist -->
 <script lang="ts" setup name="projectEdit">
 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 procurementDialog from '@/components/procurement/index.vue'
+import subcontractingDialog from '@/components/procurementsubcontracting_selector/index.vue'
+import paylistDialog from '@/components/paylist/index.vue'
 
-import { apirefundapplyAdd, apirefundapplyEdit, apirefundapplyDetail } from '@/api/refund'
+const active = ref(0)
+
+import { paymentapplyAdd, paymentapplyEdit, paymentapplyDetail } from '@/api/paymentrequest'
 import { toChinesNum } from "@/utils/util";
 import { getAllProjectTypes } from '@/api/projecttype'
 import { timeFormat } from '@/utils/util'
@@ -151,7 +202,6 @@ import useUserStore from "@/stores/modules/user";
 const protype = reactive([])
 const base_url = configs.baseUrl + configs.urlPrefix
 const userStore = useUserStore();
-const active = ref(0)
 const formDataannex = reactive([])
 const contract_name = ref('')
 const project_name = ref('')
@@ -218,9 +268,9 @@ const mode = ref('add')
 const amount_daxie = ref('')
 const showDialog = ref(false)
 const showDialog1 = ref(false)
-
+const showDialog2 = ref(false)
 const customEvent = (e: any) => {
-    formData.customer_id = e.id;
+    formData.supplier_id = e.id;
     custom_name.value = e.name;
     showDialog.value = false;
 };
@@ -229,10 +279,19 @@ const customEvent1 = (e: any) => {
     project_name.value = e.project_name;
     project_code.value = e.project_code;
     contract_name.value = e.contract_name;
-    contract_no.value = e.contract_code
+    contract_no.value = e.contract_no
     showDialog1.value = false;
 };
 
+const customEvent2 = (e: any) => {
+    formData.payment_plan_id = e.id;
+    formData.period = e.period
+    formData.amount = e.amount
+    project_name.value = e.project_name;
+    project_code.value = e.project_code;
+    formData.amount_daxie = toChinesNum(e.amount)
+    showDialog2.value = false;
+};
 
 
 //监听输入
@@ -249,20 +308,24 @@ const popupTitle = computed(() => {
 
 // 表单数据
 const formData = reactive({
-    id: '',
-    customer_id: "",
-    contract_id: "",
-    approve_id: 0,
-    refund_date: "",
-    reason: "",
-    amount: 0,
-    amount_daxie: "",
-    refund_type: "",
-    refunder: userInfo.name,
-    return_total_amount: "",
-    return_desc: "",
-    collection_bank: "",
-    collection_acccount: ""
+    supplier_id: 1,
+    approve_id: '',
+    contract_id: '',
+    pay_date: '',
+    period: '',
+    payment_plan_id: '',
+    payment_natrue: '',
+    pay_type: '',
+    applier: userInfo.name,
+    invoice_status: '',
+    amount: '',
+    amount_daxie: '',
+    desc: '',
+    remark: '',
+    annex: '',
+    bank: '',
+    account_name: '',
+    account: ''
 })
 
 
@@ -274,9 +337,9 @@ const formRules = reactive<any>({
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
-    if (data.return_desc && data.return_desc.length > 0) {
-        if (data.return_desc.includes(",")) {
-            const arry1 = data.return_desc.split(',').map((item: any, index: any) => {
+    if (data.annex && data.annex.length > 0) {
+        if (data.annex.includes(",")) {
+            const arry1 = data.annex.split(',').map((item: any, index: any) => {
                 return {
                     name: `文件${index + 1}`,
                     uri: item
@@ -284,7 +347,7 @@ const setFormData = async (data: Record<any, any>) => {
             });
             Object.assign(formDataannex, arry1)
         } else {
-            const arry1 = [{ name: `文件1`, uri: data.return_desc }]
+            const arry1 = [{ name: `文件1`, uri: data.annex }]
             Object.assign(formDataannex, arry1)
             console.log(formDataannex)
 
@@ -298,18 +361,18 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    custom_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
+    contract_no.value = data.contract.contract_no
 
 
 
 }
 const getDetail = async (row: Record<string, any>) => {
-    const data = await apirefundapplyDetail({
+    const data = await paymentapplyDetail({
         id: row.id
     })
     setFormData(data)
@@ -319,7 +382,7 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
     if (formDataannex.length > 0) {
-        formData.return_desc = formDataannex.map((item: any) => item.uri).toString()
+        formData.annex = formDataannex.map((item: any) => item.uri).toString()
     }
     console.log(formRef.value?.validate(), '22222222')
     await formRef.value?.validate()
@@ -327,8 +390,8 @@ const handleSubmit = async () => {
 
     const data = { ...formData }
     mode.value == 'edit'
-        ? await apirefundapplyEdit(data)
-        : await apirefundapplyAdd(data)
+        ? await paymentapplyEdit(data)
+        : await paymentapplyAdd(data)
     popupRef.value?.close()
     emit('success')
 }
@@ -340,7 +403,7 @@ const open = (type = 'add') => {
 
     getAllProjectTypes().then((res) => {
 
-        protype.splice(0, protype.length, ...res);
+        protype.splice('', protype.length, ...res);
     })
 }
 
diff --git a/src/views/paymentrequest/index.vue b/src/views/paymentrequest/index.vue
index b9a5140..d25fb71 100644
--- a/src/views/paymentrequest/index.vue
+++ b/src/views/paymentrequest/index.vue
@@ -2,11 +2,27 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="合同编号" prop="project_name">
-                    <el-input class="w-[280px]" v-model="queryParams.contract_no" clearable placeholder="请输入合同编号" />
+                <el-form-item label="付款性质" prop="payment_natrue">
+                    <el-select class="flex-1" v-model="queryParams.payment_natrue" clearable placeholder="请选择付款性质">
+                        <el-option v-for="(item, index) in dictData.payment_natrue" :key="index" :label="item.name" :value="parseInt(item.value)" />
+                    </el-select>
                 </el-form-item>
-                <el-form-item label="合同名称" prop="project_role_name">
-                    <el-input class="w-[280px]" v-model="queryParams.contract_name" clearable placeholder="请输入合同名称" />
+                <el-form-item label="付款方式" prop="pay_type">
+                    <el-select class="flex-1" v-model="queryParams.pay_type" clearable placeholder="请选择付款方式">
+                        <el-option v-for="(item, index) in dictData.pay_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-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-select>
                 </el-form-item>
 
 
@@ -30,19 +46,31 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" 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="project_name" show-overflow-tooltip />
-                    <el-table-column label="客户名称" prop="project_code" show-overflow-tooltip />
-                    <el-table-column label="项目名称" prop="project_role_name" show-overflow-tooltip />
-                    <el-table-column label="合同编号" prop="admin_name" show-overflow-tooltip />
-                    <el-table-column label="退款原因" prop="reason" show-overflow-tooltip />
-                    <el-table-column label="退款日期" prop="refund_date" show-overflow-tooltip />
-                    <el-table-column label="退款金额" prop="amount" show-overflow-tooltip />
-                    <el-table-column label="退款方式" prop="refund_type" show-overflow-tooltip>
+                    <el-table-column label="供应商名称" prop="supplier_na" 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.refund_type" :value="row.refund_type" />
+                            <dict-value :options="dictData.pay_type" :value="row.pay_type" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="退款人" prop="refunder" show-overflow-tooltip />
+                    <el-table-column label="付款性质" prop="payment_natrue" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.payment_natrue" :value="row.payment_natrue" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="期次" prop="period" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.pay_period" :value="row.period" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="申请人" prop="applier" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
                     <el-table-column label="操作" width="150" fixed="right">
                         <template #default="{ row }">
@@ -72,23 +100,27 @@
 <script lang="ts" setup name="projectLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apirefundapplyLists, apirefundapplyDelete, apirefundapplyDetail } from '@/api/refund'
+import { paymentapplyLists, paymentapplyDelete, paymentapplyDetail } from '@/api/paymentrequest'
 import { timeFormat } from '@/utils/util'
 import { getAllProjectTypes } from '@/api/projecttype'
+import { apiProcurementContractLists } from '@/api/procurement_contract'
 const protype = reactive([])
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import DetailPopup from './detail.vue'
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const list = ref([])
 // 是否显示编辑框
 const showEdit = ref(false)
 const showDtail = ref(false)
 
 // 查询条件
 const queryParams = reactive({
-    contract_no: '',
-    contract_name: '',
+    payment_natrue: '',
+    pay_type: '',
+    contract_id: '',
+    supplier_id: '',
 
 })
 
@@ -103,10 +135,10 @@ const handleSelectionChange = (val: any[]) => {
 }
 
 // 获取字典数据
-const { dictData } = useDictData('refund_type')
+const { dictData } = useDictData('pay_period,pay_type,payment_natrue,invoice_status')
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apirefundapplyLists,
+    fetchFun: paymentapplyLists,
     params: queryParams
 })
 
@@ -121,7 +153,7 @@ const handleAdd = async () => {
 // 编辑
 const handleEdit = async (data: any) => {
     console.log(data.id)
-    let res = await apirefundapplyDetail({ id: data.id })
+    let res = await paymentapplyDetail({ id: data.id })
     showEdit.value = true
     await nextTick()
     editRef.value?.open('edit')
@@ -131,17 +163,28 @@ const handleEdit = async (data: any) => {
 // 删除
 const handleDelete = async (id: number | any[]) => {
     await feedback.confirm('确定要删除？')
-    await apirefundapplyDelete({ id })
+    await paymentapplyDelete({ id })
     getLists()
 }
 const handledetail = async (data: any) => {
-    let res = await apirefundapplyDetail({ id: data.id })
+    let res = await paymentapplyDetail({ id: data.id })
     showDtail.value = true
     await nextTick()
     detailRef.value?.open()
     detailRef.value?.setFormData(res)
 }
-
+//查询合同
+const getlist1 = () => {
+    apiProcurementContractLists({
+        project_id: '',
+        supplier_id: '',
+        contract_no: '',
+        all: 1,
+    }).then((res) => {
+        list.value = res.lists
+    })
+}
+getlist1()
 
 getLists()
 </script>
diff --git a/src/views/procurement_contract/index.vue b/src/views/procurement_contract/index.vue
index 77090fd..4d68af2 100644
--- a/src/views/procurement_contract/index.vue
+++ b/src/views/procurement_contract/index.vue
@@ -8,6 +8,10 @@
                 <el-form-item label="项目id" prop="project_id">
                     <el-input class="w-[280px]" v-model="queryParams.project_id" clearable placeholder="请输入项目id" />
                 </el-form-item>
+                <el-form-item label="合同编号" prop="project_id">
+                    <el-input class="w-[280px]" v-model="queryParams.contract_no" clearable placeholder="请输入合同编号" />
+                </el-form-item>
+
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -99,7 +103,8 @@ const showDtail = ref(false)
 // 查询条件
 const queryParams = reactive({
     supplier_id: '',
-    project_id: ''
+    project_id: '',
+    contract_no: ''
 })
 
 // 选中数据
diff --git a/src/views/project_manager_appointment/detail.vue b/src/views/project_manager_appointment/detail.vue
index a5e7a98..4021e4e 100644
--- a/src/views/project_manager_appointment/detail.vue
+++ b/src/views/project_manager_appointment/detail.vue
@@ -1,74 +1,65 @@
 
 <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="160px">
                 <el-card class="mb-2">
                     <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="合同编号">
-                                {{ formData.contract.contract_name }}
-                            </el-form-item>
-                        </el-col>
+
 
 
                         <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.project_code
+                                {{ formData.project_code
+
                                 }}
                             </el-form-item>
                         </el-col>
 
                         <el-col :span="12">
                             <el-form-item label="客户名称">
-                                {{ formData.custom.name
+                                {{ formData.custom_name
                                 }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="退款日期">
-                                {{ formData.reason
+                            <el-form-item label="项目类型">
+                                {{ formData.project_type_name
                                 }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="退款金额">
+                            <el-form-item label="项目金额">
                                 {{ formData.amount }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="金额大写">
-                                {{ formData.amount_daxie }}
+                            <el-form-item label="项目经理">
+                                {{ formData.project_manager_name }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="退款方式">
-                                <dict-value :options="dictData.refund_type" :value="formData.refund_type" />
+                            <el-form-item label="立项日期">
+                                {{ formData.project_approval_date }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="退款人">
-                                {{ formData.refunder }}
+                            <el-form-item label="项目开始日期">
+                                {{ formData.start_date }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="收款账号">
-                                {{ formData.collection_acccount }}
+                            <el-form-item label="项目交付日期">
+                                {{ formData.delivery_date }}
                             </el-form-item>
                         </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款银行">
-                                {{ formData.collection_bank }}
-                            </el-form-item>
-                        </el-col>
-
 
                         <el-col :span="12">
                             <el-form-item label="备注">
diff --git a/src/views/project_manager_appointment/edit.vue b/src/views/project_manager_appointment/edit.vue
index c6ed330..aaca97d 100644
--- a/src/views/project_manager_appointment/edit.vue
+++ b/src/views/project_manager_appointment/edit.vue
@@ -41,7 +41,7 @@
                             <el-input v-model="contract_no" clearable placeholder="请输入合同编号" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
+                    <el-col :span="8" v-if="contract_name.length > 0">
                         <el-form-item label="合同名称" prop="contract_name">
                             <el-input v-model="contract_name" clearable placeholder="请输入合同名称" />
                         </el-form-item>
@@ -54,7 +54,7 @@
                     </el-form-item>
                     <el-col :span="8">
                         <el-form-item label="项目经理" prop="project_manager" @click="userclick">
-                            <el-input v-model="formData.project_manager" readonly clearable placeholder="请输入项目经理" />
+                            <el-input v-model="manage_name" readonly clearable placeholder="请输入项目经理" />
 
                         </el-form-item>
                     </el-col>
@@ -160,9 +160,9 @@ const list2 = reactive([])
 const contract_name = ref('')
 const project_name = ref('')
 const project_code = ref('')
-const project_amount = ref('')
 const contract_no = ref('')
 const custom_name = ref('')
+const manage_name = ref('')
 const userInfo = userStore.userInfo
 const personnel = ref<any>()
 // console.log(userInfo, '222222')
@@ -252,8 +252,8 @@ const userclick = () => {
 }
 //确认
 const submituser = (e: any) => {
-    formData.project_manager = e.name;
-    // return_name.value = e.name;
+    formData.project_manager = e.id;
+    manage_name.value = e.name;
 }
 
 
@@ -322,9 +322,9 @@ const getlist1 = (id: any) => {
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
-    if (data.return_desc && data.return_desc.length > 0) {
-        if (data.return_desc.includes(",")) {
-            const arry1 = data.return_desc.split(',').map((item: any, index: any) => {
+    if (data.annex && data.annex.length > 0) {
+        if (data.annex.includes(",")) {
+            const arry1 = data.annex.split(',').map((item: any, index: any) => {
                 return {
                     name: `文件${index + 1}`,
                     uri: item
@@ -332,7 +332,7 @@ const setFormData = async (data: Record<any, any>) => {
             });
             Object.assign(formDataannex, arry1)
         } else {
-            const arry1 = [{ name: `文件1`, uri: data.return_desc }]
+            const arry1 = [{ name: `文件1`, uri: data.annex }]
             Object.assign(formDataannex, arry1)
             console.log(formDataannex)
 
@@ -346,14 +346,16 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    custom_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
+    custom_name.value = data.custom_name
+    project_name.value = data.project_name
+    project_code.value = data.project_code
+    contract_no.value = data.contract_code
+    manage_name.value = data.project_manager_name
 
+    if (data && data.contract_name) {
+        contract_name.value = data.contract_name;
 
+    }
 
 }
 
@@ -368,7 +370,7 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
     if (formDataannex.length > 0) {
-        formData.return_desc = formDataannex.map((item: any) => item.uri).toString()
+        formData.annex = formDataannex.map((item: any) => item.uri).toString()
     }
     console.log(formRef.value?.validate(), '22222222')
     await formRef.value?.validate()
diff --git a/src/views/project_manager_appointment/index.vue b/src/views/project_manager_appointment/index.vue
index cd060f4..ddb6f79 100644
--- a/src/views/project_manager_appointment/index.vue
+++ b/src/views/project_manager_appointment/index.vue
@@ -2,20 +2,20 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="立项日期" prop="project_name">
+                <el-form-item label="立项日期" prop="project_approval_date">
                     <el-date-picker class="flex-1 !flex" v-model="queryParams.project_approval_date" clearable type="date" value-format="YYYY-MM-DD " placeholder="选择签订日期">
                     </el-date-picker>
                 </el-form-item>
 
 
-                <el-form-item label="项目时间范围" prop="project_role_name">
-                    <el-date-picker v-model="dtimevalue" type="daterange" start-placeholder="项目开始日期" end-placeholder="项目交付日期" :default-time="defaultTime" value-format="YYYY-MM-DD " />
+                <el-form-item label="项目时间范围">
+                    <el-date-picker v-model="dtimevalue" type="daterange" start-placeholder="项目开始日期" end-placeholder="项目交付日期" :default-time="defaultTime" value-format="YYYY-MM-DD " @change="dateclick" />
                 </el-form-item>
 
 
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
+                    <el-button @click="reset">重置</el-button>
                 </el-form-item>
             </el-form>
         </el-card>
@@ -33,20 +33,19 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" 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="project_role_name" show-overflow-tooltip />
-                    <el-table-column label="合同编号" prop="admin_name" show-overflow-tooltip />
-                    <el-table-column label="退款原因" prop="reason" show-overflow-tooltip />
-                    <el-table-column label="退款日期" prop="refund_date" show-overflow-tooltip />
-                    <el-table-column label="退款金额" prop="amount" 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" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="退款人" prop="refunder" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="remark" 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="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 />
+                    <el-table-column label="项目类型" prop="project_type_name" show-overflow-tooltip />
+                    <el-table-column label="项目金额" prop="amount" show-overflow-tooltip />
+                    <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 @click="handleEdit(row)">
@@ -89,15 +88,29 @@ const showEdit = ref(false)
 const showDtail = ref(false)
 const dtimevalue = ref([])
 
+//查询
+const dateclick = (e: any) => {
+    queryParams.start_date = e[0]
+    queryParams.delivery_date = e[1]
+}
 
 // 查询条件
 const queryParams = reactive({
     project_approval_date: '',
-    start_date: dtimevalue.value[0],
-    delivery_date: dtimevalue.value[1]
+    start_date: '',
+    delivery_date: '',
 })
 
-
+//重置
+const reset = () => {
+    Object.assign(queryParams, {
+        project_approval_date: '',
+        start_date: '',
+        delivery_date: '',
+    })
+    dtimevalue.value = ''
+    getLists()
+}
 // 选中数据
 const selectData = ref<any[]>([])
 
diff --git a/src/views/project_milestones/detail.vue b/src/views/project_milestones/detail.vue
new file mode 100644
index 0000000..6c587e1
--- /dev/null
+++ b/src/views/project_milestones/detail.vue
@@ -0,0 +1,123 @@
+
+<template>
+    <div class="detail-popup">
+        <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 }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="项目编码">
+                                {{ formData.project_code }}
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="里程碑">
+                                {{ formData.project_milestones_text }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="日期">
+                                {{ formData.project_milestones_date }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="添加人">
+                                {{ formData.add_user_name }}
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-card>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiCustomDetail } from '@/api/custom'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+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 (row: Record<string, any>) => {
+    const data = await apiCustomDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    popupRef.value?.close()
+
+}
+
+//打开弹窗
+const open = () => {
+    console.log('1111111')
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+
+
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
+<style lang="scss">
+.tit {
+    font-size: 1.2em;
+    margin-bottom: 10px;
+}
+</style>
diff --git a/src/views/project_milestones/edit.vue b/src/views/project_milestones/edit.vue
new file mode 100644
index 0000000..2a4ccb4
--- /dev/null
+++ b/src/views/project_milestones/edit.vue
@@ -0,0 +1,144 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+            <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">
+                            <el-input v-model="project_name" clearable placeholder="请输入项目名称" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目编码" prop="project_id">
+                            <el-input v-model="project_code" clearable placeholder="请输入项目编码" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="里程碑" prop="project_milestones">
+                            <el-select class="w-[280px]" v-model="formData.project_milestones" clearable placeholder="请选择里程碑">
+
+                                <el-option v-for="(item, index) in dictData.project_milestones" :key="index" :label="item.name" :value="parseInt(item.value)" />
+                            </el-select>
+                        </el-form-item>
+
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="日期" prop="project_milestones_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.project_milestones_date" clearable type="date" value-format="YYYY-MM-DD " placeholder="选择日期">
+                            </el-date-picker>
+
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+            </el-form>
+        </popup>
+
+        <el-dialog v-model="showDialog" title="选择项目" width="70%">
+            <projectDialog @customEvent="customEvent"></projectDialog>
+        </el-dialog>
+    </div>
+</template>
+
+<script lang="ts" setup name="procurementContractEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import projectDialog from '@/components/project/index.vue'
+import { apimilestonesAdd, apimilestonesEdit, apimilestonesDetail } from '@/api/project_milestones'
+
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+const project_name = ref('')
+const project_code = ref('')
+const showDialog = ref(false)
+
+const customEvent = (e: any) => {
+    formData.project_id = e.id;
+    project_name.value = e.name;
+    project_code.value = e.project_code;
+    showDialog.value = false;
+};
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑项目里程碑' : '新增项目里程碑'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    project_id: '',
+    project_milestones: '',
+    project_milestones_date: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+
+
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    project_name.value = data.project_name;
+    project_code.value = data.project_code;
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apimilestonesDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apimilestonesEdit(data)
+        : await apimilestonesAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/project_milestones/index.vue b/src/views/project_milestones/index.vue
index dde454d..f4c1050 100644
--- a/src/views/project_milestones/index.vue
+++ b/src/views/project_milestones/index.vue
@@ -2,12 +2,13 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="立项日期" prop="project_name">
-                    <el-date-picker class="flex-1 !flex" v-model="queryParams.project_approval_date" clearable type="date" value-format="YYYY-MM-DD " placeholder="选择签订日期">
+                <el-form-item label="日期" prop="declare_time">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.project_milestones_date" clearable type="date" value-format="YYYY-MM-DD " placeholder="选择日期">
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="项目时间范围" prop="project_role_name">
-                    <el-date-picker v-model="value" type="daterange" start-placeholder="项目开始日期" end-placeholder="项目交付日期" :default-time="defaultTime" value-format="YYYY-MM-DD " />
+
+                <el-form-item label="里程碑" prop="project_milestones">
+                    <el-input class="w-[280px]" v-model="queryParams.project_milestones" clearable placeholder="请输入里程碑" />
                 </el-form-item>
 
 
@@ -18,42 +19,33 @@
             </el-form>
         </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['project.project_manager_appointment/add']" type="primary" @click="handleAdd">
+            <el-button v-perms="['project.project_milestones/add']" type="primary" @click="handleAdd">
                 <template #icon>
                     <icon name="el-icon-Plus" />
                 </template>
                 新增
             </el-button>
-            <el-button v-perms="['project.project_manager_appointment/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+            <el-button v-perms="['project.project_milestones/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="退款单号" prop="project_name" show-overflow-tooltip />
-                    <el-table-column label="客户名称" prop="project_code" show-overflow-tooltip />
-                    <el-table-column label="项目名称" prop="project_role_name" show-overflow-tooltip />
-                    <el-table-column label="合同编号" prop="admin_name" show-overflow-tooltip />
-                    <el-table-column label="退款原因" prop="reason" show-overflow-tooltip />
-                    <el-table-column label="退款日期" prop="refund_date" show-overflow-tooltip />
-                    <el-table-column label="退款金额" prop="amount" 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" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="退款人" prop="refunder" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="remark" 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="project_milestones_text" show-overflow-tooltip />
+                    <el-table-column label="日期" prop="project_milestones_date" show-overflow-tooltip />
+                    <el-table-column label="添加人" prop="add_user_name" 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 @click="handleEdit(row)">
+                            <el-button v-perms="['project.project_milestones/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button v-perms="['project.project_manager_appointment/delete']" type="danger" link @click="handleDelete(row.id)">
+                            <el-button v-perms="['project.project_milestones/delete']" type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
-                            <el-button v-perms="['project.project_manager_appointment/detail']" link @click="handledetail(row)">
+                            <el-button v-perms="['project.project_milestones/detail']" link @click="handledetail(row)">
                                 详情
                             </el-button>
 
@@ -73,7 +65,7 @@
 <script lang="ts" setup name="projectLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { appointmentLists, appointmentDelete, appointmentDetail } from '@/api/appointment'
+import { apimilestonesLists, apimilestonesDelete, apimilestonesDetail } from '@/api/project_milestones'
 import { timeFormat } from '@/utils/util'
 import { getAllProjectTypes } from '@/api/projecttype'
 const protype = reactive([])
@@ -89,9 +81,9 @@ const value = ref([])
 
 // 查询条件
 const queryParams = reactive({
-    project_approval_date: '',
-    start_date: '',
-    delivery_date: ''
+    project_milestones_date: '',
+    sproject_milestones: '',
+
 })
 
 
@@ -104,10 +96,10 @@ const handleSelectionChange = (val: any[]) => {
 }
 
 // 获取字典数据
-const { dictData } = useDictData('invoice_type')
+const { dictData } = useDictData('project_milestones')
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: appointmentLists,
+    fetchFun: apimilestonesLists,
     params: queryParams
 })
 
@@ -122,7 +114,7 @@ const handleAdd = async () => {
 // 编辑
 const handleEdit = async (data: any) => {
     console.log(data.id)
-    let res = await appointmentDetail({ id: data.id })
+    let res = await apimilestonesDetail({ id: data.id })
     showEdit.value = true
     await nextTick()
     editRef.value?.open('edit')
@@ -132,11 +124,11 @@ const handleEdit = async (data: any) => {
 // 删除
 const handleDelete = async (id: number | any[]) => {
     await feedback.confirm('确定要删除？')
-    await appointmentDelete({ id })
+    await apimilestonesDelete({ id })
     getLists()
 }
 const handledetail = async (data: any) => {
-    let res = await appointmentDetail({ id: data.id })
+    let res = await apimilestonesDetail({ id: data.id })
     showDtail.value = true
     await nextTick()
     detailRef.value?.open()
diff --git a/src/views/project_plan/detail.vue b/src/views/project_plan/detail.vue
new file mode 100644
index 0000000..cb15d2f
--- /dev/null
+++ b/src/views/project_plan/detail.vue
@@ -0,0 +1,123 @@
+
+<template>
+    <div class="detail-popup">
+        <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 }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="项目编码">
+                                {{ formData.project_code }}
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="计划开始日期">
+                                {{ formData.start_time }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="计划结束日期">
+                                {{ formData.deliver_time }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="负责人">
+                                {{ formData.project_manager_name }}
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-card>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiCustomDetail } from '@/api/custom'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+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 (row: Record<string, any>) => {
+    const data = await apiCustomDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    popupRef.value?.close()
+
+}
+
+//打开弹窗
+const open = () => {
+    console.log('1111111')
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+
+
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
+<style lang="scss">
+.tit {
+    font-size: 1.2em;
+    margin-bottom: 10px;
+}
+</style>
diff --git a/src/views/project_plan/edit.vue b/src/views/project_plan/edit.vue
new file mode 100644
index 0000000..3cc3a67
--- /dev/null
+++ b/src/views/project_plan/edit.vue
@@ -0,0 +1,340 @@
+<template>
+    <div class="edit-popup">
+
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+            <el-steps :active="active" align-center style="margin-bottom: 20px;">
+                <el-step title="项目经理提交" />
+                <el-step title="事业部总工审核" />
+
+            </el-steps>
+            <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
+                <div style="display: flex; flex-direction: row-reverse; justify-content: flex-start;margin-bottom: 30px;">
+
+                    <el-select class="w-[180px]" v-model="formData.dept_id" clearable placeholder="请选择部门">
+                        <el-option v-for="(item, index) in list2" :key="index" :label="item.name" :value="item.id" />
+                    </el-select>
+                    <el-select class="w-[180px]" v-model="formData.org_id" clearable placeholder="请选择组织" @change="deptrmt">
+                        <el-option v-for="(item, index) in list1" :key="index" :label="item.name" :value="item.id" />
+                    </el-select>
+                </div>
+
+
+                <el-row :gutter="10">
+
+                    <el-col :span="8">
+                        <el-form-item label="项目名称" prop="project_id" @click="showDialog2 = true">
+                            <el-input v-model="project_name" clearable placeholder="请输入项目名称" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目编码" prop="project_id">
+                            <el-input v-model="project_code" clearable placeholder="请输入项目编码" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="项目经理" prop="project_manage" @click="userclick">
+                            <el-input v-model="manage_name" readonly clearable placeholder="请输入项目经理" />
+
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="填报日期" prop="declare_time">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.declare_time" clearable type="date" value-format="YYYY-MM-DD" placeholder="选择项目开始日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目开始日期" prop="start_time">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.start_time" clearable type="date" value-format="YYYY-MM-DD" placeholder="选择项目开始日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目交付日期" prop="deliver_time">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.deliver_time" clearable type="date" value-format="YYYY-MM-DD " placeholder="选择项目交付日期">
+                            </el-date-picker>
+
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="12">
+                        <el-form-item label="备注" prop="remark">
+                            <el-input v-model="formData.remark" type="textarea" clearable placeholder="请输入备注" />
+                        </el-form-item>
+                    </el-col>
+
+
+                    <el-col :span="24">
+
+                        <el-form-item label="附件" prop="field127">
+                            <el-upload accept=".pdf" 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>
+
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+
+
+
+
+                <!-- <el-dialog v-model="showDialog" title="选择客户" width="70%">
+                    <customDialog @customEvent="customEvent"></customDialog>
+                </el-dialog> -->
+
+
+                <el-dialog v-model="showDialog2" title="选择项目" width="70%">
+                    <projectDialog @customEvent="customEvent2"></projectDialog>
+                </el-dialog>
+                <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+            </el-form>
+        </popup>
+
+    </div>
+</template>
+
+<script lang="ts" setup name="projectEdit">
+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 projectDialog from '@/components/project/index.vue'
+import { apiProjectplanAdd, apiProjectplanEdit, apiProjectplanDetail } from '@/api/project_plan'
+
+import { toChinesNum } from "@/utils/util";
+import { getAllProjectTypes } from '@/api/projecttype'
+import { timeFormat } from '@/utils/util'
+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 configs from "@/config"
+import useUserStore from "@/stores/modules/user";
+const protype = reactive([])
+const base_url = configs.baseUrl + configs.urlPrefix
+const userStore = useUserStore();
+const active = ref(0)
+const formDataannex = reactive([])
+const list1 = reactive([])
+const list2 = reactive([])
+const contract_name = ref('')
+const project_name = ref('')
+const project_code = ref('')
+const custom_name = ref('')
+const manage_name = ref('')
+const personnel = ref<any>()
+// console.log(userInfo, '222222')
+// 上传文件
+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)
+}
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+const showDialog2 = ref(false)
+
+const customEvent2 = (e: any) => {
+    formData.project_id = e.id;
+    project_name.value = e.name;
+    project_code.value = e.project_code;
+    custom_name.value = e.custom_name;
+    showDialog2.value = false;
+};
+//打开弹窗
+
+const userclick = () => {
+    // console.log(personnel.value, '1111111')
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData.project_manage = e.id;
+    manage_name.value = e.name;
+}
+
+
+
+//监听输入
+const amountinput = (e) => {
+    // console.log(e)
+    if (e && e > 0) {
+        formData.amount_daxie = toChinesNum(e)
+    }
+}
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑退款申请表' : '新增退款申请表'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    org_id: "",
+    dept_id: "",
+    project_id: 0,
+    declare_time: '',
+    project_manage: '',
+    project_approval_date: "",
+    start_time: "",
+    deliver_time: "",
+    remark: "",
+    annex: "",
+    process_approval: '{"current_step":"1","action":"1","submit_step":"2","check_user":"2","check_opinions":"dgfdsfds","copy_user":"3,4"}'
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+
+})
+
+//获取所有组织
+const getlist = () => {
+    getAll().then((res) => {
+        Object.assign(list1, res)
+        if (res.length > 0) {
+            formData.org_id = res[0].id
+            deptAll({ 'org_id': res[0].id }).then((res) => {
+                if (res.length > 0) {
+                    Object.assign(list2, res)
+                    formData.dept_id = res[0].id
+                }
+
+            })
+        }
+    })
+}
+const deptrmt = (e) => {
+    getlist1(e)
+}
+//获取所有部门
+const getlist1 = (id: any) => {
+    deptAll({ 'org_id': id }).then((res) => {
+        Object.assign(list2, res)
+    })
+}
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    if (data.annex && data.annex.length > 0) {
+        if (data.annex.includes(",")) {
+            const arry1 = data.annex.split(',').map((item: any, index: any) => {
+                return {
+                    name: `文件${index + 1}`,
+                    uri: item
+                };
+            });
+            Object.assign(formDataannex, arry1)
+        } else {
+            const arry1 = [{ name: `文件1`, uri: data.annex }]
+            Object.assign(formDataannex, arry1)
+            console.log(formDataannex)
+
+        }
+    }
+
+
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    custom_name.value = data.custom_name
+    project_name.value = data.project_name
+    project_code.value = data.project_code
+    manage_name.value = data.project_manager_name
+
+    if (data && data.contract_name) {
+        contract_name.value = data.contract_name;
+
+    }
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiProjectplanDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    if (formDataannex.length > 0) {
+        formData.annex = formDataannex.map((item: any) => item.uri).toString()
+    }
+    console.log(formRef.value?.validate(), '22222222')
+    await formRef.value?.validate()
+
+    const data = { ...formData }
+    mode.value == 'edit'
+        ? await apiProjectplanEdit(data)
+        : await apiProjectplanAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+
+    getAllProjectTypes().then((res) => {
+        protype.splice(0, protype.length, ...res);
+    })
+    getlist()
+
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/project_plan/index.vue b/src/views/project_plan/index.vue
index e69de29..5e94341 100644
--- a/src/views/project_plan/index.vue
+++ b/src/views/project_plan/index.vue
@@ -0,0 +1,180 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="填报日期" prop="declare_time">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.declare_time" clearable type="date" value-format="YYYY-MM-DD " placeholder="选择填报日期">
+                    </el-date-picker>
+                </el-form-item>
+
+
+                <el-form-item label="项目时间范围">
+                    <el-date-picker v-model="dtimevalue" type="daterange" start-placeholder="项目开始日期" end-placeholder="项目交付日期" :default-time="defaultTime" value-format="YYYY-MM-DD " @change="dateclick" />
+                </el-form-item>
+
+
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="reset">重置</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_plan/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['project.project_plan/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="项目名称" prop="project_name" show-overflow-tooltip />
+                    <el-table-column label="项目编码" prop="project_code" show-overflow-tooltip />
+                    <el-table-column label="节点名称" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="是否末节点" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="一级节点" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="二级节点" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="三级节点" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="四级节点" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="五级节点" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="六级节点" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="七级节点" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="八级节点" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="九级节点" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="计划开始日期" prop="start_time" show-overflow-tooltip />
+                    <el-table-column label="计划结束日期" prop="deliver_time" show-overflow-tooltip />
+                    <el-table-column label="负责人" prop="project_manager_name" show-overflow-tooltip />
+                    <el-table-column label="预算工时" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="工时单价" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="预算工时费" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="实际开始日期" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="实际结束日期" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="实际工时" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="实际工时费" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="权重" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="工时进度" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="输出资料" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="权重" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="备注" prop="sort" show-overflow-tooltip />
+                    <el-table-column label="排序号" prop="sort" 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_plan/edit']" type="primary" link @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['project.project_plan/delete']" type="danger" link @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                            <el-button v-perms="['project.project_plan/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" />
+    </div>
+</template>
+
+<script lang="ts" setup name="projectLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiProjectplanLists, apiProjectplanDelete, apiProjectplanDetail } from '@/api/project_plan'
+import { timeFormat } from '@/utils/util'
+import { getAllProjectTypes } from '@/api/projecttype'
+const protype = reactive([])
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+import DetailPopup from './detail.vue'
+const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+const showDtail = ref(false)
+const dtimevalue = ref([])
+// 查询条件
+const queryParams = reactive({
+    deliver_time: '',
+    start_time: '',
+    declare_time: ''
+})
+//查询
+const dateclick = (e: any) => {
+    queryParams.start_time = e[0]
+    queryParams.deliver_time = e[1]
+}
+
+//重置
+const reset = () => {
+    Object.assign(queryParams, {
+        project_approval_date: '',
+        start_date: '',
+        delivery_date: '',
+    })
+    dtimevalue.value = ''
+    getLists()
+}
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiProjectplanLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+
+// 编辑
+const handleEdit = async (data: any) => {
+    console.log(data.id)
+    let res = await apiProjectplanDetail({ id: data.id })
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(res)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiProjectplanDelete({ id })
+    getLists()
+}
+const handledetail = async (data: any) => {
+    let res = await apiProjectplanDetail({ id: data.id })
+    showDtail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+
+getLists()
+</script>
+
diff --git a/src/views/receiptrecord/edit.vue b/src/views/receiptrecord/edit.vue
index 52be4bf..f6fca85 100644
--- a/src/views/receiptrecord/edit.vue
+++ b/src/views/receiptrecord/edit.vue
@@ -6,13 +6,13 @@
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
                 <el-row :gutter="10">
                     <el-col :span="8">
-                        <el-form-item label="供应商名称" prop="customer_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="custom_name" @click="showDialog = true" clearable placeholder="请选择客户" />
+                        <el-form-item label="供应商名称" prop="supplier_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="supplier_name" clearable placeholder="请选择客户" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="供应商编码" prop="customer_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="custom_name" @click="showDialog = true" clearable placeholder="请选择客户" />
+                        <el-form-item label="供应商编码" prop="supplier_id">
+                            <el-input v-model="supplier_name" clearable placeholder="请选择客户" />
                         </el-form-item>
                     </el-col>
 
@@ -38,19 +38,19 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="开票日期" prop="return_date">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.return_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择开票日期">
+                        <el-form-item label="开票日期" prop="invoicing_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择开票日期">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="提交人" prop="refunder">
-                            <el-input v-model="formData.refunder" readonly clearable placeholder="请输入提交人" />
+                        <el-form-item label="提交人" prop="commitor">
+                            <el-input v-model="formData.commitor" readonly clearable placeholder="请输入提交人" />
 
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="发票类型" prop="invoice_type">
+                    <el-col :span="24">
+                        <el-form-item label="发票类型" prop="invoice_type" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
                             <el-radio-group v-model="formData.invoice_type" placeholder="请选择发票类型">
                                 <el-radio v-for="(item, index) in dictData.invoice_type" :key="index" :label="parseInt(item.value)">
                                     {{ item.name }}
@@ -59,46 +59,48 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="发票编号" prop="reason">
-                            <el-input v-model="formData.reason" clearable placeholder="请输入退款原因" />
+                        <el-form-item label="发票编号" prop="invoice_no">
+                            <el-input v-model="formData.invoice_no" clearable placeholder="请输入发票编号" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="发票金额" prop="amount">
-                            <el-input v-model="formData.amount" clearable placeholder="请输入退款金额" @input="amountinput" />
+                        <el-form-item label="发票金额" prop="invoice_amount" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="formData.invoice_amount" clearable placeholder="请输入发票金额" @input="amountinput" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="发票金额大写" prop="amount_daxie">
-                            <el-input v-model="formData.amount_daxie" readonly clearable placeholder="请输入金额大写" />
+                        <el-form-item label="发票金额大写" prop="invoice_amount_daxie">
+                            <el-input v-model="formData.invoice_amount_daxie" readonly clearable placeholder="请输入金额大写" />
 
                         </el-form-item>
                     </el-col>
 
-                    <el-col :span="12">
-                        <el-form-item label="发票税率" prop="remark">
-                            <el-input v-model="formData.remark" type="textarea" clearable placeholder="请输入备注" />
+                    <el-col :span="8">
+                        <el-form-item label="发票税率" prop="invoice_tax_rate">
+                            <el-input v-model="formData.invoice_tax_rate" clearable placeholder="请输入发票税率" />
                         </el-form-item>
                     </el-col>
 
-                    <el-col :span="12">
-                        <el-form-item label="税额" prop="remark">
-                            <el-input v-model="formData.remark" type="textarea" clearable placeholder="请输入备注" />
+                    <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-form-item>
                     </el-col>
 
-                    <el-col :span="12">
-                        <el-form-item label="不含税金额" prop="remark">
-                            <el-input v-model="formData.remark" type="textarea" clearable placeholder="请输入备注" />
+                    <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-form-item>
                     </el-col>
 
-                    <el-col :span="12">
-                        <el-form-item label="收票日期" prop="remark">
-                            <el-input v-model="formData.remark" type="textarea" clearable placeholder="请输入备注" />
+                    <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 type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择收票日期">
+                            </el-date-picker>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="24">
                         <el-form-item label="备注" prop="remark">
                             <el-input v-model="formData.remark" type="textarea" clearable placeholder="请输入备注" />
                         </el-form-item>
@@ -107,7 +109,7 @@
 
                     <el-col :span="24">
 
-                        <el-form-item label="附件" prop="field127">
+                        <el-form-item label="附件" prop="field87">
                             <el-upload accept=".pdf" 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">
                                     上传
@@ -124,32 +126,14 @@
                         </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_acccount" @click="showDialog2 = true">
-                            <el-input v-model="formData.collection_acccount" 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>
 
 
-                <el-dialog v-model="showDialog" title="选择客户" width="70%">
-                    <customDialog @customEvent="customEvent"></customDialog>
+
+                <el-dialog v-model="showDialog" title="选择供应商" width="70%">
+                    <procurementDialog @customEvent="customEvent"></procurementDialog>
                 </el-dialog>
                 <el-dialog v-model="showDialog1" title="选择合同" width="70%">
-                    <salescontractDialog @customEvent="customEvent1"></salescontractDialog>
+                    <subcontractingDialog @customEvent="customEvent1"></subcontractingDialog>
                 </el-dialog>
 
 
@@ -164,9 +148,10 @@
 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 procurementDialog from '@/components/procurement/index.vue'
+import subcontractingDialog from '@/components/procurementsubcontracting_selector/index.vue'
 
-import { apirefundapplyAdd, apirefundapplyEdit, apirefundapplyDetail } from '@/api/refund'
+import { apifinancereceiptAdd, apifinancereceiptEdit, apifinancereceiptDetail } from '@/api/receiptrecord'
 import { toChinesNum } from "@/utils/util";
 import { getAllProjectTypes } from '@/api/projecttype'
 import { timeFormat } from '@/utils/util'
@@ -184,7 +169,7 @@ const project_name = ref('')
 const project_code = ref('')
 const project_amount = ref('')
 const contract_no = ref('')
-const custom_name = ref('')
+const supplier_name = ref('')
 const userInfo = userStore.userInfo
 console.log(userInfo, '222222')
 // 上传文件
@@ -246,8 +231,8 @@ const showDialog = ref(false)
 const showDialog1 = ref(false)
 
 const customEvent = (e: any) => {
-    formData.customer_id = e.id;
-    custom_name.value = e.name;
+    formData.supplier_id = e.id;
+    supplier_name.value = e.name;
     showDialog.value = false;
 };
 const customEvent1 = (e: any) => {
@@ -255,7 +240,7 @@ const customEvent1 = (e: any) => {
     project_name.value = e.project_name;
     project_code.value = e.project_code;
     contract_name.value = e.contract_name;
-    contract_no.value = e.contract_code
+    contract_no.value = e.contract_no
     showDialog1.value = false;
 };
 
@@ -270,25 +255,26 @@ const amountinput = (e) => {
 }
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑退款申请表' : '新增退款申请表'
+    return mode.value == 'edit' ? '编辑收票记录表' : '新增收票记录表'
 })
 
 // 表单数据
 const formData = reactive({
     id: '',
-    customer_id: "",
-    contract_id: "",
-    approve_id: 0,
-    refund_date: "",
-    reason: "",
-    amount: 0,
-    amount_daxie: "",
-    refund_type: "",
-    refunder: userInfo.name,
-    return_total_amount: "",
-    return_desc: "",
-    collection_bank: "",
-    collection_acccount: ""
+    supplier_id: 1,
+    contract_id: 1,
+    invoicing_date: "",
+    commitor: userInfo.name,
+    invoice_type: '',
+    invoice_no: "",
+    invoice_amount: '',
+    invoice_amount_daxie: "",
+    invoice_tax_rate: "",
+    tax: "",
+    amount_excluding_tax: "",
+    receipt_date: "",
+    remark: "",
+    annex: ""
 })
 
 
@@ -324,7 +310,7 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    custom_name.value = data.custom.name
+    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
@@ -335,7 +321,7 @@ const setFormData = async (data: Record<any, any>) => {
 
 }
 const getDetail = async (row: Record<string, any>) => {
-    const data = await apirefundapplyDetail({
+    const data = await apifinancereceiptDetail({
         id: row.id
     })
     setFormData(data)
@@ -353,8 +339,8 @@ const handleSubmit = async () => {
 
     const data = { ...formData }
     mode.value == 'edit'
-        ? await apirefundapplyEdit(data)
-        : await apirefundapplyAdd(data)
+        ? await apifinancereceiptEdit(data)
+        : await apifinancereceiptAdd(data)
     popupRef.value?.close()
     emit('success')
 }
@@ -366,7 +352,7 @@ const open = (type = 'add') => {
 
     getAllProjectTypes().then((res) => {
 
-        protype.splice(0, protype.length, ...res);
+        protype.splice('', protype.length, ...res);
     })
 }
 
diff --git a/src/views/receiptrecord/index.vue b/src/views/receiptrecord/index.vue
index 3f9e0c0..39951f4 100644
--- a/src/views/receiptrecord/index.vue
+++ b/src/views/receiptrecord/index.vue
@@ -2,14 +2,18 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="合同编号" prop="project_name">
-                    <el-input class="w-[280px]" v-model="queryParams.contract_no" clearable placeholder="请输入合同编号" />
+                <el-form-item label="提交人" prop="commitor">
+                    <el-input class="w-[280px]" v-model="queryParams.commitor" clearable placeholder="请输入提交人" />
                 </el-form-item>
-                <el-form-item label="合同名称" prop="project_role_name">
-                    <el-input class="w-[280px]" v-model="queryParams.contract_name" clearable placeholder="请输入合同名称" />
+                <el-form-item label="发票编号" prop="invoice_no">
+                    <el-input class="w-[280px]" v-model="queryParams.invoice_no" clearable placeholder="请输入发票编号" />
                 </el-form-item>
+                <el-form-item label="发票类型" prop="invoice_type">
+                    <el-select class="w-[280px]" v-model="queryParams.invoice_type" clearable placeholder="请选择发票类型">
 
-
+                        <el-option v-for="(item, index) in dictData.invoice_type" :key="index" :label="item.name" :value="item.value" />
+                    </el-select>
+                </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -30,20 +34,28 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" 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="project_role_name" show-overflow-tooltip />
-                    <el-table-column label="合同编号" prop="admin_name" show-overflow-tooltip />
-                    <el-table-column label="退款原因" prop="reason" show-overflow-tooltip />
-                    <el-table-column label="退款日期" prop="refund_date" show-overflow-tooltip />
-                    <el-table-column label="退款金额" prop="amount" show-overflow-tooltip />
-                    <el-table-column label="退款方式" prop="refund_type" 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_type">
                         <template #default="{ row }">
-                            <dict-value :options="dictData.refund_type" :value="row.refund_type" />
+                            <dict-value :options="dictData.contract_type" :value="row.contract_type" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="退款人" prop="refunder" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
+                    <el-table-column label="收票日期" prop="receipt_date" show-overflow-tooltip />
+                    <el-table-column label="开票日期" prop="invoicing_date" show-overflow-tooltip />
+                    <el-table-column label="提交人" prop="commitor" show-overflow-tooltip />
+                    <el-table-column label="发票税率" prop="invoice_tax_rate" show-overflow-tooltip />
+                    <el-table-column label="发票金额" prop="invoice_amount" show-overflow-tooltip />
+                    <el-table-column label="不含税金额" prop="amount_excluding_tax" show-overflow-tooltip />
+                    <el-table-column label="税额" prop="tax" show-overflow-tooltip />
+                    <el-table-column label="发票类型" prop="invoice_type">
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.invoice_type" :value="row.invoice_type" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="发票编号" prop="invoice_no" 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)">
@@ -72,7 +84,7 @@
 <script lang="ts" setup name="projectLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apirefundapplyLists, apirefundapplyDelete, apirefundapplyDetail } from '@/api/refund'
+import { apifinancereceiptLists, apifinancereceiptDelete, apifinancereceiptDetail } from '@/api/receiptrecord'
 import { timeFormat } from '@/utils/util'
 import { getAllProjectTypes } from '@/api/projecttype'
 const protype = reactive([])
@@ -87,8 +99,9 @@ const showDtail = ref(false)
 
 // 查询条件
 const queryParams = reactive({
-    contract_no: '',
-    contract_name: '',
+    commitor: '',
+    invoice_no: '',
+    invoice_type: '',
 
 })
 
@@ -103,10 +116,10 @@ const handleSelectionChange = (val: any[]) => {
 }
 
 // 获取字典数据
-const { dictData } = useDictData('invoice_type')
+const { dictData } = useDictData('invoice_type,contract_type')
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apirefundapplyLists,
+    fetchFun: apifinancereceiptLists,
     params: queryParams
 })
 
@@ -121,7 +134,7 @@ const handleAdd = async () => {
 // 编辑
 const handleEdit = async (data: any) => {
     console.log(data.id)
-    let res = await apirefundapplyDetail({ id: data.id })
+    let res = await apifinancereceiptDetail({ id: data.id })
     showEdit.value = true
     await nextTick()
     editRef.value?.open('edit')
@@ -131,11 +144,11 @@ const handleEdit = async (data: any) => {
 // 删除
 const handleDelete = async (id: number | any[]) => {
     await feedback.confirm('确定要删除？')
-    await apirefundapplyDelete({ id })
+    await apifinancereceiptDelete({ id })
     getLists()
 }
 const handledetail = async (data: any) => {
-    let res = await apirefundapplyDetail({ id: data.id })
+    let res = await apifinancereceiptDetail({ id: data.id })
     showDtail.value = true
     await nextTick()
     detailRef.value?.open()
diff --git a/src/views/refundbidDeposit/detail.vue b/src/views/refundbidDeposit/detail.vue
new file mode 100644
index 0000000..0cfc5e6
--- /dev/null
+++ b/src/views/refundbidDeposit/detail.vue
@@ -0,0 +1,161 @@
+
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" title="退投标保证金详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+            <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.project.name
+                                }}
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="项目编码">
+                                {{ formData.project.project_code
+                                }}
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="客户名称">
+                                {{ formData.custom.name
+                                }}
+                            </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 }}
+                            </el-form-item>
+                        </el-col>
+                        <!-- <el-col :span="12">
+                            <el-form-item label="金额大写">
+                                {{ formData.refund_amount_daxie }}
+                            </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-row>
+                </el-card>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiCustomDetail } from '@/api/custom'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+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 (row: Record<string, any>) => {
+    const data = await apiCustomDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    popupRef.value?.close()
+
+}
+
+//打开弹窗
+const open = () => {
+    console.log('1111111')
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+
+
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
+<style lang="scss">
+.tit {
+    font-size: 1.2em;
+    margin-bottom: 10px;
+}
+</style>
diff --git a/src/views/refundbidDeposit/edit.vue b/src/views/refundbidDeposit/edit.vue
new file mode 100644
index 0000000..2cd440b
--- /dev/null
+++ b/src/views/refundbidDeposit/edit.vue
@@ -0,0 +1,362 @@
+<template>
+    <div class="edit-popup">
+
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+
+            <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
+                <el-row :gutter="10">
+                    <el-col :span="8">
+                        <el-form-item label="投标编号" prop="bidding_decision_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="custom_name" clearable placeholder="请选择投标编号" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="客户名称">
+                            <el-input v-model="custom_name" clearable placeholder="请选择客户" />
+                        </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="bidding_time">
+                            <el-date-picker class="flex-1 !flex" v-model="bidding_time" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目编码" prop="contract_id">
+                            <el-input v-model="project_code" clearable 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 type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+
+
+                    <el-col :span="8">
+                        <el-form-item label="退款金额" prop="refund_amount">
+                            <el-input v-model="formData.refund_amount" clearable placeholder="请输入退款金额" @input="amountinput" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="金额大写" prop="refund_amount_daxie">
+                            <el-input v-model="refund_amount_daxie" readonly clearable placeholder="请输入金额大写" />
+                        </el-form-item>
+                    </el-col>
+
+
+
+                    <el-col :span="12">
+                        <el-form-item label="备注" prop="remark">
+                            <el-input v-model="formData.remark" type="textarea" clearable placeholder="请输入备注" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+
+                        <el-form-item label="附件" prop="field127">
+                            <el-upload accept=".pdf" 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>
+
+                        </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="invoicing_company_name" @click="showDialog2 = true">
+                            <el-input v-model="formData.invoicing_company_name" 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-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 type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
+                            </el-date-picker>
+
+                        </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="showDialog2" title="选择银行账户" width="70%">
+                    <bankaccountDialog @customEvent="customEvent"></bankaccountDialog>
+                </el-dialog>
+            </el-form>
+        </popup>
+
+    </div>
+</template>
+
+<script lang="ts" setup name="projectEdit">
+import customDialog from '@/components/custom-dialog/index.vue'
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import biddingDecisionDialog from '@/components/biddingDecision/index.vue'
+
+import bankaccountDialog from '@/components/bankaccount/index.vue'
+import { bidrefundAdd, bidrefundEdit, bidrefundDetail } from '@/api/refundbidDeposit'
+import { toChinesNum } from "@/utils/util";
+import { getAllProjectTypes } from '@/api/projecttype'
+import { timeFormat } from '@/utils/util'
+import { isEmail, isIdCard, isPhone } from '@/utils/validate'
+import type { PropType } from 'vue'
+import configs from "@/config"
+import useUserStore from "@/stores/modules/user";
+const protype = reactive([])
+const base_url = configs.baseUrl + configs.urlPrefix
+const userStore = useUserStore();
+const formDataannex = reactive([])
+const contract_name = ref('')
+const project_name = ref('')
+const project_code = ref('')
+const bidding_time = ref('')
+const contract_no = ref('')
+const custom_name = ref('')
+const userInfo = userStore.userInfo
+console.log(userInfo, '222222')
+// 上传文件
+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 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 {
+        callback()
+    }
+
+};
+// 删除上传的文件
+const delFileFn = (index: number) => {
+    formDataannex.splice(index, 1)
+}
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+const refund_amount_daxie = ref('')
+const showDialog = ref(false)
+const showDialog1 = ref(false)
+const showDialog2 = ref(false)
+const customEvent = (e: any) => {
+    formData.bidding_decision_id = e.id;
+    project_name.value = e.project_name
+    bidding_time.value = e.bidding_time
+    custom_name.value = e.custom_name
+    project_code.value = e.project_code
+    showDialog.value = false;
+};
+const customEvent1 = (e: any) => {
+
+
+
+    showDialog1.value = false;
+};
+
+
+
+//监听输入
+const amountinput = (e) => {
+    // console.log(e)
+    if (e && e > 0) {
+        refund_amount_daxie.value = toChinesNum(e)
+    }
+}
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑退投标保证金表' : '新增退投标保证金表'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    bidding_decision_id: "",
+    refund_amount: "",
+    refund_amount_daxie: "",
+    refund_date: "",
+    remark: "",
+    annex: "",
+    bank_account_id: 1,
+    is_calculate_interest: "",
+    interest_calculation_start_date: ""
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    if (data.return_desc && data.return_desc.length > 0) {
+        if (data.return_desc.includes(",")) {
+            const arry1 = data.return_desc.split(',').map((item: any, index: any) => {
+                return {
+                    name: `文件${index + 1}`,
+                    uri: item
+                };
+            });
+            Object.assign(formDataannex, arry1)
+        } else {
+            const arry1 = [{ name: `文件1`, uri: data.return_desc }]
+            Object.assign(formDataannex, arry1)
+            console.log(formDataannex)
+
+        }
+    }
+
+
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+    project_name.value = data.project.name
+    project_code.value = data.project.project_code
+    custom_name.value = data.custom.name
+    bidding_time.value = data.decision.bidding_time
+    amountinput(data.refund_amount)
+
+}
+const getDetail = async (row: Record<string, any>) => {
+    const data = await bidrefundDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    if (formDataannex.length > 0) {
+        formData.return_desc = formDataannex.map((item: any) => item.uri).toString()
+    }
+    console.log(formRef.value?.validate(), '22222222')
+    await formRef.value?.validate()
+
+
+    const data = { ...formData }
+    mode.value == 'edit'
+        ? await bidrefundEdit(data)
+        : await bidrefundAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+
+    getAllProjectTypes().then((res) => {
+
+        protype.splice(0, protype.length, ...res);
+    })
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/refundbidDeposit/index.vue b/src/views/refundbidDeposit/index.vue
new file mode 100644
index 0000000..0b858c1
--- /dev/null
+++ b/src/views/refundbidDeposit/index.vue
@@ -0,0 +1,145 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="退款日期" prop="refund_date">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.refund_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="银行账号" prop="bank_account_id">
+                    <el-input class="w-[280px]" v-model="queryParams.bank_account_id" clearable placeholder="请输入银行账号" />
+                </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">
+            <el-button v-perms="['refund.refund/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['refund.refund/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="投标编号" prop="supplier_name" show-overflow-tooltip />
+                    <el-table-column label="客户名称" prop="customer_name" show-overflow-tooltip />
+
+                    <el-table-column label="项目编码" prop="project_code" show-overflow-tooltip />
+                    <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
+                    <el-table-column label="投标时间" prop="refund_date" show-overflow-tooltip />
+                    <el-table-column label="退款金额" prop="refund_amount" show-overflow-tooltip />
+                    <el-table-column label="退款日期" prop="refund_date" show-overflow-tooltip />
+                    <el-table-column label="添加人" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="备注" prop="remark" 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)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['refund.refund/delete']" type="danger" link @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                            <el-button v-perms="['refund.refund/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" />
+    </div>
+</template>
+
+<script lang="ts" setup name="projectLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { bidrefundLists, bidrefundDelete, bidrefundDetail } from '@/api/refundbidDeposit'
+import { timeFormat } from '@/utils/util'
+import { getAllProjectTypes } from '@/api/projecttype'
+const protype = reactive([])
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+import DetailPopup from './detail.vue'
+const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+const showDtail = ref(false)
+
+// 查询条件
+const queryParams = reactive({
+    bank_account_id: '',
+    refund_date: '',
+
+})
+
+
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('refund_type,isaccrued,contract_type')
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: bidrefundLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+
+// 编辑
+const handleEdit = async (data: any) => {
+    console.log(data.id)
+    let res = await bidrefundDetail({ id: data.id })
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(res)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await bidrefundDelete({ id })
+    getLists()
+}
+const handledetail = async (data: any) => {
+    let res = await bidrefundDetail({ id: data.id })
+    showDtail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+
+getLists()
+</script>
+
diff --git a/src/views/refundrecord/detail.vue b/src/views/refundrecord/detail.vue
index a5e7a98..0eb085d 100644
--- a/src/views/refundrecord/detail.vue
+++ b/src/views/refundrecord/detail.vue
@@ -1,7 +1,7 @@
 
 <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="160px">
                 <el-card class="mb-2">
                     <el-row>
@@ -26,26 +26,33 @@
                             </el-form-item>
                         </el-col>
 
-                        <el-col :span="12">
+                        <!-- <el-col :span="12">
                             <el-form-item label="客户名称">
                                 {{ formData.custom.name
                                 }}
                             </el-form-item>
-                        </el-col>
+                        </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.amount }}
+                                {{ formData.refund_amount }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="金额大写">
-                                {{ formData.amount_daxie }}
+                                {{ formData.refund_amount_daxie }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
@@ -53,19 +60,15 @@
                                 <dict-value :options="dictData.refund_type" :value="formData.refund_type" />
                             </el-form-item>
                         </el-col>
+
                         <el-col :span="12">
-                            <el-form-item label="退款人">
-                                {{ formData.refunder }}
+                            <el-form-item label="开始计息日期">
+                                {{ formData.interest_calculation_start_date }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="收款账号">
-                                {{ formData.collection_acccount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="收款银行">
-                                {{ formData.collection_bank }}
+                            <el-form-item label="是否计息">
+                                {{ formData.is_calculate_interest == 1 ? '是' : "否" }}
                             </el-form-item>
                         </el-col>
 
diff --git a/src/views/refundrecord/edit.vue b/src/views/refundrecord/edit.vue
index 692ee14..917334d 100644
--- a/src/views/refundrecord/edit.vue
+++ b/src/views/refundrecord/edit.vue
@@ -2,23 +2,22 @@
     <div class="edit-popup">
 
         <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-steps :active="active" align-center style="margin-bottom: 20px;">
-                <el-step title="商务部发起" />
-                <el-step title="商务总监" />
-                <el-step title="财务经理" />
-                <el-step title="总经理" />
-            </el-steps>
+
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
                 <el-row :gutter="10">
                     <el-col :span="8">
-                        <el-form-item label="客户名称" prop="customer_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="custom_name" @click="showDialog = true" clearable placeholder="请选择客户" />
+                        <el-form-item label="供应商名称" prop="supplier_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="supplier_name" clearable placeholder="请选择客户" />
                         </el-form-item>
                     </el-col>
-
                     <el-col :span="8">
-                        <el-form-item label="退款日期" prop="return_date">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.return_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
+                        <el-form-item label="供应商编码" prop="supplier_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="supplier_name" clearable 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 type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -44,20 +43,15 @@
                             <el-input v-model="contract_name" clearable placeholder="请输入合同名称" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="退款原因" prop="reason">
-                            <el-input v-model="formData.reason" type='textarea' clearable placeholder="请输入退款原因" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="退款金额" prop="amount">
-                            <el-input v-model="formData.amount" clearable placeholder="请输入退款金额" @input="amountinput" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="金额大写" prop="amount_daxie">
-                            <el-input v-model="formData.amount_daxie" readonly clearable placeholder="请输入金额大写" />
 
+                    <el-col :span="8">
+                        <el-form-item label="退款金额" prop="refund_amount">
+                            <el-input v-model="formData.refund_amount" clearable placeholder="请输入退款金额" @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">
@@ -67,10 +61,9 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="退款人" prop="refunder">
-                            <el-input v-model="formData.refunder" readonly clearable placeholder="请输入退款人" />
-
+                    <el-col :span="24">
+                        <el-form-item label="退款原因" prop="reason">
+                            <el-input v-model="formData.reason" type='textarea' clearable placeholder="请输入退款原因" />
                         </el-form-item>
                     </el-col>
 
@@ -98,36 +91,66 @@
                         </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="collection_acccount" @click="showDialog2 = true">
-                            <el-input v-model="formData.collection_acccount" clearable placeholder="请输入收款账号" />
+                        <el-form-item label="账户编码" prop="invoicing_company_name" @click="showDialog2 = true">
+                            <el-input v-model="formData.invoicing_company_name" 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="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-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 type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
+                            </el-date-picker>
+
+                        </el-form-item>
+                    </el-col>
 
                 </el-row>
 
 
-                <el-dialog v-model="showDialog" title="选择客户" width="70%">
-                    <customDialog @customEvent="customEvent"></customDialog>
+                <el-dialog v-model="showDialog" title="选择供应商" width="70%">
+                    <procurementDialog @customEvent="customEvent"></procurementDialog>
                 </el-dialog>
                 <el-dialog v-model="showDialog1" title="选择合同" width="70%">
-                    <salescontractDialog @customEvent="customEvent1"></salescontractDialog>
+                    <subcontractingDialog @customEvent="customEvent1"></subcontractingDialog>
                 </el-dialog>
 
-
-
+                <el-dialog v-model="showDialog2" title="选择银行账户" width="70%">
+                    <bankaccountDialog @customEvent="customEvent"></bankaccountDialog>
+                </el-dialog>
             </el-form>
         </popup>
 
@@ -138,9 +161,10 @@
 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 { apirefundapplyAdd, apirefundapplyEdit, apirefundapplyDetail } from '@/api/refund'
+import procurementDialog from '@/components/procurement/index.vue'
+import subcontractingDialog from '@/components/procurementsubcontracting_selector/index.vue'
+import bankaccountDialog from '@/components/bankaccount/index.vue'
+import { apiFinancerefundAdd, apiFinancerefundEdit, apiFinancerefundDetail } from '@/api/refundrecord'
 import { toChinesNum } from "@/utils/util";
 import { getAllProjectTypes } from '@/api/projecttype'
 import { timeFormat } from '@/utils/util'
@@ -151,14 +175,13 @@ import useUserStore from "@/stores/modules/user";
 const protype = reactive([])
 const base_url = configs.baseUrl + configs.urlPrefix
 const userStore = useUserStore();
-const active = ref(0)
 const formDataannex = reactive([])
 const contract_name = ref('')
 const project_name = ref('')
 const project_code = ref('')
-const project_amount = ref('')
+const project_refund_amount = ref('')
 const contract_no = ref('')
-const custom_name = ref('')
+const supplier_name = ref('')
 const userInfo = userStore.userInfo
 console.log(userInfo, '222222')
 // 上传文件
@@ -215,13 +238,13 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
-const amount_daxie = ref('')
+const refund_refund_amount_daxie = ref('')
 const showDialog = ref(false)
 const showDialog1 = ref(false)
-
+const showDialog2 = ref(false)
 const customEvent = (e: any) => {
-    formData.customer_id = e.id;
-    custom_name.value = e.name;
+    formData.supplier_id = e.id;
+    supplier_name.value = e.name;
     showDialog.value = false;
 };
 const customEvent1 = (e: any) => {
@@ -229,7 +252,7 @@ const customEvent1 = (e: any) => {
     project_name.value = e.project_name;
     project_code.value = e.project_code;
     contract_name.value = e.contract_name;
-    contract_no.value = e.contract_code
+    contract_no.value = e.contract_no
     showDialog1.value = false;
 };
 
@@ -239,30 +262,29 @@ const customEvent1 = (e: any) => {
 const amountinput = (e) => {
     // console.log(e)
     if (e && e > 0) {
-        formData.amount_daxie = toChinesNum(e)
+        formData.refund_amount_daxie = toChinesNum(e)
     }
 }
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑退款申请表' : '新增退款申请表'
+    return mode.value == 'edit' ? '编辑退款纪录表' : '新增退款纪录表'
 })
 
 // 表单数据
 const formData = reactive({
     id: '',
-    customer_id: "",
-    contract_id: "",
-    approve_id: 0,
+    supplier_id: 1,
+    contract_id: 0,
+    refund_amount: '',
+    refund_amount_daxie: '',
     refund_date: "",
+    refund_type: 0,
     reason: "",
-    amount: 0,
-    amount_daxie: "",
-    refund_type: "",
-    refunder: userInfo.name,
-    return_total_amount: "",
-    return_desc: "",
-    collection_bank: "",
-    collection_acccount: ""
+    remark: "",
+    annexs: "",
+    bank_account_id: 0,
+    is_calculate_interest: '',
+    interest_calculation_start_date: ""
 })
 
 
@@ -298,18 +320,17 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    custom_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
+    contract_no.value = data.contract.contract_no
 
 
 
 }
 const getDetail = async (row: Record<string, any>) => {
-    const data = await apirefundapplyDetail({
+    const data = await apiFinancerefundDetail({
         id: row.id
     })
     setFormData(data)
@@ -327,8 +348,8 @@ const handleSubmit = async () => {
 
     const data = { ...formData }
     mode.value == 'edit'
-        ? await apirefundapplyEdit(data)
-        : await apirefundapplyAdd(data)
+        ? await apiFinancerefundEdit(data)
+        : await apiFinancerefundAdd(data)
     popupRef.value?.close()
     emit('success')
 }
diff --git a/src/views/refundrecord/index.vue b/src/views/refundrecord/index.vue
index b9a5140..96c63ba 100644
--- a/src/views/refundrecord/index.vue
+++ b/src/views/refundrecord/index.vue
@@ -2,14 +2,23 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="合同编号" prop="project_name">
-                    <el-input class="w-[280px]" v-model="queryParams.contract_no" clearable placeholder="请输入合同编号" />
+                <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-select>
                 </el-form-item>
-                <el-form-item label="合同名称" prop="project_role_name">
-                    <el-input class="w-[280px]" v-model="queryParams.contract_name" clearable placeholder="请输入合同名称" />
+                <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-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-select>
+                </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -30,19 +39,24 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" 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="project_role_name" show-overflow-tooltip />
-                    <el-table-column label="合同编号" prop="admin_name" show-overflow-tooltip />
-                    <el-table-column label="退款原因" prop="reason" show-overflow-tooltip />
+                    <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="contract_type">
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.contract_type" :value="row.contract_type" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
+                    <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
                     <el-table-column label="退款日期" prop="refund_date" show-overflow-tooltip />
-                    <el-table-column label="退款金额" prop="amount" show-overflow-tooltip />
+                    <el-table-column label="退款金额" prop="refund_amount" show-overflow-tooltip />
+                    <el-table-column label="退款原因" prop="reason" show-overflow-tooltip />
                     <el-table-column label="退款方式" prop="refund_type" show-overflow-tooltip>
                         <template #default="{ row }">
                             <dict-value :options="dictData.refund_type" :value="row.refund_type" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="退款人" prop="refunder" show-overflow-tooltip />
+
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
                     <el-table-column label="操作" width="150" fixed="right">
                         <template #default="{ row }">
@@ -72,9 +86,10 @@
 <script lang="ts" setup name="projectLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apirefundapplyLists, apirefundapplyDelete, apirefundapplyDetail } from '@/api/refund'
+import { apiFinancerefundLists, apiFinancerefundDelete, apiFinancerefundDetail } from '@/api/refundrecord'
 import { timeFormat } from '@/utils/util'
 import { getAllProjectTypes } from '@/api/projecttype'
+import { apiProcurementContractLists } from '@/api/procurement_contract'
 const protype = reactive([])
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
@@ -84,12 +99,12 @@ const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
 const showDtail = ref(false)
-
+const list = ref([])
 // 查询条件
 const queryParams = reactive({
-    contract_no: '',
-    contract_name: '',
-
+    refund_type: '',
+    contract_id: '',
+    supplier_id: '',
 })
 
 
@@ -103,10 +118,10 @@ const handleSelectionChange = (val: any[]) => {
 }
 
 // 获取字典数据
-const { dictData } = useDictData('refund_type')
+const { dictData } = useDictData('refund_type,isaccrued,contract_type')
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apirefundapplyLists,
+    fetchFun: apiFinancerefundLists,
     params: queryParams
 })
 
@@ -121,7 +136,7 @@ const handleAdd = async () => {
 // 编辑
 const handleEdit = async (data: any) => {
     console.log(data.id)
-    let res = await apirefundapplyDetail({ id: data.id })
+    let res = await apiFinancerefundDetail({ id: data.id })
     showEdit.value = true
     await nextTick()
     editRef.value?.open('edit')
@@ -131,18 +146,30 @@ const handleEdit = async (data: any) => {
 // 删除
 const handleDelete = async (id: number | any[]) => {
     await feedback.confirm('确定要删除？')
-    await apirefundapplyDelete({ id })
+    await apiFinancerefundDelete({ id })
     getLists()
 }
+//详情
 const handledetail = async (data: any) => {
-    let res = await apirefundapplyDetail({ id: data.id })
+    let res = await apiFinancerefundDetail({ id: data.id })
     showDtail.value = true
     await nextTick()
     detailRef.value?.open()
     detailRef.value?.setFormData(res)
 }
 
-
+//查询合同
+const getlist1 = () => {
+    apiProcurementContractLists({
+        project_id: '',
+        supplier_id: '',
+        contract_no: '',
+        all: 1,
+    }).then((res) => {
+        list.value = res.lists
+    })
+}
+getlist1()
 getLists()
 </script>