From 72b69b0dd7c5cb2b09c0fd5a12c6f119196231bd Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 26 八月 2024 15:34:17 +0800
Subject: [PATCH] update 质检配送单修改
---
pages/order/order-sale/order-sale.vue | 24 ++-
pages/home/supplier-home.vue | 2
pages.json | 6 +
sub_pages/supplier/order-manage/order-manage-settlement.vue | 90 +++++++++++---
sub_pages/supplier/order-manage/order-manage-settlement-op-detail.vue | 176 +++++++++++++++++++++++++++++
pages/order/order-sale/order-sale-detail.vue | 4
6 files changed, 269 insertions(+), 33 deletions(-)
diff --git a/pages.json b/pages.json
index 9757ba3..b47ee60 100644
--- a/pages.json
+++ b/pages.json
@@ -230,6 +230,12 @@
}
},
{
+ "path": "order-manage/order-manage-settlement-op-detail",
+ "style": {
+ "navigationBarTitleText": "送货单质检操作明细"
+ }
+ },
+ {
"path": "order-manage/order-manage-flower",
"style": {
"navigationBarTitleText": "送货单"
diff --git a/pages/home/supplier-home.vue b/pages/home/supplier-home.vue
index 60b4b2b..595d984 100644
--- a/pages/home/supplier-home.vue
+++ b/pages/home/supplier-home.vue
@@ -167,7 +167,7 @@
</view>
<view class="order-desc tg">加价配置</view>
</view>
- <view class="nav row margin-tb" @click="goto('/sub_pages/supplier/order-sale/order-sale',true)">
+ <view class="nav row margin-tb" @click="goto('/pages/order/order-sale/order-sale',true)">
<view class="img-c">
<image class="icon margin-bottom order-icon shlp"
src="/static/images/supplier/user/user-icon-shlp.png" mode="scaleToFill" />
diff --git a/pages/order/order-sale/order-sale-detail.vue b/pages/order/order-sale/order-sale-detail.vue
index eea0414..9bd5274 100644
--- a/pages/order/order-sale/order-sale-detail.vue
+++ b/pages/order/order-sale/order-sale-detail.vue
@@ -11,8 +11,8 @@
// #ifdef PUB_PARTNER
type: 'partner',
// #endif
- // #ifdef PUB_CUSTOMER
- type: 'customer',
+ // #ifdef PUB_SUPPLIER
+ type: 'supplier',
// #endif
};
},
diff --git a/pages/order/order-sale/order-sale.vue b/pages/order/order-sale/order-sale.vue
index f3d83b1..5f133bb 100644
--- a/pages/order/order-sale/order-sale.vue
+++ b/pages/order/order-sale/order-sale.vue
@@ -122,7 +122,10 @@
tabIndex: 0,
}
},
- onLoad() {
+ onLoad(options) {
+ if (options.orderItemId) {
+ this.query.orderItemId = options.orderItemId
+ }
// #ifdef PUB_SUPPLIER
this.listApi = '/api/supplier/sales/list'
// #endif
@@ -280,13 +283,14 @@
vertical-align: middle;
}
}
- .flower-item{
+
+ .flower-item {
.title {
font-weight: 600;
font-size: 28rpx;
color: #000000;
line-height: 40rpx;
-
+
.level {
font-weight: 400;
font-size: 28rpx;
@@ -295,19 +299,19 @@
margin-right: 20rpx;
}
}
-
+
.flower-img {
width: 128rpx;
height: 118rpx;
min-width: 128rpx;
min-height: 118rpx;
}
-
+
.each-list {
display: flex;
flex-wrap: wrap;
margin-top: 6rpx;
-
+
.each-item {
min-width: 40%;
max-width: 50%;
@@ -315,7 +319,7 @@
margin-left: 0rpx;
margin-right: auto;
display: flex;
-
+
.label {
font-weight: 400;
font-size: 24rpx;
@@ -323,11 +327,11 @@
text-align: left;
padding-right: 10rpx;
}
-
+
.label::after {
content: ": "
}
-
+
.value {
font-weight: 400;
font-size: 24rpx;
@@ -335,7 +339,7 @@
}
}
}
-
+
}
}
}
diff --git a/sub_pages/supplier/order-manage/order-manage-settlement-op-detail.vue b/sub_pages/supplier/order-manage/order-manage-settlement-op-detail.vue
new file mode 100644
index 0000000..02342c9
--- /dev/null
+++ b/sub_pages/supplier/order-manage/order-manage-settlement-op-detail.vue
@@ -0,0 +1,176 @@
+<script>
+ export default {
+ data() {
+ return {
+ dto: {
+
+ },
+ orderItemId: '',
+ op: '',
+
+ };
+ },
+ async onLoad(options) {
+ this.orderItemId = options.orderItemId || ''
+ this.op = options.op || ''
+
+ await this.init()
+
+ },
+
+ methods: {
+ async init() {
+ this.$message.showLoading()
+ const {
+ data
+ } = await this.$http.request('get', `/api/supplier/delivery/mine/list/check/info/` + this.op, {
+ params: {
+ orderItemId: this.orderItemId
+ }
+ })
+
+ this.$message.hideLoading()
+ if (data) {
+ var t = data || {}
+ // if (!t.pictures) {
+ // t.pictures = []
+ // } else {
+ // try {
+ // t.pictures = JSON.parse(t.pictures) || []
+ // } catch (e) {
+ // console.log('parse arriveImages', e)
+ // }
+ // }
+ this.dto = {
+ ...this.dto,
+ ...t
+ }
+ }
+ },
+
+
+
+ }
+ }
+</script>
+<template>
+ <view class="delivery-detail-page bg-white p20">
+ <view v-if="dto.id">
+ <view class="delivery-info p10 flex">
+ <view class="flex1">
+ <view class="name">质检时间：{{ dto.checkTime || '-'}}</view>
+ <view class="name">质检人：{{ dto.createName || '-'}}</view>
+ <view class="name">审核状态：{{ dto.auditStatusStr || '-'}}</view>
+ <view class="name">备注：{{ dto.remarks || '-'}}</view>
+
+
+ <view class="line-gray"></view>
+ <view class="name" v-if="dto.targetLevel">降级等级：{{ dto.targetLevelStr || dto.targetLevel || '-'}}
+ </view>
+
+ <view class="name" v-if="dto.type">处理类型：{{ dto.type || '-'}}</view>
+ <view class="name">处理数量：{{ dto.num || '-' }}</view>
+ <view class="name">扣款金额：{{ dto.deductAmount || '-'}}</view>
+
+ </view>
+ </view>
+
+
+ </view>
+ <view class="p10" style="margin-top: 0rpx;padding-top: 0rpx;" v-if="dto.pictureList&&dto.pictureList.length>0">
+ <view class="line-gray"></view>
+
+ <view class="m-r-0">
+ <view>图片:</view>
+ </view>
+ <view class="flex">
+ <view class="m-t-12 m-r-10 " v-for="(timg,index) of dto.pictureList" :key="index">
+ <image class="arrive-img" :src="timg" @click.stop="previewImg(timg)">
+ </image>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ </view>
+</template>
+
+<style lang="scss" scoped>
+ .delivery-detail-page {
+ font-weight: 400;
+ font-size: 28rpx;
+ line-height: 40rpx;
+
+ .arrive-img {
+ width: 96rpx;
+ height: 96rpx;
+ border-radius: 4rpx;
+ border: 2rpx dashed #CECECE;
+ }
+
+ .delivery-order-item {
+ .title {
+ font-weight: 600;
+ font-size: 28rpx;
+ color: #000000;
+ line-height: 40rpx;
+
+ .level {
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #20613D;
+ line-height: 40rpx;
+ margin-left: 20rpx;
+ }
+ }
+
+ .buttons {
+ display: flex;
+
+ .button {
+ margin: 0 auto;
+ width: 98rpx;
+ line-height: 48rpx;
+ border-radius: 24rpx;
+ border: 2rpx solid #CECECE;
+ text-align: center;
+ font-size: 24rpx;
+ color: #666666;
+ line-height: 34rpx;
+ }
+
+ .button-0 {
+ color: #fff;
+ border: 2rpx solid #20613D;
+ background: #20613D;
+ }
+ }
+
+ .flower-img {
+ width: 128rpx;
+ height: 118rpx;
+ min-width: 128rpx;
+ min-height: 118rpx;
+ }
+
+ }
+
+
+ .delivery-info {
+ // padding: 10rpx;
+
+
+
+ .station {
+ height: 50rpx;
+ background: #C6E8D4;
+ border-radius: 4rpx;
+ padding-left: 20rpx;
+ padding-right: 20rpx;
+ min-width: 110rpx;
+
+ line-height: 50rpx;
+ }
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/sub_pages/supplier/order-manage/order-manage-settlement.vue b/sub_pages/supplier/order-manage/order-manage-settlement.vue
index 6e75864..be2c2cd 100644
--- a/sub_pages/supplier/order-manage/order-manage-settlement.vue
+++ b/sub_pages/supplier/order-manage/order-manage-settlement.vue
@@ -13,8 +13,8 @@
<view class="t-red">已结算：￥{{tj_has||0}}</view>
</view>
</view>
- <view v-for="(item,index) in list" :key="index" @click="toDetail(item)"
- class="m-t-20 order-sale-list list-container">
+ <!-- @click="toDetail(item)" -->
+ <view v-for="(item,index) in list" :key="index" class="m-t-20 order-sale-list list-container">
<view class="order-sale-item br-4 list-item bg-white">
@@ -42,7 +42,8 @@
<view class=" ">{{item.orderTime||item.orderTime || '-'}}</view>
</view>
<view class="flex flex1">
- <view class="flex1 text-center value "><span class="desc-gray m-r-5">数量</span>{{item.num||0}}扎
+ <view class="flex1 text-center value "><span
+ class="desc-gray m-r-5">数量</span>{{item.num||0}}扎
</view>
<view class="flex1 text-center value"><span
class="desc-gray m-r-5">合计</span>￥{{item.totalAmount||'0.00'}}</view>
@@ -53,32 +54,61 @@
<view v-if="item.status">
<view class="flex">
<view class="form-item">
- <view class="label">服务费</view>
- <view class="value">{{item.serviceFee||0}}</view>
- </view>
- <view class="form-item">
- <view class="label">售后理赔</view>
- <view class="value">{{item.salesFee||0}}</view>
- </view>
- </view>
- <view class="flex">
- <view class="form-item">
- <view class="label">质检扣款</view>
- <view class="value">{{item.checkFee||0}}</view>
+ <view class="label">收入</view>
+ <view class="value">{{item.income||0}}</view>
</view>
<view class="form-item">
<view class="label">集货站运费</view>
<view class="value">{{item.stationFee||0}}</view>
</view>
+
</view>
<view class="flex">
+ <view class="form-item">
+ <view class="label">服务费</view>
+ <view class="value">{{item.serviceFee||0}}</view>
+ </view>
<view class="form-item">
<view class="label">服务费率</view>
<view class="value">{{item.serviceFeeRate||0}}</view>
</view>
+
+ </view>
+ <view class="flex">
<view class="form-item">
- <view class="label">收入</view>
- <view class="value">{{item.income||0}}</view>
+ <view class="label">售后退款</view>
+ <view class="value">{{item.salesFee||0}}</view>
+ </view>
+
+ </view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="label">缺货数量</view>
+ <view class="value">{{item.lackNum||0}}</view>
+ </view>
+ <view class="form-item">
+ <view class="label">缺货扣款</view>
+ <view class="value">{{item.lackFee||0}}</view>
+ </view>
+ </view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="label">补货数量</view>
+ <view class="value">{{item.replaceNum||0}}</view>
+ </view>
+ <view class="form-item">
+ <view class="label">补货扣款</view>
+ <view class="value">{{item.replaceFee||0}}</view>
+ </view>
+ </view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="label">降级数量</view>
+ <view class="value">{{item.checkNum||0}}</view>
+ </view>
+ <view class="form-item">
+ <view class="label">降级扣款</view>
+ <view class="value">{{item.checkFee||0}}</view>
</view>
</view>
</view>
@@ -95,6 +125,13 @@
</view>
</view>
</view> -->
+ <view class="component-buttons m-t-10" style="width: unset;">
+ <view class="button-1 m-auto" @click.stop="toOpDetail('sale',item)">售后详情</view>
+ <view class="button-1 m-auto" @click.stop="toOpDetail('reduce',item)">降级详情</view>
+ <view class="button-1 m-auto" @click.stop="toOpDetail('lack',item)">缺货详情</view>
+ <view class="button-1 m-auto" @click.stop="toOpDetail('replace',item)">补货详情</view>
+
+ </view>
</view>
</view>
</view>
@@ -142,6 +179,19 @@
uni.stopPullDownRefresh()
},
methods: {
+ toOpDetail(op, item) {
+ if (op === 'sale') {
+ //去列表页面
+ uni.navigateTo({
+ url: '/pages/order/order-sale/order-sale?orderItemId=' + item.orderItemId
+ })
+ } else {
+ uni.navigateTo({
+ url: `/sub_pages/supplier/order-manage/order-manage-settlement-op-detail?op=${op}&orderItemId=${item.orderItemId}`
+ })
+ }
+
+ },
//选择timer的时间
async select_time_picker_time(e) {
// console.log('select_time_picker_time1', e, this.tmp_picker_time_item)
@@ -154,9 +204,9 @@
this.refreshList()
},
toDetail(item) {
- uni.navigateTo({
- url: `/sub_pages/supplier/order-settlement/order-settlement-detail?id=${item.id}`
- })
+ // uni.navigateTo({
+ // url: `/sub_pages/supplier/order-settlement/order-settlement-order-item-detail?id=${item.orderItemId}`
+ // })
},
},
computed: {
--
Gitblit v1.9.3