Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/timesheet/src/views/contract/components/contractManagement.vue

@@ -6,7 +6,7 @@
         <!-- 合同编号/名称 -->
         <el-form-item>
           <div style="display: flex;align-items: center;height: 40px;">
-            <el-input v-model="keyword" class="input-with-select" @keyup.enter.native="searchFilter" :placeholder="keyword == 1 ? $t('qing-shu-ru-he-tong-bian-hao') : $t('qing-shu-ru-he-tong-ming-cheng')" clearable size="small">
+            <el-input v-model="keyword" class="input-with-select" @keyup.enter.native="searchFilter" :placeholder="searchField == 1 ? $t('qing-shu-ru-he-tong-bian-hao') : $t('qing-shu-ru-he-tong-ming-cheng')" clearable size="small">
               <el-select slot="prepend" v-model="searchField" :placeholder="$t('defaultText.pleaseChoose')" style="width:120px">
                 <el-option :label="$t('he-tong-ming-cheng')" :value="0"></el-option>
                 <el-option :label="$t('contractno')" :value="1"></el-option>

fhKeeper/formulahousekeeper/timesheet/src/views/contract/components/customContract.vue

@@ -6,7 +6,7 @@
         <!-- 合同编号/名称 -->
         <el-form-item>
           <div style="display: flex;align-items: center;height: 40px;">
-            <el-input v-model="keyword" class="input-with-select" @keyup.enter.native="searchFilter" :placeholder="keyword == 1 ? $t('qing-shu-ru-he-tong-bian-hao') : $t('qing-shu-ru-he-tong-ming-cheng')" clearable size="small">
+            <el-input v-model="keyword" class="input-with-select" @keyup.enter.native="searchFilter" :placeholder="searchField == 1 ? $t('qing-shu-ru-he-tong-bian-hao') : $t('qing-shu-ru-he-tong-ming-cheng')" clearable size="small">
               <el-select slot="prepend" v-model="searchField" :placeholder="$t('defaultText.pleaseChoose')" style="width:120px">
                 <el-option :label="$t('he-tong-ming-cheng')" :value="0"></el-option>
                 <el-option :label="$t('contractno')" :value="1"></el-option>

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/css/knowledgeField.css

@@ -175,8 +175,8 @@
   position: absolute;
   font-size: 0.875rem;
   color: #7b7b7b;
-  top: 0;
-  right: 0;
+  top: 1.75rem;
+  right: 1.875rem;
 }
 .knowledgeFieldCon .knowledgeDetails .knowledgeDetails-left .knowledgeDetails-left-con {
   padding: 0 1.875rem 0.9375rem 1.875rem;
@@ -286,6 +286,8 @@
 }
 .knowledgeFieldCon .knowledgeDetails .knowledgeDetails-right .latestList a {
   margin-bottom: 1rem;
+  display: inline-block;
+  width: 100%;
 }
 .knowledgeFieldCon .knowledgeDetails .knowledgeDetails-right .latestList a:last-child {
   margin-bottom: 0;

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/css/knowledgeField.less

@@ -180,8 +180,8 @@
           position: absolute;
           font-size: .875rem;
           color: #7b7b7b;
-          top: 0;
-          right: 0;
+          top: 1.75rem;
+          right: 1.875rem;
         }
       }
 
@@ -302,6 +302,8 @@
         width: 100%;
         a {
           margin-bottom: 1rem;
+          display: inline-block;
+          width: 100%;
           &:last-child {
             margin-bottom: 0;
           }

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/knowledge.ftl

@@ -54,7 +54,7 @@
                     <p>${ item.profile }</p>
                     <div class="textContentUnderstand">
                       <div class="textContentUnderstandText">发布于：${item.createTimeStr}</div>
-                      <div class="textContentUnderstandText">预览量：${item.viewCount}</div>
+                      <p class="textContentUnderstandText">预览量：${item.viewCount}</p>
                       <!-- <button class="linkButtonss" onclick="learnMore(${item.id})">了解详情></button> -->
                       <a class="linkButtonss" href="/articleTemplate/articleDetail?id=${item.id}">查看详情></a>
                     </div>