From 2fa023d9832dfcb6c87c908268276f9289d1538b Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Wed, 21 Feb 2024 18:04:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E7=8F=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/cost_project.ts                       |  26 ++
 src/views/InvoicingRequests/detail copy.vue   | 210 +++++++++++++++
 src/views/InvoicingRequests/detail.vue        | 173 +++---------
 .../edit.vue                                  | 135 ++++++----
 .../index.vue                                 |  23 +-
 src/views/cost_projects/edit.vue              | 249 ++++++++++++++++++
 src/views/cost_projects/index.vue             | 162 ++++++++++++
 src/views/project/edit.vue                    |  29 +-
 src/views/user/setting.vue                    |  32 +--
 vite.config.ts                                |   1 +
 10 files changed, 798 insertions(+), 242 deletions(-)
 create mode 100644 src/api/cost_project.ts
 create mode 100644 src/views/InvoicingRequests/detail copy.vue
 rename src/views/{cost_approved_project => cost_approved_projects}/edit.vue (73%)
 rename src/views/{cost_approved_project => cost_approved_projects}/index.vue (92%)
 create mode 100644 src/views/cost_projects/edit.vue
 create mode 100644 src/views/cost_projects/index.vue

diff --git a/src/api/cost_project.ts b/src/api/cost_project.ts
new file mode 100644
index 0000000..26c9d68
--- /dev/null
+++ b/src/api/cost_project.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 造价项目台账列表
+export function apiCostProjectLists(params: any) {
+    return request.get({ url: '/cost_project.cost_project/lists', params })
+}
+
+// 添加造价项目台账
+export function apiCostProjectAdd(params: any) {
+    return request.post({ url: '/cost_project.cost_project/add', params })
+}
+
+// 编辑造价项目台账
+export function apiCostProjectEdit(params: any) {
+    return request.post({ url: '/cost_project.cost_project/edit', params })
+}
+
+// 删除造价项目台账
+export function apiCostProjectDelete(params: any) {
+    return request.post({ url: '/cost_project.cost_project/delete', params })
+}
+
+// 造价项目台账详情
+export function apiCostProjectDetail(params: any) {
+    return request.get({ url: '/cost_project.cost_project/detail', params })
+}
\ No newline at end of file
diff --git a/src/views/InvoicingRequests/detail copy.vue b/src/views/InvoicingRequests/detail copy.vue
new file mode 100644
index 0000000..8dca7d8
--- /dev/null
+++ b/src/views/InvoicingRequests/detail copy.vue	
@@ -0,0 +1,210 @@
+
+<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-descriptions :column="3" title="基本信息" border>
+                    <el-descriptions-item label="合同名称" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.contract_name }}</el-descriptions-item>
+                    <el-descriptions-item label="合同编号" label-align="left" align="left" label-class-name="my-label"> {{
+                        formData.contract_code }}</el-descriptions-item>
+                    <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.project_name }}</el-descriptions-item>
+                    <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{
+                        formData.project_code }}</el-descriptions-item>
+                    <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label"> {{
+                        formData.custom_name }}</el-descriptions-item>
+                    <el-descriptions-item label="合同金额" label-align="left" align="left" label-class-name="my-label">
+                        {{ formData.contract_amount }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="期次" label-align="left" align="left" label-class-name="my-label"> {{
+                        formData.period_text }}</el-descriptions-item>
+                    <el-descriptions-item label="税率(%)" label-align="left" align="left" label-class-name="my-label"> {{
+                        formData.tax_rate_text }}</el-descriptions-item>
+                    <el-descriptions-item label="发票类型" label-align="left" align="left" label-class-name="my-label"> {{
+                        formData.invoice_type_text }}</el-descriptions-item>
+                    <el-descriptions-item label="开票金额(含税)" label-align="left" align="left" label-class-name="my-label"> {{
+                        formData.amount_including_tax }}</el-descriptions-item>
+                    <!-- <el-descriptions-item label="开票金额(税额)" label-align="left" align="left" label-class-name="my-label"> {{ formData.industry_text }}</el-descriptions-item> -->
+                    <el-descriptions-item label="开票内容" label-align="left" align="left" label-class-name="my-label"> {{
+                        formData.content }}</el-descriptions-item>
+                    <el-descriptions-item label="发票编号" label-align="left" align="left" label-class-name="my-label"> {{
+                        formData.invoice_no }}</el-descriptions-item>
+
+
+
+
+
+                    <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                        <div v-if="formData.annex && formData.annex.length > 0">
+                            <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+                                <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
+                                    target="_blank">文件{{ index + 1 }} 查看</a>
+                            </div>
+                        </div>
+                        <div v-else>
+                            暂无文件
+                        </div>
+                    </el-descriptions-item>
+
+
+                </el-descriptions>
+                <el-descriptions :column="3" title="客户开票信息" border style="margin: 20px 0;">
+                    <el-descriptions-item label="开票公司名称" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.invoicing_company_name }}</el-descriptions-item>
+                    <el-descriptions-item label="纳税人识别号" label-align="left" align="left" label-class-name="my-label"> {{
+                        formData.taxpayer_identification_number }}</el-descriptions-item>
+                    <el-descriptions-item label="开户银行" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.deposit_bank }}</el-descriptions-item>
+                    <el-descriptions-item label="账号" label-align="left" align="left" label-class-name="my-label"> {{
+                        formData.bank_accnout }}</el-descriptions-item>
+
+                    <el-descriptions-item label="开户地址及电话" label-align="left" align="left" label-class-name="my-label">
+                        {{ formData.address_phone }}
+                    </el-descriptions-item>
+
+
+
+
+
+
+
+                </el-descriptions>
+                <el-descriptions :column="3" title="发票邮寄信息" border style="margin: 20px 0;">
+                    <el-descriptions-item label="收票地址" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.receiving_address }}</el-descriptions-item>
+                    <el-descriptions-item label="联系人" label-align="left" align="left" label-class-name="my-label"> {{
+                        formData.contacts }}</el-descriptions-item>
+                    <el-descriptions-item label="联系电话" label-align="left" align="left" label-class-name="my-label">{{
+                        formData.phone }}</el-descriptions-item>
+                    <el-descriptions-item label="邮寄时间" label-align="left" align="left" label-class-name="my-label"> {{
+                        formData.mailing_type }}</el-descriptions-item>
+                    <el-descriptions-item label="邮寄方式" label-align="left" align="left" label-class-name="my-label"> {{
+                        formData.mailing_type }}</el-descriptions-item>
+                    <el-descriptions-item label="邮寄单号" label-align="left" align="left" label-class-name="my-label">
+                        {{ formData.mailing_no }}
+                    </el-descriptions-item>
+
+
+
+
+
+
+
+                </el-descriptions>
+                <flowProcess v-if="!formData?.approve_id || formData.approve_check_status == 4" :flows="flows"
+                    :submitApi="apiInvoicingRequestsApprove" :id="formData?.id" @off="handleClose">
+                </flowProcess>
+                <flowDetail v-else :approve_id="formData?.approve_id" @off="handleClose" />
+                <!-- import { apiInvoicingRequestsApprove, apiInvoicingRequestsFlows } from '@/api/flowSet.ts'
+            // 获取审批流程
+            const flows = ref([])
+            const getbidDocumentExaminationFlows = async () => {
+            if (formData?.approve_id) return
+            let res = await apisubcontracting_contract_negotiationFlows()
+            flows.value = res
+            } -->
+
+            </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 { apiInvoicingRequestsApprove, apiInvoicingRequestsFlows } from '@/api/flowSet.ts'
+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 formData = reactive({
+
+})
+
+
+
+
+// 获取详情
+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)
+    getbidDocumentExaminationFlows()
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiCustomDetail({
+        id: formData.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    popupRef.value?.close()
+
+}
+
+//打开弹窗
+const open = () => {
+    console.log('1111111')
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+// 获取审批流程
+const flows = ref([])
+const getbidDocumentExaminationFlows = async () => {
+    if (formData?.approve_id) return
+    let res = await apiInvoicingRequestsFlows()
+    flows.value = res
+}
+
+
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
+<style lang="scss" scoped>
+.tit {
+    font-size: 1.2em;
+    margin-bottom: 10px;
+}
+
+:deep(.my-label) {
+    width: 150px;
+}
+</style>
diff --git a/src/views/InvoicingRequests/detail.vue b/src/views/InvoicingRequests/detail.vue
index 8dca7d8..96e4dfe 100644
--- a/src/views/InvoicingRequests/detail.vue
+++ b/src/views/InvoicingRequests/detail.vue
@@ -2,109 +2,47 @@
 <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-descriptions :column="3" title="基本信息" border>
-                    <el-descriptions-item label="合同名称" label-align="left" align="left" label-class-name="my-label">{{
-                        formData.contract_name }}</el-descriptions-item>
-                    <el-descriptions-item label="合同编号" label-align="left" align="left" label-class-name="my-label"> {{
-                        formData.contract_code }}</el-descriptions-item>
-                    <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">{{
-                        formData.project_name }}</el-descriptions-item>
-                    <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{
-                        formData.project_code }}</el-descriptions-item>
-                    <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label"> {{
-                        formData.custom_name }}</el-descriptions-item>
-                    <el-descriptions-item label="合同金额" label-align="left" align="left" label-class-name="my-label">
-                        {{ formData.contract_amount }}
+            <el-form ref="formRef" :model="formData">
+                <el-descriptions :column="3" title="房子出租" border>
+                    <el-descriptions-item label="开票公司名称" label-align="left">
+                        {{ formData.invoicing_company_name }}萨达撒旦发射点发射
                     </el-descriptions-item>
-                    <el-descriptions-item label="期次" label-align="left" align="left" label-class-name="my-label"> {{
-                        formData.period_text }}</el-descriptions-item>
-                    <el-descriptions-item label="税率(%)" label-align="left" align="left" label-class-name="my-label"> {{
-                        formData.tax_rate_text }}</el-descriptions-item>
-                    <el-descriptions-item label="发票类型" label-align="left" align="left" label-class-name="my-label"> {{
-                        formData.invoice_type_text }}</el-descriptions-item>
-                    <el-descriptions-item label="开票金额(含税)" label-align="left" align="left" label-class-name="my-label"> {{
-                        formData.amount_including_tax }}</el-descriptions-item>
-                    <!-- <el-descriptions-item label="开票金额(税额)" label-align="left" align="left" label-class-name="my-label"> {{ formData.industry_text }}</el-descriptions-item> -->
-                    <el-descriptions-item label="开票内容" label-align="left" align="left" label-class-name="my-label"> {{
-                        formData.content }}</el-descriptions-item>
-                    <el-descriptions-item label="发票编号" label-align="left" align="left" label-class-name="my-label"> {{
-                        formData.invoice_no }}</el-descriptions-item>
-
-
-
-
-
-                    <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
-                        <div v-if="formData.annex && formData.annex.length > 0">
-                            <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                                <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
-                                    target="_blank">文件{{ index + 1 }} 查看</a>
-                            </div>
-                        </div>
-                        <div v-else>
-                            暂无文件
-                        </div>
+                    <el-descriptions-item label="开票公司名称" label-align="left">
+                        {{ formData.invoicing_company_name }}萨达撒旦发射点发射点发射点大师傅士大夫都是
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开票公司名称" label-align="left">
+                        {{ formData.invoicing_company_name }}点发射点大师傅士大夫都是
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开票公司名称" label-align="left">
+                        {{ formData.invoicing_company_name }}点发
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开票公司名称" label-align="left">
+                        {{ formData.invoicing_company_name }}点发点发射点大师傅士大夫都是点发射点大师傅士大夫都是
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开票公司名称" label-align="left">
+                        {{ formData.invoicing_company_name }}点发点发射点大师傅士大夫都是
                     </el-descriptions-item>
-
-
                 </el-descriptions>
-                <el-descriptions :column="3" title="客户开票信息" border style="margin: 20px 0;">
-                    <el-descriptions-item label="开票公司名称" label-align="left" align="left" label-class-name="my-label">{{
-                        formData.invoicing_company_name }}</el-descriptions-item>
-                    <el-descriptions-item label="纳税人识别号" label-align="left" align="left" label-class-name="my-label"> {{
-                        formData.taxpayer_identification_number }}</el-descriptions-item>
-                    <el-descriptions-item label="开户银行" label-align="left" align="left" label-class-name="my-label">{{
-                        formData.deposit_bank }}</el-descriptions-item>
-                    <el-descriptions-item label="账号" label-align="left" align="left" label-class-name="my-label"> {{
-                        formData.bank_accnout }}</el-descriptions-item>
-
-                    <el-descriptions-item label="开户地址及电话" label-align="left" align="left" label-class-name="my-label">
-                        {{ formData.address_phone }}
+                <el-descriptions :column="3" title="空闲土地出租" border>
+                    <el-descriptions-item label="开票公司名称" label-align="left">
+                        {{ formData.invoicing_company_name }}
                     </el-descriptions-item>
-
-
-
-
-
-
-
                 </el-descriptions>
-                <el-descriptions :column="3" title="发票邮寄信息" border style="margin: 20px 0;">
-                    <el-descriptions-item label="收票地址" label-align="left" align="left" label-class-name="my-label">{{
-                        formData.receiving_address }}</el-descriptions-item>
-                    <el-descriptions-item label="联系人" label-align="left" align="left" label-class-name="my-label"> {{
-                        formData.contacts }}</el-descriptions-item>
-                    <el-descriptions-item label="联系电话" label-align="left" align="left" label-class-name="my-label">{{
-                        formData.phone }}</el-descriptions-item>
-                    <el-descriptions-item label="邮寄时间" label-align="left" align="left" label-class-name="my-label"> {{
-                        formData.mailing_type }}</el-descriptions-item>
-                    <el-descriptions-item label="邮寄方式" label-align="left" align="left" label-class-name="my-label"> {{
-                        formData.mailing_type }}</el-descriptions-item>
-                    <el-descriptions-item label="邮寄单号" label-align="left" align="left" label-class-name="my-label">
-                        {{ formData.mailing_no }}
+                <el-descriptions :column="3" title="农副产品出售" border>
+                    <el-descriptions-item label="开票公司名称" label-align="left">
+                        {{ formData.invoicing_company_name }}
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions :column="3" title="空闲资产出租/出售" border>
+                    <el-descriptions-item label="开票公司名称" label-align="left">
+                        {{ formData.invoicing_company_name }}
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions :column="3" title="房屋装饰建设" border>
+                    <el-descriptions-item label="开票公司名称" label-align="left">
+                        {{ formData.invoicing_company_name }}
                     </el-descriptions-item>
-
-
-
-
-
-
-
                 </el-descriptions>
-                <flowProcess v-if="!formData?.approve_id || formData.approve_check_status == 4" :flows="flows"
-                    :submitApi="apiInvoicingRequestsApprove" :id="formData?.id" @off="handleClose">
-                </flowProcess>
-                <flowDetail v-else :approve_id="formData?.approve_id" @off="handleClose" />
-                <!-- import { apiInvoicingRequestsApprove, apiInvoicingRequestsFlows } from '@/api/flowSet.ts'
-            // 获取审批流程
-            const flows = ref([])
-            const getbidDocumentExaminationFlows = async () => {
-            if (formData?.approve_id) return
-            let res = await apisubcontracting_contract_negotiationFlows()
-            flows.value = res
-            } -->
-
             </el-form>
         </popup>
     </div>
@@ -113,20 +51,10 @@
 <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 { apiInvoicingRequestsApprove, apiInvoicingRequestsFlows } from '@/api/flowSet.ts'
-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([])
 
 
 
@@ -140,26 +68,10 @@ const formData = reactive({
 
 // 获取详情
 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)
-    getbidDocumentExaminationFlows()
-
 }
 
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiCustomDetail({
-        id: formData.id
-    })
-    setFormData(data)
-}
+
 
 
 // 提交按钮
@@ -170,7 +82,6 @@ const handleSubmit = async () => {
 
 //打开弹窗
 const open = () => {
-    console.log('1111111')
     popupRef.value?.open()
 }
 
@@ -180,13 +91,6 @@ const handleClose = () => {
 }
 
 
-// 获取审批流程
-const flows = ref([])
-const getbidDocumentExaminationFlows = async () => {
-    if (formData?.approve_id) return
-    let res = await apiInvoicingRequestsFlows()
-    flows.value = res
-}
 
 
 
@@ -195,7 +99,6 @@ const getbidDocumentExaminationFlows = async () => {
 defineExpose({
     open,
     setFormData,
-    getDetail
 })
 </script>
 <style lang="scss" scoped>
@@ -203,8 +106,4 @@ defineExpose({
     font-size: 1.2em;
     margin-bottom: 10px;
 }
-
-:deep(.my-label) {
-    width: 150px;
-}
 </style>
diff --git a/src/views/cost_approved_project/edit.vue b/src/views/cost_approved_projects/edit.vue
similarity index 73%
rename from src/views/cost_approved_project/edit.vue
rename to src/views/cost_approved_projects/edit.vue
index c4660d0..f7140ab 100644
--- a/src/views/cost_approved_project/edit.vue
+++ b/src/views/cost_approved_projects/edit.vue
@@ -21,13 +21,11 @@
                     </el-col>
                 </el-row>
                 <el-row>
-
                     <el-col :span="8">
                         <el-form-item label="甲方联系人" prop="part_a_contract">
                             <el-input v-model="formData.part_a_contract" clearable placeholder="请输入甲方联系人" />
                         </el-form-item>
                     </el-col>
-
                     <el-col :span="8">
                         <el-form-item label="业主地址" prop="part_a_address">
                             <el-input v-model="formData.part_a_address" clearable placeholder="请输入业主地址" />
@@ -38,10 +36,8 @@
                             <el-input v-model="formData.part_b" clearable placeholder="请输入乙方签约单位" />
                         </el-form-item>
                     </el-col>
-
                 </el-row>
                 <el-row>
-
                     <el-col :span="8">
                         <el-form-item label="乙方签约人" prop="part_b_signatory">
                             <el-input v-model="formData.part_b_signatory" clearable placeholder="请输入乙方签约人" />
@@ -49,34 +45,51 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="业务性质" prop="business_nature">
-                            <el-input v-model="formData.business_nature" clearable placeholder="请输入业务性质" />
+                            <el-select class="flex-1" v-model="formData.business_nature" clearable placeholder="请选择业务性质">
+                                <el-option v-for="(item, index) in dictData.cost_consultation_business_nature" :key="index"
+                                    :label="item.name" :value="parseInt(item.value)" />
+                            </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="行业性质" prop="industry_nature">
-                            <el-input v-model="formData.industry_nature" clearable placeholder="请输入行业性质" />
+                            <el-select class="flex-1" v-model="formData.industry_nature" clearable placeholder="请选择行业性质">
+                                <el-option v-for="(item, index) in dictData.cost_consultation_industry_nature" :key="index"
+                                    :label="item.name" :value="parseInt(item.value)" />
+                            </el-select>
                         </el-form-item>
                     </el-col>
-
                 </el-row>
                 <el-row>
                     <el-col :span="8">
                         <el-form-item label="建设区域" prop="const_area">
-                            <el-input v-model="formData.const_area" clearable placeholder="请输入建设区域" />
+                            <el-select class="flex-1" v-model="formData.const_area" clearable placeholder="请选择建设区域">
+                                <el-option v-for="(item, index) in dictData.cost_consultation_const_area" :key="index"
+                                    :label="item.name" :value="parseInt(item.value)" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="资金来源" prop="fund_sources">
+                            <el-select class="flex-1" v-model="formData.fund_sources" clearable placeholder="请选择资金来源">
+                                <el-option v-for="(item, index) in dictData.cost_consultation_fund_sources" :key="index"
+                                    :label="item.name" :value="parseInt(item.value)" />
+                            </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="工程总投资" prop="project_money">
-                            <el-input v-model="formData.project_money" clearable placeholder="请输入工程总投资" />
+                            <el-input v-model="formData.project_money" clearable placeholder="请输入工程总投资" type="number" />
                         </el-form-item>
-                    </el-col> <el-col :span="8">
+                    </el-col>
+
+                </el-row>
+                <el-row>
+                    <!-- <el-col :span="8">
                         <el-form-item label="造价业务类别" prop="servicecategory" label-width="120px">
                             <el-input v-model="formData.servicecategory" clearable placeholder="请输入造价业务类别" />
                         </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
+                    </el-col> -->
                     <el-col :span="8">
                         <el-form-item label="工程规模及概况" prop="project_scale" label-width="140px">
                             <el-input v-model="formData.project_scale" clearable placeholder="请输入工程规模及概况" />
@@ -87,43 +100,45 @@
                             <el-input v-model="formData.money" clearable placeholder="请输入签订金额(元)" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="合同签订费率(%)" prop="rate" label-width="140px">
-                            <el-input v-model="formData.rate" clearable placeholder="请输入合同签订费率(%)" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
                     <el-col :span="8">
                         <el-form-item label="合同服务工期" prop="contract_service" label-width="120px">
                             <el-input v-model="formData.contract_service" clearable placeholder="请输入合同服务工期" />
                         </el-form-item>
                     </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="合同签订费率(%)" prop="rate" label-width="140px">
+                            <el-input v-model="formData.rate" clearable placeholder="请输入合同签订费率(%)" type="number" />
+                        </el-form-item>
+                    </el-col>
+
                     <el-col :span="8">
                         <el-form-item label="合同计划开始日期" prop="start_date" label-width="160px">
-
-                            <el-date-picker v-model="formData.start_date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                                :style="{ width: '100%' }" placeholder="请选择日期" clearable class=" !flex"></el-date-picker>
+                            <el-date-picker class="flex-1 !flex" v-model="formData.start_date" clearable type="date"
+                                value-format="YYYY-MM-DD" placeholder="请选择日期">
+                            </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="合同计划结束日期" prop="end_date" label-width="160px">
-                            <el-date-picker v-model="formData.end_date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                                :style="{ width: '100%' }" placeholder="请选择日期" clearable class=" !flex"></el-date-picker>
+                            <el-date-picker class="flex-1 !flex" v-model="formData.end_date" clearable type="date"
+                                value-format="YYYY-MM-DD" placeholder="请选择日期">
+                            </el-date-picker>
                         </el-form-item>
                     </el-col>
                 </el-row>
-
                 <el-row>
                     <el-col :span="8">
                         <el-form-item label="合同履约金(元)" prop="performance" label-width="140px">
-                            <el-input v-model="formData.performance" clearable placeholder="请输入合同履约金(元)" />
+                            <el-input v-model="formData.performance" clearable placeholder="请输入合同履约金(元)" type="number" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="履约金到期时间" prop="due_time" label-width="124px">
-                            <el-input v-model="formData.due_time" clearable placeholder="请输入履约金到期时间" />
+                            <el-date-picker class="flex-1 !flex" v-model="formData.due_time" clearable type="date"
+                                value-format="YYYY-MM-DD" placeholder="请选择日期">
+                            </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -132,7 +147,6 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-
                 <el-row>
                     <el-col :span="8">
                         <el-form-item label="合同主要内容" prop="content" label-width="120px">
@@ -146,8 +160,9 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="创建日期" prop="create_date">
-                            <el-date-picker v-model="formData.create_date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                                :style="{ width: '100%' }" placeholder="请选择日期" clearable class=" !flex"></el-date-picker>
+                            <el-date-picker class="flex-1 !flex" v-model="formData.create_date" clearable type="date"
+                                value-format="YYYY-MM-DD" placeholder="请选择日期">
+                            </el-date-picker>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -176,37 +191,50 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="实施方式" prop="way">
-                            <el-input v-model="formData.way" clearable placeholder="请输入实施方式" />
+                            <el-select class="flex-1" v-model="formData.way" clearable placeholder="请选择实施方式">
+                                <el-option v-for="(item, index) in dictData.cost_consultation_way" :key="index"
+                                    :label="item.name" :value="parseInt(item.value)" />
+                            </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="盖章名称" prop="seal_name">
-                            <el-input v-model="formData.seal_name" clearable placeholder="请输入盖章名称" />
+                            <el-select class="flex-1" v-model="formData.seal_name" clearable placeholder="请选择盖章名称">
+                                <el-option v-for="(item, index) in dictData.cost_consultation_seal_name" :key="index"
+                                    :label="item.name" :value="parseInt(item.value)" />
+                            </el-select>
+
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row>
                     <el-col :span="8">
                         <el-form-item label="是否限制" prop="limit">
-                            <el-input v-model="formData.limit" clearable placeholder="请输入是否限制" />
+                            <el-select class="flex-1" v-model="formData.limit" clearable placeholder="请选择">
+                                <el-option label="是" :value="(1)" />
+                                <el-option label="否" :value="(0)" />
+                            </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="限制次数" prop="limit_num">
-                            <el-input v-model="formData.limit_num" clearable placeholder="请输入限制次数" />
+                            <el-input v-model="formData.limit_num" clearable type="number" placeholder="请输入限制次数" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="文件类型" prop="file_type">
-                            <el-input v-model="formData.file_type" clearable placeholder="请输入文件类型" />
+                            <el-select class="flex-1" v-model="formData.file_type" clearable placeholder="请选择盖章名称">
+                                <el-option v-for="(item, index) in dictData.cost_consultation_file_type" :key="index"
+                                    :label="item.name" :value="parseInt(item.value)" />
+                            </el-select>
+
                         </el-form-item>
                     </el-col>
                 </el-row>
-
                 <el-row>
                     <el-col :span="8">
                         <el-form-item label="盖章份数" prop="seal_num">
-                            <el-input v-model="formData.seal_num" clearable placeholder="请输入盖章份数" />
+                            <el-input v-model="formData.seal_num" clearable type="number" placeholder="请输入盖章份数" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -216,16 +244,19 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="骑缝盖章" prop="plance_seal">
-                            <el-input v-model="formData.plance_seal" clearable placeholder="请输入骑缝盖章" />
+                            <el-select class="flex-1" v-model="formData.plance_seal" clearable placeholder="请选择">
+                                <el-option label="是" :value="(1)" />
+                                <el-option label="否" :value="(0)" />
+                            </el-select>
                         </el-form-item>
                     </el-col>
                 </el-row>
-
                 <el-row>
                     <el-col :span="8">
                         <el-form-item label="发出日期" prop="send_date">
-                            <el-date-picker v-model="formData.send_date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                                :style="{ width: '100%' }" placeholder="请选择日期" clearable class=" !flex"></el-date-picker>
+                            <el-date-picker class="flex-1 !flex" v-model="formData.send_date" clearable type="date"
+                                value-format="YYYY-MM-DD" placeholder="请选择日期">
+                            </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -233,14 +264,14 @@
                             <el-input v-model="formData.number" clearable placeholder="请输入邮寄编号" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="附件">
-                            <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
-                                @delFile="delFileFn" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
 
+                </el-row>
+                <el-col :span="8">
+                    <el-form-item label="附件">
+                        <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+                            @delFile="delFileFn" />
+                    </el-form-item>
+                </el-col>
             </el-form>
         </popup>
     </div>
@@ -283,7 +314,6 @@ const formData = reactive({
     fund_sources: '',
     const_area: '',
     project_money: '',
-    servicecategory: '',
     project_scale: '',
     money: '',
     rate: '',
@@ -314,6 +344,7 @@ const formData = reactive({
 })
 
 const handleAvatarSuccess_four = (response: any) => {
+    if (!Array.isArray(formData.annex)) formData.annex = []
     // @ts-ignore
     response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
 };
diff --git a/src/views/cost_approved_project/index.vue b/src/views/cost_approved_projects/index.vue
similarity index 92%
rename from src/views/cost_approved_project/index.vue
rename to src/views/cost_approved_projects/index.vue
index aff77ed..6fd45ca 100644
--- a/src/views/cost_approved_project/index.vue
+++ b/src/views/cost_approved_projects/index.vue
@@ -73,7 +73,7 @@
                     <el-table-column label="建设区域" prop="const_area_text" show-overflow-tooltip />
                     <el-table-column label="项目总监/经理" prop="project_director" show-overflow-tooltip />
                     <el-table-column label="监管部门" prop="regulators" show-overflow-tooltip />
-                    <el-table-column label="操作" fixed="right" align="center">
+                    <el-table-column label="操作" fixed="right" width="200" align="center">
                         <template #default="{ row }">
                             <el-button v-perms="['cost_project.cost_approved_project/edit']" type="primary" link
                                 @click="handleEdit(row)">
@@ -83,15 +83,15 @@
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
-                            <el-button v-perms="['cost_project.cost_approved_project/edit']" type="primary" link
-                                @click="handleEdit(row)">
+                            <el-button v-perms="['cost_project.cost_approved_project/edit']" type='warning' link
+                                @click="handleCreation(row)">
                                 生成项目
                             </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
             </div>
-            <div class="flex mt-4 justify-end">
+            <div class="flex justify-end mt-4">
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
@@ -102,7 +102,7 @@
 <script lang="ts" setup name="costApprovedProjectLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiCostApprovedProjectLists, apiCostApprovedProjectDelete } from '@/api/cost_approved_project'
+import { apiCostApprovedProjectLists, apiCostApprovedProjectDelete, apiCostApprovedProjectDetail } from '@/api/cost_approved_project'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
@@ -111,7 +111,6 @@ const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
 
-
 // 查询条件
 const queryParams = reactive({
     contract_name: '',
@@ -133,7 +132,8 @@ const handleSelectionChange = (val: any[]) => {
 }
 
 // 获取字典数据
-const { dictData } = useDictData('cost_consultation_business_nature,cost_consultation_industry_nature,cost_consultation_fund_sources,cost_consultation_const_area')
+const { dictData } = useDictData('cost_consultation_business_nature,cost_consultation_industry_nature,cost_consultation_fund_sources,cost_consultation_const_area,cost_consultation_file_type,cost_consultation_way,cost_consultation_seal_name')
+
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
@@ -150,10 +150,11 @@ const handleAdd = async () => {
 
 // 编辑
 const handleEdit = async (data: any) => {
+    let res = await apiCostApprovedProjectDetail({ id: data.id })
     showEdit.value = true
     await nextTick()
     editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
+    editRef.value?.setFormData(res)
 }
 
 // 删除
@@ -163,6 +164,12 @@ const handleDelete = async (id: number | any[]) => {
     getLists()
 }
 
+// 生成项目
+const handleCreation = async (id: number | any[]) => {
+    await feedback.confirm('是否生成项目')
+    // await apiCostApprovedProjectDelete({ id })
+    getLists()
+}
 getLists()
 </script>
 
diff --git a/src/views/cost_projects/edit.vue b/src/views/cost_projects/edit.vue
new file mode 100644
index 0000000..2d8b513
--- /dev/null
+++ b/src/views/cost_projects/edit.vue
@@ -0,0 +1,249 @@
+<template>
+    <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="项目编号" prop="project_num">
+                    <el-input v-model="formData.project_num" clearable placeholder="请输入项目编号" />
+                </el-form-item>
+                <el-form-item label="项目名称" prop="project_name">
+                    <el-input v-model="formData.project_name" clearable placeholder="请输入项目名称" />
+                </el-form-item>
+                <el-form-item label="关联合同" prop="contract_id">
+                    <el-input v-model="formData.contract_id" clearable placeholder="请输入关联合同" />
+                </el-form-item>
+                <el-form-item label="咨询类型" prop="types">
+                    <el-input v-model="formData.types" clearable placeholder="请输入咨询类型" />
+                </el-form-item>
+                <el-form-item label="行业" prop="industry">
+                    <el-input v-model="formData.industry" clearable placeholder="请输入行业" />
+                </el-form-item>
+                <el-form-item label="所在省份" prop="province">
+                    <el-input v-model="formData.province" clearable placeholder="请输入所在省份" />
+                </el-form-item>
+                <el-form-item label="所在市区" prop="city">
+                    <el-input v-model="formData.city" clearable placeholder="请输入所在市区" />
+                </el-form-item>
+                <el-form-item label="具体地址" prop="address">
+                    <el-input v-model="formData.address" clearable placeholder="请输入具体地址" />
+                </el-form-item>
+                <el-form-item label="计划开始日期" prop="starting">
+                    <el-input v-model="formData.starting" clearable placeholder="请输入计划开始日期" />
+                </el-form-item>
+                <el-form-item label="计划结束日期" prop="endtime">
+                    <el-input v-model="formData.endtime" clearable placeholder="请输入计划结束日期" />
+                </el-form-item>
+                <el-form-item label="计划工期（天）" prop="jhgq">
+                    <el-input v-model="formData.jhgq" clearable placeholder="请输入计划工期（天）" />
+                </el-form-item>
+                <el-form-item label="项目所属部门" prop="depar">
+                    <el-input v-model="formData.depar" clearable placeholder="请输入项目所属部门" />
+                </el-form-item>
+                <el-form-item label="项目负责人" prop="principal">
+                    <el-input v-model="formData.principal" clearable placeholder="请输入项目负责人" />
+                </el-form-item>
+                <el-form-item label="项目相关人员" prop="person">
+                    <el-input v-model="formData.person" clearable placeholder="请输入项目相关人员" />
+                </el-form-item>
+                <el-form-item label="项目总投资（万元）" prop="invest">
+                    <el-input v-model="formData.invest" clearable placeholder="请输入项目总投资（万元）" />
+                </el-form-item>
+                <el-form-item label="预算造价（万元）" prop="budget">
+                    <el-input v-model="formData.budget" clearable placeholder="请输入预算造价（万元）" />
+                </el-form-item>
+                <el-form-item label="送审造价（万元）" prop="cost">
+                    <el-input v-model="formData.cost" clearable placeholder="请输入送审造价（万元）" />
+                </el-form-item>
+                <el-form-item label="审定造价（万元）" prop="approval">
+                    <el-input v-model="formData.approval" clearable placeholder="请输入审定造价（万元）" />
+                </el-form-item>
+                <el-form-item label="委托单位" prop="aunit">
+                    <el-input v-model="formData.aunit" clearable placeholder="请输入委托单位" />
+                </el-form-item>
+                <el-form-item label="委托方联系人" prop="Acontact">
+                    <el-input v-model="formData.Acontact" clearable placeholder="请输入委托方联系人" />
+                </el-form-item>
+                <el-form-item label="联系电话" prop="acontactnum">
+                    <el-input v-model="formData.acontactnum" clearable placeholder="请输入联系电话" />
+                </el-form-item>
+                <el-form-item label="登记日期" prop="date">
+                    <el-input v-model="formData.date" clearable placeholder="请输入登记日期" />
+                </el-form-item>
+                <el-form-item label="项目规模及概括" prop="generalize">
+                    <el-input v-model="formData.generalize" clearable placeholder="请输入项目规模及概括" />
+                </el-form-item>
+                <el-form-item label="注意事项" prop="note">
+                    <el-input v-model="formData.note" clearable placeholder="请输入注意事项" />
+                </el-form-item>
+                <el-form-item label="备注" prop="remark">
+                    <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
+                </el-form-item>
+                <el-form-item label="附件" prop="annex">
+                    <el-input v-model="formData.annex" clearable placeholder="请输入附件" />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="costProjectEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiCostProjectAdd, apiCostProjectEdit, apiCostProjectDetail } from '@/api/cost_project'
+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 popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑造价项目台账' : '新增造价项目台账'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    project_num: '',
+    project_name: '',
+    contract_id: '',
+    types: '',
+    industry: '',
+    province: '',
+    city: '',
+    address: '',
+    starting: '',
+    endtime: '',
+    jhgq: '',
+    depar: '',
+    principal: '',
+    person: '',
+    invest: '',
+    budget: '',
+    cost: '',
+    approval: '',
+    aunit: '',
+    Acontact: '',
+    acontactnum: '',
+    date: '',
+    generalize: '',
+    note: '',
+    remark: '',
+    annex: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    project_num: [{
+        required: true,
+        message: '请输入项目编号',
+        trigger: ['blur']
+    }],
+    project_name: [{
+        required: true,
+        message: '请输入项目名称',
+        trigger: ['blur']
+    }],
+    contract_id: [{
+        required: true,
+        message: '请输入关联合同',
+        trigger: ['blur']
+    }],
+    starting: [{
+        required: true,
+        message: '请输入计划开始日期',
+        trigger: ['blur']
+    }],
+    endtime: [{
+        required: true,
+        message: '请输入计划结束日期',
+        trigger: ['blur']
+    }],
+    jhgq: [{
+        required: true,
+        message: '请输入计划工期（天）',
+        trigger: ['blur']
+    }],
+    principal: [{
+        required: true,
+        message: '请输入项目负责人',
+        trigger: ['blur']
+    }],
+    invest: [{
+        required: true,
+        message: '请输入项目总投资（万元）',
+        trigger: ['blur']
+    }],
+    aunit: [{
+        required: true,
+        message: '请输入委托单位',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+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 apiCostProjectDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData,  }
+    mode.value == 'edit' 
+        ? await apiCostProjectEdit(data) 
+        : await apiCostProjectAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/cost_projects/index.vue b/src/views/cost_projects/index.vue
new file mode 100644
index 0000000..5ab1a90
--- /dev/null
+++ b/src/views/cost_projects/index.vue
@@ -0,0 +1,162 @@
+<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_num">
+                    <el-input class="w-[280px]" v-model="queryParams.project_num" 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-form-item>
+                <el-form-item label="咨询类型" prop="types">
+                    <el-input class="w-[280px]" v-model="queryParams.types" clearable placeholder="请输入咨询类型" />
+                </el-form-item>
+                <el-form-item label="行业" prop="industry">
+                    <el-input class="w-[280px]" v-model="queryParams.industry" clearable placeholder="请输入行业" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['cost_project.cost_project/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button
+                v-perms="['cost_project.cost_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_num" show-overflow-tooltip />
+                    <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
+                    <el-table-column label="关联合同" prop="contract_id" show-overflow-tooltip />
+                    <el-table-column label="咨询类型" prop="types" show-overflow-tooltip />
+                    <el-table-column label="行业" prop="industry" show-overflow-tooltip />
+                    <el-table-column label="所在省份" prop="province" show-overflow-tooltip />
+                    <el-table-column label="所在市区" prop="city" show-overflow-tooltip />
+                    <el-table-column label="具体地址" prop="address" show-overflow-tooltip />
+                    <el-table-column label="计划开始日期" prop="starting" show-overflow-tooltip />
+                    <el-table-column label="计划结束日期" prop="endtime" show-overflow-tooltip />
+                    <el-table-column label="计划工期（天）" prop="jhgq" show-overflow-tooltip />
+                    <el-table-column label="项目所属部门" prop="depar" show-overflow-tooltip />
+                    <el-table-column label="项目负责人" prop="principal" show-overflow-tooltip />
+                    <el-table-column label="项目相关人员" prop="person" show-overflow-tooltip />
+                    <el-table-column label="项目总投资（万元）" prop="invest" show-overflow-tooltip />
+                    <el-table-column label="预算造价（万元）" prop="budget" show-overflow-tooltip />
+                    <el-table-column label="送审造价（万元）" prop="cost" show-overflow-tooltip />
+                    <el-table-column label="审定造价（万元）" prop="approval" show-overflow-tooltip />
+                    <el-table-column label="委托单位" prop="aunit" show-overflow-tooltip />
+                    <el-table-column label="委托方联系人" prop="Acontact" show-overflow-tooltip />
+                    <el-table-column label="联系电话" prop="acontactnum" show-overflow-tooltip />
+                    <el-table-column label="登记日期" prop="date" show-overflow-tooltip />
+                    <el-table-column label="项目规模及概括" prop="generalize" show-overflow-tooltip />
+                    <el-table-column label="注意事项" prop="note" show-overflow-tooltip />
+                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="附件" prop="annex" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                             <el-button
+                                v-perms="['cost_project.cost_project/edit']"
+                                type="primary"
+                                link
+                                @click="handleEdit(row)"
+                            >
+                                编辑
+                            </el-button>
+                            <el-button
+                                v-perms="['cost_project.cost_project/delete']"
+                                type="danger"
+                                link
+                                @click="handleDelete(row.id)"
+                            >
+                                删除
+                            </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>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="costProjectLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiCostProjectLists, apiCostProjectDelete } from '@/api/cost_project'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    project_num: '',
+    project_name: '',
+    types: '',
+    industry: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiCostProjectLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiCostProjectDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/project/edit.vue b/src/views/project/edit.vue
index edaedbf..501cb1a 100644
--- a/src/views/project/edit.vue
+++ b/src/views/project/edit.vue
@@ -13,7 +13,7 @@
                 </div>
                 <el-row :gutter="10">
                     <el-col :span="8">
-                        <el-form-item label="客户名称" prop="custom_name"
+                        <el-form-item label="客户名s称" prop="custom_name"
                             :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.custom_name" @click="showDialog = true" clearable
                                 placeholder="请选择客户" />
@@ -222,9 +222,11 @@
                             </el-radio-group>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="24">
-                        <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
-                            @delFile="delFileFn" />
+                    <el-col :span="8">
+                        <el-form-item label="附件">
+                            <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+                                @delFile="delFileFn" />
+                        </el-form-item>
                     </el-col>
                 </el-row>
 
@@ -251,12 +253,10 @@ const handleAvatarSuccess_four = (response: any) => {
 };
 // 删除上传的文件
 const delFileFn = (index: number) => { formData.annex.splice(index, 1) }
-// <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
-//                                 @delFile="delFileFn" />
+
 
 
 const protype = reactive([])
-const formDataannex = reactive([])
 const list1 = reactive([])
 const list2 = reactive([])
 import { deptAll } from '@/api/org/department'
@@ -366,17 +366,9 @@ const setFormData = async (data: Record<any, any>) => {
     if (data.dept_id) {
         getlist1(data.org_id)
     }
-    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 (!Array.isArray(formData.project_content)) formData.project_content = [];
+    if (!Array.isArray(formData.annex)) formData.annex = [];
     //@ts-ignore
     data.project_content && (formData.project_content = String(data.project_content).split(","))
 
@@ -392,9 +384,6 @@ const getDetail = async (row: Record<string, any>) => {
 
 // 提交按钮
 const handleSubmit = async () => {
-    if (formDataannex.length > 0) {
-        formData.annex = formDataannex.map((item) => item.uri)
-    }
     await formRef.value?.validate()
     const data = { ...formData, project_content: formData.project_content.join(",") }
     mode.value == 'edit'
diff --git a/src/views/user/setting.vue b/src/views/user/setting.vue
index 4341d9a..d164647 100644
--- a/src/views/user/setting.vue
+++ b/src/views/user/setting.vue
@@ -2,13 +2,7 @@
 <template>
     <div class="user-setting">
         <el-card class="!border-none" shadow="never">
-            <el-form
-                ref="formRef"
-                class="ls-form"
-                :model="formData"
-                :rules="rules"
-                label-width="100px"
-            >
+            <el-form ref="formRef" class="ls-form" :model="formData" :rules="rules" label-width="100px">
                 <el-form-item label="头像：" prop="avatar">
                     <material-picker v-model="formData.avatar" :limit="1" />
                 </el-form-item>
@@ -27,34 +21,22 @@
 
                 <el-form-item label="当前密码：" prop="password_old">
                     <div class="w-80">
-                        <el-input
-                            v-model.trim="formData.password_old"
-                            placeholder="修改密码时必填, 不修改密码时留空"
-                            type="password"
-                            show-password
-                        />
+                        <el-input v-model.trim="formData.password_old" placeholder="修改密码时必填, 不修改密码时留空" type="password"
+                            show-password />
                     </div>
                 </el-form-item>
 
                 <el-form-item label="新的密码：" prop="password">
                     <div class="w-80">
-                        <el-input
-                            v-model.trim="formData.password"
-                            placeholder="修改密码时必填, 不修改密码时留空"
-                            type="password"
-                            show-password
-                        />
+                        <el-input v-model.trim="formData.password" placeholder="修改密码时必填, 不修改密码时留空" type="password"
+                            show-password />
                     </div>
                 </el-form-item>
 
                 <el-form-item label="确定密码：" prop="password_confirm">
                     <div class="w-80">
-                        <el-input
-                            v-model.trim="formData.password_confirm"
-                            placeholder="修改密码时必填, 不修改密码时留空"
-                            type="password"
-                            show-password
-                        />
+                        <el-input v-model.trim="formData.password_confirm" placeholder="修改密码时必填, 不修改密码时留空" type="password"
+                            show-password />
                     </div>
                 </el-form-item>
             </el-form>
diff --git a/vite.config.ts b/vite.config.ts
index fb69137..e48c010 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -15,6 +15,7 @@ export default defineConfig({
     base: '/admin/',
     server: {
         host: '0.0.0.0',
+        port:9527,
         open:true
     },
     plugins: [