From af99a62b085d458b131b87c26fa67a017d3ca845 Mon Sep 17 00:00:00 2001
From: tianhao <2524518601@qq.com>
Date: Fri, 4 Sep 2020 10:16:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=84=E5=91=A8=E6=9C=9F=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/par/examperiod/ExamPeriod.vue | 63 +++++++++++++++++++++----
 1 file changed, 53 insertions(+), 10 deletions(-)

diff --git a/src/views/par/examperiod/ExamPeriod.vue b/src/views/par/examperiod/ExamPeriod.vue
index fd659cc..4ebac49 100644
--- a/src/views/par/examperiod/ExamPeriod.vue
+++ b/src/views/par/examperiod/ExamPeriod.vue
@@ -49,6 +49,7 @@
         <a-divider type="vertical" />
         <a @click="modelMethod('edit',record)" v-action:update>编辑</a>
       </span>
+      <span slot="kpzqlx" slot-scope="text">{{ kpzqlxEcho(text) }}</span>
     </s-table>
     <!-- 弹出框 -->
     <a-modal
@@ -71,14 +72,35 @@
         :wrapper-col="wrapperCol"
       >
         <a-row class="form-row">
-          <a-col :span="10" :offset="1">
+          <a-col :span="20" :offset="1">
             <a-form-model-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
+              :labelCol="{span:4}"
+              :wrapperCol="{span:20}"
               label="考评周期名称"
               prop="kpzqmc"
             >
-              <a-input :maxLength="80" placeholder="请输入考评周期名称" v-model="selectInfo.kpzqmc" :disabled="operate=='detile'?'disabled':false" />
+              <a-input
+                :maxLength="80"
+                placeholder="请输入考评周期名称"
+                v-model="selectInfo.kpzqmc"
+                :disabled="operate=='detile'?'disabled':false"
+              />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="20" :offset="1">
+            <a-form-model-item
+              :labelCol="{span:4}"
+              :wrapperCol="{span:20}"
+              label="考评周期类型"
+              prop="kpzqlx"
+            >
+              <a-select
+                placeholder="请选择考评周期类型"
+                v-model="selectInfo.kpzqlx"
+                :disabled="operate=='detile'?'disabled':false">
+                <a-select-option key="1" value="1">单位</a-select-option>
+                <a-select-option key="2" value="2">个人</a-select-option>
+              </a-select>
             </a-form-model-item>
           </a-col>
           <a-col :span="20" :offset="1" style="padding-top:5px;">
@@ -129,11 +151,26 @@ export default {
       columns: [
         {
           title: '考评周期名称',
-          dataIndex: 'kpzqmc'
+          dataIndex: 'kpzqmc',
+          ellipsis: true
+        },
+        {
+          title: '考评周期类型',
+          dataIndex: 'kpzqlx',
+          scopedSlots: { customRender: 'kpzqlx' }
         },
         {
           title: '备注',
-          dataIndex: 'bz'
+          dataIndex: 'bz',
+          ellipsis: true
+        },
+        {
+          title: '创建人',
+          dataIndex: 'crtName'
+        },
+        {
+          title: '创建时间',
+          dataIndex: 'crtTime'
         },
         {
           title: '操作',
@@ -152,10 +189,9 @@ export default {
         sm: { span: 16 }
       },
       rules: {
-        kpzqmc: [
-          { required: true, message: '考评周期名称不能为空', trigger: 'blur' }
-        ],
-        bz: [{ required: true, message: '备注不能为空', trigger: 'blur' }]
+        kpzqmc: [{ required: true, message: '考评周期名称不能为空', trigger: 'blur' }],
+        bz: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+        kpzqlx: [{ required: true, message: '请选择考评周期类型', trigger: 'change' }]
       },
       modelVisible: false, // 弹出框显示
       operate: 'query', // 当前操作
@@ -295,6 +331,13 @@ export default {
       document.body.appendChild(link)
       link.click()
       document.body.removeChild(link)
+    },
+    kpzqlxEcho (text) {
+      if (text === '1') {
+        return '单位'
+      } else if (text === '2') {
+        return '个人'
+      }
     }
   }
 }
-- 
Gitee