收款明细页面及对接接口、详情页面 测试bug调整

819527061@qq.com

2023-11-28 1c7b86f984498eab66968c8d9e9ece42634b96bb

 pages/home/home.vue

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

            </template>

            <template v-slot:center>

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

               <view class="center-container">

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

                     <view class="">

                        <text>所属流程：{{ item.processName }}</text>

@@ -54,11 +54,11 @@
                        <image src="@/static/home/cehui.png" mode=""></image>

                        <view>撤回</view>

                     </view> -->

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

                     <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>

@@ -70,7 +70,7 @@
                        <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 @click="() => checkTheScheduleClick(item.procInstId)" v-if="item.status !== 1">

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

                        <view>审批历史</view>

                     </view>

@@ -96,13 +96,13 @@
      <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>

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

            <template slot="center">

               <view class="center-container">

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

                     <view class="">

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

@@ -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)">

                     <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)">

                     <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>

@@ -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>

@@ -448,8 +452,8 @@
         haveTodoParams: {

            pageNumber: 1,

            pageSize: 2,

            sort: 'createTime',

            order: 'desc'

            // sort: 'createTime',

            // order: 'desc'

         }

      };

   },

@@ -493,12 +497,13 @@
      },

    //代办详情

    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 == 'WAY_BILL') {

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

        uni.navigateTo({

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

        })

@@ -506,12 +511,13 @@
    },

    //代办详情

    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 == 'WAY_BILL') {

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

        uni.navigateTo({

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

        })

@@ -519,8 +525,11 @@
    },

      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();

@@ -659,7 +668,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('操作成功!');

@@ -725,11 +734,13 @@
         });

      },

      // 表单数据

      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) {

         this.deleteWithDrawApplicationGlobal(id)

@@ -889,7 +900,7 @@
   // echarts图表

   .charts-box {

      width: 91%;

      height: vww(330);

      height: vww(270);

      margin: 0 auto;

      .u-empty {

         height: 100%;