From b5d3561a2e06106ed9cce2c6bcc9c2463951e998 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期五, 15 十一月 2024 11:06:26 +0800
Subject: [PATCH] 新增申请页面不显示发运通知单的问题修改
---
pages/home/home.vue | 103 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 76 insertions(+), 27 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 8676b1f..f0910eb 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -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,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)">
+ <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>
@@ -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>
@@ -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>
@@ -416,8 +420,14 @@
// dataSeletText: '璇烽�夋嫨鐘舵��',
// 椹冲洖璇锋眰
rejectForm: {
- procInstIds: '',
- comment: ''
+ id: "",
+ procInstId: "",
+ comment: "",
+ type: 0,
+ backTaskKey: "-1",
+ sendMessage: true,
+ sendSms: true,
+ sendEmail: true,
},
modalType: 0,
// 鍒犻櫎鐢宠妯℃�佹
@@ -448,8 +458,8 @@
haveTodoParams: {
pageNumber: 1,
pageSize: 2,
- sort: 'createTime',
- order: 'desc'
+ // sort: 'createTime',
+ // order: 'desc'
}
};
},
@@ -491,10 +501,41 @@
this.doneList(); // 鎴戠殑宸插姙
this.xscarshippingdayplan(); // 鏃ヨ鍒�
},
+ //浠ｅ姙璇︽儏
+ daibanDetail(item) {
+ console.log(item,'item=====------000000')
+ if(item?.actBusiness?.actType == 'Offsetting') { //鏀舵 actType = 鈥極ffsetting鈥�
+ 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 = 鈥極ffsetting鈥�
+ 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();
@@ -633,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('鎿嶄綔鎴愬姛!');
@@ -649,15 +690,20 @@
},
// 椹冲洖
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 {
@@ -699,11 +745,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)
@@ -819,6 +867,7 @@
};
</script>
+
<style lang="scss" scoped>
::v-deep.home {
width: 100%;
@@ -863,7 +912,7 @@
// echarts鍥捐〃
.charts-box {
width: 91%;
- height: vww(330);
+ height: vww(270);
margin: 0 auto;
.u-empty {
height: 100%;
@@ -1110,4 +1159,4 @@
}
}
}
-</style>
+</style>
--
Gitblit v1.9.1