diff --git a/src/views/rule/programme/components/edit.vue b/src/views/rule/programme/components/edit.vue
index 6dbf9ce..7011d3e 100644
--- a/src/views/rule/programme/components/edit.vue
+++ b/src/views/rule/programme/components/edit.vue
@@ -5,6 +5,10 @@
  -->
 <script lang="ts" setup name="RuleProgrammeHandler">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import proxyTable from './proxyTable.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { uploadApi } from '@/api/common'
 const $route = useRoute()
 const $router = useRouter()
 // 对话框类型：create,update
@@ -17,7 +21,20 @@
 }
 // 表单对象
 const ruleForm = ref({
-
+  assObject: 1,
+  createTime: '',
+  cycle: '',
+  endTime: '',
+  fileId: '',
+  id: '',
+  isEnable: '',
+  levelId: '',
+  planName: '',
+  recoRating: '',
+  remarks: '',
+  ruleDescription: '', // 考核得分规则描述
+  score: '',
+  startTime: '',
 })
 // 表单验证规则
 const rules = ref<FormRules>({
@@ -25,7 +42,8 @@
 })
 // 表单实例对象
 const ruleFormRef = ref()
-const radio1 = ref('')
+// 一级考核指标实例对象
+const proxyRef = ref()
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   if (event.target.files?.length !== 0) {
@@ -36,20 +54,20 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     fd.append('multipartFile', event.target.files[0])
-    // uploadApi(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
-    //     // 重置当前验证
-    //     ruleFormRef.value?.clearValidate('minioFileName')
-    //     ElMessage.success('文件上传成功')
-    //     fileRef.value.value = ''
-    //     loading.close()
-    //   }
-    //   else {
-    //     // ElMessage.error(res.message)
-    //     loading.close()
-    //   }
-    // })
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value.fileId = ruleForm.value.fileId ? `${ruleForm.value.fileId},${res.data[0]}` : res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 // 上传
@@ -58,10 +76,35 @@
 }
 // 删除上传的文件
 const deleteFile = (fileName: string) => {
-  const data = ruleForm.value.instructionsFile.split(',')
+  const data = ruleForm.value.fileId.split(',')
   const filterData = data.filter(item => item !== fileName)
-  ruleForm.value.instructionsFile = filterData.length ? filterData.join(',') : ''
+  ruleForm.value.fileId = filterData.length ? filterData.join(',') : ''
 }
+// 考核对象下拉列表
+const objectList = ref<{ id: string; value: string; name: string }[]>()
+// 是否禁用下拉列表
+const disableList = ref<{ id: string; value: string; name: string }[]>()
+// 考核周期下拉框
+const cycleList = ref<{ id: string; value: string; name: string }[]>()
+// 考核等级下拉框
+const levelList = ref<{ id: string; value: string; name: string }[]>()
+// 获取字典
+const fetchSelectList = () => {
+  getDictByCode('ass_object').then((res) => {
+    objectList.value = res.data
+  })
+  getDictByCode('is_enable').then((res) => {
+    disableList.value = res.data
+  })
+  getDictByCode('cycle_code').then((res) => {
+    cycleList.value = res.data
+  })
+  getDictByCode('level_code').then((res) => {
+    levelList.value = res.data
+  })
+}
+fetchSelectList()
+const radio = ref('基本信息')
 </script>
 
 <template>
@@ -77,19 +120,28 @@
       </template>
     </detail-page>
     <detail-block-com>
+      <el-radio-group v-model="radio">
+        <el-radio-button label="基本信息" />
+        <el-radio-button label="一级考核指标" />
+      </el-radio-group>
+    </detail-block-com>
+    <!-- 基本信息 -->
+    <detail-block-com v-show="radio === '基本信息'">
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="130px" class="form"
         :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
-            <el-form-item label="考核方案名称" prop="approvalNo">
-              <el-input v-model.trim="ruleForm.approvalNo" placeholder="考核方案名称" style="width: 100%;" />
+            <el-form-item label="考核方案名称" prop="planName">
+              <el-input v-model.trim="ruleForm.planName" placeholder="考核方案名称" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="考核对象" prop="approvalNo">
-              <el-select v-model.trim="ruleForm.approvalNo" placeholder="指标考核对象" style="width: 100%;" />
+            <el-form-item label="考核对象" prop="assObject">
+              <el-select v-model.trim="ruleForm.assObject" placeholder="指标考核对象" style="width: 100%;">
+                <el-option v-for="item in objectList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -102,28 +154,32 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
-            <el-form-item label="考核周期" prop="approvalNo">
-              <el-select v-model.trim="ruleForm.approvalNo" placeholder="考核周期" style="width: 100%;" />
+            <el-form-item label="考核周期" prop="cycle">
+              <el-select v-model.trim="ruleForm.cycle" placeholder="考核周期" style="width: 100%;">
+                <el-option v-for="item in cycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="考核等级评定" prop="approvalNo">
-              <el-select v-model.trim="ruleForm.approvalNo" placeholder="考核等级评定" style="width: 100%;" />
+            <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-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
-            <el-form-item label="考核填报发送日期" prop="approvalNo">
+            <el-form-item label="考核填报发送日期" prop="startTime">
               <el-date-picker
-                v-model="ruleForm.endTime"
+                v-model="ruleForm.startTime"
                 style="width: 100%;" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
                 placeholder="考核填报发送日期"
               />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="考核填报截至日期" prop="approvalNo">
+            <el-form-item label="考核填报截至日期" prop="endTime">
               <el-date-picker
                 v-model="ruleForm.endTime"
                 style="width: 100%;" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
@@ -134,15 +190,15 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
-            <el-form-item label="考核得分" prop="approvalNo">
-              <el-input v-model.trim="ruleForm.approvalNo" placeholder="添加考核得分规则" style="width: 100%;" />
+            <el-form-item label="考核得分" prop="score">
+              <el-input v-model.trim="ruleForm.score" placeholder="添加考核得分规则" style="width: 100%;" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
-            <el-form-item label="备注" prop="approvalName">
-              <el-input v-model.trim="ruleForm.approvalName" type="textarea" placeholder="备注" :rows="4" maxlength="100" show-word-limit />
+            <el-form-item label="备注" prop="remarks">
+              <el-input v-model.trim="ruleForm.remarks" type="textarea" placeholder="备注" :rows="4" maxlength="100" show-word-limit />
             </el-form-item>
           </el-col>
         </el-row>
@@ -150,10 +206,12 @@
           <el-col :span="24">
             <el-form-item label="是否启用" prop="approvalName">
               <el-switch
-                v-model="ruleForm.value"
+                v-model="ruleForm.isEnable"
                 size="large"
                 active-text="是"
+                active-value="1"
                 inactive-text="否"
+                inactive-value="0"
               />
             </el-form-item>
           </el-col>
@@ -161,7 +219,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
             <el-form-item label="附件上传" prop="approvalNo">
-              <show-photo :minio-file-name="ruleForm.instructionsFile" @delete="deleteFile" />
+              <show-photo :minio-file-name="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">
                 上传
@@ -171,6 +229,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
+    <!-- 一级考核指标 -->
+    <proxy-table ref="proxyRef" :data="[]" />
   </app-container>
 </template>
 

diff --git a/src/views/rule/programme/components/edit.vue b/src/views/rule/programme/components/edit.vue
index 6dbf9ce..7011d3e 100644
--- a/src/views/rule/programme/components/edit.vue
+++ b/src/views/rule/programme/components/edit.vue
@@ -5,6 +5,10 @@
  -->
 <script lang="ts" setup name="RuleProgrammeHandler">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import proxyTable from './proxyTable.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { uploadApi } from '@/api/common'
 const $route = useRoute()
 const $router = useRouter()
 // 对话框类型：create,update
@@ -17,7 +21,20 @@
 }
 // 表单对象
 const ruleForm = ref({
-
+  assObject: 1,
+  createTime: '',
+  cycle: '',
+  endTime: '',
+  fileId: '',
+  id: '',
+  isEnable: '',
+  levelId: '',
+  planName: '',
+  recoRating: '',
+  remarks: '',
+  ruleDescription: '', // 考核得分规则描述
+  score: '',
+  startTime: '',
 })
 // 表单验证规则
 const rules = ref<FormRules>({
@@ -25,7 +42,8 @@
 })
 // 表单实例对象
 const ruleFormRef = ref()
-const radio1 = ref('')
+// 一级考核指标实例对象
+const proxyRef = ref()
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   if (event.target.files?.length !== 0) {
@@ -36,20 +54,20 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     fd.append('multipartFile', event.target.files[0])
-    // uploadApi(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
-    //     // 重置当前验证
-    //     ruleFormRef.value?.clearValidate('minioFileName')
-    //     ElMessage.success('文件上传成功')
-    //     fileRef.value.value = ''
-    //     loading.close()
-    //   }
-    //   else {
-    //     // ElMessage.error(res.message)
-    //     loading.close()
-    //   }
-    // })
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value.fileId = ruleForm.value.fileId ? `${ruleForm.value.fileId},${res.data[0]}` : res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 // 上传
@@ -58,10 +76,35 @@
 }
 // 删除上传的文件
 const deleteFile = (fileName: string) => {
-  const data = ruleForm.value.instructionsFile.split(',')
+  const data = ruleForm.value.fileId.split(',')
   const filterData = data.filter(item => item !== fileName)
-  ruleForm.value.instructionsFile = filterData.length ? filterData.join(',') : ''
+  ruleForm.value.fileId = filterData.length ? filterData.join(',') : ''
 }
+// 考核对象下拉列表
+const objectList = ref<{ id: string; value: string; name: string }[]>()
+// 是否禁用下拉列表
+const disableList = ref<{ id: string; value: string; name: string }[]>()
+// 考核周期下拉框
+const cycleList = ref<{ id: string; value: string; name: string }[]>()
+// 考核等级下拉框
+const levelList = ref<{ id: string; value: string; name: string }[]>()
+// 获取字典
+const fetchSelectList = () => {
+  getDictByCode('ass_object').then((res) => {
+    objectList.value = res.data
+  })
+  getDictByCode('is_enable').then((res) => {
+    disableList.value = res.data
+  })
+  getDictByCode('cycle_code').then((res) => {
+    cycleList.value = res.data
+  })
+  getDictByCode('level_code').then((res) => {
+    levelList.value = res.data
+  })
+}
+fetchSelectList()
+const radio = ref('基本信息')
 </script>
 
 <template>
@@ -77,19 +120,28 @@
       </template>
     </detail-page>
     <detail-block-com>
+      <el-radio-group v-model="radio">
+        <el-radio-button label="基本信息" />
+        <el-radio-button label="一级考核指标" />
+      </el-radio-group>
+    </detail-block-com>
+    <!-- 基本信息 -->
+    <detail-block-com v-show="radio === '基本信息'">
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="130px" class="form"
         :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
-            <el-form-item label="考核方案名称" prop="approvalNo">
-              <el-input v-model.trim="ruleForm.approvalNo" placeholder="考核方案名称" style="width: 100%;" />
+            <el-form-item label="考核方案名称" prop="planName">
+              <el-input v-model.trim="ruleForm.planName" placeholder="考核方案名称" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="考核对象" prop="approvalNo">
-              <el-select v-model.trim="ruleForm.approvalNo" placeholder="指标考核对象" style="width: 100%;" />
+            <el-form-item label="考核对象" prop="assObject">
+              <el-select v-model.trim="ruleForm.assObject" placeholder="指标考核对象" style="width: 100%;">
+                <el-option v-for="item in objectList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -102,28 +154,32 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
-            <el-form-item label="考核周期" prop="approvalNo">
-              <el-select v-model.trim="ruleForm.approvalNo" placeholder="考核周期" style="width: 100%;" />
+            <el-form-item label="考核周期" prop="cycle">
+              <el-select v-model.trim="ruleForm.cycle" placeholder="考核周期" style="width: 100%;">
+                <el-option v-for="item in cycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="考核等级评定" prop="approvalNo">
-              <el-select v-model.trim="ruleForm.approvalNo" placeholder="考核等级评定" style="width: 100%;" />
+            <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-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
-            <el-form-item label="考核填报发送日期" prop="approvalNo">
+            <el-form-item label="考核填报发送日期" prop="startTime">
               <el-date-picker
-                v-model="ruleForm.endTime"
+                v-model="ruleForm.startTime"
                 style="width: 100%;" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
                 placeholder="考核填报发送日期"
               />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="考核填报截至日期" prop="approvalNo">
+            <el-form-item label="考核填报截至日期" prop="endTime">
               <el-date-picker
                 v-model="ruleForm.endTime"
                 style="width: 100%;" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
@@ -134,15 +190,15 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
-            <el-form-item label="考核得分" prop="approvalNo">
-              <el-input v-model.trim="ruleForm.approvalNo" placeholder="添加考核得分规则" style="width: 100%;" />
+            <el-form-item label="考核得分" prop="score">
+              <el-input v-model.trim="ruleForm.score" placeholder="添加考核得分规则" style="width: 100%;" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
-            <el-form-item label="备注" prop="approvalName">
-              <el-input v-model.trim="ruleForm.approvalName" type="textarea" placeholder="备注" :rows="4" maxlength="100" show-word-limit />
+            <el-form-item label="备注" prop="remarks">
+              <el-input v-model.trim="ruleForm.remarks" type="textarea" placeholder="备注" :rows="4" maxlength="100" show-word-limit />
             </el-form-item>
           </el-col>
         </el-row>
@@ -150,10 +206,12 @@
           <el-col :span="24">
             <el-form-item label="是否启用" prop="approvalName">
               <el-switch
-                v-model="ruleForm.value"
+                v-model="ruleForm.isEnable"
                 size="large"
                 active-text="是"
+                active-value="1"
                 inactive-text="否"
+                inactive-value="0"
               />
             </el-form-item>
           </el-col>
@@ -161,7 +219,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
             <el-form-item label="附件上传" prop="approvalNo">
-              <show-photo :minio-file-name="ruleForm.instructionsFile" @delete="deleteFile" />
+              <show-photo :minio-file-name="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">
                 上传
@@ -171,6 +229,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
+    <!-- 一级考核指标 -->
+    <proxy-table ref="proxyRef" :data="[]" />
   </app-container>
 </template>
 
diff --git a/src/views/rule/programme/components/proxyDialog.vue b/src/views/rule/programme/components/proxyDialog.vue
new file mode 100644
index 0000000..c0ae1e4
--- /dev/null
+++ b/src/views/rule/programme/components/proxyDialog.vue
@@ -0,0 +1,203 @@
+<!--
+ * @Description: 考核指标弹窗
+ * @Author: 李亚光
+ * @Date: 2023-09-15
+ -->
+<script lang="ts" setup name="SubpackageDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getListPage } from '@/api/home/rule/proxy'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const listQuery = reactive({
+  assDept: '', // 责任考核单位
+  priIndicators: '', // 一级考核指标
+  quotaNo: '', // 指标编码
+  quotaProject: '', // 指标项目
+  quotaType: '', // 指标类型
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '考核指标编号',
+    value: 'quotaNo',
+    align: 'center',
+  },
+  {
+    text: '考核指标项目',
+    value: 'quotaProjectName',
+    align: 'center',
+  },
+  {
+    text: '考核指标类型',
+    value: 'quotaTypeName',
+    align: 'center',
+  },
+  {
+    text: '一级考核指标',
+    value: 'priIndicators',
+    align: 'center',
+  },
+  {
+    text: '指标数据来源',
+    value: 'dataSourceName',
+    align: 'center',
+  },
+  {
+    text: '指标责任考核单位',
+    value: 'assDeptName',
+    align: 'center',
+  },
+  {
+    text: '指标计算规则',
+    value: 'ruleDesc',
+    align: 'center',
+  },
+  {
+    text: '考核分值',
+    value: 'score',
+    align: 'center',
+  },
+  {
+    text: '备注',
+    value: 'remarks',
+    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
+  }
+  getListPage(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.assDept = ''
+  listQuery.priIndicators = ''
+  listQuery.quotaNo = ''
+  listQuery.quotaProject = ''
+  listQuery.quotaType = ''
+  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 projectList = ref<{ id: string; value: string; name: string }[]>()
+// 指标类型下拉列表
+const typeList = ref<{ id: string; value: string; name: string }[]>()
+// 获取字典
+const fetchSelectList = () => {
+  getDictByCode('quota_project').then((res) => {
+    projectList.value = res.data
+  })
+  getDictByCode('quota_type').then((res) => {
+    typeList.value = res.data
+  })
+}
+fetchSelectList()
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 点击保存
+const submitForm = () => {
+  if (selectList.value.length) {
+    emits('add', selectList.value)
+    dialogFormVisible.value = false
+    selectList.value = []
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择考核指标')
+  }
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择考核指标" width="75%">
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.quotaNo" placeholder="考核指标编号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.quotaProject" placeholder="考核指标项目" clearable>
+          <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.quotaType" placeholder="考核指标类型" clearable>
+          <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.priIndicators" placeholder="一级考核指标" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.assDept" placeholder="责任考核单位" clearable />
+      </search-item>
+    </search-area>
+    <table-container>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+      />
+    </table-container>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>

diff --git a/src/views/rule/programme/components/edit.vue b/src/views/rule/programme/components/edit.vue
index 6dbf9ce..7011d3e 100644
--- a/src/views/rule/programme/components/edit.vue
+++ b/src/views/rule/programme/components/edit.vue
@@ -5,6 +5,10 @@
  -->
 <script lang="ts" setup name="RuleProgrammeHandler">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import proxyTable from './proxyTable.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { uploadApi } from '@/api/common'
 const $route = useRoute()
 const $router = useRouter()
 // 对话框类型：create,update
@@ -17,7 +21,20 @@
 }
 // 表单对象
 const ruleForm = ref({
-
+  assObject: 1,
+  createTime: '',
+  cycle: '',
+  endTime: '',
+  fileId: '',
+  id: '',
+  isEnable: '',
+  levelId: '',
+  planName: '',
+  recoRating: '',
+  remarks: '',
+  ruleDescription: '', // 考核得分规则描述
+  score: '',
+  startTime: '',
 })
 // 表单验证规则
 const rules = ref<FormRules>({
@@ -25,7 +42,8 @@
 })
 // 表单实例对象
 const ruleFormRef = ref()
-const radio1 = ref('')
+// 一级考核指标实例对象
+const proxyRef = ref()
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   if (event.target.files?.length !== 0) {
@@ -36,20 +54,20 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     fd.append('multipartFile', event.target.files[0])
-    // uploadApi(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
-    //     // 重置当前验证
-    //     ruleFormRef.value?.clearValidate('minioFileName')
-    //     ElMessage.success('文件上传成功')
-    //     fileRef.value.value = ''
-    //     loading.close()
-    //   }
-    //   else {
-    //     // ElMessage.error(res.message)
-    //     loading.close()
-    //   }
-    // })
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value.fileId = ruleForm.value.fileId ? `${ruleForm.value.fileId},${res.data[0]}` : res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 // 上传
@@ -58,10 +76,35 @@
 }
 // 删除上传的文件
 const deleteFile = (fileName: string) => {
-  const data = ruleForm.value.instructionsFile.split(',')
+  const data = ruleForm.value.fileId.split(',')
   const filterData = data.filter(item => item !== fileName)
-  ruleForm.value.instructionsFile = filterData.length ? filterData.join(',') : ''
+  ruleForm.value.fileId = filterData.length ? filterData.join(',') : ''
 }
+// 考核对象下拉列表
+const objectList = ref<{ id: string; value: string; name: string }[]>()
+// 是否禁用下拉列表
+const disableList = ref<{ id: string; value: string; name: string }[]>()
+// 考核周期下拉框
+const cycleList = ref<{ id: string; value: string; name: string }[]>()
+// 考核等级下拉框
+const levelList = ref<{ id: string; value: string; name: string }[]>()
+// 获取字典
+const fetchSelectList = () => {
+  getDictByCode('ass_object').then((res) => {
+    objectList.value = res.data
+  })
+  getDictByCode('is_enable').then((res) => {
+    disableList.value = res.data
+  })
+  getDictByCode('cycle_code').then((res) => {
+    cycleList.value = res.data
+  })
+  getDictByCode('level_code').then((res) => {
+    levelList.value = res.data
+  })
+}
+fetchSelectList()
+const radio = ref('基本信息')
 </script>
 
 <template>
@@ -77,19 +120,28 @@
       </template>
     </detail-page>
     <detail-block-com>
+      <el-radio-group v-model="radio">
+        <el-radio-button label="基本信息" />
+        <el-radio-button label="一级考核指标" />
+      </el-radio-group>
+    </detail-block-com>
+    <!-- 基本信息 -->
+    <detail-block-com v-show="radio === '基本信息'">
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="130px" class="form"
         :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
-            <el-form-item label="考核方案名称" prop="approvalNo">
-              <el-input v-model.trim="ruleForm.approvalNo" placeholder="考核方案名称" style="width: 100%;" />
+            <el-form-item label="考核方案名称" prop="planName">
+              <el-input v-model.trim="ruleForm.planName" placeholder="考核方案名称" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="考核对象" prop="approvalNo">
-              <el-select v-model.trim="ruleForm.approvalNo" placeholder="指标考核对象" style="width: 100%;" />
+            <el-form-item label="考核对象" prop="assObject">
+              <el-select v-model.trim="ruleForm.assObject" placeholder="指标考核对象" style="width: 100%;">
+                <el-option v-for="item in objectList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -102,28 +154,32 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
-            <el-form-item label="考核周期" prop="approvalNo">
-              <el-select v-model.trim="ruleForm.approvalNo" placeholder="考核周期" style="width: 100%;" />
+            <el-form-item label="考核周期" prop="cycle">
+              <el-select v-model.trim="ruleForm.cycle" placeholder="考核周期" style="width: 100%;">
+                <el-option v-for="item in cycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="考核等级评定" prop="approvalNo">
-              <el-select v-model.trim="ruleForm.approvalNo" placeholder="考核等级评定" style="width: 100%;" />
+            <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-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
-            <el-form-item label="考核填报发送日期" prop="approvalNo">
+            <el-form-item label="考核填报发送日期" prop="startTime">
               <el-date-picker
-                v-model="ruleForm.endTime"
+                v-model="ruleForm.startTime"
                 style="width: 100%;" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
                 placeholder="考核填报发送日期"
               />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="考核填报截至日期" prop="approvalNo">
+            <el-form-item label="考核填报截至日期" prop="endTime">
               <el-date-picker
                 v-model="ruleForm.endTime"
                 style="width: 100%;" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
@@ -134,15 +190,15 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
-            <el-form-item label="考核得分" prop="approvalNo">
-              <el-input v-model.trim="ruleForm.approvalNo" placeholder="添加考核得分规则" style="width: 100%;" />
+            <el-form-item label="考核得分" prop="score">
+              <el-input v-model.trim="ruleForm.score" placeholder="添加考核得分规则" style="width: 100%;" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
-            <el-form-item label="备注" prop="approvalName">
-              <el-input v-model.trim="ruleForm.approvalName" type="textarea" placeholder="备注" :rows="4" maxlength="100" show-word-limit />
+            <el-form-item label="备注" prop="remarks">
+              <el-input v-model.trim="ruleForm.remarks" type="textarea" placeholder="备注" :rows="4" maxlength="100" show-word-limit />
             </el-form-item>
           </el-col>
         </el-row>
@@ -150,10 +206,12 @@
           <el-col :span="24">
             <el-form-item label="是否启用" prop="approvalName">
               <el-switch
-                v-model="ruleForm.value"
+                v-model="ruleForm.isEnable"
                 size="large"
                 active-text="是"
+                active-value="1"
                 inactive-text="否"
+                inactive-value="0"
               />
             </el-form-item>
           </el-col>
@@ -161,7 +219,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
             <el-form-item label="附件上传" prop="approvalNo">
-              <show-photo :minio-file-name="ruleForm.instructionsFile" @delete="deleteFile" />
+              <show-photo :minio-file-name="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">
                 上传
@@ -171,6 +229,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
+    <!-- 一级考核指标 -->
+    <proxy-table ref="proxyRef" :data="[]" />
   </app-container>
 </template>
 
diff --git a/src/views/rule/programme/components/proxyDialog.vue b/src/views/rule/programme/components/proxyDialog.vue
new file mode 100644
index 0000000..c0ae1e4
--- /dev/null
+++ b/src/views/rule/programme/components/proxyDialog.vue
@@ -0,0 +1,203 @@
+<!--
+ * @Description: 考核指标弹窗
+ * @Author: 李亚光
+ * @Date: 2023-09-15
+ -->
+<script lang="ts" setup name="SubpackageDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getListPage } from '@/api/home/rule/proxy'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const listQuery = reactive({
+  assDept: '', // 责任考核单位
+  priIndicators: '', // 一级考核指标
+  quotaNo: '', // 指标编码
+  quotaProject: '', // 指标项目
+  quotaType: '', // 指标类型
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '考核指标编号',
+    value: 'quotaNo',
+    align: 'center',
+  },
+  {
+    text: '考核指标项目',
+    value: 'quotaProjectName',
+    align: 'center',
+  },
+  {
+    text: '考核指标类型',
+    value: 'quotaTypeName',
+    align: 'center',
+  },
+  {
+    text: '一级考核指标',
+    value: 'priIndicators',
+    align: 'center',
+  },
+  {
+    text: '指标数据来源',
+    value: 'dataSourceName',
+    align: 'center',
+  },
+  {
+    text: '指标责任考核单位',
+    value: 'assDeptName',
+    align: 'center',
+  },
+  {
+    text: '指标计算规则',
+    value: 'ruleDesc',
+    align: 'center',
+  },
+  {
+    text: '考核分值',
+    value: 'score',
+    align: 'center',
+  },
+  {
+    text: '备注',
+    value: 'remarks',
+    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
+  }
+  getListPage(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.assDept = ''
+  listQuery.priIndicators = ''
+  listQuery.quotaNo = ''
+  listQuery.quotaProject = ''
+  listQuery.quotaType = ''
+  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 projectList = ref<{ id: string; value: string; name: string }[]>()
+// 指标类型下拉列表
+const typeList = ref<{ id: string; value: string; name: string }[]>()
+// 获取字典
+const fetchSelectList = () => {
+  getDictByCode('quota_project').then((res) => {
+    projectList.value = res.data
+  })
+  getDictByCode('quota_type').then((res) => {
+    typeList.value = res.data
+  })
+}
+fetchSelectList()
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 点击保存
+const submitForm = () => {
+  if (selectList.value.length) {
+    emits('add', selectList.value)
+    dialogFormVisible.value = false
+    selectList.value = []
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择考核指标')
+  }
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择考核指标" width="75%">
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.quotaNo" placeholder="考核指标编号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.quotaProject" placeholder="考核指标项目" clearable>
+          <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.quotaType" placeholder="考核指标类型" clearable>
+          <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.priIndicators" placeholder="一级考核指标" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.assDept" placeholder="责任考核单位" clearable />
+      </search-item>
+    </search-area>
+    <table-container>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+      />
+    </table-container>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/rule/programme/components/proxyTable.vue b/src/views/rule/programme/components/proxyTable.vue
new file mode 100644
index 0000000..c2fd143
--- /dev/null
+++ b/src/views/rule/programme/components/proxyTable.vue
@@ -0,0 +1,160 @@
+<!--
+ * @Description: 考核方案详情 - 一级考核指标列表
+ * @Author: 李亚光
+ * @Date: 2023-09-15
+ -->
+<script lang="ts" setup name="CertificateTable">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import proxyDialog from './proxyDialog.vue'
+import { useCheckList } from '@/utils/useCheckList'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '考核指标项目',
+    value: 'quotaProjectName',
+    required: false,
+  },
+  {
+    text: '考核指标类型',
+    value: 'quotaTypeName',
+    required: false,
+  },
+  {
+    text: '一级考核指标',
+    value: 'priIndicators',
+    required: false,
+  },
+  {
+    text: '考核指标编号',
+    value: 'quotaNo',
+    required: false,
+  },
+  {
+    text: '考核指标计算规则',
+    value: 'ruleDesc',
+    required: false,
+  },
+  {
+    text: '指标数据来源',
+    value: 'dataSourceName',
+    required: false,
+  },
+  {
+    text: '指标责任考核人',
+    value: 'assDeptName',
+    required: false,
+  },
+  {
+    text: '考核分值',
+    value: 'score',
+    required: false,
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value, '一级考核指标列表')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const proxyRef = ref()
+const addRow = () => {
+  proxyRef.value.initDialog()
+}
+// 确认添加
+const comfirm = (data: any[]) => {
+  data.forEach((item: any) => {
+    // 去掉重复选择
+    if (!list.value.filter((ele: any) => ele.id === item.id).length) {
+      list.value.push(item)
+    }
+  })
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+</script>
+
+<template>
+  <detail-block-switch title="">
+    <proxy-dialog ref="proxyRef" @add="comfirm" />
+    <template #menu>
+      <el-input v-if="!$route.path.includes('create')" placeholder="指标名称" />
+    </template>
+    <template v-if="!$route.path.includes('detail')" #btns>
+      <el-button v-if="!$route.path.includes('create')" type="info">
+        查询
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除
+      </el-button>
+      <el-button type="primary" @click="addRow">
+        增加
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span>{{ scope.row[item.value] }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>

diff --git a/src/views/rule/programme/components/edit.vue b/src/views/rule/programme/components/edit.vue
index 6dbf9ce..7011d3e 100644
--- a/src/views/rule/programme/components/edit.vue
+++ b/src/views/rule/programme/components/edit.vue
@@ -5,6 +5,10 @@
  -->
 <script lang="ts" setup name="RuleProgrammeHandler">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import proxyTable from './proxyTable.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { uploadApi } from '@/api/common'
 const $route = useRoute()
 const $router = useRouter()
 // 对话框类型：create,update
@@ -17,7 +21,20 @@
 }
 // 表单对象
 const ruleForm = ref({
-
+  assObject: 1,
+  createTime: '',
+  cycle: '',
+  endTime: '',
+  fileId: '',
+  id: '',
+  isEnable: '',
+  levelId: '',
+  planName: '',
+  recoRating: '',
+  remarks: '',
+  ruleDescription: '', // 考核得分规则描述
+  score: '',
+  startTime: '',
 })
 // 表单验证规则
 const rules = ref<FormRules>({
@@ -25,7 +42,8 @@
 })
 // 表单实例对象
 const ruleFormRef = ref()
-const radio1 = ref('')
+// 一级考核指标实例对象
+const proxyRef = ref()
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   if (event.target.files?.length !== 0) {
@@ -36,20 +54,20 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     fd.append('multipartFile', event.target.files[0])
-    // uploadApi(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
-    //     // 重置当前验证
-    //     ruleFormRef.value?.clearValidate('minioFileName')
-    //     ElMessage.success('文件上传成功')
-    //     fileRef.value.value = ''
-    //     loading.close()
-    //   }
-    //   else {
-    //     // ElMessage.error(res.message)
-    //     loading.close()
-    //   }
-    // })
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value.fileId = ruleForm.value.fileId ? `${ruleForm.value.fileId},${res.data[0]}` : res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 // 上传
@@ -58,10 +76,35 @@
 }
 // 删除上传的文件
 const deleteFile = (fileName: string) => {
-  const data = ruleForm.value.instructionsFile.split(',')
+  const data = ruleForm.value.fileId.split(',')
   const filterData = data.filter(item => item !== fileName)
-  ruleForm.value.instructionsFile = filterData.length ? filterData.join(',') : ''
+  ruleForm.value.fileId = filterData.length ? filterData.join(',') : ''
 }
+// 考核对象下拉列表
+const objectList = ref<{ id: string; value: string; name: string }[]>()
+// 是否禁用下拉列表
+const disableList = ref<{ id: string; value: string; name: string }[]>()
+// 考核周期下拉框
+const cycleList = ref<{ id: string; value: string; name: string }[]>()
+// 考核等级下拉框
+const levelList = ref<{ id: string; value: string; name: string }[]>()
+// 获取字典
+const fetchSelectList = () => {
+  getDictByCode('ass_object').then((res) => {
+    objectList.value = res.data
+  })
+  getDictByCode('is_enable').then((res) => {
+    disableList.value = res.data
+  })
+  getDictByCode('cycle_code').then((res) => {
+    cycleList.value = res.data
+  })
+  getDictByCode('level_code').then((res) => {
+    levelList.value = res.data
+  })
+}
+fetchSelectList()
+const radio = ref('基本信息')
 </script>
 
 <template>
@@ -77,19 +120,28 @@
       </template>
     </detail-page>
     <detail-block-com>
+      <el-radio-group v-model="radio">
+        <el-radio-button label="基本信息" />
+        <el-radio-button label="一级考核指标" />
+      </el-radio-group>
+    </detail-block-com>
+    <!-- 基本信息 -->
+    <detail-block-com v-show="radio === '基本信息'">
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="130px" class="form"
         :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
-            <el-form-item label="考核方案名称" prop="approvalNo">
-              <el-input v-model.trim="ruleForm.approvalNo" placeholder="考核方案名称" style="width: 100%;" />
+            <el-form-item label="考核方案名称" prop="planName">
+              <el-input v-model.trim="ruleForm.planName" placeholder="考核方案名称" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="考核对象" prop="approvalNo">
-              <el-select v-model.trim="ruleForm.approvalNo" placeholder="指标考核对象" style="width: 100%;" />
+            <el-form-item label="考核对象" prop="assObject">
+              <el-select v-model.trim="ruleForm.assObject" placeholder="指标考核对象" style="width: 100%;">
+                <el-option v-for="item in objectList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -102,28 +154,32 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
-            <el-form-item label="考核周期" prop="approvalNo">
-              <el-select v-model.trim="ruleForm.approvalNo" placeholder="考核周期" style="width: 100%;" />
+            <el-form-item label="考核周期" prop="cycle">
+              <el-select v-model.trim="ruleForm.cycle" placeholder="考核周期" style="width: 100%;">
+                <el-option v-for="item in cycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="考核等级评定" prop="approvalNo">
-              <el-select v-model.trim="ruleForm.approvalNo" placeholder="考核等级评定" style="width: 100%;" />
+            <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-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
-            <el-form-item label="考核填报发送日期" prop="approvalNo">
+            <el-form-item label="考核填报发送日期" prop="startTime">
               <el-date-picker
-                v-model="ruleForm.endTime"
+                v-model="ruleForm.startTime"
                 style="width: 100%;" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
                 placeholder="考核填报发送日期"
               />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="考核填报截至日期" prop="approvalNo">
+            <el-form-item label="考核填报截至日期" prop="endTime">
               <el-date-picker
                 v-model="ruleForm.endTime"
                 style="width: 100%;" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
@@ -134,15 +190,15 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
-            <el-form-item label="考核得分" prop="approvalNo">
-              <el-input v-model.trim="ruleForm.approvalNo" placeholder="添加考核得分规则" style="width: 100%;" />
+            <el-form-item label="考核得分" prop="score">
+              <el-input v-model.trim="ruleForm.score" placeholder="添加考核得分规则" style="width: 100%;" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
-            <el-form-item label="备注" prop="approvalName">
-              <el-input v-model.trim="ruleForm.approvalName" type="textarea" placeholder="备注" :rows="4" maxlength="100" show-word-limit />
+            <el-form-item label="备注" prop="remarks">
+              <el-input v-model.trim="ruleForm.remarks" type="textarea" placeholder="备注" :rows="4" maxlength="100" show-word-limit />
             </el-form-item>
           </el-col>
         </el-row>
@@ -150,10 +206,12 @@
           <el-col :span="24">
             <el-form-item label="是否启用" prop="approvalName">
               <el-switch
-                v-model="ruleForm.value"
+                v-model="ruleForm.isEnable"
                 size="large"
                 active-text="是"
+                active-value="1"
                 inactive-text="否"
+                inactive-value="0"
               />
             </el-form-item>
           </el-col>
@@ -161,7 +219,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
             <el-form-item label="附件上传" prop="approvalNo">
-              <show-photo :minio-file-name="ruleForm.instructionsFile" @delete="deleteFile" />
+              <show-photo :minio-file-name="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">
                 上传
@@ -171,6 +229,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
+    <!-- 一级考核指标 -->
+    <proxy-table ref="proxyRef" :data="[]" />
   </app-container>
 </template>
 
diff --git a/src/views/rule/programme/components/proxyDialog.vue b/src/views/rule/programme/components/proxyDialog.vue
new file mode 100644
index 0000000..c0ae1e4
--- /dev/null
+++ b/src/views/rule/programme/components/proxyDialog.vue
@@ -0,0 +1,203 @@
+<!--
+ * @Description: 考核指标弹窗
+ * @Author: 李亚光
+ * @Date: 2023-09-15
+ -->
+<script lang="ts" setup name="SubpackageDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getListPage } from '@/api/home/rule/proxy'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const listQuery = reactive({
+  assDept: '', // 责任考核单位
+  priIndicators: '', // 一级考核指标
+  quotaNo: '', // 指标编码
+  quotaProject: '', // 指标项目
+  quotaType: '', // 指标类型
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '考核指标编号',
+    value: 'quotaNo',
+    align: 'center',
+  },
+  {
+    text: '考核指标项目',
+    value: 'quotaProjectName',
+    align: 'center',
+  },
+  {
+    text: '考核指标类型',
+    value: 'quotaTypeName',
+    align: 'center',
+  },
+  {
+    text: '一级考核指标',
+    value: 'priIndicators',
+    align: 'center',
+  },
+  {
+    text: '指标数据来源',
+    value: 'dataSourceName',
+    align: 'center',
+  },
+  {
+    text: '指标责任考核单位',
+    value: 'assDeptName',
+    align: 'center',
+  },
+  {
+    text: '指标计算规则',
+    value: 'ruleDesc',
+    align: 'center',
+  },
+  {
+    text: '考核分值',
+    value: 'score',
+    align: 'center',
+  },
+  {
+    text: '备注',
+    value: 'remarks',
+    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
+  }
+  getListPage(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.assDept = ''
+  listQuery.priIndicators = ''
+  listQuery.quotaNo = ''
+  listQuery.quotaProject = ''
+  listQuery.quotaType = ''
+  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 projectList = ref<{ id: string; value: string; name: string }[]>()
+// 指标类型下拉列表
+const typeList = ref<{ id: string; value: string; name: string }[]>()
+// 获取字典
+const fetchSelectList = () => {
+  getDictByCode('quota_project').then((res) => {
+    projectList.value = res.data
+  })
+  getDictByCode('quota_type').then((res) => {
+    typeList.value = res.data
+  })
+}
+fetchSelectList()
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 点击保存
+const submitForm = () => {
+  if (selectList.value.length) {
+    emits('add', selectList.value)
+    dialogFormVisible.value = false
+    selectList.value = []
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择考核指标')
+  }
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择考核指标" width="75%">
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.quotaNo" placeholder="考核指标编号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.quotaProject" placeholder="考核指标项目" clearable>
+          <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.quotaType" placeholder="考核指标类型" clearable>
+          <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.priIndicators" placeholder="一级考核指标" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.assDept" placeholder="责任考核单位" clearable />
+      </search-item>
+    </search-area>
+    <table-container>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+      />
+    </table-container>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/rule/programme/components/proxyTable.vue b/src/views/rule/programme/components/proxyTable.vue
new file mode 100644
index 0000000..c2fd143
--- /dev/null
+++ b/src/views/rule/programme/components/proxyTable.vue
@@ -0,0 +1,160 @@
+<!--
+ * @Description: 考核方案详情 - 一级考核指标列表
+ * @Author: 李亚光
+ * @Date: 2023-09-15
+ -->
+<script lang="ts" setup name="CertificateTable">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import proxyDialog from './proxyDialog.vue'
+import { useCheckList } from '@/utils/useCheckList'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '考核指标项目',
+    value: 'quotaProjectName',
+    required: false,
+  },
+  {
+    text: '考核指标类型',
+    value: 'quotaTypeName',
+    required: false,
+  },
+  {
+    text: '一级考核指标',
+    value: 'priIndicators',
+    required: false,
+  },
+  {
+    text: '考核指标编号',
+    value: 'quotaNo',
+    required: false,
+  },
+  {
+    text: '考核指标计算规则',
+    value: 'ruleDesc',
+    required: false,
+  },
+  {
+    text: '指标数据来源',
+    value: 'dataSourceName',
+    required: false,
+  },
+  {
+    text: '指标责任考核人',
+    value: 'assDeptName',
+    required: false,
+  },
+  {
+    text: '考核分值',
+    value: 'score',
+    required: false,
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value, '一级考核指标列表')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const proxyRef = ref()
+const addRow = () => {
+  proxyRef.value.initDialog()
+}
+// 确认添加
+const comfirm = (data: any[]) => {
+  data.forEach((item: any) => {
+    // 去掉重复选择
+    if (!list.value.filter((ele: any) => ele.id === item.id).length) {
+      list.value.push(item)
+    }
+  })
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+</script>
+
+<template>
+  <detail-block-switch title="">
+    <proxy-dialog ref="proxyRef" @add="comfirm" />
+    <template #menu>
+      <el-input v-if="!$route.path.includes('create')" placeholder="指标名称" />
+    </template>
+    <template v-if="!$route.path.includes('detail')" #btns>
+      <el-button v-if="!$route.path.includes('create')" type="info">
+        查询
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除
+      </el-button>
+      <el-button type="primary" @click="addRow">
+        增加
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span>{{ scope.row[item.value] }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/rule/programme/index.vue b/src/views/rule/programme/index.vue
index 5059a04..dd485b4 100644
--- a/src/views/rule/programme/index.vue
+++ b/src/views/rule/programme/index.vue
@@ -7,55 +7,59 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { delProgramme, getListPage } from '@/api/home/rule/programme'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
+  planName: '', // 方案名称
+  isEnable: '', // 是否禁用
+  assObject: '', // 考核对象
   offset: 1,
   limit: 20,
 })
 const columns = ref([
   {
     text: '考核方案名称',
-    value: 'groupName',
+    value: 'planName',
     align: 'center',
   },
   {
     text: '考核对象',
-    value: 'createUserName',
+    value: 'assObjectName',
     align: 'center',
   },
   {
     text: '具体考核部门',
-    value: 'createTime',
+    value: '',
     align: 'center',
   },
   {
     text: '考核周期',
-    value: 'remark',
+    value: 'cycleName',
     align: 'center',
   },
   {
     text: '是否启用',
-    value: 'remark',
+    value: 'isEnableName',
     align: 'center',
   },
   {
     text: '考核等级评定',
-    value: 'remark',
+    value: 'recoRatingName',
     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',
+    value: 'score',
     align: 'center',
   },
 ])
@@ -83,6 +87,9 @@
 }
 // 重置
 const reset = () => {
+  listQuery.planName = ''
+  listQuery.isEnable = ''
+  listQuery.assObject = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -125,6 +132,20 @@
     })
   })
 }
+// 考核对象下拉列表
+const objectList = ref<{ id: string; value: string; name: string }[]>()
+// 是否禁用下拉列表
+const disableList = ref<{ id: string; value: string; name: string }[]>()
+// 获取字典
+const fetchSelectList = () => {
+  getDictByCode('ass_object').then((res) => {
+    objectList.value = res.data
+  })
+  getDictByCode('is_enable').then((res) => {
+    disableList.value = res.data
+  })
+}
+fetchSelectList()
 </script>
 
 <template>
@@ -132,16 +153,20 @@
     <!-- 筛选条件 -->
     <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.planName" placeholder="考核方案名称" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
+        <el-select v-model.trim="listQuery.assObject" placeholder="指标考核对象" clearable>
+          <el-option v-for="item in objectList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.groupName" placeholder="具体考核部门" clearable />
-      </search-item>
+      </search-item> -->
       <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="是否启用" clearable />
+        <el-select v-model.trim="listQuery.isEnable" placeholder="是否启用" clearable>
+          <el-option v-for="item in disableList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
     </search-area>
     <table-container>

diff --git a/src/views/rule/programme/components/edit.vue b/src/views/rule/programme/components/edit.vue
index 6dbf9ce..7011d3e 100644
--- a/src/views/rule/programme/components/edit.vue
+++ b/src/views/rule/programme/components/edit.vue
@@ -5,6 +5,10 @@
  -->
 <script lang="ts" setup name="RuleProgrammeHandler">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import proxyTable from './proxyTable.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { uploadApi } from '@/api/common'
 const $route = useRoute()
 const $router = useRouter()
 // 对话框类型：create,update
@@ -17,7 +21,20 @@
 }
 // 表单对象
 const ruleForm = ref({
-
+  assObject: 1,
+  createTime: '',
+  cycle: '',
+  endTime: '',
+  fileId: '',
+  id: '',
+  isEnable: '',
+  levelId: '',
+  planName: '',
+  recoRating: '',
+  remarks: '',
+  ruleDescription: '', // 考核得分规则描述
+  score: '',
+  startTime: '',
 })
 // 表单验证规则
 const rules = ref<FormRules>({
@@ -25,7 +42,8 @@
 })
 // 表单实例对象
 const ruleFormRef = ref()
-const radio1 = ref('')
+// 一级考核指标实例对象
+const proxyRef = ref()
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   if (event.target.files?.length !== 0) {
@@ -36,20 +54,20 @@
       background: 'rgba(255, 255, 255, 0.8)',
     })
     fd.append('multipartFile', event.target.files[0])
-    // uploadApi(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
-    //     // 重置当前验证
-    //     ruleFormRef.value?.clearValidate('minioFileName')
-    //     ElMessage.success('文件上传成功')
-    //     fileRef.value.value = ''
-    //     loading.close()
-    //   }
-    //   else {
-    //     // ElMessage.error(res.message)
-    //     loading.close()
-    //   }
-    // })
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value.fileId = ruleForm.value.fileId ? `${ruleForm.value.fileId},${res.data[0]}` : res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
   }
 }
 // 上传
@@ -58,10 +76,35 @@
 }
 // 删除上传的文件
 const deleteFile = (fileName: string) => {
-  const data = ruleForm.value.instructionsFile.split(',')
+  const data = ruleForm.value.fileId.split(',')
   const filterData = data.filter(item => item !== fileName)
-  ruleForm.value.instructionsFile = filterData.length ? filterData.join(',') : ''
+  ruleForm.value.fileId = filterData.length ? filterData.join(',') : ''
 }
+// 考核对象下拉列表
+const objectList = ref<{ id: string; value: string; name: string }[]>()
+// 是否禁用下拉列表
+const disableList = ref<{ id: string; value: string; name: string }[]>()
+// 考核周期下拉框
+const cycleList = ref<{ id: string; value: string; name: string }[]>()
+// 考核等级下拉框
+const levelList = ref<{ id: string; value: string; name: string }[]>()
+// 获取字典
+const fetchSelectList = () => {
+  getDictByCode('ass_object').then((res) => {
+    objectList.value = res.data
+  })
+  getDictByCode('is_enable').then((res) => {
+    disableList.value = res.data
+  })
+  getDictByCode('cycle_code').then((res) => {
+    cycleList.value = res.data
+  })
+  getDictByCode('level_code').then((res) => {
+    levelList.value = res.data
+  })
+}
+fetchSelectList()
+const radio = ref('基本信息')
 </script>
 
 <template>
@@ -77,19 +120,28 @@
       </template>
     </detail-page>
     <detail-block-com>
+      <el-radio-group v-model="radio">
+        <el-radio-button label="基本信息" />
+        <el-radio-button label="一级考核指标" />
+      </el-radio-group>
+    </detail-block-com>
+    <!-- 基本信息 -->
+    <detail-block-com v-show="radio === '基本信息'">
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="130px" class="form"
         :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
-            <el-form-item label="考核方案名称" prop="approvalNo">
-              <el-input v-model.trim="ruleForm.approvalNo" placeholder="考核方案名称" style="width: 100%;" />
+            <el-form-item label="考核方案名称" prop="planName">
+              <el-input v-model.trim="ruleForm.planName" placeholder="考核方案名称" style="width: 100%;" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="考核对象" prop="approvalNo">
-              <el-select v-model.trim="ruleForm.approvalNo" placeholder="指标考核对象" style="width: 100%;" />
+            <el-form-item label="考核对象" prop="assObject">
+              <el-select v-model.trim="ruleForm.assObject" placeholder="指标考核对象" style="width: 100%;">
+                <el-option v-for="item in objectList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -102,28 +154,32 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
-            <el-form-item label="考核周期" prop="approvalNo">
-              <el-select v-model.trim="ruleForm.approvalNo" placeholder="考核周期" style="width: 100%;" />
+            <el-form-item label="考核周期" prop="cycle">
+              <el-select v-model.trim="ruleForm.cycle" placeholder="考核周期" style="width: 100%;">
+                <el-option v-for="item in cycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="考核等级评定" prop="approvalNo">
-              <el-select v-model.trim="ruleForm.approvalNo" placeholder="考核等级评定" style="width: 100%;" />
+            <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-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
-            <el-form-item label="考核填报发送日期" prop="approvalNo">
+            <el-form-item label="考核填报发送日期" prop="startTime">
               <el-date-picker
-                v-model="ruleForm.endTime"
+                v-model="ruleForm.startTime"
                 style="width: 100%;" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
                 placeholder="考核填报发送日期"
               />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="考核填报截至日期" prop="approvalNo">
+            <el-form-item label="考核填报截至日期" prop="endTime">
               <el-date-picker
                 v-model="ruleForm.endTime"
                 style="width: 100%;" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
@@ -134,15 +190,15 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
-            <el-form-item label="考核得分" prop="approvalNo">
-              <el-input v-model.trim="ruleForm.approvalNo" placeholder="添加考核得分规则" style="width: 100%;" />
+            <el-form-item label="考核得分" prop="score">
+              <el-input v-model.trim="ruleForm.score" placeholder="添加考核得分规则" style="width: 100%;" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
-            <el-form-item label="备注" prop="approvalName">
-              <el-input v-model.trim="ruleForm.approvalName" type="textarea" placeholder="备注" :rows="4" maxlength="100" show-word-limit />
+            <el-form-item label="备注" prop="remarks">
+              <el-input v-model.trim="ruleForm.remarks" type="textarea" placeholder="备注" :rows="4" maxlength="100" show-word-limit />
             </el-form-item>
           </el-col>
         </el-row>
@@ -150,10 +206,12 @@
           <el-col :span="24">
             <el-form-item label="是否启用" prop="approvalName">
               <el-switch
-                v-model="ruleForm.value"
+                v-model="ruleForm.isEnable"
                 size="large"
                 active-text="是"
+                active-value="1"
                 inactive-text="否"
+                inactive-value="0"
               />
             </el-form-item>
           </el-col>
@@ -161,7 +219,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="24">
             <el-form-item label="附件上传" prop="approvalNo">
-              <show-photo :minio-file-name="ruleForm.instructionsFile" @delete="deleteFile" />
+              <show-photo :minio-file-name="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">
                 上传
@@ -171,6 +229,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
+    <!-- 一级考核指标 -->
+    <proxy-table ref="proxyRef" :data="[]" />
   </app-container>
 </template>
 
diff --git a/src/views/rule/programme/components/proxyDialog.vue b/src/views/rule/programme/components/proxyDialog.vue
new file mode 100644
index 0000000..c0ae1e4
--- /dev/null
+++ b/src/views/rule/programme/components/proxyDialog.vue
@@ -0,0 +1,203 @@
+<!--
+ * @Description: 考核指标弹窗
+ * @Author: 李亚光
+ * @Date: 2023-09-15
+ -->
+<script lang="ts" setup name="SubpackageDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getListPage } from '@/api/home/rule/proxy'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+const listQuery = reactive({
+  assDept: '', // 责任考核单位
+  priIndicators: '', // 一级考核指标
+  quotaNo: '', // 指标编码
+  quotaProject: '', // 指标项目
+  quotaType: '', // 指标类型
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '考核指标编号',
+    value: 'quotaNo',
+    align: 'center',
+  },
+  {
+    text: '考核指标项目',
+    value: 'quotaProjectName',
+    align: 'center',
+  },
+  {
+    text: '考核指标类型',
+    value: 'quotaTypeName',
+    align: 'center',
+  },
+  {
+    text: '一级考核指标',
+    value: 'priIndicators',
+    align: 'center',
+  },
+  {
+    text: '指标数据来源',
+    value: 'dataSourceName',
+    align: 'center',
+  },
+  {
+    text: '指标责任考核单位',
+    value: 'assDeptName',
+    align: 'center',
+  },
+  {
+    text: '指标计算规则',
+    value: 'ruleDesc',
+    align: 'center',
+  },
+  {
+    text: '考核分值',
+    value: 'score',
+    align: 'center',
+  },
+  {
+    text: '备注',
+    value: 'remarks',
+    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
+  }
+  getListPage(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.assDept = ''
+  listQuery.priIndicators = ''
+  listQuery.quotaNo = ''
+  listQuery.quotaProject = ''
+  listQuery.quotaType = ''
+  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 projectList = ref<{ id: string; value: string; name: string }[]>()
+// 指标类型下拉列表
+const typeList = ref<{ id: string; value: string; name: string }[]>()
+// 获取字典
+const fetchSelectList = () => {
+  getDictByCode('quota_project').then((res) => {
+    projectList.value = res.data
+  })
+  getDictByCode('quota_type').then((res) => {
+    typeList.value = res.data
+  })
+}
+fetchSelectList()
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 点击保存
+const submitForm = () => {
+  if (selectList.value.length) {
+    emits('add', selectList.value)
+    dialogFormVisible.value = false
+    selectList.value = []
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择考核指标')
+  }
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择考核指标" width="75%">
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.quotaNo" placeholder="考核指标编号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.quotaProject" placeholder="考核指标项目" clearable>
+          <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.quotaType" placeholder="考核指标类型" clearable>
+          <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.priIndicators" placeholder="一级考核指标" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.assDept" placeholder="责任考核单位" clearable />
+      </search-item>
+    </search-area>
+    <table-container>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+      />
+    </table-container>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/rule/programme/components/proxyTable.vue b/src/views/rule/programme/components/proxyTable.vue
new file mode 100644
index 0000000..c2fd143
--- /dev/null
+++ b/src/views/rule/programme/components/proxyTable.vue
@@ -0,0 +1,160 @@
+<!--
+ * @Description: 考核方案详情 - 一级考核指标列表
+ * @Author: 李亚光
+ * @Date: 2023-09-15
+ -->
+<script lang="ts" setup name="CertificateTable">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import proxyDialog from './proxyDialog.vue'
+import { useCheckList } from '@/utils/useCheckList'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '考核指标项目',
+    value: 'quotaProjectName',
+    required: false,
+  },
+  {
+    text: '考核指标类型',
+    value: 'quotaTypeName',
+    required: false,
+  },
+  {
+    text: '一级考核指标',
+    value: 'priIndicators',
+    required: false,
+  },
+  {
+    text: '考核指标编号',
+    value: 'quotaNo',
+    required: false,
+  },
+  {
+    text: '考核指标计算规则',
+    value: 'ruleDesc',
+    required: false,
+  },
+  {
+    text: '指标数据来源',
+    value: 'dataSourceName',
+    required: false,
+  },
+  {
+    text: '指标责任考核人',
+    value: 'assDeptName',
+    required: false,
+  },
+  {
+    text: '考核分值',
+    value: 'score',
+    required: false,
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value, '一级考核指标列表')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const proxyRef = ref()
+const addRow = () => {
+  proxyRef.value.initDialog()
+}
+// 确认添加
+const comfirm = (data: any[]) => {
+  data.forEach((item: any) => {
+    // 去掉重复选择
+    if (!list.value.filter((ele: any) => ele.id === item.id).length) {
+      list.value.push(item)
+    }
+  })
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+</script>
+
+<template>
+  <detail-block-switch title="">
+    <proxy-dialog ref="proxyRef" @add="comfirm" />
+    <template #menu>
+      <el-input v-if="!$route.path.includes('create')" placeholder="指标名称" />
+    </template>
+    <template v-if="!$route.path.includes('detail')" #btns>
+      <el-button v-if="!$route.path.includes('create')" type="info">
+        查询
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除
+      </el-button>
+      <el-button type="primary" @click="addRow">
+        增加
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span>{{ scope.row[item.value] }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/rule/programme/index.vue b/src/views/rule/programme/index.vue
index 5059a04..dd485b4 100644
--- a/src/views/rule/programme/index.vue
+++ b/src/views/rule/programme/index.vue
@@ -7,55 +7,59 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { delProgramme, getListPage } from '@/api/home/rule/programme'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
+  planName: '', // 方案名称
+  isEnable: '', // 是否禁用
+  assObject: '', // 考核对象
   offset: 1,
   limit: 20,
 })
 const columns = ref([
   {
     text: '考核方案名称',
-    value: 'groupName',
+    value: 'planName',
     align: 'center',
   },
   {
     text: '考核对象',
-    value: 'createUserName',
+    value: 'assObjectName',
     align: 'center',
   },
   {
     text: '具体考核部门',
-    value: 'createTime',
+    value: '',
     align: 'center',
   },
   {
     text: '考核周期',
-    value: 'remark',
+    value: 'cycleName',
     align: 'center',
   },
   {
     text: '是否启用',
-    value: 'remark',
+    value: 'isEnableName',
     align: 'center',
   },
   {
     text: '考核等级评定',
-    value: 'remark',
+    value: 'recoRatingName',
     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',
+    value: 'score',
     align: 'center',
   },
 ])
@@ -83,6 +87,9 @@
 }
 // 重置
 const reset = () => {
+  listQuery.planName = ''
+  listQuery.isEnable = ''
+  listQuery.assObject = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -125,6 +132,20 @@
     })
   })
 }
+// 考核对象下拉列表
+const objectList = ref<{ id: string; value: string; name: string }[]>()
+// 是否禁用下拉列表
+const disableList = ref<{ id: string; value: string; name: string }[]>()
+// 获取字典
+const fetchSelectList = () => {
+  getDictByCode('ass_object').then((res) => {
+    objectList.value = res.data
+  })
+  getDictByCode('is_enable').then((res) => {
+    disableList.value = res.data
+  })
+}
+fetchSelectList()
 </script>
 
 <template>
@@ -132,16 +153,20 @@
     <!-- 筛选条件 -->
     <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.planName" placeholder="考核方案名称" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="指标考核对象" clearable />
+        <el-select v-model.trim="listQuery.assObject" placeholder="指标考核对象" clearable>
+          <el-option v-for="item in objectList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.groupName" placeholder="具体考核部门" clearable />
-      </search-item>
+      </search-item> -->
       <search-item>
-        <el-select v-model.trim="listQuery.groupName" placeholder="是否启用" clearable />
+        <el-select v-model.trim="listQuery.isEnable" placeholder="是否启用" clearable>
+          <el-option v-for="item in disableList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
       </search-item>
     </search-area>
     <table-container>
diff --git a/src/views/rule/proxy/components/edit.vue b/src/views/rule/proxy/components/edit.vue
index f02d0ef..cd2d4ef 100644
--- a/src/views/rule/proxy/components/edit.vue
+++ b/src/views/rule/proxy/components/edit.vue
@@ -21,6 +21,8 @@
   create: '新增',
   detail: '详情',
 }
+// 表单实例对象
+const ruleFormRef = ref()
 // 表单对象
 const ruleForm = ref({
   quotaType: '', // 考核指标类型
@@ -30,10 +32,11 @@
   assDept: '', // 指标考核责任人
   dataSource: '', // 数据来源
   score: '', // 考核分值
-  valType: '', // 指标值类型
+  valType: '1', // 指标值类型
   remarks: '', // 备注
   fileId: '', // 上传文件
   id: '',
+  ruleDesc: '',
 })
 // 表单验证规则
 const rules = ref<FormRules>({
@@ -44,9 +47,27 @@
   dataSource: [{ required: true, message: '数据来源必选', trigger: ['blur', 'change'] }],
   valType: [{ required: true, message: '指标值类型必选', trigger: ['blur', 'change'] }],
   score: [{ required: true, message: '考核分值必填', trigger: ['blur', 'change'] }],
+  ruleDesc: [{ required: true, message: '指标计算规则必填', trigger: ['blur', 'change'] }],
 })
-// 表单实例对象
-const ruleFormRef = ref()
+// 考核分值区间
+const score1 = ref()
+const score2 = ref()
+watch([score1, score2], (newVal) => {
+  if (newVal[0] && newVal[1]) {
+    ruleFormRef.value?.clearValidate('score')
+    ruleForm.value.score = `${score1.value}-${score2.value}`
+  }
+})
+watch(() => ruleForm.value.valType, (newVal) => {
+  if (newVal === '1' && !ruleForm.value.score.includes('-')) {
+    ruleForm.value.score = ''
+  }
+  else if ((newVal === '2' || newVal === '3') && ruleForm.value.score.includes('-')) {
+    score1.value = ''
+    score2.value = ''
+    ruleForm.value.score = ''
+  }
+})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   if (event.target.files?.length !== 0) {
@@ -128,6 +149,12 @@
       data[i] = String(data[i])
     }
     ruleForm.value = data
+    // 区间范围
+    if (ruleForm.value.valType === '1') {
+      const score = ruleForm.value.score.split('-')
+      score1.value = score[0]
+      score2.value = score[1]
+    }
   }
 })
 // 指标项目下拉列表
@@ -163,6 +190,7 @@
     }
   })
 }
+fetchDeptTree()
 </script>
 
 <template>
@@ -226,6 +254,13 @@
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="指标计算规则" prop="ruleDesc">
+              <el-input v-model.trim="ruleForm.ruleDesc" type="textarea" placeholder="指标计算规则" :rows="2" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="指标值类型" prop="valType">
               <el-radio-group v-model="ruleForm.valType" class="ml-4">
@@ -237,7 +272,20 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="考核分值" prop="score">
-              <el-input v-model.trim="ruleForm.score" placeholder="考核分值" />
+              <div v-if="ruleForm.valType === '1'">
+                <el-input v-model.trim="score1" placeholder="" style="width: 100px;" />
+                ——
+                <el-input v-model.trim="score2" placeholder="" style="width: 100px;" />
+              </div>
+              <!-- 区间 -->
+              <!-- 加分 -->
+              <el-input
+                v-if="ruleForm.valType === '2'" v-model.trim="ruleForm.score" placeholder="考核分值"
+              />
+              <!-- 减分 -->
+              <el-input
+                v-if="ruleForm.valType === '3'" v-model.trim="ruleForm.score" placeholder="考核分值"
+              />
             </el-form-item>
           </el-col>
         </el-row>