walter 9 maanden geleden
bovenliggende
commit
3684351431

+ 4 - 1
src/point/view/integral/appealList.vue

@@ -61,6 +61,7 @@
             </van-row>
           </template>
         </van-cell>
+        <NoData :list="list"/>
       </scroller>
     </div>
 
@@ -77,10 +78,11 @@
 import Vue from "vue";
 import {DropdownMenu,DropdownItem,Card,NoticeBar} from "vant";
 import AppealInfo from "@/components/AppealInfo.vue";
+import NoData from "../../../components/noData.vue";
 Vue.use(DropdownMenu).use(DropdownItem).use(Card).use(NoticeBar)
 export default {
   name: "appeal",
-  components: {AppealInfo},
+  components: {AppealInfo,NoData},
   data(){
     return {
       first:true,
@@ -98,6 +100,7 @@ export default {
         hasFinish:false,
       },
       list:[],
+      ll:[],
       appealStatusMap:{
         0:'全部',
         1:'审批中',

+ 2 - 2
src/point/view/integral/approval_detail.vue

@@ -134,14 +134,14 @@
       <!-- 驳回弹窗 -->
       <van-popup v-model="show_refuse" position="right" :style="{ height: '100%', width: '100%', 'background-color': 'rgb(245, 245, 245)' }">
         <div :style="'padding-top:' + bar_height + 'px;background-color: #238dfa;'"></div>
-        <van-nav-bar title="确认驳回" left-text="返回" @click-left="show_refuse = false" left-arrow></van-nav-bar>`
+        <van-nav-bar title="审批拒绝" left-text="返回" @click-left="show_refuse = false" left-arrow></van-nav-bar>
         <van-cell-group><van-field v-model="refuse_msg" rows="5" autosize type="textarea" maxlength="50" placeholder="请输入审批意见" show-word-limit /></van-cell-group>
         <div style="padding:0.32rem;"><van-button block type="info" :loading="submitting" @click="confirm_refuse">确认驳回</van-button></div>
       </van-popup>
 
       <van-popup v-model="showRejectRewrite" position="right" :style="{height:'100%',width:'100%', backgroundColor:'rgb(245, 245, 245)'}">
         <div :style="'padding-top:' + bar_height + 'px;background-color: #238dfa;'"></div>
-        <van-nav-bar title="驳回重做" left-text="返回" @click-left="showRejectRewrite = false" left-arrow></van-nav-bar>`
+        <van-nav-bar title="驳回重做" left-text="返回" @click-left="showRejectRewrite = false" left-arrow></van-nav-bar>
         <van-cell-group><van-field v-model="formRejectRewrite.remark" rows="5" autosize type="textarea" maxlength="100" placeholder="原因说明" show-word-limit /></van-cell-group>
         <div style="padding:0.32rem;"><van-button block type="info" :loading="submitting" @click="rejectRewrite">确认</van-button></div>
       </van-popup>

+ 1 - 1
src/point/view/integral/approval_list.vue

@@ -73,7 +73,7 @@
       </div>
     </TabsList>
 
-    <van-dialog v-model="show" title="确认驳回" class="reject_popup" show-cancel-button :beforeClose="save_btn">
+    <van-dialog v-model="show" 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-cell-group>

+ 4 - 1
src/point/view/integral/event_detail.vue

@@ -8,7 +8,10 @@
             <div class="flex-1 flex-box-ce">
               <userImage :id="eventInfo.employee_id" :img_url="eventInfo.img_url" :user_name="eventInfo.employee_name" width="1.1rem" height="1.1rem"></userImage>
               <div style="margin-left: 0.1rem;">
-                <div class="event-employee__name">{{ eventInfo.employee_name }}</div>
+                <div class="event-employee__name">
+                  {{ eventInfo.employee_name }}
+                  <van-tag type="primary" size="medium"  v-if="eventInfo && eventInfo.has_appeal" >已申诉</van-tag>
+                </div>
                 <div class="deptName">{{ deptName }}</div>
               </div>
             </div>

+ 1 - 1
src/point/view/task/my_task.vue

@@ -171,7 +171,7 @@ export default {
       time: moment().format('YYYY-MM-DD HH:mm'),
       date: moment().format('YYYY-MM-DD'),
       tips: '暂无数据',
-      title: '我的任务',
+      title: '我负责的',
       loading: true,
       activeNames: '2',
       filter: {