From f8b91eb33edb4d9352f39a9f3b34406a76bb42da Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 3 Aug 2020 17:15:05 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90PC=E7=AB=AF=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-08-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../case/typicalcase-add-or-update.vue        | 14 ++++-----
 .../modules/heart/actinfo-add-or-update.vue   |  2 +-
 .../modules/heart/actinfo-detail-view.vue     |  5 ++--
 .../modules/heart/actphrase-add-or-update.vue | 29 ++++++++++++-------
 src/views/modules/heart/actphrase.vue         |  4 +--
 .../modules/heart/actuserclock-detail.vue     |  7 +++--
 src/views/modules/job/schedule.vue            |  6 ++--
 src/views/modules/news/news-publish.vue       | 15 +++++++---
 src/views/modules/news/news.vue               | 17 +++++++++--
 src/views/modules/sys/dict-add-or-update.vue  |  2 +-
 src/views/modules/user/user-detail.vue        |  2 +-
 11 files changed, 66 insertions(+), 37 deletions(-)

diff --git a/src/views/modules/case/typicalcase-add-or-update.vue b/src/views/modules/case/typicalcase-add-or-update.vue
index 6a59bc71..6f838ee9 100644
--- a/src/views/modules/case/typicalcase-add-or-update.vue
+++ b/src/views/modules/case/typicalcase-add-or-update.vue
@@ -7,7 +7,7 @@
                      ref="dataForm"
                      :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
                 <el-row>
-                    <el-form-item label="banner：" v-loading="loading" prop="mainPicture">
+                    <el-form-item label="banner" v-loading="loading" prop="mainPicture">
                         <el-upload class="avatar-uploader"
                                    :action="uploadUrl"
                                    :show-file-list="false"
@@ -25,7 +25,7 @@
                     </el-form-item>
                 </el-row>
                 <el-row>
-                    <el-form-item label="案例标题：" prop="caseTitle">
+                    <el-form-item label="案例标题" prop="caseTitle">
                         <el-input v-model="dataForm.caseTitle" type="text"
                                   maxlength="40"
                                   show-word-limit
@@ -35,7 +35,7 @@
                     </el-form-item>
                 </el-row>
                 <el-row>
-                    <el-form-item label="摘要：" prop="typicalAbstract">
+                    <el-form-item label="摘要" prop="typicalAbstract">
                         <el-input  v-model="dataForm.typicalAbstract" placeholder="文本输入框，限制200字内" type="textarea"
                                    style="width:500px"
                                    maxlength="200"
@@ -44,9 +44,9 @@
                 </el-row>
                 <el-row>
                     <div v-for="(item, index) in dataForm.dynamicItem" :key="index">
-                        <div style="text-align: left">{{"案例"+(index+1)}}</div>
+                        <div style="text-align: left; font-weight: bold; height:40px; font-size:15px;">{{"案例"+(index+1)+"："}}</div>
                         <el-row>
-                            <el-form-item label="案例来源："
+                            <el-form-item label="案例来源"
                                           prop="caseSource">
                                 <el-input v-model="item.caseSource"
                                           :disabled="true"
@@ -59,7 +59,7 @@
                             </el-form-item>
                         </el-row>
                         <el-row>
-                            <el-form-item label="案例类型："prop="associatedType">
+                            <el-form-item label="案例类型" prop="associatedType">
                                 <el-select v-model="item.associatedType" :disabled="true">
                                     <el-option label="议题" value="0"></el-option>
                                     <el-option label="项目" value="1"></el-option>
@@ -68,7 +68,7 @@
                             </el-form-item>
                         </el-row>
                         <el-row>
-                            <el-form-item label="内容描述：" prop="contentDescription">
+                            <el-form-item label="内容描述" prop="contentDescription">
                                 <el-upload ref="upload"
                                            :action="uploadUrl"
                                            id ="quill-upload"
diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue
index 89ac9f20..ebd9f3c2 100644
--- a/src/views/modules/heart/actinfo-add-or-update.vue
+++ b/src/views/modules/heart/actinfo-add-or-update.vue
@@ -246,7 +246,7 @@
         <el-row>
           <el-form-item prop="actContent"
                         label="活动内容：">
-            <div style="width:1000px">
+            <div style="width:700px">
               <!-- 富文本编辑器, 容器 -->
               <div id="J_quillEditor" class="ql-editor"></div>
               <!-- 自定义上传图片功能 (使用element upload组件) -->
diff --git a/src/views/modules/heart/actinfo-detail-view.vue b/src/views/modules/heart/actinfo-detail-view.vue
index 71a3300f..61412bb0 100644
--- a/src/views/modules/heart/actinfo-detail-view.vue
+++ b/src/views/modules/heart/actinfo-detail-view.vue
@@ -131,7 +131,7 @@
         <el-row>
           <el-form-item prop="actContent"
                         label="活动内容：">
-            <div style="border:1px solid  #000000">
+            <div style="border:1px solid  #EDEFF0">
               <p v-html="dataForm.actContent"></p>
             </div>
           </el-form-item>
@@ -148,9 +148,10 @@
         </el-row>
 
         <el-row>
-          <el-form-item label-width="500px" style="margin-left: 300px;">
+          <el-form-item style="padding-left:40px;">
             <el-button size="small"
                        style="width: 95px"
+                       type="primary"
                        @click="back">返回</el-button>
 
           </el-form-item>
diff --git a/src/views/modules/heart/actphrase-add-or-update.vue b/src/views/modules/heart/actphrase-add-or-update.vue
index d08293fb..31632c7b 100644
--- a/src/views/modules/heart/actphrase-add-or-update.vue
+++ b/src/views/modules/heart/actphrase-add-or-update.vue
@@ -2,31 +2,34 @@
   <el-dialog :visible.sync="visible"
              :title="!dataForm.id ? $t('add') : $t('update')"
              :close-on-click-modal="false"
-             :close-on-press-escape="false">
+             :close-on-press-escape="false"
+             customClass="customWidth">
     <el-form :model="dataForm"
              :rules="dataRule"
              ref="dataForm"
              @keyup.enter.native="dataFormSubmitHandle()"
              :label-width="$i18n.locale === 'en-US' ? '120px' : '100px'">
-      <el-form-item label="常用语 :"
+      <el-form-item label="常用语"
                     prop="phrase">
         <el-input v-model="dataForm.phrase"
                   maxlength="500"
-                  show-word-limit
-                  placeholder="常用语"></el-input>
+                  placeholder="请输入常用语"
+                  style="width:95%;"></el-input>
       </el-form-item>
-      <el-form-item label="编码 :"
+      <el-form-item label="编码"
                     prop="code">
         <el-input type="text"
                   oninput="value=value.replace(/[^0-9.]/g,'')"
                   v-model="dataForm.code"
                   maxlength="20"
-                  placeholder="输入数字编码"></el-input>
+                  placeholder="请输入数字编码"
+                  style="width:95%;"></el-input>
       </el-form-item>
-      <el-form-item label="是否显示 :"
+      <el-form-item label="是否显示"
                     prop="showFlag">
         <el-select v-model="dataForm.showFlag"
-                   placeholder="是否显示">
+                   placeholder="是否显示"
+                   style="width:40%;">
           <el-option v-for="item in showFlagArr"
                      :key="item.dictValue"
                      :label="item.dictName"
@@ -35,11 +38,12 @@
         </el-select>
       </el-form-item>
       <el-form-item prop="sort"
-                    label="显示顺序 :">
+                    label="显示顺序">
         <el-input-number v-model="dataForm.sort"
                          controls-position="right"
                          :min="1"
-                         label="显示顺序"></el-input-number>
+                         label="显示顺序"
+                         style="width:40%;"></el-input-number>
       </el-form-item>
       <!-- <el-form-item prop="usageNum" label="使用次数 :">
         <el-input-number v-model="dataForm.usageNum" controls-position="right" :min="0" label="使用次数" disabled="true"></el-input-number>
@@ -169,3 +173,8 @@ export default {
   }
 }
 </script>
+<style lang="scss">
+  .customWidth {
+  width:50%
+  }
+</style>
diff --git a/src/views/modules/heart/actphrase.vue b/src/views/modules/heart/actphrase.vue
index 990ed6e7..86ac6ea0 100644
--- a/src/views/modules/heart/actphrase.vue
+++ b/src/views/modules/heart/actphrase.vue
@@ -64,11 +64,11 @@
                          label="编码"
                          header-align="center"
                          align="center" width="100"></el-table-column>
-        <!-- <el-table-column prop="showFlag"
+        <el-table-column prop="showFlag"
                          label="是否显示"
                          header-align="center"
                          align="center"
-                         :formatter="showFlagFormat" width="50"></el-table-column> -->
+                         :formatter="showFlagFormat" width="50"></el-table-column>
         <el-table-column prop="sort"
                          label="显示顺序"
                          header-align="center"
diff --git a/src/views/modules/heart/actuserclock-detail.vue b/src/views/modules/heart/actuserclock-detail.vue
index 3b96b337..5beb316a 100644
--- a/src/views/modules/heart/actuserclock-detail.vue
+++ b/src/views/modules/heart/actuserclock-detail.vue
@@ -2,11 +2,12 @@
   <div class="project-handle" style="background: #ffffff;">
     <div class="project-detail">
       <div v-if="dataForm.oldStatus=='1' || dataForm.oldStatus=='2'">
-        <div class="project-detail-tip">处理操作 :</div>
+        <div class="project-detail-tip">处理操作</div>
         <el-form
           ref="dataForm"
           :model="dataForm"
           :rules="dataRule"
+          style="width:100%"
           @keyup.enter.native="dataFormSubmitHandle()"
         >
           <el-form-item label="是否加积分 :" prop="ratiod">
@@ -18,11 +19,11 @@
               :rows="4"
               v-model="dataForm.failureReason"
               type="textarea"
-              style="width: 560px"
+              style="width: 95% !important"
               placeholder="请写明理由，100字以内"
             ></el-input>
           </el-form-item>
-          <el-form-item style="float: right;">
+          <el-form-item style="float: right;padding-right:5%">
             <el-button
               size="small"
               style="width: 95px"
diff --git a/src/views/modules/job/schedule.vue b/src/views/modules/job/schedule.vue
index 9c647ed7..2cdb0f57 100644
--- a/src/views/modules/job/schedule.vue
+++ b/src/views/modules/job/schedule.vue
@@ -104,7 +104,7 @@ export default {
     pauseHandle (id) {
       if (!id && this.dataListSelections.length <= 0) {
         return this.$message({
-          message: this.$t('prompt.deleteBatch'),
+          message: this.$t('prompt.selectBatch'),
           type: 'warning',
           duration: 500
         })
@@ -137,7 +137,7 @@ export default {
     resumeHandle (id) {
       if (!id && this.dataListSelections.length <= 0) {
         return this.$message({
-          message: this.$t('prompt.deleteBatch'),
+          message: this.$t('prompt.selectBatch'),
           type: 'warning',
           duration: 500
         })
@@ -166,7 +166,7 @@ export default {
     runHandle (id) {
       if (!id && this.dataListSelections.length <= 0) {
         return this.$message({
-          message: this.$t('prompt.deleteBatch'),
+          message: this.$t('prompt.selectBatch'),
           type: 'warning',
           duration: 500
         })
diff --git a/src/views/modules/news/news-publish.vue b/src/views/modules/news/news-publish.vue
index 84493ada..f3d3d49c 100644
--- a/src/views/modules/news/news-publish.vue
+++ b/src/views/modules/news/news-publish.vue
@@ -73,7 +73,7 @@
                       show-word-limit
                       placeholder="请输入标题"
                       clearable
-                      style="width:500px">
+                      style="width:450px">
             </el-input>
           </el-form-item>
         </el-row>
@@ -130,9 +130,9 @@
         <el-row>
           <el-form-item label-width="500px">
             <el-button type="primary"
-                       @click="dataFormSubmitHandle()">确认发布</el-button>
+                       @click="dataFormSubmitHandle()" :disabled="isAble">确认发布</el-button>
             <el-button type="primary"
-                       @click="draftDataFormSubmitHandle()">存草稿箱</el-button>
+                       @click="draftDataFormSubmitHandle()" :disabled="isAble">存草稿箱</el-button>
           </el-form-item>
         </el-row>
       </el-form>
@@ -191,7 +191,8 @@ export default {
       ],
       uploadUrl: '',
       // 富文本end
-      fileList: []
+      fileList: [],
+      isAble: false
     }
   },
   activated () {
@@ -360,8 +361,10 @@ export default {
         if (!valid) {
           return false
         }
+        this.isAble = true
         this.$http['post']('/news/news/publish', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
+            this.isAble = false
             return this.$message.error(res.msg)
           }
           this.$message({
@@ -388,6 +391,7 @@ export default {
               this.quillEditor.root.innerHTML = ''
               this.dataForm.communityId = this.dataForm.streetId = this.dataForm.gridId = null
               this.communityList = this.gridList = []
+              this.isAble = false
             }
           })
         }).catch(() => { })
@@ -402,8 +406,10 @@ export default {
         if (!valid) {
           return false
         }
+        this.isAble = true
         this.$http['post']('/news/news/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
+            this.isAble = false
             return this.$message.error(res.msg)
           }
           this.$message({
@@ -430,6 +436,7 @@ export default {
               this.quillEditor.root.innerHTML = ''
               this.dataForm.communityId = this.dataForm.streetId = this.dataForm.gridId = null
               this.communityList = this.gridList = []
+              this.isAble = false
             }
           })
         }).catch(() => { })
diff --git a/src/views/modules/news/news.vue b/src/views/modules/news/news.vue
index b32a29b6..b5007575 100644
--- a/src/views/modules/news/news.vue
+++ b/src/views/modules/news/news.vue
@@ -151,10 +151,10 @@
                                  min-width="200"
                                  header-align="center"
                                  align="center"></el-table-column>
-                <el-table-column label="有效时间" width="360" header-align="center" align="center">
-                    <template slot-scope="scope">
+                <el-table-column label="有效时间" width="220" header-align="center" align="center" :formatter="showFlagFormat">
+                    <!-- <template slot-scope="scope">
                         {{scope.row.newsReleaseStartTime}} 到 {{scope.row.newsReleaseEndTime}}
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column label="发布状态"
                                  :formatter="publishState"
@@ -276,6 +276,17 @@
             this.getListCategory()
         },
         methods: {
+            showFlagFormat (row, column) {
+                var newsReleaseStartTime = row.newsReleaseStartTime
+                var newsReleaseEndTime = row.newsReleaseEndTime
+                if (row.newsReleaseStartTime.length > 10 && row.newsReleaseStartTime.indexOf(' ') >= 0) {
+                    newsReleaseStartTime = row.newsReleaseStartTime.substr(0,row.newsReleaseStartTime.indexOf(' '))
+                }
+                if (row.newsReleaseEndTime.length > 10 && row.newsReleaseEndTime.indexOf(' ') >= 0) {
+                    newsReleaseEndTime = row.newsReleaseEndTime.substr(0,row.newsReleaseEndTime.indexOf(' '))
+                }
+                return newsReleaseStartTime + ' 到 ' + newsReleaseEndTime
+            },
             newsUpDownState: function (row) {
                 return row.newsUpDownState === '1' ? '下线' : '上线'
             },
diff --git a/src/views/modules/sys/dict-add-or-update.vue b/src/views/modules/sys/dict-add-or-update.vue
index 45fb584b..ead1f217 100644
--- a/src/views/modules/sys/dict-add-or-update.vue
+++ b/src/views/modules/sys/dict-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="70px">
       <el-form-item prop="dictName" :label="$t('dict.dictName')">
         <el-input v-model="dataForm.dictName"
                   maxlength="50"
diff --git a/src/views/modules/user/user-detail.vue b/src/views/modules/user/user-detail.vue
index 8c5ced90..ce8e6cab 100644
--- a/src/views/modules/user/user-detail.vue
+++ b/src/views/modules/user/user-detail.vue
@@ -66,7 +66,7 @@
                            label="主键" v-if="false">
           </el-table-column>
           <el-table-column prop="allDeptNames"
-                           label="街道-社区-网格" align="center" min-width="200">
+                           label="街道-社区-网格" align="center" min-width="200" show-overflow-tooltip>
           </el-table-column>
           <el-table-column prop="grid"
                            label="网格名称" v-if="false">