From cb82a6be82b7261da242419d539530759207cfb4 Mon Sep 17 00:00:00 2001
From: leewand <liwd@neuray.cn>
Date: Tue, 1 Sep 2020 14:56:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=80=83=E8=AF=84=E8=AE=A1=E5=88=92=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/par/examPlan/ParExamPlan.vue |  3 +--
 src/views/par/examPlan/PlanItem.vue    | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/views/par/examPlan/ParExamPlan.vue b/src/views/par/examPlan/ParExamPlan.vue
index bb13908..13a8c8f 100644
--- a/src/views/par/examPlan/ParExamPlan.vue
+++ b/src/views/par/examPlan/ParExamPlan.vue
@@ -22,8 +22,7 @@
             <a-form-item label="考评时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-range-picker
                 v-model="timeDate"
-                :show-time="{ format: 'HH:mm' }"
-                format="YYYY-MM-DD HH:mm"
+                format="YYYY-MM-DD"
                 :placeholder="['开始时间', '结束时间']"
                 @change="onChange"
               />
diff --git a/src/views/par/examPlan/PlanItem.vue b/src/views/par/examPlan/PlanItem.vue
index 14b3baf..9d57913 100644
--- a/src/views/par/examPlan/PlanItem.vue
+++ b/src/views/par/examPlan/PlanItem.vue
@@ -10,12 +10,12 @@
   >
     <a-form :form="editForm">
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评名称">
-        <a-input v-decorator="['kpjhmc',{ rules: [{ required: true, message: '请填写考评单位类型' }] }]" />
+        <a-input v-decorator="['kpjhmc',{ rules: [{ required: true, message: '请填写考评名称' }] }]" />
       </a-form-item>
       <a-form-item v-if="type === 'org'" :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评单位类型" hasFeedback>
         <a-select
           :disabled="inOrUp=='update'?'disabled':false"
-          v-decorator="['dwlx', { rules: [{ required: true, message: '请填写考评单位类型' }] }]"
+          v-decorator="['dwlx', { rules: [{ required: true, message: '请选择考评单位类型' }] }]"
         >
           <a-select-option value="1">机关</a-select-option>
           <a-select-option value="2">各层级单位</a-select-option>
@@ -24,7 +24,7 @@
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评周期" hasFeedback>
         <a-select
           size="default"
-          v-decorator="['kpzqid', { rules: [{ required: true, message: '请填写考评周期' }] }]"
+          v-decorator="['kpzqid', { rules: [{ required: true, message: '请选择考评周期' }] }]"
         >
           <a-select-option v-for="kpzq in kpzqList" :value="kpzq.ID" :key="kpzq.ID">
             {{ kpzq.NAME }}
@@ -33,17 +33,17 @@
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="检查方式" hasFeedback>
         <a-select
-          v-decorator="['jcfs',{ rules: [{ required: true, message: '请填写考评单位类型' }] }]"
+          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>
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开始时间" hasFeedback>
-        <a-date-picker show-time v-decorator="['kssj',{ rules: [{ required: true, message: '请填写考评单位类型' }] }]"/>
+        <a-date-picker v-decorator="['kssj',{ rules: [{ required: true, message: '请填写开始时间' }] }]"/>
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结束时间" hasFeedback>
-        <a-date-picker show-time v-decorator="['jssj',{ rules: [{ required: true, message: '请填写考评单位类型' }] }]"/>
+        <a-date-picker 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']" />
-- 
Gitee


From 79aa50dd750c65a0f60c1d8fb8ce310c1d8c7ddd Mon Sep 17 00:00:00 2001
From: leewand <liwd@neuray.cn>
Date: Tue, 1 Sep 2020 15:01:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=80=83=E8=AF=84=E8=AE=A1=E5=88=92=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/par/examPlan/PlanItem.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/par/examPlan/PlanItem.vue b/src/views/par/examPlan/PlanItem.vue
index 9d57913..9177c4b 100644
--- a/src/views/par/examPlan/PlanItem.vue
+++ b/src/views/par/examPlan/PlanItem.vue
@@ -93,7 +93,8 @@ export default {
             jcfs: record.jcfs,
             kssj: record.kssj,
             jssj: record.jssj,
-            bz: record.bz
+            bz: record.bz,
+            kpzqid: record.kpzqid
           })
         }, 0)
       } else if (record.inOrUp === 'insert') {
-- 
Gitee