Skip to content

W
wly-APP
Commit 2808db7f authored by chuan.liu's avatar chuan.liu
Browse files
Options

团购订单联调

parent e6829ce4
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 27 deletions
pages/my-order/my-order.nvue
View file @ 2808db7f
......@@ -90,7 +90,7 @@
{
id: "tab04",
name: '公关团购',
newsid: 'ZS02'
newsid: 'V013'
}
],
tabIndex: 0,
......
pages/my-order/order-page.nvue
View file @ 2808db7f
......@@ -133,10 +133,23 @@
"SIGN": "I",
"OPTION": "EQ",
LOW: 'ZS02',
},
{
"SIGN": "I",
"OPTION": "EQ",
LOW: 'V013',
}
]
} else {
PROCESS_TYPE = this.condition.PROCESS_TYPE
if (this.nid === 'V013') {
PROCESS_TYPE = [{
"SIGN": "I",
"OPTION": "EQ",
LOW: 'ZS02',
}]
} else {
PROCESS_TYPE = this.condition.PROCESS_TYPE
}
}
console.log('load---------', this.nid, PROCESS_TYPE)
......@@ -147,6 +160,17 @@
POSTING_DATE,
...this.page
}
if (this.nid === 'V013') {
params.ZZFLD00002J = [{
"SIGN": "I",
"OPTION": "EQ",
LOW: 'V013',
}]
} else {
delete params['ZZFLD00002J']
}
apiGetSalesOrder(params).then((res) => {
console.log('loadData', res)
const {
......
pages/order-detail-group/order-detail-group.nvue
View file @ 2808db7f
......@@ -8,10 +8,10 @@
<scroll-view class="scroll-area view" :scroll-top="scrollTop" scroll-y="true">
<view class="order-main view">
<view class="top">
<text class="title-no">订单编号：TP10000021</text>
<text class="title-no">订单编号：{{INFO.OBJECT_ID}}</text>
<view class="title-info">
<button class="title-info__status" type="default"><text
class="item-block-btn__text">待审批</text></button>
class="item-block-btn__text">{{INFO.STATUS_TEXT}}</text></button>
</view>
</view>
<view class="order-main-middle view">
......@@ -20,30 +20,30 @@
</view>
<view class="text-block-box">
<view class="text-block text-block-last">
<text class="middle-date">2021-08-06 05:14</text>
<text class="middle-date">{{INFO.POSTING_DATE}}</text>
<text class="middle-date-des">下单日期</text>
</view>
<view class="text-block text-block-last">
<view class="middle-date-right">
<text class="middle-date">¥5000</text>
<text class="middle-date">{{INFO.OBJECT_ID}}</text>
</view>
<text class="middle-date-des middle-date-right">金额</text>
</view>
</view>
<view class="text-block-box">
<view class="text-block text-block-last">
<text class="middle-date">市直属机关</text>
<text class="middle-date">{{INFO.GRPNAME}}</text>
<text class="middle-date-des">团购单位</text>
</view>
</view>
<view class="text-block-box text-block-box-last">
<view class="text-block text-block-last">
<text class="middle-date">是</text>
<text class="middle-date">{{INFO.ZZFLD000099}}</text>
<text class="middle-date-des">是否盒外刻字</text>
</view>
<view class="text-block text-block-last">
<view class="middle-date-right">
<text class="middle-date">内供专用</text>
<text class="middle-date">{{INFO.ZZFLD000098}}</text>
</view>
<text class="middle-date-des middle-date-right">外箱喷码内容</text>
</view>
......@@ -59,49 +59,49 @@
<view class="block-detal">
<view class="block-detal-item">
<text class="detal-item-label">收货单位</text>
<text class="detal-item-value">市直属机关</text>
<text class="detal-item-value">{{INFO.ZZFLD00008T_DSCR}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">联系人</text>
<text class="detal-item-value">宋万云</text>
<text class="detal-item-value">{{INFO.ZZFLD00002L}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">联系电话</text>
<text class="detal-item-value">3324-9600759</text>
<text class="detal-item-value">{{INFO.ZZFLD00002M}}</text>
</view>
<view class="block-detal-item block-detal-item-last">
<text class="detal-item-label">收货地址</text>
<text class="detal-item-value">广东省惠州市龙门县平安大道99号</text>
<text class="detal-item-value">{{INFO.ZZFLD00002N}}</text>
</view>
</view>
</view>
<view class="middle view">
<view class="middle view" v-for="(item,index) in ITEM" :key="index">
<view class="item-block item-block-name">
<text class="item-block-label">订购产品</text>
</view>
<view class="block-detal">
<view class="block-detal-item">
<text class="detal-item-label">产品</text>
<text class="detal-item-value">1618五粮液 500ml*6</text>
<text class="detal-item-value">{{item.DESCRIPTION}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">数量</text>
<text class="detal-item-value">25</text>
<text class="detal-item-label">数量（件)）</text>
<text class="detal-item-value">{{item.ZZFLD000009}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">合数</text>
<text class="detal-item-value">25</text>
<text class="detal-item-label">盒数</text>
<text class="detal-item-value">{{item.ZZFLD00002W}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">单价</text>
<text class="detal-item-value">¥880</text>
<text class="detal-item-value">{{item.NET_PRICE}}</text>
</view>
<view class="block-detal-item block-detal-item-last">
<text class="detal-item-label"></text>
<view class="detal-item-value">
<text class="item-value-intotal">小计：</text>
<text class="item-value-intotal-num">¥20,000.00</text>
<text class="item-value-intotal-num">{{item.NET_VALUE}}</text>
</view>
</view>
</view>
......@@ -176,11 +176,21 @@
mapState
} from 'vuex'
import {
apiGetSalesOrderDetail
} from '@/servers/salesOrder.js'
export default {
data() {
return {
ishowReceiveDetail: false,
scrollTop: 0
scrollTop: 0,
orderItem: {},
orderDetail: {
ITEM: [],
INFO: {},
ATTACHMENT: []
}
}
},
computed: {
......@@ -190,8 +200,28 @@
'height': `${this.sysinfo.safeArea.top + 44}px`
}
},
ITEM() {
return this.orderDetail.ITEM || []
},
INFO() {
return this.orderDetail.INFO || {}
},
ATTACHMENT() {
return this.orderDetail.ATTACHMENT || []
}
},
onLoad(option) {
this.orderItem = JSON.parse(option.order)
this.getOrderDetail()
},
methods: {
async getOrderDetail() {
const params = {
OBJECT_ID: this.orderItem.object_id
}
const res = await apiGetSalesOrderDetail(params)
this.orderDetail = res.DATA
},
handleShowReceiveDetail() {
this.ishowReceiveDetail = !this.ishowReceiveDetail
},
......@@ -222,10 +252,10 @@
flex-direction: column;
margin-top: -164rpx;
padding: 0 16rpx;
}
.scroll-area{
flex: 1;
}
.scroll-area {
flex: 1;
}
.order-main {
......@@ -340,7 +370,7 @@
.order-middle {
position: relative;
height: 1580rpx;
overflow: hidden;
padding-bottom: 60rpx;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment