From de4fb42a9c4cee29c1da183ad54b6615b0d95a2a Mon Sep 17 00:00:00 2001
From: leewand <liwd@neuray.cn>
Date: Tue, 8 Sep 2020 11:31:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=84=E8=AE=A1=E5=88=92=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/par/examPlan/ParExamCate.vue        | 11 +++++----
 src/views/par/examPlan/ParExamItem.vue        |  1 +
 src/views/par/examPlan/ParExamPlan.vue        |  4 ++--
 .../par/examPlan/ParExamPlanPersonnel.vue     |  4 ++--
 src/views/par/examPlan/PlanItem.vue           | 23 +++++++------------
 5 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/src/views/par/examPlan/ParExamCate.vue b/src/views/par/examPlan/ParExamCate.vue
index 7b4e54e..6d8f7b2 100644
--- a/src/views/par/examPlan/ParExamCate.vue
+++ b/src/views/par/examPlan/ParExamCate.vue
@@ -4,8 +4,7 @@
     style="top: 100px;"
     :width="1200"
     v-model="editVisible"
-    @ok="handleEditOk"
-    @cancel="cancelHandel"
+    :maskClosable=false
     :bodyStyle="{ 'max-height': '500px', overflow: 'scroll' }"
     :confirmLoading="confirmLoading"
   >
@@ -24,6 +23,11 @@
       </a-table>
       <par-exam-item ref="examItemModel" @success="afterClose"></par-exam-item>
     </a-card>
+    <template slot="footer">
+      <a-button key="back" @click="cancelHandel">
+        关闭
+      </a-button>
+    </template>
   </a-modal>
 </template>
 
@@ -127,9 +131,6 @@ export default {
       record.dwlx = this.param.dwlx
       this.$refs.examItemModel.begin(record, this.type)
     },
-    handleEditOk () {
-      this.close()
-    },
     /**
      * 关闭弹出框
      */
diff --git a/src/views/par/examPlan/ParExamItem.vue b/src/views/par/examPlan/ParExamItem.vue
index c4fc5ed..a7f5444 100644
--- a/src/views/par/examPlan/ParExamItem.vue
+++ b/src/views/par/examPlan/ParExamItem.vue
@@ -6,6 +6,7 @@
     v-model="editVisible"
     @ok="handleEditOk"
     @cancel="cancelHandel"
+    :maskClosable=false
     :bodyStyle="{ 'max-height': '500px', overflow: 'scroll' }"
     :confirmLoading="confirmLoading"
   >
diff --git a/src/views/par/examPlan/ParExamPlan.vue b/src/views/par/examPlan/ParExamPlan.vue
index 71b8b59..135d29a 100644
--- a/src/views/par/examPlan/ParExamPlan.vue
+++ b/src/views/par/examPlan/ParExamPlan.vue
@@ -111,11 +111,11 @@ export default {
           ellipsis: true
         },
         {
-          title: '考评开始时间',
+          title: '考评开始日期',
           dataIndex: 'kssj'
         },
         {
-          title: '考评结束时间',
+          title: '考评结束日期',
           dataIndex: 'jssj'
         },
         {
diff --git a/src/views/par/examPlan/ParExamPlanPersonnel.vue b/src/views/par/examPlan/ParExamPlanPersonnel.vue
index dcfef58..b3df875 100644
--- a/src/views/par/examPlan/ParExamPlanPersonnel.vue
+++ b/src/views/par/examPlan/ParExamPlanPersonnel.vue
@@ -108,11 +108,11 @@ export default {
           ellipsis: true
         },
         {
-          title: '考评开始时间',
+          title: '考评开始日期',
           dataIndex: 'kssj'
         },
         {
-          title: '考评结束时间',
+          title: '考评结束日期',
           dataIndex: 'jssj'
         },
         {
diff --git a/src/views/par/examPlan/PlanItem.vue b/src/views/par/examPlan/PlanItem.vue
index 4590ddd..2f8393e 100644
--- a/src/views/par/examPlan/PlanItem.vue
+++ b/src/views/par/examPlan/PlanItem.vue
@@ -5,15 +5,17 @@
     :width="800"
     v-model="editVisible"
     @ok="handleEditOk"
+    :maskClosable=false
     @cancel="cancelHandel"
     :confirmLoading="confirmLoading"
   >
     <a-form :form="editForm">
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评名称">
-        <a-input v-decorator="['kpjhmc',{ rules: [{ required: true, message: '请填写考评名称' }, { max: 32, message: '最多填写32位字符' }] }]" />
+        <a-input placeholder="请填写考评名称" v-decorator="['kpjhmc',{ rules: [{ required: true, message: '请填写考评名称' }, { max: 32, message: '最多填写32位字符' }] }]" />
       </a-form-item>
       <a-form-item v-if="type === 'org'" :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评单位类型" hasFeedback>
         <a-select
+          placeholder="请选择考评单位类型"
           :disabled="inOrUp=='update'?'disabled':false"
           v-decorator="['dwlx', { rules: [{ required: true, message: '请选择考评单位类型' }] }]"
         >
@@ -23,6 +25,7 @@
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评周期" hasFeedback>
         <a-select
+          placeholder="请选择考评周期"
           size="default"
           v-decorator="['kpzqid', { rules: [{ required: true, message: '请选择考评周期' }] }]"
         >
@@ -31,10 +34,8 @@
           </a-select-option>
         </a-select>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="检查方式" hasFeedback>
-        <a-select
-          v-decorator="['jcfs',{ rules: [{ required: true, message: '请选择检查方式' }] }]"
-        >
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="检查方式">
+        <a-select placeholder="请选择检查方式" v-decorator="['jcfs',{ rules: [{ required: true, message: '请选择检查方式' }] }]">
           <a-select-option value="1">四不两直检查</a-select-option>
           <a-select-option value="2">定期检查</a-select-option>
         </a-select>
@@ -46,7 +47,7 @@
         <a-date-picker format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-decorator="['jssj',{ rules: [{ required: true, message: '请填写结束时间' }] }]"/>
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注" hasFeedback>
-        <a-textarea :rows="5" v-decorator="['bz',{ rules: [{ max: 500, message: '最多填写500位字符' }] }]" />
+        <a-textarea placeholder="请填写备注" :rows="5" v-decorator="['bz',{ rules: [{ max: 500, message: '最多填写500位字符' }] }]" />
       </a-form-item>
     </a-form>
   </a-modal>
@@ -99,15 +100,7 @@ export default {
         }, 0)
       } else if (record.inOrUp === 'insert') {
         setTimeout(() => {
-          this.editForm.setFieldsValue({
-            kpjhmc: '',
-            dwlx: '',
-            jcfs: '',
-            kssj: '',
-            jssj: '',
-            bz: '',
-            kpzqid: ''
-          })
+          this.editForm.resetFields()
         }, 0)
       }
       this.editVisible = true
-- 
Gitee