优化

src/components/AppealInfo.vue

@@ -37,7 +37,7 @@
           </van-row>
           <van-divider/>
           <div class="card-content">
-            <p><van-tag type="primary" size="medium">{{appealInfo.create_time}}</van-tag>&nbsp;发起复议申请</p>
+            <p><van-tag type="primary" size="medium">{{appealInfo.create_time}}</van-tag>&nbsp;发起申诉申请</p>
             <p>共<van-tag type="primary" size="medium">{{appealInfo.events.length}}</van-tag>&nbsp;条积分事件</p>
             <p v-if="appealInfo.global_remark">申请原因&nbsp;:&nbsp;<van-tag type="primary" size="medium">{{appealInfo.global_remark}}</van-tag></p>
             <template v-if="appealInfo.complete_time">
@@ -45,7 +45,7 @@
             </template>
           </div>
         </div>
-        <van-collapse v-model="activeNames" accordion>
+        <van-collapse v-model="activeNames" accordion @change="collapseChange">
           <van-collapse-item name="process">
             <template slot="title">
               <span class="content-font">审批流程</span>
@@ -74,18 +74,22 @@
                 <p>积分&nbsp;:&nbsp;{{item.point + ' ' + ptName(item.pt_id)}} <van-tag :type="pointStatusType(item.status)" >{{pointStatusMap[item.status] || '--'}}</van-tag> </p>
                 <p style="line-height: 0.5rem">积分备注&nbsp;:&nbsp;{{item.event_remark}}</p>
                 <p>时间&nbsp;:&nbsp;{{item.event_time}}</p>
-                <p v-if="item.appeal_remark" >复议原因&nbsp;:&nbsp;{{item.appeal_remark}}</p>
+                <p v-if="item.appeal_remark" >申诉原因&nbsp;:&nbsp;{{item.appeal_remark}}</p>
                 <p v-if="item.delete_time" >已删除&nbsp;:&nbsp;{{item.delete_time}}</p>
               </div>
             </div>
           </van-collapse-item>
-          <van-collapse-item name="logs">
+          <van-collapse-item name="logs" :disabled="!appealInfo.logs.length > 0">
             <template slot="title">
               <span class="content-font">{{appealInfo.logs.length + '条操作日志'}}</span>
             </template>
-            <p v-for="(item,index) in appealInfo.logs" :key="index" class="content-font font-flex-word">
-              <van-tag type="primary" size="medium" v-if="item.create_time" >{{item.create_time}}</van-tag>
-              {{item.msg}}
+            <p v-for="(item,index) in logs" :key="index" class="content-font font-flex-word">
+              <van-notice-bar
+                left-icon="info-o"
+                color="#1989fa"
+                background="#ecf9ff"
+                :text="item.create_time + item.msg"
+              />
             </p>
           </van-collapse-item>
         </van-collapse>
@@ -96,13 +100,14 @@
       v-model="showActions"
       :actions="appealActions"
       @select="actionSelect"
+      :closeable="false"
       close-on-click-action
     />
 
-<!--  拒绝审批  -->
+<!--  审批拒绝  -->
     <van-dialog
       v-model="showReviewRefuse"
-      title="拒绝审批"
+      title="审批拒绝"
       :show-cancel-button="false"
       :show-confirm-button="false"
     >
@@ -220,7 +225,7 @@
 <!--  重新填写  -->
 <!--    <van-dialog-->
 <!--      v-model="showRewrite"-->
-<!--      title="复议记录"-->
+<!--      title="申诉记录"-->
 <!--      :show-cancel-button="false"-->
 <!--      :show-confirm-button="false"-->
 <!--    >-->
@@ -239,7 +244,7 @@
 
 <script>
 import Vue from "vue";
-import {NavBar,Steps,Step,Collapse,CollapseItem,Dialog} from "vant";
+import {NavBar,Steps,Step,Collapse,CollapseItem,Dialog,NoticeBar} from "vant";
 import EmployeeSelectorCell from "./EmployeeSelectorCell.vue";
 import Mtextarea from "./Mtextarea2.vue";
 import AppealRewrite from "./AppealRewrite.vue";
@@ -249,6 +254,7 @@ Vue.use(NavBar)
   .use(Collapse)
   .use(CollapseItem)
   .use(Dialog)
+  .use(NoticeBar)
 
 export default {
   name: 'appealInfo',
@@ -294,7 +300,7 @@ export default {
       pointStatusMap:{
         1:'正常',
         2:'已删除',
-        3:'已通过申述并删除'
+        3:'已通过申诉并删除'
       },
       processStatusMap:{
         1:'待处理',
@@ -303,7 +309,7 @@ export default {
         4:'拒绝',
         5:'驳回重做',
         6:'撤回上个节点重填',
-        7:'复议撤回',
+        7:'申诉撤回',
       },
       pts:this.$getTypes,
       formData:{
@@ -328,15 +334,16 @@ export default {
       activeNames:'process',
       showActions:false,
       actions:{
-        delete:{name:'删除复议',action:'delete',loading:false,disabled:false},
-        refuse:{name:'拒绝',action:'refuse',loading:false,disabled:false},
-        rejectRewrite:{name:'驳回重做',action:'rejectRewrite',loading:false,disabled:false},
-        cancel:{name:'撤回审批',action:'cancel',loading:false,disabled:false},
-        cancelAppeal:{name:'撤回复议',action:'cancelAppeal',loading:false,disabled:false},
-        rewrite:{name:'重新填写',action:'rewrite',loading:false,disabled:false},
-        submit:{name:'递交审批',action:'submit',loading:false,disabled:false},
-        approval:{name:'通过',action:'approval',loading:false,disabled:false},
-      }
+        delete:{name:'删除申诉',subname:'删除申诉后将不可恢复',action:'delete',loading:false,disabled:false},
+        refuse:{name:'拒绝',subname:'拒绝申请直接结束申诉流程',action:'refuse',loading:false,disabled:false},
+        rejectRewrite:{name:'驳回重做',subname:'申请人重新填写申诉内容',action:'rejectRewrite',loading:false,disabled:false},
+        cancel:{name:'撤回审批',subname:'撤回重新填写审批信息',action:'cancel',loading:false,disabled:false},
+        cancelAppeal:{name:'撤回申诉',subname:'撤回重新填写申诉内容',action:'cancelAppeal',loading:false,disabled:false},
+        rewrite:{name:'重新填写',subname:'填写申诉内容重新提交',action:'rewrite',loading:false,disabled:false},
+        submit:{name:'递交审批',subname:'递交其他人审批',action:'submit',loading:false,disabled:false},
+        approval:{name:'通过',subname:'通过审批结束申诉流程',action:'approval',loading:false,disabled:false},
+      },
+      logs:[]
     }
   },
   watch:{
@@ -442,8 +449,8 @@ export default {
       switch (item.action){
         case 'delete':
           Dialog.confirm({
-            title:'删除复议',
-            message:'删除复议后将不可恢复,确认提交吗',
+            title:'删除申诉',
+            message:'删除申诉后将不可恢复,确认提交吗',
             showCancelButton:true,
             confirmButtonText:'提交',
             cancelButtonText:'取消',
@@ -474,8 +481,8 @@ export default {
           break;
         case 'cancelAppeal':
           Dialog.confirm({
-            title:'撤回复议',
-            message:'复议撤回后可以重新编辑内容重新提交',
+            title:'撤回申诉',
+            message:'申诉撤回后可以重新编辑内容重新提交',
             showCancelButton:true,
             confirmButtonText:'提交',
             cancelButtonText:'取消',
@@ -654,6 +661,13 @@ export default {
     handleRewriteSubmit(){
       this.hasSubmit = true
       this.getAppealInfo()
+    },
+    collapseChange(activeName){
+      if (activeName === 'logs'){
+        this.logs = this.appealInfo.logs
+      }else {
+        this.logs = []
+      }
     }
   },
 }

src/components/AppealRewrite.vue

@@ -8,7 +8,7 @@
     @closed="onClosed"
   >
     <van-nav-bar
-      title="申述重写"
+      title="申诉重写"
       :left-arrow="true"
       @click-left="showAppealRewrite = false"
       @click-right="showActions = true"
@@ -106,7 +106,7 @@ export default {
         reviewer:[]
       },
       loading:false,
-      actionRewrite:{name:'提交',action:'rewrite',loading:false,disabled:false},
+      actionRewrite:{name:'提交',subname:'提交申诉进入审批流程',action:'rewrite',loading:false,disabled:false},
       submitting:false,
     }
   },

src/okr/view/task/taskDetail.vue

@@ -501,7 +501,7 @@
     <!-- 审批拒绝 -->
     <van-dialog v-model="isShowError" title="审批拒绝" class="reject_popup" show-cancel-button :beforeClose="save_btn">
       <van-cell-group>
-        <van-field v-model="errorContent" rows="2" autosize type="textarea" maxlength="50" placeholder="请输入拒绝理由" show-word-limit v-validate="'required'" name="拒绝理由" />
+        <van-field v-model="errorContent" rows="2" autosize type="textarea" maxlength="50" placeholder="原因说明" show-word-limit v-validate="'required'" name="原因说明" />
       </van-cell-group>
     </van-dialog>
 
@@ -1294,7 +1294,7 @@ export default {
     save_btn(action, done) {
       if (action == 'confirm') {
         if(!this.errorContent){
-          this.$toast('请输入拒绝理由');
+          this.$toast('请填写原因说明');
           done();
           return false;
         }

src/point/view/integral/appealList.vue

@@ -7,6 +7,10 @@
         </van-dropdown-menu>
       </template>
     </van-nav-bar>
+    <van-notice-bar
+      left-icon="volume-o"
+      text="手机端到积分事件页面选择个人积分发起申诉,一旦审批,积分将自动删除"
+    />
     <van-tabs
       v-model="currentTab"
       :border="false"
@@ -43,7 +47,7 @@
                 <span style="font-size: 0.35rem;line-height: 0.8rem">
                   提交了
                   <van-tag type="primary" round size="medium">{{item.event_count <= 1000 ? item.event_count : '1000+'}}</van-tag>
-                  条积分复议
+                  条积分申诉
                 </span>
               </van-col>
             </van-row>
@@ -71,9 +75,9 @@
 
 <script>
 import Vue from "vue";
-import {DropdownMenu,DropdownItem,Card} from "vant";
+import {DropdownMenu,DropdownItem,Card,NoticeBar} from "vant";
 import AppealInfo from "@/components/AppealInfo.vue";
-Vue.use(DropdownMenu).use(DropdownItem).use(Card)
+Vue.use(DropdownMenu).use(DropdownItem).use(Card).use(NoticeBar)
 export default {
   name: "appeal",
   components: {AppealInfo},

src/point/view/integral/batchList.vue

@@ -265,12 +265,12 @@
         <div style="height: 2rem;"></div>
       </scroller>
       <div class="flex-box btns" v-show="rightText" :class="{ isIos: isIos }" >
-        <van-button plain type="danger" class="flex-1" style="margin-right: 0.24rem" @click="reject()">驳回</van-button>
+        <van-button plain type="danger" class="flex-1" style="margin-right: 0.24rem" @click="reject()">拒绝</van-button>
         <van-button plain type="info" class="flex-1" @click="pass()">通过</van-button>
       </div>
-      <van-dialog v-model="showReject" title="确认驳回" class="reject_popup" show-cancel-button :beforeClose="save_btn">
+      <van-dialog v-model="showReject" title="批量拒绝" class="reject_popup" show-cancel-button :beforeClose="save_btn">
         <van-cell-group>
-          <van-field v-model="reject_text" rows="2" autosize  type="textarea" maxlength="50" placeholder="请输入审批意见"  show-word-limit v-validate="'required'" name="审批意见"/>
+          <van-field v-model="reject_text" rows="2" autosize  type="textarea" maxlength="50" placeholder="原因说明"  show-word-limit v-validate="'required'" name="原因说明"/>
         </van-cell-group>
       </van-dialog>
       <van-image-preview v-model="show" :images="imageSrc"></van-image-preview>
@@ -353,7 +353,7 @@ export default {
     reject () {
       Dialog.confirm({
         title: '提示',
-        message: `确定驳回已选的${this.activeCheckedNum}条审批吗？`
+        message: `确定拒绝已选的${this.activeCheckedNum}条审批吗？`
       }).then(() => {
         this.showReject = true
       }).catch(() => {

src/point/view/integral/event_detail.vue

@@ -86,7 +86,7 @@
         <van-row type="flex" justify="center">
           <!--    发起申诉    -->
           <van-col span="24" v-if="appealEnable">
-            <van-button type="info" block @click="showAppeal = true">申诉</van-button>
+            <van-button type="info" block @click="showAppeal = true">发起申诉</van-button>
           </van-col>
           <!-- 奖扣者 ||  -->
           <van-col span="24" v-else-if="eventInfo.recorder_id == $userInfo().id && eventInfo.process.length == 1 && (eventInfo.event_type == 3 || eventInfo.event_type == 4)">

src/point/view/integral/event_list.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="event-list__container">
     <van-nav-bar title="积分事件" left-text="返回" @click-left="$route_back" left-arrow></van-nav-bar>
+    <van-notice-bar
+      left-icon="volume-o"
+      text="积分事件列表,根据角色数据权限返回对应的人员积分事件.用户可对自己的积分事件进行申诉,审批通过后积分事件将自动删除"
+    />
     <van-search placeholder="请输入事件内容搜索" v-model="searchParams.keyword" @input="keyVal()" />
     <van-dropdown-menu>
       <van-dropdown-item :title="dateItemTitle" ref="dateDropdownItem"><DateSelectorDropdown :title.sync="dateItemTitle" @onConfirm="onConfirmDate" /></van-dropdown-item>
@@ -47,7 +51,7 @@ import Vue from 'vue';
 import moment from 'moment';
 
 import { _debounce, _throttle } from '@/utils/auth';
-import { DropdownMenu, DropdownItem, Empty, Search } from 'vant';
+import { DropdownMenu, DropdownItem, Empty, Search,NoticeBar } from 'vant';
 import DateSelectorDropdown from '@/components/DateSelectorDropdown';
 import DeptSelectorDropdown from '@/components/DeptSelectorDropdown';
 import RuleCategorySelDropdown from '@/components/RuleCategorySelDropdown';
@@ -55,7 +59,8 @@ import RuleCategorySelDropdown from '@/components/RuleCategorySelDropdown';
 Vue.use(Empty)
   .use(DropdownMenu)
   .use(DropdownItem)
-  .use(Search);
+  .use(Search)
+  .use(NoticeBar)
 
 export default {
   name: 'event_list',