From 566941f0d4e4ba495ebf45f11fbbff1f105c5124 Mon Sep 17 00:00:00 2001
From: T-95707 <zhujt@neuray.cn>
Date: Tue, 8 Sep 2020 11:28:05 +0800
Subject: [PATCH] =?UTF-8?q?20200908=20zjt=20=E4=BF=AE=E6=94=B9bug=E4=B8=8E?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/par/basicData/ParBasicData.vue      | 10 ++++----
 .../personBasicData/ParPersonBasicData.vue    |  8 +++---
 .../ParPersonScoreManage.vue                  | 14 +++++------
 .../PersonScoreManageAdd.vue                  | 22 +++++++++++-----
 src/views/par/scoreManage/ParScoreManage.vue  | 12 ++++-----
 src/views/par/scoreManage/ScoreManageAdd.vue  | 25 +++++++++++++------
 6 files changed, 55 insertions(+), 36 deletions(-)

diff --git a/src/views/par/basicData/ParBasicData.vue b/src/views/par/basicData/ParBasicData.vue
index 474b1f7..55f849e 100644
--- a/src/views/par/basicData/ParBasicData.vue
+++ b/src/views/par/basicData/ParBasicData.vue
@@ -17,7 +17,7 @@
               </a-tooltip>
             </template>
             <div>
-              <a-input-search style="margin-bottom: 8px" placeholder="Search" @change="onChange" />
+              <a-input-search style="margin-bottom: 8px" placeholder="请输入查询内容" @change="onChange" />
               <a-tree
                 @expand="onExpand"
                 :expandedKeys="expandedKeys"
@@ -55,7 +55,7 @@
                   label="数据名称"
                 >
                   <a-input
-                    placeholder="数据名称"
+                    placeholder="请输入数据名称"
                     v-decorator="['name',{rules: [{ required: true, message: '请输入数据名称信息' },{ max:60,message:'长度不能超过60个字'}]}]"/>
                 </a-form-item>
                 <a-form-item
@@ -107,7 +107,7 @@
                   label="考评分数"
                   v-if="itemShowFlag"
                 >
-                  <a-input-number style="width:100%" :min="0" :max="999999" v-decorator="['kpfs',{rules: [{ required: true, message: '请输入考评分数' }]}]" />
+                  <a-input-number placeholder="请输入考评分数" style="width:100%" :min="0" :max="999999" v-decorator="['kpfs',{rules: [{ required: true, message: '请输入考评分数' }]}]" />
                 </a-form-item>
                 <a-form-item
                   :labelCol="labelCol"
@@ -115,7 +115,7 @@
                   label="考评点"
                   v-if="itemShowFlag"
                 >
-                  <a-textarea :rows="5" v-decorator="['kpd']"/>
+                  <a-textarea placeholder="请输入考评点" :rows="5" v-decorator="['kpd']"/>
                   <p style="font-size:12px;height: 20px;color: red;">注：每条考评点间使用回车分割</p>
                 </a-form-item>
                 <a-form-item
@@ -124,7 +124,7 @@
                   :label="kpbzLabel"
                   v-if="kpdShowFlag"
                 >
-                  <a-textarea :rows="5" v-decorator="['kpbz']"/>
+                  <a-textarea :placeholder="'请输入'+kpbzLabel" :rows="5" v-decorator="['kpbz']"/>
                   <p style="font-size:12px;height: 20px;color: red;">注：每条{{ kpbzLabel }}间使用回车分割</p>
                 </a-form-item>
               </a-form>
diff --git a/src/views/par/personBasicData/ParPersonBasicData.vue b/src/views/par/personBasicData/ParPersonBasicData.vue
index 34acb7a..ac6ee25 100644
--- a/src/views/par/personBasicData/ParPersonBasicData.vue
+++ b/src/views/par/personBasicData/ParPersonBasicData.vue
@@ -17,7 +17,7 @@
               </a-tooltip>
             </template>
             <div>
-              <a-input-search style="margin-bottom: 8px" placeholder="Search" @change="onChange" />
+              <a-input-search style="margin-bottom: 8px" placeholder="请输入查询内容" @change="onChange" />
               <a-tree
                 @expand="onExpand"
                 :expandedKeys="expandedKeys"
@@ -55,7 +55,7 @@
                   label="数据名称"
                 >
                   <a-input
-                    placeholder="数据名称"
+                    placeholder="请输入数据名称"
                     v-decorator="['name',{rules: [{ required: true, message: '请输入数据名称信息' },{ max:60,message:'长度不能超过60个字'}]}]"/>
                 </a-form-item>
                 <a-form-item
@@ -89,7 +89,7 @@
                   label="考评分数"
                   v-if="itemShowFlag"
                 >
-                  <a-input-number style="width:100%" :min="0" :max="999999" v-decorator="['kpfs',{rules: [{ required: true, message: '请输入考评分数' }]}]" />
+                  <a-input-number placeholder="请输入考评分数" style="width:100%" :min="0" :max="999999" v-decorator="['kpfs',{rules: [{ required: true, message: '请输入考评分数' }]}]" />
                 </a-form-item>
                 <!-- <a-form-item
                   :labelCol="labelCol"
@@ -106,7 +106,7 @@
                   label="考评标准"
                   v-if="itemShowFlag"
                 >
-                  <a-textarea :rows="5" v-decorator="['kpbz']"/>
+                  <a-textarea placeholder="请输入考评标准" :rows="5" v-decorator="['kpbz']"/>
                   <p style="font-size:12px;height: 20px;color: red;">注：每条考评标准间使用回车分割</p>
                 </a-form-item>
               </a-form>
diff --git a/src/views/par/personScoreManage/ParPersonScoreManage.vue b/src/views/par/personScoreManage/ParPersonScoreManage.vue
index 5d13598..c4f5377 100644
--- a/src/views/par/personScoreManage/ParPersonScoreManage.vue
+++ b/src/views/par/personScoreManage/ParPersonScoreManage.vue
@@ -9,7 +9,7 @@
               label="考评名称"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol">
-              <a-input v-model="queryParam.kpmc" allowClear/>
+              <a-input v-model="queryParam.kpmc" placeholder="请输入考评名称" allowClear/>
             </a-form-item>
           </a-col>
           <a-col :span="6" :offset="1">
@@ -17,7 +17,7 @@
               label="单位"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol">
-              <a-select v-model="queryParam.dw">
+              <a-select v-model="queryParam.dw" placeholder="请选择单位">
                 <a-select-option v-for="d in orgList" :value="d.ID" :key="d.ID">
                   {{ d.ORGNAME }}
                 </a-select-option>
@@ -29,7 +29,7 @@
               label="考评人"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol">
-              <a-input v-model="queryParam.kpr" allowClear/>
+              <a-input v-model="queryParam.kpr" placeholder="请输入考评人" allowClear/>
             </a-form-item>
           </a-col>
           <a-col :span="2" :offset="1">
@@ -39,7 +39,7 @@
         <a-row class="form-row" >
           <a-col :span="6" :offset="1">
             <a-form-item
-              label="考评开始时间"
+              label="考评开始日期"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol">
               <a-range-picker
@@ -51,7 +51,7 @@
           </a-col>
           <a-col :span="6" :offset="1">
             <a-form-item
-              label="考评结束时间"
+              label="考评结束日期"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol">
               <a-range-picker
@@ -128,8 +128,8 @@ export default {
       columns: [
         { title: '考评名称', dataIndex: 'kpmc', ellipsis: true },
         { title: '考评计划名称', dataIndex: 'kpjhmc', ellipsis: true },
-        { title: '考评开始时间', dataIndex: 'kssj' },
-        { title: '考评结束时间', dataIndex: 'jssj' },
+        { title: '考评开始日期', dataIndex: 'kssj' },
+        { title: '考评结束日期', dataIndex: 'jssj' },
         { title: '单位', dataIndex: 'dwlx' },
         { title: '考评人', dataIndex: 'kpr', ellipsis: true },
         { title: '检查方式',
diff --git a/src/views/par/personScoreManage/PersonScoreManageAdd.vue b/src/views/par/personScoreManage/PersonScoreManageAdd.vue
index ce5095b..c49e7e8 100644
--- a/src/views/par/personScoreManage/PersonScoreManageAdd.vue
+++ b/src/views/par/personScoreManage/PersonScoreManageAdd.vue
@@ -13,37 +13,47 @@
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评名称" >
         <a-input
           style="width: 360px"
+          placeholder="请输入考评名称"
           v-decorator="['kpmc',{rules: [{ required: true, message: '请选择考评名称信息' },{ max:20,message:'长度不能超过20个字'}]}]"
         />
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评计划" >
-        <a-select v-decorator="['kpjhbid',{rules: [{ required: true, message: '请选择考评计划信息' }]}]" @change="changePlan" style="width:360px">
+        <a-select
+          placeholder="请输入考评计划"
+          v-decorator="['kpjhbid',{rules: [{ required: true, message: '请选择考评计划信息' }]}]"
+          @change="changePlan"
+          style="width:360px">
           <a-select-option v-for="d in planList" :value="d.id" :key="d.id">
             {{ d.kpjhmc }}
           </a-select-option>
         </a-select>
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评人" >
-        <a-select mode="multiple" :maxTagCount="5" v-decorator="['kpr',{rules: [{ required: true, message: '请选择考评人' }]}]" style="width:360px">
+        <a-select
+          placeholder="请选择考评人"
+          mode="multiple"
+          :maxTagCount="5"
+          v-decorator="['kpr',{rules: [{ required: true, message: '请选择考评人' }]}]"
+          style="width:360px">
           <a-select-option v-for="d in userList" :value="d.ID" :key="d.ID">
             {{ d.NAME }}
           </a-select-option>
         </a-select>
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="检查方式" >
-        <a-select placeholder="请选择" v-decorator="['jcfs']" style="width:360px">
+        <a-select placeholder="请选择检查方式" v-decorator="['jcfs']" style="width:360px">
           <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="开始时间" >
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开始日期" >
         <a-date-picker v-decorator="['kssj']" style="width:360px" valueFormat="YYYY-MM-DD" />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结束时间" >
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结束日期" >
         <a-date-picker v-decorator="['jssj']" style="width:360px" valueFormat="YYYY-MM-DD" />
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注" >
-        <a-textarea :rows="5" v-decorator="['bz',{rules: [{ max:500,message:'长度不能超过500个字'}]}]" style="width:360px"/>
+        <a-textarea placeholder="请输入备注" :rows="5" v-decorator="['bz',{rules: [{ max:500,message:'长度不能超过500个字'}]}]" style="width:360px"/>
       </a-form-item>
     </a-form>
   </a-modal>
diff --git a/src/views/par/scoreManage/ParScoreManage.vue b/src/views/par/scoreManage/ParScoreManage.vue
index 1d3215c..5d84b9f 100644
--- a/src/views/par/scoreManage/ParScoreManage.vue
+++ b/src/views/par/scoreManage/ParScoreManage.vue
@@ -9,7 +9,7 @@
               label="考评名称"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol">
-              <a-input v-model="queryParam.kpmc" allowClear/>
+              <a-input v-model="queryParam.kpmc" placeholder="请输入考评名称" allowClear/>
             </a-form-item>
           </a-col>
           <a-col :span="6" :offset="1">
@@ -17,7 +17,7 @@
               label="单位"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol">
-              <a-select v-model="queryParam.kpr">
+              <a-select v-model="queryParam.kpr" placeholder="请选择单位">
                 <a-select-option v-for="d in orgList" :value="d.ID" :key="d.ID">
                   {{ d.ORGNAME }}
                 </a-select-option>
@@ -31,7 +31,7 @@
         <a-row class="form-row" >
           <a-col :span="6" :offset="1">
             <a-form-item
-              label="考评开始时间"
+              label="考评开始日期"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol">
               <a-range-picker
@@ -43,7 +43,7 @@
           </a-col>
           <a-col :span="6" :offset="1">
             <a-form-item
-              label="考评结束时间"
+              label="考评结束日期"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol">
               <a-range-picker
@@ -122,8 +122,8 @@ export default {
       columns: [
         { title: '考评名称', dataIndex: 'kpmc', ellipsis: true },
         { title: '考评计划名称', dataIndex: 'kpjhmc', ellipsis: true },
-        { title: '考评开始时间', dataIndex: 'kssj' },
-        { title: '考评结束时间', dataIndex: 'jssj' },
+        { title: '考评开始日期', dataIndex: 'kssj' },
+        { title: '考评结束日期', dataIndex: 'jssj' },
         { title: '单位', dataIndex: 'kpr', ellipsis: true },
         { title: '检查方式',
           dataIndex: 'jcfs',
diff --git a/src/views/par/scoreManage/ScoreManageAdd.vue b/src/views/par/scoreManage/ScoreManageAdd.vue
index ff6bb56..51e2f2d 100644
--- a/src/views/par/scoreManage/ScoreManageAdd.vue
+++ b/src/views/par/scoreManage/ScoreManageAdd.vue
@@ -13,42 +13,44 @@
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评名称" >
         <a-input
           style="width: 360px"
-          v-decorator="['kpmc',{rules: [{ required: true, message: '请选择考评名称信息' },{ max:20,message:'长度不能超过20个字'}]}]"
+          placeholder="请输入考评名称"
+          v-decorator="['kpmc',{rules: [{ required: true, message: '请输入考评名称信息' },{ max:20,message:'长度不能超过20个字'}]}]"
         />
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评单位" >
         <a-tree-select
-          v-decorator="['kpr',{rules: [{ required: true, message: '请输入考评名称信息' }]}]"
+          v-decorator="['kpr',{rules: [{ required: true, message: '请选择考评单位信息' }]}]"
           style="width: 360px"
           :tree-data="orgTree"
           tree-checkable
           :show-checked-strategy="SHOW_PARENT"
-          search-placeholder="Please select"
+          search-placeholder="请选择考评单位"
+          placeholder="请选择考评单位"
           @change="selectTree"
           :treeCheckStrictly="true"
         />
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评计划" >
-        <a-select v-decorator="['kpjhbid',{rules: [{ required: true, message: '请选择考评计划信息' }]}]" @change="changePlan" style="width:360px">
+        <a-select placeholder="请输入考评计划" v-decorator="['kpjhbid',{rules: [{ required: true, message: '请选择考评计划信息' }]}]" @change="changePlan" style="width:360px">
           <a-select-option v-for="d in planList" :value="d.id" :key="d.id">
             {{ d.kpjhmc }}
           </a-select-option>
         </a-select>
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="检查方式" >
-        <a-select placeholder="请选择" v-decorator="['jcfs']" style="width:360px">
+        <a-select placeholder="请选择检查方式" v-decorator="['jcfs']" style="width:360px">
           <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="开始时间" >
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开始日期" >
         <a-date-picker v-decorator="['kssj']" style="width:360px" valueFormat="YYYY-MM-DD" />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结束时间" >
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结束日期" >
         <a-date-picker v-decorator="['jssj']" style="width:360px" valueFormat="YYYY-MM-DD" />
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注" >
-        <a-textarea :rows="5" v-decorator="['bz',{rules: [{ max:500,message:'长度不能超过500个字'}]}]" style="width:360px"/>
+        <a-textarea placeholder="请输入备注" :rows="5" v-decorator="['bz',{rules: [{ max:500,message:'长度不能超过500个字'}]}]" style="width:360px"/>
       </a-form-item>
     </a-form>
   </a-modal>
@@ -154,6 +156,13 @@ export default {
       this.close()
     },
     selectTree (value, label, extra) {
+      this.form.setFieldsValue({
+        kpjhbid: [],
+        jcfs: [],
+        kssj: null,
+        jssj: null,
+        bz: null
+      })
       if (value.length === 1) {
         const basicTree = [{ children: this.orgTree }]
         const node = this.getNode(value[0].value, basicTree)
-- 
Gitee