优化

src/components/AppealInfo.vue

@@ -681,6 +681,8 @@ export default {
       font-size: 0.25rem;
       line-height: 0.5rem;
       color: #909399;
+      text-align: left;
+      margin-left: 0.3rem;
     }
 
     & .card-content1{
@@ -688,6 +690,7 @@ export default {
       line-height: 0.25rem;
       color: #909399;
       text-align: left;
+
     }
 
   }

src/point/view/integral/appealList.vue

@@ -83,9 +83,9 @@ export default {
       userInfo:this.$userInfo(),
       currentTab:'waiting',
       tabs:[
-        {name:'waiting',title:'待处理'},
-        {name:'my',title:'我的'},
-        {name:'join',title:'参与'},
+        {name:'waiting',title:'待处理列表'},
+        {name:'my',title:'申诉列表'},
+        {name:'join',title:'参与列表'},
       ],
       searchForm:{
         status: 3,

src/point/view/integral/approval_detail.vue

@@ -3,6 +3,16 @@
     <van-nav-bar :title="title" :left-text="isHome? '首页':'返回'" @click-left="routeBack" left-arrow></van-nav-bar>
     <div class="body_com" :class="{ can_complete: detail_info.can_complete == 1}">
       <scroller>
+        <van-collapse
+          v-model="activeNames"
+        >
+          <van-collapse-item v-if="detail_info && detail_info.logs && detail_info.logs.length > 0" :title="detail_info.logs.length + '条操作日志'" name="logs">
+            <div v-for="(item,index) in detail_info.logs" :key="index" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
+              <van-tag type="primary" size="medium">{{item.create_time}}</van-tag>
+              {{item.msg}}
+            </div>
+          </van-collapse-item>
+        </van-collapse>
         <van-cell-group>
           <van-cell :title="detail_info.employee_info.name" v-if="detail_info.process !== null && detail_info.status == 0">
             <template slot="icon">
@@ -94,6 +104,7 @@
         <approvalProcess :data.sync="detail_info.process"></approvalProcess>
         <div style="height: 3.5rem;"></div>
       </scroller>
+
       <!-- 审批者 ||  -->
 <!--      <footer class="flex-box flex-v-ce footer" v-if="detail_info.can_refuse === 1">-->
 <!--        <div class="flex-2">撤回后需重新审批</div>-->
@@ -162,7 +173,7 @@
 <script>
 import Vue from 'vue'
 import approvalProcess from '@/point/view/integral/approval_process'
-import { Dialog, Panel, Step, Steps, Overlay, ImagePreview } from 'vant'
+import { Dialog, Panel, Step, Steps, Overlay, ImagePreview, Collapse, CollapseItem } from 'vant'
 import Footer from "../../../components/footer.vue";
 Vue.use(Dialog)
   .use(Panel)
@@ -170,6 +181,8 @@ Vue.use(Dialog)
   .use(Steps)
   .use(Overlay)
   .use(ImagePreview)
+  .use(Collapse)
+  .use(CollapseItem)
 export default {
   // 数据
   components: {Footer, approvalProcess },
@@ -208,6 +221,7 @@ export default {
         remark:''
       },
       submitting:false,
+      activeNames:[]
     }
   },
   watch: {
@@ -414,6 +428,7 @@ export default {
     }
   },
   activated() {
+    this.activeNames = []
   	this.get_info()
     if(this.$route.query.isHome){
        this.isHome = true;

src/point/view/integral/event_detail.vue

@@ -97,7 +97,7 @@
     </div>
     <van-popup v-model="showAppeal" position="bottom" :style="{height:'100%',width:'100%',backgroundColor:'rgb(245, 245, 245)'}">
       <div :style="'padding-top:' + barHeight + 'px;background-color: #238dfa;'"></div>
-      <van-nav-bar title="发起申诉" left-text="返回" @click-left="showAppeal = false" left-arrow></van-nav-bar>`
+      <van-nav-bar title="发起申诉" left-text="返回" @click-left="showAppeal = false" left-arrow></van-nav-bar>
       <van-cell-group>
         <EmployeeSelectorCell
           title="审批人"
@@ -237,7 +237,7 @@ export default {
           if (res.data.code === 1){
             self.appealForm.reviewer = []
             self.appealForm.remark = ''
-            self.$toast('复议已发起')
+            self.$toast('申诉已发起')
             self.showAppeal = false
           }else {
             self.$toast(res.data.msg)

src/point/view/task/my_task.vue

@@ -131,7 +131,7 @@
                 <van-button class="fr complete_task" v-show="item.status == 1" type="info" @click.stop="complete_task(item)" size="small">完成任务</van-button>
                 <span class="fr orange bg" v-show="item.review_status == 0">待处理</span>
                 <span class="fr green  bg" v-show="item.review_status == 1">已通过</span>
-                <span class="fr red bg" v-show="item.review_status == 2">已驳回</span>
+                <span class="fr red bg" v-show="item.review_status == 2">已拒绝</span>
               </div>
             </template>
           </van-cell>

src/point/view/task/taskFile.vue

@@ -39,7 +39,7 @@
             <template slot="title">
               <div class="time">
                 <span>审批结果</span>
-                <span class="timeExactly red">已驳回</span>
+                <span class="timeExactly red">已拒绝</span>
               </div>
             </template>
           </van-cell>