From e3da7999d10ffdfd2ec8ddda5813752183f2a803 Mon Sep 17 00:00:00 2001
From: leewand <liwd@neuray.cn>
Date: Tue, 1 Sep 2020 18:16:04 +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=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/par/examPlan/ParExamItem.vue        | 12 +---
 src/views/par/examPlan/ParExamPlan.vue        | 54 ++++++++++-------
 .../par/examPlan/ParExamPlanPersonnel.vue     | 59 +++++++++++--------
 src/views/par/examPlan/PlanItem.vue           |  4 +-
 4 files changed, 74 insertions(+), 55 deletions(-)

diff --git a/src/views/par/examPlan/ParExamItem.vue b/src/views/par/examPlan/ParExamItem.vue
index 3769b89..8bca1f1 100644
--- a/src/views/par/examPlan/ParExamItem.vue
+++ b/src/views/par/examPlan/ParExamItem.vue
@@ -63,16 +63,8 @@ export default {
       columns: [
         {
           title: '考评标准及要点大类',
-          dataIndex: 'kpdl',
-          customRender: function (text) {
-            if (text === '1') {
-              return '基础性工作'
-            } else if (text === '2') {
-              return '指令性工作'
-            } else {
-              return '综合评定'
-            }
-          }
+          dataIndex: 'parentName',
+          ellipsis: true
         },
         {
           title: '考评内容',
diff --git a/src/views/par/examPlan/ParExamPlan.vue b/src/views/par/examPlan/ParExamPlan.vue
index 13a8c8f..6f64026 100644
--- a/src/views/par/examPlan/ParExamPlan.vue
+++ b/src/views/par/examPlan/ParExamPlan.vue
@@ -1,8 +1,8 @@
 <template>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row class="form-row" justify="space-around" align="middle" type="flex" style="margin-top: 10px">
+  <a-card style="margin-top:-2px" :bordered="false">
+    <div>
+      <a-form>
+        <a-row class="form-row">
           <a-col :span="6" :offset="1">
             <a-form-item label="考评名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入" v-model="queryParam.kpjhmc" />
@@ -17,26 +17,36 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row class="form-row" justify="space-around" align="middle" type="flex">
+        <a-row class="form-row">
           <a-col :span="6" :offset="1">
-            <a-form-item label="考评时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-item label="考评开始日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-range-picker
-                v-model="timeDate"
+                v-model="kssjs"
                 format="YYYY-MM-DD"
-                :placeholder="['开始时间', '结束时间']"
+                valueFormat="YYYY-MM-DD"
+                :placeholder="['开始日期', '结束日期']"
                 @change="onChange"
               />
             </a-form-item>
           </a-col>
           <a-col :span="6" :offset="1">
+            <a-form-item label="考评结束日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-range-picker
+                      v-model="jssjs"
+                      format="YYYY-MM-DD"
+                      valueFormat="YYYY-MM-DD"
+                      :placeholder="['开始日期', '结束日期']"
+                      @change="onChange"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8" :offset="1">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchPlan">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetPlan">重置</a-button>
-              <a-button
-                type="primary"
-                style="margin-left: 30px"
-                @click="handleAdd()"
-              >新建计划</a-button>
+              <span style="float:right" class="table-page-search-submitButtons">
+              <a-button type="primary" style="margin-left: 8px;float:right" @click="handleAdd()" >新增</a-button>
+              </span>
             </span>
           </a-col>
         </a-row>
@@ -90,7 +100,8 @@ export default {
       mdl: {},
       // 查询参数
       queryParam: {},
-      timeDate: [],
+      kssjs: [],
+      jssjs: [],
       // 表头
       columns: [
         {
@@ -208,17 +219,20 @@ export default {
      * 搜索
      */
     searchPlan () {
-      console.log(this.queryParam)
-      // eslint-disable-next-line use-isnan
-      if (this.timeDate !== [] && this.timeDate.length !== 0) {
-        this.queryParam.kssj = moment(this.timeDate[0], 'YYYY-MM-DD HH:mm:ss').valueOf()
-        this.queryParam.jssj = moment(this.timeDate[1], 'YYYY-MM-DD HH:mm:ss').valueOf()
+      if (this.kssjs !== [] && this.kssjs.length !== 0) {
+        this.queryParam.kssjStart = moment(this.kssjs[0]).format('YYYY-MM-DD')
+        this.queryParam.kssjEnd = moment(this.kssjs[1]).format('YYYY-MM-DD')
+      }
+      if (this.jssjs !== [] && this.jssjs.length !== 0) {
+        this.queryParam.jssjStart = moment(this.jssjs[0]).format('YYYY-MM-DD')
+        this.queryParam.jssjEnd = moment(this.jssjs[1]).format('YYYY-MM-DD')
       }
       this.$refs.stable.loadData({}, this.queryParam, {})
     },
     resetPlan () {
       this.queryParam = {}
-      this.timeDate = []
+      this.jssjs = []
+      this.kssjs = []
     },
     /**
      * 编辑弹出框
diff --git a/src/views/par/examPlan/ParExamPlanPersonnel.vue b/src/views/par/examPlan/ParExamPlanPersonnel.vue
index 8ee9d3b..f3c4d8a 100644
--- a/src/views/par/examPlan/ParExamPlanPersonnel.vue
+++ b/src/views/par/examPlan/ParExamPlanPersonnel.vue
@@ -1,8 +1,8 @@
 <template>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row class="form-row" justify="space-around" align="middle" type="flex" style="margin-top: 10px">
+  <a-card style="margin-top:-2px" :bordered="false">
+    <div>
+      <a-form>
+        <a-row class="form-row">
           <a-col :span="6" :offset="1">
             <a-form-item label="考评名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入" v-model="queryParam.kpjhmc" />
@@ -14,27 +14,36 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row class="form-row" justify="space-around" align="middle" type="flex">
+        <a-row class="form-row">
           <a-col :span="6" :offset="1">
-            <a-form-item label="考评时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <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"
-                :placeholder="['开始时间', '结束时间']"
-                @change="onChange"
+                      v-model="kssjs"
+                      format="YYYY-MM-DD"
+                      valueFormat="YYYY-MM-DD"
+                      :placeholder="['开始日期', '结束日期']"
+                      @change="onChange"
               />
             </a-form-item>
           </a-col>
           <a-col :span="6" :offset="1">
+            <a-form-item label="考评结束日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-range-picker
+                      v-model="jssjs"
+                      format="YYYY-MM-DD"
+                      valueFormat="YYYY-MM-DD"
+                      :placeholder="['开始日期', '结束日期']"
+                      @change="onChange"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8" :offset="1">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchPlan">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetPlan">重置</a-button>
-              <a-button
-                type="primary"
-                style="margin-left: 30px"
-                @click="handleAdd()"
-              >新建计划</a-button>
+              <span style="float:right" class="table-page-search-submitButtons">
+              <a-button type="primary" style="margin-left: 8px;float:right" @click="handleAdd()" >新增</a-button>
+              </span>
             </span>
           </a-col>
         </a-row>
@@ -88,7 +97,8 @@ export default {
       mdl: {},
       // 查询参数
       queryParam: {},
-      timeDate: [],
+      kssjs: [],
+      jssjs: [],
       // 表头
       columns: [
         {
@@ -199,17 +209,20 @@ export default {
      * 搜索
      */
     searchPlan () {
-      console.log(this.queryParam)
-      // eslint-disable-next-line use-isnan
-      if (this.timeDate !== [] && this.timeDate.length !== 0) {
-        this.queryParam.kssj = moment(this.timeDate[0], 'YYYY-MM-DD HH:mm:ss').valueOf()
-        this.queryParam.jssj = moment(this.timeDate[1], 'YYYY-MM-DD HH:mm:ss').valueOf()
+      if (this.kssjs !== [] && this.kssjs.length !== 0) {
+        this.queryParam.kssjStart = moment(this.kssjs[0]).format('YYYY-MM-DD')
+        this.queryParam.kssjEnd = moment(this.kssjs[1]).format('YYYY-MM-DD')
+      }
+      if (this.jssjs !== [] && this.jssjs.length !== 0) {
+        this.queryParam.jssjStart = moment(this.jssjs[0]).format('YYYY-MM-DD')
+        this.queryParam.jssjEnd = moment(this.jssjs[1]).format('YYYY-MM-DD')
       }
       this.$refs.stable.loadData({}, this.queryParam, {})
     },
     resetPlan () {
       this.queryParam = {}
-      this.timeDate = []
+      this.jssjs = []
+      this.kssjs = []
     },
     /**
      * 编辑弹出框
diff --git a/src/views/par/examPlan/PlanItem.vue b/src/views/par/examPlan/PlanItem.vue
index 9177c4b..59b035a 100644
--- a/src/views/par/examPlan/PlanItem.vue
+++ b/src/views/par/examPlan/PlanItem.vue
@@ -40,10 +40,10 @@
         </a-select>
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开始时间" hasFeedback>
-        <a-date-picker v-decorator="['kssj',{ rules: [{ required: true, message: '请填写开始时间' }] }]"/>
+        <a-date-picker format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-decorator="['kssj',{ rules: [{ required: true, message: '请填写开始时间' }] }]"/>
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结束时间" hasFeedback>
-        <a-date-picker v-decorator="['jssj',{ rules: [{ required: true, message: '请填写结束时间' }] }]"/>
+        <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']" />
-- 
Gitee