Merge branch 'feature/style' of http://121.42.41.42:7070/r/esua-epdc-admin into feature/style

src/views/modules/analysis/item/item-detail-view.vue

@@ -109,8 +109,8 @@
       <el-dialog width="90%" title="评论" :visible.sync="innerVisible" append-to-body>
           <el-table :data="commentsDTOs" border style="width: 100%;">
               <el-table-column prop="user.userName" label="发言人" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="commentTime" label="发言时间" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="commentTime" label="发言时间" header-align="center" align="center" width="180"></el-table-column>
-              <el-table-column prop="content" label="发言内容" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="content" label="发言内容" header-align="center" align="center" min-width="200" show-overflow-tooltip ></el-table-column>
               <el-table-column prop="replyComment.userName" label="被回复人" header-align="center" align="center"></el-table-column>
               <el-table-column prop="replyComment.content" label="被回复内容" header-align="center" align="center"></el-table-column>
               <el-table-column :label="$t('handle')" header-align="center" align="center" width="150" v-if="false">
@@ -433,4 +433,8 @@ export default {
             float:left;
         }
     }
+    .el-pagination{
+      margin-top: 10px;
+      text-align: right;
+    }
 </style>

src/views/modules/custom/gridoperatorinfo-add-or-update.vue

@@ -8,14 +8,14 @@
              ref="dataForm"
              :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item label="姓名"
-                    prop="realName">
+                    prop="realName" style="width:300px">
         <el-input v-model="dataForm.realName"
                   placeholder="姓名" maxlength="10"></el-input>
       </el-form-item>
       <el-form-item label="性别"
                     prop="sex">
         <el-select v-model="dataForm.sex"
-                   placeholder="性别">
+                   placeholder="性别" style="width:220px">
           <el-option v-for="item in sexFlagArr"
                      :key="item.dictValue"
                      :label="item.dictName"
@@ -24,12 +24,12 @@
         </el-select>
       </el-form-item>
       <el-form-item label="身份证号"
-                    prop="identityNo">
+                    prop="identityNo" style="width:300px">
         <el-input v-model="dataForm.identityNo"
                   placeholder="身份证号"></el-input>
       </el-form-item>
       <el-form-item label="联系电话"
-                    prop="mobile">
+                    prop="mobile" style="width:300px">
         <el-input v-model="dataForm.mobile"
                   placeholder="联系电话"></el-input>
       </el-form-item>
@@ -40,7 +40,7 @@
                      :options="options"
                      :props="{ multiple: true }"
                      filterable
-                     collapse-tags></el-cascader>
+                     collapse-tags style="width:220px"></el-cascader>
       </el-form-item>
       <el-form-item label="所属机构"
                     v-if="dataForm.id">
@@ -50,7 +50,7 @@
                     prop="dutyCategoryId">
         <el-select v-model="dataForm.dutyCategoryId"
                    @change="changeCaterory"
-                   placeholder="请选择网络职责">
+                   placeholder="请选择网络职责" style="width:220px">
           <el-option v-for="item in dutyCategorys"
                      :key="item.id"
                      :label="item.dutyCategoryName"
@@ -63,7 +63,7 @@
         <el-input-number v-model="dataForm.sort"
                          controls-position="right"
                          :min="0"
-                         :label="$t('dict.sort')"></el-input-number>
+                         :label="$t('dict.sort')" style="width:220px"></el-input-number>
       </el-form-item>
       <el-form-item label="工作单位"
                     prop="workUnit">

src/views/modules/events/category-add-or-update.vue

@@ -4,9 +4,6 @@
       <el-form-item prop="categoryName" label="分类名称">
         <el-input v-model="dataForm.categoryName" placeholder="分类名称" maxlength="500"></el-input>
       </el-form-item>
-      <el-form-item prop="categoryCode" label="分类编码">
-        <el-input v-model="dataForm.categoryCode" placeholder="分类编码" maxlength="50"></el-input>
-      </el-form-item>
       <el-form-item prop="parentName" label="上级分类" class="category-list">
         <el-popover v-model="categoryListVisible" ref="categoryListPopover" placement="bottom-start" trigger="click">
           <el-tree :data="categoryList"
@@ -23,14 +20,17 @@
           <i v-if="dataForm.pid !== '0'" slot="suffix" @click.stop="categoryListTreeSetDefaultHandle()" class="el-icon-circle-close el-input__icon"></i>
         </el-input>
       </el-form-item>
+      <el-form-item prop="categoryCode" label="分类编码">
+        <el-input v-model="dataForm.categoryCode" placeholder="分类编码" maxlength="50" style="width:200px"></el-input>
+      </el-form-item>
       <el-form-item label="分类类型" prop="categoryType">
-        <el-select v-model="dataForm.categoryType" @change="changeOrgType" placeholder="分类类型">
+        <el-select v-model="dataForm.categoryType" @change="changeOrgType" placeholder="分类类型" style="width:200px">
           <el-option v-for="item in secondOrgDictList" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item prop="sort" label="排序">
-        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" label="排序"></el-input-number>
+        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" label="排序" style="width:200px"></el-input-number>
       </el-form-item>
     </el-form>
     <template slot="footer">

src/views/modules/heart/actinfo-add-or-update.vue

@@ -195,6 +195,7 @@
                         prop="contacts">
             <el-input v-model="dataForm.contacts"
                       maxlength="5"
+                      placeholder="请输入联系人"
                       style="width:150px"></el-input>
           </el-form-item>
         </el-row>
@@ -203,6 +204,7 @@
                         prop="tel" >
             <el-input v-model="dataForm.tel"
                       maxlength="20"
+                      placeholder="请输入联系电话"
                       style="width:200px"></el-input>
           </el-form-item>
         </el-row>
@@ -295,7 +297,7 @@
             </el-upload>
           </el-form-item>
         </el-row>
-        <el-row>
+        <el-row style="text-align:center">
           <el-form-item label-width="500px">
             <el-button type="primary"
                        :disabled="isAble"

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="70px">
           <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="70px">
           <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="70px">
           <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="70px">
           <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="90px">
           <el-date-picker v-model="dataForm.year"
               type="year" clearable placeholder="选择年"
               value-format="yyyy"  format="yyyy"
@@ -32,7 +32,7 @@
               </el-option>
             </el-select>
         </el-form-item>
-        <el-form-item label="加分级别" prop="bonusLevel" label-width="110px">
+        <el-form-item label="加分级别" prop="bonusLevel" label-width="90px">
             <el-select v-model="dataForm.bonusLevel" placeholder="加分级别" clearable style="width:250px;">
               <el-option v-for="item in bonusLevelArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
               </el-option>

src/views/modules/master/masteruserrelation-add.vue

@@ -11,7 +11,7 @@
         <el-form :inline="true" :rules="dataRule" ref="item" :model="item" >
           <div style="text-align: left;">{{"书记"+(index+1)+":"}}</div>
           <el-row>
-              <el-form-item label="选择书记：" prop="deptName">
+              <el-form-item label="选择书记" prop="deptName" label-width="80px">
                   <el-input v-model="item.deptName"
                             :disabled="true"
                             type="text"
@@ -26,7 +26,7 @@
                   </el-input> &emsp;
                   <el-button @click="selectUserMethod(index)">{{"选择书记"}}</el-button>&emsp;&emsp;
               </el-form-item>
-              <el-form-item label="群内昵称：" prop="nickName">
+              <el-form-item label="群内昵称" prop="nickName" label-width="80px">
                   <el-input v-model="item.nickName"
                             type="text"
                             style="width: 30rem;"

src/views/modules/message/mail-template-add-or-update.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="60px">
       <el-form-item prop="name" :label="$t('mail.name')">
         <el-input v-model="dataForm.name" :placeholder="$t('mail.name')" maxlength="100"></el-input>
       </el-form-item>

src/views/modules/news/banner-add-or-update.vue

@@ -6,24 +6,21 @@
     <el-form :model="dataForm"
              :rules="dataRule"
              ref="dataForm"
-             @keyup.enter.native="dataFormSubmitHandle()"
              :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item label="链接地址"
                     v-if="dataForm.newsFlag !== '1'"
-                    prop="url">
+                    prop="url" label-width="100px">
         <el-input v-model="dataForm.url"
                   maxlength="1000"
-                  show-word-limit
                   placeholder="链接地址"></el-input>
       </el-form-item>
       <el-form-item label="标题"
-                    prop="title">
+                    prop="title" label-width="100px">
         <el-input v-model="dataForm.title"
                   maxlength="50"
-                  show-word-limit
                   placeholder="标题"></el-input>
       </el-form-item>
-      <el-form-item label="所属机构">
+      <el-form-item label="所属机构" label-width="100px">
         <el-cascader v-model="dataForm.allDeptIdsShow"
                      :options="options"
                      :props="{ multiple: true }"
@@ -65,7 +62,7 @@
         </el-select>
       </el-form-item>-->
       <el-form-item label="banner类型"
-                    prop="bannerType">
+                    prop="bannerType" label-width="100px">
         <el-select v-model="dataForm.bannerType"
                    placeholder="请选择">
           <el-option v-for="item in bannerOptions"
@@ -76,7 +73,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="banner位置"
-                    prop="position">
+                    prop="position" label-width="100px">
         <el-select v-model="dataForm.position"
                    placeholder="请选择">
           <el-option v-for="item in positionList"
@@ -88,7 +85,7 @@
       </el-form-item>
       <el-form-item label="banner图片"
                     v-loading="loading"
-                    prop="imgUrl">
+                    prop="imgUrl" label-width="100px">
         <el-upload class="avatar-uploader"
                    :action="this.uploadUrl"
                    :show-file-list="false"

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/newscategory-add-or-update.vue

@@ -10,17 +10,17 @@
       <el-form-item label="类别名称"
                     prop="categoryName">
         <el-input v-model="dataForm.categoryName"
-                  placeholder="类别名称"></el-input>
+                  placeholder="类别名称" maxlength="128"></el-input>
       </el-form-item>
       <el-form-item label="类别编码"
                     prop="categoryCode">
         <el-input v-model="dataForm.categoryCode"
-                  placeholder="类别编码"></el-input>
+                  placeholder="类别编码"  maxlength="32"></el-input>
       </el-form-item>
       <el-form-item label="描述"
                     prop="description">
         <el-input v-model="dataForm.description"
-                  placeholder="描述"></el-input>
+                  placeholder="描述" maxlength="128"></el-input>
       </el-form-item>
       <el-form-item label="排序"
                     prop="sort">

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/sys/analysis-menu-add-or-update.vue

@@ -94,6 +94,7 @@
           controls-position="right"
           :min="0"
           :label="$t('menu.sort')"
+          style="width:200px"
         ></el-input-number>
       </el-form-item>
       <el-form-item

src/views/modules/sys/dept-add-or-update.vue

@@ -66,7 +66,8 @@
         <el-input-number v-model="dataForm.sort"
                          controls-position="right"
                          :min="0"
-                         :label="$t('dept.sort')"></el-input-number>
+                         :label="$t('dept.sort')"
+                         style="width:200px"></el-input-number>
       </el-form-item>
     </el-form>
     <template slot="footer">

src/views/modules/sys/params-add-or-update.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm"  label-width="120px">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm"  label-width="60px">
       <el-form-item prop="paramCode" :label="$t('params.paramCode')">
         <el-input v-model="dataForm.paramCode"
                   maxlength="30"

src/views/modules/sys/totalconfig-add-or-update.vue

@@ -14,7 +14,7 @@
                     placeholder="统计类型（自定义）"></el-input>
         </el-form-item>
         <el-form-item label="统计方式" prop="totalStyle">
-            <el-select v-model="dataForm.totalStyle" placeholder="统计方式" clearable>
+            <el-select v-model="dataForm.totalStyle" placeholder="统计方式" clearable style="width:200px">
                 <el-option label="其他" :value="0"></el-option>
                 <el-option label="统计次数" :value="1"></el-option>
                 <el-option label="统计人数" :value="2"></el-option>
@@ -32,6 +32,7 @@
                     controls-position="right"
                     :min="0"
                     label="排序"
+                    style="width:200px"
             ></el-input-number>
         </el-form-item>
         <el-form-item prop="autoFlag"

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>