From 44293500aea553df002a92d7c52097c37f0d21a2 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Fri, 12 Jan 2024 10:09:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E8=AF=81=E9=87=91=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/bankaccount/index.vue       |  22 +--
 src/components/bidbond/index.vue           |  64 +++++++++
 src/views/administrativeContracts/edit.vue |  15 ++-
 src/views/bank_account/detail.vue          |  45 ++-----
 src/views/bank_account/edit.vue            | 148 ++++++---------------
 src/views/bank_account/index.vue           |  71 +++++-----
 src/views/bidbbond/detail.vue              | 106 ++++++---------
 src/views/bidbbond/edit.vue                |  20 +--
 src/views/bidbbond/index.vue               |  25 ++--
 src/views/custom/detail.vue                |   2 +-
 src/views/refundbidDeposit/detail.vue      |  94 +++++--------
 src/views/refundbidDeposit/edit.vue        |  92 +++++--------
 src/views/refundbidDeposit/index.vue       |   7 +-
 13 files changed, 304 insertions(+), 407 deletions(-)
 create mode 100644 src/components/bidbond/index.vue

diff --git a/src/components/bankaccount/index.vue b/src/components/bankaccount/index.vue
index 4dab2ec..920ad5b 100644
--- a/src/components/bankaccount/index.vue
+++ b/src/components/bankaccount/index.vue
@@ -2,8 +2,8 @@
     <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 label="客户名称" prop="account">
+                    <el-input class="w-[280px]" v-model="queryParams.account" clearable placeholder="请输入客户名称" />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
@@ -14,12 +14,12 @@
         <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="账户编码" property="name" />
-                    <el-table-column label="开户银行" property="credit_rating" />
-                    <el-table-column label="开户名称" property="master_name" />
-                    <el-table-column label="开户账号" property="master_phone" />
-                    <el-table-column label="开户日期" property="master_phone" />
-                    <el-table-column label="备注" property="master_phone" />
+                    <el-table-column label="账户编码" property="account_sn" />
+                    <el-table-column label="开户银行" property="deposit_bank" />
+                    <el-table-column label="开户名称" property="account_name" />
+                    <el-table-column label="开户账号" property="account" />
+                    <el-table-column label="开户日期" property="account_opening_date" />
+                    <el-table-column label="备注" property="remark" />
                 </el-table>
 
             </div>
@@ -33,12 +33,12 @@
 <script lang="ts" setup>
 import { usePaging } from "@/hooks/usePaging"
 import { useDictData } from "@/hooks/useDictOptions"
-import { apiCustomLists } from '@/api/custom'
+import { bankaccountLists } from '@/api/bank_account'
 import { defineEmits } from "vue"
 
 // 查询条件
 const queryParams = reactive({
-    name: ''
+    account: ''
 });
 
 // 获取字典数据
@@ -53,7 +53,7 @@ const handleCurrentChange = (value: any) => {
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiCustomLists,
+    fetchFun: bankaccountLists,
     params: queryParams,
 });
 
diff --git a/src/components/bidbond/index.vue b/src/components/bidbond/index.vue
new file mode 100644
index 0000000..f4ea462
--- /dev/null
+++ b/src/components/bidbond/index.vue
@@ -0,0 +1,64 @@
+<template>
+    <div>
+        <el-card class="!border-none" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="客户名称" prop="custom_name">
+                    <el-input class="w-[280px]" v-model="queryParams.custom_name" clearable placeholder="请输入客户名称" />
+                </el-form-item>
+                <el-form-item>
+                    <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="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="has_refund_amount" show-overflow-tooltip />
+                    <el-table-column label="未退金额" prop="not_refund_amount" show-overflow-tooltip />
+                    <el-table-column label="创建日期" prop="create_time" show-overflow-tooltip />
+                </el-table>
+
+            </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 { bidapplyLists } from '@/api/bidbbond'
+import { defineEmits } from "vue"
+
+// 查询条件
+const queryParams = reactive({
+    custom_name: ''
+});
+
+// 获取字典数据
+const { dictData } = useDictData('')
+// 选中数据
+const emits = defineEmits(["customEvent"]);
+
+// 选中数据子父传递
+const handleCurrentChange = (value: any) => {
+    emits("customEvent", value);
+};
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: bidapplyLists,
+    params: queryParams,
+});
+
+getLists();
+</script>
\ No newline at end of file
diff --git a/src/views/administrativeContracts/edit.vue b/src/views/administrativeContracts/edit.vue
index ff70673..72f2498 100644
--- a/src/views/administrativeContracts/edit.vue
+++ b/src/views/administrativeContracts/edit.vue
@@ -26,11 +26,11 @@
 
                     <el-col :span="8">
                         <el-form-item label="供应商编码" prop="supplier_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
-                            <el-input v-model="supplier_contract_name" readonly clearable placeholder="请选择供应商" />
+                            <el-input v-model="supplier_name" readonly clearable placeholder="请选择供应商" />
                         </el-form-item> </el-col>
                     <el-col :span="8">
                         <el-form-item label="供应商编码" prop="supplier_id" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
-                            <el-input v-model="supplier_contract_no" disabled clearable placeholder="系统自动填写" />
+                            <el-input v-model="supplier_code" disabled clearable placeholder="系统自动填写" />
                         </el-form-item> </el-col>
 
                     <el-col :span="8">
@@ -157,8 +157,8 @@ const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
 const showDialog = ref(false)
 const showDialog1 = ref(false)
-const supplier_contract_name = ref('')
-const supplier_contract_no = ref('')
+const supplier_name = ref('')
+const supplier_code = ref('')
 const formDataannex = reactive([])
 const tableData = reactive([])
 const list1 = reactive([])
@@ -251,9 +251,9 @@ const formData = reactive({
     annex: ""
 })
 const customEvent = (e: any) => {
-    supplier_contract_name.value = e.supplier_name
+    supplier_name.value = e.supplier_name
     formData.supplier_id = e.id
-    supplier_contract_no.value = e.supplier_code
+    supplier_code.value = e.supplier_code
     showDialog.value = false;
 
 };
@@ -288,6 +288,9 @@ const setFormData = async (data: Record<any, any>) => {
     if (data.amount_daxie) {
         amountinput(data.amount_daxie)
     }
+    supplier_name.value = data.supplier_name
+
+    supplier_code.value = data.supplier_code
     //@ts-ignore
     formData.signing_date = timeFormat(formData.signing_date, 'yyyy-mm-dd hh:MM:ss')
 }
diff --git a/src/views/bank_account/detail.vue b/src/views/bank_account/detail.vue
index ba03f7c..2bd3607 100644
--- a/src/views/bank_account/detail.vue
+++ b/src/views/bank_account/detail.vue
@@ -3,47 +3,28 @@
 
 <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-descriptions :column="3" border>
-                <el-descriptions-item label="流程编号" label-align="left" align="left" label-class-name="my-label">{{ formData.code }}</el-descriptions-item>
-                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">{{ formData.project_name }}</el-descriptions-item>
-                <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label">{{ formData.project_code }}</el-descriptions-item>
-                <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.custom_name }}</el-descriptions-item>
-                <el-descriptions-item label="项目估算(万元)" label-align="left" align="left" label-class-name="my-label">{{ formData.project_estimation }}</el-descriptions-item>
+                <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">{{ formData.org_name }}</el-descriptions-item>
+                <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">{{ formData.dept_name }}</el-descriptions-item>
+                <el-descriptions-item label="账户编码" label-align="left" align="left" label-class-name="my-label">{{ formData.account_sn }}</el-descriptions-item>
+                <el-descriptions-item label="开户银行" label-align="left" align="left" label-class-name="my-label">{{ formData.deposit_bank }}</el-descriptions-item>
+                <el-descriptions-item label="开户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.account_name }}</el-descriptions-item>
 
-                <el-descriptions-item label="招标项目资金来源" label-align="left" align="left" label-class-name="my-label">{{ formData.bidding_project_fund_source }}</el-descriptions-item>
+                <el-descriptions-item label="账号" label-align="left" align="left" label-class-name="my-label">{{ formData.account }}</el-descriptions-item>
 
 
-                <el-descriptions-item label="投标时间" label-align="left" align="left" label-class-name="my-label">{{ formData.bidding_time }}</el-descriptions-item>
+                <el-descriptions-item label="开户日期" label-align="left" align="left" label-class-name="my-label">{{ formData.account_opening_date }}</el-descriptions-item>
 
 
-                <el-descriptions-item label="招标方式" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_type }}</el-descriptions-item>
+                <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">{{ formData.remark }}</el-descriptions-item>
 
-                <el-descriptions-item label="竞争对手" label-align="left" align="left" label-class-name="my-label">{{ formData.competitor }}</el-descriptions-item>
+                <el-descriptions-item label="添加人" label-align="left" align="left" label-class-name="my-label">{{ formData.competitor }}</el-descriptions-item>
 
-                <el-descriptions-item label="是否需要保证金" label-align="left" align="left" label-class-name="my-label">{{ formData.is_margin }}</el-descriptions-item>
-                <el-descriptions-item label="保证金金额(元)" label-align="left" align="left" label-class-name="my-label">{{ formData.margin_amount }}</el-descriptions-item>
-
-                <el-descriptions-item label="开标日期" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_opening_date }}</el-descriptions-item>
-                <el-descriptions-item label="保证金退还时间" label-align="left" align="left" label-class-name="my-label">{{ formData.margin_amount_return_date }}</el-descriptions-item>
-
-                <el-descriptions-item label="有无内部资源" label-align="left" align="left" label-class-name="my-label">{{ formData.is_internal_resources }}</el-descriptions-item>
-
-                <el-descriptions-item label="项目把握度" label-align="left" align="left" label-class-name="my-label">{{ formData.project_assurance }}</el-descriptions-item>
-                <el-descriptions-item label="招标项目概况" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_project_overview }}</el-descriptions-item>
-
-                <el-descriptions-item label="项目简介" label-align="left" align="left" label-class-name="my-label">{{ formData.project_desc }}</el-descriptions-item>
-
-                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
-                    <div v-if="formDataannex.length > 0">
-                        <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
-                            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
-
-                        </div>
-                    </div>
-                    <div v-else>暂无附件</div>
-                </el-descriptions-item>
+                <el-descriptions-item label="创建日期" label-align="left" align="left" label-class-name="my-label">{{ formData.is_margin }}</el-descriptions-item>
+                <el-descriptions-item label="更新人" label-align="left" align="left" label-class-name="my-label">{{ formData.margin_amount }}</el-descriptions-item>
 
+                <el-descriptions-item label="更新日期" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_opening_date }}</el-descriptions-item>
 
             </el-descriptions>
         </popup>
diff --git a/src/views/bank_account/edit.vue b/src/views/bank_account/edit.vue
index d811915..9cad0c2 100644
--- a/src/views/bank_account/edit.vue
+++ b/src/views/bank_account/edit.vue
@@ -21,35 +21,42 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                        <el-form-item label="名称" prop="project_id" @click="showDialog = true">
-                            <el-input v-model="project_name" clearable placeholder="请输入名称" />
+                        <el-form-item label="账户编码">
+                            <el-input v-model="bank_no" clearable disabled placeholder="系统自动生成" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="开户银行" prop="deposit_bank" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="formData.deposit_bank" clearable placeholder="请输入开户银行" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                        <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-col :span="24">
-                        <el-form-item label="验收日期" prop="accept_date">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.accept_date" clearable type="date" value-format="YYYY-MM-DD" placeholder="选择验收日期">
+                        <el-form-item label="账号" prop="account" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="formData.account" clearable placeholder="请输入账号" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                        <el-form-item label="开户日期" prop="account_opening_date" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.account_opening_date" clearable type="date" value-format="YYYY-MM-DD" placeholder="选择开户日期">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
 
+                    <el-col :span="24">
+                        <el-form-item label="期初金额" prop="opening_amount" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="formData.opening_amount" type="number" clearable placeholder="请输入期初金额" />
+                        </el-form-item>
+                    </el-col>
 
-                    <el-col :span="24">
-                        <el-form-item label="验收类型" prop="type">
-                            <el-input v-model="formData.type" clearable placeholder="请输入验收类型" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item label="验收工程师" prop="engineer">
-                            <el-input v-model="formData.engineer" clearable placeholder="请输入验收工程师" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item label="验收内容" prop="content">
-                            <el-input v-model="formData.content" clearable placeholder="请输入验收内容" />
-                        </el-form-item>
-                    </el-col>
                     <el-col :span="24">
                         <el-form-item label="备注" prop="remark">
                             <el-input v-model="formData.remark" type="textarea" clearable placeholder="请输入备注" />
@@ -58,30 +65,10 @@
 
 
 
-                    <el-col :span="24">
-
-                        <el-form-item label="附件" prop="field127">
-                            <el-upload accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv" class="upload-demo" :show-file-list="false" aria-hidden="true" :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'" :on-success="handleAvatarSuccess_four" ref="upload">
-                                <el-button type="primary">
-                                    上传
-                                </el-button>
-                            </el-upload>
-
-                            <div>
-                                <div v-for="( item, index ) in  formDataannex " style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
-                                    <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
-                                </div>
-                            </div>
-
-                        </el-form-item>
-                    </el-col>
                 </el-row>
 
 
-                <el-dialog v-model="showDialog" title="选择项目" width="70%">
-                    <porjectDialog @customEvent="customEvent"></porjectDialog>
-                </el-dialog>
+
 
 
             </el-form>
@@ -102,54 +89,20 @@ 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 active = ref(0)
-const formDataannex = reactive([])
+
 const list1 = reactive([])
 const list2 = reactive([])
 const showDialog = ref(false)
-const project_name = ref('')
+const bank_no = ref('')
 import { deptAll } from '@/api/org/department'
 import { getAll } from '@/api/org/organization'
-const userInfo = userStore.userInfo
-// 上传文件
-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 customEvent = (e: any) => {
-    formData.project_id = e.id;
-    project_name.value = e.name;
-    showDialog.value = false;
-};
+
 
 //获取所有组织
 const getlist = () => {
@@ -179,15 +132,14 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
+    org_id: '',
     dept_id: '',
-    org_id: "",
-    project_id: "",
-    accept_date: "",
-    type: '',
-    file: '',
-    engineer: "",
-    content: "",
-    remark: "",
+    deposit_bank: '',
+    account_name: '',
+    account: '',
+    account_opening_date: '',
+    opening_amount: '',
+    remark: ''
 
 })
 
@@ -200,18 +152,6 @@ const formRules = reactive<any>({
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
-    if (data.file && data.file.length > 0) {
-
-        const arry1 = data.file.map((item: any, index: any) => {
-            return {
-                name: `文件${index + 1}`,
-                uri: item
-            };
-        });
-        Object.assign(formDataannex, arry1)
-
-
-    }
 
 
     for (const key in formData) {
@@ -221,11 +161,11 @@ const setFormData = async (data: Record<any, any>) => {
         }
     }
     if (data.dept_id) {
-        getlist1(data.dept_id
-        )
+        getlist1(data.org_id)
     }
 
-    project_name.value = data.project_name
+    bank_no.value = data.account_sn
+
 
 
 }
@@ -239,13 +179,8 @@ const getDetail = async (row: Record<string, any>) => {
 
 // 提交按钮
 const handleSubmit = async () => {
-    if (formDataannex.length > 0) {
-        formData.file = JSON.stringify(formDataannex.map((item) => item.uri))
-    }
 
     await formRef.value?.validate()
-
-
     const data = { ...formData }
     mode.value == 'edit'
         ? await bankaccountEdit(data)
@@ -256,9 +191,10 @@ const handleSubmit = async () => {
 
 //打开弹窗
 const open = (type = 'add') => {
+    getlist()
     mode.value = type
     popupRef.value?.open()
-    getlist()
+
 
 }
 
diff --git a/src/views/bank_account/index.vue b/src/views/bank_account/index.vue
index 5782bfc..f52e5f7 100644
--- a/src/views/bank_account/index.vue
+++ b/src/views/bank_account/index.vue
@@ -3,17 +3,18 @@
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
 
-                <el-form-item label="标书审查" prop="bid_document_examination_id">
-                    <el-select v-model="queryParams.bid_document_examination_id" clearable placeholder="请选择标书审查">
-                        <el-option v-for="(item, index) in documentList" :key="index" :label="item.bid_document_no" :value="parseInt(item.id)" />
-                    </el-select>
+                <el-form-item label="账户编码" prop="account_sn">
+                    <el-input v-model="queryParams.account_sn" clearable placeholder="请输入账户编码" />
                 </el-form-item>
-                <el-form-item label="项目" prop="project_id">
-                    <el-select v-model="queryParams.project_id" clearable placeholder="请选择项目">
-                        <el-option v-for="(item, index) in projectList" :key="index" :label="item.name" :value="parseInt(item.id)" />
-                    </el-select>
+                <el-form-item label="账号" prop="account">
+                    <el-input v-model="queryParams.account" clearable placeholder="请输入账号" />
+                </el-form-item>
+                <el-form-item label="开户银行" prop="deposit_bank">
+                    <el-input v-model="queryParams.deposit_bank" clearable placeholder="请输入开户银行" />
+                </el-form-item>
+                <el-form-item label="开户名称" prop="account_name">
+                    <el-input v-model="queryParams.account_name" clearable placeholder="请输入开户名称" />
                 </el-form-item>
-
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -35,20 +36,22 @@
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="序号" type="index" width="55" />
 
-                    <el-table-column label="投标编号" prop="bid_document_examination_code" show-overflow-tooltip />
-                    <el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
-                    <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
-                    <el-table-column label="项目编码" prop="project_code" show-overflow-tooltip />
-                    <el-table-column label="投标时间" prop="bidding_time" show-overflow-tooltip />
-                    <el-table-column label="开标日期" prop="bid_opening_date" show-overflow-tooltip />
-                    <el-table-column label="是否中标" prop="is_successful" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.is_successful" :value="row.is_successful" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="中标单位" prop="bidder_company" show-overflow-tooltip />
-                    <el-table-column label="中标金额" prop="bidder_amount" show-overflow-tooltip />
+                    <el-table-column label="组织名称" prop="org_name" show-overflow-tooltip />
+                    <el-table-column label="部门名称" prop="dept_name" show-overflow-tooltip />
+                    <el-table-column label="账户编码" prop="account_sn" show-overflow-tooltip />
+                    <el-table-column label="开户银行" prop="deposit_bank" show-overflow-tooltip />
+                    <el-table-column label="开户名称" prop="account_name" show-overflow-tooltip />
+                    <el-table-column label="账号" prop="account" show-overflow-tooltip />
 
+                    <el-table-column label="开户日期" prop="account_opening_date" show-overflow-tooltip />
+                    <el-table-column label="期初金额" prop="opening_amount" show-overflow-tooltip />
+                    <el-table-column label="入账金额" prop="bidder_amount" show-overflow-tooltip />
+                    <el-table-column label="出账金额" prop="bidder_amount" show-overflow-tooltip />
+
+                    <el-table-column label="账户余额" prop="bidder_amount" show-overflow-tooltip />
+                    <el-table-column label="账户资金余额" prop="bidder_amount" show-overflow-tooltip />
+                    <el-table-column label="汇票账户余额" prop="bidder_amount" show-overflow-tooltip />
+                    <el-table-column label="备注" prop="bidder_amount" show-overflow-tooltip />
                     <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['bid.bid_result/edit']" type="primary" link @click="handleEdit(row)">
@@ -91,12 +94,13 @@ const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 const showEdit = ref(false)
 
 const showDtail = ref(false)
-const projectList = ref([])
-const documentList = ref([])
+
 // 查询条件
 const queryParams = reactive({
-    bid_document_examination_id: '',
-    project_id: ''
+    account_name: '',
+    account: '',
+    account_sn: '',
+    deposit_bank: ''
 })
 
 // 选中数据
@@ -146,22 +150,7 @@ const handledetail = async (data: any) => {
     detailRef.value?.open()
     detailRef.value?.setFormData(res)
 }
-//获取项目
 
-const projectlist = async () => {
-    let res = await apiProjectLists({ page_no: 1, page_size: 9999 })
-    projectList.value = res.lists
-
-}
-//获取标书审查列表
-
-const documentlists = async () => {
-    let res = await apiBidDocumentExaminationLists({ page_no: 1, page_size: 9999 })
-    documentList.value = res.lists
-
-}
-documentlists()
-projectlist()
 getLists()
 </script>
 
diff --git a/src/views/bidbbond/detail.vue b/src/views/bidbbond/detail.vue
index b02d3d8..6d601bd 100644
--- a/src/views/bidbbond/detail.vue
+++ b/src/views/bidbbond/detail.vue
@@ -2,76 +2,52 @@
 <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-descriptions title="基本信息" :column="3" border>
+                <el-descriptions-item label="投标编号" label-align="left" align="left" label-class-name="my-label">{{ formData.security_apply_code }}</el-descriptions-item>
+                <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.custom_name }}</el-descriptions-item>
+                <el-descriptions-item label="申请人" label-align="left" align="left" label-class-name="my-label">{{ formData.applier }}</el-descriptions-item>
+                <el-descriptions-item label="付款方式" label-align="left" align="left" label-class-name="my-label">{{ formData.pay_type_text }}</el-descriptions-item>
 
-
-                        <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project ? 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-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">{{ formData.project_name }}</el-descriptions-item>
+                <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label">{{ formData.project_code }}</el-descriptions-item>
 
 
 
+                <el-descriptions-item label="保证金金额" label-align="left" align="left" label-class-name="my-label">{{ formData.margin_amount }}</el-descriptions-item>
+                <!-- <el-descriptions-item label="大写" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_opening_date }}</el-descriptions-item> -->
 
-                    </el-row>
-                </el-card>
-            </el-form>
+                <el-descriptions-item label="投标时间" label-align="left" align="left" label-class-name="my-label">{{ formData.bidding_time
+                }}</el-descriptions-item>
+
+                <el-descriptions-item label="预计退还时间" label-align="left" align="left" label-class-name="my-label">{{ formData.refund_date }}</el-descriptions-item>
+
+                <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">{{ formData.remark }}</el-descriptions-item>
+                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+
+                    <div v-if="formData.annex.length > 0">
+                        <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+                            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</a>
+
+                        </div>
+                    </div>
+                    <div v-else> 暂无附件</div>
+                </el-descriptions-item>
+
+            </el-descriptions>
+            <el-descriptions title="收款人信息" border>
+
+                <el-descriptions-item label=" 开户银行" label-align="left" align="left" label-class-name="my-label">{{ formData.deposit_bank }}</el-descriptions-item>
+                <el-descriptions-item label="开户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.account_name }}</el-descriptions-item>
+                <el-descriptions-item label="账号" label-align="left" align="left" label-class-name="my-label">{{ formData.account }}</el-descriptions-item>
+
+
+            </el-descriptions>
+            <el-descriptions title="付款账户信息" border>
+                <el-descriptions-item label="账号编码" label-align="left" align="left" label-class-name="my-label">{{}}</el-descriptions-item>
+                <el-descriptions-item label="开户银行" label-align="left" align="left" label-class-name="my-label">{{ formData.deposit_bank }}</el-descriptions-item>
+                <el-descriptions-item label="开户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.account_name }}</el-descriptions-item>
+                <el-descriptions-item label="账号" label-align="left" align="left" label-class-name="my-label">{{ formData.account }}</el-descriptions-item>
+            </el-descriptions>
         </popup>
     </div>
 </template>
diff --git a/src/views/bidbbond/edit.vue b/src/views/bidbbond/edit.vue
index 3ba9bdc..bb39a1f 100644
--- a/src/views/bidbbond/edit.vue
+++ b/src/views/bidbbond/edit.vue
@@ -12,7 +12,7 @@
                 <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-input v-model="document_no" clearable placeholder="请选择投标编号" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -156,7 +156,7 @@ const project_name = ref('')
 const bidding_time = ref('')
 const project_code = ref('')
 const contract_no = ref('')
-const supplier_name = ref('')
+const document_no = ref('')
 const userInfo = userStore.userInfo
 console.log(userInfo, '222222')
 // 上传文件
@@ -195,6 +195,7 @@ const showDialog = ref(false)
 
 const customEvent = (e: any) => {
     formData.bidding_decision_id = e.id;
+    document_no.value = e.code;
     project_name.value = e.project_name
     project_code.value = e.project_code
     bidding_time.value = e.bidding_time;
@@ -220,10 +221,9 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
-    approve_id: 0,
-    bidding_decision_id: 0,
+    bidding_decision_id: '',
     applier: '',
-    pay_type: 0,
+    pay_type: '',
     refund_date: "",
     remark: "",
     annex: "",
@@ -261,10 +261,12 @@ const setFormData = async (data: Record<any, any>) => {
         }
     }
 
-    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
+    project_name.value = data.project_name
+    project_code.value = data.project_code
+    bidding_time.value = data.bidding_time
+    document_no.value = data.security_apply_code
+
+    refund_amount.value = data.margin_amount
     amountinput(data.decision.margin_amount)
 
 
diff --git a/src/views/bidbbond/index.vue b/src/views/bidbbond/index.vue
index 6c2404e..1ab7d5a 100644
--- a/src/views/bidbbond/index.vue
+++ b/src/views/bidbbond/index.vue
@@ -6,7 +6,12 @@
                     <el-input class="w-[280px]" v-model="queryParams.applier" clearable placeholder="请输入申请人" />
                 </el-form-item>
 
-
+                <el-form-item label="付款方式" prop="project_content">
+                    <el-select class="w-[280px]" v-model="queryParams.pay_type" clearable placeholder="请选择付款方式">
+                        <el-option label="全部" value=""></el-option>
+                        <el-option v-for="(item, index) in  dictData.pay_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>
@@ -29,18 +34,18 @@
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="序号" type="index" width="55" />
-                    <el-table-column label="处理流程" prop="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="" show-overflow-tooltip />
+                    <el-table-column label="流程步骤" prop="" show-overflow-tooltip />
+                    <el-table-column label="流程编号" prop="security_apply_code" show-overflow-tooltip />
+                    <el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
                     <el-table-column label="投标时间" prop="bidding_time" show-overflow-tooltip />
                     <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="已退金额" prop="has_refund_amount" show-overflow-tooltip />
+                    <el-table-column label="未退金额" prop="not_refund_amount" show-overflow-tooltip />
+                    <el-table-column label="创建日期" prop="create_time" show-overflow-tooltip />
 
                     <el-table-column label="操作" width="150" fixed="right">
                         <template #default="{ row }">
@@ -85,8 +90,8 @@ const showDtail = ref(false)
 
 // 查询条件
 const queryParams = reactive({
-    applier: ''
-
+    applier: '',
+    pay_type: ''
 
 })
 
diff --git a/src/views/custom/detail.vue b/src/views/custom/detail.vue
index b22ee79..c52026f 100644
--- a/src/views/custom/detail.vue
+++ b/src/views/custom/detail.vue
@@ -165,7 +165,7 @@
                     <el-tab-pane label="售后" name="new_name_8">
                         <div>
                             <el-table :data="tableData3" stripe style="width: 100%">
-                                <el-table-column label="工单编号" prop='custom_service_code' width="180" />
+                                <el-table-column label="工单编号" prop='custom service code' width="180" />
                                 <el-table-column label="合同编号" prop='contract_code' width="180" />
                                 <el-table-column label="投诉主题" prop='name' />
                                 <el-table-column label="日期" prop='date' />
diff --git a/src/views/refundbidDeposit/detail.vue b/src/views/refundbidDeposit/detail.vue
index 16d5847..f7f3ae4 100644
--- a/src/views/refundbidDeposit/detail.vue
+++ b/src/views/refundbidDeposit/detail.vue
@@ -1,77 +1,45 @@
 
 <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>
+        <popup ref="popupRef" title="退投标保证金" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+            <el-descriptions title="基本信息" :column="3" border>
+                <el-descriptions-item label="投标编号" label-align="left" align="left" label-class-name="my-label">{{ formData.bidding_decision_code }}</el-descriptions-item>
+                <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.custom_name }}</el-descriptions-item>
+
+
+                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">{{ formData.project_name }}</el-descriptions-item>
+                <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label">{{ formData.project_code }}</el-descriptions-item>
+
+                <el-descriptions-item label="投标时间" label-align="left" align="left" label-class-name="my-label">{{ formData.bidding_time
+                }}</el-descriptions-item>
+
+                <el-descriptions-item label="退款金额" label-align="left" align="left" label-class-name="my-label">{{ formData.margin_amount }}</el-descriptions-item>
+                <!-- <el-descriptions-item label="大写" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_opening_date }}</el-descriptions-item> -->
 
 
 
-                        <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project ? formData.project.name : '暂无数据'
-                                }}
-                            </el-form-item>
-                        </el-col>
+                <el-descriptions-item label="退款日期" label-align="left" align="left" label-class-name="my-label">{{ formData.refund_date }}</el-descriptions-item>
 
-                        <el-col :span="12">
-                            <el-form-item label="项目编码">
-                                {{ formData.project.project_code
-                                }}
-                            </el-form-item>
-                        </el-col>
+                <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label">{{ formData.remark }}</el-descriptions-item>
+                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
 
-                        <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>
+                    <div v-if="formData.annex.length > 0">
+                        <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+                            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</a>
 
-                        <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> -->
+                        </div>
+                    </div>
+                    <div v-else> 暂无附件</div>
+                </el-descriptions-item>
 
+            </el-descriptions>
 
-                        <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>
+            <el-descriptions title="收款账户信息" border>
+                <el-descriptions-item label="账号编码" label-align="left" align="left" label-class-name="my-label">{{ formData.bank_account_info.account_sn }}</el-descriptions-item>
+                <el-descriptions-item label="开户银行" label-align="left" align="left" label-class-name="my-label">{{ formData.bank_account_info.deposit_bank }}</el-descriptions-item>
+                <el-descriptions-item label="开户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.bank_account_info.account_name }}</el-descriptions-item>
+                <el-descriptions-item label="账号" label-align="left" align="left" label-class-name="my-label">{{ formData.bank_account_info.account }}</el-descriptions-item>
+            </el-descriptions>
         </popup>
     </div>
 </template>
diff --git a/src/views/refundbidDeposit/edit.vue b/src/views/refundbidDeposit/edit.vue
index e097dd9..9a93031 100644
--- a/src/views/refundbidDeposit/edit.vue
+++ b/src/views/refundbidDeposit/edit.vue
@@ -6,8 +6,8 @@
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
                 <el-row :gutter="10">
                     <el-col :span="8">
-                        <el-form-item label="投标编号" prop="bidding_decision_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="custom_name" clearable placeholder="请选择投标编号" />
+                        <el-form-item label="投标编号" prop="bid_security_apply_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="bidding_code" clearable placeholder="请选择投标编号" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -18,7 +18,7 @@
 
 
                     <el-col :span="8">
-                        <el-form-item label="项目名称" prop="contract_id" @click="showDialog1 = true">
+                        <el-form-item label="项目名称" prop="contract_id">
                             <el-input v-model="project_name" clearable disabled placeholder="系统自动填写" />
                         </el-form-item>
                     </el-col>
@@ -84,58 +84,41 @@
                 <el-row :gutter="10">
 
                     <el-col :span="8">
-                        <el-form-item label="账户编码" prop="invoicing_company_name" @click="showDialog2 = true">
-                            <el-input v-model="formData.invoicing_company_name" clearable placeholder="请输入账户编码" />
+                        <el-form-item label="账户编码" prop="bank_account_id" @click="showDialog1 = true">
+                            <el-input v-model="accnout_sn" readonly clearable placeholder="请输入账户编码" />
                         </el-form-item>
 
                     </el-col>
 
                     <el-col :span="8">
-                        <el-form-item label="开户银行" prop="deposit_bank">
-                            <el-input v-model="formData.deposit_bank" clearable placeholder="请输入开户银行" />
+                        <el-form-item label="开户银行" prop="bank_account_id">
+                            <el-input v-model="deposit_bank" disabled 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 label="账号" prop="bank_account_id">
+                            <el-input v-model="bank_accnout" disabled 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 label="开户地址及电话" prop="bank_account_id">
+                            <el-input v-model="address_phone" disabled 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 v-model="showDialog" title="选择投标保证金" width="70%">
+                    <bidbondDialog @customEvent="customEvent"></bidbondDialog>
                 </el-dialog>
 
 
-                <el-dialog v-model="showDialog2" title="选择银行账户" width="70%">
-                    <bankaccountDialog @customEvent="customEvent2"></bankaccountDialog>
+                <el-dialog v-model="showDialog1" title="选择银行账户" width="70%">
+                    <bankaccountDialog @customEvent="customEvent1"></bankaccountDialog>
                 </el-dialog>
             </el-form>
         </popup>
@@ -147,8 +130,7 @@
 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 bidbondDialog from '@/components/bidbond/index.vue'
 import bankaccountDialog from '@/components/bankaccount/index.vue'
 import { bidrefundAdd, bidrefundEdit, bidrefundDetail } from '@/api/refundbidDeposit'
 import { toChinesNum } from "@/utils/util";
@@ -162,12 +144,16 @@ const protype = reactive([])
 const base_url = configs.baseUrl + configs.urlPrefix
 const userStore = useUserStore();
 const formDataannex = reactive([])
-const contract_name = ref('')
+const bidding_code = ref('')
 const project_name = ref('')
 const project_code = ref('')
 const bidding_time = ref('')
-const contract_no = ref('')
+const accnout_sn = ref('')
+const bank_accnout = ref('')
+const address_phone = ref('')
+const deposit_bank = ref('')
 const custom_name = ref('')
+
 const userInfo = userStore.userInfo
 console.log(userInfo, '222222')
 // 上传文件
@@ -195,21 +181,7 @@ const checkPhone = (rule: any, value: any, callback: (arg0: Error) => any) => {
     }
 
 }
-const userEmail = (rule: any, value: string, callback: (arg0: Error | undefined) => void) => {
 
-    // const mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/
-    // // if (!value) {
-    // //     return callback(new Error('邮箱不能为空'))
-    // // }
-
-
-    if (value && !mailReg.test(value)) {
-        callback(new Error('请输入正确的邮箱格式'))
-    } else {
-        callback()
-    }
-
-};
 // 删除上传的文件
 const delFileFn = (index: number) => {
     formDataannex.splice(index, 1)
@@ -227,19 +199,23 @@ 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;
+    formData.bid_security_apply_id = e.id;
     project_name.value = e.project_name
     bidding_time.value = e.bidding_time
     custom_name.value = e.custom_name
+    bidding_code.value = e.security_apply_code
     project_code.value = e.project_code
     showDialog.value = false;
 };
 const customEvent1 = (e: any) => {
 
-
-
+    formData.bank_account_id = e.id
+    accnout_sn.value = e.account_sn
+    bank_accnout.value = e.account
+    address_phone.value = e.account_sn
+    deposit_bank.value = e.deposit_bank
     showDialog1.value = false;
 };
 
@@ -260,15 +236,13 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
-    bidding_decision_id: "",
+    bid_security_apply_id: "",
     refund_amount: "",
-    refund_amount_daxie: "",
     refund_date: "",
     remark: "",
     annex: "",
-    bank_account_id: 1,
-    is_calculate_interest: "",
-    interest_calculation_start_date: ""
+    bank_account_id: '',
+
 })
 
 
diff --git a/src/views/refundbidDeposit/index.vue b/src/views/refundbidDeposit/index.vue
index 861bb95..e955b34 100644
--- a/src/views/refundbidDeposit/index.vue
+++ b/src/views/refundbidDeposit/index.vue
@@ -32,15 +32,14 @@
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="序号" type="index" width="55" />
-                    <el-table-column label="投标编号" prop="supplier_name" show-overflow-tooltip />
-                    <el-table-column label="客户名称" prop="customer_name" show-overflow-tooltip />
-
+                    <el-table-column label="投标编号" prop="bidding_decision_code" show-overflow-tooltip />
+                    <el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
                     <el-table-column label="项目编码" prop="project_code" show-overflow-tooltip />
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
                     <el-table-column label="投标时间" prop="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="备注" prop="remark" show-overflow-tooltip />
                     <el-table-column label="操作" width="150" fixed="right">
                         <template #default="{ row }">