Merge branch 'master' of http://git.cc-lotus.info/laboratory/ruoyi-project

java代码/ruoyi-ui/src/views/merits/check/index.vue

@@ -12,9 +12,14 @@
             @toView="toView"
             @toCheck="toCheck"
           >
-            <template #custom="{ item, row }">
+            <template #options="{ item }">
               <template v-if="item.prop === 'status'">
-                <el-option v-for="(i, index) in statusList" :key="index" :label="i.label" :value="i.value" />
+                <el-option
+                  v-for="(i, index) in statusList"
+                  :key="index"
+                  :label="i.label"
+                  :value="i.value"
+                />
               </template>
             </template>
           </data-table>
@@ -114,7 +119,8 @@ export default {
         },
         {
           label: '绩效审核',
-          method: 'toCheck'
+          method: 'toCheck',
+          display: (i) => i.status == '1'
         }
       ],
       // 绩效审核
@@ -129,10 +135,9 @@ export default {
       },
       // 审核状态
       statusList: [
-        {
-          label: '0',
-          value: 'as'
-        }
+        { label: '待审中', value: '1' },
+        { label: '审核通过', value: '2' },
+        { label: '审核拒绝', value: '3' }
       ],
       // 查看
       viewData: {}