From a7afb1992515e7754d1872befa757edfbe8b0739 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Wed, 5 Jun 2024 11:17:47 +0800
Subject: [PATCH] add

---
 src/api/oaSelfExamine.ts                      |  36 ++
 .../dialogTable/dialogTableConfig.ts          |  25 ++
 src/layout/default/components/header/msg.vue  |   6 +-
 src/views/allAssessments/edit.vue             | 355 ------------------
 src/views/allAssessments/index.vue            |  97 ++---
 .../edit.vue                                  |  87 +++--
 .../index.vue                                 |  82 ++--
 7 files changed, 188 insertions(+), 500 deletions(-)
 create mode 100644 src/api/oaSelfExamine.ts
 delete mode 100644 src/views/allAssessments/edit.vue
 rename src/views/{selfEvaluation => oa_self_examine}/edit.vue (66%)
 rename src/views/{selfEvaluation => oa_self_examine}/index.vue (60%)

diff --git a/src/api/oaSelfExamine.ts b/src/api/oaSelfExamine.ts
new file mode 100644
index 0000000..dd9e272
--- /dev/null
+++ b/src/api/oaSelfExamine.ts
@@ -0,0 +1,36 @@
+import request from "@/utils/request";
+
+// 自评记录列表
+export function apiOaSelfExamineLists(params: any) {
+  return request.get({ url: "/jxgl.oa_self_examine/lists", params });
+}
+
+// 添加自评记录
+export function apiOaSelfExamineAdd(params: any) {
+  return request.post({ url: "/jxgl.oa_self_examine/add", params });
+}
+
+// 编辑自评记录
+export function apiOaSelfExamineEdit(params: any) {
+  return request.post({ url: "/jxgl.oa_self_examine/edit", params });
+}
+
+// 删除自评记录
+export function apiOaSelfExamineDelete(params: any) {
+  return request.post({ url: "/jxgl.oa_self_examine/delete", params });
+}
+
+// 自评记录详情
+export function apiOaSelfExamineDetail(params: any) {
+  return request.get({ url: "/jxgl.oa_self_examine/detail", params });
+}
+
+// 删除自评记录
+export function apidelete_detail(params: any) {
+  return request.post({ url: "/jxgl.oa_self_examine/delete_detail", params });
+}
+
+// 自评记录列表
+export function apioa_examine_allLists(params: any) {
+  return request.get({ url: "/jxgl.oa_examine_all/lists", params });
+}
diff --git a/src/components/dialogTable/dialogTableConfig.ts b/src/components/dialogTable/dialogTableConfig.ts
index ba6d864..ae21919 100644
--- a/src/components/dialogTable/dialogTableConfig.ts
+++ b/src/components/dialogTable/dialogTableConfig.ts
@@ -1077,3 +1077,28 @@ export const oa_flow_type: Iconfig = {
     { department_names: "应用部门" },
   ],
 };
+
+import { apiOaExamineTempLists } from "@/api/oa_examine_temp_item";
+
+export const oa_examine_temp_item: Iconfig = {
+  fetchFn: apiOaExamineTempLists,
+  dictData: "jxgl_check_type",
+  serchList: [
+    {
+      label: "模板名称",
+      value: "temp_name",
+    },
+    {
+      label: "考核类别",
+      value: "examine_type",
+      select: "jxgl_check_type",
+    },
+  ],
+  tableList: [
+    { examine_type_text: "考核类别" },
+    { temp_name: "模版名称" },
+    { total_score: "考核总分" },
+    { create_user: "创建人" },
+    { create_time: "创建时间" },
+  ],
+};
diff --git a/src/layout/default/components/header/msg.vue b/src/layout/default/components/header/msg.vue
index f538a68..d06c87a 100644
--- a/src/layout/default/components/header/msg.vue
+++ b/src/layout/default/components/header/msg.vue
@@ -33,9 +33,9 @@ const getNums = async () => {
 
 }
 
-setInterval(() => {
-    getNums()
-}, 10000);
+// setInterval(() => {
+//     getNums()
+// }, 10000);
 getNums()
 
 </script>
diff --git a/src/views/allAssessments/edit.vue b/src/views/allAssessments/edit.vue
deleted file mode 100644
index 3658b9f..0000000
--- a/src/views/allAssessments/edit.vue
+++ /dev/null
@@ -1,355 +0,0 @@
-<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
index 1165007..86f1bfb 100644
--- a/src/views/allAssessments/index.vue
+++ b/src/views/allAssessments/index.vue
@@ -4,23 +4,29 @@
             <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-form-item label="考核类别" prop="project_name">
+                            <el-select class="flex-1" v-model="queryParams.examine_type" clearable placeholder="请选择考核类别">
+                                <el-option v-for="(item, index) in dictData.jxgl_check_type" :key="index" :label="item.name"
+                                    :value="parseInt(item.value)" />
                             </el-select>
                         </el-form-item>
                     </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="考核人" prop="project_code">
+                            <el-input v-model="queryParams.kh_user" clearable placeholder="请输入考核人" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="被考核人" prop="project_code">
+                            <el-input v-model="queryParams.bkh_user" clearable placeholder="请输入被考核人" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="考核月份" prop="project_code">
+                            <el-date-picker v-model="queryParams.examine_month" type="month" value-format="YYYY-MM"
+                                placeholder="请选择考核月份" />
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="6">
                         <el-form-item>
                             <el-button type="primary" @click="resetPage">查询</el-button>
@@ -32,79 +38,50 @@
         </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 border :data="pager.lists">
                     <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="考核总分" prop="total_score" show-overflow-tooltip />
+                    <el-table-column label="最终得分" prop="final_score" show-overflow-tooltip />
+                    <el-table-column label="自评得分" prop="total_self_score" show-overflow-tooltip />
+                    <el-table-column label="上评得分" prop="total_superior_score" show-overflow-tooltip />
+                    <el-table-column label="考核评语" prop="content" show-overflow-tooltip />
+                    <el-table-column label="考核时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="被考核人" prop="bkh_user_name" show-overflow-tooltip />
+                    <el-table-column label="考核类型" prop="examine_type_text" show-overflow-tooltip />
+                    <el-table-column label="考核月份" prop="examine_month" 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 { apioa_examine_allLists } from '@/api/oaSelfExamine'
 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: ''
+    examine_type: "",
+    kh_user: '',
+    bkh_user: "",
+    examine_month: ""
 })
 
-// 选中数据
-const selectData = ref<any[]>([])
+const { dictData } = useDictData('jxgl_check_type')
 
-// 表格选择后回调事件
-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,
+    fetchFun: apioa_examine_allLists,
     params: queryParams
 })
 
 
-
-
-
 getLists()
 </script>
diff --git a/src/views/selfEvaluation/edit.vue b/src/views/oa_self_examine/edit.vue
similarity index 66%
rename from src/views/selfEvaluation/edit.vue
rename to src/views/oa_self_examine/edit.vue
index d556c26..03a2085 100644
--- a/src/views/selfEvaluation/edit.vue
+++ b/src/views/oa_self_examine/edit.vue
@@ -4,14 +4,9 @@
             <el-card>
                 <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
                     <el-row>
-                        <el-col :span="8">
-                            <el-form-item label="自评人" prop="industry">
-                                <el-input v-model="formData.admin_user" readonly />
-                            </el-form-item>
-                        </el-col>
                         <el-col :span="8">
                             <el-form-item label="考核类别" prop="type">
-                                <el-select class="flex-1" v-model="formData.type" clearable placeholder="请选择考核类别">
+                                <el-select class="flex-1" v-model="formData.examine_type" clearable placeholder="请选择考核类别">
                                     <el-option v-for="(item, index) in dictData.jxgl_check_type" :key="index"
                                         :label="item.name" :value="parseInt(item.value)" />
                                 </el-select>
@@ -19,13 +14,13 @@
                         </el-col>
                         <el-col :span="8">
                             <el-form-item label="模版名称" prop="name">
-                                <el-input v-model="formData.name" clearable placeholder="请输入模版名称" readonly
-                                    :disabled="!formData.type" />
+                                <el-input v-model="formData.temp_name" clearable placeholder="点击选择模版" readonly
+                                    :disabled="!formData.examine_type" @click="showDialog = true" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="8">
                             <el-form-item label="考核月份" prop="name">
-                                <el-date-picker v-model="formData.month" type="month" value-format="YYYY-MM"
+                                <el-date-picker v-model="formData.examine_month" type="month" value-format="YYYY-MM"
                                     placeholder="请选择考核月份" />
                             </el-form-item>
                         </el-col>
@@ -41,28 +36,29 @@
                         </template>
                         <el-table-column label="考核项" prop="progress" show-overflow-tooltip>
                             <template #default="{ row }">
-                                <el-input v-model="row.admin_user" placeholder="请输入考核项" />
+                                <el-input v-model="row.examine_item" placeholder="请输入考核项" />
                             </template>
                         </el-table-column>
                         <el-table-column label="分数" prop="progress" show-overflow-tooltip>
                             <template #default="{ row }">
-                                <el-input v-model="row.admin_user" placeholder="请输入分数" />
+                                <el-input v-model="row.score" placeholder="请输入分数" />
                             </template>
                         </el-table-column>
                         <el-table-column label="考核说明" prop="progress" show-overflow-tooltip>
                             <template #default="{ row }">
-                                <el-input v-model="row.admin_user" placeholder="请输入考核说明" />
+                                <el-input v-model="row.examine_desc" placeholder="请输入考核说明" />
                             </template>
                         </el-table-column>
                         <el-table-column label="自评得分" prop="progress" show-overflow-tooltip>
                             <template #default="{ row }">
-                                <el-input v-model="row.admin_user" placeholder="请输入自评得分" />
+                                <el-input v-model="row.self_score" placeholder="请输入自评得分" type="number"
+                                    @change="updateScore" />
                             </template>
                         </el-table-column>
                         <el-table-column label="操作" prop="progress" show-overflow-tooltip>
-                            <template #default="{ row }">
+                            <template #default="{ row, $index }">
                                 <el-button @click="handleAdd" size="small">+</el-button>
-                                <el-button @click="handleAdd" size="small">-</el-button>
+                                <el-button @click="handDelete(row, $index)" size="small">-</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -71,13 +67,18 @@
             <el-card>
                 <el-descriptions :column="3" border>
                     <el-descriptions-item label="考核总分" label-align="left" align="left">
-                        { formData.org_name }
+                        {{ formData.total_score }}
                     </el-descriptions-item>
                     <el-descriptions-item label="自评得分" label-align="left" align="left">
-                        { formData.org_name }
+                        {{ formData.total_self_score }}
                     </el-descriptions-item>
                 </el-descriptions>
             </el-card>
+            <el-dialog v-model="showDialog" title="选择考核模版" width="60%">
+                <dialogTable :config="oa_examine_temp_item" :query="{ examine_type: formData.examine_type }"
+                    @customEvent="customEvent">
+                </dialogTable>
+            </el-dialog>
         </popup>
     </div>
 </template>
@@ -85,12 +86,11 @@
 <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 { apiOaSelfExamineEdit, apiOaSelfExamineAdd, apidelete_detail } from '@/api/oaSelfExamine'
 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";
+import { oa_examine_temp_item } from "@/components/dialogTable/dialogTableConfig";
+import { apiOaExamineTempDetail } from '@/api/oa_examine_temp_item.ts'
 
 
 defineProps({
@@ -103,7 +103,7 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
-const useStore = useUserStore().userInfo
+const showDialog = ref(false)
 
 
 
@@ -115,19 +115,44 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
-    nature: '',
-    name: '',
-    admin: useStore.id,
-    admin_user: useStore.name,
-    month: "",
-    detail: []
-
+    "examine_temp_id": '',
+    temp_name: "",
+    "examine_type": '',
+    "examine_month": "",
+    total_score: 0,
+    total_self_score: 0,
+    "detail": []
 })
 
+
 const handleAdd = () => {
     formData.detail.push({})
 }
 
+const handDelete = async (row, index) => {
+    if (row.id) { await apidelete_detail({ id: row.id }) }
+    formData.detail.splice(index, 1)
+}
+
+
+
+const updateScore = () => {
+    formData.total_self_scor = 0
+    formData.detail.forEach((item, index) => {
+        formData.total_self_score += (Number(item.self_score) || 0)
+    })
+}
+
+const customEvent = async (e) => {
+    formData.temp_name = e.temp_name
+    formData.examine_temp_id = e.id
+    showDialog.value = false
+    let res = await apiOaExamineTempDetail({ id: e.id })
+    formData.total_score = res.total_score
+    formData.detail = res.detail.map(item => { return { examine_item: item.examine_item, score: item.score, examine_desc: item.examine_desc } })
+}
+
+
 
 // 表单验证
 const formRules = reactive<any>({
@@ -170,8 +195,8 @@ const handleSubmit = async () => {
     await formRef.value?.validate()
     const data = { ...formData, }
     mode.value == 'edit'
-        ? await apiManageProjectEdit(data)
-        : await apiManageProjectAdd(data)
+        ? await apiOaSelfExamineEdit(data)
+        : await apiOaSelfExamineAdd(data)
     popupRef.value?.close()
     emit('success')
 }
diff --git a/src/views/selfEvaluation/index.vue b/src/views/oa_self_examine/index.vue
similarity index 60%
rename from src/views/selfEvaluation/index.vue
rename to src/views/oa_self_examine/index.vue
index 8efa99c..a21dc65 100644
--- a/src/views/selfEvaluation/index.vue
+++ b/src/views/oa_self_examine/index.vue
@@ -4,23 +4,19 @@
             <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-form-item label="考核类别" prop="project_name">
+                            <el-select class="flex-1" v-model="queryParams.examine_type" clearable placeholder="请选择考核类别">
+                                <el-option v-for="(item, index) in dictData.jxgl_check_type" :key="index" :label="item.name"
+                                    :value="parseInt(item.value)" />
                             </el-select>
                         </el-form-item>
                     </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="考核月份" prop="project_code">
+                            <el-date-picker v-model="queryParams.examine_month" type="month" value-format="YYYY-MM"
+                                placeholder="请选择考核月份" />
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="6">
                         <el-form-item>
                             <el-button type="primary" @click="resetPage">查询</el-button>
@@ -37,22 +33,19 @@
                 </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 border :data="pager.lists">
                     <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="user_name" show-overflow-tooltip />
+                    <el-table-column label="考核类别" prop="examine_type_text" show-overflow-tooltip />
+                    <el-table-column label="考核模版" prop="temp_name" show-overflow-tooltip />
+                    <el-table-column label="考核月份" prop="examine_month" show-overflow-tooltip width="120" />
+                    <el-table-column label="考核总分" prop="total_score" show-overflow-tooltip />
+                    <el-table-column label="自评得分" prop="total_self_score" 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="create_time" 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
@@ -71,8 +64,7 @@
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="success()" @close="showEdit = false"
-            :deptList="deptList" />
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
 
     </div>
 </template>
@@ -80,13 +72,13 @@
 <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";
+import { apiOaSelfExamineLists, apiOaSelfExamineDelete, apiOaSelfExamineDetail } from '@/api/oaSelfExamine'
+
+
+
 
-const route = useRoute()
-const router = useRouter()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 const detailRef = ref('')
 // 是否显示编辑框
@@ -96,29 +88,17 @@ const showDetail = ref(false)
 
 // 查询条件
 const queryParams = reactive({
-    project_name: '',
-    project_code: '',
-    nature: '',
-    industry: '',
-    build_area: '',
-    project_level: '',
-    engineering_status: ''
+    examine_type: "",
+    examine_month: ""
 })
 
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
 
 // 获取字典数据
 const { dictData } = useDictData('jxgl_check_type')
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiManageProjectLists,
+    fetchFun: apiOaSelfExamineLists,
     params: queryParams
 })
 
@@ -131,7 +111,7 @@ const handleAdd = async () => {
 
 // 编辑
 const handleEdit = async (data: any) => {
-    let res = await apiManageProjectDetail({ id: data.id })
+    let res = await apiOaSelfExamineDetail({ id: data.id })
     showEdit.value = true
     await nextTick()
     editRef.value?.open('edit')
@@ -141,7 +121,7 @@ const handleEdit = async (data: any) => {
 // 删除
 const handleDelete = async (id: number | any[]) => {
     await feedback.confirm('确定要删除？')
-    await apiManageProjectDelete({ id })
+    await apiOaSelfExamineDelete({ id })
     getLists()
 }