From 4b74ae71c84d7c3a2fcc83d1ef75f11f8f8c05e0 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 30 五月 2023 10:28:28 +0800
Subject: [PATCH] 增加新功能，修复bug
---
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue | 291 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 190 insertions(+), 101 deletions(-)
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
index 2dedc99..837d437 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
@@ -1,115 +1,204 @@
<template>
<view>
- <combined-title title="鎻愮叅鍗曡鎯�"></combined-title>
- <view class="compDetails" v-for="(item, index) in yyDailyList" :key="index">
- <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
- <uni-tr>
- <uni-th align="left">鎻愮叅鍗曠紪鍙�</uni-th>
- <uni-td align="left">{{ item.code || '' }}</uni-td>
- </uni-tr>
- <uni-tr>
- <uni-th align="left">鎻愮叅鍗曠姸鎬�</uni-th>
- <uni-td align="left">{{ coalStatus[item.status] }}</uni-td>
- </uni-tr>
- <uni-tr>
- <uni-th align="left">杞︾墝鍙�</uni-th>
- <uni-td align="left">{{ item.carNo || '' }}</uni-td>
- </uni-tr>
- <uni-tr>
- <uni-th align="left">鍏ュ満鏃堕棿</uni-th>
- <uni-td align="left">{{ item.inTime || '' }}</uni-td>
- </uni-tr>
- <uni-tr>
- <uni-th align="left">鍑哄満鏃堕棿</uni-th>
- <uni-td align="left">{{ item.outTime || '' }}</uni-td>
- </uni-tr>
- <uni-tr>
- <uni-th align="left">鐨噸</uni-th>
- <uni-td align="left">{{ item.skin || 0 }}</uni-td>
- </uni-tr>
- <uni-tr>
- <uni-th align="left">姣涢噸</uni-th>
- <uni-td align="left">{{ item.hair || 0 }}</uni-td>
- </uni-tr>
- <uni-tr>
- <uni-th align="left">鍑�閲�</uni-th>
- <uni-td align="left">{{ item.clean || 0 }}</uni-td>
- </uni-tr>
- <uni-tr>
- <uni-th align="left">璁㈠崟缂栧彿</uni-th>
- <uni-td align="left">{{ item.orderCode || '' }}</uni-td>
- </uni-tr>
- <uni-tr>
- <uni-th align="left">璁㈠崟鍓╀綑閲�</uni-th>
- <uni-td align="left">{{ item.allowance || 0 }}</uni-td>
- </uni-tr>
- </uni-table>
+ <view class="main">
+ <view class="main-body">
+ <view class="body-container">
+ <view class="container-block">
+ <view class="">杞︾墝鍙�</view>
+ <view class="">{{ yyDailyList.carNo || '' }}</view>
+ </view>
+ </view>
+ <view class="body-container">
+ <view class="container-block">
+ <view class="">鎻愮叅鍗曠姸鎬�</view>
+ <view class="">{{ coalStatus[yyDailyList.status] }}</view>
+ </view>
+ </view>
+ <view class="body-container">
+ <view class="container-block">
+ <view class="">鍏ュ満鏃堕棿</view>
+ <view class="">{{ yyDailyList.inTime || '' }}</view>
+ </view>
+ </view>
+ <view class="body-container">
+ <view class="container-block">
+ <view class="">鐨噸</view>
+ <view class="">{{ yyDailyList.skin || 0 }}</view>
+ </view>
+ </view>
+ <view class="body-container">
+ <view class="container-block">
+ <view class="">姣涢噸</view>
+ <view class="">{{ yyDailyList.hair || 0 }}</view>
+ </view>
+ </view>
+ <view class="body-container">
+ <view class="container-block">
+ <view class="">鍑�閲�</view>
+ <view class="">{{ yyDailyList.clean || 0 }}</view>
+ </view>
+ </view>
+ <view class="body-container">
+ <view class="container-block">
+ <view class="">璁㈠崟鍓╀綑閲�</view>
+ <view class="">{{ yyDailyList.allowance || 0 }}</view>
+ </view>
+ </view>
+ <view class="body-container">
+ <view class="container-block">
+ <view class="">鎻愮叅鍗曠紪鍙�</view>
+ <view class="">{{ yyDailyList.code || '' }}</view>
+ </view>
+ </view>
+ <view class="body-container last">
+ <view class="container-block">
+ <view class="">璁㈠崟缂栧彿</view>
+ <view class="">{{ yyDailyList.orderCode || '' }}</view>
+ </view>
+ </view>
+ </view>
+ <view class="origin-info"
+ v-if="yyDailyList.orderType == '澶栬喘' || yyDailyList.orderType == '鍐呰喘' || yyDailyList.orderType == '杞叆'">
+ <combined-title title="鍘熷彂淇℃伅"></combined-title>
+ <view class="body-container">
+ <view class="container-block">
+ <view class="">鐨噸</view>
+ <view class="">{{ yyDailyList.skinTwo || 0 }}</view>
+ </view>
+ </view>
+ <view class="body-container">
+ <view class="container-block">
+ <view class="">姣涢噸</view>
+ <view class="">{{ yyDailyList.hairTwo || 0 }}</view>
+ </view>
+ </view>
+ <view class="body-container last">
+ <view class="container-block">
+ <view class="">鍑�閲�</view>
+ <view class="">{{ yyDailyList.cleanTwo || 0 }}</view>
+ </view>
+ </view>
+ </view>
</view>
</view>
</template>
<script>
-import combinedTitle from '@/components/combined-title/combined-title.vue';
+ import combinedTitle from '@/components/combined-title/combined-title.vue';
-export default {
- components: {
- combinedTitle
- },
- onLoad(params) {
- this.orderPlanId = params.orderPlanId;
- this.index = params.index;
- },
- onShow() {
- this.GetOrderPlanDetail();
- },
- data() {
- return {
- orderPlanId: '',
- yyDailyList: [],
- orderPlanDetail: {},
- coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�'],
- index: ''
- };
- },
- methods: {
- GetOrderPlanDetail() {
- uni.showLoading({
- title: '鍔犺浇涓�...'
- });
- this.$reqGet('xiangqingList', { orderPlanId: this.orderPlanId }).then(res => {
- if (res.code == 0) {
- this.orderPlanDetail = res.data;
- this.yyDailyList = res.data.yyDailyList.filter((v, i) => i == this.index);
- uni.hideLoading();
- }
- });
+ export default {
+ components: {
+ combinedTitle
+ },
+ onLoad(params) {
+ this.id = params.id;
+ },
+ onShow() {
+ this.GetOrderPlanDetail();
+ },
+ data() {
+ return {
+ id: '',
+ yyDailyList: {},
+ orderPlanDetail: {},
+ coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
+ '杩涘叆鍦洪櫌'
+ ],
+ index: ''
+ };
+ },
+ methods: {
+ GetOrderPlanDetail() {
+ uni.showLoading({
+ title: '鍔犺浇涓�...'
+ });
+ this.$reqGet('getTakeCoal', { takeCoalId: this.id }).then(res => {
+ if (res.code == 0) {
+ this.orderPlanDetail = res.data;
+ this.yyDailyList = res.data;
+ console.log(this.yyDailyList);
+ uni.hideLoading();
+ } else {
+ this.$u.toast('鍔犺浇澶辫触');
+ }
+ });
+ }
}
- }
-};
+ };
</script>
-<style scoped lang="scss">
-.uni-table {
- .uni-table-tr {
- padding: 0;
- border: vww(1) solid #c6c6c6;
- .uni-table-th {
- font-size: vww(14);
- height: vww(30);
- line-height: vww(30);
- padding: vww(5) vww(10);
- color: #111111;
- font-weight: 500;
- background: #e2e2e2;
+<style scoped
+ lang="scss">
+ @mixin flex {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ }
+
+ .main {
+ width: 100%;
+ margin-top: vww(10);
+ color: #303030;
+ @include flex;
+ flex-direction: column;
+
+ .main-body {
+ width: 690rpx;
+ height: 1062rpx;
+ background: #ffffff;
+ box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+ border-radius: 20rpx;
+ @include flex flex-direction: column;
+ align-items: flex-start;
+
+ .body-container {
+ color: #303030;
+ width: 100%;
+ height: vww(56);
+ border-bottom: vww(1) solid #d6d6d6;
+ @include flex;
+ justify-content: center;
+
+ .container-block {
+ width: 96%;
+ height: vww(56);
+ @include flex;
+ }
+ }
+
+ .last {
+ border-bottom: none;
+ }
}
- .uni-table-td {
- font-size: vww(14);
- font-weight: 400;
- height: vww(30);
- line-height: vww(30);
- padding: vww(5) vww(10);
- color: #111111;
+
+ .origin-info {
+ width: 690rpx;
+ min-height: 300rpx;
+ margin-top: 20rpx;
+ margin-bottom: 20rpx;
+ background: #ffffff;
+ box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+ border-radius: 20rpx;
+ @include flex;
+ flex-direction: column;
+ align-items: flex-start;
+
+ .body-container {
+ width: 100%;
+ height: vww(56);
+ border-bottom: vww(1) solid #d6d6d6;
+ @include flex;
+ justify-content: center;
+
+ .container-block {
+ width: 94%;
+ @include flex;
+ }
+ }
+
+ .last {
+ border-bottom: none;
+ }
}
}
-}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.1