From 0a5a42552a7d17b391d1655c43409b595ad6ef33 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Thu, 28 Dec 2023 14:19:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project_salary_detail.ts              |   8 +
 src/api/project_salary_payment.ts             |   4 +-
 src/components/document_examination/index.vue | 102 +++++
 .../bid_document_examination_detail/edit.vue  |  13 +-
 src/views/bid_result/edit.vue                 |  20 +-
 src/views/customer_demand/edit.vue            |   8 +-
 .../detail.vue                                |   0
 .../edit.vue                                  |   0
 .../index.vue                                 |   0
 .../detail.vue                                |   0
 .../edit.vue                                  |   0
 .../index.vue                                 |   0
 .../detail.vue                                |   0
 .../edit.vue                                  |   0
 .../index.vue                                 |   0
 .../detail.vue                                |   0
 .../edit.vue                                  |   0
 .../index.vue                                 |   0
 .../ProcurementChanges.vue                    |   0
 .../PurchaseContracts.vue                     |   0
 .../detail.vue                                |   0
 .../edit.vue                                  |   0
 .../index.vue                                 |  10 +-
 src/views/project_budget/detail.vue           | 138 ++++++
 src/views/project_budget/edit.vue             | 172 ++++++++
 src/views/project_budget/index.vue            | 174 ++++++++
 src/views/project_personnel/detail.vue        |   4 +-
 src/views/project_personnel/edit.vue          |   3 -
 src/views/project_salary/list/detail.vue      |  10 +-
 .../project_salary_detail/index.vue           |  10 +-
 src/views/project_stakeholder/index.vue       |   2 +-
 .../Subcontractors.vue                        |   0
 .../detail.vue                                |   0
 .../edit.vue                                  |   0
 .../index.vue                                 |  10 +-
 .../subcontract.vue                           |   0
 src/views/supplerManagement/list/detail.vue   | 241 -----------
 src/views/supplerManagement/list/edit.vue     | 405 ------------------
 src/views/supplerManagement/list/index.vue    | 171 --------
 src/views/supplier/detail.vue                 | 131 ++++--
 src/views/supplier/edit.vue                   | 402 +++++++++++++----
 src/views/supplier/index.vue                  |  98 +++--
 .../contact => supplier_contacts}/detail.vue  |   0
 .../contact => supplier_contacts}/edit.vue    |   0
 .../contact => supplier_contacts}/index.vue   |   0
 45 files changed, 1105 insertions(+), 1031 deletions(-)
 create mode 100644 src/api/project_salary_detail.ts
 create mode 100644 src/components/document_examination/index.vue
 rename src/views/{paymentrequest => finance_payment_apply}/detail.vue (100%)
 rename src/views/{paymentrequest => finance_payment_apply}/edit.vue (100%)
 rename src/views/{paymentrequest => finance_payment_apply}/index.vue (100%)
 rename src/views/{paymentplan => finance_payment_plan}/detail.vue (100%)
 rename src/views/{paymentplan => finance_payment_plan}/edit.vue (100%)
 rename src/views/{paymentplan => finance_payment_plan}/index.vue (100%)
 rename src/views/{receiptrecord => finance_receipt_record}/detail.vue (100%)
 rename src/views/{receiptrecord => finance_receipt_record}/edit.vue (100%)
 rename src/views/{receiptrecord => finance_receipt_record}/index.vue (100%)
 rename src/views/{refundrecord => finance_refund_record}/detail.vue (100%)
 rename src/views/{refundrecord => finance_refund_record}/edit.vue (100%)
 rename src/views/{refundrecord => finance_refund_record}/index.vue (100%)
 rename src/views/{purchaseContracts => procurement_contract_change}/ProcurementChanges.vue (100%)
 rename src/views/{purchaseContracts => procurement_contract_change}/PurchaseContracts.vue (100%)
 rename src/views/{purchaseContracts => procurement_contract_change}/detail.vue (100%)
 rename src/views/{purchaseContracts => procurement_contract_change}/edit.vue (100%)
 rename src/views/{purchaseContracts => procurement_contract_change}/index.vue (91%)
 create mode 100644 src/views/project_budget/detail.vue
 create mode 100644 src/views/project_budget/edit.vue
 create mode 100644 src/views/project_budget/index.vue
 rename src/views/{subcontract => subcontracting_contract_negotiation}/Subcontractors.vue (100%)
 rename src/views/{subcontract => subcontracting_contract_negotiation}/detail.vue (100%)
 rename src/views/{subcontract => subcontracting_contract_negotiation}/edit.vue (100%)
 rename src/views/{subcontract => subcontracting_contract_negotiation}/index.vue (90%)
 rename src/views/{subcontract => subcontracting_contract_negotiation}/subcontract.vue (100%)
 delete mode 100644 src/views/supplerManagement/list/detail.vue
 delete mode 100644 src/views/supplerManagement/list/edit.vue
 delete mode 100644 src/views/supplerManagement/list/index.vue
 rename src/views/{supplerManagement/contact => supplier_contacts}/detail.vue (100%)
 rename src/views/{supplerManagement/contact => supplier_contacts}/edit.vue (100%)
 rename src/views/{supplerManagement/contact => supplier_contacts}/index.vue (100%)

diff --git a/src/api/project_salary_detail.ts b/src/api/project_salary_detail.ts
new file mode 100644
index 0000000..2d15184
--- /dev/null
+++ b/src/api/project_salary_detail.ts
@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+
+// 工资明细列表列表
+export function projectsalaryDetailLists(params: any) {
+    return request.get({ url: '/project.project_salary_detail/lists', params })
+}
+
+
diff --git a/src/api/project_salary_payment.ts b/src/api/project_salary_payment.ts
index 3309334..b590116 100644
--- a/src/api/project_salary_payment.ts
+++ b/src/api/project_salary_payment.ts
@@ -28,4 +28,6 @@ export function projectsalarypaymentDetail(params: any) {
 //获取所有工资付款记录
 export function getAllProjectRoles(params: any) {
     return request.post({ url: '/project.project_salary_payment/getAllProjectRoles', params })
-}
\ No newline at end of file
+}
+
+
diff --git a/src/components/document_examination/index.vue b/src/components/document_examination/index.vue
new file mode 100644
index 0000000..6024956
--- /dev/null
+++ b/src/components/document_examination/index.vue
@@ -0,0 +1,102 @@
+<template>
+    <div>
+        <el-card class="!border-none" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="查询" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.contract_no" clearable placeholder="请输入内容" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div class="mt-4">
+                <el-table :data="pager.lists" @cell-click="handleCurrentChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="序号" type="index" width="55" />
+                    <el-table-column label="流程编号" prop="supplier_name" show-overflow-tooltip />
+                    <el-table-column label="组织名称" prop="project_name" show-overflow-tooltip />
+                    <el-table-column label="部门名称" prop="contract_no" show-overflow-tooltip />
+                    <el-table-column label="客户名称" prop="contract_no" show-overflow-tooltip />
+                    <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
+                    <el-table-column label="项目编码" prop="project_name" show-overflow-tooltip />
+                    <el-table-column label="标书编号" prop="contract_no" show-overflow-tooltip />
+                    <el-table-column label="购买人员" prop="pay_date" show-overflow-tooltip />
+                    <el-table-column label="招标公司名称" prop="amount" show-overflow-tooltip />
+                    <el-table-column label="投标公司名称" prop="refunder" show-overflow-tooltip />
+                    <el-table-column label="投标时间" prop="refunder" show-overflow-tooltip />
+                    <el-table-column label="招标方式" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="投标地址" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="是否需要保证金" prop="is_need_deposit">
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.whether_status" :value="row.is_need_deposit" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="保证金金额" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="开标日期" prop="bid_opening_date" show-overflow-tooltip />
+                    <el-table-column label="保证金退还时间" prop="deposit_refund_time" show-overflow-tooltip />
+                    <el-table-column label="招标项目概况" prop="bidding_project_overview" show-overflow-tooltip />
+                    <el-table-column label="项目简介" prop="project_introduction" show-overflow-tooltip />
+                    <el-table-column label="技术协议偏差" prop="technical_protocol_deviation" show-overflow-tooltip />
+                    <el-table-column label="协议偏差处理方案" prop="protocol_deviation_handling_plan" show-overflow-tooltip />
+                    <el-table-column label="总金额" prop="business_review_total_amount" show-overflow-tooltip />
+                    <el-table-column label="税率" prop="tax_rate">
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.tax_rate" :value="row.tax_rate" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="付款方式" prop="pay_type">
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.pay_type" :value="row.pay_type" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="付款比例" prop="pay_rate" show-overflow-tooltip />
+                    <el-table-column label="商务合同偏差" prop="business_contract_deviation" show-overflow-tooltip />
+                    <el-table-column label="偏差处理方案" prop="business_contract_deviation_handling_plan" show-overflow-tooltip />
+                </el-table>
+
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+    </div>
+</template>
+  
+<script lang="ts" setup>
+import { usePaging } from "@/hooks/usePaging"
+import { useDictData } from "@/hooks/useDictOptions"
+import {
+    apiBidDocumentExaminationLists
+} from '@/api/bid_document_examination'
+
+import { defineEmits } from "vue"
+import { timeFormat } from '@/utils/util'
+
+// 查询条件
+const queryParams = reactive({
+    status: 1,
+});
+
+// 获取字典数据
+const { dictData } = useDictData('tax_rate,pay_type,whether_status')
+// 选中数据
+const emits = defineEmits(["customEvent"]);
+
+// 选中数据子父传递
+const handleCurrentChange = (value: any) => {
+    emits("customEvent", value);
+};
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiBidDocumentExaminationLists,
+    params: queryParams,
+
+});
+
+getLists();
+</script>
\ No newline at end of file
diff --git a/src/views/bid_document_examination_detail/edit.vue b/src/views/bid_document_examination_detail/edit.vue
index 20d6312..462d862 100644
--- a/src/views/bid_document_examination_detail/edit.vue
+++ b/src/views/bid_document_examination_detail/edit.vue
@@ -5,20 +5,20 @@
                 <el-row>
                     <el-col :span="8">
                         <el-form-item label="项目名称" prop="bid_document_examination_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" @click="showDialog = true">
-                            <el-input v-model="project_name" readonly clearable placeholder="请输入" />
+                            <el-input v-model="project_name" readonly clearable placeholder="请选择项目" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="项目编码" prop="bid_document_examination_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="project_code" clearable readonly placeholder="请输入" />
+                            <el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
                         </el-form-item></el-col>
                     <el-col :span="8">
                         <el-form-item label="客户名称" prop="bid_document_examination_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="matsname" clearable readonly placeholder="请输入" />
+                            <el-input v-model="matsname" clearable disabled placeholder="系统自动填写" />
                         </el-form-item></el-col><el-col :span="8">
                         <!-- @click="showDialog1 = true" -->
                         <el-form-item label="产品id" prop="product_id">
-                            <el-input v-model="formData.product_id" readonly clearable placeholder="请输入产品id" />
+                            <el-input v-model="formData.product_id" readonly clearable placeholder="请输入产品" />
                         </el-form-item></el-col><el-col :span="8">
                         <el-form-item label="产品数量" prop="product_num">
                             <el-input v-model="formData.product_num" clearable placeholder="请输入产品数量" />
@@ -46,7 +46,6 @@
         </popup>
         <el-dialog v-model="showDialog" title="选择标书" width="70%">
             <biddocumentTable @customEvent="customEvent"></biddocumentTable>
-
         </el-dialog>
         <el-dialog v-model="showDialog1" title="选择产品" width="70%">
             <prodctTable @customEvent="customEvent1"></prodctTable>
@@ -106,8 +105,8 @@ const formRules = reactive<any>({
 //获取值
 const customEvent = (e: any) => {
     formData.bid_document_examination_id = e.id;
-    matsname.value = e.person
-    project_name.value = e.custom_name
+    matsname.value = e.customer_name
+    project_name.value = e.project_name
     project_code.value = e.project_code
     showDialog.value = false;
 
diff --git a/src/views/bid_result/edit.vue b/src/views/bid_result/edit.vue
index 46e4b70..c3d06c9 100644
--- a/src/views/bid_result/edit.vue
+++ b/src/views/bid_result/edit.vue
@@ -2,17 +2,17 @@
     <div class="edit-popup">
         <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="标书审查id" prop="bid_document_examination_id">
-                    <el-input v-model="formData.bid_document_examination_id" clearable placeholder="请输入标书审查id" />
+                <el-form-item label="标书审查id" prop="bid_document_examination_id" @click="showDialog = true">
+                    <el-input v-model="formData.bid_document_examination_id" clearable placeholder="点击选择标书评审(可以为空)" />
                 </el-form-item>
                 <el-form-item label="项目名称" prop="project_id">
-                    <el-input v-model="project_name" readonly clearable placeholder="请选择项目" />
+                    <el-input v-model="project_name" clearable disabled placeholder="系统自动填写" />
                 </el-form-item>
                 <el-form-item label="项目编码" prop="project_id">
-                    <el-input v-model="project_code" readonly clearable placeholder="请选择项目" />
+                    <el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
                 </el-form-item>
                 <el-form-item label="客户名称" prop="project_id">
-                    <el-input v-model="project_matername" readonly clearable placeholder="请选择项目" />
+                    <el-input v-model="project_matername" clearable disabled placeholder="系统自动填写" />
                 </el-form-item>
                 <el-form-item label="是否中标" prop="is_successful">
                     <el-input v-model="formData.is_successful" clearable placeholder="请输入是否中标" />
@@ -34,21 +34,18 @@
                 </el-form-item>
             </el-form>
         </popup>
-        <el-dialog v-model="showDialog" title="选择标书" width="70%">
+        <el-dialog v-model="showDialog" title="选择标书审查" width="70%">
             <biddocumentTable @customEvent="customEvent"></biddocumentTable>
 
         </el-dialog>
-        <el-dialog v-model="showDialog1" title="选择产品" width="70%">
-            <prodctTable @customEvent="customEvent1"></prodctTable>
-        </el-dialog>
+
     </div>
 </template>
 
 <script lang="ts" setup name="bidResultEdit">
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
-import biddocumentTable from "@/components/biddocument/index.vue"
-import prodctTable from "@/components/product/index.vue"
+import biddocumentTable from "@/components/document_examination/index.vue"
 import { apiBidResultAdd, apiBidResultEdit, apiBidResultDetail } from '@/api/bid_result'
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
@@ -65,6 +62,7 @@ const mode = ref('add')
 const project_matername = ref('')
 const project_name = ref('')
 const project_code = ref('')
+const showDialog = ref(false)
 // 弹窗标题
 const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑投标结果' : '新增投标结果'
diff --git a/src/views/customer_demand/edit.vue b/src/views/customer_demand/edit.vue
index 23ec09d..a36b3b0 100644
--- a/src/views/customer_demand/edit.vue
+++ b/src/views/customer_demand/edit.vue
@@ -12,16 +12,16 @@
                         <el-option v-for="(item, index) in jobs" :key="index" :label="item.name" :value="parseInt(item.id)" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="项目名称" prop="project_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                    <el-input v-model="project_name" clearable placeholder="请输入项目id" />
+                <el-form-item label="项目名称" prop="project_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+                    <el-input v-model="project_name" clearable placeholder="请选择项目" />
                 </el-form-item>
                 <el-form-item label="项目编码" prop="project_id">
                     <el-input v-model="project_code
-                        " clearable placeholder="请输入项目id" />
+                        " clearable disabled placeholder="系统自动填写" />
                 </el-form-item>
                 <el-form-item label="客户名称" prop="project_id">
                     <el-input v-model="custom_name
-                        " clearable placeholder="请输入项目id" />
+                        " clearable disabled placeholder="系统自动填写" />
                 </el-form-item>
                 <el-form-item label="需求主题" prop="theme">
                     <el-input v-model="formData.theme" clearable placeholder="请输入需求主题" />
diff --git a/src/views/paymentrequest/detail.vue b/src/views/finance_payment_apply/detail.vue
similarity index 100%
rename from src/views/paymentrequest/detail.vue
rename to src/views/finance_payment_apply/detail.vue
diff --git a/src/views/paymentrequest/edit.vue b/src/views/finance_payment_apply/edit.vue
similarity index 100%
rename from src/views/paymentrequest/edit.vue
rename to src/views/finance_payment_apply/edit.vue
diff --git a/src/views/paymentrequest/index.vue b/src/views/finance_payment_apply/index.vue
similarity index 100%
rename from src/views/paymentrequest/index.vue
rename to src/views/finance_payment_apply/index.vue
diff --git a/src/views/paymentplan/detail.vue b/src/views/finance_payment_plan/detail.vue
similarity index 100%
rename from src/views/paymentplan/detail.vue
rename to src/views/finance_payment_plan/detail.vue
diff --git a/src/views/paymentplan/edit.vue b/src/views/finance_payment_plan/edit.vue
similarity index 100%
rename from src/views/paymentplan/edit.vue
rename to src/views/finance_payment_plan/edit.vue
diff --git a/src/views/paymentplan/index.vue b/src/views/finance_payment_plan/index.vue
similarity index 100%
rename from src/views/paymentplan/index.vue
rename to src/views/finance_payment_plan/index.vue
diff --git a/src/views/receiptrecord/detail.vue b/src/views/finance_receipt_record/detail.vue
similarity index 100%
rename from src/views/receiptrecord/detail.vue
rename to src/views/finance_receipt_record/detail.vue
diff --git a/src/views/receiptrecord/edit.vue b/src/views/finance_receipt_record/edit.vue
similarity index 100%
rename from src/views/receiptrecord/edit.vue
rename to src/views/finance_receipt_record/edit.vue
diff --git a/src/views/receiptrecord/index.vue b/src/views/finance_receipt_record/index.vue
similarity index 100%
rename from src/views/receiptrecord/index.vue
rename to src/views/finance_receipt_record/index.vue
diff --git a/src/views/refundrecord/detail.vue b/src/views/finance_refund_record/detail.vue
similarity index 100%
rename from src/views/refundrecord/detail.vue
rename to src/views/finance_refund_record/detail.vue
diff --git a/src/views/refundrecord/edit.vue b/src/views/finance_refund_record/edit.vue
similarity index 100%
rename from src/views/refundrecord/edit.vue
rename to src/views/finance_refund_record/edit.vue
diff --git a/src/views/refundrecord/index.vue b/src/views/finance_refund_record/index.vue
similarity index 100%
rename from src/views/refundrecord/index.vue
rename to src/views/finance_refund_record/index.vue
diff --git a/src/views/purchaseContracts/ProcurementChanges.vue b/src/views/procurement_contract_change/ProcurementChanges.vue
similarity index 100%
rename from src/views/purchaseContracts/ProcurementChanges.vue
rename to src/views/procurement_contract_change/ProcurementChanges.vue
diff --git a/src/views/purchaseContracts/PurchaseContracts.vue b/src/views/procurement_contract_change/PurchaseContracts.vue
similarity index 100%
rename from src/views/purchaseContracts/PurchaseContracts.vue
rename to src/views/procurement_contract_change/PurchaseContracts.vue
diff --git a/src/views/purchaseContracts/detail.vue b/src/views/procurement_contract_change/detail.vue
similarity index 100%
rename from src/views/purchaseContracts/detail.vue
rename to src/views/procurement_contract_change/detail.vue
diff --git a/src/views/purchaseContracts/edit.vue b/src/views/procurement_contract_change/edit.vue
similarity index 100%
rename from src/views/purchaseContracts/edit.vue
rename to src/views/procurement_contract_change/edit.vue
diff --git a/src/views/purchaseContracts/index.vue b/src/views/procurement_contract_change/index.vue
similarity index 91%
rename from src/views/purchaseContracts/index.vue
rename to src/views/procurement_contract_change/index.vue
index 5a03082..8737a5d 100644
--- a/src/views/purchaseContracts/index.vue
+++ b/src/views/procurement_contract_change/index.vue
@@ -32,13 +32,13 @@
             </el-form>
         </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['project.project/add']" type="primary" @click="handleAdd">
+            <el-button v-perms="['procurement_contract_change.procurement_contract_change/add']" type="primary" @click="handleAdd">
                 <template #icon>
                     <icon name="el-icon-Plus" />
                 </template>
                 新增
             </el-button>
-            <el-button v-perms="['project.project/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+            <el-button v-perms="['procurement_contract_change.procurement_contract_change/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
                 删除
             </el-button>
 
@@ -82,13 +82,13 @@
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
                     <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['project.project/edit']" type="primary" link @click="handleEdit(row)">
+                            <el-button v-perms="['procurement_contract_change.procurement_contract_change/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button v-perms="['project.project/delete']" type="danger" link @click="handleDelete(row.id)">
+                            <el-button v-perms="['procurement_contract_change.procurement_contract_change/delete']" type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
-                            <el-button v-perms="['project.project/detail']" link @click="handledetail(row)">
+                            <el-button v-perms="['procurement_contract_change.procurement_contract_change/detail']" link @click="handledetail(row)">
                                 详情
                             </el-button>
                         </template>
diff --git a/src/views/project_budget/detail.vue b/src/views/project_budget/detail.vue
new file mode 100644
index 0000000..f307ebb
--- /dev/null
+++ b/src/views/project_budget/detail.vue
@@ -0,0 +1,138 @@
+
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" title="项目费用模板详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="120px">
+                <el-card class="mb-2">
+                    <el-row>
+                        <el-col :span="12">
+                            <el-form-item label="项目类型">
+                                {{ formData.project_type_name
+                                }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="科目编码">
+                                {{ formData.subject_code
+                                }}
+                            </el-form-item>
+                        </el-col> <el-col :span="12">
+                            <el-form-item label="一级科目">
+                                {{ formData.first_level_subject }}
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="二级科目">
+                                {{ formData.second_level_subject }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="三级科目">
+                                {{ formData.third_level_subject }}
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="单位">
+                                {{ formData.unit
+                                }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="是否属于差旅科目">
+                                {{ formData.is_travel == 1 ? '是' : '否' }}
+                            </el-form-item>
+                        </el-col>
+
+
+                    </el-row>
+                </el-card>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiCustomDetail } from '@/api/custom'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+
+const datas = reactive({
+    provinceOptions: [],
+    cityOptions: [],
+    areaOptions: [],
+});
+
+
+// 表单数据
+const formData = reactive({
+
+})
+
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    Object.assign(formData, data)
+
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiCustomDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    popupRef.value?.close()
+
+}
+
+//打开弹窗
+const open = () => {
+    console.log('1111111')
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+
+
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
+<style lang="scss">
+.tit {
+    font-size: 1.2em;
+    margin-bottom: 10px;
+}
+</style>
diff --git a/src/views/project_budget/edit.vue b/src/views/project_budget/edit.vue
new file mode 100644
index 0000000..c3e2eb2
--- /dev/null
+++ b/src/views/project_budget/edit.vue
@@ -0,0 +1,172 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="项目类型" prop="project_id" @click="showDialog = true">
+                            <el-select class="w-[280px]" v-model="formData.project_type_id" clearable placeholder="请选择项目类型">
+                                <el-option label="全部" value=""></el-option>
+                                <el-option v-for="(item, index) in list" :key="index" :label="item.name" :value="parseInt(item.id)" />
+                            </el-select>
+                        </el-form-item> </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="科目编码" prop="formData.subject_code">
+                            <el-input v-model="formData.subject_code" clearable placeholder="请输入科目编码" />
+                        </el-form-item> </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="一级科目" prop="first_level_subject">
+                            <el-input v-model="formData.first_level_subject" clearable placeholder="请输入一级科目" />
+                        </el-form-item> </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="二级科目" prop="second_level_subject">
+                            <el-input v-model="formData.second_level_subject" clearable placeholder="请输入二级科目" />
+                        </el-form-item> </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="三级科目" prop="third_level_subject">
+                            <el-input v-model="formData.third_level_subject" clearable placeholder="请输入三级科目" />
+                        </el-form-item> </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="单位" prop="unit">
+                            <el-input v-model="formData.unit" clearable placeholder="请输入单位" />
+                        </el-form-item> </el-col>
+
+
+                    <el-col :span="8">
+                        <el-form-item label="差旅科目" prop="is_travel">
+                            <el-select class="w-[280px]" v-model="formData.is_travel" clearable placeholder="请选择的是否属于差旅科目">
+
+                                <el-option v-for="(item, index) in list1" :key="index" :label="item.name" :value="parseInt(item.id)" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+
+
+
+
+
+                </el-row>
+
+            </el-form>
+        </popup>
+
+
+    </div>
+</template>
+
+<script lang="ts" setup name="procurementContractEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiProjectcostAdd, apiProjectcostEdit, apiProjectcostDetail } from '@/api/project_cost_temp_set'
+import { getAllProjectTypes } from '@/api/projecttype'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+const list = ref([])
+const list1 = ref([{
+    name: '是',
+    id: 1
+},
+{
+    name: '否',
+    id: 2
+}])
+const showDialog = ref(false)
+const project_name = ref('')
+const project_code = ref('')
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑项目WBS设置' : '新增项目WBS设置'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    subject_code: '',
+    project_type_id: '',
+    first_level_subject: '',
+    second_level_subject: '',
+    third_level_subject: '',
+    unit: '',
+    is_travel: '',
+
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+
+})
+//获取项目类型
+const getlist = () => {
+    getAllProjectTypes().then((res) => {
+
+        list.value = res
+    })
+}
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+
+
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiProjectcostDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiProjectcostEdit(data)
+        : await apiProjectcostAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+getlist()
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/project_budget/index.vue b/src/views/project_budget/index.vue
new file mode 100644
index 0000000..517633a
--- /dev/null
+++ b/src/views/project_budget/index.vue
@@ -0,0 +1,174 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="项目类型名称" prop="project_type_name">
+                    <el-input class="w-[280px]" v-model="queryParams.project_type_name" clearable placeholder="请输入项目类型名称" />
+                </el-form-item>
+                <el-form-item label="科目编码" prop="subject_code">
+                    <el-input class="w-[280px]" v-model="queryParams.subject_code" clearable placeholder="请输入科目编码" />
+                </el-form-item>
+                <el-form-item label="一级科目" prop="first_level_subject">
+                    <el-input class="w-[280px]" v-model="queryParams.first_level_subject" clearable placeholder="请输入一级科目" />
+                </el-form-item>
+                <el-form-item label="二级科目" prop="second_level_subject">
+                    <el-input class="w-[280px]" v-model="queryParams.second_level_subject" clearable placeholder="请输入二级科目" />
+                </el-form-item>
+                <el-form-item label="三级科目" prop="third_level_subject">
+                    <el-input class="w-[280px]" v-model="queryParams.third_level_subject" clearable placeholder="请输入二级科目" />
+                </el-form-item>
+                <el-form-item label="单位" prop="unit">
+                    <el-input class="w-[280px]" v-model="queryParams.unit" clearable placeholder="请输入单位" />
+                </el-form-item>
+                <el-form-item label="差旅科目" prop="unit">
+                    <el-select class="w-[280px]" v-model="queryParams.is_travel" clearable placeholder="请选择的是否属于差旅科目">
+
+                        <el-option v-for="(item, index) in list1" :key="index" :label="item.name" :value="parseInt(item.id)" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['project.project/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['project.project/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+                删除
+            </el-button>
+
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="项目类型" prop="project_type_name" show-overflow-tooltip />
+                    <el-table-column label="科目编码" prop="subject_code" show-overflow-tooltip />
+                    <el-table-column label="一级科目" prop="first_level_subject" show-overflow-tooltip />
+                    <el-table-column label="二级科目" prop="second_level_subject" show-overflow-tooltip />
+                    <el-table-column label="三级科目" prop="third_level_subject" show-overflow-tooltip />
+                    <el-table-column label="单位" prop="unit" show-overflow-tooltip />
+                    <el-table-column label="差旅科目" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.is_travel == 1 ? '是' : '否' }}
+
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作" width="150" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['project.project/edit']" type="primary" link @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['project.project/delete']" type="danger" link @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                            <el-button v-perms="['project.project/detail']" link @click="handledetail(row)">
+                                详情
+                            </el-button>
+
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detail-popup v-if="showDtail" ref="detailRef" :dict-data="dictData" @close="showDtail = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="projectLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiProjectcostLists, apiProjectcostDelete, apiProjectcostDetail } from '@/api/project_cost_temp_set'
+import { timeFormat } from '@/utils/util'
+import { getAllProjectTypes } from '@/api/projecttype'
+const protype = reactive([])
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+import DetailPopup from './detail.vue'
+const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+const showDtail = ref(false)
+const list1 = ref([{
+    name: '是',
+    id: 1
+},
+{
+    name: '否',
+    id: 2
+}])
+// 查询条件
+const queryParams = reactive({
+    project_type_name: '',
+    subject_code: '',
+    first_level_subject: '',
+    second_level_subject: '',
+    third_level_subject: '',
+    unit: '',
+    is_travel: '',
+
+})
+
+
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiProjectcostLists,
+    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 apiProjectcostDetail({ 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 apiProjectcostDelete({ id })
+    getLists()
+}
+const handledetail = async (data: any) => {
+    let res = await apiProjectcostDetail({ id: data.id })
+    showDtail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+
+getLists()
+</script>
+
diff --git a/src/views/project_personnel/detail.vue b/src/views/project_personnel/detail.vue
index e7e0b2b..5281c88 100644
--- a/src/views/project_personnel/detail.vue
+++ b/src/views/project_personnel/detail.vue
@@ -159,8 +159,8 @@
                             <el-table-column label="工种" prop="person_work_type_text" show-overflow-tooltip />
                             <el-table-column label="总收入" prop="total_income" show-overflow-tooltip />
                             <el-table-column label="总支出" prop="total_pay_out" show-overflow-tooltip />
-                            <el-table-column label="未发放" prop="deposit_bank" show-overflow-tooltip />
-                            <el-table-column label="本次付款金额" prop="balance" show-overflow-tooltip />
+                            <el-table-column label="未发放" prop="balance" show-overflow-tooltip />
+                            <el-table-column label="本次付款金额" prop="apply_amount" show-overflow-tooltip />
                             <el-table-column label="备注" prop="remark" show-overflow-tooltip />
 
                         </el-table>
diff --git a/src/views/project_personnel/edit.vue b/src/views/project_personnel/edit.vue
index 28005d0..7945f4a 100644
--- a/src/views/project_personnel/edit.vue
+++ b/src/views/project_personnel/edit.vue
@@ -67,9 +67,6 @@
                             <material-picker v-model="formData.bank_card" />
                         </el-form-item>
                     </el-col>
-
-
-
                     <el-col :span="8">
                         <el-form-item label="银行卡号" prop="bank_no">
                             <el-input v-model="formData.bank_no" clearable placeholder="请输入银行卡号" />
diff --git a/src/views/project_salary/list/detail.vue b/src/views/project_salary/list/detail.vue
index 5edf155..533f587 100644
--- a/src/views/project_salary/list/detail.vue
+++ b/src/views/project_salary/list/detail.vue
@@ -83,23 +83,19 @@
                         </el-col>
 
                     </el-row>
+
+                    <div style="margin: 10px 0;">支付明细</div>
                     <div>
                         <el-table :data="formData.payment_detail">
-
                             <el-table-column label="序号" type="index" show-overflow-tooltip />
-
-
-
                             <el-table-column label="姓名" prop="person_name" show-overflow-tooltip />
                             <el-table-column label="工种" prop="person_work_type_text" show-overflow-tooltip />
                             <el-table-column label="银行卡号" prop="person_bank_no" show-overflow-tooltip />
                             <el-table-column label="总收入" prop="total_income" show-overflow-tooltip />
                             <el-table-column label="总支出" prop="total_pay_out" show-overflow-tooltip />
-                            <el-table-column label="未发放" prop="total_amount_uppercase" show-overflow-tooltip />
+                            <el-table-column label="未发放" prop="balance" show-overflow-tooltip />
                             <el-table-column label="本次申请付款金额" prop="apply_amount" show-overflow-tooltip />
                             <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-
-
                         </el-table>
                     </div>
                 </el-card>
diff --git a/src/views/project_salary/project_salary_detail/index.vue b/src/views/project_salary/project_salary_detail/index.vue
index a6849e9..3439f49 100644
--- a/src/views/project_salary/project_salary_detail/index.vue
+++ b/src/views/project_salary/project_salary_detail/index.vue
@@ -97,7 +97,7 @@
 <script lang="ts" setup name="projectLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { insurancemanagementLists, insurancemanagementDelete, insurancemanagementDetail } from '@/api/project_salary'
+import { projectsalaryDetailLists, projectsalaryDetailDelete, projectsalaryDetailDetail } from '@/api/project_salary_detail'
 import { timeFormat } from '@/utils/util'
 import { getAllProjectTypes } from '@/api/projecttype'
 const protype = reactive([])
@@ -134,7 +134,7 @@ const handleSelectionChange = (val: any[]) => {
 const { dictData } = useDictData('labor_contract_status,labor_contract_type,labor_contract_name')
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: insurancemanagementLists,
+    fetchFun: projectsalaryDetailLists,
     params: queryParams
 })
 
@@ -149,7 +149,7 @@ const handleAdd = async () => {
 // 编辑
 const handleEdit = async (data: any) => {
     console.log(data.id)
-    let res = await insurancemanagementDetail({ id: data.id })
+    let res = await projectsalaryDetailDetail({ id: data.id })
     showEdit.value = true
     await nextTick()
     editRef.value?.open('edit')
@@ -159,11 +159,11 @@ const handleEdit = async (data: any) => {
 // 删除
 const handleDelete = async (id: number | any[]) => {
     await feedback.confirm('确定要删除？')
-    await insurancemanagementDelete({ id })
+    await projectsalaryDetailDelete({ id })
     getLists()
 }
 const handledetail = async (data: any) => {
-    let res = await insurancemanagementDetail({ id: data.id })
+    let res = await projectsalaryDetailDetail({ id: data.id })
     showDtail.value = true
     await nextTick()
     detailRef.value?.open()
diff --git a/src/views/project_stakeholder/index.vue b/src/views/project_stakeholder/index.vue
index 3bf4d5b..13ea0ed 100644
--- a/src/views/project_stakeholder/index.vue
+++ b/src/views/project_stakeholder/index.vue
@@ -9,7 +9,7 @@
                     <el-input class="w-[280px]" v-model="queryParams.phone" clearable placeholder="请输入电话" />
                 </el-form-item>
                 <el-form-item label="项目名称" prop="project_name">
-                    <el-input class="w-[280px]" v-model="queryParams.project_name" clearable placeholder="请输入人员名称" />
+                    <el-input class="w-[280px]" v-model="queryParams.project_name" clearable placeholder="请输入项目名称" />
                 </el-form-item>
                 <el-form-item label="身份" prop="identity">
                     <el-select class="w-[280px]" v-model="queryParams.identity" clearable placeholder="请选择身份">
diff --git a/src/views/subcontract/Subcontractors.vue b/src/views/subcontracting_contract_negotiation/Subcontractors.vue
similarity index 100%
rename from src/views/subcontract/Subcontractors.vue
rename to src/views/subcontracting_contract_negotiation/Subcontractors.vue
diff --git a/src/views/subcontract/detail.vue b/src/views/subcontracting_contract_negotiation/detail.vue
similarity index 100%
rename from src/views/subcontract/detail.vue
rename to src/views/subcontracting_contract_negotiation/detail.vue
diff --git a/src/views/subcontract/edit.vue b/src/views/subcontracting_contract_negotiation/edit.vue
similarity index 100%
rename from src/views/subcontract/edit.vue
rename to src/views/subcontracting_contract_negotiation/edit.vue
diff --git a/src/views/subcontract/index.vue b/src/views/subcontracting_contract_negotiation/index.vue
similarity index 90%
rename from src/views/subcontract/index.vue
rename to src/views/subcontracting_contract_negotiation/index.vue
index b9d0632..5b5cbed 100644
--- a/src/views/subcontract/index.vue
+++ b/src/views/subcontracting_contract_negotiation/index.vue
@@ -32,13 +32,13 @@
             </el-form>
         </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['project.project/add']" type="primary" @click="handleAdd">
+            <el-button v-perms="['contract.subcontracting_contract_negotiation/add']" type="primary" @click="handleAdd">
                 <template #icon>
                     <icon name="el-icon-Plus" />
                 </template>
                 新增
             </el-button>
-            <el-button v-perms="['project.project/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+            <el-button v-perms="['contract.subcontracting_contract_negotiation/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
                 删除
             </el-button>
 
@@ -67,13 +67,13 @@
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
                     <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['subcontractor.subcontractor/edit']" type="primary" link @click="handleEdit(row)">
+                            <el-button v-perms="['contract.subcontracting_contract_negotiation/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button v-perms="['subcontractor.subcontractor/delete']" type="danger" link @click="handleDelete(row.id)">
+                            <el-button v-perms="['contract.subcontracting_contract_negotiation/delete']" type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
-                            <el-button v-perms="['subcontractor.subcontractor/detail']" link @click="handledetail(row)">
+                            <el-button v-perms="['contract.subcontracting_contract_negotiation/detail']" link @click="handledetail(row)">
                                 详情
                             </el-button>
                         </template>
diff --git a/src/views/subcontract/subcontract.vue b/src/views/subcontracting_contract_negotiation/subcontract.vue
similarity index 100%
rename from src/views/subcontract/subcontract.vue
rename to src/views/subcontracting_contract_negotiation/subcontract.vue
diff --git a/src/views/supplerManagement/list/detail.vue b/src/views/supplerManagement/list/detail.vue
deleted file mode 100644
index d4a321d..0000000
--- a/src/views/supplerManagement/list/detail.vue
+++ /dev/null
@@ -1,241 +0,0 @@
-
-
-
-<template>
-    <div class="detail-popup">
-        <popup ref="popupRef" title="供应商管理详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="160px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="建档人">
-
-                                {{ formData.custom_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="组织">
-                                {{ formData.org.name }}
-
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="部门">
-                                {{ formData.dept.name
-                                }}
-
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="供应商编码">
-                                {{ formData.supplier_code
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="供应商名称">
-                                {{ formData.supplier_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="供应商简介">
-                                {{ formData.supplier_introduction }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="品牌类别">
-                                {{ formData.brand_category }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="供应商照片" prop="photos">
-                                <div v-if="formData.photos && formData.photos.length > 0">
-                                    <material-picker v-model="formData.photos" />
-                                </div>
-                                <div v-else>暂无供应商照片</div>
-
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="供应商分组">
-                                <dict-value :options="dictData.supplier_group" :value="formData.group_id" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="供应商分类">
-                                <dict-value :options="dictData.supplier_category" :value="formData.category_id" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="供应商等级">
-                                <dict-value :options="dictData.supplier_grade" :value="formData.grade" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="联系人">
-                                {{ formData.contacts }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="性别">
-                                <dict-value :options="dictData.sex" :value="formData.contacts_sex" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="出生日期">
-                                {{ formData.birthday }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="电话号码">
-                                {{ formData.competitor }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="开标日期">
-                                {{ formData.phone }}
-                            </el-form-item>
-                        </el-col>
-
-                        <el-col :span="12">
-                            <el-form-item label="邮箱">
-                                {{ formData.email }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="地址">
-                                {{ formData.address }}
-                            </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="附件" 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>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="customdetail">
-
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiCustomDetail } from '@/api/custom'
-import { timeFormat } from '@/utils/util'
-
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const formDataannex = reactive([])
-const datas = reactive({
-    provinceOptions: [],
-    cityOptions: [],
-    areaOptions: [],
-});
-
-
-// 表单数据
-const formData = reactive({
-
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    // for (const key in formData) {
-    //     if (data[key] != null && data[key] != undefined) {
-    //         //@ts-ignore
-    //         formData[key] = data[key]
-
-    //     }
-
-    // }
-    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')
-
-
-}
-
-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/supplerManagement/list/edit.vue b/src/views/supplerManagement/list/edit.vue
deleted file mode 100644
index 1e5a22c..0000000
--- a/src/views/supplerManagement/list/edit.vue
+++ /dev/null
@@ -1,405 +0,0 @@
-<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-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-                    <el-tab-pane label="基本信息" name="first">
-                        <el-row>
-
-                            <el-col :span="8">
-                                <el-form-item label="建档人" prop="create_user_id">
-                                    <el-input v-model="create_user_name" readonly clearable placeholder="请输入建档人" />
-                                </el-form-item></el-col>
-                            <el-col :span="8">
-                                <el-form-item label="组织" prop="org_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                                    <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>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="8">
-                                <el-form-item label="部门" prop="dept_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                                    <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-form-item>
-                            </el-col>
-
-                            <el-col :span="8">
-                                <el-form-item label="供应商编码" prop="supplier_code">
-                                    <el-input v-model="formData.supplier_code" readonly clearable placeholder="系统默认生成" />
-                                </el-form-item></el-col>
-                            <el-col :span="8">
-                                <el-form-item label="供应商名称" prop="supplier_name">
-                                    <el-input v-model="formData.supplier_name" clearable placeholder="请输入" />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="24">
-                                <el-form-item label="供应商简介" prop="supplier_introduction">
-                                    <el-input v-model="formData.supplier_introduction" type="textarea" clearable placeholder="请输入" />
-                                </el-form-item></el-col>
-
-                            <el-col :span="8">
-                                <el-form-item label="品牌类别" prop="brand_category">
-                                    <el-input v-model="formData.brand_category" clearable placeholder="请输入" />
-                                </el-form-item></el-col>
-                            <el-col :span="24">
-                                <el-form-item label="供应商照片" prop="photos">
-                                    <material-picker v-model="formData.photos" />
-                                </el-form-item></el-col>
-                            <el-col :span="24">
-                                <el-form-item label="供应商分组" label-width="130px" prop="group_id">
-                                    <el-radio-group v-model="formData.group_id" placeholder="请选择供应商分组">
-                                        <el-radio v-for="(item, index) in dictData.supplier_group" :key="index" :label="parseInt(item.value)">
-                                            {{ item.name }}
-                                        </el-radio>
-                                    </el-radio-group>
-                                </el-form-item></el-col>
-                            <el-col :span="24">
-                                <el-form-item label="供应商分类" label-width="130px" prop="category_id">
-                                    <el-radio-group v-model="formData.category_id" placeholder="请选择供应商分类">
-                                        <el-radio v-for="(item, index) in dictData.supplier_category" :key="index" :label="parseInt(item.value)">
-                                            {{ item.name }}
-                                        </el-radio>
-                                    </el-radio-group>
-                                </el-form-item></el-col><el-col :span="24">
-                                <el-form-item label="供应商等级" label-width="130px" prop="grade">
-                                    <el-radio-group v-model="formData.grade" placeholder="请选择供应商等级">
-                                        <el-radio v-for="(item, index) in dictData.supplier_grade" :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="contacts">
-                                    <el-input v-model="formData.contacts" clearable placeholder="请输入" />
-                                </el-form-item></el-col>
-                            <el-col :span="24">
-                                <el-form-item label="性别" label-width="130px" prop="contacts_sex">
-                                    <el-radio-group v-model="formData.contacts_sex" placeholder="请选择性别">
-                                        <el-radio v-for="(item, index) in dictData.sex" :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="birthday">
-
-                                    <el-date-picker v-model="formData.birthday" format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="请选择出生日期" clearable></el-date-picker>
-                                </el-form-item></el-col>
-                            <el-col :span="8">
-                                <el-form-item label="电话号码" prop="phone">
-
-                                    <el-input v-model="formData.phone" clearable placeholder="请输入" />
-                                </el-form-item></el-col>
-                            <el-col :span="8">
-                                <el-form-item label="邮箱" prop="email">
-
-                                    <el-input v-model="formData.email" clearable placeholder="请输入" /> </el-form-item></el-col>
-
-
-                            <el-col :span="8">
-                                <el-form-item label="地址" prop="address">
-                                    <el-input v-model="formData.address" clearable placeholder="请输入" />
-                                </el-form-item></el-col>
-
-
-                            <el-col :span="8">
-                                <el-form-item label="备注" prop="remark">
-                                    <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
-                                </el-form-item></el-col><el-col :span="24">
-                                <el-form-item label="附件" prop="field127">
-                                    <el-upload accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv" class="upload-demo" :show-file-list="false" aria-hidden="true" :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'" :on-success="handleAvatarSuccess_four" ref="upload">
-                                        <el-button type="primary">
-                                            上传
-                                        </el-button>
-                                    </el-upload>
-
-                                    <div>
-                                        <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
-                                            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
-                                            <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
-                                        </div>
-                                    </div>
-
-
-
-                                </el-form-item></el-col>
-                        </el-row>
-                    </el-tab-pane>
-                    <el-tab-pane label="开票信息" name="second">
-                        <el-row>
-                            <el-col :span="8">
-                                <el-form-item label="开票公司名称" prop="invoice_company_name">
-                                    <el-input v-model="formData.invoice_company_name" clearable placeholder="请输入" />
-                                </el-form-item></el-col>
-                            <el-col :span="8">
-                                <el-form-item label="纳税人识别号" prop="taxpayer_identification_number">
-                                    <el-input v-model="formData.taxpayer_identification_number" clearable placeholder="请输入" />
-                                </el-form-item></el-col>
-                            <el-col :span="8">
-                                <el-form-item label="开户银行" prop="bank_name">
-                                    <el-input v-model="formData.bank_name" clearable placeholder="请输入" />
-                                </el-form-item></el-col>
-                            <el-col :span="8">
-                                <el-form-item label="开户名称" prop="bank_accnout_name">
-                                    <el-input v-model="formData.bank_accnout_name" clearable placeholder="请输入" />
-                                </el-form-item></el-col>
-                            <el-col :span="8">
-                                <el-form-item label="账号" prop="bank_account">
-                                    <el-input v-model="formData.bank_account" clearable placeholder="请输入" />
-                                </el-form-item></el-col>
-                            <el-col :span="8">
-                                <el-form-item label="开户地址" prop="bank_address">
-                                    <el-input v-model="formData.bank_address" clearable placeholder="请输入" />
-                                </el-form-item></el-col>
-                            <el-col :span="8">
-                                <el-form-item label="期初未开票金额(元)" prop="init_invoice_amount">
-                                    <el-input v-model="formData.init_invoice_amount" type="number" clearable placeholder="请输入" />
-                                </el-form-item></el-col>
-
-                        </el-row>
-                    </el-tab-pane>
-                    <el-tab-pane label="账期管理" name="third">
-
-                        <el-col :span="8">
-                            <el-form-item label="授信额度(元)" prop="credit_limit">
-                                <el-input v-model="formData.credit_limit" type="number" clearable placeholder="请输入" />
-                            </el-form-item></el-col>
-                        <el-col :span="8">
-                            <el-form-item label="账期(元)" prop="account_period">
-                                <el-input v-model="formData.account_period" type="number" clearable placeholder="请输入" />
-                            </el-form-item></el-col>
-                    </el-tab-pane>
-                </el-tabs>
-
-            </el-form>
-            <reviewprocess />
-        </popup>
-        <el-dialog v-model="showDialog" title="选择项目" width="70%">
-            <projectTable @customEvent="customEvent"></projectTable>
-
-        </el-dialog>
-    </div>
-</template>
-
-<script lang="ts" setup name="bidBiddingDecisionEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import reviewprocess from '@/components/reviewprocess/index.vue'
-
-import projectTable from "@/components/project/index.vue"
-
-import { apisupplierAdd, apisupplierEdit, apisupplierDetail } from '@/api/suppler_list'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const create_user_name = ref('')
-const project_name = ref('')
-const project_code = ref('')
-const emit = defineEmits(['success', 'close'])
-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";
-
-const userStore = useUserStore();
-const userInfo = userStore.userInfo
-const formDataannex = 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 customEvent = (e: any) => {
-    formData.project_id = e.id;
-    project_name.value = e.custom_name
-    project_code.value = e.project_code
-    showDialog.value = false;
-};
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑供应商管理' : '新增供应商管理'
-})
-
-//分页点击
-const activeName = ref('first')
-
-const handleClick = (tab: TabsPaneContext, event: Event) => {
-    // console.log(tab, event)
-}
-//获取所有组织
-const getlist = () => {
-    getAll().then((res) => {
-        Object.assign(list1, res)
-        if (res.length > 0 && !formData.org_id) {
-            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: any) => {
-    formData.dept_id = ''
-    getlist1(e)
-
-}
-//获取所有部门
-const getlist1 = (id: any) => {
-    deptAll({ 'org_id': id }).then((res) => {
-        Object.assign(list2, res)
-    })
-}
-// 表单数据
-const formData = reactive({
-    id: '',
-    dept_id: '',
-    org_id: '',
-    create_user_id: "",
-    supplier_code: "",
-    supplier_name: "",
-    supplier_introduction: "",
-    brand_category: "",
-    photos: "",
-    group_id: "",
-    category_id: "",
-    grade: "",
-    contacts: "",
-    contacts_sex: "",
-    birthday: "",
-    phone: "",
-    email: "",
-    address: "",
-    remark: "",
-    annex: "",
-    invoice_company_name: "",
-    taxpayer_identification_number: "",
-    bank_name: "",
-    bank_accnout_name: "",
-    bank_account: "",
-    bank_address: "",
-    init_invoice_amount: "",
-    credit_limit: "",
-    account_period: ""
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-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)
-
-    }
-    if (data.dept_id) {
-        getlist1(data.dept_id)
-    }
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-
-
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apisupplierDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    if (formDataannex.length > 0) {
-        formData.annex = JSON.stringify(formDataannex.map((item: any) => item.uri))
-    }
-    if (formData.photos.length > 0) {
-        formData.photos = JSON.stringify(formData.photos)
-    }
-    await formRef.value?.validate()
-    const data = { ...formData, }
-    mode.value == 'edit'
-        ? await apisupplierEdit(data)
-        : await apisupplierAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    if (!formData.create_user_id) {
-
-        create_user_name.value = userInfo.name
-        formData.create_user_id = userInfo.id
-    }
-    popupRef.value?.open()
-    getlist()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/supplerManagement/list/index.vue b/src/views/supplerManagement/list/index.vue
deleted file mode 100644
index 22db4fc..0000000
--- a/src/views/supplerManagement/list/index.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="供应商编码" prop="supplier_code">
-                    <el-input class="w-[280px]" v-model="queryParams.supplier_code" clearable placeholder="请输入供应商编码" />
-                </el-form-item>
-                <el-form-item label="供应商名称" prop="supplier_name">
-                    <el-input class="w-[280px]" v-model="queryParams.supplier_name" clearable placeholder="请输入供应商名称" />
-                </el-form-item>
-                <el-form-item label="供应商分组" prop="group_id">
-                    <el-select class="flex-1" v-model="queryParams.group_id" clearable placeholder="请选择供应商分组">
-                        <el-option v-for="(item, index) in dictData.supplier_group" :key="index" :label="item.name" :value="parseInt(item.value)" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="供应商分类" prop="category_id">
-                    <el-select class="flex-1" v-model="queryParams.category_id" clearable placeholder="请选择供应商分类">
-                        <el-option v-for="(item, index) in dictData.supplier_category" :key="index" :label="item.name" :value="parseInt(item.value)" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="供应商等级" prop="grade">
-                    <el-select class="flex-1" v-model="queryParams.grade" clearable placeholder="请选择供应商等级">
-                        <el-option v-for="(item, index) in dictData.supplier_grade" :key="index" :label="item.name" :value="parseInt(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="['bid.bid_bidding_decision/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button v-perms="['bid.bid_bidding_decision/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
-                删除
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-
-                    <el-table-column label="建档人" prop="project_id" show-overflow-tooltip />
-                    <el-table-column label="供应商编码" prop="supplier_code" show-overflow-tooltip />
-                    <el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
-                    <el-table-column label="品牌类别" prop="brand_category" show-overflow-tooltip />
-                    <el-table-column label="供应商分组" prop="group_id">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.supplier_group" :value="row.group_id" />
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column label="供应商分类" prop="category_id">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.supplier_category" :value="row.category_id" />
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column label="供应商等级" prop="grade">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.supplier_grade" :value="row.grade" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="联系人" prop="contacts" show-overflow-tooltip />
-                    <el-table-column label="性别" prop="contacts_sex" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.sex" :value="row.contacts_sex" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="电话号码" prop="phone" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="操作" width="160" fixed="right">
-                        <template #default="{ row }">
-                            <el-button v-perms="['bid.bid_bidding_decision/edit']" type="primary" link @click="handleEdit(row)">
-                                编辑
-                            </el-button>
-                            <el-button v-perms="['bid.bid_bidding_decision/delete']" type="danger" link @click="handleDelete(row.id)">
-                                删除
-                            </el-button>
-                            <el-button v-perms="['bid.bid_bidding_decision/detail']" link @click="handledetail(row)">
-                                详情
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <detail-popup v-if="showDtail" ref="detailRef" :dict-data="dictData" @close="showDtail = false" />
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="bidBiddingDecisionLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apisupplierLists, apisupplierDelete, apisupplierDetail } from '@/api/suppler_list'
-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({
-    category_id: '',
-    grade: '',
-    group_id: "",
-    supplier_name: '',
-    supplier_code: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('supplier_grade,supplier_category,supplier_group,sex')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apisupplierLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    let res = await apisupplierDetail({ 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 apisupplierDelete({ id })
-    getLists()
-}
-//详情
-const handledetail = async (data: any) => {
-    let res = await apisupplierDetail({ id: data.id })
-    showDtail.value = true
-    await nextTick()
-    detailRef.value?.open()
-    detailRef.value?.setFormData(res)
-}
-getLists()
-</script>
-
diff --git a/src/views/supplier/detail.vue b/src/views/supplier/detail.vue
index 7a9d618..d4a321d 100644
--- a/src/views/supplier/detail.vue
+++ b/src/views/supplier/detail.vue
@@ -3,105 +3,131 @@
 
 <template>
     <div class="detail-popup">
-        <popup ref="popupRef" title="投标决策详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+        <popup ref="popupRef" title="供应商管理详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="160px">
                 <el-card class="mb-2">
                     <el-row>
                         <el-col :span="12">
-                            <el-form-item label="客户名称">
+                            <el-form-item label="建档人">
 
                                 {{ formData.custom_name }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project.name }}
+                            <el-form-item label="组织">
+                                {{ formData.org.name }}
 
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="项目编码">
-                                {{ formData.project.project_code }}
+                            <el-form-item label="部门">
+                                {{ formData.dept.name
+                                }}
+
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="供应商编码">
+                                {{ formData.supplier_code
+                                }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="供应商名称">
+                                {{ formData.supplier_name }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="供应商简介">
+                                {{ formData.supplier_introduction }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="品牌类别">
+                                {{ formData.brand_category }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="供应商照片" prop="photos">
+                                <div v-if="formData.photos && formData.photos.length > 0">
+                                    <material-picker v-model="formData.photos" />
+                                </div>
+                                <div v-else>暂无供应商照片</div>
 
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="项目估算(万元)">
-                                {{ formData.project_estimation }}
+                            <el-form-item label="供应商分组">
+                                <dict-value :options="dictData.supplier_group" :value="formData.group_id" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="投标时间">
-                                {{ formData.bidding_time }}
+                            <el-form-item label="供应商分类">
+                                <dict-value :options="dictData.supplier_category" :value="formData.category_id" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="购买标书时间">
-                                {{ formData.buy_bid_document_date }}
+                            <el-form-item label="供应商等级">
+                                <dict-value :options="dictData.supplier_grade" :value="formData.grade" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="招标项目资金来源">
-                                <dict-value :options="dictData.construction_funds_sources" :value="formData.bidding_project_fund_source" />
+                            <el-form-item label="联系人">
+                                {{ formData.contacts }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="招标方式">
-                                <dict-value :options="dictData.bidding_method" :value="formData.bid_type" />
+                            <el-form-item label="性别">
+                                <dict-value :options="dictData.sex" :value="formData.contacts_sex" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="竞争对手">
-                                {{ formData.competitor }}
+                            <el-form-item label="出生日期">
+                                {{ formData.birthday }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="保证金金额">
-                                {{ formData.margin_amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="是否需要保证金">
-                                <dict-value :options="dictData.whether_status" :value="formData.whether_status" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="保证金金额">
+                            <el-form-item label="电话号码">
                                 {{ formData.competitor }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="开标日期">
-                                {{ bid_opening_date }}
+                                {{ formData.phone }}
                             </el-form-item>
                         </el-col>
 
                         <el-col :span="12">
-                            <el-form-item label="保证金退还时间">
-                                {{ formData.margin_amount_return_date }}
+                            <el-form-item label="邮箱">
+                                {{ formData.email }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="有无内部资源">
-                                <dict-value :options="dictData.whether_status" :value="formData.is_internal_resources" />
+                            <el-form-item label="地址">
+                                {{ formData.address }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="项目把握度">
-                                {{ formData.project_assurancee }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="招标项目概况">
-                                {{ formData.bid_project_overview }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目简介">
-                                {{ formData.project_desc }}
+                            <el-form-item label="备注">
+                                {{ formData.remark }}
                             </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>
@@ -116,6 +142,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 +153,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 +178,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/supplier/edit.vue b/src/views/supplier/edit.vue
index 20d6312..1e5a22c 100644
--- a/src/views/supplier/edit.vue
+++ b/src/views/supplier/edit.vue
@@ -1,67 +1,201 @@
 <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="90px" :rules="formRules">
-                <el-row>
-                    <el-col :span="8">
-                        <el-form-item label="项目名称" prop="bid_document_examination_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" @click="showDialog = true">
-                            <el-input v-model="project_name" readonly clearable placeholder="请输入" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="项目编码" prop="bid_document_examination_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="project_code" clearable readonly placeholder="请输入" />
-                        </el-form-item></el-col>
-                    <el-col :span="8">
-                        <el-form-item label="客户名称" prop="bid_document_examination_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="matsname" clearable readonly placeholder="请输入" />
-                        </el-form-item></el-col><el-col :span="8">
-                        <!-- @click="showDialog1 = true" -->
-                        <el-form-item label="产品id" prop="product_id">
-                            <el-input v-model="formData.product_id" readonly clearable placeholder="请输入产品id" />
-                        </el-form-item></el-col><el-col :span="8">
-                        <el-form-item label="产品数量" prop="product_num">
-                            <el-input v-model="formData.product_num" clearable placeholder="请输入产品数量" />
-                        </el-form-item></el-col><el-col :span="8">
-                        <el-form-item label="成本单价" prop="cost_unit_price">
-                            <el-input v-model="formData.cost_unit_price" 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="请输入金额" />
-                        </el-form-item></el-col><el-col :span="8">
-                        <el-form-item label="点数" prop="rate">
-                            <el-input v-model="formData.rate" clearable placeholder="请输入点数" />
-                        </el-form-item></el-col><el-col :span="8">
-                        <el-form-item label="报价单价" prop="unit_price">
-                            <el-input v-model="formData.unit_price" clearable placeholder="请输入报价单价" />
-                        </el-form-item></el-col><el-col :span="8">
-                        <el-form-item label="报价金额" prop="total_amount">
-                            <el-input v-model="formData.total_amount" clearable placeholder="请输入报价金额" />
-                        </el-form-item></el-col><el-col :span="8">
-                        <el-form-item label="" prop="create_user">
-                            <el-input v-model="formData.create_user" clearable placeholder="请输入" />
-                        </el-form-item></el-col>
-                </el-row>
-            </el-form>
-        </popup>
-        <el-dialog v-model="showDialog" title="选择标书" width="70%">
-            <biddocumentTable @customEvent="customEvent"></biddocumentTable>
+            <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
+                <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+                    <el-tab-pane label="基本信息" name="first">
+                        <el-row>
+
+                            <el-col :span="8">
+                                <el-form-item label="建档人" prop="create_user_id">
+                                    <el-input v-model="create_user_name" readonly clearable placeholder="请输入建档人" />
+                                </el-form-item></el-col>
+                            <el-col :span="8">
+                                <el-form-item label="组织" prop="org_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                                    <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>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="部门" prop="dept_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                                    <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-form-item>
+                            </el-col>
+
+                            <el-col :span="8">
+                                <el-form-item label="供应商编码" prop="supplier_code">
+                                    <el-input v-model="formData.supplier_code" readonly clearable placeholder="系统默认生成" />
+                                </el-form-item></el-col>
+                            <el-col :span="8">
+                                <el-form-item label="供应商名称" prop="supplier_name">
+                                    <el-input v-model="formData.supplier_name" clearable placeholder="请输入" />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="24">
+                                <el-form-item label="供应商简介" prop="supplier_introduction">
+                                    <el-input v-model="formData.supplier_introduction" type="textarea" clearable placeholder="请输入" />
+                                </el-form-item></el-col>
+
+                            <el-col :span="8">
+                                <el-form-item label="品牌类别" prop="brand_category">
+                                    <el-input v-model="formData.brand_category" clearable placeholder="请输入" />
+                                </el-form-item></el-col>
+                            <el-col :span="24">
+                                <el-form-item label="供应商照片" prop="photos">
+                                    <material-picker v-model="formData.photos" />
+                                </el-form-item></el-col>
+                            <el-col :span="24">
+                                <el-form-item label="供应商分组" label-width="130px" prop="group_id">
+                                    <el-radio-group v-model="formData.group_id" placeholder="请选择供应商分组">
+                                        <el-radio v-for="(item, index) in dictData.supplier_group" :key="index" :label="parseInt(item.value)">
+                                            {{ item.name }}
+                                        </el-radio>
+                                    </el-radio-group>
+                                </el-form-item></el-col>
+                            <el-col :span="24">
+                                <el-form-item label="供应商分类" label-width="130px" prop="category_id">
+                                    <el-radio-group v-model="formData.category_id" placeholder="请选择供应商分类">
+                                        <el-radio v-for="(item, index) in dictData.supplier_category" :key="index" :label="parseInt(item.value)">
+                                            {{ item.name }}
+                                        </el-radio>
+                                    </el-radio-group>
+                                </el-form-item></el-col><el-col :span="24">
+                                <el-form-item label="供应商等级" label-width="130px" prop="grade">
+                                    <el-radio-group v-model="formData.grade" placeholder="请选择供应商等级">
+                                        <el-radio v-for="(item, index) in dictData.supplier_grade" :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="contacts">
+                                    <el-input v-model="formData.contacts" clearable placeholder="请输入" />
+                                </el-form-item></el-col>
+                            <el-col :span="24">
+                                <el-form-item label="性别" label-width="130px" prop="contacts_sex">
+                                    <el-radio-group v-model="formData.contacts_sex" placeholder="请选择性别">
+                                        <el-radio v-for="(item, index) in dictData.sex" :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="birthday">
+
+                                    <el-date-picker v-model="formData.birthday" format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="请选择出生日期" clearable></el-date-picker>
+                                </el-form-item></el-col>
+                            <el-col :span="8">
+                                <el-form-item label="电话号码" prop="phone">
+
+                                    <el-input v-model="formData.phone" clearable placeholder="请输入" />
+                                </el-form-item></el-col>
+                            <el-col :span="8">
+                                <el-form-item label="邮箱" prop="email">
+
+                                    <el-input v-model="formData.email" clearable placeholder="请输入" /> </el-form-item></el-col>
+
+
+                            <el-col :span="8">
+                                <el-form-item label="地址" prop="address">
+                                    <el-input v-model="formData.address" clearable placeholder="请输入" />
+                                </el-form-item></el-col>
+
+
+                            <el-col :span="8">
+                                <el-form-item label="备注" prop="remark">
+                                    <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
+                                </el-form-item></el-col><el-col :span="24">
+                                <el-form-item label="附件" prop="field127">
+                                    <el-upload accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv" class="upload-demo" :show-file-list="false" aria-hidden="true" :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'" :on-success="handleAvatarSuccess_four" ref="upload">
+                                        <el-button type="primary">
+                                            上传
+                                        </el-button>
+                                    </el-upload>
+
+                                    <div>
+                                        <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
+                                            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
+                                            <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
+                                        </div>
+                                    </div>
+
+
+
+                                </el-form-item></el-col>
+                        </el-row>
+                    </el-tab-pane>
+                    <el-tab-pane label="开票信息" name="second">
+                        <el-row>
+                            <el-col :span="8">
+                                <el-form-item label="开票公司名称" prop="invoice_company_name">
+                                    <el-input v-model="formData.invoice_company_name" clearable placeholder="请输入" />
+                                </el-form-item></el-col>
+                            <el-col :span="8">
+                                <el-form-item label="纳税人识别号" prop="taxpayer_identification_number">
+                                    <el-input v-model="formData.taxpayer_identification_number" clearable placeholder="请输入" />
+                                </el-form-item></el-col>
+                            <el-col :span="8">
+                                <el-form-item label="开户银行" prop="bank_name">
+                                    <el-input v-model="formData.bank_name" clearable placeholder="请输入" />
+                                </el-form-item></el-col>
+                            <el-col :span="8">
+                                <el-form-item label="开户名称" prop="bank_accnout_name">
+                                    <el-input v-model="formData.bank_accnout_name" clearable placeholder="请输入" />
+                                </el-form-item></el-col>
+                            <el-col :span="8">
+                                <el-form-item label="账号" prop="bank_account">
+                                    <el-input v-model="formData.bank_account" clearable placeholder="请输入" />
+                                </el-form-item></el-col>
+                            <el-col :span="8">
+                                <el-form-item label="开户地址" prop="bank_address">
+                                    <el-input v-model="formData.bank_address" clearable placeholder="请输入" />
+                                </el-form-item></el-col>
+                            <el-col :span="8">
+                                <el-form-item label="期初未开票金额(元)" prop="init_invoice_amount">
+                                    <el-input v-model="formData.init_invoice_amount" type="number" clearable placeholder="请输入" />
+                                </el-form-item></el-col>
+
+                        </el-row>
+                    </el-tab-pane>
+                    <el-tab-pane label="账期管理" name="third">
+
+                        <el-col :span="8">
+                            <el-form-item label="授信额度(元)" prop="credit_limit">
+                                <el-input v-model="formData.credit_limit" type="number" clearable placeholder="请输入" />
+                            </el-form-item></el-col>
+                        <el-col :span="8">
+                            <el-form-item label="账期(元)" prop="account_period">
+                                <el-input v-model="formData.account_period" type="number" clearable placeholder="请输入" />
+                            </el-form-item></el-col>
+                    </el-tab-pane>
+                </el-tabs>
+
+            </el-form>
+            <reviewprocess />
+        </popup>
+        <el-dialog v-model="showDialog" title="选择项目" width="70%">
+            <projectTable @customEvent="customEvent"></projectTable>
 
-        </el-dialog>
-        <el-dialog v-model="showDialog1" title="选择产品" width="70%">
-            <prodctTable @customEvent="customEvent1"></prodctTable>
         </el-dialog>
     </div>
 </template>
 
-<script lang="ts" setup name="bidDocumentExaminationDetailEdit">
+<script lang="ts" setup name="bidBiddingDecisionEdit">
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
-import biddocumentTable from "@/components/biddocument/index.vue"
-import prodctTable from "@/components/product/index.vue"
-import { apiBidDocumentExaminationDetailAdd, apiBidDocumentExaminationDetailEdit, apiBidDocumentExaminationDetailDetail } from '@/api/bid_document_examination_detail'
-import { timeFormat } from '@/utils/util'
+import reviewprocess from '@/components/reviewprocess/index.vue'
+
 import projectTable from "@/components/project/index.vue"
+
+import { apisupplierAdd, apisupplierEdit, apisupplierDetail } from '@/api/suppler_list'
+import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
 defineProps({
     dictData: {
@@ -69,7 +203,7 @@ defineProps({
         default: () => ({})
     }
 })
-const matsname = ref('')
+const create_user_name = ref('')
 const project_name = ref('')
 const project_code = ref('')
 const emit = defineEmits(['success', 'close'])
@@ -77,24 +211,113 @@ const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
 const showDialog = ref(false)
-const showDialog1 = 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";
+
+const userStore = useUserStore();
+const userInfo = userStore.userInfo
+const formDataannex = 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 customEvent = (e: any) => {
+    formData.project_id = e.id;
+    project_name.value = e.custom_name
+    project_code.value = e.project_code
+    showDialog.value = false;
+};
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑标书审查-报价明细' : '新增标书审查-报价明细'
+    return mode.value == 'edit' ? '编辑供应商管理' : '新增供应商管理'
 })
 
+//分页点击
+const activeName = ref('first')
+
+const handleClick = (tab: TabsPaneContext, event: Event) => {
+    // console.log(tab, event)
+}
+//获取所有组织
+const getlist = () => {
+    getAll().then((res) => {
+        Object.assign(list1, res)
+        if (res.length > 0 && !formData.org_id) {
+            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: any) => {
+    formData.dept_id = ''
+    getlist1(e)
+
+}
+//获取所有部门
+const getlist1 = (id: any) => {
+    deptAll({ 'org_id': id }).then((res) => {
+        Object.assign(list2, res)
+    })
+}
 // 表单数据
 const formData = reactive({
     id: '',
-    bid_document_examination_id: '',
-    product_id: '',
-    product_num: '',
-    cost_unit_price: '',
-    amount: '',
-    rate: '',
-    unit_price: '',
-    total_amount: '',
-    create_user: '',
+    dept_id: '',
+    org_id: '',
+    create_user_id: "",
+    supplier_code: "",
+    supplier_name: "",
+    supplier_introduction: "",
+    brand_category: "",
+    photos: "",
+    group_id: "",
+    category_id: "",
+    grade: "",
+    contacts: "",
+    contacts_sex: "",
+    birthday: "",
+    phone: "",
+    email: "",
+    address: "",
+    remark: "",
+    annex: "",
+    invoice_company_name: "",
+    taxpayer_identification_number: "",
+    bank_name: "",
+    bank_accnout_name: "",
+    bank_account: "",
+    bank_address: "",
+    init_invoice_amount: "",
+    credit_limit: "",
+    account_period: ""
 })
 
 
@@ -103,26 +326,23 @@ const formRules = reactive<any>({
 
 })
 
-//获取值
-const customEvent = (e: any) => {
-    formData.bid_document_examination_id = e.id;
-    matsname.value = e.person
-    project_name.value = e.custom_name
-    project_code.value = e.project_code
-    showDialog.value = false;
 
-
-};
-//获取值
-const customEvent1 = (e: any) => {
-    // formData.buy_bidding_document_id = e.id;
-
-    showDialog1.value = false;
-
-
-};
 // 获取详情
 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)
+
+    }
+    if (data.dept_id) {
+        getlist1(data.dept_id)
+    }
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
             //@ts-ignore
@@ -134,7 +354,7 @@ const setFormData = async (data: Record<any, any>) => {
 }
 
 const getDetail = async (row: Record<string, any>) => {
-    const data = await apiBidDocumentExaminationDetailDetail({
+    const data = await apisupplierDetail({
         id: row.id
     })
     setFormData(data)
@@ -143,11 +363,17 @@ const getDetail = async (row: Record<string, any>) => {
 
 // 提交按钮
 const handleSubmit = async () => {
+    if (formDataannex.length > 0) {
+        formData.annex = JSON.stringify(formDataannex.map((item: any) => item.uri))
+    }
+    if (formData.photos.length > 0) {
+        formData.photos = JSON.stringify(formData.photos)
+    }
     await formRef.value?.validate()
     const data = { ...formData, }
     mode.value == 'edit'
-        ? await apiBidDocumentExaminationDetailEdit(data)
-        : await apiBidDocumentExaminationDetailAdd(data)
+        ? await apisupplierEdit(data)
+        : await apisupplierAdd(data)
     popupRef.value?.close()
     emit('success')
 }
@@ -155,7 +381,13 @@ const handleSubmit = async () => {
 //打开弹窗
 const open = (type = 'add') => {
     mode.value = type
+    if (!formData.create_user_id) {
+
+        create_user_name.value = userInfo.name
+        formData.create_user_id = userInfo.id
+    }
     popupRef.value?.open()
+    getlist()
 }
 
 // 关闭回调
diff --git a/src/views/supplier/index.vue b/src/views/supplier/index.vue
index db3fef3..22db4fc 100644
--- a/src/views/supplier/index.vue
+++ b/src/views/supplier/index.vue
@@ -2,11 +2,26 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="标书审查id" prop="bid_document_examination_id">
-                    <el-input class="w-[280px]" v-model="queryParams.bid_document_examination_id" clearable placeholder="请输入标书审查id" />
+                <el-form-item label="供应商编码" prop="supplier_code">
+                    <el-input class="w-[280px]" v-model="queryParams.supplier_code" clearable placeholder="请输入供应商编码" />
                 </el-form-item>
-                <el-form-item label="产品id" prop="product_id">
-                    <el-input class="w-[280px]" v-model="queryParams.product_id" clearable placeholder="请输入产品id" />
+                <el-form-item label="供应商名称" prop="supplier_name">
+                    <el-input class="w-[280px]" v-model="queryParams.supplier_name" clearable placeholder="请输入供应商名称" />
+                </el-form-item>
+                <el-form-item label="供应商分组" prop="group_id">
+                    <el-select class="flex-1" v-model="queryParams.group_id" clearable placeholder="请选择供应商分组">
+                        <el-option v-for="(item, index) in dictData.supplier_group" :key="index" :label="item.name" :value="parseInt(item.value)" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="供应商分类" prop="category_id">
+                    <el-select class="flex-1" v-model="queryParams.category_id" clearable placeholder="请选择供应商分类">
+                        <el-option v-for="(item, index) in dictData.supplier_category" :key="index" :label="item.name" :value="parseInt(item.value)" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="供应商等级" prop="grade">
+                    <el-select class="flex-1" v-model="queryParams.grade" clearable placeholder="请选择供应商等级">
+                        <el-option v-for="(item, index) in dictData.supplier_grade" :key="index" :label="item.name" :value="parseInt(item.value)" />
+                    </el-select>
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
@@ -15,36 +30,57 @@
             </el-form>
         </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['bid.bid_document_examination_detail/add']" type="primary" @click="handleAdd">
+            <el-button v-perms="['bid.bid_bidding_decision/add']" type="primary" @click="handleAdd">
                 <template #icon>
                     <icon name="el-icon-Plus" />
                 </template>
                 新增
             </el-button>
-            <el-button v-perms="['bid.bid_document_examination_detail/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+            <el-button v-perms="['bid.bid_bidding_decision/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="标书审查id" prop="bid_document_examination_id" show-overflow-tooltip />
-                    <el-table-column label="产品id" prop="product_id" show-overflow-tooltip />
-                    <el-table-column label="产品数量" prop="product_num" show-overflow-tooltip />
-                    <el-table-column label="成本单价" prop="cost_unit_price" show-overflow-tooltip />
-                    <el-table-column label="金额" prop="amount" show-overflow-tooltip />
-                    <el-table-column label="点数" prop="rate" show-overflow-tooltip />
-                    <el-table-column label="报价单价" prop="unit_price" show-overflow-tooltip />
-                    <el-table-column label="报价金额" prop="total_amount" show-overflow-tooltip />
-                    <el-table-column label="" prop="create_user" show-overflow-tooltip />
+
+                    <el-table-column label="建档人" prop="project_id" show-overflow-tooltip />
+                    <el-table-column label="供应商编码" prop="supplier_code" show-overflow-tooltip />
+                    <el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
+                    <el-table-column label="品牌类别" prop="brand_category" show-overflow-tooltip />
+                    <el-table-column label="供应商分组" prop="group_id">
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.supplier_group" :value="row.group_id" />
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column label="供应商分类" prop="category_id">
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.supplier_category" :value="row.category_id" />
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column label="供应商等级" prop="grade">
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.supplier_grade" :value="row.grade" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="联系人" prop="contacts" show-overflow-tooltip />
+                    <el-table-column label="性别" prop="contacts_sex" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.sex" :value="row.contacts_sex" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="电话号码" prop="phone" show-overflow-tooltip />
+                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
                     <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['bid.bid_document_examination_detail/edit']" type="primary" link @click="handleEdit(row)">
+                            <el-button v-perms="['bid.bid_bidding_decision/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button v-perms="['bid.bid_document_examination_detail/delete']" type="danger" link @click="handleDelete(row.id)">
+                            <el-button v-perms="['bid.bid_bidding_decision/delete']" type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
-                            <el-button v-perms="['bid.bid_document_examination_detail/detail']" link @click="handledetail(row)">
+                            <el-button v-perms="['bid.bid_bidding_decision/detail']" link @click="handledetail(row)">
                                 详情
                             </el-button>
                         </template>
@@ -60,10 +96,10 @@
     </div>
 </template>
 
-<script lang="ts" setup name="bidDocumentExaminationDetailLists">
+<script lang="ts" setup name="bidBiddingDecisionLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiBidDocumentExaminationDetailLists, apiBidDocumentExaminationDetailDelete, apiBidDocumentExaminationDetailDetail } from '@/api/bid_document_examination_detail'
+import { apisupplierLists, apisupplierDelete, apisupplierDetail } from '@/api/suppler_list'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
@@ -72,15 +108,15 @@ const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
-
 const showDtail = ref(false)
 
-
-
 // 查询条件
 const queryParams = reactive({
-    bid_document_examination_id: '',
-    product_id: ''
+    category_id: '',
+    grade: '',
+    group_id: "",
+    supplier_name: '',
+    supplier_code: ''
 })
 
 // 选中数据
@@ -92,11 +128,11 @@ const handleSelectionChange = (val: any[]) => {
 }
 
 // 获取字典数据
-const { dictData } = useDictData('')
+const { dictData } = useDictData('supplier_grade,supplier_category,supplier_group,sex')
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiBidDocumentExaminationDetailLists,
+    fetchFun: apisupplierLists,
     params: queryParams
 })
 
@@ -109,24 +145,24 @@ const handleAdd = async () => {
 
 // 编辑
 const handleEdit = async (data: any) => {
+    let res = await apisupplierDetail({ id: data.id })
     showEdit.value = true
     await nextTick()
     editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
+    editRef.value?.setFormData(res)
 }
 
 // 删除
 const handleDelete = async (id: number | any[]) => {
     await feedback.confirm('确定要删除？')
-    await apiBidDocumentExaminationDetailDelete({ id })
+    await apisupplierDelete({ id })
     getLists()
 }
 //详情
 const handledetail = async (data: any) => {
-    let res = await apiBidDocumentExaminationDetailDetail({ id: data.id })
+    let res = await apisupplierDetail({ id: data.id })
     showDtail.value = true
     await nextTick()
-
     detailRef.value?.open()
     detailRef.value?.setFormData(res)
 }
diff --git a/src/views/supplerManagement/contact/detail.vue b/src/views/supplier_contacts/detail.vue
similarity index 100%
rename from src/views/supplerManagement/contact/detail.vue
rename to src/views/supplier_contacts/detail.vue
diff --git a/src/views/supplerManagement/contact/edit.vue b/src/views/supplier_contacts/edit.vue
similarity index 100%
rename from src/views/supplerManagement/contact/edit.vue
rename to src/views/supplier_contacts/edit.vue
diff --git a/src/views/supplerManagement/contact/index.vue b/src/views/supplier_contacts/index.vue
similarity index 100%
rename from src/views/supplerManagement/contact/index.vue
rename to src/views/supplier_contacts/index.vue