From 26bb3b0f690795a7e1aec2a28befd67c660587c9 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Sat, 23 Dec 2023 18:59:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E7=A5=A8=E8=BD=AC=E5=87=BA=E3=80=81?=
 =?UTF-8?q?=E6=89=BF=E5=85=91=E6=B1=87=E7=A5=A8=20=E6=97=A5=E5=B8=B8?=
 =?UTF-8?q?=E6=8A=A5=E9=94=80=E7=AD=89=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/acceptance.ts                         |  27 +
 src/api/expense_reimbursement.ts              |  33 +
 src/api/redemption_bill.ts                    |  27 +
 src/api/transfer_bill.ts                      |  27 +
 src/components/budget/index.vue               |  34 +-
 src/components/personnelselector/index.vue    |   9 +-
 src/components/proontract/index.vue           |   2 +-
 src/views/administrativeContracts/edit.vue    |  63 +-
 src/views/bid_bidding_decision/detail.vue     |  26 +-
 src/views/bid_bidding_decision/edit.vue       |  45 ++
 src/views/bid_buy_bidding_document/detail.vue |  25 +-
 src/views/bid_buy_bidding_document/edit.vue   |  93 ++-
 src/views/bid_document_examination/edit.vue   | 430 ++++++++++++-
 src/views/bid_document_examination/index.vue  |   2 +-
 src/views/bidbbond/edit.vue                   |   4 +-
 src/views/contract_negotiation/edit.vue       |  96 ++-
 src/views/contract_negotiation/index.vue      |   2 +-
 .../AdministrativePayments/edit.vue           |   2 +-
 .../AdministrativeTickets/edit.vue            |   4 +-
 .../Management/editadjust.vue                 |   2 +-
 .../draft/Acceptance/detail.vue               | 188 ++++++
 .../draft/Acceptance/edit.vue                 | 403 ++++++++++++
 .../draft/Acceptance/index.vue                | 156 +++++
 .../financialManagement/draft/Cash/detail.vue | 188 ++++++
 .../financialManagement/draft/Cash/edit.vue   | 364 +++++++++++
 .../financialManagement/draft/Cash/index.vue  | 155 +++++
 .../draft/MoneyOrderTransfer/detail.vue       | 188 ++++++
 .../draft/MoneyOrderTransfer/edit.vue         | 404 ++++++++++++
 .../draft/MoneyOrderTransfer/index.vue        | 156 +++++
 .../reimbursement/DailyExpenses.vue           | 137 ++++
 .../reimbursement/DailyReimbursement.vue      | 185 ------
 .../reimbursement/detail.vue                  | 188 ++++++
 .../reimbursement/edit.vue                    | 584 ++++++++++++++++++
 .../reimbursement/index.vue                   | 153 +++++
 src/views/paymentrequest/edit.vue             |   4 +-
 src/views/procurement_contract/edit.vue       |  54 +-
 src/views/procurement_contract/index.vue      |  17 +-
 src/views/purchaseContracts/edit.vue          |  47 ++
 .../quality_specification/index.vue           |  14 +-
 src/views/receiptrecord/edit.vue              |   4 +-
 src/views/refund/edit.vue                     |   4 +-
 src/views/subcontract/edit.vue                |  44 +-
 src/views/subcontracting_contract/edit.vue    |  44 ++
 43 files changed, 4331 insertions(+), 303 deletions(-)
 create mode 100644 src/api/acceptance.ts
 create mode 100644 src/api/expense_reimbursement.ts
 create mode 100644 src/api/redemption_bill.ts
 create mode 100644 src/api/transfer_bill.ts
 create mode 100644 src/views/financialManagement/draft/Acceptance/detail.vue
 create mode 100644 src/views/financialManagement/draft/Acceptance/edit.vue
 create mode 100644 src/views/financialManagement/draft/Acceptance/index.vue
 create mode 100644 src/views/financialManagement/draft/Cash/detail.vue
 create mode 100644 src/views/financialManagement/draft/Cash/edit.vue
 create mode 100644 src/views/financialManagement/draft/Cash/index.vue
 create mode 100644 src/views/financialManagement/draft/MoneyOrderTransfer/detail.vue
 create mode 100644 src/views/financialManagement/draft/MoneyOrderTransfer/edit.vue
 create mode 100644 src/views/financialManagement/draft/MoneyOrderTransfer/index.vue
 delete mode 100644 src/views/financialManagement/reimbursement/DailyReimbursement.vue
 create mode 100644 src/views/financialManagement/reimbursement/detail.vue
 create mode 100644 src/views/financialManagement/reimbursement/edit.vue
 create mode 100644 src/views/financialManagement/reimbursement/index.vue

diff --git a/src/api/acceptance.ts b/src/api/acceptance.ts
new file mode 100644
index 0000000..fec1bf2
--- /dev/null
+++ b/src/api/acceptance.ts
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+// 承兑汇票表列表
+export function acceptancebillLists(params: any) {
+    return request.get({ url: '/bill.acceptance_bill/lists', params })
+}
+
+// 添加承兑汇票
+export function acceptancebillAdd(params: any) {
+    return request.post({ url: '/bill.acceptance_bill/add', params })
+}
+
+// 编辑承兑汇票
+export function acceptancebillEdit(params: any) {
+    return request.post({ url: '/bill.acceptance_bill/edit', params })
+}
+
+// 删除承兑汇票
+export function acceptancebillDelete(params: any) {
+    return request.post({ url: '/bill.acceptance_bill/delete', params })
+}
+
+
+// 承兑汇票详情
+export function acceptancebillDetail(params: any) {
+    return request.get({ url: '/bill.acceptance_bill/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/expense_reimbursement.ts b/src/api/expense_reimbursement.ts
new file mode 100644
index 0000000..b202ee2
--- /dev/null
+++ b/src/api/expense_reimbursement.ts
@@ -0,0 +1,33 @@
+import request from '@/utils/request'
+
+
+
+// 日常报销列表
+export function expensereimbursementLists(params: any) {
+    return request.get({ url: '/expense.expense_reimbursement/lists', params })
+}
+
+// 添加日常报销
+export function expensereimbursementAdd(params: any) {
+    return request.post({ url: '/expense.expense_reimbursement/add', params })
+}
+
+// 编辑日常报销
+export function expensereimbursementEdit(params: any) {
+    return request.post({ url: '/expense.expense_reimbursement/edit', params })
+}
+
+// 删除日常报销
+export function expensereimbursementDelete(params: any) {
+    return request.post({ url: '/expense.expense_reimbursement/delete', params })
+}
+
+// 日常报销详情
+export function expensereimbursementDetail(params: any) {
+    return request.get({ url: '/expense.expense_reimbursement/detail', params })
+}
+
+// 日常费用明细列表
+export function reimbursementdetails(params: any) {
+    return request.get({ url: '/expense.expense_reimbursement_detail/lists', params })
+}
\ No newline at end of file
diff --git a/src/api/redemption_bill.ts b/src/api/redemption_bill.ts
new file mode 100644
index 0000000..941333b
--- /dev/null
+++ b/src/api/redemption_bill.ts
@@ -0,0 +1,27 @@
+
+import request from '@/utils/request'
+
+//汇票兑现列表
+export function redemptionbillLists(params: any) {
+    return request.get({ url: '/bill.redemption_bill/lists', params })
+}
+
+// 添加退款申请
+export function redemptionbillAdd(params: any) {
+    return request.post({ url: '/bill.redemption_bill/add', params })
+}
+
+// 编辑退款申请
+export function redemptionbillEdit(params: any) {
+    return request.post({ url: '/bill.redemption_bill/edit', params })
+}
+
+// 删除退款申请
+export function redemptionbillDelete(params: any) {
+    return request.post({ url: '/bill.redemption_bill/delete', params })
+}
+
+//汇票兑现详情
+export function redemptionbillDetail(params: any) {
+    return request.get({ url: '/bill.redemption_bill/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/transfer_bill.ts b/src/api/transfer_bill.ts
new file mode 100644
index 0000000..169a462
--- /dev/null
+++ b/src/api/transfer_bill.ts
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+// 汇票转出表列表
+export function transferbillLists(params: any) {
+    return request.get({ url: '/bill.transfer_bill/lists', params })
+}
+
+// 添加汇票转出
+export function transferbillAdd(params: any) {
+    return request.post({ url: '/bill.transfer_bill/add', params })
+}
+
+// 编辑汇票转出
+export function transferbillEdit(params: any) {
+    return request.post({ url: '/bill.transfer_bill/edit', params })
+}
+
+// 删除汇票转出
+export function transferbillDelete(params: any) {
+    return request.post({ url: '/bill.transfer_bill/delete', params })
+}
+
+
+// 汇票转出详情
+export function transferbillDetail(params: any) {
+    return request.get({ url: '/bill.transfer_bill/detail', params })
+}
\ No newline at end of file
diff --git a/src/components/budget/index.vue b/src/components/budget/index.vue
index 23839a7..3e2446e 100644
--- a/src/components/budget/index.vue
+++ b/src/components/budget/index.vue
@@ -15,21 +15,21 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @cell-click="handleCurrentChange">
                     <el-table-column label="序号" type="index" />
-                    <el-table-column label="年份	" property="custom_type" />
-                    <el-table-column label="一级科目" property="credit_rating" />
-                    <el-table-column label="二级科目" property="province_name" />
-                    <el-table-column label="一月" property="city_name" />
-                    <el-table-column label="二月" property="street_name" />
-                    <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="master_phone" />
-                    <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="master_phone" />
-                    <el-table-column label="十二月" property="master_phone" />
+                    <el-table-column label="年份" property="years" />
+                    <el-table-column label="一级科目" property="subject1" />
+                    <el-table-column label="二级科目" property="subject2" />
+                    <el-table-column label="一月" property="month1" />
+                    <el-table-column label="二月" property="month2" />
+                    <el-table-column label="三月" property="month3" />
+                    <el-table-column label="四月" property="month4" />
+                    <el-table-column label="五月" property="month5" />
+                    <el-table-column label="六月" property="month6" />
+                    <el-table-column label="七月" property="month7" />
+                    <el-table-column label="八月" property="month8" />
+                    <el-table-column label="九月" property="month9" />
+                    <el-table-column label="十月" property="month10" />
+                    <el-table-column label="十一月" property="month11" />
+                    <el-table-column label="十二月" property="month12" />
 
                 </el-table>
 
@@ -44,7 +44,7 @@
 <script lang="ts" setup>
 import { usePaging } from "@/hooks/usePaging"
 import { useDictData } from "@/hooks/useDictOptions"
-import { apiCustomLists } from '@/api/custom'
+import { apiCustomdetailDetail } from '@/api/cost_budget'
 import { defineEmits } from "vue"
 
 // 查询条件
@@ -63,7 +63,7 @@ const handleCurrentChange = (value: any) => {
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiCustomLists,
+    fetchFun: apiCustomdetailDetail,
     params: queryParams,
 });
 
diff --git a/src/components/personnelselector/index.vue b/src/components/personnelselector/index.vue
index cf671d0..de4a2c4 100644
--- a/src/components/personnelselector/index.vue
+++ b/src/components/personnelselector/index.vue
@@ -228,7 +228,6 @@ const props = defineProps({
 const emits = defineEmits(['confirm'])
 
 const dialogVisible = ref(false)
-const active = ref(0);
 const isCollapse = ref(1);
 const uesrlist = reactive([])
 const deparmetlist = reactive({})
@@ -293,6 +292,9 @@ const gwclck = (item: { id: any }) => {
 
 //打开弹窗
 const open = (e: any) => {
+    getlist()
+    deparmet()
+    Jobs()
     leixin.value = e
     dialogVisible.value = true
 
@@ -310,11 +312,6 @@ const userclick = () => {
 }
 
 
-onMounted(() => {
-    getlist()
-    deparmet()
-    Jobs()
-})
 
 
 
diff --git a/src/components/proontract/index.vue b/src/components/proontract/index.vue
index b261b83..b943648 100644
--- a/src/components/proontract/index.vue
+++ b/src/components/proontract/index.vue
@@ -61,7 +61,7 @@ const queryParams = reactive({
     custom_name: '',
     project_type: ""
 });
-const { dictData } = useDictData('project_type,project_content,bidding_method,relationship,information_sources,construction_funds_sources,construction_financial_status,construction_recognition,my_construction_recognition,strategic_significance,industry,unit_nature')
+const { dictData } = useDictData('contract_type,contract_pricing_method')
 
 // 选中数据
 const emits = defineEmits(["customEvent"]);
diff --git a/src/views/administrativeContracts/edit.vue b/src/views/administrativeContracts/edit.vue
index ef6a07a..a7b11b0 100644
--- a/src/views/administrativeContracts/edit.vue
+++ b/src/views/administrativeContracts/edit.vue
@@ -2,6 +2,16 @@
     <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">
+                <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>
 
                     <el-col :span="8">
@@ -141,7 +151,10 @@ const project_name = ref('')
 const project_code = ref('')
 const formDataannex = reactive([])
 const tableData = reactive([])
-const tableData1 = reactive([])
+const list1 = reactive([])
+const list2 = reactive([])
+import { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
 import feedback from '@/utils/feedback'
 import configs from "@/config"
 const base_url = configs.baseUrl + configs.urlPrefix
@@ -165,22 +178,35 @@ const handleAvatarSuccess_four = (
 const delFileFn = (index: number) => {
     formDataannex.splice(index, 1)
 }
-const handleAdd = (row: any) => {
-    // 在 row 后面插入一行数据
-    const index = tableData.indexOf(row);
-    tableData.splice(index + 1, 0, {});
-};
 
-const handleDelete = (row: any) => {
-    // 删除 row
-    const index = tableData.indexOf(row);
-    tableData.splice(index, 1);
+
+
+//获取所有组织
+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 handleDelete1 = (row: any) => {
-    // 删除 row
-    const index = formData.pay_plan.indexOf(row);
-    formData.material.splice(index, 1);
-};
 // 弹窗标题
 const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑行政合同' : '新增行政合同'
@@ -189,6 +215,8 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
+    dept_id: '',
+    org_id: '',
     supplier_id: 0,
     contract_no: "",
     contract_name: "",
@@ -235,7 +263,9 @@ const setFormData = async (data: Record<any, any>) => {
         Object.assign(formDataannex, arry1)
     }
 
-
+    if (formData.dept_id) {
+        getlist1(formData.dept_id)
+    }
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
             //@ts-ignore
@@ -273,6 +303,7 @@ const handleSubmit = async () => {
 const open = (type = 'add') => {
     mode.value = type
     popupRef.value?.open()
+    getlist()
 }
 
 // 关闭回调
diff --git a/src/views/bid_bidding_decision/detail.vue b/src/views/bid_bidding_decision/detail.vue
index 24eec1b..8c06588 100644
--- a/src/views/bid_bidding_decision/detail.vue
+++ b/src/views/bid_bidding_decision/detail.vue
@@ -101,8 +101,21 @@
                                 {{ formData.project_desc }}
                             </el-form-item>
                         </el-col>
+                        <el-col :span="24">
+                            <el-form-item label="附件" prop="field127">
 
 
+                                <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-form-item>
+                        </el-col>
+
                     </el-row>
                 </el-card>
             </el-form>
@@ -116,6 +129,7 @@ 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: {
@@ -126,7 +140,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: [],
@@ -151,7 +165,17 @@ const setFormData = async (data: Record<any, any>) => {
     //     }
 
     // }
+    if (data.annex && data.annex.length > 0) {
 
+        const arry1 = data.annex.map((item: any, index: any) => {
+            return {
+                name: `文件${index + 1}`,
+                uri: item
+            };
+        });
+        Object.assign(formDataannex, arry1)
+
+    }
     Object.assign(formData, data)
     console.log(formData, '2222222222')
 
diff --git a/src/views/bid_bidding_decision/edit.vue b/src/views/bid_bidding_decision/edit.vue
index b3ec744..c671dce 100644
--- a/src/views/bid_bidding_decision/edit.vue
+++ b/src/views/bid_bidding_decision/edit.vue
@@ -2,6 +2,16 @@
     <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">
+                <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>
                     <el-col :span="8">
                         <el-form-item label="项目名称" prop="project_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" @click="showDialog = true">
@@ -132,6 +142,10 @@ const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
 const showDialog = ref(false)
+const list1 = reactive([])
+const list2 = reactive([])
+import { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
 import configs from "@/config"
 const base_url = configs.baseUrl + configs.urlPrefix
 import useUserStore from "@/stores/modules/user";
@@ -167,10 +181,37 @@ const customEvent = (e: any) => {
 const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑投标决策' : '新增投标决策'
 })
+//获取所有组织
+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 formData = reactive({
     id: '',
+    dept_id: '',
+    org_id: '',
     project_id: '',
     project_estimation: '',
     bidding_project_fund_source: '',
@@ -213,6 +254,9 @@ const setFormData = async (data: Record<any, any>) => {
         Object.assign(formDataannex, arry1)
 
     }
+    if (formData.dept_id) {
+        getlist1(formData.dept_id)
+    }
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
             //@ts-ignore
@@ -249,6 +293,7 @@ const handleSubmit = async () => {
 const open = (type = 'add') => {
     mode.value = type
     popupRef.value?.open()
+    getlist()
 }
 
 // 关闭回调
diff --git a/src/views/bid_buy_bidding_document/detail.vue b/src/views/bid_buy_bidding_document/detail.vue
index 645feb5..fb9e79c 100644
--- a/src/views/bid_buy_bidding_document/detail.vue
+++ b/src/views/bid_buy_bidding_document/detail.vue
@@ -90,8 +90,21 @@
                                 {{ formData.project_desc }}
                             </el-form-item>
                         </el-col>
+                        <el-col :span="24">
+                            <el-form-item label="附件" prop="field127">
 
 
+                                <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-form-item>
+                        </el-col>
                     </el-row>
                 </el-card>
             </el-form>
@@ -115,7 +128,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: [],
@@ -140,7 +153,17 @@ const setFormData = async (data: Record<any, any>) => {
     //     }
 
     // }
+    if (data.annex && data.annex.length > 0) {
 
+        const arry1 = data.annex.map((item: any, index: any) => {
+            return {
+                name: `文件${index + 1}`,
+                uri: item
+            };
+        });
+        Object.assign(formDataannex, arry1)
+
+    }
     Object.assign(formData, data)
     console.log(formData, '2222222222')
 
diff --git a/src/views/bid_buy_bidding_document/edit.vue b/src/views/bid_buy_bidding_document/edit.vue
index 7051de0..7eceb30 100644
--- a/src/views/bid_buy_bidding_document/edit.vue
+++ b/src/views/bid_buy_bidding_document/edit.vue
@@ -1,7 +1,16 @@
 <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="130px" :rules="formRules">
+            <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>
                     <el-col :span="8">
                         <el-form-item label="项目名称" prop="project_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" @click="showDialog = true">
@@ -22,8 +31,8 @@
                         <el-form-item label="投标公司名称" prop="bid_company_name" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.bid_company_name" clearable placeholder="请输入投标公司名称" />
                         </el-form-item></el-col><el-col :span="8">
-                        <el-form-item label="购买人员" prop="buyer">
-                            <el-input v-model="formData.buyer" clearable placeholder="请输入购买人员" />
+                        <el-form-item label="购买人员" prop="buyer" @click="userclick">
+                            <el-input v-model="buyer_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="请输入购买标书金额" />
@@ -79,7 +88,7 @@
                             </el-upload>
 
                             <div>
-                                <div v-for="(item, index) in formannex" style="margin-left: 5px;display: block;">
+                                <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>
@@ -93,6 +102,8 @@
             </el-form>
             <reviewprocess />
         </popup>
+        <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
         <el-dialog v-model="showDialog" title="选择项目" width="70%">
             <projectTable @customEvent="customEvent"></projectTable>
 
@@ -104,6 +115,8 @@
 import type { FormInstance } from 'element-plus'
 import reviewprocess from '@/components/reviewprocess/index.vue'
 import Popup from '@/components/popup/index.vue'
+import personnelselector from '@/components/personnelselector/index.vue'
+
 import projectTable from "@/components/project/index.vue"
 import { apiBidBuyBiddingDocumentAdd, apiBidBuyBiddingDocumentEdit, apiBidBuyBiddingDocumentDetail } from '@/api/bid_buy_bidding_document'
 import { timeFormat } from '@/utils/util'
@@ -117,16 +130,22 @@ defineProps({
 const matsname = ref('')
 const project_name = ref('')
 const project_code = ref('')
+const personnel = ref<any>()
 const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
+const list1 = reactive([])
+const list2 = reactive([])
+import { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
 import configs from "@/config"
 const base_url = configs.baseUrl + configs.urlPrefix
 import useUserStore from "@/stores/modules/user";
 const userStore = useUserStore();
-const formannex = reactive([])
+const formDataannex = reactive([])
 const showDialog = ref(false)
+const buyer_name = ref('')
 // 上传文件
 const handleAvatarSuccess_four = (
     response,
@@ -136,12 +155,15 @@ const handleAvatarSuccess_four = (
         ElMessage.error(response.msg);
         return;
     }
-    formannex.push(
+    formDataannex.push(
         { uri: response.data.uri, name: response.data.name }
 
     );
 };
-
+// 删除上传的文件
+const delFileFn = (index: number) => {
+    formDataannex.splice(index, 1)
+}
 
 // 弹窗标题
 const popupTitle = computed(() => {
@@ -151,6 +173,8 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
+    dept_id: '',
+    org_id: '',
     project_id: '',
     approve_id: '1',
     bid_document_no: '',
@@ -170,12 +194,48 @@ const formData = reactive({
     annex: '',
 })
 
+//打开弹窗
 
+const userclick = () => {
+    // console.log(personnel.value, '1111111')
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData.buyer = e.id;
+    buyer_name.value = e.name;
+}
 // 表单验证
 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 customEvent = (e: any) => {
     formData.project_id = e.id;
@@ -184,6 +244,7 @@ const customEvent = (e: any) => {
     project_code.value = e.project_code
     showDialog.value = false;
 };
+
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     matsname.value = data.project.person
@@ -195,16 +256,23 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
+    if (data.annex && data.annex.length > 0) {
 
+        const arry1 = data.annex.map((item: any, index: any) => {
+            return {
+                name: `文件${index + 1}`,
+                uri: item
+            };
+        });
+        Object.assign(formDataannex, arry1)
+
+    }
     //@ts-ignore
     formData.bid_date = timeFormat(formData.bid_date, 'yyyy-mm-dd hh:MM:ss')
     //@ts-ignore
     formData.buy_date = timeFormat(formData.buy_date, 'yyyy-mm-dd hh:MM:ss')
 }
-// 删除上传的文件
-const delFileFn = (index: number) => {
-    formannex.splice(index, 1)
-}
+
 
 const getDetail = async (row: Record<string, any>) => {
     const data = await apiBidBuyBiddingDocumentDetail({
@@ -216,7 +284,7 @@ const getDetail = async (row: Record<string, any>) => {
 
 // 提交按钮
 const handleSubmit = async () => {
-    formData.annex = JSON.stringify(formannex.map(item => item.uri))
+    formData.annex = JSON.stringify(formDataannex.map(item => item.uri))
 
 
     await formRef.value?.validate()
@@ -232,6 +300,7 @@ const handleSubmit = async () => {
 const open = (type = 'add') => {
     mode.value = type
     popupRef.value?.open()
+    getlist()
 }
 
 // 关闭回调
diff --git a/src/views/bid_document_examination/edit.vue b/src/views/bid_document_examination/edit.vue
index 9cf25d4..e84b61f 100644
--- a/src/views/bid_document_examination/edit.vue
+++ b/src/views/bid_document_examination/edit.vue
@@ -1,77 +1,271 @@
 <template>
     <div class="edit-popup">
         <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" :rules="formRules" inline>
+            <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules" inline>
+                <el-steps :active="2" align-center style="margin-bottom: 30px;">
+                    <el-step title="销售发起" description="Some description" />
+                    <el-step title="商务部技术部" description="Some description" />
+                    <el-step title="财务部" description="Some description" />
+                    <el-step title="事业部总工" description="Some description" />
+                    <el-step title="事业部总经理审批" description="Some description" />
+                    <el-step title="销售副总" description="Some description" />
+                </el-steps>
+                <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>
-                    <el-col :span="12">
+                    <el-col :span="8">
                         <el-form-item label="审批id" prop="approve_id">
                             <el-input v-model="formData.approve_id" clearable placeholder="请输入审批id" />
                         </el-form-item>
-                    </el-col> <el-col :span="12">
-                        <el-form-item label="购买标书" prop="buy_bidding_document_id" @click="showDialog = true">
-                            <el-input v-model="bidding_name" clearable readonly placeholder="请输入购买标书" />
-                        </el-form-item></el-col> <el-col :span="12">
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="标书编号" prop="buy_bidding_document_id" @click="showDialog = true">
+                            <el-input v-model="bid_document_no" clearable readonly placeholder="请选择标书编号" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="购买人员" prop="buy_bidding_document_id">
+                            <el-input v-model="buyer" clearable readonly placeholder="请输入购买人员" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="客户名称" prop="buy_bidding_document_id">
+                            <el-input v-model="bid_document_no" clearable readonly placeholder="请输入客户名称" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="招标公司名称" prop="buy_bidding_document_id">
+                            <el-input v-model="invite_tenders_company_name" clearable readonly placeholder="请输入招标公司名称" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="投标公司名称" prop="buy_bidding_document_id">
+                            <el-input v-model="bid_company_name" clearable readonly placeholder="请输入购买标书" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="购买标书金额" prop="buy_bidding_document_id">
+                            <el-input v-model="amount" clearable readonly placeholder="请输入购买标书金额" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+
+                        <el-form-item label="招标项目资金来源" prop="buy_bidding_document_id">
+                            <el-select v-model="project_fund_source" clearable placeholder="请选择招标项目资金来源" @change="deptrmt">
+                                <el-option v-for="(item, index) in dictData.construction_funds_sources" :key="index" :label="item.name" :value="parseInt(item.id)" />
+                            </el-select>
+
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="投标时间" prop="buy_bidding_document_id">
+                            <el-input v-model="bid_date" clearable readonly placeholder="请输入投标时间" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="购买标书时间" prop="buy_bidding_document_id">
+                            <el-input v-model="buy_date" clearable readonly placeholder="请输入投标时间" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="招标方式" prop="buy_bidding_document_id">
+                            <el-select v-model="invite_tenders_type" clearable placeholder="请选择招标方式" @change="deptrmt">
+                                <el-option v-for="(item, index) in dictData.bidding_method" :key="index" :label="item.name" :value="parseInt(item.id)" />
+                            </el-select>
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="投标地址" prop="buy_bidding_document_id">
+                            <el-input v-model="bid_address" clearable readonly placeholder="请输入投标地址" />
+                        </el-form-item>
+                    </el-col>
+
+
+                    <el-col :span="8">
                         <el-form-item label="是否需要保证金" prop="is_need_deposit">
                             <el-radio-group v-model="formData.is_need_deposit" placeholder="请选择是否需要保证金">
                                 <el-radio v-for="(item, index) in dictData.whether_status" :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>
+                    </el-col>
+
+
+
+                    <el-col :span="8">
                         <el-form-item label="开标日期" prop="bid_opening_date">
                             <el-date-picker class="flex-1 !flex" v-model="formData.bid_opening_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-form-item></el-col> <el-col :span="8">
 
                         <el-form-item label="保证金退还时间" prop="deposit_refund_time">
                             <el-date-picker class="flex-1 !flex" v-model="formData.deposit_refund_time" 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> <el-col :span="8">
                         <el-form-item label="招标项目概况" prop="bidding_project_overview">
                             <el-input v-model="formData.bidding_project_overview" clearable placeholder="请输入招标项目概况" />
-                        </el-form-item></el-col> <el-col :span="12">
+                        </el-form-item></el-col> <el-col :span="8">
                         <el-form-item label="项目简介" prop="project_introduction">
                             <el-input v-model="formData.project_introduction" clearable placeholder="请输入项目简介" />
-                        </el-form-item></el-col> <el-col :span="12">
+                        </el-form-item></el-col> <el-col :span="24">
                         <el-form-item label="附件" prop="annex">
-                            <el-input v-model="formData.annex" clearable placeholder="请输入附件" />
-                        </el-form-item></el-col> <el-col :span="12">
+
+                            <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>
+                <div class="tit">技术审查</div>
+                <el-row>
+
+                    <el-col :span="8">
                         <el-form-item label="技术协议偏差" prop="technical_protocol_deviation">
                             <el-input v-model="formData.technical_protocol_deviation" clearable placeholder="请输入技术协议偏差" />
-                        </el-form-item></el-col> <el-col :span="12">
+                        </el-form-item></el-col> <el-col :span="8">
                         <el-form-item label="协议偏差处理方案" prop="protocol_deviation_handling_plan">
                             <el-input v-model="formData.protocol_deviation_handling_plan" clearable placeholder="请输入协议偏差处理方案" />
-                        </el-form-item></el-col> <el-col :span="12">
+                        </el-form-item></el-col>
+                    <el-col :span="24">
                         <el-form-item label="技术审查附件" prop="technical_review_annex">
-                            <el-input v-model="formData.technical_review_annex" clearable placeholder="请输入技术审查附件" />
-                        </el-form-item></el-col> <el-col :span="12">
+
+                            <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_four1" ref="upload">
+                                <el-button type="primary">
+                                    上传
+                                </el-button>
+                            </el-upload>
+
+                            <div>
+                                <div v-for="(item, index) in formDataannex1" 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="delFileFn1(index)">x</span>
+                                </div>
+                            </div>
+
+                        </el-form-item>
+                    </el-col>
+
+
+                </el-row>
+                <div class="tit">商务审查</div>
+                <el-row>
+                    <el-col :span="8">
                         <el-form-item label="总金额" prop="business_review_total_amount">
                             <el-input v-model="formData.business_review_total_amount" clearable placeholder="请输入总金额" />
-                        </el-form-item></el-col> <el-col :span="12">
+                        </el-form-item></el-col> <el-col :span="8">
                         <el-form-item label="税率" prop="tax_rate">
                             <el-select class="flex-1" v-model="formData.tax_rate" clearable placeholder="请选择税率">
                                 <el-option v-for="(item, index) in dictData.tax_rate" :key="index" :label="item.name" :value="parseInt(item.value)" />
                             </el-select>
-                        </el-form-item></el-col> <el-col :span="12">
+                        </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="12">
+                        </el-form-item></el-col> <el-col :span="8">
                         <el-form-item label="付款比例" prop="pay_rate">
                             <el-input v-model="formData.pay_rate" clearable placeholder="请输入付款比例" />
-                        </el-form-item></el-col> <el-col :span="12">
+                        </el-form-item></el-col> <el-col :span="8">
                         <el-form-item label="商务合同偏差" prop="business_contract_deviation">
                             <el-input v-model="formData.business_contract_deviation" clearable placeholder="请输入商务合同偏差" />
-                        </el-form-item></el-col> <el-col :span="12">
+                        </el-form-item></el-col> <el-col :span="8">
                         <el-form-item label="偏差处理方案" prop="business_contract_deviation_handling_plan">
                             <el-input v-model="formData.business_contract_deviation_handling_plan" clearable placeholder="请输入偏差处理方案" />
-                        </el-form-item></el-col> <el-col :span="12">
+                        </el-form-item></el-col> <el-col :span="24">
                         <el-form-item label="商务审查附件" prop="business_contract_deviation_annex">
-                            <el-input v-model="formData.business_contract_deviation_annex" clearable placeholder="请输入商务审查附件" />
+
+                            <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_four2" ref="upload">
+                                <el-button type="primary">
+                                    上传
+                                </el-button>
+                            </el-upload>
+
+                            <div>
+                                <div v-for="(item, index) in formDataannex2" 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="delFileFn2(index)">x</span>
+                                </div>
+                            </div>
+
+
+
                         </el-form-item></el-col>
                 </el-row>
+                <div class="tit">审查明细</div>
+                <div style="margin-bottom: 30px;">
+                    <el-table :data="formData.product">
+                        <el-table-column label="序号">
+                            <template #default="{ row }">
+                                <el-button @click="handleAdd(row)">+</el-button>
+                                <el-button @click="handleDelete(row)">-</el-button>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="产品名称" prop="product_name">
+                            <template #default="{ row }">
+                                <el-input v-model="row.product_name" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="型号规格" prop="pay_date">
+                            <template #default="{ row }">
+                                <el-input v-model="row.pay_amount" />
+                            </template></el-table-column>
+                        <el-table-column label="单位" prop="pay_amount">
+                            <template #default="{ row }">
+                                <el-input v-model="row.pay_amount" /> </template>
+                        </el-table-column>
+                        <el-table-column label="数量" prop="product_num">
+                            <template #default="{ row }">
+                                <el-input v-model="row.product_num" /> </template>
+                        </el-table-column>
+
+                        <el-table-column label="成本单价" prop="cost_unit_price">
+                            <template #default="{ row }">
+                                <el-input v-model="row.cost_unit_price" /> </template>
+                        </el-table-column>
+
+                        <el-table-column label="金额" prop="amount">
+                            <template #default="{ row }">
+                                <el-input v-model="row.amount" /> </template>
+                        </el-table-column>
+                        <el-table-column label="点数" prop="rate">
+                            <template #default="{ row }">
+                                <el-input v-model="row.rate" /> </template>
+                        </el-table-column>
+                        <el-table-column label="报价单价" prop="unit_price">
+                            <template #default="{ row }">
+                                <el-input v-model="row.unit_price" /> </template>
+                        </el-table-column>
+                        <el-table-column label="报价金额" prop="total_amount">
+                            <template #default="{ row }">
+                                <el-input v-model="row.total_amount" />
+                            </template>
+                        </el-table-column>
+
+
+                    </el-table>
+                </div>
             </el-form>
         </popup>
         <el-dialog v-model="showDialog" title="选择标书" width="70%">
@@ -101,7 +295,95 @@ const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
 const showDialog = ref(false)
-const bidding_name = ref('')
+const bid_document_no = ref('')
+const invite_tenders_company_name = ref('')
+const bid_company_name = ref('')
+const amount = ref('')
+const buyer = ref('')
+const project_fund_source = ref('')
+const bid_date = ref('')
+const buy_date = ref('')
+const invite_tenders_type = ref('')
+const bid_address = ref('')
+const list1 = reactive([])
+const list2 = reactive([])
+import { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
+import configs from "@/config"
+const base_url = configs.baseUrl + configs.urlPrefix
+import useUserStore from "@/stores/modules/user";
+const userStore = useUserStore();
+const formDataannex = reactive([])
+const formDataannex1 = reactive([])
+const formDataannex2 = reactive([])
+// 上传文件
+const handleAvatarSuccess_four = (
+    response,
+    uploadFile
+) => {
+    if (response.code == 0) {
+        ElMessage.error(response.msg);
+        return;
+    }
+    formDataannex.push(
+        { uri: response.data.uri, name: response.data.name }
+
+    );
+};
+// 删除上传的文件
+const delFileFn = (index: number) => {
+    formDataannex.splice(index, 1)
+}
+
+// 上传文件
+const handleAvatarSuccess_four1 = (
+    response,
+    uploadFile
+) => {
+    if (response.code == 0) {
+        ElMessage.error(response.msg);
+        return;
+    }
+    formDataannex1.push(
+        { uri: response.data.uri, name: response.data.name }
+
+    );
+};
+// 删除上传的文件
+const delFileFn1 = (index: number) => {
+    formDataannex1.splice(index, 1)
+}
+
+// 上传文件
+const handleAvatarSuccess_four2 = (
+    response,
+    uploadFile
+) => {
+    if (response.code == 0) {
+        ElMessage.error(response.msg);
+        return;
+    }
+    formDataannex2.push(
+        { uri: response.data.uri, name: response.data.name }
+
+    );
+};
+// 删除上传的文件
+const delFileFn2 = (index: number) => {
+    formDataannex2.splice(index, 1)
+}
+
+const handleAdd = (row: any) => {
+    // 在 row 后面插入一行数据
+    const index = formData.product.indexOf(row);
+    formData.product.splice(index + 1, 0, {});
+};
+
+const handleDelete = (row: any) => {
+    // 删除 row
+    const index = formData.product.indexOf(row);
+    formData.product.splice(index, 1);
+};
 // 弹窗标题
 const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑标书审查' : '新增标书审查'
@@ -110,6 +392,8 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
+    dept_id: '',
+    org_id: '',
     approve_id: '',
     buy_bidding_document_id: '',
     is_need_deposit: '',
@@ -117,7 +401,7 @@ const formData = reactive({
     deposit_refund_time: '',
     bidding_project_overview: '',
     project_introduction: '',
-    annex: '',
+    project_fund_source: '',
     technical_protocol_deviation: '',
     protocol_deviation_handling_plan: '',
     technical_review_annex: '',
@@ -128,12 +412,24 @@ const formData = reactive({
     business_contract_deviation: '',
     business_contract_deviation_handling_plan: '',
     business_contract_deviation_annex: '',
+    product: [{
+
+    }]
 })
 
 //获取值
 const customEvent = (e: any) => {
     formData.buy_bidding_document_id = e.id;
-    bidding_name.value = e.bid_document_no
+    bid_document_no.value = e.bid_document_no
+    invite_tenders_company_name.value = e.invite_tenders_company_name
+    bid_company_name.value = e.bid_company_name
+    amount.value = e.amount
+    buyer.value = e.buyer
+    project_fund_source.value = e.project_fund_source
+    bid_date.value = e.bid_date
+    buy_date.value = e.buy_date
+    invite_tenders_type.value = e.invite_tenders_type
+    bid_address.value = e.bid_address
     showDialog.value = false
 
 };
@@ -142,16 +438,90 @@ 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>) => {
-    bidding_name.value = data.document.bid_document_no
+    bid_document_no.value = data.document.bid_document_no
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
             //@ts-ignore
             formData[key] = data[key]
         }
     }
+    if (formData.dept_id) {
+        getlist1(formData.dept_id)
+    }
+
+    if (data.project_fund_source && data.project_fund_source.length > 0) {
+
+        const arry1 = data.project_fund_source.map((item: any, index: any) => {
+            return {
+                name: `文件${index + 1}`,
+                uri: item
+            };
+        });
+        Object.assign(formDataannex, arry1)
+
+    }
+    if (data.technical_review_annex && data.technical_review_annex.length > 0) {
+
+        const arry1 = data.technical_review_annex.map((item: any, index: any) => {
+            return {
+                name: `文件${index + 1}`,
+                uri: item
+            };
+        });
+        Object.assign(formDataannex1, arry1)
+
+    }
+    if (data.business_contract_deviation_annex && data.business_contract_deviation_annex.length > 0) {
+
+        const arry1 = data.business_contract_deviation_annex.map((item: any, index: any) => {
+            return {
+                name: `文件${index + 1}`,
+                uri: item
+            };
+        });
+        Object.assign(formDataannex2, arry1)
+
+    }
+
+
+    bid_document_no.value = data.document.bid_document_no
+    invite_tenders_company_name.value = data.document.invite_tenders_company_name
+    bid_company_name.value = data.document.bid_company_name
+    amount.value = data.document.amount
+    buyer.value = data.document.buyer
+    project_fund_source.value = data.document.project_fund_source
+    bid_date.value = data.document.bid_date
+    buy_date.value = data.document.buy_date
+    invite_tenders_type.value = data.document.invite_tenders_type
+    bid_address.value = data.document.bid_address
 
     //@ts-ignore
     formData.bid_opening_date = timeFormat(formData.bid_opening_date, 'yyyy-mm-dd hh:MM:ss')
@@ -169,6 +539,9 @@ const getDetail = async (row: Record<string, any>) => {
 
 // 提交按钮
 const handleSubmit = async () => {
+    formData.project_fund_source = JSON.stringify(formDataannex.map(item => item.uri))
+    formData.technical_review_annex = JSON.stringify(formDataannex1.map(item => item.uri))
+    formData.business_contract_deviation_annex = JSON.stringify(formDataannex2.map(item => item.uri))
     await formRef.value?.validate()
     const data = { ...formData, }
     mode.value == 'edit'
@@ -182,6 +555,7 @@ const handleSubmit = async () => {
 const open = (type = 'add') => {
     mode.value = type
     popupRef.value?.open()
+    getlist()
 }
 
 // 关闭回调
diff --git a/src/views/bid_document_examination/index.vue b/src/views/bid_document_examination/index.vue
index 0af9753..33edf14 100644
--- a/src/views/bid_document_examination/index.vue
+++ b/src/views/bid_document_examination/index.vue
@@ -122,7 +122,7 @@ const handleSelectionChange = (val: any[]) => {
 }
 
 // 获取字典数据
-const { dictData } = useDictData('whether_status,tax_rate,pay_type')
+const { dictData } = useDictData('whether_status,tax_rate,pay_type,construction_funds_sources,bidding_method')
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
diff --git a/src/views/bidbbond/edit.vue b/src/views/bidbbond/edit.vue
index 13d53f5..8bc3c16 100644
--- a/src/views/bidbbond/edit.vue
+++ b/src/views/bidbbond/edit.vue
@@ -244,7 +244,7 @@ const formData = reactive({
     id: '',
     approve_id: 0,
     bidding_decision_id: 0,
-    applier: userInfo.name,
+    applier: '',
     pay_type: 0,
     refund_date: "",
     remark: "",
@@ -333,7 +333,7 @@ const handleClose = () => {
 }
 
 
-
+formData.applier = userInfo.name
 defineExpose({
     open,
     setFormData,
diff --git a/src/views/contract_negotiation/edit.vue b/src/views/contract_negotiation/edit.vue
index a549c3d..e960176 100644
--- a/src/views/contract_negotiation/edit.vue
+++ b/src/views/contract_negotiation/edit.vue
@@ -2,6 +2,16 @@
     <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="160px" :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>
                     <el-col :span="8">
                         <el-form-item label="合同名称" prop="contract_id" @click="showDialog = true">
@@ -15,15 +25,27 @@
                         </el-form-item></el-col><el-col :span="8">
                         <el-form-item label="客户名称" prop="contract_id" @click="showDialog = true">
                             <el-input v-model="custom_name" readonly clearable placeholder="请选择合同" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" />
-                        </el-form-item></el-col><el-col :span="8">
-                        <el-form-item label="合同类型" prop="contract_id" @click="showDialog = true">
-                            <el-input v-model="contract_type" readonly clearable placeholder="请选择合同" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" />
-                        </el-form-item></el-col><el-col :span="8">
-                        <el-form-item label="合同计价方式" prop="contract_id" @click="showDialog = true">
-                            <el-input v-model="contract_pricing_method" readonly clearable placeholder="请选择合同" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" />
-                        </el-form-item></el-col><el-col :span="8">
+                        </el-form-item></el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="合同类型" prop="contract_id">
+                            <el-select v-model="contract_type" clearable placeholder="请选择合同类型">
+                                <el-option v-for="(item, index) in dictData.contract_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="contract_id">
+                            <el-select class="flex-1" v-model="contract_pricing_method" clearable placeholder="请选择合同计价方式">
+                                <el-option v-for="(item, index) in dictData.contract_pricing_method" :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="contract_id" @click="showDialog = true">
-                            <el-input v-model="contract_name" readonly clearable placeholder="请选择合同" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" />
+                            <el-input v-model="business_director" readonly clearable placeholder="请选择合同" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" />
                         </el-form-item></el-col><el-col :span="8">
 
                         <el-form-item label="审批id" prop="approve_id">
@@ -80,12 +102,9 @@
                 </el-row>
             </el-form>
         </popup>
-        <el-dialog v-model="showDialog" title="选择客户" width="70%">
-
+        <el-dialog v-model="showDialog" title="选择合同" width="70%">
             <proontractTable @customEvent="customEvent"></proontractTable>
 
-
-
         </el-dialog>
     </div>
 </template>
@@ -112,9 +131,13 @@ const contract_name = ref('')
 const contract_code = ref('')
 const project_name = ref('')
 const custom_name = ref('')
+const business_director = ref('')
 const contract_type = ref('')
 const contract_pricing_method = ref('')
-
+const list1 = reactive([])
+const list2 = reactive([])
+import { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
 // 弹窗标题
 const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑合同洽商' : '新增合同洽商'
@@ -123,6 +146,8 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
+    dept_id: '',
+    org_id: '',
     contract_id: '',
     approve_id: '',
     negotiation_name: '',
@@ -145,13 +170,46 @@ const formData = reactive({
 const customEvent = (e: any) => {
     formData.contract_id = e.id;
     contract_name.value = e.contract_name;
+    contract_code.value = e.contract_code
+    custom_name.value = e.customer_name
+    business_director.value = e.business_director
+    business_director.value = e.business_director
+    contract_type.value = e.contract_type
+    project_name.value = e.project_name
+    contract_pricing_method.value = e.contract_pricing_method
+
     showDialog.value = false;
 };
 // 表单验证
 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>) => {
     for (const key in formData) {
@@ -161,6 +219,17 @@ const setFormData = async (data: Record<any, any>) => {
         }
     }
 
+
+    if (formData.dept_id) {
+        getlist1(formData.dept_id)
+    }
+    business_director.value = data.business_director
+    contract_name.value = data.contract_name
+    contract_code.value = data.contract_code
+    project_name.value = data.project_name
+    custom_name.value = data.custom_name
+    contract_type.value = data.contract_type
+    contract_pricing_method.value = data.contract_pricing_method
     //@ts-ignore
     formData.Warranty_expire_date = timeFormat(formData.Warranty_expire_date, 'yyyy-mm-dd hh:MM:ss')
 }
@@ -188,6 +257,7 @@ const handleSubmit = async () => {
 const open = (type = 'add') => {
     mode.value = type
     popupRef.value?.open()
+    getlist()
 }
 
 // 关闭回调
diff --git a/src/views/contract_negotiation/index.vue b/src/views/contract_negotiation/index.vue
index 53014b4..3d71a95 100644
--- a/src/views/contract_negotiation/index.vue
+++ b/src/views/contract_negotiation/index.vue
@@ -101,7 +101,7 @@ const handleSelectionChange = (val: any[]) => {
 }
 
 // 获取字典数据
-const { dictData } = useDictData('negotiation_type')
+const { dictData } = useDictData('negotiation_type,contract_type,contract_pricing_method')
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
diff --git a/src/views/financialManagement/Administrative/AdministrativePayments/edit.vue b/src/views/financialManagement/Administrative/AdministrativePayments/edit.vue
index 80295c6..197655e 100644
--- a/src/views/financialManagement/Administrative/AdministrativePayments/edit.vue
+++ b/src/views/financialManagement/Administrative/AdministrativePayments/edit.vue
@@ -70,7 +70,7 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="本次支付金额" prop="payment_amount">
-                            <el-input v-model="formData.payment_amount" clearable placeholder="请输入金额大写" @input="amountinput" />
+                            <el-input v-model="formData.payment_amount" clearable placeholder="请输入支付金额" @input="amountinput" />
 
                         </el-form-item>
                     </el-col>
diff --git a/src/views/financialManagement/Administrative/AdministrativeTickets/edit.vue b/src/views/financialManagement/Administrative/AdministrativeTickets/edit.vue
index b1bf2e4..0295bb8 100644
--- a/src/views/financialManagement/Administrative/AdministrativeTickets/edit.vue
+++ b/src/views/financialManagement/Administrative/AdministrativeTickets/edit.vue
@@ -258,7 +258,7 @@ const formData = reactive({
     org_id: 0,
     dept_id: 0,
     administrative_contract_id: 0,
-    commitor: userInfo.name,
+    commitor: '',
     invoicing_date: "",
     invoice_type: 0,
     invoice_sn: "",
@@ -350,7 +350,7 @@ const handleClose = () => {
     emit('close')
 }
 
-
+formData.commitor = userInfo.name
 
 defineExpose({
     open,
diff --git a/src/views/financialManagement/Management/editadjust.vue b/src/views/financialManagement/Management/editadjust.vue
index 50f4c16..e6e986e 100644
--- a/src/views/financialManagement/Management/editadjust.vue
+++ b/src/views/financialManagement/Management/editadjust.vue
@@ -430,7 +430,7 @@ const getlist1 = (id: any) => {
 const handleSubmit = async () => {
     // console.log(tableData.value)
     // formData.detail=
-    if (tableData.value.length) {
+    if (tableData.value.length > 0) {
         const arr1 = tableData.value.map(({ name1, name2, ...rest }) => rest)
         Object.assign(formData.detail, arr1)
     }
diff --git a/src/views/financialManagement/draft/Acceptance/detail.vue b/src/views/financialManagement/draft/Acceptance/detail.vue
new file mode 100644
index 0000000..2faab17
--- /dev/null
+++ b/src/views/financialManagement/draft/Acceptance/detail.vue
@@ -0,0 +1,188 @@
+
+<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.contract.contract_no }}
+                            </el-form-item>
+                        </el-col>
+
+
+                        <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.custom.name
+                                }}
+                            </el-form-item>
+                        </el-col> -->
+                        <el-col :span="12">
+                            <el-form-item label="申请日期">
+                                {{ formData.apply_date
+                                }}
+                            </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.amount_daxie }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="付款方式">
+                                <dict-value :options="dictData.pay_type" :value="formData.pay_type" />
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="本次支付金额">
+                                {{ formData.payment_amount }}
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="收款银行">
+                                {{ formData.deposit_bank }}
+                            </el-form-item>
+                        </el-col>
+
+
+                        <el-col :span="12">
+                            <el-form-item label="备注">
+                                {{ formData.remark
+                                }}
+                            </el-form-item>
+                        </el-col>
+
+
+                        <el-col :span="24">
+                            <el-form-item label="附件">
+                                <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-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 formDataannex = reactive([])
+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)
+    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)
+
+        }
+    }
+
+
+}
+
+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/financialManagement/draft/Acceptance/edit.vue b/src/views/financialManagement/draft/Acceptance/edit.vue
new file mode 100644
index 0000000..9de28da
--- /dev/null
+++ b/src/views/financialManagement/draft/Acceptance/edit.vue
@@ -0,0 +1,403 @@
+<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="org_id">
+                            <el-select 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> </el-form-item></el-col>
+                    <el-col :span="8">
+                        <el-form-item label="请选择部门" prop="dept_id">
+                            <el-select 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-form-item> </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="客户名称" prop="customer_id" @click="showDialog = true">
+                            <el-input v-model="customer_name" readonly clearable placeholder="请输入客户名称" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目名称" prop="reimburser">
+                            <el-input v-model="project_name" clearable placeholder="请输入项目名称" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目编码" prop="reimburser">
+                            <el-input v-model="project_code" clearable placeholder="请输入项目编码" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="合同名称" prop="reimburser">
+                            <el-input v-model="contract_name" clearable placeholder="请输入合同名称" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="合同编码" prop="reimburser">
+                            <el-input v-model="contract_no" clearable placeholder="请输入合同编码" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="合同类型" prop="contract_type">
+                            <el-select v-model="contract_type" clearable placeholder="请选择合同类型">
+                                <el-option v-for="(item, index) in dictData.contract_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="invoice_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.invoice_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="bill_sn">
+                            <el-input v-model="formData.bill_sn" clearable placeholder="请输入票据编号" />
+
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="收票银行" prop="reimburser">
+                            <el-input v-model="formData.reimburser" clearable placeholder="请输入收票银行" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="收票账户编码" prop="reimburser">
+                            <el-input v-model="formData.reimburser" clearable placeholder="请输入收票账户编码" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+
+                        <el-form-item label="汇票类型" prop="bill_type">
+                            <el-radio-group v-model="formData.bill_type" placeholder="请选择汇票类型">
+                                <el-radio v-for="(item, index) in dictData.bill_type" :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="draft_acceptance_bank">
+                            <el-input v-model="formData.draft_acceptance_bank" readonly clearable placeholder="请输入汇票承兑银行" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="汇票到期日期" prop="bill_due_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.bill_due_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="receipt_amount">
+                            <el-input v-model="formData.receipt_amount" clearable placeholder="请输入收款金额" @input="amountinput" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="收款金额大写" prop="receipt_amount_daxie">
+                            <el-input v-model="formData.receipt_amount_daxie" readonly 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="请输入备注" />
+                        </el-form-item>
+                    </el-col>
+
+
+                    <el-col :span="24">
+
+                        <el-form-item label="附件" prop="field87">
+                            <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="showDialog1" title="选择项目" width="70%">
+                    <projectDialog @customEvent="customEvent1"></projectDialog>
+                </el-dialog>
+
+                <el-dialog v-model="showDialog2" title="选择合同" width="70%">
+                    <proontractDialog @customEvent="customEvent2"></proontractDialog>
+                </el-dialog>
+
+                <el-dialog v-model="showDialog" title="选择客户" width="70%">
+                    <customDialog @customEvent="customEvent"></customDialog>
+                </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 projectDialog from '@/components/project/index.vue'
+import proontractDialog from '@/components/proontract/index.vue'
+import { acceptancebillAdd, acceptancebillEdit, acceptancebillDetail } from '@/api/acceptance'
+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 { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
+import configs from "@/config"
+import useUserStore from "@/stores/modules/user";
+
+const base_url = configs.baseUrl + configs.urlPrefix
+const userStore = useUserStore();
+const active = ref(0)
+const formDataannex = reactive([])
+const contract_name = ref('')
+const contract_no = ref('')
+const customer_name = ref('')
+const project_name = ref('')
+const project_code = ref('')
+const list1 = reactive([])
+const list2 = reactive([])
+
+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 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 amount_daxie = ref('')
+const showDialog = ref(false)
+const showDialog1 = ref(false)
+const showDialog2 = ref(false)
+
+
+
+
+
+
+const customEvent = (e: any) => {
+    formData.customer_id = e.id;
+    customer_name.value = e.name;
+    showDialog.value = false;
+};
+
+const customEvent1 = (e: any) => {
+    showDialog1.value = false;
+};
+
+
+
+//获取所有组织
+const getlist = () => {
+    getAll().then((res) => {
+        Object.assign(list1, res)
+
+    })
+}
+//获取部门
+const deptrmt = (e) => {
+    getlist1(e)
+}
+//获取所有部门
+const getlist1 = (id: any) => {
+    deptAll({ 'org_id': id }).then((res) => {
+        Object.assign(list2, res)
+    })
+}
+
+//监听输入
+const amountinput = (e) => {
+    // console.log(e)
+    if (e && e > 0) {
+        formData.receipt_amount_daxie = toChinesNum(e)
+    }
+}
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑承兑汇票报销表' : '新增承兑汇票表'
+})
+
+
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    org_id: '',
+    dept_id: '',
+    customer_id: 0,
+    project_id: 0,
+    contract_id: 0,
+    invoice_type: "",
+    bill_sn: "",
+    bank_account_id: 0,
+    bill_type: 0,
+    draft_acceptance_bank: "",
+    bill_due_date: "",
+    receipt_amount: "",
+    receipt_amount_daxie: "",
+    remark: "",
+    annex: ""
+
+
+})
+
+
+// 表单验证
+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]
+        }
+    }
+    customer_name.value = data.custom.name
+    if (formData.reimbursement_amount) {
+        toChinesNum(formData.reimbursement_amount)
+    }
+
+
+
+
+}
+const getDetail = async (row: Record<string, any>) => {
+    const data = await acceptancebillDetail({
+        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 acceptancebillEdit(data)
+        : await acceptancebillAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+
+    getlist()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/financialManagement/draft/Acceptance/index.vue b/src/views/financialManagement/draft/Acceptance/index.vue
new file mode 100644
index 0000000..083273e
--- /dev/null
+++ b/src/views/financialManagement/draft/Acceptance/index.vue
@@ -0,0 +1,156 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="提交人" prop="commitor">
+                    <el-input class="w-[280px]" v-model="queryParams.commitor" clearable placeholder="请输入提交人" />
+                </el-form-item>
+                <el-form-item label="报销id" prop="expense_id">
+                    <el-input class="w-[280px]" v-model="queryParams.expense_id" clearable placeholder="请输入报销id" />
+                </el-form-item>
+                <el-form-item label="发票类型" prop="cost_subject_id">
+                    <el-select class="w-[280px]" v-model="queryParams.cost_subject_id" clearable placeholder="请选择费用科目id">
+
+                        <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>
+                </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="序号" type="index" show-overflow-tooltip />
+                    <el-table-column label="处理流程" prop="project_code" show-overflow-tooltip />
+                    <el-table-column label="流程步骤" prop="project_code" show-overflow-tooltip />
+                    <el-table-column label="组织名称" prop="approve_no" show-overflow-tooltip />
+                    <el-table-column label="客户名称" prop="contract_no" show-overflow-tooltip />
+                    <el-table-column label="项目名称" prop="contract_name" show-overflow-tooltip />
+                    <el-table-column label="合同编号" prop="supplier_name" show-overflow-tooltip />
+                    <el-table-column label="收票日期" prop="apply_date" show-overflow-tooltip />
+                    <el-table-column label="票据编号" prop="applier" show-overflow-tooltip />
+                    <el-table-column label="收票银行" prop="payment_amount" 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="tax" show-overflow-tooltip />
+                    <el-table-column label="兑现金额" prop="tax" show-overflow-tooltip />
+                    <el-table-column label="余额" prop="tax" 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 { acceptancebillLists, acceptancebillDelete, acceptancebillDetail } from '@/api/acceptance'
+import { timeFormat } from '@/utils/util'
+
+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({
+    commitor: '',
+    expense_id: '',
+    invoice_type: '',
+
+})
+
+
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('pay_type,invoice_type,tax_rate,invoice_form,bill_type,contract_type')
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: acceptancebillLists,
+    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 acceptancebillDetail({ 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 acceptancebillDelete({ id })
+    getLists()
+}
+const handledetail = async (data: any) => {
+    let res = await acceptancebillDetail({ id: data.id })
+    showDtail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+
+getLists()
+</script>
+
diff --git a/src/views/financialManagement/draft/Cash/detail.vue b/src/views/financialManagement/draft/Cash/detail.vue
new file mode 100644
index 0000000..2faab17
--- /dev/null
+++ b/src/views/financialManagement/draft/Cash/detail.vue
@@ -0,0 +1,188 @@
+
+<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.contract.contract_no }}
+                            </el-form-item>
+                        </el-col>
+
+
+                        <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.custom.name
+                                }}
+                            </el-form-item>
+                        </el-col> -->
+                        <el-col :span="12">
+                            <el-form-item label="申请日期">
+                                {{ formData.apply_date
+                                }}
+                            </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.amount_daxie }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="付款方式">
+                                <dict-value :options="dictData.pay_type" :value="formData.pay_type" />
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="本次支付金额">
+                                {{ formData.payment_amount }}
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="收款银行">
+                                {{ formData.deposit_bank }}
+                            </el-form-item>
+                        </el-col>
+
+
+                        <el-col :span="12">
+                            <el-form-item label="备注">
+                                {{ formData.remark
+                                }}
+                            </el-form-item>
+                        </el-col>
+
+
+                        <el-col :span="24">
+                            <el-form-item label="附件">
+                                <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-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 formDataannex = reactive([])
+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)
+    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)
+
+        }
+    }
+
+
+}
+
+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/financialManagement/draft/Cash/edit.vue b/src/views/financialManagement/draft/Cash/edit.vue
new file mode 100644
index 0000000..a89e8a4
--- /dev/null
+++ b/src/views/financialManagement/draft/Cash/edit.vue
@@ -0,0 +1,364 @@
+<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="org_id">
+                            <el-select 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> </el-form-item></el-col>
+                    <el-col :span="8">
+                        <el-form-item label="请选择部门" prop="dept_id">
+                            <el-select 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-form-item> </el-col>
+
+
+                    <el-col :span="8">
+                        <el-form-item label="票据编号" prop="bill_sn">
+                            <el-input v-model="formData.bill_sn" clearable placeholder="请输入票据编号" />
+
+                        </el-form-item>
+                    </el-col>
+
+
+                    <el-col :span="8">
+
+                        <el-form-item label="汇票类型" prop="bill_type">
+                            <el-radio-group v-model="formData.bill_type" placeholder="请选择汇票类型">
+                                <el-radio v-for="(item, index) in dictData.bill_type" :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="draft_acceptance_bank">
+                            <el-input v-model="formData.draft_acceptance_bank" readonly clearable placeholder="请输入汇票承兑银行" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="汇票到期日期" prop="bill_due_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.bill_due_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="reimburser">
+                            <el-input v-model="formData.reimburser" clearable placeholder="请输入收票账户编码" />
+
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="收票银行" prop="reimburser">
+                            <el-input v-model="formData.reimburser" clearable placeholder="请输入收票银行" />
+
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="兑现日期" prop="maturity_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.maturity_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="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-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                        <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="field87">
+                            <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="showDialog1" title="选择项目" width="70%">
+                    <projectDialog @customEvent="customEvent1"></projectDialog>
+                </el-dialog>
+
+                <el-dialog v-model="showDialog2" title="选择合同" width="70%">
+                    <proontractDialog @customEvent="customEvent2"></proontractDialog>
+                </el-dialog>
+
+                <el-dialog v-model="showDialog" title="选择客户" width="70%">
+                    <customDialog @customEvent="customEvent"></customDialog>
+                </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 projectDialog from '@/components/project/index.vue'
+import proontractDialog from '@/components/proontract/index.vue'
+import { redemptionbillAdd, redemptionbillEdit, redemptionbillDetail } from '@/api/redemption_bill'
+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 { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
+import configs from "@/config"
+import useUserStore from "@/stores/modules/user";
+
+const base_url = configs.baseUrl + configs.urlPrefix
+const userStore = useUserStore();
+const active = ref(0)
+const formDataannex = reactive([])
+const contract_name = ref('')
+const contract_no = ref('')
+const customer_name = ref('')
+const project_name = ref('')
+const project_code = ref('')
+const list1 = reactive([])
+const list2 = reactive([])
+
+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 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 amount_daxie = ref('')
+const showDialog = ref(false)
+const showDialog1 = ref(false)
+const showDialog2 = ref(false)
+
+
+
+
+
+
+const customEvent = (e: any) => {
+    formData.customer_id = e.id;
+    customer_name.value = e.name;
+    showDialog.value = false;
+};
+
+const customEvent1 = (e: any) => {
+    showDialog1.value = false;
+};
+
+
+
+//获取所有组织
+const getlist = () => {
+    getAll().then((res) => {
+        Object.assign(list1, res)
+
+    })
+}
+//获取部门
+const deptrmt = (e) => {
+    getlist1(e)
+}
+//获取所有部门
+const getlist1 = (id: any) => {
+    deptAll({ 'org_id': id }).then((res) => {
+        Object.assign(list2, res)
+    })
+}
+
+//监听输入
+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: '',
+    supplier_id: 1,
+    maturity_date: "",
+    amount: "",
+    amount_daxie: "",
+    remark: "",
+    annex: ""
+
+})
+
+
+// 表单验证
+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]
+        }
+    }
+    customer_name.value = data.custom.name
+    if (formData.reimbursement_amount) {
+        toChinesNum(formData.reimbursement_amount)
+    }
+
+
+
+
+}
+const getDetail = async (row: Record<string, any>) => {
+    const data = await redemptionbillDetail({
+        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 redemptionbillEdit(data)
+        : await redemptionbillAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+
+    getlist()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/financialManagement/draft/Cash/index.vue b/src/views/financialManagement/draft/Cash/index.vue
new file mode 100644
index 0000000..11779a2
--- /dev/null
+++ b/src/views/financialManagement/draft/Cash/index.vue
@@ -0,0 +1,155 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="票据编号" prop="bill_sn">
+                    <el-input class="w-[280px]" v-model="queryParams.bill_sn" clearable placeholder="请输入票据编号" />
+                </el-form-item>
+                <el-form-item label="客户id" prop="customer_id">
+                    <el-input class="w-[280px]" v-model="queryParams.customer_id" clearable placeholder="请输入客户id" />
+                </el-form-item>
+                <el-form-item label="销售合同id" prop="contract_id">
+                    <el-select class="w-[280px]" v-model="queryParams.contract_id" clearable placeholder="请选择销售合同id">
+
+                        <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>
+                </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="序号" type="index" show-overflow-tooltip />
+                    <el-table-column label="处理流程" prop="project_code" show-overflow-tooltip />
+                    <el-table-column label="流程步骤" prop="project_code" show-overflow-tooltip />
+                    <el-table-column label="组织名称" prop="approve_no" show-overflow-tooltip />
+                    <el-table-column label="票据编号" prop="applier" show-overflow-tooltip />
+                    <el-table-column label="收票银行" prop="payment_amount" show-overflow-tooltip />
+                    <el-table-column label="汇票类型" prop="tax" show-overflow-tooltip />
+                    <el-table-column label="汇票承兑银行" prop="tax" show-overflow-tooltip />
+                    <el-table-column label="汇票到期日期" prop="tax" show-overflow-tooltip />
+                    <el-table-column label="收票账户编码" prop="tax" show-overflow-tooltip />
+                    <el-table-column label="收票银行" prop="tax" show-overflow-tooltip />
+                    <el-table-column label="兑现日期" prop="tax" show-overflow-tooltip />
+                    <el-table-column label="兑现金额" prop="tax" show-overflow-tooltip />
+                    <el-table-column label="兑现金额大写" prop="tax" 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 { redemptionbillLists, redemptionbillDelete, redemptionbillDetail } from '@/api/redemption_bill'
+import { timeFormat } from '@/utils/util'
+
+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({
+    bill_sn: '',
+    customer_id: '',
+    invoice_type: '',
+
+})
+
+
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('pay_type,invoice_type,tax_rate,invoice_form,bill_type,contract_type')
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: redemptionbillLists,
+    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 redemptionbillDetail({ 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 redemptionbillDelete({ id })
+    getLists()
+}
+const handledetail = async (data: any) => {
+    let res = await redemptionbillDetail({ id: data.id })
+    showDtail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+
+getLists()
+</script>
+
diff --git a/src/views/financialManagement/draft/MoneyOrderTransfer/detail.vue b/src/views/financialManagement/draft/MoneyOrderTransfer/detail.vue
new file mode 100644
index 0000000..2faab17
--- /dev/null
+++ b/src/views/financialManagement/draft/MoneyOrderTransfer/detail.vue
@@ -0,0 +1,188 @@
+
+<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.contract.contract_no }}
+                            </el-form-item>
+                        </el-col>
+
+
+                        <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.custom.name
+                                }}
+                            </el-form-item>
+                        </el-col> -->
+                        <el-col :span="12">
+                            <el-form-item label="申请日期">
+                                {{ formData.apply_date
+                                }}
+                            </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.amount_daxie }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="付款方式">
+                                <dict-value :options="dictData.pay_type" :value="formData.pay_type" />
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="本次支付金额">
+                                {{ formData.payment_amount }}
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="收款银行">
+                                {{ formData.deposit_bank }}
+                            </el-form-item>
+                        </el-col>
+
+
+                        <el-col :span="12">
+                            <el-form-item label="备注">
+                                {{ formData.remark
+                                }}
+                            </el-form-item>
+                        </el-col>
+
+
+                        <el-col :span="24">
+                            <el-form-item label="附件">
+                                <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-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 formDataannex = reactive([])
+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)
+    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)
+
+        }
+    }
+
+
+}
+
+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/financialManagement/draft/MoneyOrderTransfer/edit.vue b/src/views/financialManagement/draft/MoneyOrderTransfer/edit.vue
new file mode 100644
index 0000000..cd8e49e
--- /dev/null
+++ b/src/views/financialManagement/draft/MoneyOrderTransfer/edit.vue
@@ -0,0 +1,404 @@
+<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="org_id">
+                            <el-select 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> </el-form-item></el-col>
+                    <el-col :span="8">
+                        <el-form-item label="请选择部门" prop="dept_id">
+                            <el-select 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-form-item> </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="供应商名称" prop="customer_id">
+                            <el-input v-model="customer_name" clearable placeholder="请输入供应商名称" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="供应商编码" prop="customer_id">
+                            <el-input v-model="customer_name" clearable placeholder="请输入供应商编码 " />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目名称" prop="reimburser">
+                            <el-input v-model="project_name" clearable placeholder="请输入项目名称" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目编码" prop="reimburser">
+                            <el-input v-model="project_code" clearable placeholder="请输入项目编码" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="合同名称" prop="reimburser">
+                            <el-input v-model="contract_name" clearable placeholder="请输入合同名称" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="合同编码" prop="reimburser">
+                            <el-input v-model="contract_no" clearable placeholder="请输入合同编码" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="合同类型" prop="contract_type">
+                            <el-select v-model="contract_type" clearable placeholder="请选择合同类型">
+                                <el-option v-for="(item, index) in dictData.contract_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="bill_sn">
+                            <el-input v-model="formData.bill_sn" clearable placeholder="请输入票据编号" />
+
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="开户银行" prop="reimburser">
+                            <el-input v-model="formData.reimburser" clearable placeholder="请输入开户银行" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="账户编码" prop="reimburser">
+                            <el-input v-model="formData.reimburser" clearable placeholder="请输入账户编码" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+
+                        <el-form-item label="汇票类型" prop="bill_type">
+                            <el-radio-group v-model="formData.bill_type" placeholder="请选择汇票类型">
+                                <el-radio v-for="(item, index) in dictData.bill_type" :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="draft_acceptance_bank">
+                            <el-input v-model="formData.draft_acceptance_bank" readonly clearable placeholder="请输入汇票承兑银行" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="汇票到期日期" prop="bill_due_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.bill_due_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="payment_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.payment_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="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-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                        <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="field87">
+                            <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="showDialog1" title="选择项目" width="70%">
+                    <projectDialog @customEvent="customEvent1"></projectDialog>
+                </el-dialog>
+
+                <el-dialog v-model="showDialog2" title="选择合同" width="70%">
+                    <proontractDialog @customEvent="customEvent2"></proontractDialog>
+                </el-dialog>
+
+                <el-dialog v-model="showDialog" title="选择客户" width="70%">
+                    <customDialog @customEvent="customEvent"></customDialog>
+                </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 projectDialog from '@/components/project/index.vue'
+import proontractDialog from '@/components/proontract/index.vue'
+import { transferbillAdd, transferbillEdit, transferbillDetail } from '@/api/transfer_bill'
+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 { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
+import configs from "@/config"
+import useUserStore from "@/stores/modules/user";
+
+const base_url = configs.baseUrl + configs.urlPrefix
+const userStore = useUserStore();
+const active = ref(0)
+const formDataannex = reactive([])
+const contract_name = ref('')
+const contract_no = ref('')
+const customer_name = ref('')
+const project_name = ref('')
+const project_code = ref('')
+const list1 = reactive([])
+const list2 = reactive([])
+
+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 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 amount_daxie = ref('')
+const showDialog = ref(false)
+const showDialog1 = ref(false)
+const showDialog2 = ref(false)
+
+
+
+
+
+
+const customEvent = (e: any) => {
+    formData.customer_id = e.id;
+    customer_name.value = e.name;
+    showDialog.value = false;
+};
+
+const customEvent1 = (e: any) => {
+    showDialog1.value = false;
+};
+
+
+
+//获取所有组织
+const getlist = () => {
+    getAll().then((res) => {
+        Object.assign(list1, res)
+
+    })
+}
+//获取部门
+const deptrmt = (e) => {
+    getlist1(e)
+}
+//获取所有部门
+const getlist1 = (id: any) => {
+    deptAll({ 'org_id': id }).then((res) => {
+        Object.assign(list2, res)
+    })
+}
+
+//监听输入
+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: '',
+    supplier_id: 0,
+    procurement_contract_id: 0,
+    acceptance_bill_id: 0,
+    payment_date: "",
+    amount: "",
+    amount_daxie: "",
+    remark: "",
+    annex: ""
+
+})
+
+
+// 表单验证
+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]
+        }
+    }
+    customer_name.value = data.custom.name
+    if (formData.reimbursement_amount) {
+        toChinesNum(formData.reimbursement_amount)
+    }
+
+
+
+
+}
+const getDetail = async (row: Record<string, any>) => {
+    const data = await transferbillDetail({
+        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 transferbillEdit(data)
+        : await transferbillAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+
+    getlist()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/financialManagement/draft/MoneyOrderTransfer/index.vue b/src/views/financialManagement/draft/MoneyOrderTransfer/index.vue
new file mode 100644
index 0000000..351551e
--- /dev/null
+++ b/src/views/financialManagement/draft/MoneyOrderTransfer/index.vue
@@ -0,0 +1,156 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="票据编号" prop="bill_sn">
+                    <el-input class="w-[280px]" v-model="queryParams.bill_sn" clearable placeholder="请输入票据编号" />
+                </el-form-item>
+                <el-form-item label="客户id" prop="customer_id">
+                    <el-input class="w-[280px]" v-model="queryParams.customer_id" clearable placeholder="请输入客户id" />
+                </el-form-item>
+                <el-form-item label="销售合同id" prop="contract_id">
+                    <el-select class="w-[280px]" v-model="queryParams.contract_id" clearable placeholder="请选择销售合同id">
+
+                        <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>
+                </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="序号" type="index" show-overflow-tooltip />
+                    <el-table-column label="流程步骤" prop="project_code" show-overflow-tooltip />
+                    <el-table-column label="组织名称" prop="org_name" show-overflow-tooltip />
+                    <el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
+                    <el-table-column label="项目名称" prop="contract_name" show-overflow-tooltip />
+                    <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
+                    <el-table-column label="收票日期" prop="apply_date" show-overflow-tooltip />
+                    <el-table-column label="票据编号" prop="applier" show-overflow-tooltip />
+                    <el-table-column label="开户银行" prop="payment_amount" 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="tax" show-overflow-tooltip />
+                    <el-table-column label="汇票到期日期" prop="tax" show-overflow-tooltip />
+                    <el-table-column label="付款日期" prop="payment_date" show-overflow-tooltip />
+                    <el-table-column label="余额" prop="amount" 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 { transferbillLists, transferbillDelete, transferbillDetail } from '@/api/transfer_bill'
+import { timeFormat } from '@/utils/util'
+
+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({
+    bill_sn: '',
+    customer_id: '',
+    invoice_type: '',
+
+})
+
+
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('pay_type,invoice_type,tax_rate,invoice_form,bill_type,contract_type')
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: transferbillLists,
+    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 transferbillDetail({ 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 transferbillDelete({ id })
+    getLists()
+}
+const handledetail = async (data: any) => {
+    let res = await transferbillDetail({ id: data.id })
+    showDtail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+
+getLists()
+</script>
+
diff --git a/src/views/financialManagement/reimbursement/DailyExpenses.vue b/src/views/financialManagement/reimbursement/DailyExpenses.vue
index e69de29..497b33c 100644
--- a/src/views/financialManagement/reimbursement/DailyExpenses.vue
+++ b/src/views/financialManagement/reimbursement/DailyExpenses.vue
@@ -0,0 +1,137 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+
+                <el-form-item label="报销id" prop="expense_id">
+                    <el-input class="w-[280px]" v-model="queryParams.expense_id" clearable placeholder="请输入报销id" />
+                </el-form-item>
+                <el-form-item label="费用科目id" prop="cost_subject_id">
+                    <el-select class="w-[280px]" v-model="queryParams.cost_subject_id" clearable placeholder="请选择费用科目id">
+
+                        <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>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="序号" type="index" 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="customer_name" show-overflow-tooltip />
+                    <el-table-column label="报销人" prop="reimburser" show-overflow-tooltip />
+                    <el-table-column label="报销金额" prop="reimbursement_amount" show-overflow-tooltip />
+
+                    <el-table-column label="付款方式" prop="pay_type">
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.pay_type" :value="row.pay_type" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="年份" prop="year" show-overflow-tooltip />
+                    <el-table-column label="月份" prop="month" 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="用途" 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>
+            </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 { reimbursementdetails } from '@/api/expense_reimbursement'
+import { timeFormat } from '@/utils/util'
+
+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({
+    commitor: '',
+    expense_id: '',
+    invoice_type: '',
+
+})
+
+
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('pay_type,invoice_type,tax_rate,invoice_form')
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: reimbursementdetails,
+    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 expensereimbursementDetail({ 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 expensereimbursementDelete({ id })
+    getLists()
+}
+const handledetail = async (data: any) => {
+    let res = await expensereimbursementDetail({ id: data.id })
+    showDtail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+
+getLists()
+</script>
+
diff --git a/src/views/financialManagement/reimbursement/DailyReimbursement.vue b/src/views/financialManagement/reimbursement/DailyReimbursement.vue
deleted file mode 100644
index 90eba7d..0000000
--- a/src/views/financialManagement/reimbursement/DailyReimbursement.vue
+++ /dev/null
@@ -1,185 +0,0 @@
-<template>
-    <div>
-        <el-card>
-            <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px" label-position="left">
-                <el-row :gutter="10">
-                    <el-col :span="12">
-                        <el-form-item label="报销人" prop="field101">
-                            <el-input v-model="formData.field101" placeholder="请输入报销人" clearable :style="{ width: '100%' }">
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="报销日期" prop="field102">
-                            <el-date-picker v-model="formData.field102" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                                :style="{ width: '100%' }" placeholder="请选择报销日期" clearable
-                                :disabled='true'></el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="客户名称" prop="field103">
-                            <el-input v-model="formData.field103" placeholder="点击选择客户" :disabled='true' clearable
-                                :style="{ width: '100%' }"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="付款方式" prop="field106">
-                            <el-select v-model="formData.field106" placeholder="请选择付款方式" clearable
-                                :style="{ width: '100%' }">
-                                <el-option v-for="(item, index) in field106Options" :key="index" :label="item.label"
-                                    :value="item.value" :disabled="item.disabled"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="报销金额" prop="field107">
-                            <el-input v-model="formData.field107" placeholder="系统自动计算" :disabled='true' clearable
-                                :style="{ width: '100%' }"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="报销金额大写" prop="field108">
-                            <el-input v-model="formData.field108" placeholder="系统自动计算" :disabled='true' clearable
-                                :style="{ width: '100%' }"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="收款人姓名" prop="field109">
-                            <el-input v-model="formData.field109" placeholder="请输入收款人姓名" clearable
-                                :style="{ width: '100%' }">
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="收款银行" prop="field110">
-                            <el-input v-model="formData.field110" placeholder="请输入收款银行" clearable
-                                :style="{ width: '100%' }">
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item label="收款账号" prop="field111">
-                            <el-input v-model="formData.field111" placeholder="请输入收款账号" clearable
-                                :style="{ width: '100%' }">
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item label="备注" prop="field112">
-                            <el-input v-model="formData.field112" type="textarea" placeholder="请输入备注"
-                                :autosize="{ minRows: 4, maxRows: 4 }" :style="{ width: '100%' }"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item label="附件" prop="field113">
-                            <el-upload ref="field113" :file-list="field113fileList" :action="field113Action"
-                                :before-upload="field113BeforeUpload">
-                                <el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
-                            </el-upload>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item size="large">
-                            <el-button type="primary" @click="submitForm">提交</el-button>
-                            <el-button @click="resetForm">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-            </el-form>
-        </el-card>
-    </div>
-</template>
-<script>
-export default {
-    components: {},
-    props: [],
-    data() {
-        return {
-            formData: {
-                field101: undefined,
-                field102: null,
-                field103: undefined,
-                field106: undefined,
-                field107: undefined,
-                field108: undefined,
-                field109: undefined,
-                field110: undefined,
-                field111: undefined,
-                field112: undefined,
-                field113: null,
-            },
-            rules: {
-                field101: [],
-                field102: [{
-                    required: true,
-                    message: '请选择报销日期',
-                    trigger: 'change'
-                }],
-                field103: [],
-                field106: [{
-                    required: true,
-                    message: '请选择付款方式',
-                    trigger: 'change'
-                }],
-                field107: [],
-                field108: [],
-                field109: [{
-                    required: true,
-                    message: '请输入收款人姓名',
-                    trigger: 'blur'
-                }],
-                field110: [{
-                    required: true,
-                    message: '请输入收款银行',
-                    trigger: 'blur'
-                }],
-                field111: [{
-                    required: true,
-                    message: '请输入收款账号',
-                    trigger: 'blur'
-                }],
-                field112: [],
-            },
-            field113Action: 'https://jsonplaceholder.typicode.com/posts/',
-            field113fileList: [],
-            field106Options: [{
-                "label": "选项一",
-                "value": 1
-            }, {
-                "label": "选项二",
-                "value": 2
-            }],
-        }
-    },
-    computed: {},
-    watch: {},
-    created() { },
-    mounted() { },
-    methods: {
-        submitForm() {
-            this.$refs['elForm'].validate(valid => {
-                if (!valid) return
-                // TODO 提交表单
-            })
-        },
-        resetForm() {
-            this.$refs['elForm'].resetFields()
-        },
-        field113BeforeUpload(file) {
-            let isRightSize = file.size / 1024 / 1024 < 2
-            if (!isRightSize) {
-                this.$message.error('文件大小超过 2MB')
-            }
-            return isRightSize
-        },
-    }
-}
-
-</script>
-<style>
-.el-upload__tip {
-    line-height: 1.2;
-}
-</style>
-  
\ No newline at end of file
diff --git a/src/views/financialManagement/reimbursement/detail.vue b/src/views/financialManagement/reimbursement/detail.vue
new file mode 100644
index 0000000..2faab17
--- /dev/null
+++ b/src/views/financialManagement/reimbursement/detail.vue
@@ -0,0 +1,188 @@
+
+<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.contract.contract_no }}
+                            </el-form-item>
+                        </el-col>
+
+
+                        <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.custom.name
+                                }}
+                            </el-form-item>
+                        </el-col> -->
+                        <el-col :span="12">
+                            <el-form-item label="申请日期">
+                                {{ formData.apply_date
+                                }}
+                            </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.amount_daxie }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="付款方式">
+                                <dict-value :options="dictData.pay_type" :value="formData.pay_type" />
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="本次支付金额">
+                                {{ formData.payment_amount }}
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="收款银行">
+                                {{ formData.deposit_bank }}
+                            </el-form-item>
+                        </el-col>
+
+
+                        <el-col :span="12">
+                            <el-form-item label="备注">
+                                {{ formData.remark
+                                }}
+                            </el-form-item>
+                        </el-col>
+
+
+                        <el-col :span="24">
+                            <el-form-item label="附件">
+                                <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-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 formDataannex = reactive([])
+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)
+    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)
+
+        }
+    }
+
+
+}
+
+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/financialManagement/reimbursement/edit.vue b/src/views/financialManagement/reimbursement/edit.vue
new file mode 100644
index 0000000..fb644af
--- /dev/null
+++ b/src/views/financialManagement/reimbursement/edit.vue
@@ -0,0 +1,584 @@
+<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">
+                <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="reimburser">
+                            <el-input v-model="formData.reimburser" clearable placeholder="请输入报销人" />
+
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="报销日期" prop="reimbursement_date" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.reimbursement_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="customer_id" @click="showDialog = true">
+                            <el-input v-model="customer_name" readonly clearable placeholder="请输入客户名称" />
+
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                        <el-form-item label="付款方式" prop="pay_type" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+                            <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="8">
+                        <el-form-item label="报销金额" prop="reimbursement_amount">
+                            <el-input v-model="formData.reimbursement_amount" readonly clearable placeholder="请输入报销金额" @input="amountinput" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="报销金额大写" prop="invoice_amount_daxie">
+                            <el-input v-model="invoice_amount_daxie" readonly clearable placeholder="请输入报销金额大写" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="收款人姓名" prop="payee_name" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+                            <el-input v-model="formData.payee_name" clearable placeholder="请输入收款人姓名" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="收款银行" prop="payee_bank" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+                            <el-input v-model="formData.payee_bank" clearable placeholder="请输入收款银行" />
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="收款账号" prop="payee_account" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+                            <el-input v-model="formData.payee_account" 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="请输入备注" />
+                        </el-form-item>
+                    </el-col>
+
+
+                    <el-col :span="24">
+
+                        <el-form-item label="附件" prop="field87">
+                            <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>
+                <div class="tit">报销明细</div>
+                <el-row>
+
+                    <el-table :data="tablist1">
+                        <el-table-column label="序号">
+                            <template #default="{ row }">
+                                <el-button @click="handleAdd(row)">+</el-button>
+                                <el-button @click="handleDelete(row)">-</el-button>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="一级科目" prop="name1">
+                            <template #default="{ row, $index }">
+                                <el-input v-model="row.name1" readonly @click="subjectmu(row, $index)" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="二级科目" prop="name2">
+                            <template #default="{ row }">
+                                <el-input v-model="row.name2" readonly />
+                            </template></el-table-column>
+                        <el-table-column label="用途" prop="use_to">
+                            <template #default="{ row }">
+                                <el-input v-model="row.use_to" /> </template>
+                        </el-table-column>
+                        <el-table-column label="金额" prop="amount">
+                            <template #default="{ row }">
+                                <el-input v-model="row.amount" type="number" @input="amountnum" /> </template>
+                        </el-table-column>
+
+                        <el-table-column label="备注" prop="remark">
+                            <template #default="{ row }">
+                                <el-input v-model="row.remark" /> </template>
+                        </el-table-column>
+
+
+                    </el-table>
+
+
+                </el-row>
+                <br />
+                <div class="tit">发票明细</div>
+
+                <div style="margin-bottom: 30px;">
+                    <el-table :data="tablist2">
+                        <el-table-column label="序号">
+                            <template #default="{ row }">
+                                <el-button @click="handleAdd1(row)">+</el-button>
+                                <el-button @click="handleDelete1(row)">-</el-button>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="发票类型" prop="invoice_type">
+                            <template #default="{ row }">
+                                <el-select v-model="row.invoice_type" clearable placeholder="请选择发票类型">
+                                    <el-option v-for="(item, index) in dictData.invoice_type" :key="index" :label="item.name" :value="item.value" />
+                                </el-select>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="发票号" prop="invoice_sn">
+                            <template #default="{ row }">
+                                <el-input v-model="row.invoice_sn" />
+                            </template></el-table-column>
+                        <el-table-column label="发票税率" prop="tax_rate">
+                            <template #default="{ row }">
+                                <el-select v-model="row.tax_rate" clearable placeholder="请选择发票类型">
+                                    <el-option v-for="(item, index) in dictData.tax_rate" :key="index" :label="item.name" :value="item.value" />
+                                </el-select> </template>
+                        </el-table-column>
+                        <el-table-column label="发票形式" prop="invoice_form">
+                            <template #default="{ row }">
+                                <el-select v-model="row.invoice_form" clearable placeholder="请选择发票类型">
+                                    <el-option v-for="(item, index) in dictData.invoice_form" :key="index" :label="item.name" :value="item.value" />
+                                </el-select> </template>
+                        </el-table-column>
+
+                        <el-table-column label="发票金额" prop="amount">
+                            <template #default="{ row }">
+                                <el-input v-model="row.amount" /> </template>
+                        </el-table-column>
+
+                        <el-table-column label="发票税额" prop="tax">
+                            <template #default="{ row }">
+                                <el-input v-model="row.tax" /> </template>
+                        </el-table-column>
+                        <el-table-column label="发票附件" prop="annex">
+                            <template #default="{ row, $index }">
+                                <!-- <el-input v-model="row.annex" /> -->
+                                <div>
+                                    <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="(response, file, fileList) => { return handleAvatarSuccess_four1($index, response, file, fileList) }" ref="upload">
+                                        <el-button type="primary">
+                                            上传
+                                        </el-button>
+                                    </el-upload>
+                                    <div v-if="row.annex">
+                                        <div v-for="(item, index) in row.annex" style="margin-left: 5px;display: block;">
+
+                                            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">{{ item }}</a>
+                                            <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn1(row, index)">x</span>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="发票备注" prop="remark">
+                            <template #default="{ row }">
+                                <el-input v-model="row.remark" /> </template>
+                        </el-table-column>
+
+
+
+                    </el-table>
+
+                </div>
+
+
+
+                <el-dialog v-model="showDialog1" title="选择科目" width="70%">
+                    <budgetDialog @customEvent="customEvent1"></budgetDialog>
+                </el-dialog>
+
+
+                <el-dialog v-model="showDialog" title="选择客户" width="70%">
+                    <customDialog @customEvent="customEvent"></customDialog>
+                </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 budgetDialog from '@/components/budget/index.vue'
+
+import { expensereimbursementAdd, expensereimbursementEdit, expensereimbursementDetail } from '@/api/expense_reimbursement'
+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 { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
+import configs from "@/config"
+import useUserStore from "@/stores/modules/user";
+
+const base_url = configs.baseUrl + configs.urlPrefix
+const userStore = useUserStore();
+const active = ref(0)
+const formDataannex = reactive([])
+const formDataannex1 = reactive([])
+const contract_name = ref('')
+const invoice_amount_daxie = ref('')
+const contract_no = ref('')
+const supplier_name = ref('')
+const supplier_no = ref('')
+const list1 = reactive([])
+const list2 = reactive([])
+const tablist1 = reactive([{}])
+const tablist2 = reactive([{}])
+const userInfo = userStore.userInfo
+console.log(userInfo, '222222')
+// 上传文件
+const handleAvatarSuccess_four = (
+    response,
+    uploadFile
+) => {
+    if (response.code == 0) {
+        ElMessage.error(response.msg);
+        return;
+    }
+    formDataannex.push(
+        response.data.uri
+    );
+};
+
+// 删除上传的文件
+const delFileFn = (index: number) => {
+    formDataannex.splice(index, 1)
+}
+
+// 上传文件
+const handleAvatarSuccess_four1 = (index, response, file, fileList) => {
+    if (response.code == 0) {
+        ElMessage.error(response.msg);
+        return;
+    }
+    if (!tablist2[index].annex) {
+        tablist2[index].annex = [];  // 如果 annex 不存在，先创建一个空数组
+    }
+    console.log(tablist2[index], index, tablist2)
+    // console.log(index, response)
+    tablist2[index].annex.push({ uri: response.data.uri, name: response.data.name });
+
+
+
+
+    // console.log(response.data.uri, index, tablist2)
+    // formDataannex1.push(
+    //     { uri: response.data.uri, name: response.data.name }
+    // );
+};
+
+// 删除上传的文件
+const delFileFn1 = (index: number) => {
+    // 删除附件文件
+    row.annex.splice(index, 1);
+}
+
+//金额计算
+
+const amountnum = () => {
+    // console.log(tablist1)
+    formData.reimbursement_amount = tablist1.reduce((total, item) => {
+        return total + parseInt(item.amount);
+    }, 0);
+
+    setTimeout(() => {
+        toChinesNum(formData.reimbursement_amount)
+    }, 10)
+}
+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 amount_daxie = ref('')
+const showDialog = ref(false)
+const showDialog1 = ref(false)
+const customer_name = ref('')
+const tabnum = ref(0)
+const customEvent = (e: any) => {
+    formData.customer_id = e.id;
+    customer_name.value = e.name;
+    showDialog.value = false;
+};
+
+const customEvent1 = (e: any) => {
+    tablist1[tabnum.value].name1 = e.subject1;
+    tablist1[tabnum.value].name2 = e.subject2;
+    showDialog1.value = false;
+};
+
+//报销明细赋值
+const subjectmu = (a: any, b: number) => {
+    tabnum.value = b
+    showDialog1.value = true
+}
+
+//获取所有组织
+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 amountinput = (e) => {
+    // console.log(e)
+    if (e && e > 0) {
+        invoice_amount_daxie.value = toChinesNum(e)
+    }
+}
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑日常费用报销表' : '新增日常费用报销表'
+})
+// 删除上传的文件
+const delFileFn2 = (index: number) => {
+    formDataannex2.splice(index, 1)
+}
+
+const handleAdd = (row: any) => {
+    // 在 row 后面插入一行数据
+    const index = tablist1.indexOf(row);
+    tablist1.splice(index + 1, 0, {});
+};
+
+const handleDelete = (row: any) => {
+    // 删除 row
+    const index = tablist1.indexOf(row);
+    tablist1.splice(index, 1);
+};
+const handleAdd1 = (row: any) => {
+    // 在 row 后面插入一行数据
+    const index = tablist2.indexOf(row);
+    tablist2.splice(index + 1, 0, {});
+};
+
+const handleDelete1 = (row: any) => {
+    // 删除 row
+    const index = tablist2.indexOf(row);
+    tablist2.splice(index, 1);
+};
+// 表单数据
+const formData = reactive({
+    id: '',
+    org_id: 0,
+    dept_id: 0,
+    approve_id: 0,
+    reimburser: '',
+    reimbursement_date: "",
+    customer_id: "",
+    pay_type: 0,
+    reimbursement_amount: 0,
+    payee_name: "",
+    payee_bank: "",
+    payee_account: "",
+    remark: "",
+    annex: "",
+    detail: [
+        {
+            cost_subject_id: 0,
+            use_to: "",
+            amount: 0,
+            remark: ""
+        }
+    ],
+    invoice: [
+        {
+            invoice_type: '',
+            invoice_sn: "",
+            tax_rate: "",
+            invoice_form: '',
+            amount: '',
+            tax: "",
+            annex: "",
+            remark: ""
+        }
+    ]
+
+})
+
+
+// 表单验证
+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)
+
+        }
+    }
+    if (data.detail && data.detail.length > 0) {
+        const arry1 = data.detail.map((item, i) => {
+            if (item.subject && item.subject.subject1) {
+                item.name1 = item.subject.subject1
+            }
+            if (item.subject && item.subject.subject2) {
+                item.name2 = item.subject.subject2
+            }
+
+            return item
+        })
+
+        Object.assign(tablist1, arry1)
+        console.log(arry1, '22222222')
+    }
+    if (data.invoice && data.invoice.length > 0) {
+        Object.assign(tablist2, data.invoice)
+    }
+
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    customer_name.value = data.custom.name
+    if (formData.reimbursement_amount) {
+        toChinesNum(Number(formData.reimbursement_amount))
+    }
+
+
+
+
+}
+const getDetail = async (row: Record<string, any>) => {
+    const data = await expensereimbursementDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    if (formDataannex.length > 0) {
+        formData.annex = formDataannex.map((item: any) => item.uri).toString()
+    }
+    if (tablist1.length > 0) {
+        const arr1 = tablist1.map(({ name1, name2, ...rest }) => rest)
+        Object.assign(formData.detail, arr1)
+    }
+    if (tablist2.length > 0) {
+
+
+
+        Object.assign(formData.invoice, tablist2)
+    }
+
+
+
+
+    console.log(formRef.value?.validate(), '22222222')
+    await formRef.value?.validate()
+
+
+    const data = { ...formData }
+    mode.value == 'edit'
+        ? await expensereimbursementEdit(data)
+        : await expensereimbursementAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+
+    getlist()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+formData.reimburser = userInfo.name
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/financialManagement/reimbursement/index.vue b/src/views/financialManagement/reimbursement/index.vue
new file mode 100644
index 0000000..1ba0b2b
--- /dev/null
+++ b/src/views/financialManagement/reimbursement/index.vue
@@ -0,0 +1,153 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+
+                <el-form-item label="报销id" prop="expense_id">
+                    <el-input class="w-[280px]" v-model="queryParams.expense_id" clearable placeholder="请输入报销id" />
+                </el-form-item>
+                <el-form-item label="费用科目id" prop="cost_subject_id">
+                    <el-select class="w-[280px]" v-model="queryParams.cost_subject_id" clearable placeholder="请选择费用科目id">
+
+                        <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>
+                </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="序号" type="index" show-overflow-tooltip />
+                    <el-table-column label="处理流程" prop="project_code" show-overflow-tooltip />
+                    <el-table-column label="流程步骤" prop="project_code" show-overflow-tooltip />
+                    <el-table-column label="付款单号" prop="approve_no" 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="supplier_name" show-overflow-tooltip />
+                    <el-table-column label="客户名称" prop="customer_name" show-overflow-tooltip />
+                    <el-table-column label="报销人" prop="reimburser" show-overflow-tooltip />
+                    <el-table-column label="报销金额" prop="reimbursement_amount" show-overflow-tooltip />
+                    <el-table-column label="付款方式" prop="pay_type">
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.pay_type" :value="row.pay_type" />
+                        </template>
+                    </el-table-column>
+                    <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 { expensereimbursementLists, expensereimbursementDelete, expensereimbursementDetail } from '@/api/expense_reimbursement'
+import { timeFormat } from '@/utils/util'
+
+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({
+    commitor: '',
+    expense_id: '',
+    invoice_type: '',
+
+})
+
+
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('pay_type,invoice_type,tax_rate,invoice_form')
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: expensereimbursementLists,
+    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 expensereimbursementDetail({ 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 expensereimbursementDelete({ id })
+    getLists()
+}
+const handledetail = async (data: any) => {
+    let res = await expensereimbursementDetail({ id: data.id })
+    showDtail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+
+getLists()
+</script>
+
diff --git a/src/views/paymentrequest/edit.vue b/src/views/paymentrequest/edit.vue
index b72b047..43266af 100644
--- a/src/views/paymentrequest/edit.vue
+++ b/src/views/paymentrequest/edit.vue
@@ -316,7 +316,7 @@ const formData = reactive({
     payment_plan_id: '',
     payment_natrue: '',
     pay_type: '',
-    applier: userInfo.name,
+    applier: '',
     invoice_status: '',
     amount: '',
     amount_daxie: '',
@@ -408,7 +408,7 @@ const handleClose = () => {
     emit('close')
 }
 
-
+formData.applier = userInfo.name
 
 defineExpose({
     open,
diff --git a/src/views/procurement_contract/edit.vue b/src/views/procurement_contract/edit.vue
index e48f9a8..1ab8a6a 100644
--- a/src/views/procurement_contract/edit.vue
+++ b/src/views/procurement_contract/edit.vue
@@ -2,6 +2,16 @@
     <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">
+                <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>
                     <el-col :span="8">
                         <el-form-item label="供应商名称" prop="supplier_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
@@ -28,8 +38,8 @@
                         <el-form-item label="合同编号" prop="contract_no">
                             <el-input v-model="formData.contract_no" clearable placeholder="请输入合同编号" />
                         </el-form-item> </el-col> <el-col :span="8">
-                        <el-form-item label="供应商合同号" prop="supplier_contract_no">
-                            <el-input v-model="formData.supplier_contract_no" clearable placeholder="请输入供应商合同号" />
+                        <el-form-item label="供应商合同号" prop="supplier_id">
+                            <el-input v-model="supplier_contract_no" clearable placeholder="请输入供应商合同号" />
                         </el-form-item> </el-col> <el-col :span="24">
                         <el-form-item label="合同类型" prop="contract_type">
                             <el-radio-group v-model="formData.contract_type" placeholder="请选择合同类型" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
@@ -210,6 +220,11 @@ import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import projectTable from '@/components/project/index.vue'
 import suppliertable from '@/components/supplier/index.vue'
+
+const list1 = reactive([])
+const list2 = reactive([])
+import { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
 import { apiProcurementContractAdd, apiProcurementContractEdit, apiProcurementContractDetail } from '@/api/procurement_contract'
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
@@ -227,6 +242,7 @@ const showDialog = ref(false)
 const showDialog1 = ref(false)
 const project_name = ref('')
 const project_code = ref('')
+const supplier_contract_no = ref('')
 const formDataannex = reactive([])
 import feedback from '@/utils/feedback'
 import configs from "@/config"
@@ -278,14 +294,41 @@ const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑采购合同' : '新增采购合同'
 })
 
+//获取所有组织
+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 formData = reactive({
     id: '',
+    dept_id: '',
+    org_id: '',
     supplier_id: '',
     approve_id: '',
     project_id: '',
     contract_no: '',
-    supplier_contract_no: '',
     contract_type: '',
     signing_date: '',
     pay_type: '',
@@ -341,7 +384,9 @@ const setFormData = async (data: Record<any, any>) => {
         });
         Object.assign(formDataannex, arry1)
     }
-
+    if (formData.dept_id) {
+        getlist1(formData.dept_id)
+    }
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
             //@ts-ignore
@@ -378,6 +423,7 @@ const handleSubmit = async () => {
 const open = (type = 'add') => {
     mode.value = type
     popupRef.value?.open()
+    getlist()
 }
 
 // 关闭回调
diff --git a/src/views/procurement_contract/index.vue b/src/views/procurement_contract/index.vue
index 4d68af2..447fdb5 100644
--- a/src/views/procurement_contract/index.vue
+++ b/src/views/procurement_contract/index.vue
@@ -5,8 +5,10 @@
                 <el-form-item label="供应商id" prop="supplier_id">
                     <el-input class="w-[280px]" v-model="queryParams.supplier_id" clearable placeholder="请输入供应商id" />
                 </el-form-item>
-                <el-form-item label="项目id" prop="project_id">
-                    <el-input class="w-[280px]" v-model="queryParams.project_id" clearable placeholder="请输入项目id" />
+                <el-form-item label="项目" prop="project_id">
+                    <el-select v-model="queryParams.project_id" clearable placeholder="请选择项目">
+                        <el-option v-for="(item, index) in projects" :key="index" :label="item.name" :value="parseInt(item.id)" />
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="合同编号" prop="project_id">
                     <el-input class="w-[280px]" v-model="queryParams.contract_no" clearable placeholder="请输入合同编号" />
@@ -91,6 +93,7 @@ import { useDictData } from '@/hooks/useDictOptions'
 import { apiProcurementContractLists, apiProcurementContractDelete, apiProcurementContractDetail } from '@/api/procurement_contract'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
+import { apiProjectLists } from '@/api/project'
 import EditPopup from './edit.vue'
 import DetailPopup from './detail.vue'
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
@@ -99,7 +102,7 @@ const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 const showEdit = ref(false)
 
 const showDtail = ref(false)
-
+const projects = ref([])
 // 查询条件
 const queryParams = reactive({
     supplier_id: '',
@@ -154,6 +157,14 @@ const handleDetail = async (data: any) => {
     detailRef.value?.setFormData(res)
 }
 
+//获取项目列表
+
+const projectList = async () => {
+    let res = await apiProjectLists()
+    projects.value = res.lists
+
+}
+projectList()
 getLists()
 </script>
 
diff --git a/src/views/purchaseContracts/edit.vue b/src/views/purchaseContracts/edit.vue
index 2519f03..1bc6a81 100644
--- a/src/views/purchaseContracts/edit.vue
+++ b/src/views/purchaseContracts/edit.vue
@@ -2,6 +2,16 @@
     <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">
+                <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>
                     <el-col :span="8">
                         <el-form-item label="合同编号" prop="contract_no">
@@ -224,6 +234,11 @@ import procurementTable from '@/components/procurement/index.vue'
 import { apiProcurementAdd, apiProcurementEdit, apiProcurementDetail } from '@/api/procurement_changes'
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
+import { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
+const list1 = reactive([])
+const list2 = reactive([])
+
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
@@ -284,10 +299,37 @@ const handleDelete1 = (row: any) => {
 const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑采购变更' : '新增采购变更'
 })
+//获取所有组织
+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 formData = reactive({
     id: '',
+    dept_id: '',
+    org_id: '',
     supplier_id: '',
     approve_id: '',
     procurement_contract_id: '',
@@ -355,6 +397,10 @@ const setFormData = async (data: Record<any, any>) => {
 
         }
     }
+
+    if (formData.dept_id) {
+        getlist1(formData.dept_id)
+    }
     project_name.value = data.project.name
     project_code.value = data.project.project_code
 
@@ -395,6 +441,7 @@ const handleSubmit = async () => {
 const open = (type = 'add') => {
     mode.value = type
     popupRef.value?.open()
+    getlist()
 }
 
 // 关闭回调
diff --git a/src/views/qualitycontrol/quality_specification/index.vue b/src/views/qualitycontrol/quality_specification/index.vue
index edc6fbe..fc31990 100644
--- a/src/views/qualitycontrol/quality_specification/index.vue
+++ b/src/views/qualitycontrol/quality_specification/index.vue
@@ -39,7 +39,19 @@
                     <el-table-column label="发布部门" prop="release_dept" show-overflow-tooltip />
                     <el-table-column label="发布时间" prop="release_date" show-overflow-tooltip />
                     <el-table-column label="内容" prop="content" show-overflow-tooltip />
-                    <el-table-column label="规范附件" prop="file" show-overflow-tooltip />
+                    <el-table-column label="规范附件" prop="file" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <div v-if="row.file && row.file.length > 0">
+                                <div v-for="(item, i) in row.file " :key='i'>
+                                    <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
+                                </div>
+                            </div>
+                            <div v-else>
+                                暂无文件
+                            </div>
+
+                        </template>
+                    </el-table-column>
                     <el-table-column label="操作" width="150" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['quality.quality_specification/edit']" type="primary" link @click="handleEdit(row)">
diff --git a/src/views/receiptrecord/edit.vue b/src/views/receiptrecord/edit.vue
index 64a2aa8..0d7ccbe 100644
--- a/src/views/receiptrecord/edit.vue
+++ b/src/views/receiptrecord/edit.vue
@@ -264,7 +264,7 @@ const formData = reactive({
     supplier_id: 1,
     contract_id: 1,
     invoicing_date: "",
-    commitor: userInfo.name,
+    commitor: '',
     invoice_type: '',
     invoice_no: "",
     invoice_amount: '',
@@ -361,7 +361,7 @@ const handleClose = () => {
     emit('close')
 }
 
-
+formData.commitor = userInfo.name
 
 defineExpose({
     open,
diff --git a/src/views/refund/edit.vue b/src/views/refund/edit.vue
index 7221b7a..b23a488 100644
--- a/src/views/refund/edit.vue
+++ b/src/views/refund/edit.vue
@@ -258,7 +258,7 @@ const formData = reactive({
     amount: 0,
     amount_daxie: "",
     refund_type: "",
-    refunder: userInfo.name,
+    refunder: '',
     return_total_amount: "",
     return_desc: "",
     collection_bank: "",
@@ -349,7 +349,7 @@ const handleClose = () => {
     emit('close')
 }
 
-
+formData.refunder = userInfo.name
 
 defineExpose({
     open,
diff --git a/src/views/subcontract/edit.vue b/src/views/subcontract/edit.vue
index a825b69..dd26efe 100644
--- a/src/views/subcontract/edit.vue
+++ b/src/views/subcontract/edit.vue
@@ -2,6 +2,14 @@
     <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="160px" :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>
                     <el-col :span="8">
                         <el-form-item label="合同编号" prop="contract_no" @click="showDialog = true">
@@ -137,7 +145,10 @@ const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
 const showDialog = ref(false)
-
+const list1 = reactive([])
+const list2 = reactive([])
+import { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
 const project_name = ref('')
 const project_code = ref('')
 const formDataannex = reactive([])
@@ -191,10 +202,37 @@ const delFileFn1 = (index: number) => {
 const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑分包洽商' : '新增分包洽商'
 })
+//获取所有组织
+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 formData = reactive({
     id: '',
+    dept_id: '',
+    org_id: '',
     subcontracting_contract_id: '1',
     negotiation_name: '',
     negotiation_no: '',
@@ -237,6 +275,9 @@ const setFormData = async (data: Record<any, any>) => {
         });
         Object.assign(formDataannex, arry1)
     }
+    if (formData.dept_id) {
+        getlist1(formData.dept_id)
+    }
     if (data.negotiation_basis.length > 0) {
 
         const arry1 = data.negotiation_basis.map((item: any, index: any) => {
@@ -291,6 +332,7 @@ const handleSubmit = async () => {
 const open = (type = 'add') => {
     mode.value = type
     popupRef.value?.open()
+    getlist()
 }
 
 // 关闭回调
diff --git a/src/views/subcontracting_contract/edit.vue b/src/views/subcontracting_contract/edit.vue
index 2a462eb..4e7c84f 100644
--- a/src/views/subcontracting_contract/edit.vue
+++ b/src/views/subcontracting_contract/edit.vue
@@ -2,6 +2,15 @@
     <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">
+                <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>
                     <el-col :span="8">
                         <el-form-item label="项目名称" prop="project_id" @click="showDialog = true">
@@ -236,6 +245,10 @@ const project_code = ref('')
 const formDataannex = reactive([])
 const tableData = reactive([])
 const tableData1 = reactive([])
+const list1 = reactive([])
+const list2 = reactive([])
+import { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
 import feedback from '@/utils/feedback'
 import configs from "@/config"
 const base_url = configs.baseUrl + configs.urlPrefix
@@ -283,6 +296,8 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
+    dept_id: '',
+    org_id: '',
     supplier_id: '',
     approve_id: 1,
     project_id: '',
@@ -331,7 +346,32 @@ 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>) => {
     project_name.value = data.project.name
@@ -342,6 +382,9 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
+    if (formData.dept_id) {
+        getlist1(formData.dept_id)
+    }
     if (data.annex && data.annex.length > 0) {
         const arry1 = data.annex.split(',').map((item: any, index: any) => {
             return {
@@ -386,6 +429,7 @@ const handleSubmit = async () => {
 const open = (type = 'add') => {
     mode.value = type
     popupRef.value?.open()
+    getlist()
 }
 
 // 关闭回调