测试bug调整

819527061@qq.com

2023-12-01 c56e67c77e2a36c894346830c1ab1e6df36fe935

 pages/home/home.vue

@@ -50,15 +50,15 @@
               <view class="bottom-container">

                  <!-- 按钮区域 -->

                  <view class="bottom-content__chulizhong bottom-content__item">

                     <view @click="withDrawClick(item.procInstId)" v-if="item.status == 1">

                     <!-- <view @click="withDrawClick(item.procInstId)" v-if="item.status == 1">

                        <image src="@/static/home/cehui.png" mode=""></image>

                        <view>撤回</view>

                     </view>

                     <view @click="checkTheScheduleClick(item.procInstId)" v-if="item.status == 1">

                     </view> -->

                     <view @click="() => checkTheScheduleClick(item.procInstId)" v-if="item.status == 1">

                        <image src="@/static/home/jindu.png" mode=""></image>

                        <view>查看进度</view>

                     </view>

                     <view @click="theFormDataClick(item.tableId)" v-if="(item.status == 1 || item.status == 2 || item.status == 3) && item.processName == '发运通知单'">

                     <view @click="() => shenqingDetail(item)" v-if="item.actType == 'Offsetting' || item.actType == 'XsWaybill'">

                        <image src="@/static/home/biaodan.png" mode=""></image>

                        <view>申请详情</view>

                     </view>

@@ -66,18 +66,18 @@
                        <image src="@/static/home/history.png" mode=""></image>

                        <view>重新申请</view>

                     </view> -->

                     <view @click="editMyApplication(item)" v-if="item.status == 1 && item.processName == '发运通知单'">

                     <!-- <view @click="editMyApplication(item)" v-if="item.status == 1 && item.processName == '发运通知单'">

                        <image src="@/static/home/history.png" mode=""></image>

                        <view>编辑</view>

                     </view>

                     <view @click="approvalHistoryClick(item.procInstId)" v-if="item.status == 2 || item.status == 3">

                     </view> -->

                     <view @click="() => checkTheScheduleClick(item.procInstId)" v-if="item.status !== 1">

                        <image src="@/static/home/history.png" mode=""></image>

                        <view>审批历史</view>

                     </view>

                     <view @click="deleteWithDrawApplication(item.tableId)" v-if="item.status == 3">

                     <!-- <view @click="deleteWithDrawApplication(item.tableId)" v-if="item.status == 3">

                        <image src="@/static/home/delete.png" mode=""></image>

                        <view>删除</view>

                     </view>

                     </view> -->

                  </view>

                  <!-- 已结束小组按钮 -->

                  <!-- <view class="bottom-content__chulizhong bottom-content__item" v-if="item.status == 2">

@@ -96,12 +96,12 @@
      <combined-title title="我的待办" detailsPath="/pages/my-todo/my-todo"></combined-title>

      <view class="card-group">

         <combination-card class="card" v-for="(item, index) in daibanData" index="index">

            <template v-slot:top>

            <template slot="top">

               <view>

                  <text>{{ item.actBusiness.title }}</text>

               </view>

            </template>

            <template v-slot:center>

            <template slot="center">

               <view class="center-container">

                  <view class="center-content__one center-margin">

                     <view class="">

@@ -120,23 +120,23 @@
                  </view>

               </view>

            </template>

            <template v-slot:bottom>

            <template slot="bottom">

               <view class="bottom-container">

                  <!-- 待办按钮 -->

                  <view class="bottom-content__item">

                     <view @click="theFormDataClick(item.tableId)">

                <image src="@/static/home/jindu.png" mode=""></image>

                <view>申请详情</view>

              </view>

                     <view @click="adopClick(item)">

                     <view @click="() => daibanDetail(item)" v-if="item.actBusiness.actType == 'Offsetting' || item.actBusiness.actType == 'XsWaybill'">

                        <image src="@/static/home/jindu.png" mode=""></image>

                        <view>申请详情</view>

                     </view>

                     <view @click="() => adopClick(item)">

                        <image src="@/static/home/tongguo.png" mode=""></image>

                        <view>通过</view>

                     </view>

                     <view @click="rejectClick(item)">

                     <view @click="() => rejectClick(item)">

                        <image src="@/static/home/bohui.png" mode=""></image>

                        <view>驳回</view>

                     </view>

                     <view @click="approvalHistoryClick(item.procInstId)">

                     <view @click="() => checkTheScheduleClick(item.procInstId)">

                        <image src="@/static/home/history.png" mode=""></image>

                        <view>历史</view>

                     </view>

@@ -156,7 +156,7 @@
               </view>

            </template>

            <template v-slot:center>

               <view class="center-container">

               <view class="center-container" @click="() => shenqingDetail(item)">

                  <view class="center-content__one center-margin">

                     <view>

                        <text>任务名称：{{ item.name }}</text>

@@ -175,7 +175,7 @@
                  </view>

                  <view class="center-content__three center-margin">

                     <view class="">

                        <text>审批意见：{{ item.comment=='undefined'?'未填写':item.comment || '未填写' }}</text>

                        <text>审批意见：{{ item.comment == 'undefined' ? '未填写' : item.comment || '未填写' }}</text>

                     </view>

                     <view class="">

                        <text>

@@ -198,11 +198,15 @@
               <view class="bottom-container">

                  <!-- 已办按钮 -->

                  <view class="bottom-content__item">

                     <view @click="theFormDataClick(item.tableId)" v-if="item.processName == '发运通知单'">

                     <view @click="() => shenqingDetail(item)" v-if="item.processName == '发运通知单'">

                        <image src="@/static/home/biaodan.png" mode=""></image>

                        <view>表单数据</view>

                     </view>

                     <view @click="approvalHistoryClick(item.procInstId)">

              <view @click="() => daibanDetail(item)"  v-if="item.actBusiness.actType == 'Offsetting' || item.actBusiness.actType == 'XsWaybill'">

                <image src="@/static/home/jindu.png" mode=""></image>

                <view>详情</view>

              </view>

                     <view @click="() => checkTheScheduleClick(item.procInstId)">

                        <image src="@/static/home/history.png" mode=""></image>

                        <view>审批历史</view>

                     </view>

@@ -218,7 +222,7 @@


      <!-- 日计划 -->

      <combined-title title="日发运计划" detailsPath="/pages/jihua/jihua" v-if="rijihuaMenu"></combined-title>

      <view class="card-group bottomChild" >

      <view class="card-group bottomChild">

         <combination-card class="card" :showTop="false" v-for="(item, index) in fyData.slice(0, 2)" :key="item.id" v-if="rijihuaMenu">

            <template v-slot:top></template>

            <template v-slot:center>

@@ -333,9 +337,19 @@
import combinedTitle from '@/components/common/combined-title/combined-title.vue';

import combinationCard from '@/components/common/combination-card/combination-card.vue';

import { setAccessToken, redirectLogin } from '@/utils/status.js';

import { logout } from '@/api/global.js';



export default {

   name: 'home',

   onLaunch() {

      let that = this;

      uni.addInterceptor('redirectTo', {

         //监听关闭本页面跳转

         success(e) {

            that.watchRouter();

         }

      });

   },

   computed: {

      rijihuaMenu() {

         return this.$store.state.rijihuaMenu;

@@ -406,8 +420,14 @@
         // dataSeletText: '请选择状态',

         // 驳回请求

         rejectForm: {

            procInstIds: '',

            comment: ''

        id: "",

        procInstId: "",

        comment: "",

        type: 0,

        backTaskKey: "-1",

        sendMessage: true,

        sendSms: true,

        sendEmail: true,

         },

         modalType: 0,

         // 删除申请模态框

@@ -438,8 +458,8 @@
         haveTodoParams: {

            pageNumber: 1,

            pageSize: 2,

            sort: 'createTime',

            order: 'desc'

            // sort: 'createTime',

            // order: 'desc'

         }

      };

   },

@@ -456,24 +476,7 @@
   onUnload(event) {

      //多层级跳转之后，监听左上角返回事件，直接退回到index

      console.log('监听左上角', event);

      uni

         .request({

            url: `${BaseUrl}/auth/token/logout`,

            method: 'DELETE',

            header: {

               'TENANT-ID': 5,

               Authorization: 'Bearer ' + uni.getStorageSync('access_token'),

               VERSION: 'zzl'

            }

         })

         .then(res => {

            console.log('缓存清理成功');

         })

         .catch(err => {

            uni.showToast({

               title: '缓存清理失败！'

            });

         });

      this.logout();

   },

   onShow() {

      // 菜单注释（app待用）

@@ -488,6 +491,9 @@
      // popupMenu

   },

   methods: {

      watchRouter() {

         console.log('路由跳转');

      },

      init() {

         this.getUserInfo(); // 用户信息

         this.getProcessDataList(); // 申请列表

@@ -495,10 +501,41 @@
         this.doneList(); // 我的已办

         this.xscarshippingdayplan(); // 日计划

      },

    //代办详情

    daibanDetail(item) {

      console.log(item,'item=====------000000')

      if(item?.actBusiness?.actType == 'Offsetting') {  //收款 actType = ‘Offsetting’

        uni.navigateTo({

          url: `/pages/payment-form-data/payment-form-data?id=${item.tableId}`,



        })

      }else if(item?.actBusiness?.actType == 'XsWaybill') {

        uni.navigateTo({

          url: `/pages/new-application-form-data/new-application-form-data?id=${item.tableId}`

        })

      }

    },

    //代办详情

    shenqingDetail(item) {

      console.log(item,'item====待办===详情')

      if(item.actType == 'Offsetting') {  //收款 actType = ‘Offsetting’

        uni.navigateTo({

          url: `/pages/payment-form-data/payment-form-data?id=${item.tableId}`,



        })

      }else if(item.actType == 'XsWaybill') {

        uni.navigateTo({

          url: `/pages/new-application-form-data/new-application-form-data?id=${item.tableId}`

        })

      }

    },

      getUserInfo() {

         this.$reqGet('getUserInfo').then(res => {

        console.log(res,'res=====系统登录===')

            if (res.code == 0) {

               uni.setStorageSync('userInfo', res.data.sysUser);

          this.$store.commit('SET_PERMISSIONS',res.data.permissions)

               //uni.setStorageSync('permissions', res.data.permissions);

               this.userId = res.data.sysUser.userId;

               this.$nextTick(() => {

                  this.coalbunker();

@@ -606,19 +643,19 @@
         this.withDrawData.procInstId = procInstId;

      },

      withDrawConfirm() {

            this.$reqPost('cancel', this.withDrawData).then(res => {

               this.withDrawShow = false;

               if (res.code == 0) {

                  uni.showToast({

                     title: res.data,

                     duration: 2000

                  });

               }

               // 刷新列表

               this.getProcessDataList();

               this.todoList();

               this.doneList();

            });

         this.$reqPost('cancel', this.withDrawData).then(res => {

            this.withDrawShow = false;

            if (res.code == 0) {

               uni.showToast({

                  title: res.data,

                  duration: 2000

               });

            }

            // 刷新列表

            this.getProcessDataList();

            this.todoList();

            this.doneList();

         });

      },

      withDrawCancel() {

         this.withDrawShow = false;

@@ -637,7 +674,7 @@
      // 通过模态框

      adoptModalConfirm() {

         this.adoptModalShow = false;

         this.adoptForm.comment = this.adoptModalContent;

         this.adoptForm.comment = this.adoptModalContent || '';

         this.$reqPost('passAll', this.adoptForm).then(res => {

            if (res.code == 0) {

               this.$u.toast('操作成功!');

@@ -645,7 +682,7 @@
               this.$u.toast('通过失败!!');

            }

            this.todoList(); // 我的待办

            this.doneList(); 
            this.doneList();

         });

      },

      adoptModalCancel() {

@@ -653,22 +690,27 @@
      },

      // 驳回

      rejectClick(v) {

      console.log('驳回====',v)

         this.modalType = 1;

         this.rejectModalShow = true;

         this.rejectForm.procInstIds = v.procInstId;

         this.rejectForm.procInstId = v.procInstId;

      this.rejectForm.id = v.id;

      this.rejectForm.procDefId = v.procDefId;

      this.rejectForm.priority = v.priority;

      this.rejectForm.type = 1;

      },

      // 驳回模态框

      rejectModalConfirm() {

         this.rejectModalShow = false;



         this.$reqPost('backAll', this.rejectForm).then(res => {

         this.$reqPost('back', this.rejectForm).then(res => {

            if (res.code == 0) {

               this.$u.toast('操作成功！');

            } else {

               this.$u.toast('操作失败！！！');

            }

            this.todoList(); // 我的待办

            this.doneList(); 
            this.doneList();

         });

      },

      rejectModalCancel() {

@@ -703,38 +745,24 @@
         });

      },

      // 表单数据

      theFormDataClick(v) {

         uni.navigateTo({

            url: `/pages/the-form-data/the-form-data?index=${v}`

         });

      },

      // theFormDataClick(item) {

    //   console.log(item,'申请还是-----item')

      //    // uni.navigateTo({

      //    //    url: `/pages/the-form-data/the-form-data?index=${v}`

      //    // });

    //

      // },

      // 删除撤回申请

      deleteWithDrawApplication(id){

         uni

            .request({

               url: `${BaseUrl}/yunxiao/xswaybill/${id}`,

               method: 'DELETE',

               header: {

                  'TENANT-ID': 5,

                  Authorization: 'Bearer ' + uni.getStorageSync('access_token'),

                  VERSION: 'zzl'

      deleteWithDrawApplication(id) {

         this.deleteWithDrawApplicationGlobal(id)

            .then(res => {

               if (res.code == 0) {

                  // 刷新列表

                  this.getProcessDataList();

               }

            })

            .then(res => {

               uni.showToast({

                  title:'删除成功',

                  icon:'none'

               })

					
               // 刷新列表

               this.getProcessDataList();

					
            })

            .catch(err => {

               uni.showToast({

                  title:'删除出错',

                  icon:'none'

               })

               console.log('删除撤回申请异常');

            });

      },

      // 重新申请

@@ -827,7 +855,6 @@
            url: `/pages/approval-history/approval-history?index=${v}`

         });

      },

		
      redirectLogin() {

         redirectLogin();

      },

@@ -884,7 +911,7 @@
   // echarts图表

   .charts-box {

      width: 91%;

      height: vww(330);

      height: vww(270);

      margin: 0 auto;

      .u-empty {

         height: 100%;

@@ -906,7 +933,7 @@
         }

      }

   }

   .bottomChild{

   .bottomChild {

      margin-bottom: vww(20);

   }



@@ -1131,4 +1158,4 @@
      }

   }

}

</style>
</style>