diff --git a/.env.development b/.env.development
index df76eaf..deb8da9 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
 NODE_ENV = 'development'
 
 VITE_APP_BASE_URL = 'https://ceshi-engineering.lihaink.cn/'
-# VITE_APP_BASE_URL = 'http://192.168.1.13:8089/'
\ No newline at end of file
+# VITE_APP_BASE_URL = 'http://192.168.1.7:9090/'
\ No newline at end of file
diff --git a/src/components/cost_approved_projects/index.vue b/src/components/cost_approved_projects/index.vue
new file mode 100644
index 0000000..7c9c836
--- /dev/null
+++ b/src/components/cost_approved_projects/index.vue
@@ -0,0 +1,73 @@
+<template>
+    <div>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="合同名称" prop="contract_name">
+                    <el-input class="w-[280px]" v-model="queryParams.contract_name" clearable placeholder="请输入合同名称" />
+                </el-form-item>
+                <el-form-item label="合同编号" prop="contract_num">
+                    <el-input class="w-[280px]" v-model="queryParams.contract_num" 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>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @cell-click="handleCurrentChange">
+                    <el-table-column label="合同编号" prop="contract_num" show-overflow-tooltip />
+                    <el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
+                    <el-table-column label="甲方签约单位" prop="part_a" show-overflow-tooltip />
+                    <el-table-column label="乙方签约单位" prop="part_b" show-overflow-tooltip />
+                    <el-table-column label="合同计划开始日期" prop="start_date" show-overflow-tooltip />
+                    <el-table-column label="合同计划结束日期" prop="end_date" show-overflow-tooltip />
+                    <el-table-column label="工程总投资" prop="project_money" show-overflow-tooltip />
+                    <el-table-column label="业务性质" prop="business_nature_text" show-overflow-tooltip />
+                    <el-table-column label="行业性质" prop="industry_nature" show-overflow-tooltip />
+                    <el-table-column label="签订部门" prop="dept" show-overflow-tooltip />
+                    <el-table-column label="资金来源" prop="fund_sources_text" show-overflow-tooltip />
+                    <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>
+
+            </div>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+    </div>
+</template>
+  
+<script lang="ts" setup>
+import { usePaging } from "@/hooks/usePaging"
+import { apiCostApprovedProjectLists } from '@/api/cost_approved_project'
+
+
+import { defineEmits } from "vue"
+
+const props = defineProps({
+    project_id: Number
+})
+// 查询条件
+const queryParams = reactive({
+    contract_name: '',
+    contract_num: '',
+});
+
+// 选中数据
+const emits = defineEmits(["customEvent"]);
+
+// 选中数据子父传递
+const handleCurrentChange = (value: any) => {
+    emits("customEvent", value);
+};
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiCostApprovedProjectLists,
+    params: queryParams,
+});
+
+getLists();
+</script>
\ No newline at end of file
diff --git a/src/components/cost_project/index.vue b/src/components/cost_project/index.vue
new file mode 100644
index 0000000..5a11b9a
--- /dev/null
+++ b/src/components/cost_project/index.vue
@@ -0,0 +1,91 @@
+<template>
+    <div>
+        <el-card class="!border-none" v-loading="pager.loading" 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>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @cell-click="handleCurrentChange">
+                    <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>
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.consultation_type" :value="row.types" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="行业" prop="industry" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.cost_consultation_industry_nature" :value="row.industry" />
+                        </template>
+                    </el-table-column>
+                    <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>
+
+            </div>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+    </div>
+</template>
+  
+<script lang="ts" setup>
+import { usePaging } from "@/hooks/usePaging"
+import { apiCostProjectLists } from '@/api/cost_project'
+import { defineEmits } from "vue"
+import { useDictData } from '@/hooks/useDictOptions'
+
+const props = defineProps({
+    project_id: Number
+})
+// 查询条件
+const queryParams = reactive({
+    project_name: '',
+    project_num: '',
+});
+const { dictData } = useDictData('consultation_type,cost_consultation_industry_nature')
+
+// 选中数据
+const emits = defineEmits(["customEvent"]);
+
+// 选中数据子父传递
+const handleCurrentChange = (value: any) => {
+    emits("customEvent", value);
+};
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiCostProjectLists,
+    params: queryParams,
+});
+
+getLists();
+</script>
\ No newline at end of file
diff --git a/src/components/task_type/index.vue b/src/components/task_type/index.vue
new file mode 100644
index 0000000..b0909ad
--- /dev/null
+++ b/src/components/task_type/index.vue
@@ -0,0 +1,67 @@
+<template>
+    <div>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="任务名称" prop="unit_name">
+                    <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入任务名称" />
+                </el-form-item>
+                <el-form-item label="上级类别" prop="qualification_grade">
+                    <el-select class="flex-1" v-model="queryParams.superior_sort" clearable placeholder="请选择上级类别">
+                        <el-option v-for="(item, index) in dictData.superior_category" :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>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @cell-click="handleCurrentChange">
+                    <el-table-column label="标识" prop="dataid" show-overflow-tooltip />
+                    <el-table-column label="任务编号" prop="num" show-overflow-tooltip />
+                    <el-table-column label="任务名称" prop="name" show-overflow-tooltip />
+                    <el-table-column label="上级类别" prop="superior_sort" show-overflow-tooltip />
+                    <el-table-column label="任务级次" prop="level" show-overflow-tooltip />
+                    <el-table-column label="备注" prop="remarks" show-overflow-tooltip />
+                </el-table>
+            </div>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+    </div>
+</template>
+  
+<script lang="ts" setup>
+import { usePaging } from "@/hooks/usePaging"
+import { apiTaskTypeLists } from '@/api/task_type'
+import { defineEmits } from "vue"
+import { useDictData } from '@/hooks/useDictOptions'
+
+const props = defineProps({
+    project_id: Number
+})
+// 查询条件
+const queryParams = reactive({
+    name: '',
+    superior_sort: '',
+});
+const { dictData } = useDictData('superior_category')
+
+// 选中数据
+const emits = defineEmits(["customEvent"]);
+
+// 选中数据子父传递
+const handleCurrentChange = (value: any) => {
+    emits("customEvent", value);
+};
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiTaskTypeLists,
+    params: queryParams,
+});
+
+getLists();
+</script>
\ No newline at end of file
diff --git a/src/views/acceptance_bill/edit.vue b/src/views/acceptance_bill/edit.vue
index c8ca422..7a9d7c2 100644
--- a/src/views/acceptance_bill/edit.vue
+++ b/src/views/acceptance_bill/edit.vue
@@ -20,7 +20,8 @@
                             <el-select v-model="formData.dept_id" clearable placeholder="请选择部门">
                                 <el-option v-for="(item, index) in list2" :key="index" :label="item.name"
                                     :value="item.id" />
-                            </el-select></el-form-item> </el-col>
+                            </el-select></el-form-item>
+                    </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="客户名称" prop="customer_id"
@@ -416,12 +417,6 @@ const handleSubmit = async () => {
     if (formDataannex.length > 0) {
         formData.annex = formDataannex.map((item: any) => item.uri)
     }
-
-
-
-
-
-    console.log(formRef.value?.validate(), '22222222')
     await formRef.value?.validate()
 
 
diff --git a/src/views/cost_approved_projects/edit.vue b/src/views/cost_approved_projects/edit.vue
index e99a19f..4ddb466 100644
--- a/src/views/cost_approved_projects/edit.vue
+++ b/src/views/cost_approved_projects/edit.vue
@@ -84,11 +84,6 @@
 
                 </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-col :span="8">
                         <el-form-item label="工程规模及概况" prop="project_scale" label-width="140px">
                             <el-input v-model="formData.project_scale" clearable placeholder="请输入工程规模及概况" />
diff --git a/src/views/cost_approved_projects/index.vue b/src/views/cost_approved_projects/index.vue
index 6fd45ca..9b5ea8a 100644
--- a/src/views/cost_approved_projects/index.vue
+++ b/src/views/cost_approved_projects/index.vue
@@ -19,7 +19,6 @@
                         <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-form-item label="行业性质" prop="industry_nature">
                     <el-select class="w-[280px]" v-model="queryParams.industry_nature" clearable placeholder="请选择行业性质">
@@ -83,9 +82,16 @@
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
-                            <el-button v-perms="['cost_project.cost_approved_project/edit']" type='warning' link
-                                @click="handleCreation(row)">
-                                生成项目
+                            <el-button v-perms="['cost_project.cost_approved_project/edit']" type='warning' link>
+                                <router-link :to="{
+                                    path: '/cost_consultation/cost_consultation_project/cost_project',
+                                    query: {
+                                        contractId: row.id,
+                                        contractName: row.contract_name
+                                    }
+                                }">
+                                    生成项目
+                                </router-link>
                             </el-button>
                         </template>
                     </el-table-column>
diff --git a/src/views/cost_projects/edit.vue b/src/views/cost_projects/edit.vue
index a943eea..ef05764 100644
--- a/src/views/cost_projects/edit.vue
+++ b/src/views/cost_projects/edit.vue
@@ -1,92 +1,199 @@
 <template>
     <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="60%"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :inline="true"  :model="formData" label-width="120px" :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>
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="60vw" @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="project_num">
+                            <el-input v-model="formData.project_num" clearable placeholder="系统自动生成" disabled />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目名称" prop="project_name">
+                            <el-input v-model="formData.project_name" clearable placeholder="请输入项目名称" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="关联合同" prop="contract_id">
+                            <el-input v-model="formData.contract_name" clearable placeholder="点击选择项目" readonly
+                                @click="showDialog = true" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="咨询类型" prop="types">
+                            <el-select v-model="formData.types" clearable placeholder="请选择业务性质" class="flex-1">
+                                <el-option v-for="(item, index) in dictData.consultation_type" :key="index"
+                                    :label="item.name" :value="parseInt(item.value)" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="行业" prop="industry">
+                            <el-select v-model="formData.industry" clearable placeholder="请选择行业" class="flex-1">
+                                <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-col :span="8">
+                        <el-form-item label="所在省份" prop="province">
+                            <el-select v-model="formData.province" clearable placeholder="请选择省" @change="province_change"
+                                class="flex-1">
+                                <el-option v-for="(item, index) in datas.provinceOptions" :key="index"
+                                    :label="item.province_name" :value="parseInt(item.province_code)" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="所在市区" prop="city">
+                            <el-select v-model="formData.city" clearable placeholder="请选择市" class="flex-1">
+                                <el-option v-for="(item, index) in datas.cityOptions" :key="index" :label="item.city_name"
+                                    :value="parseInt(item.city_code)" />
+                            </el-select>
+                        </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="starting" label-width="120px">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.starting" 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="endtime" label-width="120px">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.endtime" 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="jhgq">
+                            <el-input v-model="formData.jhgq" clearable placeholder="请输入计划工期（天）" type="number" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="组织" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-select class="flex-1" 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-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="请选择部门" prop="depar"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" label-width="100px">
+                            <el-select class="flex-1" v-model="formData.depar" 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="principal" label-width="100px">
+                            <el-input v-model="formData.principal" clearable placeholder="请输入项目负责人"
+                                @click="userclick('principal')" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目相关人员" prop="person" label-width="120px">
+                            <el-input v-model="formData.person" clearable placeholder="请输入项目相关人员"
+                                @click="userclick('person')" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="项目总投资" prop="invest" label-width="100px">
+                            <el-input v-model="formData.invest" clearable placeholder="请输入项目总投资（万元）" type="number" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="预算造价" prop="budget">
+                            <el-input v-model="formData.budget" clearable placeholder="请输入预算造价（万元）" type="number" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="送审造价" prop="cost">
+                            <el-input v-model="formData.cost" clearable placeholder="请输入送审造价（万元）" type="number" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="审定造价" prop="approval">
+                            <el-input v-model="formData.approval" clearable placeholder="请输入审定造价（万元）" type="number" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="委托单位" prop="aunit">
+                            <el-input v-model="formData.aunit" clearable placeholder="请输入委托单位" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="委托方联系人" prop="Acontact" label-width="120px">
+                            <el-input v-model="formData.Acontact" clearable placeholder="请输入委托方联系人" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="联系电话" prop="acontactnum">
+                            <el-input v-model="formData.acontactnum" clearable placeholder="请输入联系电话" type="number" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="登记日期" prop="date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.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="generalize" label-width="120px">
+                            <el-input v-model="formData.generalize" clearable placeholder="请输入项目规模及概括" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="注意事项" prop="note">
+                            <el-input v-model="formData.note" 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="请输入备注" type="textarea" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="附件" prop="annex">
+                            <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+                                @delFile="delFileFn" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-dialog v-model="showDialog" title="选择项目" width="70%">
+                    <cost_approved_projects @customEvent="customEvent"></cost_approved_projects>
+                </el-dialog>
+                <div v-if="showDialog1">
+                    <personnelselector ref="personnel" @confirm="submituser" :type="persoleType">
+                    </personnelselector>
+                </div>
+
             </el-form>
         </popup>
     </div>
@@ -95,9 +202,16 @@
 <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 { apiCostProjectAdd, apiCostProjectEdit } from '@/api/cost_project'
 import type { PropType } from 'vue'
+import { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
+import { useRoute } from 'vue-router'
+import {
+    apiCityList,
+    apiAreaList,
+    apiProvinceList,
+} from "@/api/common";
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
@@ -108,6 +222,12 @@ const emit = defineEmits(['success', 'close'])
 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([])
+const personnel = ref<any>()
+const route = useRoute()
 
 
 // 弹窗标题
@@ -121,10 +241,12 @@ const formData = reactive({
     project_num: '',
     project_name: '',
     contract_id: '',
+    contract_name: "",
     types: '',
     industry: '',
     province: '',
     city: '',
+    org_id: "",
     address: '',
     starting: '',
     endtime: '',
@@ -145,15 +267,63 @@ const formData = reactive({
     remark: '',
     annex: '',
 })
+//获取所有组织
+const getlist = () => {
+    getAll().then((res) => {
+        Object.assign(list1, res)
 
+    })
+}
+//获取部门
+const deptrmt = (e: any) => {
+    formData.dept_id = ''
+    getlist1(e)
+
+}
+//获取所有部门
+const getlist1 = (id: any) => {
+    deptAll({ 'org_id': id }).then((res) => {
+        list2.splice(0, list2.length, ...res)
+    })
+}
+
+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);
+};
+
+// 删除上传的文件
+const delFileFn = (index: number) => { formData.annex.splice(index, 1) }
+
+const datas = reactive({
+    provinceOptions: [],
+    cityOptions: [],
+});
+
+const customEvent = (e) => {
+    console.log(e)
+    formData.contract_id = e.id
+    formData.contract_name = e.contract_name
+    showDialog.value = false
+}
+
+const getProvinceList = async () => {
+    const data = await apiProvinceList({});
+    datas["provinceOptions"] = data;
+};
+const getCityList = async () => {
+    const data = await apiCityList({ province_code: formData.province });
+    datas["cityOptions"] = data;
+};
+
+//获取省份
+function province_change(value: string) {
+    getCityList();
+}
 
 // 表单验证
 const formRules = reactive<any>({
-    project_num: [{
-        required: true,
-        message: '请输入项目编号',
-        trigger: ['blur']
-    }],
     project_name: [{
         required: true,
         message: '请输入项目名称',
@@ -205,8 +375,9 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
-    
+    formData.province = Number(formData.province)
+    formData.city = Number(formData.city)
+    getCityList();
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -219,10 +390,11 @@ const getDetail = async (row: Record<string, any>) => {
 
 // 提交按钮
 const handleSubmit = async () => {
+    Array.isArray(formData.annex) ? '' : formData.annex = []
     await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiCostProjectEdit(data) 
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiCostProjectEdit(data)
         : await apiCostProjectAdd(data)
     popupRef.value?.close()
     emit('success')
@@ -232,6 +404,28 @@ const handleSubmit = async () => {
 const open = (type = 'add') => {
     mode.value = type
     popupRef.value?.open()
+    getlist()
+
+}
+//打开弹窗
+const userclick = async (e: any) => {
+    e == 'person' ? persoleType.value = 2 : persoleType.value = 1
+    label.value = e
+    showDialog1.value = true
+    await nextTick()
+    personnel.value.open()
+
+}
+
+const label = ref('')
+const persoleType = ref('1')
+//确认
+const submituser = (e: any) => {
+    let flag = Array.isArray(e)
+    let personl;
+    personl = (flag ? (e.map(item => [item.name])).join(',') : e.name)
+    formData[label.value] = personl
+    showDialog1.value = false
 }
 
 // 关闭回调
@@ -239,7 +433,13 @@ const handleClose = () => {
     emit('close')
 }
 
+if (route.query.contractId) {
+    // handleAdd()
+    formData.contract_id = route.query.contractId
+    formData.contract_name = route.query.contractName
+}
 
+getProvinceList();
 
 defineExpose({
     open,
diff --git a/src/views/cost_projects/index.vue b/src/views/cost_projects/index.vue
index 5ab1a90..bf99527 100644
--- a/src/views/cost_projects/index.vue
+++ b/src/views/cost_projects/index.vue
@@ -1,11 +1,7 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
+            <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>
@@ -13,10 +9,16 @@
                     <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-select class="w-[280px]" v-model="queryParams.types" clearable placeholder="请选择业务性质">
+                        <el-option v-for="(item, index) in dictData.consultation_type" :key="index" :label="item.name"
+                            :value="parseInt(item.value)" />
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="行业" prop="industry">
-                    <el-input class="w-[280px]" v-model="queryParams.industry" clearable placeholder="请输入行业" />
+                    <el-select class="w-[280px]" v-model="queryParams.industry" 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-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
@@ -31,21 +33,25 @@
                 </template>
                 新增
             </el-button>
-            <el-button
-                v-perms="['cost_project.cost_project/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
+            <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="types" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.consultation_type" :value="row.types" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="行业" prop="industry" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.cost_consultation_industry_nature" :value="row.industry" />
+                        </template>
+                    </el-table-column>
                     <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 />
@@ -66,30 +72,21 @@
                     <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 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 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">
+            <div class="flex justify-end mt-4">
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
@@ -100,14 +97,15 @@
 <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 { useRoute } from 'vue-router'
+import { apiCostProjectLists, apiCostProjectDelete, apiCostProjectDetail } from '@/api/cost_project'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
+const route = useRoute()
 
 
 // 查询条件
@@ -127,7 +125,7 @@ const handleSelectionChange = (val: any[]) => {
 }
 
 // 获取字典数据
-const { dictData } = useDictData('')
+const { dictData } = useDictData('consultation_type,cost_consultation_industry_nature')
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
@@ -144,10 +142,11 @@ const handleAdd = async () => {
 
 // 编辑
 const handleEdit = async (data: any) => {
+    let res = await apiCostProjectDetail({ id: data.id })
     showEdit.value = true
     await nextTick()
     editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
+    editRef.value?.setFormData(res)
 }
 
 // 删除
@@ -156,6 +155,9 @@ const handleDelete = async (id: number | any[]) => {
     await apiCostProjectDelete({ id })
     getLists()
 }
+if (route.query.contractId) {
+    handleAdd()
+}
 
 getLists()
 </script>
diff --git a/src/views/permission/admin/edit.vue b/src/views/permission/admin/edit.vue
index 6f1f7d7..ffd3edd 100644
--- a/src/views/permission/admin/edit.vue
+++ b/src/views/permission/admin/edit.vue
@@ -21,15 +21,14 @@
                     <el-input v-model="formData.name" placeholder="请输入名称" clearable />
                 </el-form-item>
                 <el-form-item label="组织" prop="org_id">
-                    <el-select clearable v-model="formData.org_id" placeholder="请选择组织" @change="area_change">
-                        <el-option v-for="(item, index) in orglist" :key="index" :label="item.name" :value="item.id" />
+                    <el-select clearable v-model="formData.org_id" placeholder="请选择组织" @change="area_change" class="flex-1">
+                        <el-option v-for=" (item, index) in orglist" :key="index" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="归属部门" prop="dept_id">
-                    <!-- <el-tree-select class="flex-1" v-model="formData.dept_id" :data="dept" clearable multiple node-key="id" check-strictly :default-expand-all="true" placeholder="请选择上级部门" /> -->
-
-                    <el-select class="flex-1" v-model="formData.dept_id" clearable placeholder="请选择部门" @change="area_change1">
-                        <el-option v-for="(item, index) in dept" :key="index" :label="item.name" :value="item.id" />
+                    <el-select class="flex-1" v-model="formData.dept_id" clearable placeholder="请选择部门"
+                        @change="area_change1">
+                        <el-option v-for="(item, index) in depts" :key="index" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="岗位" prop="job_id">
@@ -40,9 +39,11 @@
 
                 <!-- 角色选择框 -->
                 <el-form-item label="角色" prop="role_id">
-                    <el-select v-model="formData.role_id" :disabled="formData.root == 1" class="flex-1" multiple placeholder="请选择角色" clearable>
+                    <el-select v-model="formData.role_id" :disabled="formData.root == 1" class="flex-1" multiple
+                        placeholder="请选择角色" clearable>
                         <el-option v-if="formData.root == 1" label="系统管理员" :value="0" />
-                        <el-option v-for="(item, index) in optionsData.role" :key="index" :label="item.name" :value="item.id" />
+                        <el-option v-for="(item, index) in optionsData.role" :key="index" :label="item.name"
+                            :value="item.id" />
                     </el-select>
                 </el-form-item>
 
@@ -106,7 +107,10 @@ const formData = reactive({
 })
 
 const dept = reactive([])
-const jobs = reactive([])
+const jobs = ref([])
+const depts = ref([])
+
+
 const passwordConfirmValidator = (rule: object, value: string, callback: any) => {
     if (formData.password) {
         if (!value) callback(new Error('请再次输入密码'))
@@ -178,22 +182,20 @@ const open = (type = 'add') => {
     popupRef.value?.open()
 }
 const area_change = (e: any) => {
+    depts.value = []
     deptAll({ org_id: e }).then((res) => {
-        // orglist = res.data
-        Object.assign(dept, res)
-
+        Object.assign(depts.value, res)
     })
 }
 const area_change1 = (e: any) => {
+    jobs.value = []
     jobsAll({ dept_id: e }).then((res) => {
-        // orglist = res.data
-        Object.assign(jobs, res)
-
+        Object.assign(jobs.value, res)
+        formData.job_id = ''
     })
 }
 const getlista = () => {
     getAll().then((res) => {
-        // orglist = res.data
         Object.assign(orglist, res)
 
     })
@@ -210,16 +212,11 @@ const setFormData = async (row: any) => {
         id: row.id
     })
     if (mode.value != 'add') {
-
         deptAll({ org_id: data.org_id }).then((res) => {
-            // orglist = res.data
-            Object.assign(dept, res)
-
+            Object.assign(depts.value, res)
         })
         jobsAll({ dept_id: data.dept_id }).then((res) => {
-            // orglist = res.data
-            Object.assign(jobs, res)
-
+            Object.assign(jobs.value, res)
         })
     }
     for (const key in formData) {
diff --git a/src/views/remittance/edit.vue b/src/views/remittance/edit.vue
index b6d85ee..d23de5d 100644
--- a/src/views/remittance/edit.vue
+++ b/src/views/remittance/edit.vue
@@ -103,7 +103,6 @@
                 <el-dialog v-model="showDialog1" title="选择合同" width="70%">
                     <contractDialog @customEvent="customEvent1"></contractDialog>
                 </el-dialog>
-
                 <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
             </el-form>
         </popup>
@@ -271,7 +270,6 @@ const handleSubmit = async () => {
 //打开弹窗
 
 const userclick = () => {
-    // console.log(personnel.value, '1111111')
     personnel.value.open()
 
 }
diff --git a/src/views/task_allocation/edit.vue b/src/views/task_allocation/edit.vue
index b7e5306..29dd773 100644
--- a/src/views/task_allocation/edit.vue
+++ b/src/views/task_allocation/edit.vue
@@ -1,22 +1,12 @@
 <template>
   <div class="edit-popup">
-    <popup
-        ref="popupRef"
-        :title="popupTitle"
-        :async="true"
-        width="550px"
-        @confirm="handleSubmit"
-        @close="handleClose"
-    >
+    <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
       <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-        <el-form-item label="" prop="dataid">
-          <el-input v-model="formData.dataid" clearable placeholder="请输入" />
-        </el-form-item>
         <el-form-item label="单据编号" prop="num">
-          <el-input v-model="formData.num" clearable placeholder="请输入单据编号" />
+          <el-input v-model="formData.num" clearable placeholder="系统自动生成" disabled />
         </el-form-item>
-        <el-form-item label="项目名称" prop="project">
-          <el-input v-model="formData.project" clearable placeholder="请输入项目名称" />
+        <el-form-item label="项目名称" prop="project_id">
+          <el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly @click="showDialog = true" />
         </el-form-item>
         <el-form-item label="项目编号" prop="project_num">
           <el-input v-model="formData.project_num" clearable placeholder="请输入项目编号" />
@@ -25,12 +15,147 @@
           <el-input v-model="formData.head" clearable placeholder="请输入项目负责人" />
         </el-form-item>
         <el-form-item label="登记日期" prop="apptime">
-          <el-input v-model="formData.apptime" clearable placeholder="请输入登记日期" />
+          <el-date-picker class="flex-1 !flex" v-model="formData.apptime" clearable type="date" value-format="YYYY-MM-DD"
+            placeholder="请选择日期">
+          </el-date-picker>
         </el-form-item>
-        <el-form-item label="附件" prop="annex">
-          <el-input v-model="formData.annex" clearable placeholder="请输入附件" />
+        <el-form-item label="附件">
+          <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four" @delFile="delFileFn" />
         </el-form-item>
+        <el-dialog v-model="showDialog" title="选择项目" width="70%">
+          <cost_project @customEvent="customEvent"></cost_project>
+        </el-dialog>
+        <el-dialog v-model="showDialog1" title="选择任务" width="70%">
+          <task_type @customEvent="customEvent1"></task_type>
+        </el-dialog>
 
+        <div v-if="showDialog3">
+          <personnelselector ref="personnel" @confirm="submituser" type="1">
+          </personnelselector>
+        </div>
+
+
+        <div style="margin-bottom: 30px;">任务明细</div>
+        <div style="margin-bottom: 30px;">
+          <el-table :data="formData.task_detail">
+            <el-table-column label="序号" v-if="mode == 'add'" width="150px">
+              <template #default="{ row }">
+                <el-button @click="handleAdd(row)">+</el-button>
+                <el-button @click="handleDelete(row)">-</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="任务名称" prop="task_name" width="200px">
+              <template #default="scope">
+                <el-input v-model="scope.row.task_name" readonly @click="showDialog1 = true, tableIndex = scope.$index"
+                  placeholder="点击选择" />
+              </template>
+            </el-table-column>
+            <el-table-column label="任务次级" prop="level" width="200px">
+              <template #default="{ row }">
+                <el-input v-model="row.level" :readonly="mode == 'edit'" />
+              </template>
+            </el-table-column>
+            <el-table-column label="工序" prop="process" width="200px">
+              <template #default="{ row }">
+                <el-input v-model="row.process" :readonly="mode == 'edit'" />
+              </template>
+            </el-table-column>
+            <el-table-column label="任务类型" prop="task_type_id" width="200px">
+              <template #default="{ row }">
+                <el-select class="flex-1" v-model="row.task_type_id" clearable placeholder="请选择任务类型">
+                  <el-option v-for="(item, index) in dictData.task_type" :key="index" :label="item.name"
+                    :value="parseInt(item.value)" />
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="专业类型" prop="professional_type" width="200px">
+              <template #default="{ row }">
+                <el-select class="flex-1" v-model="row.professional_type" clearable placeholder="请选择专业类型">
+                  <el-option v-for="(item, index) in dictData.major_type" :key="index" :label="item.name"
+                    :value="item.value" />
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="工程师" prop="engineer" width="200px">
+              <template #default="scope">
+                <el-input v-model="scope.row.engineer" :readonly="mode == 'edit'"
+                  @click="userclick(scope.$index, 'engineer')" />
+              </template>
+            </el-table-column>
+            <el-table-column label="一级审核人" prop="first_reviewer" width="200px">
+              <template #default="scope">
+                <el-input v-model="scope.row.first_reviewer" :readonly="mode == 'edit'"
+                  @click="userclick(scope.$index, 'first_reviewer')" />
+              </template>
+            </el-table-column>
+            <el-table-column label="二级审核人" prop="secondary_reviewer" width="200px">
+              <template #default="scope">
+                <el-input v-model="scope.row.secondary_reviewer" :readonly="mode == 'edit'"
+                  @click="userclick(scope.$index, 'secondary_reviewer')" />
+              </template>
+            </el-table-column>
+            <el-table-column label="三级审核人" prop="third_level_reviewer" width="200px">
+              <template #default="scope">
+                <el-input v-model="scope.row.third_level_reviewer" :readonly="mode == 'edit'"
+                  @click="userclick(scope.$index, 'third_level_reviewer')" />
+              </template>
+            </el-table-column>
+            <el-table-column label="天数" prop="days" width="200px">
+              <template #default="{ row }">
+                <el-input v-model="row.days" :readonly="mode == 'edit'" />
+              </template>
+            </el-table-column>
+            <el-table-column label="开始日期" prop="start_date" width="200px">
+              <template #default="{ row }">
+                <el-date-picker class="flex-1 !flex" v-model="row.start_date" clearable type="date"
+                  value-format="YYYY-MM-DD" placeholder="请选择日期">
+                </el-date-picker>
+              </template>
+            </el-table-column>
+            <el-table-column label="结束日期" prop="end_date" width="200px">
+              <template #default="{ row }">
+                <el-date-picker class="flex-1 !flex" v-model="row.end_date" clearable type="date"
+                  value-format="YYYY-MM-DD" placeholder="请选择日期">
+                </el-date-picker>
+              </template>
+            </el-table-column>
+            <el-table-column label="中标金额(元)" prop="bid_winning_amount" width="200px">
+              <template #default="{ row }">
+                <el-input v-model="row.bid_winning_amount" :readonly="mode == 'edit'" />
+              </template>
+            </el-table-column>
+            <el-table-column label="送审造价(元)" prop="cost" width="200px">
+              <template #default="{ row }">
+                <el-input v-model="row.cost" :readonly="mode == 'edit'" />
+              </template>
+            </el-table-column>
+            <el-table-column label="第三方核定金额(元)" prop="approved_amount" width="200px">
+              <template #default="{ row }">
+                <el-input v-model="row.approved_amount" :readonly="mode == 'edit'" />
+              </template>
+            </el-table-column>
+            <el-table-column label="施工单位" prop="construction_unit" width="200px">
+              <template #default="{ row }">
+                <el-input v-model="row.construction_unit" :readonly="mode == 'edit'" />
+              </template>
+            </el-table-column>
+            <el-table-column label="联系人" prop="contact" width="200px">
+              <template #default="{ row }">
+                <el-input v-model="row.contact" :readonly="mode == 'edit'" />
+              </template>
+            </el-table-column>
+            <el-table-column label="联系电话" prop="contact_phone" width="200px">
+              <template #default="{ row }">
+                <el-input v-model="row.contact_phone" :readonly="mode == 'edit'" />
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" prop="remark" width="200px">
+              <template #default="{ row }">
+                <el-input v-model="row.remark" :readonly="mode == 'edit'" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
       </el-form>
     </popup>
   </div>
@@ -40,7 +165,6 @@
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import { apiTaskAllocationAdd, apiTaskAllocationEdit, apiTaskAllocationDetail } from '@/api/task_allocation'
-import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
 defineProps({
   dictData: {
@@ -48,11 +172,25 @@ defineProps({
     default: () => ({})
   }
 })
+const a = (e) => {
+  console.log(e.$index)
+}
 const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
+const showDialog = ref(false)
+const showDialog1 = ref(false)
+const showDialog3 = ref(false)
+const personnel = ref<any>()
 
+const handleAvatarSuccess_four = (response: any) => {
+  // @ts-ignore
+  response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
+};
+
+// 删除上传的文件
+const delFileFn = (index: number) => { formData.annex.splice(index, 1) }
 
 // 弹窗标题
 const popupTitle = computed(() => {
@@ -65,13 +203,112 @@ const formData = reactive({
   dataid: '',
   num: '',
   project: '',
+  project_name: "",
   project_num: '',
   head: '',
   apptime: '',
-  annex: '',
-
+  annex: [],
+  task_detail: [{
+    task_name: '',
+    task_name_id: '',
+    process: '',
+    task_type_id: '',
+    professional_type: '',
+    engineer: '',
+    engineer_id: '',
+    level: '',
+    first_reviewer: '',
+    first_reviewer_id: '',
+    secondary_reviewer: '',
+    secondary_reviewer_id: '',
+    third_level_reviewer: '',
+    third_level_reviewer_id: '',
+    bid_winning_amount: '',
+    cost: '',
+    approved_amount: '',
+    construction_unit: '',
+    construction_unit_id: '',
+    contact: '',
+    contact_phone: '',
+    days: '',
+    start_date: '',
+    end_date: '',
+    remark: '',
+  }]
 })
 
+const handleAdd = () => {
+  formData.task_detail.push({
+    task_name: '',
+    task_name_id: '',
+    process: '',
+    task_type_id: '',
+    professional_type: '',
+    engineer: '',
+    engineer_id: '',
+    level: '',
+    first_reviewer: '',
+    first_reviewer_id: '',
+    secondary_reviewer: '',
+    secondary_reviewer_id: '',
+    third_level_reviewer: '',
+    third_level_reviewer_id: '',
+    bid_winning_amount: '',
+    cost: '',
+    approved_amount: '',
+    construction_unit: '',
+    construction_unit_id: '',
+    contact: '',
+    contact_phone: '',
+    days: '',
+    start_date: '',
+    end_date: '',
+    remark: '',
+  })
+}
+
+
+const handleDelete = (row: any) => {
+  if (formData.task_detail.length = 1) return
+  const index = formData.task_detail.indexOf(row);
+  formData.task_detail.splice(index, 1);
+}
+
+const tableIndex = ref(0)
+
+const customEvent = (e) => {
+  // formData.project = e.id
+  // formData.project_name = e.project_name
+  // formData.project_num = e.project_num
+
+  showDialog.value = false
+}
+
+const customEvent1 = (e) => {
+  formData.task_detail[tableIndex.value].task_name = e.name
+  formData.task_detail[tableIndex.value].task_name_id = e.id
+  formData.task_detail[tableIndex.value].level = e.level
+  showDialog1.value = false
+}
+
+const tableKey = ref('')
+//打开弹窗
+const userclick = async (e: any, key) => {
+  tableIndex.value = e
+  tableKey.value = key
+  showDialog3.value = true
+  await nextTick()
+  personnel.value.open()
+  console.log(tableIndex.value, tableKey.value)
+
+}
+
+//确认
+const submituser = (e: any) => {
+  formData.task_detail[tableIndex.value][tableKey.value] = e.name
+  formData.task_detail[tableIndex.value][tableKey.value + '_id'] = e.id
+  showDialog3.value = false
+}
 
 // 表单验证
 const formRules = reactive<any>({
@@ -101,11 +338,15 @@ const getDetail = async (row: Record<string, any>) => {
 
 // 提交按钮
 const handleSubmit = async () => {
+
+
+  console.log(formData, 'formdata')
+  return
   await formRef.value?.validate()
-  const data = { ...formData,  }
+  const data = { ...formData, }
   mode.value == 'edit'
-      ? await apiTaskAllocationEdit(data)
-      : await apiTaskAllocationAdd(data)
+    ? await apiTaskAllocationEdit(data)
+    : await apiTaskAllocationAdd(data)
   popupRef.value?.close()
   emit('success')
 }
diff --git a/src/views/task_allocation/index.vue b/src/views/task_allocation/index.vue
index 2e27ad3..d473354 100644
--- a/src/views/task_allocation/index.vue
+++ b/src/views/task_allocation/index.vue
@@ -1,11 +1,7 @@
 <template>
   <div>
     <el-card class="!border-none mb-4" shadow="never">
-      <el-form
-          class="mb-[-16px]"
-          :model="queryParams"
-          inline
-      >
+      <el-form class="mb-[-16px]" :model="queryParams" inline>
         <el-form-item label="项目名称" prop="project">
           <el-input class="w-[280px]" v-model="queryParams.project" clearable placeholder="请输入项目名称" />
         </el-form-item>
@@ -23,47 +19,45 @@
         </template>
         新增
       </el-button>
-      <el-button
-          v-perms="['task.task_allocation/delete']"
-          :disabled="!selectData.length"
-          @click="handleDelete(selectData)"
-      >
+      <el-button v-perms="['task.task_allocation/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="dataid" show-overflow-tooltip />
+          <!-- <el-table-column label="" prop="dataid" show-overflow-tooltip /> -->
           <el-table-column label="单据编号" prop="num" show-overflow-tooltip />
           <el-table-column label="项目名称" prop="project" show-overflow-tooltip />
           <el-table-column label="项目编号" prop="project_num" show-overflow-tooltip />
           <el-table-column label="项目负责人" prop="head" show-overflow-tooltip />
           <el-table-column label="登记日期" prop="apptime" show-overflow-tooltip />
-          <el-table-column label="附件" prop="annex" show-overflow-tooltip />
+          <el-table-column label="附件" prop="annex" show-overflow-tooltip>
+            <template #default="{ row }">
+              <div v-if="row.annex && row.annex.length > 0">
+                <div v-for="(item, i) in row.annex " :key='i'>
+                  <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
+                </div>
+              </div>
+              <div v-else>
+                暂无文件
+              </div>
+            </template>
+          </el-table-column>
 
           <el-table-column label="操作" width="120" fixed="right">
             <template #default="{ row }">
-              <el-button
-                  v-perms="['task.task_allocation/edit']"
-                  type="primary"
-                  link
-                  @click="handleEdit(row)"
-              >
+              <el-button v-perms="['task.task_allocation/edit']" type="primary" link @click="handleEdit(row)">
                 编辑
               </el-button>
-              <el-button
-                  v-perms="['task.task_allocation/delete']"
-                  type="danger"
-                  link
-                  @click="handleDelete(row.id)"
-              >
+              <el-button v-perms="['task.task_allocation/delete']" type="danger" link @click="handleDelete(row.id)">
                 删除
               </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>
@@ -98,7 +92,7 @@ const handleSelectionChange = (val: any[]) => {
 }
 
 // 获取字典数据
-const { dictData } = useDictData('')
+const { dictData } = useDictData('task_type,major_type')
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
diff --git a/src/views/task_detail/edit.vue b/src/views/task_detail/edit.vue
index b3adfe6..2cf9c24 100644
--- a/src/views/task_detail/edit.vue
+++ b/src/views/task_detail/edit.vue
@@ -1,14 +1,7 @@
 <template>
   <div class="edit-popup">
-    <popup
-        ref="popupRef"
-        :title="popupTitle"
-        :async="true"
-        width="60%"
-        @confirm="handleSubmit"
-        @close="handleClose"
-    >
-      <el-form ref="formRef" :inline="true"  :model="formData" label-width="120px" :rules="formRules">
+    <popup ref="popupRef" :title="popupTitle" :async="true" width="60%" @confirm="handleSubmit" @close="handleClose">
+      <el-form ref="formRef" :inline="true" :model="formData" label-width="120px" :rules="formRules">
         <el-form-item label="主表标识" prop="task_allocation_dataid">
           <el-input v-model="formData.task_allocation_dataid" clearable placeholder="请输入主表标识" />
         </el-form-item>
@@ -23,22 +16,13 @@
         </el-form-item>
         <el-form-item label="任务类型" prop="task_type_id">
           <el-select class="flex-1" v-model="formData.task_type_id" clearable placeholder="请选择任务类型">
-            <el-option
-                v-for="(item, index) in dictData.task_type"
-                :key="index"
-                :label="item.name"
-                :value="parseInt(item.value)"
-            />
+            <el-option v-for="(item, index) in dictData.task_type" :key="index" :label="item.name"
+              :value="parseInt(item.value)" />
           </el-select>
         </el-form-item>
         <el-form-item label="专业类型" prop="professional_type">
           <el-select class="flex-1" v-model="formData.professional_type" clearable placeholder="请选择专业类型">
-            <el-option
-                v-for="(item, index) in dictData.major_type"
-                :key="index"
-                :label="item.name"
-                :value="item.value"
-            />
+            <el-option v-for="(item, index) in dictData.major_type" :key="index" :label="item.name" :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="工程师" prop="engineer">
@@ -101,7 +85,6 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
         </el-form-item>
-
       </el-form>
     </popup>
   </div>
@@ -192,10 +175,10 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
   await formRef.value?.validate()
-  const data = { ...formData,  }
+  const data = { ...formData, }
   mode.value == 'edit'
-      ? await apiTaskDetailEdit(data)
-      : await apiTaskDetailAdd(data)
+    ? await apiTaskDetailEdit(data)
+    : await apiTaskDetailAdd(data)
   popupRef.value?.close()
   emit('success')
 }
diff --git a/src/views/task_type/edit.vue b/src/views/task_type/edit.vue
index d0c0985..0b5ab70 100644
--- a/src/views/task_type/edit.vue
+++ b/src/views/task_type/edit.vue
@@ -1,36 +1,17 @@
 <template>
   <div class="edit-popup">
-    <popup
-        ref="popupRef"
-        :title="popupTitle"
-        :async="true"
-        width="550px"
-        @confirm="handleSubmit"
-        @close="handleClose"
-    >
+    <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="dataid">
           <el-input v-model="formData.dataid" clearable placeholder="请输入" />
         </el-form-item>
         <el-form-item label="所属项目" prop="cost_project_id">
-          <el-select
-              v-model="formData.cost_project_id"
-              remote
-              filterable
-              :remote-method="queryCostProject"
-              :loading="loading"
-          >
-            <el-option
-                v-for="(item, index) in optionsData.projectList"
-                :key="index"
-                :label="item.projectinfo"
-                :value="item.id"
-            />
+          <el-select v-model="formData.cost_project_id" remote filterable :remote-method="queryCostProject"
+            :loading="loading" class="flex-1">
+            <el-option v-for="(item, index) in optionsData.projectList" :key="index" :label="item.projectinfo"
+              :value="item.id" />
           </el-select>
         </el-form-item>
-<!--        <el-form-item label="项目id" prop="cost_project_id">-->
-<!--          <el-input v-model="formData.cost_project_id" clearable placeholder="请输入项目id" />-->
-<!--        </el-form-item>-->
         <el-form-item label="任务编号" prop="num">
           <el-input v-model="formData.num" clearable placeholder="请输入任务编号" />
         </el-form-item>
@@ -38,7 +19,11 @@
           <el-input v-model="formData.name" clearable placeholder="请输入任务名称" />
         </el-form-item>
         <el-form-item label="上级类别" prop="superior_sort">
-          <el-input v-model="formData.superior_sort" clearable placeholder="请输入上级类别" />
+          <!-- <el-input v-model="formData.superior_sort" clearable placeholder="请输入上级类别" /> -->
+          <el-select class="flex-1" v-model="formData.superior_sort" clearable placeholder="请选择上级类别">
+            <el-option v-for="(item, index) in dictData.superior_category" :key="index" :label="item.name"
+              :value="parseInt(item.value)" />
+          </el-select>
         </el-form-item>
         <el-form-item label="任务级次" prop="level">
           <el-input v-model="formData.level" clearable placeholder="请输入任务级次" />
@@ -56,9 +41,9 @@
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import { apiTaskTypeAdd, apiTaskTypeEdit, apiTaskTypeDetail } from '@/api/task_type'
-import {useDictOptions} from "@/hooks/useDictOptions"
+import { useDictOptions } from "@/hooks/useDictOptions"
 import type { PropType } from 'vue'
-import {apiCostProjectDatas} from "@/api/cost_project";
+import { apiCostProjectDatas } from "@/api/cost_project";
 defineProps({
   dictData: {
     type: Object as PropType<Record<string, any[]>>,
@@ -107,7 +92,7 @@ const { optionsData } = useDictOptions<{
 
 const loading = ref(false)
 
-const queryCostProject= async (query: string) => {
+const queryCostProject = async (query: string) => {
   loading.value = true
   const projectList = await apiCostProjectDatas({
     name: query ?? ''
@@ -125,7 +110,7 @@ const setFormData = async (data: Record<any, any>) => {
       formData[key] = data[key]
     }
   }
-
+  formData.superior_sort = Number(formData.superior_sort)
 
 }
 
@@ -140,10 +125,10 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
   await formRef.value?.validate()
-  const data = { ...formData,  }
+  const data = { ...formData, }
   mode.value == 'edit'
-      ? await apiTaskTypeEdit(data)
-      : await apiTaskTypeAdd(data)
+    ? await apiTaskTypeEdit(data)
+    : await apiTaskTypeAdd(data)
   popupRef.value?.close()
   emit('success')
 }
diff --git a/src/views/task_type/index.vue b/src/views/task_type/index.vue
index 6635dfd..723167c 100644
--- a/src/views/task_type/index.vue
+++ b/src/views/task_type/index.vue
@@ -1,12 +1,27 @@
 <template>
   <div>
     <el-card class="!border-none mb-4" shadow="never">
-      <el-form
-          class="mb-[-16px]"
-          :model="queryParams"
-          inline
-      >
-
+      <el-form class="mb-[-16px]" :model="queryParams" inline>
+        <el-form-item label="所属项目" prop="cost_project_id">
+          <el-select v-model="queryParams.cost_project_id" remote filterable :remote-method="queryCostProject"
+            :loading="loading" class="flex-1">
+            <el-option v-for="(item, index) in optionsData.projectList" :key="index" :label="item.projectinfo"
+              :value="item.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="任务名称" prop="unit_name">
+          <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入任务名称" />
+        </el-form-item>
+        <el-form-item label="上级类别" prop="qualification_grade">
+          <el-select class="flex-1" v-model="queryParams.superior_sort" clearable placeholder="请选择上级类别">
+            <el-option v-for="(item, index) in dictData.superior_category" :key="index" :label="item.name"
+              :value="parseInt(item.value)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间段">
+          <el-date-picker v-model="queryTime" type="daterange" unlink-panels range-separator="-" start-placeholder="开始时间"
+            end-placeholder="结束时间" @change="changeTime" value-format="YYYY-MM-DD" />
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="resetPage">查询</el-button>
           <el-button @click="resetParams">重置</el-button>
@@ -20,47 +35,31 @@
         </template>
         新增
       </el-button>
-      <el-button
-          v-perms="['task.task_type/delete']"
-          :disabled="!selectData.length"
-          @click="handleDelete(selectData)"
-      >
+      <el-button v-perms="['task.task_type/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="dataid" show-overflow-tooltip />
-          <el-table-column label="项目id" prop="cost_project_id" show-overflow-tooltip />
           <el-table-column label="任务编号" prop="num" show-overflow-tooltip />
           <el-table-column label="任务名称" prop="name" show-overflow-tooltip />
           <el-table-column label="上级类别" prop="superior_sort" show-overflow-tooltip />
           <el-table-column label="任务级次" prop="level" show-overflow-tooltip />
           <el-table-column label="备注" prop="remarks" show-overflow-tooltip />
-
           <el-table-column label="操作" width="120" fixed="right">
             <template #default="{ row }">
-              <el-button
-                  v-perms="['task.task_type/edit']"
-                  type="primary"
-                  link
-                  @click="handleEdit(row)"
-              >
+              <el-button v-perms="['task.task_type/edit']" type="primary" link @click="handleEdit(row)">
                 编辑
               </el-button>
-              <el-button
-                  v-perms="['task.task_type/delete']"
-                  type="danger"
-                  link
-                  @click="handleDelete(row.id)"
-              >
+              <el-button v-perms="['task.task_type/delete']" type="danger" link @click="handleDelete(row.id)">
                 删除
               </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>
@@ -72,20 +71,47 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiTaskTypeLists, apiTaskTypeDelete } from '@/api/task_type'
-import { timeFormat } from '@/utils/util'
+import { useDictOptions } from "@/hooks/useDictOptions"
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import { apiCostProjectDatas } from "@/api/cost_project";
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
+const loading = ref(false)
 
+const queryCostProject = async (query: string) => {
+  loading.value = true
+  const projectList = await apiCostProjectDatas({
+    name: query ?? ''
+  })
+  optionsData.projectList = projectList
+  loading.value = false
+}
+
+
+const { optionsData } = useDictOptions<{
+  projectList: any[]
+}>({
+  projectList: {
+    api: apiCostProjectDatas,
+  }
+})
 
 // 查询条件
 const queryParams = reactive({
-
+  name: "",
+  superior_sort: "",
+  cost_project_id: "",
+  start_time: "",
+  end_time: ""
 })
-
+const queryTime = ref('')
+const changeTime = () => {
+  queryParams.start_time = queryTime.value[0]
+  queryParams.end_time = queryTime.value[1]
+}
 // 选中数据
 const selectData = ref<any[]>([])
 
@@ -95,7 +121,7 @@ const handleSelectionChange = (val: any[]) => {
 }
 
 // 获取字典数据
-const { dictData } = useDictData('')
+const { dictData } = useDictData('superior_category')
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({