【pc端 - 优化bug】-【bug修改】-（魏凯）-2020/08/03

src/views/modules/kpi/kpicommunitybuilding.vue

@@ -13,7 +13,7 @@
             ></el-cascader>
           </el-form-item>
         </el-form-item>
-        <el-form-item label="考核周期起始月" label-width="120px">
+        <el-form-item label="考核年月" label-width="120px">
           <el-date-picker v-model="dataForm.monthYear"
               type="month" clearable placeholder="选择月"
               value-format="yyyy-MM"  format="yyyy-MM">
@@ -57,8 +57,8 @@
             </template>
         </el-table-column>
         <el-table-column prop="deptName" label="部门" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="monthYear" label="年月" header-align="center" align="center" width="180"></el-table-column>
         <el-table-column prop="deptTypeKey" label="部门类型" header-align="center" align="center" :formatter = "stateFormat" width="120"></el-table-column>
+        <el-table-column prop="monthYear" label="年月" header-align="center" align="center" width="180"></el-table-column>
         <el-table-column prop="democraticConsultationMechanism" label="民主协商机制分数" header-align="center" align="center" width="140"></el-table-column>
         <el-table-column prop="residentConventionSystem" label="居民公约制度分数" header-align="center" align="center" width="140"></el-table-column>
         <el-table-column prop="gridNegotiationCase" label="网格协商案例分数" header-align="center" align="center" width="140"></el-table-column>

src/views/modules/kpi/kpigridentity.vue

@@ -13,7 +13,7 @@
             ></el-cascader>
           </el-form-item>
         </el-form-item>
-        <el-form-item label="考核周期起始月" label-width="120px">
+        <el-form-item label="考核年月" label-width="120px">
           <el-date-picker v-model="dataForm.monthYear"
               type="month" clearable placeholder="选择月"
               value-format="yyyy-MM"  format="yyyy-MM">

src/views/modules/kpi/kpimassevaluation.vue

@@ -13,7 +13,7 @@
             ></el-cascader>
           </el-form-item>
         </el-form-item>
-        <el-form-item label="考核周期起始年">
+        <el-form-item label="考核年月">
           <el-date-picker v-model="dataForm.year"
               type="year" clearable placeholder="选择年"
               value-format="yyyy"  format="yyyy">
@@ -57,8 +57,8 @@
             </template>
         </el-table-column>
         <el-table-column prop="deptName" label="部门名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="year" label="年份" header-align="center" align="center"></el-table-column>
         <el-table-column prop="deptTypeKey" label="部门类型" header-align="center" align="center" :formatter = "stateFormat"></el-table-column>
+        <el-table-column prop="year" label="年份" header-align="center" align="center"></el-table-column>
         <el-table-column prop="satisfied" label="满意分数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="basicSatisfaction" label="基本满意分数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="dissatisfied" label="不满意分数" header-align="center" align="center"></el-table-column>

src/views/modules/kpi/kpimattersresponse.vue

@@ -13,7 +13,7 @@
             ></el-cascader>
           </el-form-item>
         </el-form-item>
-        <el-form-item label="考核周期起始月" label-width="120px">
+        <el-form-item label="考核年月" label-width="120px">
           <el-date-picker v-model="dataForm.monthYear"
               type="month" clearable placeholder="选择月"
               value-format="yyyy-MM"  format="yyyy-MM">

src/views/modules/kpi/kpipublicopinion.vue

@@ -13,7 +13,7 @@
             ></el-cascader>
           </el-form-item>
         </el-form-item>
-        <el-form-item label="考核周期起始月" label-width="120px">
+        <el-form-item label="考核年月" label-width="120px">
           <el-date-picker v-model="dataForm.monthYear"
               type="month" clearable placeholder="选择月"
               value-format="yyyy-MM"  format="yyyy-MM">

src/views/modules/kpi/kpitypicalculture.vue

@@ -13,7 +13,7 @@
             style="width:250px;"
           ></el-cascader>
         </el-form-item>
-        <el-form-item label="考核周期起始年" label-width="110px">
+        <el-form-item label="考核年月" label-width="110px">
           <el-date-picker v-model="dataForm.year"
               type="year" clearable placeholder="选择年"
               value-format="yyyy"  format="yyyy"

src/views/modules/news/news-publish.vue

@@ -55,6 +55,7 @@
                         prop="newsCateroryId">
             <el-select v-model="dataForm.newsCateroryId"
                        @change="changeCaterory"
+                       clearable
                        placeholder="请选择类别">
               <el-option v-for="item in categorys"
                          :key="item.id"

src/views/modules/news/newsdraft.vue

@@ -343,6 +343,14 @@ export default {
           return this.$message.error(res.msg)
         }
         this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data
+        if (this.dataList.length>0){
+          this.dataList.forEach(item=>{
+            let a =  item.newsReleaseStartTime.substring(0,item.newsReleaseStartTime.indexOf(" "));
+            let b = item.newsReleaseEndTime.substring(0,item.newsReleaseEndTime.indexOf(" "));
+            item.newsReleaseStartTime = a
+            item.newsReleaseEndTime = b
+          })
+        }
         this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
       }).catch(() => {
         this.dataListLoading = false
@@ -352,7 +360,8 @@ export default {
     btKeyUpkeyword(e){
       e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
       this.dataForm.keyword = e.target.value
-    }
+    },
+
   },
   components: {
     AddOrUpdate

src/views/modules/organize/sysdeptmanagement.vue

@@ -18,7 +18,7 @@
             {{scope.$index+1}}
           </template>
         </el-table-column>
-        <table-tree-column prop="name" :label="$t('dept.name')" header-align="center"></table-tree-column>
+        <table-tree-column prop="name" label="组织架构名称" header-align="center"></table-tree-column>
         <el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center"></el-table-column>
         <el-table-column prop="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">

src/views/modules/user/usertag-add-or-update.vue

@@ -25,7 +25,6 @@
                     prop="tagDesc">
         <el-input v-model="dataForm.tagDesc"
                   maxlength="100"
-                  show-word-limit
                   placeholder="标签描述"></el-input>
       </el-form-item>
     </el-form>