diff --git a/src/api/home/1 b/src/api/home/1
deleted file mode 100644
index e69de29..0000000
--- a/src/api/home/1
+++ /dev/null

diff --git a/src/api/home/1 b/src/api/home/1
deleted file mode 100644
index e69de29..0000000
--- a/src/api/home/1
+++ /dev/null
diff --git a/src/api/home/filling/filling.ts b/src/api/home/filling/filling.ts
new file mode 100644
index 0000000..47914e0
--- /dev/null
+++ b/src/api/home/filling/filling.ts
@@ -0,0 +1,29 @@
+/**
+ * 填报相关接口
+ */
+import request from '@/api/index'
+
+// 分页列表
+export function getListPage(params: object) {
+  return request({
+    url: '/planQuotaRep/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 填报
+export function filling(data: object) {
+  return request({
+    url: '/planQuotaRep/updateRep',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function batchSubmitApi(data: object) {
+  return request({
+    url: '/planQuotaRep/batchSubmit',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/home/1 b/src/api/home/1
deleted file mode 100644
index e69de29..0000000
--- a/src/api/home/1
+++ /dev/null
diff --git a/src/api/home/filling/filling.ts b/src/api/home/filling/filling.ts
new file mode 100644
index 0000000..47914e0
--- /dev/null
+++ b/src/api/home/filling/filling.ts
@@ -0,0 +1,29 @@
+/**
+ * 填报相关接口
+ */
+import request from '@/api/index'
+
+// 分页列表
+export function getListPage(params: object) {
+  return request({
+    url: '/planQuotaRep/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 填报
+export function filling(data: object) {
+  return request({
+    url: '/planQuotaRep/updateRep',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function batchSubmitApi(data: object) {
+  return request({
+    url: '/planQuotaRep/batchSubmit',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/rule/programme.ts b/src/api/home/rule/programme.ts
index cbf5585..91e1dbe 100644
--- a/src/api/home/rule/programme.ts
+++ b/src/api/home/rule/programme.ts
@@ -51,4 +51,26 @@
     data,
   })
 }
-
+// 方案指标列表
+export function ProxyList(params: object) {
+  return request({
+    url: '/assessmentPlan/planQuotaListPage',
+    method: 'get',
+    params,
+  })
+}
+// 考核方案等级下拉 /assessmentLevel/list
+export function getGradeSelectList() {
+  return request({
+    url: '/assessmentLevel/list',
+    method: 'get',
+  })
+}
+// 启用考核计划方案
+export function updatePlanEnabled(data: object) {
+  return request({
+    url: '/assessmentPlan/updatePlanEnabled',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/home/1 b/src/api/home/1
deleted file mode 100644
index e69de29..0000000
--- a/src/api/home/1
+++ /dev/null
diff --git a/src/api/home/filling/filling.ts b/src/api/home/filling/filling.ts
new file mode 100644
index 0000000..47914e0
--- /dev/null
+++ b/src/api/home/filling/filling.ts
@@ -0,0 +1,29 @@
+/**
+ * 填报相关接口
+ */
+import request from '@/api/index'
+
+// 分页列表
+export function getListPage(params: object) {
+  return request({
+    url: '/planQuotaRep/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 填报
+export function filling(data: object) {
+  return request({
+    url: '/planQuotaRep/updateRep',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function batchSubmitApi(data: object) {
+  return request({
+    url: '/planQuotaRep/batchSubmit',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/rule/programme.ts b/src/api/home/rule/programme.ts
index cbf5585..91e1dbe 100644
--- a/src/api/home/rule/programme.ts
+++ b/src/api/home/rule/programme.ts
@@ -51,4 +51,26 @@
     data,
   })
 }
-
+// 方案指标列表
+export function ProxyList(params: object) {
+  return request({
+    url: '/assessmentPlan/planQuotaListPage',
+    method: 'get',
+    params,
+  })
+}
+// 考核方案等级下拉 /assessmentLevel/list
+export function getGradeSelectList() {
+  return request({
+    url: '/assessmentLevel/list',
+    method: 'get',
+  })
+}
+// 启用考核计划方案
+export function updatePlanEnabled(data: object) {
+  return request({
+    url: '/assessmentPlan/updatePlanEnabled',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 5c765ed..a221af2 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -6,6 +6,10 @@
     type: String,
     required: true,
   },
+  minioFileId: {
+    type: String,
+    required: true,
+  },
   height: {
     type: String,
     default: '100px',
@@ -24,17 +28,20 @@
     //   url.value = res.data
     // })
     const arr = props.minioFileName.split(',')
-    urlList.value = arr.map((item) => {
+    const ids = props.minioFileId.split(',')
+    console.log(ids, 'ids')
+    urlList.value = arr.map((item, index) => {
+      console.log(`${import.meta.env.VITE_APP_API_BASEURL}${ids[index]}`)
       return {
         minioFileName: item,
-        url: '',
+        url: `${import.meta.env.VITE_APP_API_BASEURL}/static/${ids[index]}`,
       }
     })
-    urlList.value.forEach((item: any) => {
-      getFileUrl(item.minioFileName).then((res) => {
-        item.url = res.data
-      })
-    })
+    // urlList.value.forEach((item: any) => {
+    //   getFileUrl(item.minioFileName).then((res) => {
+    //     item.url = res.data
+    //   })
+    // })
   }
   else {
     urlList.value = []

diff --git a/src/api/home/1 b/src/api/home/1
deleted file mode 100644
index e69de29..0000000
--- a/src/api/home/1
+++ /dev/null
diff --git a/src/api/home/filling/filling.ts b/src/api/home/filling/filling.ts
new file mode 100644
index 0000000..47914e0
--- /dev/null
+++ b/src/api/home/filling/filling.ts
@@ -0,0 +1,29 @@
+/**
+ * 填报相关接口
+ */
+import request from '@/api/index'
+
+// 分页列表
+export function getListPage(params: object) {
+  return request({
+    url: '/planQuotaRep/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 填报
+export function filling(data: object) {
+  return request({
+    url: '/planQuotaRep/updateRep',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function batchSubmitApi(data: object) {
+  return request({
+    url: '/planQuotaRep/batchSubmit',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/rule/programme.ts b/src/api/home/rule/programme.ts
index cbf5585..91e1dbe 100644
--- a/src/api/home/rule/programme.ts
+++ b/src/api/home/rule/programme.ts
@@ -51,4 +51,26 @@
     data,
   })
 }
-
+// 方案指标列表
+export function ProxyList(params: object) {
+  return request({
+    url: '/assessmentPlan/planQuotaListPage',
+    method: 'get',
+    params,
+  })
+}
+// 考核方案等级下拉 /assessmentLevel/list
+export function getGradeSelectList() {
+  return request({
+    url: '/assessmentLevel/list',
+    method: 'get',
+  })
+}
+// 启用考核计划方案
+export function updatePlanEnabled(data: object) {
+  return request({
+    url: '/assessmentPlan/updatePlanEnabled',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 5c765ed..a221af2 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -6,6 +6,10 @@
     type: String,
     required: true,
   },
+  minioFileId: {
+    type: String,
+    required: true,
+  },
   height: {
     type: String,
     default: '100px',
@@ -24,17 +28,20 @@
     //   url.value = res.data
     // })
     const arr = props.minioFileName.split(',')
-    urlList.value = arr.map((item) => {
+    const ids = props.minioFileId.split(',')
+    console.log(ids, 'ids')
+    urlList.value = arr.map((item, index) => {
+      console.log(`${import.meta.env.VITE_APP_API_BASEURL}${ids[index]}`)
       return {
         minioFileName: item,
-        url: '',
+        url: `${import.meta.env.VITE_APP_API_BASEURL}/static/${ids[index]}`,
       }
     })
-    urlList.value.forEach((item: any) => {
-      getFileUrl(item.minioFileName).then((res) => {
-        item.url = res.data
-      })
-    })
+    // urlList.value.forEach((item: any) => {
+    //   getFileUrl(item.minioFileName).then((res) => {
+    //     item.url = res.data
+    //   })
+    // })
   }
   else {
     urlList.value = []
diff --git a/src/views/flling/already/index copy.vue b/src/views/flling/already/index copy.vue
new file mode 100644
index 0000000..8ee5ca4
--- /dev/null
+++ b/src/views/flling/already/index copy.vue
@@ -0,0 +1,199 @@
+<!--
+ * @Description: 考核填报-已填报列表页面
+ * @Author: 李亚光
+ * @Date: 2023-09-14
+ -->
+<script lang="ts" setup name="FillingAlreadyList">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '考核结果编号',
+    value: 'groupName',
+    align: 'center',
+  },
+  {
+    text: '考核方案名称',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '考核对象',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '考核周期',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核时间',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标项目',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标类型',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '一级考核指标',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标得分',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核说明',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '附件',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '提交状态',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '填报时间',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  // getGroupList(listQuery).then((response) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  listLoading.value = false
+  // })
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  // $router.push({
+  //   path: `/group/${type}`,
+  //   query: {
+  //     row: JSON.stringify(row),
+  //     id: row.id,
+  //   },
+  // })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除此分组信息吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // delGroup(row.id).then((res) => {
+    //   ElMessage.success('操作成功')
+    //   search()
+    // })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="考核时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary">
+          导出
+        </el-button>
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" @change="changePage"
+      >
+        <!-- <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small">
+                填报
+              </el-button>
+              <el-button link type="primary" size="small">
+                提交
+              </el-button>
+            </template>
+          </el-table-column>
+        </template> -->
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+

diff --git a/src/api/home/1 b/src/api/home/1
deleted file mode 100644
index e69de29..0000000
--- a/src/api/home/1
+++ /dev/null
diff --git a/src/api/home/filling/filling.ts b/src/api/home/filling/filling.ts
new file mode 100644
index 0000000..47914e0
--- /dev/null
+++ b/src/api/home/filling/filling.ts
@@ -0,0 +1,29 @@
+/**
+ * 填报相关接口
+ */
+import request from '@/api/index'
+
+// 分页列表
+export function getListPage(params: object) {
+  return request({
+    url: '/planQuotaRep/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 填报
+export function filling(data: object) {
+  return request({
+    url: '/planQuotaRep/updateRep',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function batchSubmitApi(data: object) {
+  return request({
+    url: '/planQuotaRep/batchSubmit',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/rule/programme.ts b/src/api/home/rule/programme.ts
index cbf5585..91e1dbe 100644
--- a/src/api/home/rule/programme.ts
+++ b/src/api/home/rule/programme.ts
@@ -51,4 +51,26 @@
     data,
   })
 }
-
+// 方案指标列表
+export function ProxyList(params: object) {
+  return request({
+    url: '/assessmentPlan/planQuotaListPage',
+    method: 'get',
+    params,
+  })
+}
+// 考核方案等级下拉 /assessmentLevel/list
+export function getGradeSelectList() {
+  return request({
+    url: '/assessmentLevel/list',
+    method: 'get',
+  })
+}
+// 启用考核计划方案
+export function updatePlanEnabled(data: object) {
+  return request({
+    url: '/assessmentPlan/updatePlanEnabled',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 5c765ed..a221af2 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -6,6 +6,10 @@
     type: String,
     required: true,
   },
+  minioFileId: {
+    type: String,
+    required: true,
+  },
   height: {
     type: String,
     default: '100px',
@@ -24,17 +28,20 @@
     //   url.value = res.data
     // })
     const arr = props.minioFileName.split(',')
-    urlList.value = arr.map((item) => {
+    const ids = props.minioFileId.split(',')
+    console.log(ids, 'ids')
+    urlList.value = arr.map((item, index) => {
+      console.log(`${import.meta.env.VITE_APP_API_BASEURL}${ids[index]}`)
       return {
         minioFileName: item,
-        url: '',
+        url: `${import.meta.env.VITE_APP_API_BASEURL}/static/${ids[index]}`,
       }
     })
-    urlList.value.forEach((item: any) => {
-      getFileUrl(item.minioFileName).then((res) => {
-        item.url = res.data
-      })
-    })
+    // urlList.value.forEach((item: any) => {
+    //   getFileUrl(item.minioFileName).then((res) => {
+    //     item.url = res.data
+    //   })
+    // })
   }
   else {
     urlList.value = []
diff --git a/src/views/flling/already/index copy.vue b/src/views/flling/already/index copy.vue
new file mode 100644
index 0000000..8ee5ca4
--- /dev/null
+++ b/src/views/flling/already/index copy.vue
@@ -0,0 +1,199 @@
+<!--
+ * @Description: 考核填报-已填报列表页面
+ * @Author: 李亚光
+ * @Date: 2023-09-14
+ -->
+<script lang="ts" setup name="FillingAlreadyList">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '考核结果编号',
+    value: 'groupName',
+    align: 'center',
+  },
+  {
+    text: '考核方案名称',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '考核对象',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '考核周期',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核时间',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标项目',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标类型',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '一级考核指标',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标得分',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核说明',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '附件',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '提交状态',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '填报时间',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  // getGroupList(listQuery).then((response) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  listLoading.value = false
+  // })
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  // $router.push({
+  //   path: `/group/${type}`,
+  //   query: {
+  //     row: JSON.stringify(row),
+  //     id: row.id,
+  //   },
+  // })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除此分组信息吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // delGroup(row.id).then((res) => {
+    //   ElMessage.success('操作成功')
+    //   search()
+    // })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="考核时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary">
+          导出
+        </el-button>
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" @change="changePage"
+      >
+        <!-- <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small">
+                填报
+              </el-button>
+              <el-button link type="primary" size="small">
+                提交
+              </el-button>
+            </template>
+          </el-table-column>
+        </template> -->
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
diff --git a/src/views/flling/already/index.vue b/src/views/flling/already/index.vue
index 8ee5ca4..ca7731c 100644
--- a/src/views/flling/already/index.vue
+++ b/src/views/flling/already/index.vue
@@ -4,196 +4,10 @@
  * @Date: 2023-09-14
  -->
 <script lang="ts" setup name="FillingAlreadyList">
-import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-const { proxy } = getCurrentInstance() as any
-const listQuery = reactive({
-  offset: 1,
-  limit: 20,
-})
-const columns = ref([
-  {
-    text: '考核结果编号',
-    value: 'groupName',
-    align: 'center',
-  },
-  {
-    text: '考核方案名称',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '考核对象',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '考核周期',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核时间',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标项目',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标类型',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '一级考核指标',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标得分',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核说明',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '附件',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '提交状态',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '填报时间',
-    value: 'remark',
-    align: 'center',
-  },
-])
-const list = ref([])
-const total = ref(0)
-const listLoading = ref(true)
-
-// 获取数据
-const fetchData = (isNowPage = true) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  // getGroupList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  listLoading.value = false
-  // })
-}
-fetchData()
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-// 重置
-const reset = () => {
-  listQuery.offset = 1
-  listQuery.limit = 20
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size: number; page: number }) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData()
-}
-const $router = useRouter()
-// 新建编辑操作
-const handler = (row: any, type: string) => {
-  // $router.push({
-  //   path: `/group/${type}`,
-  //   query: {
-  //     row: JSON.stringify(row),
-  //     id: row.id,
-  //   },
-  // })
-}
-// 删除
-const delHandler = (row: any) => {
-  ElMessageBox.confirm(
-    '确认删除此分组信息吗?',
-    '确认',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    // delGroup(row.id).then((res) => {
-    //   ElMessage.success('操作成功')
-    //   search()
-    // })
-  })
-}
+import list from '@/views/flling/treat/index.vue'
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="考核时间"
-        />
-      </search-item>
-    </search-area>
-    <table-container>
-      <template #btns-right>
-        <el-button type="primary">
-          导出
-        </el-button>
-      </template>
-      <!-- 普通表格 -->
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
-      >
-        <!-- <template #columns>
-          <el-table-column label="操作" width="140" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small">
-                填报
-              </el-button>
-              <el-button link type="primary" size="small">
-                提交
-              </el-button>
-            </template>
-          </el-table-column>
-        </template> -->
-      </normal-table>
-    </table-container>
-  </app-container>
+  <list />
 </template>
 

diff --git a/src/api/home/1 b/src/api/home/1
deleted file mode 100644
index e69de29..0000000
--- a/src/api/home/1
+++ /dev/null
diff --git a/src/api/home/filling/filling.ts b/src/api/home/filling/filling.ts
new file mode 100644
index 0000000..47914e0
--- /dev/null
+++ b/src/api/home/filling/filling.ts
@@ -0,0 +1,29 @@
+/**
+ * 填报相关接口
+ */
+import request from '@/api/index'
+
+// 分页列表
+export function getListPage(params: object) {
+  return request({
+    url: '/planQuotaRep/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 填报
+export function filling(data: object) {
+  return request({
+    url: '/planQuotaRep/updateRep',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function batchSubmitApi(data: object) {
+  return request({
+    url: '/planQuotaRep/batchSubmit',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/rule/programme.ts b/src/api/home/rule/programme.ts
index cbf5585..91e1dbe 100644
--- a/src/api/home/rule/programme.ts
+++ b/src/api/home/rule/programme.ts
@@ -51,4 +51,26 @@
     data,
   })
 }
-
+// 方案指标列表
+export function ProxyList(params: object) {
+  return request({
+    url: '/assessmentPlan/planQuotaListPage',
+    method: 'get',
+    params,
+  })
+}
+// 考核方案等级下拉 /assessmentLevel/list
+export function getGradeSelectList() {
+  return request({
+    url: '/assessmentLevel/list',
+    method: 'get',
+  })
+}
+// 启用考核计划方案
+export function updatePlanEnabled(data: object) {
+  return request({
+    url: '/assessmentPlan/updatePlanEnabled',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 5c765ed..a221af2 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -6,6 +6,10 @@
     type: String,
     required: true,
   },
+  minioFileId: {
+    type: String,
+    required: true,
+  },
   height: {
     type: String,
     default: '100px',
@@ -24,17 +28,20 @@
     //   url.value = res.data
     // })
     const arr = props.minioFileName.split(',')
-    urlList.value = arr.map((item) => {
+    const ids = props.minioFileId.split(',')
+    console.log(ids, 'ids')
+    urlList.value = arr.map((item, index) => {
+      console.log(`${import.meta.env.VITE_APP_API_BASEURL}${ids[index]}`)
       return {
         minioFileName: item,
-        url: '',
+        url: `${import.meta.env.VITE_APP_API_BASEURL}/static/${ids[index]}`,
       }
     })
-    urlList.value.forEach((item: any) => {
-      getFileUrl(item.minioFileName).then((res) => {
-        item.url = res.data
-      })
-    })
+    // urlList.value.forEach((item: any) => {
+    //   getFileUrl(item.minioFileName).then((res) => {
+    //     item.url = res.data
+    //   })
+    // })
   }
   else {
     urlList.value = []
diff --git a/src/views/flling/already/index copy.vue b/src/views/flling/already/index copy.vue
new file mode 100644
index 0000000..8ee5ca4
--- /dev/null
+++ b/src/views/flling/already/index copy.vue
@@ -0,0 +1,199 @@
+<!--
+ * @Description: 考核填报-已填报列表页面
+ * @Author: 李亚光
+ * @Date: 2023-09-14
+ -->
+<script lang="ts" setup name="FillingAlreadyList">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '考核结果编号',
+    value: 'groupName',
+    align: 'center',
+  },
+  {
+    text: '考核方案名称',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '考核对象',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '考核周期',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核时间',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标项目',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标类型',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '一级考核指标',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标得分',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核说明',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '附件',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '提交状态',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '填报时间',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  // getGroupList(listQuery).then((response) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  listLoading.value = false
+  // })
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  // $router.push({
+  //   path: `/group/${type}`,
+  //   query: {
+  //     row: JSON.stringify(row),
+  //     id: row.id,
+  //   },
+  // })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除此分组信息吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // delGroup(row.id).then((res) => {
+    //   ElMessage.success('操作成功')
+    //   search()
+    // })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="考核时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary">
+          导出
+        </el-button>
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" @change="changePage"
+      >
+        <!-- <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small">
+                填报
+              </el-button>
+              <el-button link type="primary" size="small">
+                提交
+              </el-button>
+            </template>
+          </el-table-column>
+        </template> -->
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
diff --git a/src/views/flling/already/index.vue b/src/views/flling/already/index.vue
index 8ee5ca4..ca7731c 100644
--- a/src/views/flling/already/index.vue
+++ b/src/views/flling/already/index.vue
@@ -4,196 +4,10 @@
  * @Date: 2023-09-14
  -->
 <script lang="ts" setup name="FillingAlreadyList">
-import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-const { proxy } = getCurrentInstance() as any
-const listQuery = reactive({
-  offset: 1,
-  limit: 20,
-})
-const columns = ref([
-  {
-    text: '考核结果编号',
-    value: 'groupName',
-    align: 'center',
-  },
-  {
-    text: '考核方案名称',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '考核对象',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '考核周期',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核时间',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标项目',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标类型',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '一级考核指标',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标得分',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核说明',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '附件',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '提交状态',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '填报时间',
-    value: 'remark',
-    align: 'center',
-  },
-])
-const list = ref([])
-const total = ref(0)
-const listLoading = ref(true)
-
-// 获取数据
-const fetchData = (isNowPage = true) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  // getGroupList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  listLoading.value = false
-  // })
-}
-fetchData()
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-// 重置
-const reset = () => {
-  listQuery.offset = 1
-  listQuery.limit = 20
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size: number; page: number }) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData()
-}
-const $router = useRouter()
-// 新建编辑操作
-const handler = (row: any, type: string) => {
-  // $router.push({
-  //   path: `/group/${type}`,
-  //   query: {
-  //     row: JSON.stringify(row),
-  //     id: row.id,
-  //   },
-  // })
-}
-// 删除
-const delHandler = (row: any) => {
-  ElMessageBox.confirm(
-    '确认删除此分组信息吗?',
-    '确认',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    // delGroup(row.id).then((res) => {
-    //   ElMessage.success('操作成功')
-    //   search()
-    // })
-  })
-}
+import list from '@/views/flling/treat/index.vue'
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="考核时间"
-        />
-      </search-item>
-    </search-area>
-    <table-container>
-      <template #btns-right>
-        <el-button type="primary">
-          导出
-        </el-button>
-      </template>
-      <!-- 普通表格 -->
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
-      >
-        <!-- <template #columns>
-          <el-table-column label="操作" width="140" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small">
-                填报
-              </el-button>
-              <el-button link type="primary" size="small">
-                提交
-              </el-button>
-            </template>
-          </el-table-column>
-        </template> -->
-      </normal-table>
-    </table-container>
-  </app-container>
+  <list />
 </template>
 
diff --git a/src/views/flling/treat/fillingDialog.vue b/src/views/flling/treat/fillingDialog.vue
new file mode 100644
index 0000000..d3b0e54
--- /dev/null
+++ b/src/views/flling/treat/fillingDialog.vue
@@ -0,0 +1,179 @@
+<!-- 考核填报弹窗 -->
+<script lang="ts" setup name="FillingDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { uploadApi } from '@/api/common'
+import { filling } from '@/api/home/filling/filling'
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+const dialogVisible = ref(false)
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+}
+const rowData = ref({})
+const defaultFormData = {
+  assDesc: '', // 考核说明
+  fileId: '',
+  fileName: '',
+  score: '',
+}
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  assDesc: [{ required: true, message: '考核说明不可为空', trigger: ['blur', 'change'] }],
+  score: [{ required: true, message: '考核得分不可为空', trigger: ['blur', 'change'] }],
+})
+
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      const data = {
+        assDesc: formData.assDesc,
+        fileId: formData.fileId,
+        fileName: formData.fileName,
+        score: formData.score,
+        id: rowData.value.id,
+      }
+      filling(data).then((res) => {
+        ElMessage.success('填报成功')
+        dialogVisible.value = false
+        resetForm()
+        emits('closeRefresh')
+      })
+    }
+  })
+}
+// 重置表单
+function resetForm() {
+  const form = formData
+  const keys = Object.keys(formData)
+  keys.forEach((key) => {
+    form[key] = defaultFormData[key]
+  })
+  Object.assign(formData, form)
+  nextTick(() => {
+    dataFormRef.value?.clearValidate()
+  })
+}
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: any) {
+  dialogVisible.value = true
+  rowData.value = row
+  resetForm()
+}
+
+// 关闭弹窗
+function dialogClose() {
+  resetForm()
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('file', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        formData.fileId = formData.fileId ? `${formData.fileId},${res.data.fileId}` : res.data.fileId
+        formData.fileName = formData.fileName ? `${formData.fileName},${res.data.fileName}` : res.data.fileName
+        // 重置当前验证
+        // dataFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+// 上传
+const upload = () => {
+  fileRef.value.click()
+}
+// 删除上传的文件
+const deleteFile = (fileName: string) => {
+  const data = formData.fileName.split(',')
+  const ids = formData.fileId.split(',')
+  const filterData = data.filter(item => item !== fileName)
+  const filterid = ids.filter((item, index) => index !== data.findIndex(citem => citem === fileName))
+  formData.fileId = filterid.length ? filterid.join(',') : ''
+  formData.fileName = filterData.length ? filterData.join(',') : ''
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="填报"
+    width="50%"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <el-form
+      ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="110px" class="form-container"
+      size="default" @submit.prevent
+    >
+      <el-row :gutter="24">
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="考核得分" prop="score" class="required">
+            <el-input v-model.trim="formData.score" type="text" placeholder="0-12之间" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="考核说明" prop="assDesc" class="required">
+            <el-input v-model.trim="formData.assDesc" type="textarea" placeholder="考核说明" :rows="4" maxlength="100" show-word-limit />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="附件上传">
+            <show-photo :minio-file-name="formData.fileName" :minio-file-id="formData.fileId" @delete="deleteFile" />
+            <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
+            <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload">
+              上传
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitForm(dataFormRef)">
+          保存
+        </el-button>
+        <el-button @click="dialogClose">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.form-container {
+  width: 100%;
+
+  .full-width-input {
+    width: 100%;
+  }
+}
+</style>

diff --git a/src/api/home/1 b/src/api/home/1
deleted file mode 100644
index e69de29..0000000
--- a/src/api/home/1
+++ /dev/null
diff --git a/src/api/home/filling/filling.ts b/src/api/home/filling/filling.ts
new file mode 100644
index 0000000..47914e0
--- /dev/null
+++ b/src/api/home/filling/filling.ts
@@ -0,0 +1,29 @@
+/**
+ * 填报相关接口
+ */
+import request from '@/api/index'
+
+// 分页列表
+export function getListPage(params: object) {
+  return request({
+    url: '/planQuotaRep/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 填报
+export function filling(data: object) {
+  return request({
+    url: '/planQuotaRep/updateRep',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function batchSubmitApi(data: object) {
+  return request({
+    url: '/planQuotaRep/batchSubmit',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/rule/programme.ts b/src/api/home/rule/programme.ts
index cbf5585..91e1dbe 100644
--- a/src/api/home/rule/programme.ts
+++ b/src/api/home/rule/programme.ts
@@ -51,4 +51,26 @@
     data,
   })
 }
-
+// 方案指标列表
+export function ProxyList(params: object) {
+  return request({
+    url: '/assessmentPlan/planQuotaListPage',
+    method: 'get',
+    params,
+  })
+}
+// 考核方案等级下拉 /assessmentLevel/list
+export function getGradeSelectList() {
+  return request({
+    url: '/assessmentLevel/list',
+    method: 'get',
+  })
+}
+// 启用考核计划方案
+export function updatePlanEnabled(data: object) {
+  return request({
+    url: '/assessmentPlan/updatePlanEnabled',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 5c765ed..a221af2 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -6,6 +6,10 @@
     type: String,
     required: true,
   },
+  minioFileId: {
+    type: String,
+    required: true,
+  },
   height: {
     type: String,
     default: '100px',
@@ -24,17 +28,20 @@
     //   url.value = res.data
     // })
     const arr = props.minioFileName.split(',')
-    urlList.value = arr.map((item) => {
+    const ids = props.minioFileId.split(',')
+    console.log(ids, 'ids')
+    urlList.value = arr.map((item, index) => {
+      console.log(`${import.meta.env.VITE_APP_API_BASEURL}${ids[index]}`)
       return {
         minioFileName: item,
-        url: '',
+        url: `${import.meta.env.VITE_APP_API_BASEURL}/static/${ids[index]}`,
       }
     })
-    urlList.value.forEach((item: any) => {
-      getFileUrl(item.minioFileName).then((res) => {
-        item.url = res.data
-      })
-    })
+    // urlList.value.forEach((item: any) => {
+    //   getFileUrl(item.minioFileName).then((res) => {
+    //     item.url = res.data
+    //   })
+    // })
   }
   else {
     urlList.value = []
diff --git a/src/views/flling/already/index copy.vue b/src/views/flling/already/index copy.vue
new file mode 100644
index 0000000..8ee5ca4
--- /dev/null
+++ b/src/views/flling/already/index copy.vue
@@ -0,0 +1,199 @@
+<!--
+ * @Description: 考核填报-已填报列表页面
+ * @Author: 李亚光
+ * @Date: 2023-09-14
+ -->
+<script lang="ts" setup name="FillingAlreadyList">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '考核结果编号',
+    value: 'groupName',
+    align: 'center',
+  },
+  {
+    text: '考核方案名称',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '考核对象',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '考核周期',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核时间',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标项目',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标类型',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '一级考核指标',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标得分',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核说明',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '附件',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '提交状态',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '填报时间',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  // getGroupList(listQuery).then((response) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  listLoading.value = false
+  // })
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  // $router.push({
+  //   path: `/group/${type}`,
+  //   query: {
+  //     row: JSON.stringify(row),
+  //     id: row.id,
+  //   },
+  // })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除此分组信息吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // delGroup(row.id).then((res) => {
+    //   ElMessage.success('操作成功')
+    //   search()
+    // })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="考核时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary">
+          导出
+        </el-button>
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" @change="changePage"
+      >
+        <!-- <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small">
+                填报
+              </el-button>
+              <el-button link type="primary" size="small">
+                提交
+              </el-button>
+            </template>
+          </el-table-column>
+        </template> -->
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
diff --git a/src/views/flling/already/index.vue b/src/views/flling/already/index.vue
index 8ee5ca4..ca7731c 100644
--- a/src/views/flling/already/index.vue
+++ b/src/views/flling/already/index.vue
@@ -4,196 +4,10 @@
  * @Date: 2023-09-14
  -->
 <script lang="ts" setup name="FillingAlreadyList">
-import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-const { proxy } = getCurrentInstance() as any
-const listQuery = reactive({
-  offset: 1,
-  limit: 20,
-})
-const columns = ref([
-  {
-    text: '考核结果编号',
-    value: 'groupName',
-    align: 'center',
-  },
-  {
-    text: '考核方案名称',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '考核对象',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '考核周期',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核时间',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标项目',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标类型',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '一级考核指标',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标得分',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核说明',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '附件',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '提交状态',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '填报时间',
-    value: 'remark',
-    align: 'center',
-  },
-])
-const list = ref([])
-const total = ref(0)
-const listLoading = ref(true)
-
-// 获取数据
-const fetchData = (isNowPage = true) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  // getGroupList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  listLoading.value = false
-  // })
-}
-fetchData()
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-// 重置
-const reset = () => {
-  listQuery.offset = 1
-  listQuery.limit = 20
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size: number; page: number }) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData()
-}
-const $router = useRouter()
-// 新建编辑操作
-const handler = (row: any, type: string) => {
-  // $router.push({
-  //   path: `/group/${type}`,
-  //   query: {
-  //     row: JSON.stringify(row),
-  //     id: row.id,
-  //   },
-  // })
-}
-// 删除
-const delHandler = (row: any) => {
-  ElMessageBox.confirm(
-    '确认删除此分组信息吗?',
-    '确认',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    // delGroup(row.id).then((res) => {
-    //   ElMessage.success('操作成功')
-    //   search()
-    // })
-  })
-}
+import list from '@/views/flling/treat/index.vue'
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="考核时间"
-        />
-      </search-item>
-    </search-area>
-    <table-container>
-      <template #btns-right>
-        <el-button type="primary">
-          导出
-        </el-button>
-      </template>
-      <!-- 普通表格 -->
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
-      >
-        <!-- <template #columns>
-          <el-table-column label="操作" width="140" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small">
-                填报
-              </el-button>
-              <el-button link type="primary" size="small">
-                提交
-              </el-button>
-            </template>
-          </el-table-column>
-        </template> -->
-      </normal-table>
-    </table-container>
-  </app-container>
+  <list />
 </template>
 
diff --git a/src/views/flling/treat/fillingDialog.vue b/src/views/flling/treat/fillingDialog.vue
new file mode 100644
index 0000000..d3b0e54
--- /dev/null
+++ b/src/views/flling/treat/fillingDialog.vue
@@ -0,0 +1,179 @@
+<!-- 考核填报弹窗 -->
+<script lang="ts" setup name="FillingDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { uploadApi } from '@/api/common'
+import { filling } from '@/api/home/filling/filling'
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+const dialogVisible = ref(false)
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+}
+const rowData = ref({})
+const defaultFormData = {
+  assDesc: '', // 考核说明
+  fileId: '',
+  fileName: '',
+  score: '',
+}
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  assDesc: [{ required: true, message: '考核说明不可为空', trigger: ['blur', 'change'] }],
+  score: [{ required: true, message: '考核得分不可为空', trigger: ['blur', 'change'] }],
+})
+
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      const data = {
+        assDesc: formData.assDesc,
+        fileId: formData.fileId,
+        fileName: formData.fileName,
+        score: formData.score,
+        id: rowData.value.id,
+      }
+      filling(data).then((res) => {
+        ElMessage.success('填报成功')
+        dialogVisible.value = false
+        resetForm()
+        emits('closeRefresh')
+      })
+    }
+  })
+}
+// 重置表单
+function resetForm() {
+  const form = formData
+  const keys = Object.keys(formData)
+  keys.forEach((key) => {
+    form[key] = defaultFormData[key]
+  })
+  Object.assign(formData, form)
+  nextTick(() => {
+    dataFormRef.value?.clearValidate()
+  })
+}
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: any) {
+  dialogVisible.value = true
+  rowData.value = row
+  resetForm()
+}
+
+// 关闭弹窗
+function dialogClose() {
+  resetForm()
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('file', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        formData.fileId = formData.fileId ? `${formData.fileId},${res.data.fileId}` : res.data.fileId
+        formData.fileName = formData.fileName ? `${formData.fileName},${res.data.fileName}` : res.data.fileName
+        // 重置当前验证
+        // dataFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+// 上传
+const upload = () => {
+  fileRef.value.click()
+}
+// 删除上传的文件
+const deleteFile = (fileName: string) => {
+  const data = formData.fileName.split(',')
+  const ids = formData.fileId.split(',')
+  const filterData = data.filter(item => item !== fileName)
+  const filterid = ids.filter((item, index) => index !== data.findIndex(citem => citem === fileName))
+  formData.fileId = filterid.length ? filterid.join(',') : ''
+  formData.fileName = filterData.length ? filterData.join(',') : ''
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="填报"
+    width="50%"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <el-form
+      ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="110px" class="form-container"
+      size="default" @submit.prevent
+    >
+      <el-row :gutter="24">
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="考核得分" prop="score" class="required">
+            <el-input v-model.trim="formData.score" type="text" placeholder="0-12之间" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="考核说明" prop="assDesc" class="required">
+            <el-input v-model.trim="formData.assDesc" type="textarea" placeholder="考核说明" :rows="4" maxlength="100" show-word-limit />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="附件上传">
+            <show-photo :minio-file-name="formData.fileName" :minio-file-id="formData.fileId" @delete="deleteFile" />
+            <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
+            <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload">
+              上传
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitForm(dataFormRef)">
+          保存
+        </el-button>
+        <el-button @click="dialogClose">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.form-container {
+  width: 100%;
+
+  .full-width-input {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/views/flling/treat/index.vue b/src/views/flling/treat/index.vue
index d08184a..44e356d 100644
--- a/src/views/flling/treat/index.vue
+++ b/src/views/flling/treat/index.vue
@@ -5,71 +5,102 @@
  -->
 <script lang="ts" setup name="FillingTreatList">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import FillingDialog from './fillingDialog.vue'
+import { batchSubmitApi, getListPage } from '@/api/home/filling/filling'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 const listQuery = reactive({
+  assessedDept: '', // 指标考核对象
+  cycle: '', // 考核周期
+  isSubmit: $route.path.includes('treat') ? 'false' : 'true',
+  planName: '', // 考核方案名称
+  resultNo: '', // 考核结果编号
   offset: 1,
   limit: 20,
+  startTime: '',
+  endTime: '',
 })
 const columns = ref([
   {
     text: '考核结果编号',
-    value: 'groupName',
+    value: 'resultNo',
     align: 'center',
   },
   {
     text: '考核方案名称',
-    value: 'createUserName',
+    value: 'planName',
     align: 'center',
   },
   {
     text: '考核对象',
-    value: 'createTime',
+    value: 'assessedDeptName',
     align: 'center',
   },
   {
     text: '考核周期',
-    value: 'remark',
+    value: 'cycleName',
     align: 'center',
   },
   {
     text: '考核时间',
-    value: 'remark',
+    value: 'startTime',
     align: 'center',
   },
   {
     text: '考核指标项目',
-    value: 'remark',
+    value: 'quotaProjectName',
     align: 'center',
   },
   {
     text: '考核指标类型',
-    value: 'remark',
+    value: 'quotaTypeName',
     align: 'center',
   },
   {
     text: '一级考核指标',
-    value: 'remark',
+    value: 'priIndicators',
     align: 'center',
   },
   {
     text: '考核指标得分',
-    value: 'remark',
+    value: 'score',
     align: 'center',
   },
   {
     text: '考核说明',
-    value: 'remark',
+    value: 'assDesc',
     align: 'center',
   },
+])
+const treatColums = ref([
   {
     text: '提交状态',
-    value: 'remark',
+    value: 'submitStatusName',
     align: 'center',
   },
   {
     text: '填报截至时间',
-    value: 'remark',
+    value: 'timeScope',
+    align: 'center',
+  },
+])
+const alreadyColums = ref([
+  {
+    text: '附件',
+    value: 'fileName',
+    align: 'center',
+  },
+  {
+    text: '提交状态',
+    value: 'submitStatusName',
+    align: 'center',
+  },
+  {
+    text: '填报时间',
+    value: 'endTime',
     align: 'center',
   },
 ])
@@ -84,19 +115,38 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getGroupList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  listLoading.value = false
-  // })
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows.map((item: any) => ({ ...item, timeScope: `${item.startTime}-${item.endTime}` }))
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
 const search = () => {
   fetchData(false)
 }
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length) {
+    listQuery.startTime = `${newVal[0]} 00:00:00`
+    listQuery.endTime = `${newVal[1]} 23:59:59`
+  }
+  else {
+    listQuery.startTime = ''
+    listQuery.endTime = ''
+  }
+})
 // 重置
 const reset = () => {
+  datetimerange.value = []
+  listQuery.assessedDept = ''
+  listQuery.planName = ''
+  listQuery.resultNo = ''
+  listQuery.startTime = ''
+  listQuery.endTime = ''
+  listQuery.cycle = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -111,21 +161,29 @@
   }
   fetchData()
 }
-const $router = useRouter()
-// 新建编辑操作
-const handler = (row: any, type: string) => {
-  // $router.push({
-  //   path: `/group/${type}`,
-  //   query: {
-  //     row: JSON.stringify(row),
-  //     id: row.id,
-  //   },
-  // })
+// 考核对象下拉列表
+const objectList = ref<{ id: string; value: string; name: string }[]>()
+// 考核周期下拉框
+const cycleList = ref<{ id: string; value: string; name: string }[]>()
+// 获取字典
+const fetchSelectList = () => {
+  getDictByCode('ass_object').then((res) => {
+    objectList.value = res.data
+  })
+  getDictByCode('cycle_code').then((res) => {
+    cycleList.value = res.data
+  })
 }
-// 删除
-const delHandler = (row: any) => {
+fetchSelectList()
+// 填报
+const fillingRef = ref()
+const filling = (row: any) => {
+  fillingRef.value.initDialog(row)
+}
+// 提交
+const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此分组信息吗?',
+    '确定提交考核结果吗？一经提交，不可修改！',
     '确认',
     {
       confirmButtonText: '确认',
@@ -133,60 +191,129 @@
       type: 'warning',
     },
   ).then(() => {
-    // delGroup(row.id).then((res) => {
-    //   ElMessage.success('操作成功')
-    //   search()
-    // })
+    batchSubmitApi({ ids: [row.id] }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
   })
 }
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 批量提交
+const batchSubmit = () => {
+  let data = [] as string[]
+  if (selectList.value.filter((item: any) => item.submitStatusName === '未提交').length) {
+    data = selectList.value.filter((item: any) => item.submitStatusName === '未提交').map((item: any) => item.id)
+  }
+  else {
+    ElMessage.warning('请选择未提交的填报')
+    return
+  }
+  // 只能提交  未提交状态的数据
+  ElMessageBox.confirm(
+    '确定提交考核结果吗？一经提交，不可修改！',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    batchSubmitApi({ ids: data }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      // ids: selectList.value.map(item => item.id),
+    }
+    // exportGrade(data).then((res) => {
+    //   exportFile(res.data, '考核等级评定')
+    //   loading.close()
+    // })
+    //   .catch((_) => {
+    //     loading.close()
+    //   })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
 </script>
 
 <template>
   <app-container>
+    <filling-dialog ref="fillingRef" @close-refresh="search" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
+        <el-input v-model.trim="listQuery.resultNo" placeholder="考核结果编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
+        <el-input v-model.trim="listQuery.planName" placeholder="考核方案名称" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
+        <el-select v-model.trim="listQuery.assessedDept" placeholder="指标考核对象" clearable>
+          <el-option v-for="item in objectList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
+        <el-select v-model.trim="listQuery.cycle" placeholder="考核周期" clearable>
+          <el-option v-for="item in cycleList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="考核时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="考核开始时间" end-placeholder="考核结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary">
+        <el-button v-if="$route.path.includes('treat')" type="primary" @click="batchSubmit">
           提交
         </el-button>
+        <el-button v-else type="primary" @click="exportList">
+          导出
+        </el-button>
       </template>
-      <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
-        <template #columns>
+        <template v-if="$route.path.includes('treat')" #columns>
+          <el-table-column v-for="item in treatColums" :key="item.text" :label="item.text" :prop="item.value" align="center" />
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button link type="primary" size="small">
+              <el-button :disabled="scope.row.submitStatusName !== '未填报'" link type="primary" size="small" @click="filling(scope.row)">
                 填报
               </el-button>
-              <el-button link type="primary" size="small">
+              <el-button :disabled="scope.row.submitStatusName !== '未提交'" link type="primary" size="small" @click="submit(scope.row)">
                 提交
               </el-button>
             </template>
           </el-table-column>
         </template>
+        <template v-else #columns>
+          <el-table-column v-for="item in alreadyColums" :key="item.text" :label="item.text" :prop="item.value" align="center" />
+        </template>
       </normal-table>
     </table-container>
   </app-container>

diff --git a/src/api/home/1 b/src/api/home/1
deleted file mode 100644
index e69de29..0000000
--- a/src/api/home/1
+++ /dev/null
diff --git a/src/api/home/filling/filling.ts b/src/api/home/filling/filling.ts
new file mode 100644
index 0000000..47914e0
--- /dev/null
+++ b/src/api/home/filling/filling.ts
@@ -0,0 +1,29 @@
+/**
+ * 填报相关接口
+ */
+import request from '@/api/index'
+
+// 分页列表
+export function getListPage(params: object) {
+  return request({
+    url: '/planQuotaRep/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 填报
+export function filling(data: object) {
+  return request({
+    url: '/planQuotaRep/updateRep',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function batchSubmitApi(data: object) {
+  return request({
+    url: '/planQuotaRep/batchSubmit',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/rule/programme.ts b/src/api/home/rule/programme.ts
index cbf5585..91e1dbe 100644
--- a/src/api/home/rule/programme.ts
+++ b/src/api/home/rule/programme.ts
@@ -51,4 +51,26 @@
     data,
   })
 }
-
+// 方案指标列表
+export function ProxyList(params: object) {
+  return request({
+    url: '/assessmentPlan/planQuotaListPage',
+    method: 'get',
+    params,
+  })
+}
+// 考核方案等级下拉 /assessmentLevel/list
+export function getGradeSelectList() {
+  return request({
+    url: '/assessmentLevel/list',
+    method: 'get',
+  })
+}
+// 启用考核计划方案
+export function updatePlanEnabled(data: object) {
+  return request({
+    url: '/assessmentPlan/updatePlanEnabled',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 5c765ed..a221af2 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -6,6 +6,10 @@
     type: String,
     required: true,
   },
+  minioFileId: {
+    type: String,
+    required: true,
+  },
   height: {
     type: String,
     default: '100px',
@@ -24,17 +28,20 @@
     //   url.value = res.data
     // })
     const arr = props.minioFileName.split(',')
-    urlList.value = arr.map((item) => {
+    const ids = props.minioFileId.split(',')
+    console.log(ids, 'ids')
+    urlList.value = arr.map((item, index) => {
+      console.log(`${import.meta.env.VITE_APP_API_BASEURL}${ids[index]}`)
       return {
         minioFileName: item,
-        url: '',
+        url: `${import.meta.env.VITE_APP_API_BASEURL}/static/${ids[index]}`,
       }
     })
-    urlList.value.forEach((item: any) => {
-      getFileUrl(item.minioFileName).then((res) => {
-        item.url = res.data
-      })
-    })
+    // urlList.value.forEach((item: any) => {
+    //   getFileUrl(item.minioFileName).then((res) => {
+    //     item.url = res.data
+    //   })
+    // })
   }
   else {
     urlList.value = []
diff --git a/src/views/flling/already/index copy.vue b/src/views/flling/already/index copy.vue
new file mode 100644
index 0000000..8ee5ca4
--- /dev/null
+++ b/src/views/flling/already/index copy.vue
@@ -0,0 +1,199 @@
+<!--
+ * @Description: 考核填报-已填报列表页面
+ * @Author: 李亚光
+ * @Date: 2023-09-14
+ -->
+<script lang="ts" setup name="FillingAlreadyList">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '考核结果编号',
+    value: 'groupName',
+    align: 'center',
+  },
+  {
+    text: '考核方案名称',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '考核对象',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '考核周期',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核时间',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标项目',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标类型',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '一级考核指标',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标得分',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核说明',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '附件',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '提交状态',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '填报时间',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  // getGroupList(listQuery).then((response) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  listLoading.value = false
+  // })
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  // $router.push({
+  //   path: `/group/${type}`,
+  //   query: {
+  //     row: JSON.stringify(row),
+  //     id: row.id,
+  //   },
+  // })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除此分组信息吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // delGroup(row.id).then((res) => {
+    //   ElMessage.success('操作成功')
+    //   search()
+    // })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="考核时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary">
+          导出
+        </el-button>
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" @change="changePage"
+      >
+        <!-- <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small">
+                填报
+              </el-button>
+              <el-button link type="primary" size="small">
+                提交
+              </el-button>
+            </template>
+          </el-table-column>
+        </template> -->
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
diff --git a/src/views/flling/already/index.vue b/src/views/flling/already/index.vue
index 8ee5ca4..ca7731c 100644
--- a/src/views/flling/already/index.vue
+++ b/src/views/flling/already/index.vue
@@ -4,196 +4,10 @@
  * @Date: 2023-09-14
  -->
 <script lang="ts" setup name="FillingAlreadyList">
-import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-const { proxy } = getCurrentInstance() as any
-const listQuery = reactive({
-  offset: 1,
-  limit: 20,
-})
-const columns = ref([
-  {
-    text: '考核结果编号',
-    value: 'groupName',
-    align: 'center',
-  },
-  {
-    text: '考核方案名称',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '考核对象',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '考核周期',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核时间',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标项目',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标类型',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '一级考核指标',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标得分',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核说明',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '附件',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '提交状态',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '填报时间',
-    value: 'remark',
-    align: 'center',
-  },
-])
-const list = ref([])
-const total = ref(0)
-const listLoading = ref(true)
-
-// 获取数据
-const fetchData = (isNowPage = true) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  // getGroupList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  listLoading.value = false
-  // })
-}
-fetchData()
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-// 重置
-const reset = () => {
-  listQuery.offset = 1
-  listQuery.limit = 20
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size: number; page: number }) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData()
-}
-const $router = useRouter()
-// 新建编辑操作
-const handler = (row: any, type: string) => {
-  // $router.push({
-  //   path: `/group/${type}`,
-  //   query: {
-  //     row: JSON.stringify(row),
-  //     id: row.id,
-  //   },
-  // })
-}
-// 删除
-const delHandler = (row: any) => {
-  ElMessageBox.confirm(
-    '确认删除此分组信息吗?',
-    '确认',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    // delGroup(row.id).then((res) => {
-    //   ElMessage.success('操作成功')
-    //   search()
-    // })
-  })
-}
+import list from '@/views/flling/treat/index.vue'
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="考核时间"
-        />
-      </search-item>
-    </search-area>
-    <table-container>
-      <template #btns-right>
-        <el-button type="primary">
-          导出
-        </el-button>
-      </template>
-      <!-- 普通表格 -->
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
-      >
-        <!-- <template #columns>
-          <el-table-column label="操作" width="140" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small">
-                填报
-              </el-button>
-              <el-button link type="primary" size="small">
-                提交
-              </el-button>
-            </template>
-          </el-table-column>
-        </template> -->
-      </normal-table>
-    </table-container>
-  </app-container>
+  <list />
 </template>
 
diff --git a/src/views/flling/treat/fillingDialog.vue b/src/views/flling/treat/fillingDialog.vue
new file mode 100644
index 0000000..d3b0e54
--- /dev/null
+++ b/src/views/flling/treat/fillingDialog.vue
@@ -0,0 +1,179 @@
+<!-- 考核填报弹窗 -->
+<script lang="ts" setup name="FillingDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { uploadApi } from '@/api/common'
+import { filling } from '@/api/home/filling/filling'
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+const dialogVisible = ref(false)
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+}
+const rowData = ref({})
+const defaultFormData = {
+  assDesc: '', // 考核说明
+  fileId: '',
+  fileName: '',
+  score: '',
+}
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  assDesc: [{ required: true, message: '考核说明不可为空', trigger: ['blur', 'change'] }],
+  score: [{ required: true, message: '考核得分不可为空', trigger: ['blur', 'change'] }],
+})
+
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      const data = {
+        assDesc: formData.assDesc,
+        fileId: formData.fileId,
+        fileName: formData.fileName,
+        score: formData.score,
+        id: rowData.value.id,
+      }
+      filling(data).then((res) => {
+        ElMessage.success('填报成功')
+        dialogVisible.value = false
+        resetForm()
+        emits('closeRefresh')
+      })
+    }
+  })
+}
+// 重置表单
+function resetForm() {
+  const form = formData
+  const keys = Object.keys(formData)
+  keys.forEach((key) => {
+    form[key] = defaultFormData[key]
+  })
+  Object.assign(formData, form)
+  nextTick(() => {
+    dataFormRef.value?.clearValidate()
+  })
+}
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: any) {
+  dialogVisible.value = true
+  rowData.value = row
+  resetForm()
+}
+
+// 关闭弹窗
+function dialogClose() {
+  resetForm()
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('file', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        formData.fileId = formData.fileId ? `${formData.fileId},${res.data.fileId}` : res.data.fileId
+        formData.fileName = formData.fileName ? `${formData.fileName},${res.data.fileName}` : res.data.fileName
+        // 重置当前验证
+        // dataFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+// 上传
+const upload = () => {
+  fileRef.value.click()
+}
+// 删除上传的文件
+const deleteFile = (fileName: string) => {
+  const data = formData.fileName.split(',')
+  const ids = formData.fileId.split(',')
+  const filterData = data.filter(item => item !== fileName)
+  const filterid = ids.filter((item, index) => index !== data.findIndex(citem => citem === fileName))
+  formData.fileId = filterid.length ? filterid.join(',') : ''
+  formData.fileName = filterData.length ? filterData.join(',') : ''
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="填报"
+    width="50%"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <el-form
+      ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="110px" class="form-container"
+      size="default" @submit.prevent
+    >
+      <el-row :gutter="24">
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="考核得分" prop="score" class="required">
+            <el-input v-model.trim="formData.score" type="text" placeholder="0-12之间" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="考核说明" prop="assDesc" class="required">
+            <el-input v-model.trim="formData.assDesc" type="textarea" placeholder="考核说明" :rows="4" maxlength="100" show-word-limit />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="附件上传">
+            <show-photo :minio-file-name="formData.fileName" :minio-file-id="formData.fileId" @delete="deleteFile" />
+            <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
+            <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload">
+              上传
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitForm(dataFormRef)">
+          保存
+        </el-button>
+        <el-button @click="dialogClose">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.form-container {
+  width: 100%;
+
+  .full-width-input {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/views/flling/treat/index.vue b/src/views/flling/treat/index.vue
index d08184a..44e356d 100644
--- a/src/views/flling/treat/index.vue
+++ b/src/views/flling/treat/index.vue
@@ -5,71 +5,102 @@
  -->
 <script lang="ts" setup name="FillingTreatList">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import FillingDialog from './fillingDialog.vue'
+import { batchSubmitApi, getListPage } from '@/api/home/filling/filling'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 const listQuery = reactive({
+  assessedDept: '', // 指标考核对象
+  cycle: '', // 考核周期
+  isSubmit: $route.path.includes('treat') ? 'false' : 'true',
+  planName: '', // 考核方案名称
+  resultNo: '', // 考核结果编号
   offset: 1,
   limit: 20,
+  startTime: '',
+  endTime: '',
 })
 const columns = ref([
   {
     text: '考核结果编号',
-    value: 'groupName',
+    value: 'resultNo',
     align: 'center',
   },
   {
     text: '考核方案名称',
-    value: 'createUserName',
+    value: 'planName',
     align: 'center',
   },
   {
     text: '考核对象',
-    value: 'createTime',
+    value: 'assessedDeptName',
     align: 'center',
   },
   {
     text: '考核周期',
-    value: 'remark',
+    value: 'cycleName',
     align: 'center',
   },
   {
     text: '考核时间',
-    value: 'remark',
+    value: 'startTime',
     align: 'center',
   },
   {
     text: '考核指标项目',
-    value: 'remark',
+    value: 'quotaProjectName',
     align: 'center',
   },
   {
     text: '考核指标类型',
-    value: 'remark',
+    value: 'quotaTypeName',
     align: 'center',
   },
   {
     text: '一级考核指标',
-    value: 'remark',
+    value: 'priIndicators',
     align: 'center',
   },
   {
     text: '考核指标得分',
-    value: 'remark',
+    value: 'score',
     align: 'center',
   },
   {
     text: '考核说明',
-    value: 'remark',
+    value: 'assDesc',
     align: 'center',
   },
+])
+const treatColums = ref([
   {
     text: '提交状态',
-    value: 'remark',
+    value: 'submitStatusName',
     align: 'center',
   },
   {
     text: '填报截至时间',
-    value: 'remark',
+    value: 'timeScope',
+    align: 'center',
+  },
+])
+const alreadyColums = ref([
+  {
+    text: '附件',
+    value: 'fileName',
+    align: 'center',
+  },
+  {
+    text: '提交状态',
+    value: 'submitStatusName',
+    align: 'center',
+  },
+  {
+    text: '填报时间',
+    value: 'endTime',
     align: 'center',
   },
 ])
@@ -84,19 +115,38 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getGroupList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  listLoading.value = false
-  // })
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows.map((item: any) => ({ ...item, timeScope: `${item.startTime}-${item.endTime}` }))
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
 const search = () => {
   fetchData(false)
 }
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length) {
+    listQuery.startTime = `${newVal[0]} 00:00:00`
+    listQuery.endTime = `${newVal[1]} 23:59:59`
+  }
+  else {
+    listQuery.startTime = ''
+    listQuery.endTime = ''
+  }
+})
 // 重置
 const reset = () => {
+  datetimerange.value = []
+  listQuery.assessedDept = ''
+  listQuery.planName = ''
+  listQuery.resultNo = ''
+  listQuery.startTime = ''
+  listQuery.endTime = ''
+  listQuery.cycle = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -111,21 +161,29 @@
   }
   fetchData()
 }
-const $router = useRouter()
-// 新建编辑操作
-const handler = (row: any, type: string) => {
-  // $router.push({
-  //   path: `/group/${type}`,
-  //   query: {
-  //     row: JSON.stringify(row),
-  //     id: row.id,
-  //   },
-  // })
+// 考核对象下拉列表
+const objectList = ref<{ id: string; value: string; name: string }[]>()
+// 考核周期下拉框
+const cycleList = ref<{ id: string; value: string; name: string }[]>()
+// 获取字典
+const fetchSelectList = () => {
+  getDictByCode('ass_object').then((res) => {
+    objectList.value = res.data
+  })
+  getDictByCode('cycle_code').then((res) => {
+    cycleList.value = res.data
+  })
 }
-// 删除
-const delHandler = (row: any) => {
+fetchSelectList()
+// 填报
+const fillingRef = ref()
+const filling = (row: any) => {
+  fillingRef.value.initDialog(row)
+}
+// 提交
+const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此分组信息吗?',
+    '确定提交考核结果吗？一经提交，不可修改！',
     '确认',
     {
       confirmButtonText: '确认',
@@ -133,60 +191,129 @@
       type: 'warning',
     },
   ).then(() => {
-    // delGroup(row.id).then((res) => {
-    //   ElMessage.success('操作成功')
-    //   search()
-    // })
+    batchSubmitApi({ ids: [row.id] }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
   })
 }
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 批量提交
+const batchSubmit = () => {
+  let data = [] as string[]
+  if (selectList.value.filter((item: any) => item.submitStatusName === '未提交').length) {
+    data = selectList.value.filter((item: any) => item.submitStatusName === '未提交').map((item: any) => item.id)
+  }
+  else {
+    ElMessage.warning('请选择未提交的填报')
+    return
+  }
+  // 只能提交  未提交状态的数据
+  ElMessageBox.confirm(
+    '确定提交考核结果吗？一经提交，不可修改！',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    batchSubmitApi({ ids: data }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      // ids: selectList.value.map(item => item.id),
+    }
+    // exportGrade(data).then((res) => {
+    //   exportFile(res.data, '考核等级评定')
+    //   loading.close()
+    // })
+    //   .catch((_) => {
+    //     loading.close()
+    //   })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
 </script>
 
 <template>
   <app-container>
+    <filling-dialog ref="fillingRef" @close-refresh="search" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
+        <el-input v-model.trim="listQuery.resultNo" placeholder="考核结果编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
+        <el-input v-model.trim="listQuery.planName" placeholder="考核方案名称" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
+        <el-select v-model.trim="listQuery.assessedDept" placeholder="指标考核对象" clearable>
+          <el-option v-for="item in objectList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
+        <el-select v-model.trim="listQuery.cycle" placeholder="考核周期" clearable>
+          <el-option v-for="item in cycleList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="考核时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="考核开始时间" end-placeholder="考核结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary">
+        <el-button v-if="$route.path.includes('treat')" type="primary" @click="batchSubmit">
           提交
         </el-button>
+        <el-button v-else type="primary" @click="exportList">
+          导出
+        </el-button>
       </template>
-      <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
-        <template #columns>
+        <template v-if="$route.path.includes('treat')" #columns>
+          <el-table-column v-for="item in treatColums" :key="item.text" :label="item.text" :prop="item.value" align="center" />
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button link type="primary" size="small">
+              <el-button :disabled="scope.row.submitStatusName !== '未填报'" link type="primary" size="small" @click="filling(scope.row)">
                 填报
               </el-button>
-              <el-button link type="primary" size="small">
+              <el-button :disabled="scope.row.submitStatusName !== '未提交'" link type="primary" size="small" @click="submit(scope.row)">
                 提交
               </el-button>
             </template>
           </el-table-column>
         </template>
+        <template v-else #columns>
+          <el-table-column v-for="item in alreadyColums" :key="item.text" :label="item.text" :prop="item.value" align="center" />
+        </template>
       </normal-table>
     </table-container>
   </app-container>
diff --git a/src/views/rule/programme/components/edit.vue b/src/views/rule/programme/components/edit.vue
index 1c1cfba..903c65e 100644
--- a/src/views/rule/programme/components/edit.vue
+++ b/src/views/rule/programme/components/edit.vue
@@ -9,7 +9,7 @@
 import proxyTable from './proxyTable.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/common'
-import { addProgramme, addProxyList, editProgramme, getDetail } from '@/api/home/rule/programme'
+import { ProxyList, addProgramme, addProxyList, editProgramme, getDetail, getGradeSelectList, updatePlanEnabled } from '@/api/home/rule/programme'
 const $route = useRoute()
 const $router = useRouter()
 // 对话框类型：create,update
@@ -27,6 +27,7 @@
   cycle: '', // 考核周期
   endTime: '',
   fileId: '',
+  fileName: '',
   id: '',
   isEnable: '',
   levelId: '',
@@ -37,6 +38,7 @@
   score: '',
   startTime: '',
 })
+const proxyList = ref([])
 // 表单验证规则
 const rules = ref<FormRules>({
   assObject: [{ required: true, message: '考核对象必选', trigger: ['blur', 'change'] }],
@@ -61,11 +63,11 @@
       lock: true,
       background: 'rgba(255, 255, 255, 0.8)',
     })
-    console.log(event.target.files)
     fd.append('file', event.target.files[0])
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
-        ruleForm.value.fileId = ruleForm.value.fileId ? `${ruleForm.value.fileId},${res.data.fileName}` : res.data.fileName
+        ruleForm.value.fileId = ruleForm.value.fileId ? `${ruleForm.value.fileId},${res.data.fileId}` : res.data.fileId
+        ruleForm.value.fileName = ruleForm.value.fileName ? `${ruleForm.value.fileName},${res.data.fileName}` : res.data.fileName
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
@@ -96,7 +98,7 @@
 // 考核周期下拉框
 const cycleList = ref<{ id: string; value: string; name: string }[]>()
 // 考核等级下拉框
-const levelList = ref<{ id: string; value: string; name: string }[]>()
+const levelList = ref<any[]>()
 // 获取字典
 const fetchSelectList = () => {
   getDictByCode('ass_object').then((res) => {
@@ -108,12 +110,24 @@
   getDictByCode('cycle_code').then((res) => {
     cycleList.value = res.data
   })
-  getDictByCode('level_code').then((res) => {
+  // getDictByCode('level_code').then((res) => {
+  //   levelList.value = res.data
+  // })
+  getGradeSelectList().then((res) => {
     levelList.value = res.data
   })
 }
 fetchSelectList()
 const radio = ref('基本信息')
+// 获取方案指标列表
+const fetchProxyList = () => {
+  // if ($route.path.includes('create')) {
+  //   return
+  // }
+  ProxyList({ planId: ruleForm.value.id, limit: 9999, offset: 1 }).then((res) => {
+    proxyList.value = res.data.rows
+  })
+}
 onMounted(() => {
   dialogStatus.value = $route.params.type as string
   if (!$route.path.includes('create')) {
@@ -125,6 +139,7 @@
     // getDetail({ id: data.id }).then((res) => {
     //   console.log(res.data)
     // })
+    fetchProxyList()
   }
 })
 // 编辑
@@ -132,22 +147,39 @@
   editProgramme({ ...ruleForm.value }).then((res) => {
     addProxyList({
       planId: ruleForm.value.id,
-      quotaIds: proxyRef.value.list.map((item: any) => item.id),
+      quotaIds: proxyList.value.map((item: any) => item.id),
     }).then((res) => {
+      // if (ruleForm.value.isEnable === '1' && proxyList.value.length) {
+      //   updatePlanEnabled({ ...ruleForm.value }).then(() => {
+      //     ElMessage.success('操作成功')
+      //     $router.go(-1)
+      //   })
+      // }
+      // else {
       ElMessage.success('操作成功')
       $router.go(-1)
+      // }
     })
   })
 }
 // 新增
 const create = () => {
-  addProgramme({ ...ruleForm.value }).then((res) => {
-    console.log()
-    // addProxyList({
-
-    // })
-    ElMessage.success('操作成功')
-    $router.go(-1)
+  addProgramme({ ...ruleForm.value }).then((response) => {
+    addProxyList({
+      planId: response.data,
+      quotaIds: proxyList.value.map((item: any) => item.id),
+    }).then((res) => {
+      if (ruleForm.value.isEnable === '1' && proxyList.value.length) {
+        updatePlanEnabled({ id: response.data, isEnable: '1' }).then(() => {
+          ElMessage.success('操作成功')
+          $router.go(-1)
+        })
+      }
+      else {
+        ElMessage.success('操作成功')
+        $router.go(-1)
+      }
+    })
   })
 }
 // 保存
@@ -163,6 +195,7 @@
         type: 'warning',
       },
     ).then((res) => {
+      proxyList.value = proxyRef.value?.list
       if ($route.path.includes('update')) {
         update()
       }
@@ -172,6 +205,11 @@
     })
   })
 }
+// watch(() => proxyRef.value?.list, (newVal) => {
+//   proxyList.value = newVal
+// }, {
+//   deep: true,
+// })
 </script>
 
 <template>
@@ -214,9 +252,9 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
-            <el-form-item label="具体考核部门" prop="approvalName">
+            <!-- <el-form-item label="具体考核部门" prop="approvalName">
               <el-input v-model.trim="ruleForm.approvalName" type="textarea" placeholder="考核部门" :rows="3" />
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
@@ -230,7 +268,7 @@
           <el-col :span="12">
             <el-form-item label="考核等级评定" prop="levelId">
               <el-select v-model.trim="ruleForm.levelId" placeholder="考核等级评定" style="width: 100%;">
-                <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in levelList" :key="item.id" :label="item.levelName" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -286,7 +324,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
             <el-form-item label="附件上传" prop="approvalNo">
-              <show-photo :minio-file-name="ruleForm.fileId" @delete="deleteFile" />
+              <show-photo :minio-file-name="ruleForm.fileName" :minio-file-id="ruleForm.fileId" @delete="deleteFile" />
               <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
               <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload">
                 上传
@@ -297,7 +335,7 @@
       </el-form>
     </detail-block-com>
     <!-- 一级考核指标 -->
-    <proxy-table v-show="radio === '一级考核指标'" ref="proxyRef" :data="[]" />
+    <proxy-table v-show="radio === '一级考核指标'" ref="proxyRef" :data="proxyList" />
   </app-container>
 </template>
 

diff --git a/src/api/home/1 b/src/api/home/1
deleted file mode 100644
index e69de29..0000000
--- a/src/api/home/1
+++ /dev/null
diff --git a/src/api/home/filling/filling.ts b/src/api/home/filling/filling.ts
new file mode 100644
index 0000000..47914e0
--- /dev/null
+++ b/src/api/home/filling/filling.ts
@@ -0,0 +1,29 @@
+/**
+ * 填报相关接口
+ */
+import request from '@/api/index'
+
+// 分页列表
+export function getListPage(params: object) {
+  return request({
+    url: '/planQuotaRep/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 填报
+export function filling(data: object) {
+  return request({
+    url: '/planQuotaRep/updateRep',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function batchSubmitApi(data: object) {
+  return request({
+    url: '/planQuotaRep/batchSubmit',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/rule/programme.ts b/src/api/home/rule/programme.ts
index cbf5585..91e1dbe 100644
--- a/src/api/home/rule/programme.ts
+++ b/src/api/home/rule/programme.ts
@@ -51,4 +51,26 @@
     data,
   })
 }
-
+// 方案指标列表
+export function ProxyList(params: object) {
+  return request({
+    url: '/assessmentPlan/planQuotaListPage',
+    method: 'get',
+    params,
+  })
+}
+// 考核方案等级下拉 /assessmentLevel/list
+export function getGradeSelectList() {
+  return request({
+    url: '/assessmentLevel/list',
+    method: 'get',
+  })
+}
+// 启用考核计划方案
+export function updatePlanEnabled(data: object) {
+  return request({
+    url: '/assessmentPlan/updatePlanEnabled',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 5c765ed..a221af2 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -6,6 +6,10 @@
     type: String,
     required: true,
   },
+  minioFileId: {
+    type: String,
+    required: true,
+  },
   height: {
     type: String,
     default: '100px',
@@ -24,17 +28,20 @@
     //   url.value = res.data
     // })
     const arr = props.minioFileName.split(',')
-    urlList.value = arr.map((item) => {
+    const ids = props.minioFileId.split(',')
+    console.log(ids, 'ids')
+    urlList.value = arr.map((item, index) => {
+      console.log(`${import.meta.env.VITE_APP_API_BASEURL}${ids[index]}`)
       return {
         minioFileName: item,
-        url: '',
+        url: `${import.meta.env.VITE_APP_API_BASEURL}/static/${ids[index]}`,
       }
     })
-    urlList.value.forEach((item: any) => {
-      getFileUrl(item.minioFileName).then((res) => {
-        item.url = res.data
-      })
-    })
+    // urlList.value.forEach((item: any) => {
+    //   getFileUrl(item.minioFileName).then((res) => {
+    //     item.url = res.data
+    //   })
+    // })
   }
   else {
     urlList.value = []
diff --git a/src/views/flling/already/index copy.vue b/src/views/flling/already/index copy.vue
new file mode 100644
index 0000000..8ee5ca4
--- /dev/null
+++ b/src/views/flling/already/index copy.vue
@@ -0,0 +1,199 @@
+<!--
+ * @Description: 考核填报-已填报列表页面
+ * @Author: 李亚光
+ * @Date: 2023-09-14
+ -->
+<script lang="ts" setup name="FillingAlreadyList">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '考核结果编号',
+    value: 'groupName',
+    align: 'center',
+  },
+  {
+    text: '考核方案名称',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '考核对象',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '考核周期',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核时间',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标项目',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标类型',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '一级考核指标',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标得分',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核说明',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '附件',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '提交状态',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '填报时间',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  // getGroupList(listQuery).then((response) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  listLoading.value = false
+  // })
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  // $router.push({
+  //   path: `/group/${type}`,
+  //   query: {
+  //     row: JSON.stringify(row),
+  //     id: row.id,
+  //   },
+  // })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除此分组信息吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // delGroup(row.id).then((res) => {
+    //   ElMessage.success('操作成功')
+    //   search()
+    // })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="考核时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary">
+          导出
+        </el-button>
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" @change="changePage"
+      >
+        <!-- <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small">
+                填报
+              </el-button>
+              <el-button link type="primary" size="small">
+                提交
+              </el-button>
+            </template>
+          </el-table-column>
+        </template> -->
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
diff --git a/src/views/flling/already/index.vue b/src/views/flling/already/index.vue
index 8ee5ca4..ca7731c 100644
--- a/src/views/flling/already/index.vue
+++ b/src/views/flling/already/index.vue
@@ -4,196 +4,10 @@
  * @Date: 2023-09-14
  -->
 <script lang="ts" setup name="FillingAlreadyList">
-import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-const { proxy } = getCurrentInstance() as any
-const listQuery = reactive({
-  offset: 1,
-  limit: 20,
-})
-const columns = ref([
-  {
-    text: '考核结果编号',
-    value: 'groupName',
-    align: 'center',
-  },
-  {
-    text: '考核方案名称',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '考核对象',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '考核周期',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核时间',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标项目',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标类型',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '一级考核指标',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标得分',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核说明',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '附件',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '提交状态',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '填报时间',
-    value: 'remark',
-    align: 'center',
-  },
-])
-const list = ref([])
-const total = ref(0)
-const listLoading = ref(true)
-
-// 获取数据
-const fetchData = (isNowPage = true) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  // getGroupList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  listLoading.value = false
-  // })
-}
-fetchData()
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-// 重置
-const reset = () => {
-  listQuery.offset = 1
-  listQuery.limit = 20
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size: number; page: number }) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData()
-}
-const $router = useRouter()
-// 新建编辑操作
-const handler = (row: any, type: string) => {
-  // $router.push({
-  //   path: `/group/${type}`,
-  //   query: {
-  //     row: JSON.stringify(row),
-  //     id: row.id,
-  //   },
-  // })
-}
-// 删除
-const delHandler = (row: any) => {
-  ElMessageBox.confirm(
-    '确认删除此分组信息吗?',
-    '确认',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    // delGroup(row.id).then((res) => {
-    //   ElMessage.success('操作成功')
-    //   search()
-    // })
-  })
-}
+import list from '@/views/flling/treat/index.vue'
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="考核时间"
-        />
-      </search-item>
-    </search-area>
-    <table-container>
-      <template #btns-right>
-        <el-button type="primary">
-          导出
-        </el-button>
-      </template>
-      <!-- 普通表格 -->
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
-      >
-        <!-- <template #columns>
-          <el-table-column label="操作" width="140" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small">
-                填报
-              </el-button>
-              <el-button link type="primary" size="small">
-                提交
-              </el-button>
-            </template>
-          </el-table-column>
-        </template> -->
-      </normal-table>
-    </table-container>
-  </app-container>
+  <list />
 </template>
 
diff --git a/src/views/flling/treat/fillingDialog.vue b/src/views/flling/treat/fillingDialog.vue
new file mode 100644
index 0000000..d3b0e54
--- /dev/null
+++ b/src/views/flling/treat/fillingDialog.vue
@@ -0,0 +1,179 @@
+<!-- 考核填报弹窗 -->
+<script lang="ts" setup name="FillingDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { uploadApi } from '@/api/common'
+import { filling } from '@/api/home/filling/filling'
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+const dialogVisible = ref(false)
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+}
+const rowData = ref({})
+const defaultFormData = {
+  assDesc: '', // 考核说明
+  fileId: '',
+  fileName: '',
+  score: '',
+}
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  assDesc: [{ required: true, message: '考核说明不可为空', trigger: ['blur', 'change'] }],
+  score: [{ required: true, message: '考核得分不可为空', trigger: ['blur', 'change'] }],
+})
+
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      const data = {
+        assDesc: formData.assDesc,
+        fileId: formData.fileId,
+        fileName: formData.fileName,
+        score: formData.score,
+        id: rowData.value.id,
+      }
+      filling(data).then((res) => {
+        ElMessage.success('填报成功')
+        dialogVisible.value = false
+        resetForm()
+        emits('closeRefresh')
+      })
+    }
+  })
+}
+// 重置表单
+function resetForm() {
+  const form = formData
+  const keys = Object.keys(formData)
+  keys.forEach((key) => {
+    form[key] = defaultFormData[key]
+  })
+  Object.assign(formData, form)
+  nextTick(() => {
+    dataFormRef.value?.clearValidate()
+  })
+}
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: any) {
+  dialogVisible.value = true
+  rowData.value = row
+  resetForm()
+}
+
+// 关闭弹窗
+function dialogClose() {
+  resetForm()
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('file', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        formData.fileId = formData.fileId ? `${formData.fileId},${res.data.fileId}` : res.data.fileId
+        formData.fileName = formData.fileName ? `${formData.fileName},${res.data.fileName}` : res.data.fileName
+        // 重置当前验证
+        // dataFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+// 上传
+const upload = () => {
+  fileRef.value.click()
+}
+// 删除上传的文件
+const deleteFile = (fileName: string) => {
+  const data = formData.fileName.split(',')
+  const ids = formData.fileId.split(',')
+  const filterData = data.filter(item => item !== fileName)
+  const filterid = ids.filter((item, index) => index !== data.findIndex(citem => citem === fileName))
+  formData.fileId = filterid.length ? filterid.join(',') : ''
+  formData.fileName = filterData.length ? filterData.join(',') : ''
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="填报"
+    width="50%"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <el-form
+      ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="110px" class="form-container"
+      size="default" @submit.prevent
+    >
+      <el-row :gutter="24">
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="考核得分" prop="score" class="required">
+            <el-input v-model.trim="formData.score" type="text" placeholder="0-12之间" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="考核说明" prop="assDesc" class="required">
+            <el-input v-model.trim="formData.assDesc" type="textarea" placeholder="考核说明" :rows="4" maxlength="100" show-word-limit />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="附件上传">
+            <show-photo :minio-file-name="formData.fileName" :minio-file-id="formData.fileId" @delete="deleteFile" />
+            <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
+            <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload">
+              上传
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitForm(dataFormRef)">
+          保存
+        </el-button>
+        <el-button @click="dialogClose">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.form-container {
+  width: 100%;
+
+  .full-width-input {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/views/flling/treat/index.vue b/src/views/flling/treat/index.vue
index d08184a..44e356d 100644
--- a/src/views/flling/treat/index.vue
+++ b/src/views/flling/treat/index.vue
@@ -5,71 +5,102 @@
  -->
 <script lang="ts" setup name="FillingTreatList">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import FillingDialog from './fillingDialog.vue'
+import { batchSubmitApi, getListPage } from '@/api/home/filling/filling'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 const listQuery = reactive({
+  assessedDept: '', // 指标考核对象
+  cycle: '', // 考核周期
+  isSubmit: $route.path.includes('treat') ? 'false' : 'true',
+  planName: '', // 考核方案名称
+  resultNo: '', // 考核结果编号
   offset: 1,
   limit: 20,
+  startTime: '',
+  endTime: '',
 })
 const columns = ref([
   {
     text: '考核结果编号',
-    value: 'groupName',
+    value: 'resultNo',
     align: 'center',
   },
   {
     text: '考核方案名称',
-    value: 'createUserName',
+    value: 'planName',
     align: 'center',
   },
   {
     text: '考核对象',
-    value: 'createTime',
+    value: 'assessedDeptName',
     align: 'center',
   },
   {
     text: '考核周期',
-    value: 'remark',
+    value: 'cycleName',
     align: 'center',
   },
   {
     text: '考核时间',
-    value: 'remark',
+    value: 'startTime',
     align: 'center',
   },
   {
     text: '考核指标项目',
-    value: 'remark',
+    value: 'quotaProjectName',
     align: 'center',
   },
   {
     text: '考核指标类型',
-    value: 'remark',
+    value: 'quotaTypeName',
     align: 'center',
   },
   {
     text: '一级考核指标',
-    value: 'remark',
+    value: 'priIndicators',
     align: 'center',
   },
   {
     text: '考核指标得分',
-    value: 'remark',
+    value: 'score',
     align: 'center',
   },
   {
     text: '考核说明',
-    value: 'remark',
+    value: 'assDesc',
     align: 'center',
   },
+])
+const treatColums = ref([
   {
     text: '提交状态',
-    value: 'remark',
+    value: 'submitStatusName',
     align: 'center',
   },
   {
     text: '填报截至时间',
-    value: 'remark',
+    value: 'timeScope',
+    align: 'center',
+  },
+])
+const alreadyColums = ref([
+  {
+    text: '附件',
+    value: 'fileName',
+    align: 'center',
+  },
+  {
+    text: '提交状态',
+    value: 'submitStatusName',
+    align: 'center',
+  },
+  {
+    text: '填报时间',
+    value: 'endTime',
     align: 'center',
   },
 ])
@@ -84,19 +115,38 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getGroupList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  listLoading.value = false
-  // })
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows.map((item: any) => ({ ...item, timeScope: `${item.startTime}-${item.endTime}` }))
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
 const search = () => {
   fetchData(false)
 }
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length) {
+    listQuery.startTime = `${newVal[0]} 00:00:00`
+    listQuery.endTime = `${newVal[1]} 23:59:59`
+  }
+  else {
+    listQuery.startTime = ''
+    listQuery.endTime = ''
+  }
+})
 // 重置
 const reset = () => {
+  datetimerange.value = []
+  listQuery.assessedDept = ''
+  listQuery.planName = ''
+  listQuery.resultNo = ''
+  listQuery.startTime = ''
+  listQuery.endTime = ''
+  listQuery.cycle = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -111,21 +161,29 @@
   }
   fetchData()
 }
-const $router = useRouter()
-// 新建编辑操作
-const handler = (row: any, type: string) => {
-  // $router.push({
-  //   path: `/group/${type}`,
-  //   query: {
-  //     row: JSON.stringify(row),
-  //     id: row.id,
-  //   },
-  // })
+// 考核对象下拉列表
+const objectList = ref<{ id: string; value: string; name: string }[]>()
+// 考核周期下拉框
+const cycleList = ref<{ id: string; value: string; name: string }[]>()
+// 获取字典
+const fetchSelectList = () => {
+  getDictByCode('ass_object').then((res) => {
+    objectList.value = res.data
+  })
+  getDictByCode('cycle_code').then((res) => {
+    cycleList.value = res.data
+  })
 }
-// 删除
-const delHandler = (row: any) => {
+fetchSelectList()
+// 填报
+const fillingRef = ref()
+const filling = (row: any) => {
+  fillingRef.value.initDialog(row)
+}
+// 提交
+const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此分组信息吗?',
+    '确定提交考核结果吗？一经提交，不可修改！',
     '确认',
     {
       confirmButtonText: '确认',
@@ -133,60 +191,129 @@
       type: 'warning',
     },
   ).then(() => {
-    // delGroup(row.id).then((res) => {
-    //   ElMessage.success('操作成功')
-    //   search()
-    // })
+    batchSubmitApi({ ids: [row.id] }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
   })
 }
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 批量提交
+const batchSubmit = () => {
+  let data = [] as string[]
+  if (selectList.value.filter((item: any) => item.submitStatusName === '未提交').length) {
+    data = selectList.value.filter((item: any) => item.submitStatusName === '未提交').map((item: any) => item.id)
+  }
+  else {
+    ElMessage.warning('请选择未提交的填报')
+    return
+  }
+  // 只能提交  未提交状态的数据
+  ElMessageBox.confirm(
+    '确定提交考核结果吗？一经提交，不可修改！',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    batchSubmitApi({ ids: data }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      // ids: selectList.value.map(item => item.id),
+    }
+    // exportGrade(data).then((res) => {
+    //   exportFile(res.data, '考核等级评定')
+    //   loading.close()
+    // })
+    //   .catch((_) => {
+    //     loading.close()
+    //   })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
 </script>
 
 <template>
   <app-container>
+    <filling-dialog ref="fillingRef" @close-refresh="search" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
+        <el-input v-model.trim="listQuery.resultNo" placeholder="考核结果编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
+        <el-input v-model.trim="listQuery.planName" placeholder="考核方案名称" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
+        <el-select v-model.trim="listQuery.assessedDept" placeholder="指标考核对象" clearable>
+          <el-option v-for="item in objectList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
+        <el-select v-model.trim="listQuery.cycle" placeholder="考核周期" clearable>
+          <el-option v-for="item in cycleList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="考核时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="考核开始时间" end-placeholder="考核结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary">
+        <el-button v-if="$route.path.includes('treat')" type="primary" @click="batchSubmit">
           提交
         </el-button>
+        <el-button v-else type="primary" @click="exportList">
+          导出
+        </el-button>
       </template>
-      <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
-        <template #columns>
+        <template v-if="$route.path.includes('treat')" #columns>
+          <el-table-column v-for="item in treatColums" :key="item.text" :label="item.text" :prop="item.value" align="center" />
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button link type="primary" size="small">
+              <el-button :disabled="scope.row.submitStatusName !== '未填报'" link type="primary" size="small" @click="filling(scope.row)">
                 填报
               </el-button>
-              <el-button link type="primary" size="small">
+              <el-button :disabled="scope.row.submitStatusName !== '未提交'" link type="primary" size="small" @click="submit(scope.row)">
                 提交
               </el-button>
             </template>
           </el-table-column>
         </template>
+        <template v-else #columns>
+          <el-table-column v-for="item in alreadyColums" :key="item.text" :label="item.text" :prop="item.value" align="center" />
+        </template>
       </normal-table>
     </table-container>
   </app-container>
diff --git a/src/views/rule/programme/components/edit.vue b/src/views/rule/programme/components/edit.vue
index 1c1cfba..903c65e 100644
--- a/src/views/rule/programme/components/edit.vue
+++ b/src/views/rule/programme/components/edit.vue
@@ -9,7 +9,7 @@
 import proxyTable from './proxyTable.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/common'
-import { addProgramme, addProxyList, editProgramme, getDetail } from '@/api/home/rule/programme'
+import { ProxyList, addProgramme, addProxyList, editProgramme, getDetail, getGradeSelectList, updatePlanEnabled } from '@/api/home/rule/programme'
 const $route = useRoute()
 const $router = useRouter()
 // 对话框类型：create,update
@@ -27,6 +27,7 @@
   cycle: '', // 考核周期
   endTime: '',
   fileId: '',
+  fileName: '',
   id: '',
   isEnable: '',
   levelId: '',
@@ -37,6 +38,7 @@
   score: '',
   startTime: '',
 })
+const proxyList = ref([])
 // 表单验证规则
 const rules = ref<FormRules>({
   assObject: [{ required: true, message: '考核对象必选', trigger: ['blur', 'change'] }],
@@ -61,11 +63,11 @@
       lock: true,
       background: 'rgba(255, 255, 255, 0.8)',
     })
-    console.log(event.target.files)
     fd.append('file', event.target.files[0])
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
-        ruleForm.value.fileId = ruleForm.value.fileId ? `${ruleForm.value.fileId},${res.data.fileName}` : res.data.fileName
+        ruleForm.value.fileId = ruleForm.value.fileId ? `${ruleForm.value.fileId},${res.data.fileId}` : res.data.fileId
+        ruleForm.value.fileName = ruleForm.value.fileName ? `${ruleForm.value.fileName},${res.data.fileName}` : res.data.fileName
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
@@ -96,7 +98,7 @@
 // 考核周期下拉框
 const cycleList = ref<{ id: string; value: string; name: string }[]>()
 // 考核等级下拉框
-const levelList = ref<{ id: string; value: string; name: string }[]>()
+const levelList = ref<any[]>()
 // 获取字典
 const fetchSelectList = () => {
   getDictByCode('ass_object').then((res) => {
@@ -108,12 +110,24 @@
   getDictByCode('cycle_code').then((res) => {
     cycleList.value = res.data
   })
-  getDictByCode('level_code').then((res) => {
+  // getDictByCode('level_code').then((res) => {
+  //   levelList.value = res.data
+  // })
+  getGradeSelectList().then((res) => {
     levelList.value = res.data
   })
 }
 fetchSelectList()
 const radio = ref('基本信息')
+// 获取方案指标列表
+const fetchProxyList = () => {
+  // if ($route.path.includes('create')) {
+  //   return
+  // }
+  ProxyList({ planId: ruleForm.value.id, limit: 9999, offset: 1 }).then((res) => {
+    proxyList.value = res.data.rows
+  })
+}
 onMounted(() => {
   dialogStatus.value = $route.params.type as string
   if (!$route.path.includes('create')) {
@@ -125,6 +139,7 @@
     // getDetail({ id: data.id }).then((res) => {
     //   console.log(res.data)
     // })
+    fetchProxyList()
   }
 })
 // 编辑
@@ -132,22 +147,39 @@
   editProgramme({ ...ruleForm.value }).then((res) => {
     addProxyList({
       planId: ruleForm.value.id,
-      quotaIds: proxyRef.value.list.map((item: any) => item.id),
+      quotaIds: proxyList.value.map((item: any) => item.id),
     }).then((res) => {
+      // if (ruleForm.value.isEnable === '1' && proxyList.value.length) {
+      //   updatePlanEnabled({ ...ruleForm.value }).then(() => {
+      //     ElMessage.success('操作成功')
+      //     $router.go(-1)
+      //   })
+      // }
+      // else {
       ElMessage.success('操作成功')
       $router.go(-1)
+      // }
     })
   })
 }
 // 新增
 const create = () => {
-  addProgramme({ ...ruleForm.value }).then((res) => {
-    console.log()
-    // addProxyList({
-
-    // })
-    ElMessage.success('操作成功')
-    $router.go(-1)
+  addProgramme({ ...ruleForm.value }).then((response) => {
+    addProxyList({
+      planId: response.data,
+      quotaIds: proxyList.value.map((item: any) => item.id),
+    }).then((res) => {
+      if (ruleForm.value.isEnable === '1' && proxyList.value.length) {
+        updatePlanEnabled({ id: response.data, isEnable: '1' }).then(() => {
+          ElMessage.success('操作成功')
+          $router.go(-1)
+        })
+      }
+      else {
+        ElMessage.success('操作成功')
+        $router.go(-1)
+      }
+    })
   })
 }
 // 保存
@@ -163,6 +195,7 @@
         type: 'warning',
       },
     ).then((res) => {
+      proxyList.value = proxyRef.value?.list
       if ($route.path.includes('update')) {
         update()
       }
@@ -172,6 +205,11 @@
     })
   })
 }
+// watch(() => proxyRef.value?.list, (newVal) => {
+//   proxyList.value = newVal
+// }, {
+//   deep: true,
+// })
 </script>
 
 <template>
@@ -214,9 +252,9 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
-            <el-form-item label="具体考核部门" prop="approvalName">
+            <!-- <el-form-item label="具体考核部门" prop="approvalName">
               <el-input v-model.trim="ruleForm.approvalName" type="textarea" placeholder="考核部门" :rows="3" />
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
@@ -230,7 +268,7 @@
           <el-col :span="12">
             <el-form-item label="考核等级评定" prop="levelId">
               <el-select v-model.trim="ruleForm.levelId" placeholder="考核等级评定" style="width: 100%;">
-                <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in levelList" :key="item.id" :label="item.levelName" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -286,7 +324,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
             <el-form-item label="附件上传" prop="approvalNo">
-              <show-photo :minio-file-name="ruleForm.fileId" @delete="deleteFile" />
+              <show-photo :minio-file-name="ruleForm.fileName" :minio-file-id="ruleForm.fileId" @delete="deleteFile" />
               <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
               <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload">
                 上传
@@ -297,7 +335,7 @@
       </el-form>
     </detail-block-com>
     <!-- 一级考核指标 -->
-    <proxy-table v-show="radio === '一级考核指标'" ref="proxyRef" :data="[]" />
+    <proxy-table v-show="radio === '一级考核指标'" ref="proxyRef" :data="proxyList" />
   </app-container>
 </template>
 
diff --git a/src/views/rule/programme/components/proxyTable.vue b/src/views/rule/programme/components/proxyTable.vue
index c2fd143..55ddd41 100644
--- a/src/views/rule/programme/components/proxyTable.vue
+++ b/src/views/rule/programme/components/proxyTable.vue
@@ -58,6 +58,7 @@
   },
 ])
 const list = ref<any[]>([])
+const backList = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
   return useCheckList(list.value, columns.value, '一级考核指标列表')
@@ -87,6 +88,7 @@
     // 去掉重复选择
     if (!list.value.filter((ele: any) => ele.id === item.id).length) {
       list.value.push(item)
+      backList.value.push(item)
     }
   })
 }
@@ -98,33 +100,47 @@
 }
 watch(() => $props.data, (newVal) => {
   if (newVal) {
-    list.value = newVal
+    list.value = JSON.parse(JSON.stringify(newVal))
+    backList.value = JSON.parse(JSON.stringify(newVal))
   }
+}, {
+  deep: true,
 })
-const initDialog = () => {
-  list.value = $props.data
-}
-initDialog()
+// const initDialog = () => {
+//   list.value = JSON.parse(JSON.stringify($props.data))
+// }
+// initDialog()
 defineExpose({
   list,
   checkCertificateList,
 })
+const name = ref<string>('')
+const search = () => {
+  list.value = backList.value.filter((item: any) => item.quotaProjectName.includes(name.value))
+}
+const reset = () => {
+  name.value = ''
+  list.value = backList.value
+}
 </script>
 
 <template>
   <detail-block-switch title="">
     <proxy-dialog ref="proxyRef" @add="comfirm" />
     <template #menu>
-      <el-input v-if="!$route.path.includes('create')" placeholder="指标名称" />
+      <el-input v-if="!$route.path.includes('create')" v-model="name" placeholder="指标名称" clearable />
     </template>
-    <template v-if="!$route.path.includes('detail')" #btns>
-      <el-button v-if="!$route.path.includes('create')" type="info">
+    <template #btns>
+      <el-button v-if="!$route.path.includes('create')" type="primary" @click="search">
         查询
       </el-button>
-      <el-button type="info" @click="removeRow">
+      <el-button v-if="!$route.path.includes('create')" type="warning" @click="reset">
+        重置
+      </el-button>
+      <el-button v-if="!$route.path.includes('detail')" type="info" @click="removeRow">
         删除
       </el-button>
-      <el-button type="primary" @click="addRow">
+      <el-button v-if="!$route.path.includes('detail')" type="primary" @click="addRow">
         增加
       </el-button>
     </template>

diff --git a/src/api/home/1 b/src/api/home/1
deleted file mode 100644
index e69de29..0000000
--- a/src/api/home/1
+++ /dev/null
diff --git a/src/api/home/filling/filling.ts b/src/api/home/filling/filling.ts
new file mode 100644
index 0000000..47914e0
--- /dev/null
+++ b/src/api/home/filling/filling.ts
@@ -0,0 +1,29 @@
+/**
+ * 填报相关接口
+ */
+import request from '@/api/index'
+
+// 分页列表
+export function getListPage(params: object) {
+  return request({
+    url: '/planQuotaRep/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 填报
+export function filling(data: object) {
+  return request({
+    url: '/planQuotaRep/updateRep',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function batchSubmitApi(data: object) {
+  return request({
+    url: '/planQuotaRep/batchSubmit',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/rule/programme.ts b/src/api/home/rule/programme.ts
index cbf5585..91e1dbe 100644
--- a/src/api/home/rule/programme.ts
+++ b/src/api/home/rule/programme.ts
@@ -51,4 +51,26 @@
     data,
   })
 }
-
+// 方案指标列表
+export function ProxyList(params: object) {
+  return request({
+    url: '/assessmentPlan/planQuotaListPage',
+    method: 'get',
+    params,
+  })
+}
+// 考核方案等级下拉 /assessmentLevel/list
+export function getGradeSelectList() {
+  return request({
+    url: '/assessmentLevel/list',
+    method: 'get',
+  })
+}
+// 启用考核计划方案
+export function updatePlanEnabled(data: object) {
+  return request({
+    url: '/assessmentPlan/updatePlanEnabled',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 5c765ed..a221af2 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -6,6 +6,10 @@
     type: String,
     required: true,
   },
+  minioFileId: {
+    type: String,
+    required: true,
+  },
   height: {
     type: String,
     default: '100px',
@@ -24,17 +28,20 @@
     //   url.value = res.data
     // })
     const arr = props.minioFileName.split(',')
-    urlList.value = arr.map((item) => {
+    const ids = props.minioFileId.split(',')
+    console.log(ids, 'ids')
+    urlList.value = arr.map((item, index) => {
+      console.log(`${import.meta.env.VITE_APP_API_BASEURL}${ids[index]}`)
       return {
         minioFileName: item,
-        url: '',
+        url: `${import.meta.env.VITE_APP_API_BASEURL}/static/${ids[index]}`,
       }
     })
-    urlList.value.forEach((item: any) => {
-      getFileUrl(item.minioFileName).then((res) => {
-        item.url = res.data
-      })
-    })
+    // urlList.value.forEach((item: any) => {
+    //   getFileUrl(item.minioFileName).then((res) => {
+    //     item.url = res.data
+    //   })
+    // })
   }
   else {
     urlList.value = []
diff --git a/src/views/flling/already/index copy.vue b/src/views/flling/already/index copy.vue
new file mode 100644
index 0000000..8ee5ca4
--- /dev/null
+++ b/src/views/flling/already/index copy.vue
@@ -0,0 +1,199 @@
+<!--
+ * @Description: 考核填报-已填报列表页面
+ * @Author: 李亚光
+ * @Date: 2023-09-14
+ -->
+<script lang="ts" setup name="FillingAlreadyList">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '考核结果编号',
+    value: 'groupName',
+    align: 'center',
+  },
+  {
+    text: '考核方案名称',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '考核对象',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '考核周期',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核时间',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标项目',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标类型',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '一级考核指标',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标得分',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核说明',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '附件',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '提交状态',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '填报时间',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  // getGroupList(listQuery).then((response) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  listLoading.value = false
+  // })
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  // $router.push({
+  //   path: `/group/${type}`,
+  //   query: {
+  //     row: JSON.stringify(row),
+  //     id: row.id,
+  //   },
+  // })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除此分组信息吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // delGroup(row.id).then((res) => {
+    //   ElMessage.success('操作成功')
+    //   search()
+    // })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="考核时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary">
+          导出
+        </el-button>
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" @change="changePage"
+      >
+        <!-- <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small">
+                填报
+              </el-button>
+              <el-button link type="primary" size="small">
+                提交
+              </el-button>
+            </template>
+          </el-table-column>
+        </template> -->
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
diff --git a/src/views/flling/already/index.vue b/src/views/flling/already/index.vue
index 8ee5ca4..ca7731c 100644
--- a/src/views/flling/already/index.vue
+++ b/src/views/flling/already/index.vue
@@ -4,196 +4,10 @@
  * @Date: 2023-09-14
  -->
 <script lang="ts" setup name="FillingAlreadyList">
-import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-const { proxy } = getCurrentInstance() as any
-const listQuery = reactive({
-  offset: 1,
-  limit: 20,
-})
-const columns = ref([
-  {
-    text: '考核结果编号',
-    value: 'groupName',
-    align: 'center',
-  },
-  {
-    text: '考核方案名称',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '考核对象',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '考核周期',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核时间',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标项目',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标类型',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '一级考核指标',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标得分',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核说明',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '附件',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '提交状态',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '填报时间',
-    value: 'remark',
-    align: 'center',
-  },
-])
-const list = ref([])
-const total = ref(0)
-const listLoading = ref(true)
-
-// 获取数据
-const fetchData = (isNowPage = true) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  // getGroupList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  listLoading.value = false
-  // })
-}
-fetchData()
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-// 重置
-const reset = () => {
-  listQuery.offset = 1
-  listQuery.limit = 20
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size: number; page: number }) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData()
-}
-const $router = useRouter()
-// 新建编辑操作
-const handler = (row: any, type: string) => {
-  // $router.push({
-  //   path: `/group/${type}`,
-  //   query: {
-  //     row: JSON.stringify(row),
-  //     id: row.id,
-  //   },
-  // })
-}
-// 删除
-const delHandler = (row: any) => {
-  ElMessageBox.confirm(
-    '确认删除此分组信息吗?',
-    '确认',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    // delGroup(row.id).then((res) => {
-    //   ElMessage.success('操作成功')
-    //   search()
-    // })
-  })
-}
+import list from '@/views/flling/treat/index.vue'
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="考核时间"
-        />
-      </search-item>
-    </search-area>
-    <table-container>
-      <template #btns-right>
-        <el-button type="primary">
-          导出
-        </el-button>
-      </template>
-      <!-- 普通表格 -->
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
-      >
-        <!-- <template #columns>
-          <el-table-column label="操作" width="140" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small">
-                填报
-              </el-button>
-              <el-button link type="primary" size="small">
-                提交
-              </el-button>
-            </template>
-          </el-table-column>
-        </template> -->
-      </normal-table>
-    </table-container>
-  </app-container>
+  <list />
 </template>
 
diff --git a/src/views/flling/treat/fillingDialog.vue b/src/views/flling/treat/fillingDialog.vue
new file mode 100644
index 0000000..d3b0e54
--- /dev/null
+++ b/src/views/flling/treat/fillingDialog.vue
@@ -0,0 +1,179 @@
+<!-- 考核填报弹窗 -->
+<script lang="ts" setup name="FillingDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { uploadApi } from '@/api/common'
+import { filling } from '@/api/home/filling/filling'
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+const dialogVisible = ref(false)
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+}
+const rowData = ref({})
+const defaultFormData = {
+  assDesc: '', // 考核说明
+  fileId: '',
+  fileName: '',
+  score: '',
+}
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  assDesc: [{ required: true, message: '考核说明不可为空', trigger: ['blur', 'change'] }],
+  score: [{ required: true, message: '考核得分不可为空', trigger: ['blur', 'change'] }],
+})
+
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      const data = {
+        assDesc: formData.assDesc,
+        fileId: formData.fileId,
+        fileName: formData.fileName,
+        score: formData.score,
+        id: rowData.value.id,
+      }
+      filling(data).then((res) => {
+        ElMessage.success('填报成功')
+        dialogVisible.value = false
+        resetForm()
+        emits('closeRefresh')
+      })
+    }
+  })
+}
+// 重置表单
+function resetForm() {
+  const form = formData
+  const keys = Object.keys(formData)
+  keys.forEach((key) => {
+    form[key] = defaultFormData[key]
+  })
+  Object.assign(formData, form)
+  nextTick(() => {
+    dataFormRef.value?.clearValidate()
+  })
+}
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: any) {
+  dialogVisible.value = true
+  rowData.value = row
+  resetForm()
+}
+
+// 关闭弹窗
+function dialogClose() {
+  resetForm()
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('file', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        formData.fileId = formData.fileId ? `${formData.fileId},${res.data.fileId}` : res.data.fileId
+        formData.fileName = formData.fileName ? `${formData.fileName},${res.data.fileName}` : res.data.fileName
+        // 重置当前验证
+        // dataFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+// 上传
+const upload = () => {
+  fileRef.value.click()
+}
+// 删除上传的文件
+const deleteFile = (fileName: string) => {
+  const data = formData.fileName.split(',')
+  const ids = formData.fileId.split(',')
+  const filterData = data.filter(item => item !== fileName)
+  const filterid = ids.filter((item, index) => index !== data.findIndex(citem => citem === fileName))
+  formData.fileId = filterid.length ? filterid.join(',') : ''
+  formData.fileName = filterData.length ? filterData.join(',') : ''
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="填报"
+    width="50%"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <el-form
+      ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="110px" class="form-container"
+      size="default" @submit.prevent
+    >
+      <el-row :gutter="24">
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="考核得分" prop="score" class="required">
+            <el-input v-model.trim="formData.score" type="text" placeholder="0-12之间" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="考核说明" prop="assDesc" class="required">
+            <el-input v-model.trim="formData.assDesc" type="textarea" placeholder="考核说明" :rows="4" maxlength="100" show-word-limit />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="附件上传">
+            <show-photo :minio-file-name="formData.fileName" :minio-file-id="formData.fileId" @delete="deleteFile" />
+            <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
+            <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload">
+              上传
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitForm(dataFormRef)">
+          保存
+        </el-button>
+        <el-button @click="dialogClose">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.form-container {
+  width: 100%;
+
+  .full-width-input {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/views/flling/treat/index.vue b/src/views/flling/treat/index.vue
index d08184a..44e356d 100644
--- a/src/views/flling/treat/index.vue
+++ b/src/views/flling/treat/index.vue
@@ -5,71 +5,102 @@
  -->
 <script lang="ts" setup name="FillingTreatList">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import FillingDialog from './fillingDialog.vue'
+import { batchSubmitApi, getListPage } from '@/api/home/filling/filling'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 const listQuery = reactive({
+  assessedDept: '', // 指标考核对象
+  cycle: '', // 考核周期
+  isSubmit: $route.path.includes('treat') ? 'false' : 'true',
+  planName: '', // 考核方案名称
+  resultNo: '', // 考核结果编号
   offset: 1,
   limit: 20,
+  startTime: '',
+  endTime: '',
 })
 const columns = ref([
   {
     text: '考核结果编号',
-    value: 'groupName',
+    value: 'resultNo',
     align: 'center',
   },
   {
     text: '考核方案名称',
-    value: 'createUserName',
+    value: 'planName',
     align: 'center',
   },
   {
     text: '考核对象',
-    value: 'createTime',
+    value: 'assessedDeptName',
     align: 'center',
   },
   {
     text: '考核周期',
-    value: 'remark',
+    value: 'cycleName',
     align: 'center',
   },
   {
     text: '考核时间',
-    value: 'remark',
+    value: 'startTime',
     align: 'center',
   },
   {
     text: '考核指标项目',
-    value: 'remark',
+    value: 'quotaProjectName',
     align: 'center',
   },
   {
     text: '考核指标类型',
-    value: 'remark',
+    value: 'quotaTypeName',
     align: 'center',
   },
   {
     text: '一级考核指标',
-    value: 'remark',
+    value: 'priIndicators',
     align: 'center',
   },
   {
     text: '考核指标得分',
-    value: 'remark',
+    value: 'score',
     align: 'center',
   },
   {
     text: '考核说明',
-    value: 'remark',
+    value: 'assDesc',
     align: 'center',
   },
+])
+const treatColums = ref([
   {
     text: '提交状态',
-    value: 'remark',
+    value: 'submitStatusName',
     align: 'center',
   },
   {
     text: '填报截至时间',
-    value: 'remark',
+    value: 'timeScope',
+    align: 'center',
+  },
+])
+const alreadyColums = ref([
+  {
+    text: '附件',
+    value: 'fileName',
+    align: 'center',
+  },
+  {
+    text: '提交状态',
+    value: 'submitStatusName',
+    align: 'center',
+  },
+  {
+    text: '填报时间',
+    value: 'endTime',
     align: 'center',
   },
 ])
@@ -84,19 +115,38 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getGroupList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  listLoading.value = false
-  // })
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows.map((item: any) => ({ ...item, timeScope: `${item.startTime}-${item.endTime}` }))
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
 const search = () => {
   fetchData(false)
 }
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length) {
+    listQuery.startTime = `${newVal[0]} 00:00:00`
+    listQuery.endTime = `${newVal[1]} 23:59:59`
+  }
+  else {
+    listQuery.startTime = ''
+    listQuery.endTime = ''
+  }
+})
 // 重置
 const reset = () => {
+  datetimerange.value = []
+  listQuery.assessedDept = ''
+  listQuery.planName = ''
+  listQuery.resultNo = ''
+  listQuery.startTime = ''
+  listQuery.endTime = ''
+  listQuery.cycle = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -111,21 +161,29 @@
   }
   fetchData()
 }
-const $router = useRouter()
-// 新建编辑操作
-const handler = (row: any, type: string) => {
-  // $router.push({
-  //   path: `/group/${type}`,
-  //   query: {
-  //     row: JSON.stringify(row),
-  //     id: row.id,
-  //   },
-  // })
+// 考核对象下拉列表
+const objectList = ref<{ id: string; value: string; name: string }[]>()
+// 考核周期下拉框
+const cycleList = ref<{ id: string; value: string; name: string }[]>()
+// 获取字典
+const fetchSelectList = () => {
+  getDictByCode('ass_object').then((res) => {
+    objectList.value = res.data
+  })
+  getDictByCode('cycle_code').then((res) => {
+    cycleList.value = res.data
+  })
 }
-// 删除
-const delHandler = (row: any) => {
+fetchSelectList()
+// 填报
+const fillingRef = ref()
+const filling = (row: any) => {
+  fillingRef.value.initDialog(row)
+}
+// 提交
+const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此分组信息吗?',
+    '确定提交考核结果吗？一经提交，不可修改！',
     '确认',
     {
       confirmButtonText: '确认',
@@ -133,60 +191,129 @@
       type: 'warning',
     },
   ).then(() => {
-    // delGroup(row.id).then((res) => {
-    //   ElMessage.success('操作成功')
-    //   search()
-    // })
+    batchSubmitApi({ ids: [row.id] }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
   })
 }
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 批量提交
+const batchSubmit = () => {
+  let data = [] as string[]
+  if (selectList.value.filter((item: any) => item.submitStatusName === '未提交').length) {
+    data = selectList.value.filter((item: any) => item.submitStatusName === '未提交').map((item: any) => item.id)
+  }
+  else {
+    ElMessage.warning('请选择未提交的填报')
+    return
+  }
+  // 只能提交  未提交状态的数据
+  ElMessageBox.confirm(
+    '确定提交考核结果吗？一经提交，不可修改！',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    batchSubmitApi({ ids: data }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      // ids: selectList.value.map(item => item.id),
+    }
+    // exportGrade(data).then((res) => {
+    //   exportFile(res.data, '考核等级评定')
+    //   loading.close()
+    // })
+    //   .catch((_) => {
+    //     loading.close()
+    //   })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
 </script>
 
 <template>
   <app-container>
+    <filling-dialog ref="fillingRef" @close-refresh="search" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
+        <el-input v-model.trim="listQuery.resultNo" placeholder="考核结果编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
+        <el-input v-model.trim="listQuery.planName" placeholder="考核方案名称" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
+        <el-select v-model.trim="listQuery.assessedDept" placeholder="指标考核对象" clearable>
+          <el-option v-for="item in objectList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
+        <el-select v-model.trim="listQuery.cycle" placeholder="考核周期" clearable>
+          <el-option v-for="item in cycleList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="考核时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="考核开始时间" end-placeholder="考核结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary">
+        <el-button v-if="$route.path.includes('treat')" type="primary" @click="batchSubmit">
           提交
         </el-button>
+        <el-button v-else type="primary" @click="exportList">
+          导出
+        </el-button>
       </template>
-      <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
-        <template #columns>
+        <template v-if="$route.path.includes('treat')" #columns>
+          <el-table-column v-for="item in treatColums" :key="item.text" :label="item.text" :prop="item.value" align="center" />
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button link type="primary" size="small">
+              <el-button :disabled="scope.row.submitStatusName !== '未填报'" link type="primary" size="small" @click="filling(scope.row)">
                 填报
               </el-button>
-              <el-button link type="primary" size="small">
+              <el-button :disabled="scope.row.submitStatusName !== '未提交'" link type="primary" size="small" @click="submit(scope.row)">
                 提交
               </el-button>
             </template>
           </el-table-column>
         </template>
+        <template v-else #columns>
+          <el-table-column v-for="item in alreadyColums" :key="item.text" :label="item.text" :prop="item.value" align="center" />
+        </template>
       </normal-table>
     </table-container>
   </app-container>
diff --git a/src/views/rule/programme/components/edit.vue b/src/views/rule/programme/components/edit.vue
index 1c1cfba..903c65e 100644
--- a/src/views/rule/programme/components/edit.vue
+++ b/src/views/rule/programme/components/edit.vue
@@ -9,7 +9,7 @@
 import proxyTable from './proxyTable.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/common'
-import { addProgramme, addProxyList, editProgramme, getDetail } from '@/api/home/rule/programme'
+import { ProxyList, addProgramme, addProxyList, editProgramme, getDetail, getGradeSelectList, updatePlanEnabled } from '@/api/home/rule/programme'
 const $route = useRoute()
 const $router = useRouter()
 // 对话框类型：create,update
@@ -27,6 +27,7 @@
   cycle: '', // 考核周期
   endTime: '',
   fileId: '',
+  fileName: '',
   id: '',
   isEnable: '',
   levelId: '',
@@ -37,6 +38,7 @@
   score: '',
   startTime: '',
 })
+const proxyList = ref([])
 // 表单验证规则
 const rules = ref<FormRules>({
   assObject: [{ required: true, message: '考核对象必选', trigger: ['blur', 'change'] }],
@@ -61,11 +63,11 @@
       lock: true,
       background: 'rgba(255, 255, 255, 0.8)',
     })
-    console.log(event.target.files)
     fd.append('file', event.target.files[0])
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
-        ruleForm.value.fileId = ruleForm.value.fileId ? `${ruleForm.value.fileId},${res.data.fileName}` : res.data.fileName
+        ruleForm.value.fileId = ruleForm.value.fileId ? `${ruleForm.value.fileId},${res.data.fileId}` : res.data.fileId
+        ruleForm.value.fileName = ruleForm.value.fileName ? `${ruleForm.value.fileName},${res.data.fileName}` : res.data.fileName
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
@@ -96,7 +98,7 @@
 // 考核周期下拉框
 const cycleList = ref<{ id: string; value: string; name: string }[]>()
 // 考核等级下拉框
-const levelList = ref<{ id: string; value: string; name: string }[]>()
+const levelList = ref<any[]>()
 // 获取字典
 const fetchSelectList = () => {
   getDictByCode('ass_object').then((res) => {
@@ -108,12 +110,24 @@
   getDictByCode('cycle_code').then((res) => {
     cycleList.value = res.data
   })
-  getDictByCode('level_code').then((res) => {
+  // getDictByCode('level_code').then((res) => {
+  //   levelList.value = res.data
+  // })
+  getGradeSelectList().then((res) => {
     levelList.value = res.data
   })
 }
 fetchSelectList()
 const radio = ref('基本信息')
+// 获取方案指标列表
+const fetchProxyList = () => {
+  // if ($route.path.includes('create')) {
+  //   return
+  // }
+  ProxyList({ planId: ruleForm.value.id, limit: 9999, offset: 1 }).then((res) => {
+    proxyList.value = res.data.rows
+  })
+}
 onMounted(() => {
   dialogStatus.value = $route.params.type as string
   if (!$route.path.includes('create')) {
@@ -125,6 +139,7 @@
     // getDetail({ id: data.id }).then((res) => {
     //   console.log(res.data)
     // })
+    fetchProxyList()
   }
 })
 // 编辑
@@ -132,22 +147,39 @@
   editProgramme({ ...ruleForm.value }).then((res) => {
     addProxyList({
       planId: ruleForm.value.id,
-      quotaIds: proxyRef.value.list.map((item: any) => item.id),
+      quotaIds: proxyList.value.map((item: any) => item.id),
     }).then((res) => {
+      // if (ruleForm.value.isEnable === '1' && proxyList.value.length) {
+      //   updatePlanEnabled({ ...ruleForm.value }).then(() => {
+      //     ElMessage.success('操作成功')
+      //     $router.go(-1)
+      //   })
+      // }
+      // else {
       ElMessage.success('操作成功')
       $router.go(-1)
+      // }
     })
   })
 }
 // 新增
 const create = () => {
-  addProgramme({ ...ruleForm.value }).then((res) => {
-    console.log()
-    // addProxyList({
-
-    // })
-    ElMessage.success('操作成功')
-    $router.go(-1)
+  addProgramme({ ...ruleForm.value }).then((response) => {
+    addProxyList({
+      planId: response.data,
+      quotaIds: proxyList.value.map((item: any) => item.id),
+    }).then((res) => {
+      if (ruleForm.value.isEnable === '1' && proxyList.value.length) {
+        updatePlanEnabled({ id: response.data, isEnable: '1' }).then(() => {
+          ElMessage.success('操作成功')
+          $router.go(-1)
+        })
+      }
+      else {
+        ElMessage.success('操作成功')
+        $router.go(-1)
+      }
+    })
   })
 }
 // 保存
@@ -163,6 +195,7 @@
         type: 'warning',
       },
     ).then((res) => {
+      proxyList.value = proxyRef.value?.list
       if ($route.path.includes('update')) {
         update()
       }
@@ -172,6 +205,11 @@
     })
   })
 }
+// watch(() => proxyRef.value?.list, (newVal) => {
+//   proxyList.value = newVal
+// }, {
+//   deep: true,
+// })
 </script>
 
 <template>
@@ -214,9 +252,9 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
-            <el-form-item label="具体考核部门" prop="approvalName">
+            <!-- <el-form-item label="具体考核部门" prop="approvalName">
               <el-input v-model.trim="ruleForm.approvalName" type="textarea" placeholder="考核部门" :rows="3" />
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
@@ -230,7 +268,7 @@
           <el-col :span="12">
             <el-form-item label="考核等级评定" prop="levelId">
               <el-select v-model.trim="ruleForm.levelId" placeholder="考核等级评定" style="width: 100%;">
-                <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in levelList" :key="item.id" :label="item.levelName" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -286,7 +324,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
             <el-form-item label="附件上传" prop="approvalNo">
-              <show-photo :minio-file-name="ruleForm.fileId" @delete="deleteFile" />
+              <show-photo :minio-file-name="ruleForm.fileName" :minio-file-id="ruleForm.fileId" @delete="deleteFile" />
               <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
               <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload">
                 上传
@@ -297,7 +335,7 @@
       </el-form>
     </detail-block-com>
     <!-- 一级考核指标 -->
-    <proxy-table v-show="radio === '一级考核指标'" ref="proxyRef" :data="[]" />
+    <proxy-table v-show="radio === '一级考核指标'" ref="proxyRef" :data="proxyList" />
   </app-container>
 </template>
 
diff --git a/src/views/rule/programme/components/proxyTable.vue b/src/views/rule/programme/components/proxyTable.vue
index c2fd143..55ddd41 100644
--- a/src/views/rule/programme/components/proxyTable.vue
+++ b/src/views/rule/programme/components/proxyTable.vue
@@ -58,6 +58,7 @@
   },
 ])
 const list = ref<any[]>([])
+const backList = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
   return useCheckList(list.value, columns.value, '一级考核指标列表')
@@ -87,6 +88,7 @@
     // 去掉重复选择
     if (!list.value.filter((ele: any) => ele.id === item.id).length) {
       list.value.push(item)
+      backList.value.push(item)
     }
   })
 }
@@ -98,33 +100,47 @@
 }
 watch(() => $props.data, (newVal) => {
   if (newVal) {
-    list.value = newVal
+    list.value = JSON.parse(JSON.stringify(newVal))
+    backList.value = JSON.parse(JSON.stringify(newVal))
   }
+}, {
+  deep: true,
 })
-const initDialog = () => {
-  list.value = $props.data
-}
-initDialog()
+// const initDialog = () => {
+//   list.value = JSON.parse(JSON.stringify($props.data))
+// }
+// initDialog()
 defineExpose({
   list,
   checkCertificateList,
 })
+const name = ref<string>('')
+const search = () => {
+  list.value = backList.value.filter((item: any) => item.quotaProjectName.includes(name.value))
+}
+const reset = () => {
+  name.value = ''
+  list.value = backList.value
+}
 </script>
 
 <template>
   <detail-block-switch title="">
     <proxy-dialog ref="proxyRef" @add="comfirm" />
     <template #menu>
-      <el-input v-if="!$route.path.includes('create')" placeholder="指标名称" />
+      <el-input v-if="!$route.path.includes('create')" v-model="name" placeholder="指标名称" clearable />
     </template>
-    <template v-if="!$route.path.includes('detail')" #btns>
-      <el-button v-if="!$route.path.includes('create')" type="info">
+    <template #btns>
+      <el-button v-if="!$route.path.includes('create')" type="primary" @click="search">
         查询
       </el-button>
-      <el-button type="info" @click="removeRow">
+      <el-button v-if="!$route.path.includes('create')" type="warning" @click="reset">
+        重置
+      </el-button>
+      <el-button v-if="!$route.path.includes('detail')" type="info" @click="removeRow">
         删除
       </el-button>
-      <el-button type="primary" @click="addRow">
+      <el-button v-if="!$route.path.includes('detail')" type="primary" @click="addRow">
         增加
       </el-button>
     </template>
diff --git a/src/views/rule/programme/index.vue b/src/views/rule/programme/index.vue
index dd485b4..e55a91c 100644
--- a/src/views/rule/programme/index.vue
+++ b/src/views/rule/programme/index.vue
@@ -29,7 +29,7 @@
   },
   {
     text: '具体考核部门',
-    value: '',
+    value: 'assDept',
     align: 'center',
   },
   {
@@ -47,21 +47,6 @@
     value: 'recoRatingName',
     align: 'center',
   },
-  // {
-  //   text: '考核指标项目',
-  //   value: 'remark',
-  //   align: 'center',
-  // },
-  // {
-  //   text: '考核指标类型',
-  //   value: 'remark',
-  //   align: 'center',
-  // },
-  {
-    text: '考核方案得分',
-    value: 'score',
-    align: 'center',
-  },
 ])
 const list = ref([])
 const total = ref(0)
@@ -75,7 +60,12 @@
     listQuery.offset = 1
   }
   getListPage(listQuery).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        assDept: item.depts.map((child: any) => child.fullName).join(','),
+      }
+    })
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
@@ -126,7 +116,7 @@
       type: 'warning',
     },
   ).then(() => {
-    delProgramme(row.id).then((res) => {
+    delProgramme({ id: row.id }).then((res) => {
       ElMessage.success('操作成功')
       search()
     })
@@ -190,6 +180,29 @@
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
+          <el-table-column label="考核指标项目" align="center">
+            <template #default="scope">
+              <div class="container">
+                <div v-for="(item, index) in scope.row.quotaInfos" :key="item.id" :class="`${index === 0 ? '' : 'item'}`">
+                  {{ item.quotaProjectName }}
+                </div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="考核指标类型" align="center">
+            <template #default="scope">
+              <div class="container">
+                <div v-for="(item, index) in scope.row.quotaInfos" :key="item.id" :class="`${index === 0 ? '' : 'item'}`">
+                  {{ item.priIndicators }}
+                </div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="考核方案得分" align="center">
+            <template #default="scope">
+              {{ scope.row.score }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
@@ -209,3 +222,17 @@
   </app-container>
 </template>
 
+<style lang="scss" scope>
+.container {
+  // display: flex;
+  width: 100%;
+
+  .item {
+    float: left;
+    border-top: 1px solid #ebeef5;
+    text-align: center;
+    width: 100%;
+  }
+}
+</style>
+

diff --git a/src/api/home/1 b/src/api/home/1
deleted file mode 100644
index e69de29..0000000
--- a/src/api/home/1
+++ /dev/null
diff --git a/src/api/home/filling/filling.ts b/src/api/home/filling/filling.ts
new file mode 100644
index 0000000..47914e0
--- /dev/null
+++ b/src/api/home/filling/filling.ts
@@ -0,0 +1,29 @@
+/**
+ * 填报相关接口
+ */
+import request from '@/api/index'
+
+// 分页列表
+export function getListPage(params: object) {
+  return request({
+    url: '/planQuotaRep/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 填报
+export function filling(data: object) {
+  return request({
+    url: '/planQuotaRep/updateRep',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function batchSubmitApi(data: object) {
+  return request({
+    url: '/planQuotaRep/batchSubmit',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/rule/programme.ts b/src/api/home/rule/programme.ts
index cbf5585..91e1dbe 100644
--- a/src/api/home/rule/programme.ts
+++ b/src/api/home/rule/programme.ts
@@ -51,4 +51,26 @@
     data,
   })
 }
-
+// 方案指标列表
+export function ProxyList(params: object) {
+  return request({
+    url: '/assessmentPlan/planQuotaListPage',
+    method: 'get',
+    params,
+  })
+}
+// 考核方案等级下拉 /assessmentLevel/list
+export function getGradeSelectList() {
+  return request({
+    url: '/assessmentLevel/list',
+    method: 'get',
+  })
+}
+// 启用考核计划方案
+export function updatePlanEnabled(data: object) {
+  return request({
+    url: '/assessmentPlan/updatePlanEnabled',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 5c765ed..a221af2 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -6,6 +6,10 @@
     type: String,
     required: true,
   },
+  minioFileId: {
+    type: String,
+    required: true,
+  },
   height: {
     type: String,
     default: '100px',
@@ -24,17 +28,20 @@
     //   url.value = res.data
     // })
     const arr = props.minioFileName.split(',')
-    urlList.value = arr.map((item) => {
+    const ids = props.minioFileId.split(',')
+    console.log(ids, 'ids')
+    urlList.value = arr.map((item, index) => {
+      console.log(`${import.meta.env.VITE_APP_API_BASEURL}${ids[index]}`)
       return {
         minioFileName: item,
-        url: '',
+        url: `${import.meta.env.VITE_APP_API_BASEURL}/static/${ids[index]}`,
       }
     })
-    urlList.value.forEach((item: any) => {
-      getFileUrl(item.minioFileName).then((res) => {
-        item.url = res.data
-      })
-    })
+    // urlList.value.forEach((item: any) => {
+    //   getFileUrl(item.minioFileName).then((res) => {
+    //     item.url = res.data
+    //   })
+    // })
   }
   else {
     urlList.value = []
diff --git a/src/views/flling/already/index copy.vue b/src/views/flling/already/index copy.vue
new file mode 100644
index 0000000..8ee5ca4
--- /dev/null
+++ b/src/views/flling/already/index copy.vue
@@ -0,0 +1,199 @@
+<!--
+ * @Description: 考核填报-已填报列表页面
+ * @Author: 李亚光
+ * @Date: 2023-09-14
+ -->
+<script lang="ts" setup name="FillingAlreadyList">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '考核结果编号',
+    value: 'groupName',
+    align: 'center',
+  },
+  {
+    text: '考核方案名称',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '考核对象',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '考核周期',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核时间',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标项目',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标类型',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '一级考核指标',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核指标得分',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '考核说明',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '附件',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '提交状态',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '填报时间',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  // getGroupList(listQuery).then((response) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  listLoading.value = false
+  // })
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  // $router.push({
+  //   path: `/group/${type}`,
+  //   query: {
+  //     row: JSON.stringify(row),
+  //     id: row.id,
+  //   },
+  // })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除此分组信息吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // delGroup(row.id).then((res) => {
+    //   ElMessage.success('操作成功')
+    //   search()
+    // })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="考核时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <el-button type="primary">
+          导出
+        </el-button>
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" @change="changePage"
+      >
+        <!-- <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small">
+                填报
+              </el-button>
+              <el-button link type="primary" size="small">
+                提交
+              </el-button>
+            </template>
+          </el-table-column>
+        </template> -->
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
diff --git a/src/views/flling/already/index.vue b/src/views/flling/already/index.vue
index 8ee5ca4..ca7731c 100644
--- a/src/views/flling/already/index.vue
+++ b/src/views/flling/already/index.vue
@@ -4,196 +4,10 @@
  * @Date: 2023-09-14
  -->
 <script lang="ts" setup name="FillingAlreadyList">
-import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-const { proxy } = getCurrentInstance() as any
-const listQuery = reactive({
-  offset: 1,
-  limit: 20,
-})
-const columns = ref([
-  {
-    text: '考核结果编号',
-    value: 'groupName',
-    align: 'center',
-  },
-  {
-    text: '考核方案名称',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '考核对象',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '考核周期',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核时间',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标项目',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标类型',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '一级考核指标',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核指标得分',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '考核说明',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '附件',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '提交状态',
-    value: 'remark',
-    align: 'center',
-  },
-  {
-    text: '填报时间',
-    value: 'remark',
-    align: 'center',
-  },
-])
-const list = ref([])
-const total = ref(0)
-const listLoading = ref(true)
-
-// 获取数据
-const fetchData = (isNowPage = true) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  // getGroupList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  listLoading.value = false
-  // })
-}
-fetchData()
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-// 重置
-const reset = () => {
-  listQuery.offset = 1
-  listQuery.limit = 20
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size: number; page: number }) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData()
-}
-const $router = useRouter()
-// 新建编辑操作
-const handler = (row: any, type: string) => {
-  // $router.push({
-  //   path: `/group/${type}`,
-  //   query: {
-  //     row: JSON.stringify(row),
-  //     id: row.id,
-  //   },
-  // })
-}
-// 删除
-const delHandler = (row: any) => {
-  ElMessageBox.confirm(
-    '确认删除此分组信息吗?',
-    '确认',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    // delGroup(row.id).then((res) => {
-    //   ElMessage.success('操作成功')
-    //   search()
-    // })
-  })
-}
+import list from '@/views/flling/treat/index.vue'
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
-      </search-item>
-      <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="考核时间"
-        />
-      </search-item>
-    </search-area>
-    <table-container>
-      <template #btns-right>
-        <el-button type="primary">
-          导出
-        </el-button>
-      </template>
-      <!-- 普通表格 -->
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
-      >
-        <!-- <template #columns>
-          <el-table-column label="操作" width="140" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small">
-                填报
-              </el-button>
-              <el-button link type="primary" size="small">
-                提交
-              </el-button>
-            </template>
-          </el-table-column>
-        </template> -->
-      </normal-table>
-    </table-container>
-  </app-container>
+  <list />
 </template>
 
diff --git a/src/views/flling/treat/fillingDialog.vue b/src/views/flling/treat/fillingDialog.vue
new file mode 100644
index 0000000..d3b0e54
--- /dev/null
+++ b/src/views/flling/treat/fillingDialog.vue
@@ -0,0 +1,179 @@
+<!-- 考核填报弹窗 -->
+<script lang="ts" setup name="FillingDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { uploadApi } from '@/api/common'
+import { filling } from '@/api/home/filling/filling'
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+const dialogVisible = ref(false)
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+}
+const rowData = ref({})
+const defaultFormData = {
+  assDesc: '', // 考核说明
+  fileId: '',
+  fileName: '',
+  score: '',
+}
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  assDesc: [{ required: true, message: '考核说明不可为空', trigger: ['blur', 'change'] }],
+  score: [{ required: true, message: '考核得分不可为空', trigger: ['blur', 'change'] }],
+})
+
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      const data = {
+        assDesc: formData.assDesc,
+        fileId: formData.fileId,
+        fileName: formData.fileName,
+        score: formData.score,
+        id: rowData.value.id,
+      }
+      filling(data).then((res) => {
+        ElMessage.success('填报成功')
+        dialogVisible.value = false
+        resetForm()
+        emits('closeRefresh')
+      })
+    }
+  })
+}
+// 重置表单
+function resetForm() {
+  const form = formData
+  const keys = Object.keys(formData)
+  keys.forEach((key) => {
+    form[key] = defaultFormData[key]
+  })
+  Object.assign(formData, form)
+  nextTick(() => {
+    dataFormRef.value?.clearValidate()
+  })
+}
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: any) {
+  dialogVisible.value = true
+  rowData.value = row
+  resetForm()
+}
+
+// 关闭弹窗
+function dialogClose() {
+  resetForm()
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('file', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        formData.fileId = formData.fileId ? `${formData.fileId},${res.data.fileId}` : res.data.fileId
+        formData.fileName = formData.fileName ? `${formData.fileName},${res.data.fileName}` : res.data.fileName
+        // 重置当前验证
+        // dataFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+// 上传
+const upload = () => {
+  fileRef.value.click()
+}
+// 删除上传的文件
+const deleteFile = (fileName: string) => {
+  const data = formData.fileName.split(',')
+  const ids = formData.fileId.split(',')
+  const filterData = data.filter(item => item !== fileName)
+  const filterid = ids.filter((item, index) => index !== data.findIndex(citem => citem === fileName))
+  formData.fileId = filterid.length ? filterid.join(',') : ''
+  formData.fileName = filterData.length ? filterData.join(',') : ''
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="填报"
+    width="50%"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <el-form
+      ref="dataFormRef" :model="formData" :rules="rules" label-position="left" label-width="110px" class="form-container"
+      size="default" @submit.prevent
+    >
+      <el-row :gutter="24">
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="考核得分" prop="score" class="required">
+            <el-input v-model.trim="formData.score" type="text" placeholder="0-12之间" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="考核说明" prop="assDesc" class="required">
+            <el-input v-model.trim="formData.assDesc" type="textarea" placeholder="考核说明" :rows="4" maxlength="100" show-word-limit />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="附件上传">
+            <show-photo :minio-file-name="formData.fileName" :minio-file-id="formData.fileId" @delete="deleteFile" />
+            <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
+            <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload">
+              上传
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitForm(dataFormRef)">
+          保存
+        </el-button>
+        <el-button @click="dialogClose">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.form-container {
+  width: 100%;
+
+  .full-width-input {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/views/flling/treat/index.vue b/src/views/flling/treat/index.vue
index d08184a..44e356d 100644
--- a/src/views/flling/treat/index.vue
+++ b/src/views/flling/treat/index.vue
@@ -5,71 +5,102 @@
  -->
 <script lang="ts" setup name="FillingTreatList">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import FillingDialog from './fillingDialog.vue'
+import { batchSubmitApi, getListPage } from '@/api/home/filling/filling'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
+const $route = useRoute()
 const listQuery = reactive({
+  assessedDept: '', // 指标考核对象
+  cycle: '', // 考核周期
+  isSubmit: $route.path.includes('treat') ? 'false' : 'true',
+  planName: '', // 考核方案名称
+  resultNo: '', // 考核结果编号
   offset: 1,
   limit: 20,
+  startTime: '',
+  endTime: '',
 })
 const columns = ref([
   {
     text: '考核结果编号',
-    value: 'groupName',
+    value: 'resultNo',
     align: 'center',
   },
   {
     text: '考核方案名称',
-    value: 'createUserName',
+    value: 'planName',
     align: 'center',
   },
   {
     text: '考核对象',
-    value: 'createTime',
+    value: 'assessedDeptName',
     align: 'center',
   },
   {
     text: '考核周期',
-    value: 'remark',
+    value: 'cycleName',
     align: 'center',
   },
   {
     text: '考核时间',
-    value: 'remark',
+    value: 'startTime',
     align: 'center',
   },
   {
     text: '考核指标项目',
-    value: 'remark',
+    value: 'quotaProjectName',
     align: 'center',
   },
   {
     text: '考核指标类型',
-    value: 'remark',
+    value: 'quotaTypeName',
     align: 'center',
   },
   {
     text: '一级考核指标',
-    value: 'remark',
+    value: 'priIndicators',
     align: 'center',
   },
   {
     text: '考核指标得分',
-    value: 'remark',
+    value: 'score',
     align: 'center',
   },
   {
     text: '考核说明',
-    value: 'remark',
+    value: 'assDesc',
     align: 'center',
   },
+])
+const treatColums = ref([
   {
     text: '提交状态',
-    value: 'remark',
+    value: 'submitStatusName',
     align: 'center',
   },
   {
     text: '填报截至时间',
-    value: 'remark',
+    value: 'timeScope',
+    align: 'center',
+  },
+])
+const alreadyColums = ref([
+  {
+    text: '附件',
+    value: 'fileName',
+    align: 'center',
+  },
+  {
+    text: '提交状态',
+    value: 'submitStatusName',
+    align: 'center',
+  },
+  {
+    text: '填报时间',
+    value: 'endTime',
     align: 'center',
   },
 ])
@@ -84,19 +115,38 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getGroupList(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  listLoading.value = false
-  // })
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows.map((item: any) => ({ ...item, timeScope: `${item.startTime}-${item.endTime}` }))
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
 const search = () => {
   fetchData(false)
 }
+// 开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  if (newVal.length) {
+    listQuery.startTime = `${newVal[0]} 00:00:00`
+    listQuery.endTime = `${newVal[1]} 23:59:59`
+  }
+  else {
+    listQuery.startTime = ''
+    listQuery.endTime = ''
+  }
+})
 // 重置
 const reset = () => {
+  datetimerange.value = []
+  listQuery.assessedDept = ''
+  listQuery.planName = ''
+  listQuery.resultNo = ''
+  listQuery.startTime = ''
+  listQuery.endTime = ''
+  listQuery.cycle = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -111,21 +161,29 @@
   }
   fetchData()
 }
-const $router = useRouter()
-// 新建编辑操作
-const handler = (row: any, type: string) => {
-  // $router.push({
-  //   path: `/group/${type}`,
-  //   query: {
-  //     row: JSON.stringify(row),
-  //     id: row.id,
-  //   },
-  // })
+// 考核对象下拉列表
+const objectList = ref<{ id: string; value: string; name: string }[]>()
+// 考核周期下拉框
+const cycleList = ref<{ id: string; value: string; name: string }[]>()
+// 获取字典
+const fetchSelectList = () => {
+  getDictByCode('ass_object').then((res) => {
+    objectList.value = res.data
+  })
+  getDictByCode('cycle_code').then((res) => {
+    cycleList.value = res.data
+  })
 }
-// 删除
-const delHandler = (row: any) => {
+fetchSelectList()
+// 填报
+const fillingRef = ref()
+const filling = (row: any) => {
+  fillingRef.value.initDialog(row)
+}
+// 提交
+const submit = (row: any) => {
   ElMessageBox.confirm(
-    '确认删除此分组信息吗?',
+    '确定提交考核结果吗？一经提交，不可修改！',
     '确认',
     {
       confirmButtonText: '确认',
@@ -133,60 +191,129 @@
       type: 'warning',
     },
   ).then(() => {
-    // delGroup(row.id).then((res) => {
-    //   ElMessage.success('操作成功')
-    //   search()
-    // })
+    batchSubmitApi({ ids: [row.id] }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
   })
 }
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 批量提交
+const batchSubmit = () => {
+  let data = [] as string[]
+  if (selectList.value.filter((item: any) => item.submitStatusName === '未提交').length) {
+    data = selectList.value.filter((item: any) => item.submitStatusName === '未提交').map((item: any) => item.id)
+  }
+  else {
+    ElMessage.warning('请选择未提交的填报')
+    return
+  }
+  // 只能提交  未提交状态的数据
+  ElMessageBox.confirm(
+    '确定提交考核结果吗？一经提交，不可修改！',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    batchSubmitApi({ ids: data }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      // ids: selectList.value.map(item => item.id),
+    }
+    // exportGrade(data).then((res) => {
+    //   exportFile(res.data, '考核等级评定')
+    //   loading.close()
+    // })
+    //   .catch((_) => {
+    //     loading.close()
+    //   })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
 </script>
 
 <template>
   <app-container>
+    <filling-dialog ref="fillingRef" @close-refresh="search" />
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核结果编号" clearable />
+        <el-input v-model.trim="listQuery.resultNo" placeholder="考核结果编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.groupName" placeholder="考核方案名称" clearable />
+        <el-input v-model.trim="listQuery.planName" placeholder="考核方案名称" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
+        <el-select v-model.trim="listQuery.assessedDept" placeholder="指标考核对象" clearable>
+          <el-option v-for="item in objectList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="考核周期" clearable />
+        <el-select v-model.trim="listQuery.cycle" placeholder="考核周期" clearable>
+          <el-option v-for="item in cycleList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="考核时间"
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="考核开始时间" end-placeholder="考核结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary">
+        <el-button v-if="$route.path.includes('treat')" type="primary" @click="batchSubmit">
           提交
         </el-button>
+        <el-button v-else type="primary" @click="exportList">
+          导出
+        </el-button>
       </template>
-      <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
-        <template #columns>
+        <template v-if="$route.path.includes('treat')" #columns>
+          <el-table-column v-for="item in treatColums" :key="item.text" :label="item.text" :prop="item.value" align="center" />
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button link type="primary" size="small">
+              <el-button :disabled="scope.row.submitStatusName !== '未填报'" link type="primary" size="small" @click="filling(scope.row)">
                 填报
               </el-button>
-              <el-button link type="primary" size="small">
+              <el-button :disabled="scope.row.submitStatusName !== '未提交'" link type="primary" size="small" @click="submit(scope.row)">
                 提交
               </el-button>
             </template>
           </el-table-column>
         </template>
+        <template v-else #columns>
+          <el-table-column v-for="item in alreadyColums" :key="item.text" :label="item.text" :prop="item.value" align="center" />
+        </template>
       </normal-table>
     </table-container>
   </app-container>
diff --git a/src/views/rule/programme/components/edit.vue b/src/views/rule/programme/components/edit.vue
index 1c1cfba..903c65e 100644
--- a/src/views/rule/programme/components/edit.vue
+++ b/src/views/rule/programme/components/edit.vue
@@ -9,7 +9,7 @@
 import proxyTable from './proxyTable.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { uploadApi } from '@/api/common'
-import { addProgramme, addProxyList, editProgramme, getDetail } from '@/api/home/rule/programme'
+import { ProxyList, addProgramme, addProxyList, editProgramme, getDetail, getGradeSelectList, updatePlanEnabled } from '@/api/home/rule/programme'
 const $route = useRoute()
 const $router = useRouter()
 // 对话框类型：create,update
@@ -27,6 +27,7 @@
   cycle: '', // 考核周期
   endTime: '',
   fileId: '',
+  fileName: '',
   id: '',
   isEnable: '',
   levelId: '',
@@ -37,6 +38,7 @@
   score: '',
   startTime: '',
 })
+const proxyList = ref([])
 // 表单验证规则
 const rules = ref<FormRules>({
   assObject: [{ required: true, message: '考核对象必选', trigger: ['blur', 'change'] }],
@@ -61,11 +63,11 @@
       lock: true,
       background: 'rgba(255, 255, 255, 0.8)',
     })
-    console.log(event.target.files)
     fd.append('file', event.target.files[0])
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
-        ruleForm.value.fileId = ruleForm.value.fileId ? `${ruleForm.value.fileId},${res.data.fileName}` : res.data.fileName
+        ruleForm.value.fileId = ruleForm.value.fileId ? `${ruleForm.value.fileId},${res.data.fileId}` : res.data.fileId
+        ruleForm.value.fileName = ruleForm.value.fileName ? `${ruleForm.value.fileName},${res.data.fileName}` : res.data.fileName
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
         ElMessage.success('文件上传成功')
@@ -96,7 +98,7 @@
 // 考核周期下拉框
 const cycleList = ref<{ id: string; value: string; name: string }[]>()
 // 考核等级下拉框
-const levelList = ref<{ id: string; value: string; name: string }[]>()
+const levelList = ref<any[]>()
 // 获取字典
 const fetchSelectList = () => {
   getDictByCode('ass_object').then((res) => {
@@ -108,12 +110,24 @@
   getDictByCode('cycle_code').then((res) => {
     cycleList.value = res.data
   })
-  getDictByCode('level_code').then((res) => {
+  // getDictByCode('level_code').then((res) => {
+  //   levelList.value = res.data
+  // })
+  getGradeSelectList().then((res) => {
     levelList.value = res.data
   })
 }
 fetchSelectList()
 const radio = ref('基本信息')
+// 获取方案指标列表
+const fetchProxyList = () => {
+  // if ($route.path.includes('create')) {
+  //   return
+  // }
+  ProxyList({ planId: ruleForm.value.id, limit: 9999, offset: 1 }).then((res) => {
+    proxyList.value = res.data.rows
+  })
+}
 onMounted(() => {
   dialogStatus.value = $route.params.type as string
   if (!$route.path.includes('create')) {
@@ -125,6 +139,7 @@
     // getDetail({ id: data.id }).then((res) => {
     //   console.log(res.data)
     // })
+    fetchProxyList()
   }
 })
 // 编辑
@@ -132,22 +147,39 @@
   editProgramme({ ...ruleForm.value }).then((res) => {
     addProxyList({
       planId: ruleForm.value.id,
-      quotaIds: proxyRef.value.list.map((item: any) => item.id),
+      quotaIds: proxyList.value.map((item: any) => item.id),
     }).then((res) => {
+      // if (ruleForm.value.isEnable === '1' && proxyList.value.length) {
+      //   updatePlanEnabled({ ...ruleForm.value }).then(() => {
+      //     ElMessage.success('操作成功')
+      //     $router.go(-1)
+      //   })
+      // }
+      // else {
       ElMessage.success('操作成功')
       $router.go(-1)
+      // }
     })
   })
 }
 // 新增
 const create = () => {
-  addProgramme({ ...ruleForm.value }).then((res) => {
-    console.log()
-    // addProxyList({
-
-    // })
-    ElMessage.success('操作成功')
-    $router.go(-1)
+  addProgramme({ ...ruleForm.value }).then((response) => {
+    addProxyList({
+      planId: response.data,
+      quotaIds: proxyList.value.map((item: any) => item.id),
+    }).then((res) => {
+      if (ruleForm.value.isEnable === '1' && proxyList.value.length) {
+        updatePlanEnabled({ id: response.data, isEnable: '1' }).then(() => {
+          ElMessage.success('操作成功')
+          $router.go(-1)
+        })
+      }
+      else {
+        ElMessage.success('操作成功')
+        $router.go(-1)
+      }
+    })
   })
 }
 // 保存
@@ -163,6 +195,7 @@
         type: 'warning',
       },
     ).then((res) => {
+      proxyList.value = proxyRef.value?.list
       if ($route.path.includes('update')) {
         update()
       }
@@ -172,6 +205,11 @@
     })
   })
 }
+// watch(() => proxyRef.value?.list, (newVal) => {
+//   proxyList.value = newVal
+// }, {
+//   deep: true,
+// })
 </script>
 
 <template>
@@ -214,9 +252,9 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
-            <el-form-item label="具体考核部门" prop="approvalName">
+            <!-- <el-form-item label="具体考核部门" prop="approvalName">
               <el-input v-model.trim="ruleForm.approvalName" type="textarea" placeholder="考核部门" :rows="3" />
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
@@ -230,7 +268,7 @@
           <el-col :span="12">
             <el-form-item label="考核等级评定" prop="levelId">
               <el-select v-model.trim="ruleForm.levelId" placeholder="考核等级评定" style="width: 100%;">
-                <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in levelList" :key="item.id" :label="item.levelName" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -286,7 +324,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
             <el-form-item label="附件上传" prop="approvalNo">
-              <show-photo :minio-file-name="ruleForm.fileId" @delete="deleteFile" />
+              <show-photo :minio-file-name="ruleForm.fileName" :minio-file-id="ruleForm.fileId" @delete="deleteFile" />
               <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
               <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload">
                 上传
@@ -297,7 +335,7 @@
       </el-form>
     </detail-block-com>
     <!-- 一级考核指标 -->
-    <proxy-table v-show="radio === '一级考核指标'" ref="proxyRef" :data="[]" />
+    <proxy-table v-show="radio === '一级考核指标'" ref="proxyRef" :data="proxyList" />
   </app-container>
 </template>
 
diff --git a/src/views/rule/programme/components/proxyTable.vue b/src/views/rule/programme/components/proxyTable.vue
index c2fd143..55ddd41 100644
--- a/src/views/rule/programme/components/proxyTable.vue
+++ b/src/views/rule/programme/components/proxyTable.vue
@@ -58,6 +58,7 @@
   },
 ])
 const list = ref<any[]>([])
+const backList = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
   return useCheckList(list.value, columns.value, '一级考核指标列表')
@@ -87,6 +88,7 @@
     // 去掉重复选择
     if (!list.value.filter((ele: any) => ele.id === item.id).length) {
       list.value.push(item)
+      backList.value.push(item)
     }
   })
 }
@@ -98,33 +100,47 @@
 }
 watch(() => $props.data, (newVal) => {
   if (newVal) {
-    list.value = newVal
+    list.value = JSON.parse(JSON.stringify(newVal))
+    backList.value = JSON.parse(JSON.stringify(newVal))
   }
+}, {
+  deep: true,
 })
-const initDialog = () => {
-  list.value = $props.data
-}
-initDialog()
+// const initDialog = () => {
+//   list.value = JSON.parse(JSON.stringify($props.data))
+// }
+// initDialog()
 defineExpose({
   list,
   checkCertificateList,
 })
+const name = ref<string>('')
+const search = () => {
+  list.value = backList.value.filter((item: any) => item.quotaProjectName.includes(name.value))
+}
+const reset = () => {
+  name.value = ''
+  list.value = backList.value
+}
 </script>
 
 <template>
   <detail-block-switch title="">
     <proxy-dialog ref="proxyRef" @add="comfirm" />
     <template #menu>
-      <el-input v-if="!$route.path.includes('create')" placeholder="指标名称" />
+      <el-input v-if="!$route.path.includes('create')" v-model="name" placeholder="指标名称" clearable />
     </template>
-    <template v-if="!$route.path.includes('detail')" #btns>
-      <el-button v-if="!$route.path.includes('create')" type="info">
+    <template #btns>
+      <el-button v-if="!$route.path.includes('create')" type="primary" @click="search">
         查询
       </el-button>
-      <el-button type="info" @click="removeRow">
+      <el-button v-if="!$route.path.includes('create')" type="warning" @click="reset">
+        重置
+      </el-button>
+      <el-button v-if="!$route.path.includes('detail')" type="info" @click="removeRow">
         删除
       </el-button>
-      <el-button type="primary" @click="addRow">
+      <el-button v-if="!$route.path.includes('detail')" type="primary" @click="addRow">
         增加
       </el-button>
     </template>
diff --git a/src/views/rule/programme/index.vue b/src/views/rule/programme/index.vue
index dd485b4..e55a91c 100644
--- a/src/views/rule/programme/index.vue
+++ b/src/views/rule/programme/index.vue
@@ -29,7 +29,7 @@
   },
   {
     text: '具体考核部门',
-    value: '',
+    value: 'assDept',
     align: 'center',
   },
   {
@@ -47,21 +47,6 @@
     value: 'recoRatingName',
     align: 'center',
   },
-  // {
-  //   text: '考核指标项目',
-  //   value: 'remark',
-  //   align: 'center',
-  // },
-  // {
-  //   text: '考核指标类型',
-  //   value: 'remark',
-  //   align: 'center',
-  // },
-  {
-    text: '考核方案得分',
-    value: 'score',
-    align: 'center',
-  },
 ])
 const list = ref([])
 const total = ref(0)
@@ -75,7 +60,12 @@
     listQuery.offset = 1
   }
   getListPage(listQuery).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        assDept: item.depts.map((child: any) => child.fullName).join(','),
+      }
+    })
     total.value = parseInt(response.data.total)
     listLoading.value = false
   })
@@ -126,7 +116,7 @@
       type: 'warning',
     },
   ).then(() => {
-    delProgramme(row.id).then((res) => {
+    delProgramme({ id: row.id }).then((res) => {
       ElMessage.success('操作成功')
       search()
     })
@@ -190,6 +180,29 @@
         :is-showmulti-select="true" @change="changePage"
       >
         <template #columns>
+          <el-table-column label="考核指标项目" align="center">
+            <template #default="scope">
+              <div class="container">
+                <div v-for="(item, index) in scope.row.quotaInfos" :key="item.id" :class="`${index === 0 ? '' : 'item'}`">
+                  {{ item.quotaProjectName }}
+                </div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="考核指标类型" align="center">
+            <template #default="scope">
+              <div class="container">
+                <div v-for="(item, index) in scope.row.quotaInfos" :key="item.id" :class="`${index === 0 ? '' : 'item'}`">
+                  {{ item.priIndicators }}
+                </div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="考核方案得分" align="center">
+            <template #default="scope">
+              {{ scope.row.score }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
@@ -209,3 +222,17 @@
   </app-container>
 </template>
 
+<style lang="scss" scope>
+.container {
+  // display: flex;
+  width: 100%;
+
+  .item {
+    float: left;
+    border-top: 1px solid #ebeef5;
+    text-align: center;
+    width: 100%;
+  }
+}
+</style>
+
diff --git a/src/views/rule/proxy/components/edit.vue b/src/views/rule/proxy/components/edit.vue
index 17ec00f..5d745ca 100644
--- a/src/views/rule/proxy/components/edit.vue
+++ b/src/views/rule/proxy/components/edit.vue
@@ -37,6 +37,7 @@
   fileId: '', // 上传文件
   id: '',
   ruleDesc: '',
+  fileName: '',
 })
 // 表单验证规则
 const rules = ref<FormRules>({
@@ -80,7 +81,8 @@
     fd.append('file', event.target.files[0])
     uploadApi(fd).then((res) => {
       if (res.code === 200) {
-        ruleForm.value.fileId = ruleForm.value.fileId ? `${ruleForm.value.fileId},${res.data.fileName}` : res.data.fileName
+        ruleForm.value.fileId = ruleForm.value.fileId ? `${ruleForm.value.fileId},${res.data.fileId}` : res.data.fileId
+        ruleForm.value.fileName = ruleForm.value.fileName ? `${ruleForm.value.fileName},${res.data.fileName}` : res.data.fileName
         // 重置当前验证
         ruleFormRef.value?.clearValidate('fileId')
         ElMessage.success('文件上传成功')
@@ -191,6 +193,18 @@
   })
 }
 fetchDeptTree()
+// 指标值类型是否可选择区间
+const scopeFlag = ref(false)
+watch(() => ruleForm.value.quotaProject, (newVal) => {
+  if (newVal === '4') {
+    scopeFlag.value = false
+    ruleForm.value.valType = '2'
+  }
+  else {
+    scopeFlag.value = true
+    ruleForm.value.valType = '1'
+  }
+})
 </script>
 
 <template>
@@ -264,7 +278,7 @@
           <el-col :span="12">
             <el-form-item label="指标值类型" prop="valType">
               <el-radio-group v-model="ruleForm.valType" class="ml-4">
-                <el-radio v-for="item in valueList" :key="item.id" :label="item.value" size="large">
+                <el-radio v-for="item in valueList" :key="item.id" :label="item.value" size="large" :disabled="!ruleForm.quotaProject ? true : item.name.includes('区间') ? !scopeFlag : scopeFlag">
                   {{ item.name }}
                 </el-radio>
               </el-radio-group>
@@ -299,7 +313,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
             <el-form-item label="附件上传" prop="fileId">
-              <show-photo :minio-file-name="ruleForm.fileId" @delete="deleteFile" />
+              <show-photo :minio-file-id="ruleForm.fileId" :minio-file-name="ruleForm.fileName" @delete="deleteFile" />
               <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
               <el-button v-if="!$route.path.includes('detail')" type="primary" @click="upload">
                 上传