From 01679da86eb7a95f52c80e0282a56573fe9e65a3 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Mon, 3 Jun 2024 10:46:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=8F=8A=E8=B7=AF=E7=94=B1=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E5=8D=87=E4=BA=86=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E9=AB=98=E4=BA=86=E6=93=8D=E4=BD=9C=E6=95=88=E7=8E=87?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/allAssessments/edit.vue             | 355 ++++++++++++++++++
 src/views/allAssessments/index.vue            | 110 ++++++
 src/views/assessSubordinates/edit.vue         | 355 ++++++++++++++++++
 src/views/assessSubordinates/index.vue        | 150 ++++++++
 src/views/contract_ledger/index.vue           |  10 +-
 src/views/financial_settlement/edit.vue       |   5 +
 src/views/financial_settlement/index.vue      |   6 +
 .../marketing_framework_agreement/index.vue   |   2 +-
 src/views/selfEvaluation/index.vue            |  15 +-
 9 files changed, 999 insertions(+), 9 deletions(-)
 create mode 100644 src/views/allAssessments/edit.vue
 create mode 100644 src/views/allAssessments/index.vue
 create mode 100644 src/views/assessSubordinates/edit.vue
 create mode 100644 src/views/assessSubordinates/index.vue

diff --git a/src/views/allAssessments/edit.vue b/src/views/allAssessments/edit.vue
new file mode 100644
index 0000000..3658b9f
--- /dev/null
+++ b/src/views/allAssessments/edit.vue
@@ -0,0 +1,355 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="项目名称" prop="project_name">
+                            <el-input v-model="formData.project_name" clearable placeholder="请输入项目名称" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="性质" prop="nature">
+                            <el-select class="flex-1" v-model="formData.nature" clearable placeholder="请选择性质">
+                                <el-option v-for="(item, index) in dictData.supervision_project_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">
+                            <el-select class="flex-1" v-model="formData.industry" clearable placeholder="请选择行业">
+                                <el-option v-for="(item, index) in dictData.industry" :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="build_unit">
+                            <el-input v-model="formData.build_unit_name" clearable placeholder="请输入建设单位"
+                                @click="showDialog1 = true" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="建设区域" prop="build_area">
+                            <el-select class="flex-1" v-model="formData.build_area" clearable placeholder="请选择建设区域">
+                                <el-option v-for="(item, index) in dictData.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="address">
+                            <el-input v-model="formData.address" clearable placeholder="请输入项目地址" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目级别" prop="project_level">
+                            <el-select class="flex-1" v-model="formData.project_level" clearable placeholder="请选择项目级别">
+                                <el-option v-for="(item, index) in dictData.supervision_project_level" :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="total_investment">
+                            <el-input v-model="formData.total_investment" clearable placeholder="请输入总投资（元）" type="number" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="工程状态" prop="engineering_status">
+                            <el-select class="flex-1" v-model="formData.engineering_status" clearable placeholder="请选择工程状态">
+                                <el-option v-for="(item, index) in dictData.engineering_status" :key="index"
+                                    :label="item.name" :value="parseInt(item.value)" />
+                            </el-select>
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="合同服务内容" prop="contract_content">
+                            <el-input v-model="formData.contract_content" clearable placeholder="请输入合同服务内容"
+                                type="textarea" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目概况" prop="project_overview">
+                            <el-input v-model="formData.project_overview" clearable placeholder="请输入项目概况" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目要求" prop="project_requirements">
+                            <el-input v-model="formData.project_requirements" clearable placeholder="请输入项目要求" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="计划开工日期" prop="planned_start_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.planned_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="planned_end_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.planned_end_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="actual_start_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.actual_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="actual_end_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.actual_end_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="implementation_department">
+                            <el-select v-model="formData.implementation_department" placeholder="请选择实施部门" class="flex-1">
+                                <el-option :label="item.name" :value="item.id" v-for="item in deptList">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="监管部门" prop="supervision_department">
+                            <el-select v-model="formData.supervision_department" placeholder="请选择监管部门" class="flex-1">
+                                <el-option :label="item.name" :value="item.id" v-for="item in deptList">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目经理" prop="project_manager">
+                            <el-input v-model="formData.project_manager_name" clearable placeholder="请输入项目经理"
+                                @click="userclick('project_manager')" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="立项日期" prop="initiation_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.initiation_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="project_leader">
+                            <el-input v-model="formData.project_leader_name" clearable placeholder="请输入项目负责人"
+                                @click="userclick('project_leader')" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目部" prop="project_department">
+                            <el-select v-model="formData.project_department" placeholder="请选择项目部门" class="flex-1">
+                                <el-option :label="item.name" :value="item.id" v-for="item in deptList">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="关联合同" prop="contract">
+                            <el-input v-model="formData.contract_name" clearable placeholder="请输入关联合同" v-type="'code'" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="甲方单位" prop="part_a_unit">
+                            <el-input v-model="formData.part_a_unit" clearable placeholder="请输入甲方单位"
+                                @click="showDialog2 = true" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="创建人" prop="create_user">
+                            <el-input v-model="formData.create_user" clearable />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="创建时间" prop="create_time">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.create_time" clearable type="datetime"
+                                value-format="YYYY-MM-DD HH:mm:ss">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="备注">
+                            <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">
+                            <uploadAnnex :formData="formData"></uploadAnnex>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div v-if="showDialog">
+                <personnelselector ref="personnel" @confirm="submituser" type="1">
+                </personnelselector>
+            </div>
+            <el-dialog v-model="showDialog1" title="选择建设单位" width="70%">
+                <dialogTable :config="marketing_custom" @customEvent="customEvent1"> </dialogTable>
+            </el-dialog>
+            <el-dialog v-model="showDialog2" title="选择甲方单位" width="70%">
+                <dialogTable :config="marketing_custom" @customEvent="customEvent2"> </dialogTable>
+            </el-dialog>
+        </popup>
+    </div>
+</template>
+  
+<script lang="ts" setup name="manageProjectEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiManageProjectAdd, apiManageProjectEdit, apiManageProjectDetail } from '@/api/manage_project'
+import type { PropType } from 'vue'
+import { timeFormat } from '@/utils/util'
+import useUserStore from "@/stores/modules/user";
+import { apiCostApprovedProjectDetail } from "@/api/cost_approved_project";
+import { marketing_custom } from "@/components/dialogTable/dialogTableConfig";
+
+
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    },
+    deptList: Array
+})
+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 showDialog2 = ref(false)
+const personnel = ref(null)
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑考核模版' : '新增考核模版'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    project_name: '',
+    nature: '',
+    industry: '',
+    build_unit: '',
+    build_unit_name: '',
+    build_area: '',
+    address: '',
+    project_level: '',
+    total_investment: '',
+    engineering_status: '',
+    contract_content: '',
+    project_overview: '',
+    project_requirements: '',
+    planned_start_date: '',
+    planned_end_date: '',
+    actual_start_date: '',
+    actual_end_date: '',
+    implementation_department: '',
+    supervision_department: '',
+    project_manager: '',
+    project_manager_name: '',
+    initiation_date: '',
+    project_leader: '',
+    project_leader_name: '',
+    project_department: '',
+    remark: '',
+    contract: '',
+    contract_name: '',
+    part_a_unit: '',
+    part_a: '',
+    annex: [],
+})
+
+
+
+// 表单验证
+const formRules = reactive<any>({
+    project_name: [{
+        required: true,
+        message: '请输入项目名称',
+        trigger: ['blur']
+    }]
+})
+
+const setRules = () => {
+    let lists = ['project_name']
+    lists.forEach((item) => {
+        formRules[item] = [{
+            required: true,
+            message: '不能为空',
+            trigger: ['blur']
+        }]
+    })
+}
+
+setRules()
+
+
+// 获取详情
+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 handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiManageProjectEdit(data)
+        : await apiManageProjectAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+
+
+let value
+const userclick = async (val) => {
+    showDialog.value = true
+    value = val
+    await nextTick()
+    personnel.value.open()
+}
+const submituser = (e: any) => {
+    formData[value + '_name'] = e.name
+    formData[value] = e.id
+    showDialog.value = false
+}
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+  
\ No newline at end of file
diff --git a/src/views/allAssessments/index.vue b/src/views/allAssessments/index.vue
new file mode 100644
index 0000000..1165007
--- /dev/null
+++ b/src/views/allAssessments/index.vue
@@ -0,0 +1,110 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" label-width="80px">
+                <el-row>
+                    <el-col :span="6">
+                        <el-form-item label="项目名称" prop="project_name">
+                            <el-input v-model="queryParams.project_name" clearable placeholder="请输入项目名称" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="项目编号" prop="project_code">
+                            <el-input v-model="queryParams.project_code" clearable placeholder="请输入项目编号" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="性质" prop="nature">
+                            <el-select class="flex-1" v-model="queryParams.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-col :span="6">
+                        <el-form-item>
+                            <el-button type="primary" @click="resetPage">查询</el-button>
+                            <el-button @click="resetParams">重置</el-button>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div class="mt-4">
+                <el-table border :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="考核人" prop="progress" show-overflow-tooltip />
+                    <el-table-column label="被考核人" prop="build_area_text" show-overflow-tooltip />
+                    <el-table-column label="考核类型" prop="project_level_text" show-overflow-tooltip />
+                    <el-table-column label="考核月份" prop="total_investment" show-overflow-tooltip width="120" />
+                    <el-table-column label="考核总分" prop="engineering_status_text" show-overflow-tooltip />
+                    <el-table-column label="自评得分" prop="engineering_status_text" show-overflow-tooltip />
+                    <el-table-column label="上评得分" prop="engineering_status_text" show-overflow-tooltip />
+                    <el-table-column label="最终得分" prop="engineering_status_text" show-overflow-tooltip />
+                    <el-table-column label="考核评语" prop="engineering_status_text" show-overflow-tooltip />
+                    <el-table-column label="考核时间" prop="engineering_status_text" show-overflow-tooltip />
+                    <el-table-column label="流程状态" prop="engineering_status_text" show-overflow-tooltip />
+                </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="success()" @close="success()"
+            :deptList="deptList" />
+
+    </div>
+</template>
+
+<script lang="ts" setup name="manageProjectLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiManageProjectLists, apiManageProjectDelete, apiManageProjectDetail } from '@/api/manage_project'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+import { deptLists } from "@/api/org/department";
+
+const route = useRoute()
+const router = useRouter()
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
+// 是否显示编辑框
+const showEdit = ref(false)
+const showDetail = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    project_name: '',
+    project_code: '',
+    nature: '',
+    industry: '',
+    build_area: '',
+    project_level: '',
+    engineering_status: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('supervision_project_nature,industry,const_area,supervision_project_level,engineering_status')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiManageProjectLists,
+    params: queryParams
+})
+
+
+
+
+
+getLists()
+</script>
diff --git a/src/views/assessSubordinates/edit.vue b/src/views/assessSubordinates/edit.vue
new file mode 100644
index 0000000..3658b9f
--- /dev/null
+++ b/src/views/assessSubordinates/edit.vue
@@ -0,0 +1,355 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="项目名称" prop="project_name">
+                            <el-input v-model="formData.project_name" clearable placeholder="请输入项目名称" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="性质" prop="nature">
+                            <el-select class="flex-1" v-model="formData.nature" clearable placeholder="请选择性质">
+                                <el-option v-for="(item, index) in dictData.supervision_project_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">
+                            <el-select class="flex-1" v-model="formData.industry" clearable placeholder="请选择行业">
+                                <el-option v-for="(item, index) in dictData.industry" :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="build_unit">
+                            <el-input v-model="formData.build_unit_name" clearable placeholder="请输入建设单位"
+                                @click="showDialog1 = true" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="建设区域" prop="build_area">
+                            <el-select class="flex-1" v-model="formData.build_area" clearable placeholder="请选择建设区域">
+                                <el-option v-for="(item, index) in dictData.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="address">
+                            <el-input v-model="formData.address" clearable placeholder="请输入项目地址" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目级别" prop="project_level">
+                            <el-select class="flex-1" v-model="formData.project_level" clearable placeholder="请选择项目级别">
+                                <el-option v-for="(item, index) in dictData.supervision_project_level" :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="total_investment">
+                            <el-input v-model="formData.total_investment" clearable placeholder="请输入总投资（元）" type="number" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="工程状态" prop="engineering_status">
+                            <el-select class="flex-1" v-model="formData.engineering_status" clearable placeholder="请选择工程状态">
+                                <el-option v-for="(item, index) in dictData.engineering_status" :key="index"
+                                    :label="item.name" :value="parseInt(item.value)" />
+                            </el-select>
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="合同服务内容" prop="contract_content">
+                            <el-input v-model="formData.contract_content" clearable placeholder="请输入合同服务内容"
+                                type="textarea" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目概况" prop="project_overview">
+                            <el-input v-model="formData.project_overview" clearable placeholder="请输入项目概况" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目要求" prop="project_requirements">
+                            <el-input v-model="formData.project_requirements" clearable placeholder="请输入项目要求" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="计划开工日期" prop="planned_start_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.planned_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="planned_end_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.planned_end_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="actual_start_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.actual_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="actual_end_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.actual_end_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="implementation_department">
+                            <el-select v-model="formData.implementation_department" placeholder="请选择实施部门" class="flex-1">
+                                <el-option :label="item.name" :value="item.id" v-for="item in deptList">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="监管部门" prop="supervision_department">
+                            <el-select v-model="formData.supervision_department" placeholder="请选择监管部门" class="flex-1">
+                                <el-option :label="item.name" :value="item.id" v-for="item in deptList">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目经理" prop="project_manager">
+                            <el-input v-model="formData.project_manager_name" clearable placeholder="请输入项目经理"
+                                @click="userclick('project_manager')" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="立项日期" prop="initiation_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.initiation_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="project_leader">
+                            <el-input v-model="formData.project_leader_name" clearable placeholder="请输入项目负责人"
+                                @click="userclick('project_leader')" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="项目部" prop="project_department">
+                            <el-select v-model="formData.project_department" placeholder="请选择项目部门" class="flex-1">
+                                <el-option :label="item.name" :value="item.id" v-for="item in deptList">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="关联合同" prop="contract">
+                            <el-input v-model="formData.contract_name" clearable placeholder="请输入关联合同" v-type="'code'" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="甲方单位" prop="part_a_unit">
+                            <el-input v-model="formData.part_a_unit" clearable placeholder="请输入甲方单位"
+                                @click="showDialog2 = true" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="创建人" prop="create_user">
+                            <el-input v-model="formData.create_user" clearable />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="创建时间" prop="create_time">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.create_time" clearable type="datetime"
+                                value-format="YYYY-MM-DD HH:mm:ss">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="备注">
+                            <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">
+                            <uploadAnnex :formData="formData"></uploadAnnex>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div v-if="showDialog">
+                <personnelselector ref="personnel" @confirm="submituser" type="1">
+                </personnelselector>
+            </div>
+            <el-dialog v-model="showDialog1" title="选择建设单位" width="70%">
+                <dialogTable :config="marketing_custom" @customEvent="customEvent1"> </dialogTable>
+            </el-dialog>
+            <el-dialog v-model="showDialog2" title="选择甲方单位" width="70%">
+                <dialogTable :config="marketing_custom" @customEvent="customEvent2"> </dialogTable>
+            </el-dialog>
+        </popup>
+    </div>
+</template>
+  
+<script lang="ts" setup name="manageProjectEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiManageProjectAdd, apiManageProjectEdit, apiManageProjectDetail } from '@/api/manage_project'
+import type { PropType } from 'vue'
+import { timeFormat } from '@/utils/util'
+import useUserStore from "@/stores/modules/user";
+import { apiCostApprovedProjectDetail } from "@/api/cost_approved_project";
+import { marketing_custom } from "@/components/dialogTable/dialogTableConfig";
+
+
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    },
+    deptList: Array
+})
+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 showDialog2 = ref(false)
+const personnel = ref(null)
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑考核模版' : '新增考核模版'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    project_name: '',
+    nature: '',
+    industry: '',
+    build_unit: '',
+    build_unit_name: '',
+    build_area: '',
+    address: '',
+    project_level: '',
+    total_investment: '',
+    engineering_status: '',
+    contract_content: '',
+    project_overview: '',
+    project_requirements: '',
+    planned_start_date: '',
+    planned_end_date: '',
+    actual_start_date: '',
+    actual_end_date: '',
+    implementation_department: '',
+    supervision_department: '',
+    project_manager: '',
+    project_manager_name: '',
+    initiation_date: '',
+    project_leader: '',
+    project_leader_name: '',
+    project_department: '',
+    remark: '',
+    contract: '',
+    contract_name: '',
+    part_a_unit: '',
+    part_a: '',
+    annex: [],
+})
+
+
+
+// 表单验证
+const formRules = reactive<any>({
+    project_name: [{
+        required: true,
+        message: '请输入项目名称',
+        trigger: ['blur']
+    }]
+})
+
+const setRules = () => {
+    let lists = ['project_name']
+    lists.forEach((item) => {
+        formRules[item] = [{
+            required: true,
+            message: '不能为空',
+            trigger: ['blur']
+        }]
+    })
+}
+
+setRules()
+
+
+// 获取详情
+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 handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiManageProjectEdit(data)
+        : await apiManageProjectAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+
+
+let value
+const userclick = async (val) => {
+    showDialog.value = true
+    value = val
+    await nextTick()
+    personnel.value.open()
+}
+const submituser = (e: any) => {
+    formData[value + '_name'] = e.name
+    formData[value] = e.id
+    showDialog.value = false
+}
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+  
\ No newline at end of file
diff --git a/src/views/assessSubordinates/index.vue b/src/views/assessSubordinates/index.vue
new file mode 100644
index 0000000..7f5207c
--- /dev/null
+++ b/src/views/assessSubordinates/index.vue
@@ -0,0 +1,150 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" label-width="80px">
+                <el-row>
+                    <el-col :span="6">
+                        <el-form-item label="项目名称" prop="project_name">
+                            <el-input v-model="queryParams.project_name" clearable placeholder="请输入项目名称" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="项目编号" prop="project_code">
+                            <el-input v-model="queryParams.project_code" clearable placeholder="请输入项目编号" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="性质" prop="nature">
+                            <el-select class="flex-1" v-model="queryParams.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-col :span="6">
+                        <el-form-item>
+                            <el-button type="primary" @click="resetPage">查询</el-button>
+                            <el-button @click="resetParams">重置</el-button>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button :disabled="!selectData.length" @click="handleDelete(selectData)">
+                删除
+            </el-button>
+            <div class="mt-4">
+                <el-table border :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="考核人" prop="progress" show-overflow-tooltip />
+                    <el-table-column label="被考核人" prop="build_area_text" show-overflow-tooltip />
+                    <el-table-column label="考核类型" prop="project_level_text" show-overflow-tooltip />
+                    <el-table-column label="考核月份" prop="total_investment" show-overflow-tooltip width="120" />
+                    <el-table-column label="考核总分" prop="engineering_status_text" show-overflow-tooltip />
+                    <el-table-column label="自评得分" prop="engineering_status_text" show-overflow-tooltip />
+                    <el-table-column label="上评得分" prop="engineering_status_text" show-overflow-tooltip />
+                    <el-table-column label="最终得分" prop="engineering_status_text" show-overflow-tooltip />
+                    <el-table-column label="考核评语" prop="engineering_status_text" show-overflow-tooltip />
+                    <el-table-column label="创建时间" prop="engineering_status_text" show-overflow-tooltip />
+                    <el-table-column label="流程状态" prop="engineering_status_text" show-overflow-tooltip />
+                    <el-table-column label="操作" width="170" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['manage_basic.manage_project/edit']" type="primary" link
+                                @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['manage_basic.manage_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="success()" @close="success()"
+            :deptList="deptList" />
+
+    </div>
+</template>
+
+<script lang="ts" setup name="manageProjectLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiManageProjectLists, apiManageProjectDelete, apiManageProjectDetail } from '@/api/manage_project'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+import { deptLists } from "@/api/org/department";
+
+const route = useRoute()
+const router = useRouter()
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
+// 是否显示编辑框
+const showEdit = ref(false)
+const showDetail = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    project_name: '',
+    project_code: '',
+    nature: '',
+    industry: '',
+    build_area: '',
+    project_level: '',
+    engineering_status: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('supervision_project_nature,industry,const_area,supervision_project_level,engineering_status')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiManageProjectLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    let res = await apiManageProjectDetail({ id: data.id })
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(res)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiManageProjectDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
diff --git a/src/views/contract_ledger/index.vue b/src/views/contract_ledger/index.vue
index 7e755db..97db296 100644
--- a/src/views/contract_ledger/index.vue
+++ b/src/views/contract_ledger/index.vue
@@ -62,7 +62,7 @@
                                 下载
                             </el-button>
                             <el-button v-perms="['contract.contract_negotiation/settlement']" type="primary" link
-                                v-if="row.refund_rate != '100%'" @click="handleSettlement(row)">
+                                v-if="row.refund_rate == '100'" @click="handleSettlement(row)">
                                 结算
                             </el-button>
                         </template>
@@ -192,8 +192,12 @@ const handleDown = async (id: number | any[]) => {
 }
 // 结算
 const handleSettlement = (row) => {
-    alert("没有接口")
-    router.push('/financial/invoice_and_receipt/financial_settlement')
+    router.push({
+        path: '/financial/invoice_and_receipt/financial_settlement',
+        query: {
+            contract_ledger: JSON.stringify(row)
+        }
+    })
 }
 
 getLists()
diff --git a/src/views/financial_settlement/edit.vue b/src/views/financial_settlement/edit.vue
index dc1304f..8b055cb 100644
--- a/src/views/financial_settlement/edit.vue
+++ b/src/views/financial_settlement/edit.vue
@@ -54,6 +54,7 @@ import { apiFinancialSettlementAdd, apiFinancialSettlementEdit, apiFinancialSett
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
 import { cost_approved_projects } from "@/components/dialogTable/dialogTableConfig";
+import { useRoute } from "vue-router"
 
 
 defineProps({
@@ -67,6 +68,7 @@ const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
 const showDialog = ref(false)
+const route = useRoute()
 
 
 // 弹窗标题
@@ -176,6 +178,9 @@ const handleClose = () => {
     emit('close')
 }
 
+if (route.query?.contract_ledger) {
+    customEvent(JSON.parse(route.query.contract_ledger))
+}
 
 
 defineExpose({
diff --git a/src/views/financial_settlement/index.vue b/src/views/financial_settlement/index.vue
index 29f839f..5fbe7ed 100644
--- a/src/views/financial_settlement/index.vue
+++ b/src/views/financial_settlement/index.vue
@@ -73,12 +73,14 @@ import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import { apiCostApprovedProjectSerch } from "@/api/cost_approved_project";
 import detailConfig from './detail'
+import { useRoute } from "vue-router"
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 const detailRef = ref('')
 // 是否显示编辑框
 const showEdit = ref(false)
 const showDetail = ref(false)
+const route = useRoute()
 
 
 
@@ -136,6 +138,10 @@ const handleDetail = async (id: any) => {
     detailRef.value?.setFormData(res)
 }
 
+if (route.query?.contract_ledger) {
+    handleAdd()
+}
+
 getLists()
 </script>
 
diff --git a/src/views/marketing_framework_agreement/index.vue b/src/views/marketing_framework_agreement/index.vue
index 4b0d8f9..3562917 100644
--- a/src/views/marketing_framework_agreement/index.vue
+++ b/src/views/marketing_framework_agreement/index.vue
@@ -71,7 +71,7 @@
                                 @click="handledetail(row)">
                                 详情
                             </el-button>
-                            <el-button type="primary" link @click="handleContract(row)" v-if="row.is_generate">
+                            <el-button type="primary" v-if="row.is_generate">
                                 已生成合同
                             </el-button>
                             <el-button type=" primary" link @click="handleContract(row)" v-else>
diff --git a/src/views/selfEvaluation/index.vue b/src/views/selfEvaluation/index.vue
index 355d8d6..b476e26 100644
--- a/src/views/selfEvaluation/index.vue
+++ b/src/views/selfEvaluation/index.vue
@@ -43,11 +43,16 @@
             <div class="mt-4">
                 <el-table border :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
-                    <el-table-column label="考核类别" prop="progress" show-overflow-tooltip />
-                    <el-table-column label="模版名称" prop="build_area_text" show-overflow-tooltip />
-                    <el-table-column label="考核总分" prop="project_level_text" show-overflow-tooltip />
-                    <el-table-column label="创建人" prop="total_investment" show-overflow-tooltip width="120" />
-                    <el-table-column label="创建时间" prop="engineering_status_text" show-overflow-tooltip />
+                    <el-table-column label="自评人" prop="progress" show-overflow-tooltip />
+                    <el-table-column label="考核类别" prop="build_area_text" show-overflow-tooltip />
+                    <el-table-column label="考核模版" prop="project_level_text" show-overflow-tooltip />
+                    <el-table-column label="考核月份" prop="total_investment" show-overflow-tooltip width="120" />
+                    <el-table-column label="考核总分" prop="engineering_status_text" show-overflow-tooltip />
+                    <el-table-column label="自评得分" prop="engineering_status_text" show-overflow-tooltip />
+                    <el-table-column label="上评得分" prop="engineering_status_text" show-overflow-tooltip />
+                    <el-table-column label="最终得分" prop="engineering_status_text" show-overflow-tooltip />
+                    <el-table-column label="考核评语" prop="engineering_status_text" show-overflow-tooltip />
+                    <el-table-column label="自评时间" prop="engineering_status_text" show-overflow-tooltip />
                     <el-table-column label="操作" width="170" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['manage_basic.manage_project/edit']" type="primary" link