优化

src/point/view/integral/approval_process.vue

@@ -22,11 +22,11 @@
         <span class="green" v-else>{{ item.review_point || '' }}</span>
       </template>
       <template slot="label">
-        <span class="datetime">{{ item.time }}</span>
+        <span class="datetime" v-if="item.time">{{ item.time }}</span>
         <van-cell title="姓名" :value="item.name" />
-        <van-cell title="申请分值" :value="item.point ? item.point : ''" />
-        <van-cell title="发放奖票" :value="item.ticket_count ? '是': '否'" v-if="i > 0" />
-        <van-cell title="审批分值" :value="item.review_point ? item.review_point : ''" v-if="item.remark !== '发起'" />
+        <van-cell title="申请分值" v-if="item.point" :value="item.point ? item.point : ''" />
+        <van-cell title="发放奖票" v-if="i > 0" :value="item.ticket_count ? '是': '否'"  />
+        <van-cell title="审批分值" v-if="item.remark !== '发起' && item.review_point" :value="item.review_point ? item.review_point : ''"  />
         <van-cell title="备注" :value="item.review_remark" v-if="item.review_remark" />
       </template>
     </van-cell>

src/point/view/integral/deptRank.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mrd-container">
     <van-nav-bar title="部门排名" left-text="返回" @click-left="$route_back" left-arrow />
-    <van-dropdown-menu>
+    <van-dropdown-menu v-if="showSearchBar">
 <!--  A/B分    -->
       <van-dropdown-item :title="timeScopeText" @open="calendarOpen"></van-dropdown-item>
       <van-dropdown-item :title="searchForm.deptName" ref="deptDropdownItem"><DeptSelectorDropdown @onConfirm="onConfirmDept" /></van-dropdown-item>
@@ -9,7 +9,7 @@
       <van-dropdown-item>
         <van-icon name="list-switch" slot="title" size="1.5em" />
         <template slot="default">
-          <van-cell center title="积分分类">
+          <van-cell center title="积分类型">
             <template #right-icon>
               <van-radio-group v-model="searchForm.ptId" direction="horizontal">
                 <van-radio v-for="pt in pts" :key="pt.value" :name="pt.value">{{pt.text}}</van-radio>
@@ -31,6 +31,7 @@
         :on-refresh="onRefresh"
       >
         <van-cell v-for="item in dataList" :key="item.id" :title="item.name" :value="item.point"/>
+        <noData :list="dataList" />
 
       </scroller>
     </div>
@@ -106,7 +107,8 @@ export default {
       showCalendar:false,
       minDate:minDate,
       maxDate:maxDate,
-      timeScope:[new Date(startDate),new Date(endDate)]
+      timeScope:[new Date(startDate),new Date(endDate)],
+      showSearchBar:!this.$supremeAuthority('employee')
     }
   },
   computed:{
@@ -222,9 +224,9 @@ export default {
   background-color: white;
 
   & .mrd-content {
-    margin-top: 20px;
+    margin-top: 0.2rem;
     position: relative;
-    height: calc(100%);
+    height: calc(100% - 2.1rem);
   }
 
 }

src/point/view/integral/event_list.vue

@@ -114,7 +114,7 @@ export default {
     },
     pointTypeDropdownItemTitle() {
       if (this.pointType === -1) {
-        return '积分分类';
+        return '积分类型';
       }
       return this.pointTypeOption.find(a => a.value === this.pointType).text;
     },

src/point/view/integral/reward_deduction_search.vue

@@ -55,7 +55,7 @@
       :close-on-click-overlay="true"
       @confirm="searchForm.keyword = keyword"
     >
-      <van-field label="姓名" placeholder="请数去用户名" v-model="keyword"></van-field>
+      <van-field label="姓名" placeholder="搜索姓名" v-model="keyword"></van-field>
     </van-dialog>
 <!--  日期区间选择  -->
     <van-calendar
@@ -222,7 +222,7 @@ export default {
 
   & .mrd-content {
     position: relative;
-    height: calc(100% - 4.6rem);
+    height: calc(100% - 5rem);
   }
 
   & .mrd-list__item {

src/point/view/pointHome.vue

@@ -41,20 +41,19 @@
           </div>
         </div>
         <van-grid :border="false" style="background-color: #fff;position: relative;" class="border-bottom">
+          <van-grid-item v-for="(app, app_index) in topMenuList" :dot="app.dot" :badge="app.badge" :key="app.code" @click="openUrl(4,app)" :text="app.code">
+            <template slot="icon">
+              <img :src="app.icon" style="-webkit-touch-callout: none;" />
+            </template>
+          </van-grid-item>
           <van-grid-item @click="goDeptRank">
             <template #text>
               <van-loading v-if="!deptRank" type="spinner" size="10px"/>
-              <span class="van-grid-item__text" v-else>部门排名</span>
+              <span class="van-grid-item__text" v-else>部门对比</span>
             </template>
             <template #icon>
               <img src="static/images/daiban.png" style="-webkit-touch-callout: none;"/>
             </template>
-
-          </van-grid-item>
-          <van-grid-item v-for="(app, app_index) in topMenuList" :dot="app.dot" :badge="app.badge" :key="app.code" @click="openUrl(4,app)" :text="app.code">
-            <template slot="icon">
-              <img :src="app.icon" style="-webkit-touch-callout: none;" />
-            </template>
           </van-grid-item>
 
           <van-grid-item v-for="(app, app_index) in common_menu" :key="app_index" @click="url_jump(app)" :icon="app.icon" :text="app.code">