From 07e7049fe46931edd6ade7c6871fdccb360a9058 Mon Sep 17 00:00:00 2001
From: zhangxiaoxu <819527061@qq.com>
Date: 星期二, 16 十二月 2025 15:57:52 +0800
Subject: [PATCH] 新增 产品当前价格 当日收款情况 煤种发运情况 分客户煤种发运情况
---
pages/home/home.vue | 793 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 690 insertions(+), 103 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 77b20e8..6d06960 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -4,11 +4,214 @@
<view class="home_swipe"><u-swiper :list="list3" indicator indicatorMode="line" circular></u-swiper></view>
<!-- 鍥捐〃 -->
- <combined-title title="鐓や粨搴撳瓨鏄庣粏"></combined-title>
- <view class="charts-box">
+ <combined-title v-if="uchartsData && uchartsData.length > 0" title="鐓や粨搴撳瓨鏄庣粏"></combined-title>
+ <view class="charts-box" v-if="uchartsData && uchartsData.length > 0">
<qiun-data-charts type="pie" :opts="opts" :chartData="chartData" v-if="uchartsData.length > 0" />
<u-empty mode="data" iconSize="200" textSize="25" width="350" height="350" icon="http://cdn.uviewui.com/uview/empty/data.png" v-if="uchartsData.length == 0"></u-empty>
</view>
+
+
+ <view class="huoshiju-box" v-if="compId == '1000278'">
+ <!-- 浜у搧褰撳墠浠锋牸 -->
+ <view class="price-group" v-if="coalData && coalData.length > 0">
+ <combined-title title="浜у搧褰撳墠浠锋牸"></combined-title>
+ <view class="price-box">
+ <div class="price-box-inside">
+ <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁" >
+ <uni-tr>
+ <uni-th width="100" align="center">鐓ょ</uni-th>
+ <uni-th width="100" align="center">闀垮崗鎴�(鍏�)</uni-th>
+ <uni-th width="100" align="center">鏅�氭埛(鍏�)</uni-th>
+ </uni-tr>
+ <uni-tr v-for="(item,index) in coalData" :key="index">
+ <uni-td align="left">{{item.coalName}}</uni-td>
+ <uni-td align="center">{{item.price1}}</uni-td>
+ <uni-td align="center">{{item.price2}}</uni-td>
+ </uni-tr>
+ </uni-table>
+<!-- <view class="price-line">
+ <view class="name">涓叅</view>
+ <view class="price"><view class="priceNum">344</view><view class="priceUnit">鍏�</view></view>
+ </view>
+ <view class="price-line">
+ <view class="name">涓叅</view>
+ <view class="price"><view class="priceNum">344</view><view class="priceUnit">鍏�</view></view>
+ </view>
+ <view class="price-line">
+ <view class="name">涓叅</view>
+ <view class="price"><view class="priceNum">344</view><view class="priceUnit">鍏�</view></view>
+ </view>
+ <view class="price-line">
+ <view class="name">涓叅</view>
+ <view class="price"><view class="priceNum">344</view><view class="priceUnit">鍏�</view></view>
+ </view>-->
+ </div>
+
+ </view>
+ </view>
+ <!-- 褰撴棩鏀舵鎯呭喌 -->
+ <view class="shoukuan-group" v-if="shoukuanJiluTemp && shoukuanJiluTemp.length > 0">
+ <view class="currentDay-box">
+ <combined-title title="褰撴棩鏀舵鎯呭喌">
+ </combined-title>
+ <view class="total-box">
+ <view class="total1">灏忚:</view>
+ <view class="total2">{{shoukuanToatl}}
+ <view class="small">鍏�</view>
+ </view>
+ </view>
+ </view>
+ <view class="shoukuan-box">
+ <div class="shoukuan-box-inside">
+ <view class="shoukuan-main" v-for="(item,index) in shoukuanJilu" :key="index">
+ <view class="shoukuan-line shoukuanFirst-line">
+ <view class="text1">{{item.customerName || ''}}</view>
+ </view>
+ <view class="shoukuan-line">
+ <view class="name">閲戦锛�</view>
+ <view class="text1 num">{{item.money || ''}}
+ <view class="small">鍏�</view>
+ </view>
+ </view>
+ <view class="shoukuan-line">
+ <view class="name">璐﹀锛�</view>
+ <view class="text1">{{item.ledgerName || ''}}</view>
+ </view>
+ </view>
+ <view class="shouqiIcon" @click="handleShouKuanIsMore">
+ <image v-if="!shoukuanIsMore" src="@/static/home/xialaIcon.png"></image>
+ <image v-else src="@/static/home/shouqiIcon.png"></image>
+ </view>
+ </div>
+ </view>
+ </view>
+ <!-- 鐓ょ鍙戣繍鎯呭喌 -->
+ <view class="shoukuan-group" v-if="coalTongjiTemp && coalTongjiTemp.length > 0">
+ <view class="currentDay-box">
+ <combined-title title="鐓ょ鍙戣繍鎯呭喌">
+ </combined-title>
+ </view>
+ <view class="shoukuan-box">
+ <view class="coalFayun-total">
+ <view class="total-block">
+ <view class="num">{{d2Sum || 0}}</view>
+ <view class="name">鎬昏閲戦(鍏�)</view>
+ </view>
+ <view class="total-block">
+ <view class="num">{{dsumSum || 0}}</view>
+ <view class="name">姹借繍鎬昏(鍚�)</view>
+ </view>
+ <view class="total-block">
+ <view class="num">{{lyDSumSum || 0}}</view>
+ <view class="name">璺繍鎬昏(鍚�)</view>
+ </view>
+ <view class="total-block">
+ <view class="num">{{d1Sum || 0}}</view>
+ <view class="name">鎬诲惃鏁�(鍚�)</view>
+ </view>
+ </view>
+ <div class="shoukuan-box-inside">
+ <view class="shoukuan-main" v-for="(item,index) in coalTongji" :key="index">
+ <view class="shoukuan-line shoukuanFirst-line">
+ <view class="text1">{{item.coalName}}</view>
+ </view>
+ <view class="shoukuan-line">
+ <view class="name">璐﹀锛�</view>
+ <view class="text1">{{item.ledgerName || ''}}</view>
+ </view>
+ <view class="coalTongji-box">
+ <view class="shoukuan-line">
+ <view class="name">鍗曚环锛�</view>
+ <view class="text1 num">
+ {{item.d3 || 0}}
+ <view class="small">鍏�</view>
+ </view>
+ </view>
+ <view class="shoukuan-line">
+ <view class="name">閲戦锛�</view>
+ <view class="text1 num">
+ {{item.d2 || 0}}
+ <view class="small">鍏�</view>
+ </view>
+ </view>
+ </view>
+ <view class="coalTongji-box marginTop">
+ <view class="caol-block">
+ <view class="name">鏃ユ苯杩愰噺(鍚�)</view>
+ <view class="num">{{item.dSum || 0}}</view>
+ </view>
+ <view class="caol-block">
+ <view class="name">鏃ヨ矾杩愰噺(鍚�)</view>
+ <view class="num">{{item.lyDSum || 0}}</view>
+ </view>
+ <view class="caol-block">
+ <view class="name">鏃ュ悎璁�(鍏�)</view>
+ <view class="num">{{item.d1 || 0}}</view>
+ </view>
+ </view>
+ </view>
+ <view class="shouqiIcon" @click="handleCoalIsMore">
+ <image v-if="!coalShowIsMore" src="@/static/home/xialaIcon.png"></image>
+ <image v-else src="@/static/home/shouqiIcon.png"></image>
+ </view>
+ </div>
+
+ </view>
+ </view>
+ <!-- 鍒嗗鎴风叅绉嶅彂杩愭儏鍐� -->
+ <view class="shoukuan-group" v-if="kehuTongjiTemp && kehuTongjiTemp.length > 0">
+ <view class="currentDay-box">
+ <combined-title title="鍒嗗鎴风叅绉嶅彂杩愭儏鍐�">
+ </combined-title>
+ </view>
+
+ <view class="shoukuan-box">
+ <div class="shoukuan-box-inside">
+ <view class="shoukuan-main" v-for="(item,index) in kehuTongji" :key="index">
+ <view class="shoukuan-line">
+ <view class="name">瀹㈡埛锛�</view>
+ <view class="text1">{{item.customerName}}</view>
+ </view>
+ <view class="shoukuan-line">
+ <view class="name">璐﹀锛�</view>
+ <view class="text1">{{item.ledgerName}}</view>
+ </view>
+ <view class="coalTongji-box">
+ <view class="shoukuan-line kehu-block">
+ <view class="name">杞︽暟锛�</view>
+ <view class="text1 num">{{item.carSize}}</view>
+ </view>
+ <view class="shoukuan-line kehu-block">
+ <view class="name">鐓ょ锛�</view>
+ <view class="text1">{{item.coalName}}</view>
+ </view>
+ </view>
+ <view class="coalTongji-box marginTop">
+ <view class="caol-block">
+ <view class="name">鍙戣繍閲�(鍚�)</view>
+ <view class="num">{{item.executive || 0}}</view>
+ </view>
+ <view class="caol-block">
+ <view class="name">鍗曚环(鍏�)</view>
+ <view class="num">{{item.coalPrice || 0}}</view>
+ </view>
+ <view class="caol-block">
+ <view class="name">閲戦(鍏�)</view>
+ <view class="num">{{item.amount || 0}}</view>
+ </view>
+ </view>
+ </view>
+ <view class="shouqiIcon" @click="handlekehuTongjiShowIsMore">
+ <image v-if="!kehuTongjiShowIsMore" src="@/static/home/xialaIcon.png"></image>
+ <image v-else src="@/static/home/shouqiIcon.png"></image>
+ </view>
+ </div>
+
+ </view>
+ </view>
+ </view>
+
+
<!-- 鎴戠殑鐢宠 -->
<combined-title title="鎴戠殑鐢宠" detailsPath="/pages/my-application/my-application" v-if="shenqingMenu"></combined-title>
<view class="card-group">
@@ -50,15 +253,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 +269,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 +299,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 +323,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 +359,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 +378,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 +401,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>
@@ -217,9 +424,9 @@
</view>
<!-- 鏃ヨ鍒� -->
- <combined-title title="鏃ュ彂杩愯鍒�" detailsPath="/pages/jihua/jihua" v-if="rijihuaMenu"></combined-title>
- <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">
+ <combined-title title="鏃ュ彂杩愯鍒�" detailsPath="/pages/jihua/jihua"></combined-title>
+ <view class="card-group bottomChild">
+ <combination-card class="card" :showTop="false" v-for="(item, index) in fyData.slice(0, 2)" :key="item.id">
<template v-slot:top></template>
<template v-slot:center>
<view class="main-block-box">
@@ -333,11 +540,23 @@
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';
+import UText from "../../uni_modules/uview-ui/components/u-text/u-text.vue";
export default {
name: 'home',
+ onLaunch() {
+ let that = this;
+ uni.addInterceptor('redirectTo', {
+ //鐩戝惉鍏抽棴鏈〉闈㈣烦杞�
+ success(e) {
+ that.watchRouter();
+ }
+ });
+ },
computed: {
rijihuaMenu() {
+ console.log(this.$store.state.rijihuaMenu,'this.$store.state.rijihuaMenu==============',this.$store.state)
return this.$store.state.rijihuaMenu;
},
shenqingMenu() {
@@ -406,8 +625,14 @@
// dataSeletText: '璇烽�夋嫨鐘舵��',
// 椹冲洖璇锋眰
rejectForm: {
- procInstIds: '',
- comment: ''
+ id: "",
+ procInstId: "",
+ comment: "",
+ type: 0,
+ backTaskKey: "-1",
+ sendMessage: true,
+ sendSms: true,
+ sendEmail: true,
},
modalType: 0,
// 鍒犻櫎鐢宠妯℃�佹
@@ -438,9 +663,25 @@
haveTodoParams: {
pageNumber: 1,
pageSize: 2,
- sort: 'createTime',
- order: 'desc'
- }
+ // sort: 'createTime',
+ // order: 'desc'
+ },
+ coalData:[],
+ shoukuanJilu:[],
+ shoukuanJiluTemp:[],
+ shoukuanIsMore:false, //
+ shoukuanToatl:0,
+ coalTongji:[], //鐓ょ缁熻
+ coalTongjiTemp:[], //鐓ょ缁熻
+ coalShowIsMore: false,
+ kehuTongji:[], //鐓ょ缁熻
+ kehuTongjiTemp:[], //鐓ょ缁熻
+ kehuTongjiShowIsMore: false,
+ compId:'',
+ d2Sum:0, //鎬昏閲戦
+ d1Sum:0, //鎬昏
+ lyDSumSum:0, //璺繍
+ dsumSum:0, //姹借繍
};
},
// 鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚銆傛敞鎰忓鏋滄覆鏌撻�熷害蹇紝浼氬湪椤甸潰杩涘叆鍔ㄧ敾瀹屾垚鍓嶈Е鍙�
@@ -456,24 +697,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() {
// 鑿滃崟娉ㄩ噴锛坅pp寰呯敤锛�
@@ -483,23 +707,178 @@
this.init();
},
components: {
+ UText,
combinedTitle,
combinationCard
// popupMenu
},
+ watch: {
+ shoukuanIsMore: {
+ handler(newVal,oldVal) {
+ console.log(newVal,'newVal-------褰撳ぉ鏀舵璁板綍')
+ let temp = newVal.toString() || ''
+ if(this.shoukuanJiluTemp && this.shoukuanJiluTemp.length > 0) {
+ if(temp == 'false') {
+ this.shoukuanJilu = this.shoukuanJiluTemp.slice(0,2)
+ this.coalShowIsMore = false
+ }else if(temp == 'true') {
+ this.shoukuanJilu = this.shoukuanJiluTemp
+ this.coalShowIsMore = true
+ }
+ }
+ },
+ immediate: true,
+ deep: true
+ },
+ coalShowIsMore: {
+ handler(newVal,oldVal) {
+ console.log(newVal,'newVal-------鎸夌叅绉嶇粺璁�')
+ let temp = newVal.toString() || ''
+ if(this.coalTongjiTemp && this.coalTongjiTemp.length > 0) {
+ if(temp == 'false') {
+ this.coalTongji = this.coalTongjiTemp.slice(0,2)
+ this.coalShowIsMore = false
+ }else if(temp == 'true') {
+ this.coalTongji = this.coalTongjiTemp
+ this.coalShowIsMore = true
+ }
+ }
+ },
+ immediate: true,
+ deep: true
+ },
+ kehuTongjiShowIsMore: {
+ handler(newVal,oldVal) {
+ console.log(newVal,'newVal-------鎸夊鎴峰彂杩愮粺璁�')
+ let temp = newVal.toString() || ''
+ if(this.kehuTongjiTemp && this.kehuTongjiTemp.length > 0) {
+ if(temp == 'false') {
+ this.kehuTongji = this.kehuTongjiTemp.slice(0,2)
+ this.kehuTongjiShowIsMore = false
+ }else if(temp == 'true') {
+ this.kehuTongji = this.kehuTongjiTemp
+ this.kehuTongjiShowIsMore = true
+ }
+ }
+ },
+ immediate: true,
+ deep: true
+ },
+ },
methods: {
+ handleShouKuanIsMore() { //褰撴棩鏀舵鎯呭喌
+ this.shoukuanIsMore = !this.shoukuanIsMore
+ },
+ handleCoalIsMore() { //鐓ょ鍙戣繍鎯呭喌
+ this.coalShowIsMore = !this.coalShowIsMore
+ },
+ handlekehuTongjiShowIsMore() { //鐓ょ鍙戣繍鎯呭喌
+ this.kehuTongjiShowIsMore = !this.kehuTongjiShowIsMore
+ },
+ watchRouter() {
+ console.log('璺敱璺宠浆');
+ },
init() {
this.getUserInfo(); // 鐢ㄦ埛淇℃伅
this.getProcessDataList(); // 鐢宠鍒楄〃
this.todoList(); // 鎴戠殑寰呭姙
this.doneList(); // 鎴戠殑宸插姙
this.xscarshippingdayplan(); // 鏃ヨ鍒�
+ this.currentCoalPrice() //鐓ょ浠锋牸
+ this.getSkList() //褰撳ぉ鏀舵璁板綍
+ this.getStatistics1() //鎸夌叅绉嶇粺璁�
+ this.getStatistics2() //鎸夊鎴峰彂杩愮粺璁�
},
+ //鐓ょ浠锋牸
+ currentCoalPrice() {
+ this.$reqGet('currentCoalPrice').then(res => {
+ console.log(res.data,'res.data')
+ if (res.code == 0) {
+ this.coalData = res.data || []
+ }
+ })
+ },
+ getSkList() { //褰撳ぉ鏀舵璁板綍
+ this.$reqGet('getSkList').then(res => {
+ if (res.code == 0) {
+ this.shoukuanJiluTemp = res.data || []
+ if(this.shoukuanJiluTemp && this.shoukuanJiluTemp.length > 0) {
+ this.shoukuanToatl = this.shoukuanJiluTemp[0]?.money || 0
+ if(this.shoukuanJiluTemp.length > 1) {
+ this.shoukuanJilu = this.shoukuanJiluTemp.slice(0,2)
+ this.shoukuanIsMore = false
+ }
+ }
+ }
+ })
+ },
+ getStatistics1() { //鎸夌叅绉嶇粺璁�
+ this.$reqGet('getStatistics1').then(res => {
+ if (res.code == 0) {
+ this.coalTongjiTemp = res.data || []
+ if(this.coalTongjiTemp && this.coalTongjiTemp.length > 0){
+ this.d2Sum = this.coalTongjiTemp[0]?.d2Sum || 0
+ this.d1Sum = this.coalTongjiTemp[0]?.d1Sum || 0
+ this.lyDSumSum = this.coalTongjiTemp[0]?.lyDSumSum || 0
+ this.dsumSum = this.coalTongjiTemp[0]?.dsumSum || 0
+ if(this.coalTongjiTemp.length > 1) {
+ this.coalTongji = this.coalTongjiTemp.slice(0,2)
+ this.coalShowIsMore = false
+ }
+ }
+ }
+ })
+ },
+ getStatistics2() { //鎸夊鎴峰彂杩愮粺璁�
+ this.$reqGet('getStatistics2').then(res => {
+ if (res.code == 0) {
+ this.kehuTongjiTemp = res.data || []
+ if(this.kehuTongjiTemp && this.kehuTongjiTemp.length > 0){
+ if(this.kehuTongjiTemp.length > 1) {
+ this.kehuTongji = this.kehuTongjiTemp.slice(0,2)
+ this.kehuTongjiShowIsMore = false
+ }
+ }
+ }
+ })
+ },
+ //浠ｅ姙璇︽儏
+ daibanDetail(item) {
+ 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.userId = res.data.sysUser.userId;
+ this.$store.commit('SET_PERMISSIONS',res.data.permissions)
+ //uni.setStorageSync('permissions', res.data.permissions);
+ this.userId = res.data.sysUser?.userId;
+ this.compId = res.data.sysUser?.compId;
+ console.log(this.compId,'this.compId---111')
this.$nextTick(() => {
this.coalbunker();
});
@@ -548,6 +927,7 @@
};
this.$reqGet('xscarshippingdayplan', params)
.then(res => {
+ console.log('鍙戣繍鏃ヨ鍒�----------------------------------',res)
if (res.code == 0) {
this.fyData = res.data.records;
uni.hideLoading();
@@ -606,19 +986,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 +1017,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 +1025,7 @@
this.$u.toast('閫氳繃澶辫触!!');
}
this.todoList(); // 鎴戠殑寰呭姙
- this.doneList();
+ this.doneList();
});
},
adoptModalCancel() {
@@ -653,22 +1033,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 +1088,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 +1198,6 @@
url: `/pages/approval-history/approval-history?index=${v}`
});
},
-
redirectLogin() {
redirectLogin();
},
@@ -840,12 +1210,25 @@
};
</script>
+
<style lang="scss" scoped>
+::v-deep{
+ .uni-table-td,.uni-table-th{
+ color: #000;
+ }
+}
::v-deep.home {
width: 100%;
display: flex;
flex-direction: column;
-
+ .marginTop{
+ margin-top: 16rpx;
+ }
+ .small{
+ font-size: 20rpx;
+ margin-left: 6rpx;
+ font-weight: normal;
+ }
// 妯悜鑿滃崟鏍�
.utils {
.utils-container {
@@ -884,7 +1267,7 @@
// echarts鍥捐〃
.charts-box {
width: 91%;
- height: vww(330);
+ height: vww(270);
margin: 0 auto;
.u-empty {
height: 100%;
@@ -906,7 +1289,7 @@
}
}
}
- .bottomChild{
+ .bottomChild {
margin-bottom: vww(20);
}
@@ -1131,4 +1514,208 @@
}
}
}
-</style>
+.huoshiju-box{
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ .price-group{
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ .price-title{
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ font-size: 32rpx;
+ }
+ .price-box{
+ width: 100%;
+ padding: 0 20rpx 20rpx 20rpx;
+ box-sizing: border-box;
+ .price-box-inside{
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ padding: 30rpx;
+ box-sizing: border-box;
+ border-radius: 18rpx;
+ box-shadow: 0 2rpx 20rpx #e5e5e5, 0 0 1px #e5e5e5, 0 0 1px #e5e5e5;
+ }
+ .price-line{
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ height: 60rpx;
+ line-height: 60rpx;
+ .name{
+ font-size: 26rpx;
+ color: #606266;
+ }
+ .price{
+ display: flex;
+ align-items: baseline;
+ .priceNum{
+ font-size: 28rpx;
+ }
+ .priceUnit{
+ font-size: 20rpx;
+ margin-left: 10rpx;
+ }
+ }
+ }
+ }
+ }
+ .shoukuan-group{
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ .currentDay-box{
+ width: 100%;
+ position: relative;
+ .total-box{
+ position: absolute;
+ right: 20rpx;
+ top: 50%;
+ transform: translateY(-50%);
+ display: flex;
+ align-items: baseline;
+ .total1{
+ font-size: 22rpx;
+ }
+ .total2{
+ font-size: 32rpx;
+ margin-top: 6rpx;
+ color: #000;
+ font-weight: 540;
+ display: flex;
+ align-items: baseline;
+ }
+ }
+ }
+ .shoukuan-box{
+ width: 100%;
+ padding: 0 20rpx 20rpx 20rpx;
+ box-sizing: border-box;
+ .coalFayun-total{
+ width: 100%;
+ display: flex;
+ background: #4b6cfa;
+ padding: 20rpx 10rpx;
+ box-sizing: border-box;
+ border-radius: 16rpx;
+ margin-bottom: 20rpx;
+ .total-block{
+ width: 50%;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ .num{
+ font-size: 32rpx;
+ color: #fff;
+ font-weight: 540;
+ display: flex;
+ align-items: baseline;
+ height: 38rpx;
+ }
+ .name{
+ font-size: 22rpx;
+ color: #fff;
+ margin-top: 10rpx;
+ }
+ }
+ }
+ .shoukuan-box-inside{
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ padding: 0 40rpx;
+ box-sizing: border-box;
+ border-radius: 18rpx;
+ box-shadow: 0 2rpx 20rpx #e5e5e5, 0 0 1px #e5e5e5, 0 0 1px #e5e5e5;
+ transition: all 0.3s;
+ .shoukuan-main{
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ border-bottom: 1px solid #e5e5e5;
+ padding: 20rpx 0;
+ &:nth-last-child(2){
+ border-bottom: none;
+ }
+ }
+ .shoukuan-line{
+ width: 100%;
+ display: flex;
+ align-items: baseline;
+ height: 60rpx;
+ line-height: 60rpx;
+ .name{
+ font-size: 24rpx;
+ color: #606266;
+ }
+ .text1{
+ font-size: 30rpx;
+ }
+ .num{
+ font-size: 32rpx;
+ margin-top: 6rpx;
+ color: #000;
+ font-weight: 540;
+ display: flex;
+ align-items: baseline;
+ }
+ }
+ .kehu-block{
+ width: 33%;
+ .text1{
+ flex: 1;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+ &:nth-child(2){
+ width: 67%;
+ }
+ }
+ .shoukuanFirst-line{
+ font-weight: bolder;
+ }
+ }
+ .coalTongji-box{
+ width: 100%;
+ display: flex;
+ align-items: center;
+ .caol-block{
+ width: 33.3%;
+ display: flex;
+ flex-direction: column;
+ .name{
+ font-size: 22rpx;
+ color: #606266;
+ }
+ .num{
+ font-size: 32rpx;
+ margin-top: 6rpx;
+ color: #000;
+ font-weight: 540;
+ display: flex;
+ align-items: baseline;
+ }
+ }
+ }
+ }
+ .shouqiIcon{
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ transition: all 0.3s;
+ image{
+ width: 50rpx;
+ height: 34rpx;
+ margin: 10rpx 0;
+ }
+ }
+ }
+}
+</style>
--
Gitblit v1.9.1