Skip to content

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

制票订单处理 销售订单处理

parent 0a5a68b7
Show whitespace changes
Inline Side-by-side
Showing with 938 additions and 764 deletions
pages/my-order/my-order.nvue
View file @ e6829ce4
...@@ -77,20 +77,20 @@ ...@@ -77,20 +77,20 @@
tabList: [{ tabList: [{
id: "tab01", id: "tab01",
name: '全部', name: '全部',
newsid: 0 newsid: ''
}, { }, {
id: "tab02", id: "tab02",
name: '配额', name: '配额',
newsid: 23 newsid: 'ZS01'
}, { }, {
id: "tab03", id: "tab03",
name: '非配额', name: '非配额',
newsid: 223 newsid: 'ZS02'
}, },
{ {
id: "tab04", id: "tab04",
name: '公关团购', name: '公关团购',
newsid: 224 newsid: 'ZS02'
} }
], ],
tabIndex: 0, tabIndex: 0,
......
pages/my-order/order-item.nvue
View file @ e6829ce4
<template> <template>
<view class="order view"> <view class="order view">
<view class="top"> <view class="top">
<text class="title-no">订单编号：TP10000021</text> <text class="title-no">订单编号：{{newsItem.object_id}}</text>
<view class="title-info"> <view class="title-info">
<button class="title-info__status title-info__status-done" type="default"><text <button class="title-info__status title-info__status-done" type="default"><text
class="item-block-btn__text">待审批</text></button> class="item-block-btn__text">{{newsItem.status_text}}</text></button>
</view> </view>
</view> </view>
<view class="middle view"> <view class="middle view">
<view class="middle-title"> <view class="middle-title">
<text class="middle-title__text">非配额订单</text> <text class="middle-title__text">{{newsItem.process_type_text}}</text>
</view> </view>
<view class="text-block-box"> <view class="text-block-box">
<view class="text-block text-block-last"> <view class="text-block text-block-last">
<text class="middle-date">2021-08-06 05:14</text> <text class="middle-date">{{newsItem.posting_date}}</text>
<text class="middle-date-des">下单日期</text> <text class="middle-date-des">下单日期</text>
</view> </view>
<view class="text-block text-block-last"> <view class="text-block text-block-last">
<view class="middle-date-right"> <view class="middle-date-right">
<text class="middle-date">¥5000</text> <text class="middle-date">{{newsItem.all_price}}</text>
</view> </view>
<text class="middle-date-des middle-date-right">金额</text> <text class="middle-date-des middle-date-right">金额</text>
</view> </view>
...@@ -83,7 +83,6 @@ ...@@ -83,7 +83,6 @@
} }
.title-info__status { .title-info__status {
width: 120rpx;
height: 48rpx; height: 48rpx;
line-height: 48rpx; line-height: 48rpx;
background: #f61d30; background: #f61d30;
......
pages/my-order/order-page.nvue
View file @ e6829ce4
<template> <template>
<view class="page-news"> <view class="page-news">
<uni-list ref="list" class="listview" :enableBackToTop="true" :scroll-y="true" @scrolltolower="loadMore()"> <uni-list ref="list" class="listview" :enableBackToTop="true" :scroll-y="true" @scrolltolower="loadMore()">
<uni-refresh class="refresh" @refresh="onrefresh" @pullingdown="onpullingdown" :display="refreshing ? 'show' : 'hide'"> <uni-refresh class="refresh" @refresh="onrefresh" @pullingdown="onpullingdown"
:display="refreshing ? 'show' : 'hide'">
<div class="refresh-view"> <div class="refresh-view">
<image class="refresh-icon" :src="refreshIcon" :style="{width: (refreshing || pulling) ? 0: '32px'}" :class="{'refresh-icon-active': refreshFlag}"></image> <image class="refresh-icon" :src="refreshIcon" :style="{width: (refreshing || pulling) ? 0: '32px'}"
<uni-load-more v-if="refreshing" class="loading-icon" status="loading" :contentText="loadingMoreText"></uni-load-more> :class="{'refresh-icon-active': refreshFlag}"></image>
<uni-load-more v-if="refreshing" class="loading-icon" status="loading"
:contentText="loadingMoreText"></uni-load-more>
<text class="loading-text">{{refreshText}}</text> <text class="loading-text">{{refreshText}}</text>
</div> </div>
</uni-refresh> </uni-refresh>
...@@ -22,7 +25,6 @@ ...@@ -22,7 +25,6 @@
</template> </template>
<script> <script>
import uniList from '@/components/uni-list.vue'; import uniList from '@/components/uni-list.vue';
import uniCell from '@/components/uni-cell.vue'; import uniCell from '@/components/uni-cell.vue';
import uniRefresh from '@/components/uni-refresh.vue'; import uniRefresh from '@/components/uni-refresh.vue';
...@@ -30,6 +32,14 @@ ...@@ -30,6 +32,14 @@
import noData from '@/components/nodata.nvue'; import noData from '@/components/nodata.nvue';
import orderItem from './order-item.nvue'; import orderItem from './order-item.nvue';
import {
mapState
} from 'vuex'
import {
apiGetSalesOrder
} from '@/servers/salesOrder.js'
export default { export default {
components: { components: {
uniList, uniList,
...@@ -41,7 +51,7 @@ ...@@ -41,7 +51,7 @@
}, },
props: { props: {
nid: { nid: {
type: [Number, String], type: String,
default: '' default: ''
} }
}, },
...@@ -63,27 +73,37 @@ ...@@ -63,27 +73,37 @@
contentrefresh: '', contentrefresh: '',
contentnomore: '' contentnomore: ''
}, },
refreshIcon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAB5QTFRFcHBw3Nzct7e39vb2ycnJioqK7e3tpqam29vb////D8oK7wAAAAp0Uk5T////////////ALLMLM8AAABxSURBVHja7JVBDoAgDASrjqj//7CJBi90iyYeOHTPMwmFZrHjYyyFYYUy1bwUZqtJIYVxhf1a6u0R7iUvWsCcrEtwJHp8MwMdvh2amHduiZD3rpWId9+BgPd7Cc2LIkPyqvlQvKxKBJ//Qwq/CacAAwDUv0a0YuKhzgAAAABJRU5ErkJggg==" refreshIcon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAB5QTFRFcHBw3Nzct7e39vb2ycnJioqK7e3tpqam29vb////D8oK7wAAAAp0Uk5T////////////ALLMLM8AAABxSURBVHja7JVBDoAgDASrjqj//7CJBi90iyYeOHTPMwmFZrHjYyyFYYUy1bwUZqtJIYVxhf1a6u0R7iUvWsCcrEtwJHp8MwMdvh2amHduiZD3rpWId9+BgPd7Cc2LIkPyqvlQvKxKBJ//Qwq/CacAAwDUv0a0YuKhzgAAAABJRU5ErkJggg==",
condition: {
USER_BP: '50000215',
ROLE: 'WLY001',
PROCESS_TYPE: [{
"SIGN": "I",
"OPTION": "EQ",
LOW: '',
HIGH: ''
}],
POSTING_DATE: [{
"SIGN": "I",
"OPTION": "BT",
LOW: '',
HIGH: ''
}]
},
page: {
"PAGE": "1",
"PAGESIZE": "10",
} }
}
},
computed: {
...mapState(['sysinfo'])
}, },
created() { created() {
this.pullTimer = null; this.pullTimer = null;
this.requestParams = {
columnId: this.nid,
minId: 0,
pageSize: 10,
column: 'id,post_id,title,author_name,cover,published_at,comments_count'
};
this._isWidescreen = false; this._isWidescreen = false;
// #ifdef H5 this.loadData()
var mediaQueryOb = uni.createMediaQueryObserver(this)
mediaQueryOb.observe({
minWidth: 768
}, matches => {
this._isWidescreen = matches;
})
// #endif
}, },
methods: { methods: {
loadData(refresh) { loadData(refresh) {
...@@ -93,50 +113,66 @@ ...@@ -93,50 +113,66 @@
this.isLoading = true; this.isLoading = true;
this.isNoData = false; this.isNoData = false;
this.requestParams.time = new Date().getTime() + '';
var startTime = new Date(); this.condition.PROCESS_TYPE[0].LOW = this.nid
uni.request({ let POSTING_DATE = []
// url: this.$host + 'api/news', let PROCESS_TYPE = []
url: 'https://unidemo.dcloud.net.cn/api/news', if (this.condition.POSTING_DATE[0].LOW === '') {
data: this.requestParams, POSTING_DATE = []
success: (result) => { } else {
var endTime = new Date(); POSTING_DATE = this.condition.POSTING_DATE
const data = result.data; }
this.isNoData = (data.length <= 0);
const data_list = data.map((news) => { if (this.condition.PROCESS_TYPE[0].LOW === '') {
return { PROCESS_TYPE = [{
id: this.newGuid() + news.id, "SIGN": "I",
newsid: news.id, "OPTION": "EQ",
article_type: 1, LOW: 'ZS01',
datetime: (new Date(news.published_at.replace(/\-/g, '/')).getTime()), },
title: news.title, {
image_url: news.cover, "SIGN": "I",
source: news.author_name, "OPTION": "EQ",
comment_count: news.comments_count, LOW: 'ZS02',
post_id: news.post_id }
}; ]
}); } else {
PROCESS_TYPE = this.condition.PROCESS_TYPE
}
console.log('load---------', this.nid, PROCESS_TYPE)
const params = {
...this.condition,
PROCESS_TYPE,
POSTING_DATE,
...this.page
}
apiGetSalesOrder(params).then((res) => {
console.log('loadData', res)
const {
data,
page,
total
} = res
const data_list = data;
this.page.PAGE = page
this.isNoData = (data_list.length <= 0);
if (refresh) { if (refresh) {
this.dataList = data_list; this.dataList = data_list;
this.requestParams.minId = 0;
} else { } else {
this.dataList = this.dataList.concat(data_list); this.dataList = this.dataList.concat(data_list);
this.requestParams.minId = data[data.length - 1].id;
} }
if (this.dataList.length > 0 && this._isWidescreen && this.dataList.length <= 10) { if (this.dataList.length > 0 && this._isWidescreen && this.dataList.length <= 10) {
this.goDetail(this.dataList[0]); // this.goDetail(this.dataList[0]);
} }
}, }).catch(() => {
fail: (err) => {
if (this.dataList.length == 0) { if (this.dataList.length == 0) {
this.isNoData = true; this.isNoData = true;
} }
}, }).finally(() => {
complete: (e) => {
this.isLoading = false; this.isLoading = false;
if (refresh) { if (refresh) {
this.refreshing = false; this.refreshing = false;
...@@ -149,10 +185,11 @@ ...@@ -149,10 +185,11 @@
this.pulling = false; this.pulling = false;
}, 1000); }, 1000);
} }
} })
});
}, },
loadMore(e) { loadMore(e) {
console.log('loadMore')
this.page.PAGE++
this.loadData(); this.loadData();
}, },
clear() { clear() {
...@@ -160,8 +197,20 @@ ...@@ -160,8 +197,20 @@
this.requestParams.minId = 0; this.requestParams.minId = 0;
}, },
goDetail(detail) { goDetail(detail) {
let path = ''
if (detail.process_type === 'ZS01') {
path = 'order-detail-quota/order-detail-quota'
} else if (detail.process_type === 'ZS02') {
if (detail.zzfld00002j === 'V013') {
path = 'order-detail-group/order-detail-group'
} else {
path = 'order-detail-noquota/order-detail-noquota'
}
} else {
return
}
uni.navigateTo({ uni.navigateTo({
url:"/pages/order-detail-group/order-detail-group" url: `/pages/${path}?order=${JSON.stringify(detail)}`
}) })
}, },
refreshData() { refreshData() {
...@@ -170,6 +219,7 @@ ...@@ -170,6 +219,7 @@
} }
this.pulling = true; this.pulling = true;
this.refreshing = true; this.refreshing = true;
this.page.PAGE = 1
this.refreshText = "正在刷新..."; this.refreshText = "正在刷新...";
this.loadData(true); this.loadData(true);
}, },
...@@ -198,12 +248,6 @@ ...@@ -198,12 +248,6 @@
this.refreshFlag = false; this.refreshFlag = false;
this.refreshText = "下拉可以刷新"; this.refreshText = "下拉可以刷新";
} }
},
newGuid() {
let s4 = function() {
return (65536 * (1 + Math.random()) | 0).toString(16).substring(1);
}
return (s4() + s4() + "-" + s4() + "-4" + s4().substr(0, 3) + "-" + s4() + "-" + s4() + s4() + s4()).toUpperCase();
} }
} }
} }
......
pages/order-detail-noquota/order-detail-noquota.nvue
View file @ e6829ce4
...@@ -5,23 +5,24 @@ ...@@ -5,23 +5,24 @@
<view class="main"> <view class="main">
<view class="order-main view"> <view class="order-main view">
<view class="top"> <view class="top">
<text class="title-no">订单编号：TP10000021</text> <text class="title-no">订单编号：{{INFO.OBJECT_ID}}</text>
<view class="title-info"> <view class="title-info">
<button class="title-info__status title-info__status-done" type="default">待审批</button> <button class="title-info__status title-info__status-done"
type="default">{{INFO.STATUS_TEXT}}</button>
</view> </view>
</view> </view>
<view class="order-main-middle view"> <view class="order-main-middle view">
<view class="middle-title"> <view class="middle-title">
<text class="middle-title__text">非配额订单</text> <text class="middle-title__text">{{INFO.PROCESS_TYPE_TEXT}}</text>
</view> </view>
<view class="text-block-box"> <view class="text-block-box">
<view class="text-block text-block-last"> <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> <text class="middle-date-des">下单日期</text>
</view> </view>
<view class="text-block text-block-last"> <view class="text-block text-block-last">
<view class="middle-date-right"> <view class="middle-date-right">
<text class="middle-date">¥5000</text> <text class="middle-date">{{INFO.OBJECT_ID}}</text>
</view> </view>
<text class="middle-date-des middle-date-right">金额</text> <text class="middle-date-des middle-date-right">金额</text>
</view> </view>
...@@ -30,38 +31,38 @@ ...@@ -30,38 +31,38 @@
</view> </view>
<view class="order-middle view" :class="{'order-middle-auto':ishowReceiveDetail}"> <view class="order-middle view" :class="{'order-middle-auto':ishowReceiveDetail}">
<view class="middle view"> <view class="middle view" v-for="(item,index) in ITEM" :key="index">
<view class="item-block item-block-name"> <view class="item-block item-block-name">
<text class="item-block-label">电商配额酒年度计划（1-5月）</text> <text class="item-block-label">{{item.ZZFLD000005_Z1}}</text>
</view> </view>
<view class="block-detal"> <view class="block-detal">
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">产品</text> <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>
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">数量</text> <text class="detal-item-label">数量（件)）</text>
<text class="detal-item-value">25</text> <text class="detal-item-value">{{item.ZZFLD000009}}</text>
</view> </view>
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">合数</text> <text class="detal-item-label">盒数</text>
<text class="detal-item-value">25</text> <text class="detal-item-value">{{item.ZZFLD00002W}}</text>
</view> </view>
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">单价</text> <text class="detal-item-label">单价</text>
<text class="detal-item-value">¥880</text> <text class="detal-item-value">{{item.NET_PRICE}}</text>
</view> </view>
<view class="block-detal-item block-detal-item-last"> <view class="block-detal-item block-detal-item-last">
<text class="detal-item-label"></text> <text class="detal-item-label"></text>
<view class="detal-item-value"> <view class="detal-item-value">
<text class="item-value-intotal">小计：</text> <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> </view>
</view> </view>
</view> </view>
<view class="middle view"> <!-- <view class="middle view">
<view class="item-block item-block-name"> <view class="item-block item-block-name">
<text class="item-block-label">电商配额酒年度计划（1-5月）</text> <text class="item-block-label">电商配额酒年度计划（1-5月）</text>
</view> </view>
...@@ -90,7 +91,7 @@ ...@@ -90,7 +91,7 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view> -->
<view class="float-btn-block"> <view class="float-btn-block">
<view class="float-btn" @click="handleShowReceiveDetail"> <view class="float-btn" @click="handleShowReceiveDetail">
...@@ -131,10 +132,20 @@ ...@@ -131,10 +132,20 @@
mapState mapState
} from 'vuex' } from 'vuex'
import {
apiGetSalesOrderDetail
} from '@/servers/salesOrder.js'
export default { export default {
data() { data() {
return { return {
ishowReceiveDetail:false ishowReceiveDetail: false,
orderItem: {},
orderDetail: {
ITEM: [],
INFO: {},
ATTACHMENT: []
}
} }
}, },
computed: { computed: {
...@@ -144,8 +155,28 @@ ...@@ -144,8 +155,28 @@
'height': `${this.sysinfo.safeArea.top + 44}px` '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: { methods: {
async getOrderDetail() {
const params = {
OBJECT_ID: this.orderItem.object_id
}
const res = await apiGetSalesOrderDetail(params)
this.orderDetail = res.DATA
},
handleShowReceiveDetail() { handleShowReceiveDetail() {
this.ishowReceiveDetail = !this.ishowReceiveDetail this.ishowReceiveDetail = !this.ishowReceiveDetail
}, },
...@@ -210,20 +241,20 @@ ...@@ -210,20 +241,20 @@
line-height: 48rpx; line-height: 48rpx;
background: #f61d30; background: #f61d30;
border-radius: 8rpx 200rpx 200rpx 8rpx; border-radius: 8rpx 200rpx 200rpx 8rpx;
border:1px solid #f61d30; border: 1px solid #f61d30;
font-size: 12px; font-size: 12px;
color: #fff; color: #fff;
text-align: center; text-align: center;
} }
.title-info__status:after { .title-info__status:after {
border:0; border: 0;
} }
.title-info__status-done{ .title-info__status-done {
background: #f8f8f8; background: #f8f8f8;
color: #888888; color: #888888;
border:1px solid #f8f8f8; border: 1px solid #f8f8f8;
} }
.order-main-middle { .order-main-middle {
...@@ -276,7 +307,7 @@ ...@@ -276,7 +307,7 @@
justify-content: flex-end; justify-content: flex-end;
} }
.order-middle{ .order-middle {
position: relative; position: relative;
height: 290rpx; height: 290rpx;
overflow: hidden; overflow: hidden;
...@@ -310,7 +341,7 @@ ...@@ -310,7 +341,7 @@
padding-bottom: 32rpx; padding-bottom: 32rpx;
} }
.icon-file{ .icon-file {
width: 29px; width: 29px;
height: 35px; height: 35px;
} }
...@@ -326,7 +357,7 @@ ...@@ -326,7 +357,7 @@
justify-content: space-between; justify-content: space-between;
} }
.block-detal-item-last{ .block-detal-item-last {
margin-bottom: 0; margin-bottom: 0;
} }
...@@ -335,23 +366,23 @@ ...@@ -335,23 +366,23 @@
font-size: 24rpx; font-size: 24rpx;
} }
.detal-item-file{ .detal-item-file {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.detal-item-value{ .detal-item-value {
color: #333; color: #333;
font-size: 28rpx; font-size: 28rpx;
} }
.item-value-intotal{ .item-value-intotal {
color: #333; color: #333;
font-size: 28rpx; font-size: 28rpx;
font-weight: 500; font-weight: 500;
} }
.item-value-intotal-num{ .item-value-intotal-num {
color: #FF1D32; color: #FF1D32;
font-size: 28rpx; font-size: 28rpx;
font-weight: 500; font-weight: 500;
...@@ -361,12 +392,12 @@ ...@@ -361,12 +392,12 @@
width: 116rpx; width: 116rpx;
height: 54rpx; height: 54rpx;
line-height: 50rpx; line-height: 50rpx;
border:1px solid $wly-primary-color; border: 1px solid $wly-primary-color;
background: #fff; background: #fff;
border-radius: 30rpx; border-radius: 30rpx;
} }
.btn:after{ .btn:after {
border: 0; border: 0;
} }
......
pages/order-detail-quota/order-detail-quota.nvue
View file @ e6829ce4
...@@ -5,23 +5,23 @@ ...@@ -5,23 +5,23 @@
<view class="main"> <view class="main">
<view class="order-main view"> <view class="order-main view">
<view class="top"> <view class="top">
<text class="title-no">订单编号：TP10000021</text> <text class="title-no">订单编号：{{INFO.OBJECT_ID}}</text>
<view class="title-info"> <view class="title-info">
<button class="title-info__status" type="default">待审批</button> <button class="title-info__status" type="default">{{INFO.STATUS_TEXT}}</button>
</view> </view>
</view> </view>
<view class="order-main-middle view"> <view class="order-main-middle view">
<view class="middle-title"> <view class="middle-title">
<text class="middle-title__text">配额订单</text> <text class="middle-title__text">{{INFO.PROCESS_TYPE_TEXT}}</text>
</view> </view>
<view class="text-block-box"> <view class="text-block-box">
<view class="text-block text-block-last"> <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> <text class="middle-date-des">下单日期</text>
</view> </view>
<view class="text-block text-block-last"> <view class="text-block text-block-last">
<view class="middle-date-right"> <view class="middle-date-right">
<text class="middle-date">¥5000</text> <text class="middle-date">{{INFO.OBJECT_ID}}</text>
</view> </view>
<text class="middle-date-des middle-date-right">金额</text> <text class="middle-date-des middle-date-right">金额</text>
</view> </view>
...@@ -34,36 +34,36 @@ ...@@ -34,36 +34,36 @@
<view class="item-block item-block-name"> <view class="item-block item-block-name">
<text class="item-block-label">计划内</text> <text class="item-block-label">计划内</text>
</view> </view>
<view class="block-detal"> <view class="block-detal" v-for="(item,index) in ITEM_INNER" :key="index">
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">计划编号</text> <text class="detal-item-label">计划编号</text>
<text class="detal-item-value">3810000023</text> <text class="detal-item-value">{{item.ZZFLD000005}}</text>
</view> </view>
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">计划类型</text> <text class="detal-item-label">计划类型</text>
<text class="detal-item-value">专卖店配额计划</text> <text class="detal-item-value">{{item.ZZFLD00002Q_Z1}}</text>
</view> </view>
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">产品</text> <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>
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">数量</text> <text class="detal-item-label">数量（件)）</text>
<text class="detal-item-value">25</text> <text class="detal-item-value">{{item.ZZFLD000009}}</text>
</view> </view>
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">合数</text> <text class="detal-item-label">盒数</text>
<text class="detal-item-value">25</text> <text class="detal-item-value">{{item.ZZFLD00002W}}</text>
</view> </view>
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">单价</text> <text class="detal-item-label">单价</text>
<text class="detal-item-value">¥880</text> <text class="detal-item-value">{{item.NET_PRICE}}</text>
</view> </view>
<view class="block-detal-item block-detal-item-last"> <view class="block-detal-item block-detal-item-last">
<text class="detal-item-label"></text> <text class="detal-item-label"></text>
<view class="detal-item-value"> <view class="detal-item-value">
<text class="item-value-intotal">小计：</text> <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> </view>
</view> </view>
...@@ -73,36 +73,36 @@ ...@@ -73,36 +73,36 @@
<view class="item-block item-block-name"> <view class="item-block item-block-name">
<text class="item-block-label">计划外</text> <text class="item-block-label">计划外</text>
</view> </view>
<view class="block-detal"> <view class="block-detal" v-for="(item,index) in ITEM_OUTER" :key="index">
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">计划编号</text> <text class="detal-item-label">计划编号</text>
<text class="detal-item-value">3810000023</text> <text class="detal-item-value">{{item.ZZFLD000005}}</text>
</view> </view>
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">计划类型</text> <text class="detal-item-label">计划类型</text>
<text class="detal-item-value">专卖店配额计划</text> <text class="detal-item-value">{{item.ZZFLD00002Q_Z1}}</text>
</view> </view>
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">产品</text> <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>
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">数量</text> <text class="detal-item-label">数量（件)）</text>
<text class="detal-item-value">25</text> <text class="detal-item-value">{{item.ZZFLD000009}}</text>
</view> </view>
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">合数</text> <text class="detal-item-label">盒数</text>
<text class="detal-item-value">25</text> <text class="detal-item-value">{{item.ZZFLD00002W}}</text>
</view> </view>
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">单价</text> <text class="detal-item-label">单价</text>
<text class="detal-item-value">¥880</text> <text class="detal-item-value">{{item.NET_PRICE}}</text>
</view> </view>
<view class="block-detal-item block-detal-item-last"> <view class="block-detal-item block-detal-item-last">
<text class="detal-item-label"></text> <text class="detal-item-label"></text>
<view class="detal-item-value"> <view class="detal-item-value">
<text class="item-value-intotal">小计：</text> <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> </view>
</view> </view>
...@@ -147,10 +147,21 @@ ...@@ -147,10 +147,21 @@
mapState mapState
} from 'vuex' } from 'vuex'
import {
apiGetSalesOrderDetail
} from '@/servers/salesOrder.js'
export default { export default {
data() { data() {
return { return {
ishowReceiveDetail:false ishowReceiveDetail: false,
orderItem: {},
orderDetail: {
ITEM_INNER: [],
ITEM_OUTER: [],
INFO: {},
ATTACHMENT: []
}
} }
}, },
computed: { computed: {
...@@ -160,8 +171,31 @@ ...@@ -160,8 +171,31 @@
'height': `${this.sysinfo.safeArea.top + 44}px` 'height': `${this.sysinfo.safeArea.top + 44}px`
} }
}, },
ITEM_INNER() {
return this.orderDetail.ITEM_INNER || []
},
ITEM_OUTER() {
return this.orderDetail.ITEM_OUTER || []
},
INFO() {
return this.orderDetail.INFO || {}
},
ATTACHMENT() {
return this.orderDetail.ATTACHMENT || []
}
},
onLoad(option) {
this.orderItem = JSON.parse(option.order)
this.getOrderDetail()
}, },
methods: { methods: {
async getOrderDetail() {
const params = {
OBJECT_ID: this.orderItem.object_id
}
const res = await apiGetSalesOrderDetail(params)
this.orderDetail = res.DATA
},
handleShowReceiveDetail() { handleShowReceiveDetail() {
this.ishowReceiveDetail = !this.ishowReceiveDetail this.ishowReceiveDetail = !this.ishowReceiveDetail
}, },
...@@ -226,20 +260,20 @@ ...@@ -226,20 +260,20 @@
line-height: 48rpx; line-height: 48rpx;
background: #f61d30; background: #f61d30;
border-radius: 8rpx 200rpx 200rpx 8rpx; border-radius: 8rpx 200rpx 200rpx 8rpx;
border:1px solid #f61d30; border: 1px solid #f61d30;
font-size: 12px; font-size: 12px;
color: #fff; color: #fff;
text-align: center; text-align: center;
} }
.title-info__status:after { .title-info__status:after {
border:0; border: 0;
} }
.title-info__status-done{ .title-info__status-done {
background: #f8f8f8; background: #f8f8f8;
color: #888888; color: #888888;
border:1px solid #f8f8f8; border: 1px solid #f8f8f8;
} }
.order-main-middle { .order-main-middle {
...@@ -292,7 +326,7 @@ ...@@ -292,7 +326,7 @@
justify-content: flex-end; justify-content: flex-end;
} }
.order-middle{ .order-middle {
position: relative; position: relative;
height: 290rpx; height: 290rpx;
overflow: hidden; overflow: hidden;
...@@ -326,7 +360,7 @@ ...@@ -326,7 +360,7 @@
padding-bottom: 32rpx; padding-bottom: 32rpx;
} }
.icon-file{ .icon-file {
width: 29px; width: 29px;
height: 35px; height: 35px;
} }
...@@ -342,7 +376,7 @@ ...@@ -342,7 +376,7 @@
justify-content: space-between; justify-content: space-between;
} }
.block-detal-item-last{ .block-detal-item-last {
margin-bottom: 0; margin-bottom: 0;
} }
...@@ -351,23 +385,23 @@ ...@@ -351,23 +385,23 @@
font-size: 24rpx; font-size: 24rpx;
} }
.detal-item-file{ .detal-item-file {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.detal-item-value{ .detal-item-value {
color: #333; color: #333;
font-size: 28rpx; font-size: 28rpx;
} }
.item-value-intotal{ .item-value-intotal {
color: #333; color: #333;
font-size: 28rpx; font-size: 28rpx;
font-weight: 500; font-weight: 500;
} }
.item-value-intotal-num{ .item-value-intotal-num {
color: #FF1D32; color: #FF1D32;
font-size: 28rpx; font-size: 28rpx;
font-weight: 500; font-weight: 500;
...@@ -377,12 +411,12 @@ ...@@ -377,12 +411,12 @@
width: 116rpx; width: 116rpx;
height: 54rpx; height: 54rpx;
line-height: 50rpx; line-height: 50rpx;
border:1px solid $wly-primary-color; border: 1px solid $wly-primary-color;
background: #fff; background: #fff;
border-radius: 30rpx; border-radius: 30rpx;
} }
.btn:after{ .btn:after {
border: 0; border: 0;
} }
......
pages/produce-material/produce-plan.nvue
View file @ e6829ce4
...@@ -100,11 +100,11 @@ ...@@ -100,11 +100,11 @@
</view> </view>
<view class="popup-content-content"> <view class="popup-content-content">
<text class="popup-content-content__title">提交成功</text> <text class="popup-content-content__title">提交成功</text>
<text class="popup-content-content__title2">生产备料编号：{{ orderInfo.OBJECT_ID }}</text> <!-- <text class="popup-content-content__title2">生产备料编号：{{ orderInfo.OBJECT_ID }}</text> -->
<text class="popup-content-content__title2">生产备料单号：{{ orderInfo.PRODPL_ID }}</text> <text class="popup-content-content__title2">生产备料单号：{{ orderInfo.PACKPL_ID }}</text>
</view> </view>
<view class="popup-content-foot"> <view class="popup-content-foot">
<text class="popup-content-foot__btn" @click="fnBackHome()">继续添加</text> <text class="popup-content-foot__btn" @click="resetData()">继续添加</text>
<text class="popup-content-foot__btn popup-content-foot__sure" <text class="popup-content-foot__btn popup-content-foot__sure"
@click="fnCheckOrderByNo()">查看备料</text> @click="fnCheckOrderByNo()">查看备料</text>
</view> </view>
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
HEADINFO: {}, HEADINFO: {},
productInitInfo: {}, productInitInfo: {},
orderInfo: { orderInfo: {
OBJECT_ID: '' PACKPL_ID: ''
}, },
} }
}, },
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
...mapState(['sysinfo', 'userInfo']) ...mapState(['sysinfo', 'userInfo'])
}, },
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
this.initProduceMaterialPlanData() this.submit()
}, },
created() { created() {
this.initProduceMaterialPlanData() this.initProduceMaterialPlanData()
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
item = { item = {
...item, ...item,
...product, ...product,
...res.DATA[0] ...res.DATA.ITEM[0]
} }
} }
return item return item
...@@ -302,9 +302,6 @@ ...@@ -302,9 +302,6 @@
handleDel(index, ) { handleDel(index, ) {
this.planinnerLists.splice(index, 1) this.planinnerLists.splice(index, 1)
}, },
fnBackHome() {
this.$refs.popup.close()
},
fnCheckOrderByNo() { fnCheckOrderByNo() {
this.$refs.popup.close() this.$refs.popup.close()
uni.navigateTo({ uni.navigateTo({
...@@ -324,17 +321,19 @@ ...@@ -324,17 +321,19 @@
async submit() { async submit() {
const params = { const params = {
USER_BP: this.userInfo.customerCode,
HEAD: this.HEADINFO, HEAD: this.HEADINFO,
ITEM: this.planinnerLists ITEM: this.planinnerLists
} }
const res = await apiUpdateProduceMaterialOrder(params) const res = await apiUpdateProduceMaterialOrder(params)
const { const {
DATA1: HEAD2, HEAD: HEAD2,
DATA2: ITEM2 ITEM: ITEM2
} = res } = res
const params2 = { const params2 = {
USER_BP: this.userInfo.customerCode,
HEAD: HEAD2, HEAD: HEAD2,
ITEM: ITEM2 ITEM: ITEM2
} }
...@@ -344,7 +343,7 @@ ...@@ -344,7 +343,7 @@
const res2 = await apiSubmitProduceMaterialOrder(params2) const res2 = await apiSubmitProduceMaterialOrder(params2)
this.orderInfo = res.DATA1 this.orderInfo = res.HEAD
this.$refs.popup.open('center') this.$refs.popup.open('center')
}, },
...@@ -353,6 +352,10 @@ ...@@ -353,6 +352,10 @@
this.salesCenterIndex = -1 this.salesCenterIndex = -1
this.selectedSalesCenter = {} this.selectedSalesCenter = {}
this.initProduceMaterialPlanData() this.initProduceMaterialPlanData()
this.$refs.popup.close()
},
change(e) {
console.log('当前模式：' + e.type + ',状态：' + e.show);
} }
} }
} }
......
pages/produce-order/produce-plan.nvue
View file @ e6829ce4
...@@ -83,11 +83,11 @@ ...@@ -83,11 +83,11 @@
</view> </view>
<view class="popup-content-content"> <view class="popup-content-content">
<text class="popup-content-content__title">提交成功</text> <text class="popup-content-content__title">提交成功</text>
<text class="popup-content-content__title2">生产计划编号：{{ orderInfo.OBJECT_ID }}</text> <!-- <text class="popup-content-content__title2">生产计划编号：{{ orderInfo.OBJECT_ID }}</text> -->
<text class="popup-content-content__title2">生产计划单号：{{ orderInfo.PRODPL_ID }}</text> <text class="popup-content-content__title2">生产计划单号：{{ orderInfo.PRODPL_ID }}</text>
</view> </view>
<view class="popup-content-foot"> <view class="popup-content-foot">
<text class="popup-content-foot__btn" @click="fnBackHome()">继续添加</text> <text class="popup-content-foot__btn" @click="resetData()">继续添加</text>
<text class="popup-content-foot__btn popup-content-foot__sure" <text class="popup-content-foot__btn popup-content-foot__sure"
@click="fnCheckOrderByNo()">查看计划</text> @click="fnCheckOrderByNo()">查看计划</text>
</view> </view>
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
HEADINFO: {}, HEADINFO: {},
productInitInfo: {}, productInitInfo: {},
orderInfo: { orderInfo: {
OBJECT_ID: '' PRODPL_ID: ''
}, },
} }
}, },
...@@ -288,9 +288,8 @@ ...@@ -288,9 +288,8 @@
handleDel(index, ) { handleDel(index, ) {
this.planinnerLists.splice(index, 1) this.planinnerLists.splice(index, 1)
}, },
fnBackHome() { change(e) {
this.resetData() console.log('当前模式：' + e.type + ',状态：' + e.show);
this.$refs.popup.close()
}, },
fnCheckOrderByNo() { fnCheckOrderByNo() {
this.$refs.popup.close() this.$refs.popup.close()
......
pages/ticket-order/order-item.nvue
View file @ e6829ce4
<template> <template>
<view class="order view"> <view class="order view">
<view class="top"> <view class="top">
<text class="title-no">制票编号：TP10000021</text> <text class="title-no">制票编号：{{itemHead.INVO_INFOID}}</text>
<view class="title-info"> <view class="title-info">
<button class="title-info__status" type="default"><text class="item-block-btn__text">待审批</text></button> <button class="title-info__status" type="default"><text
class="item-block-btn__text">{{itemHead.INV_STATUS_TEXT}}</text></button>
</view> </view>
</view> </view>
<view class="middle view"> <view class="middle view">
<text class="middle-title">配额酒制票通知单(计划内)</text> <text class="middle-title">{{itemHead.INFTYPE}}</text>
<view class="text-block"> <view class="text-block">
<text class="middle-date">2021-08-06 05:14</text> <text class="middle-date">{{itemHead.MAK_DATE}}</text>
<text class="middle-date-des">下单日期</text> <text class="middle-date-des">下单日期</text>
</view> </view>
<view class="text-block">
<text class="middle-date middle-billno">92353634474578</text>
<text class="middle-date-des">发票号</text>
</view>
</view> </view>
<view class="bottom view"> <view class="bottom view">
<view class="bottom-nav"> <view class="bottom-nav">
...@@ -25,52 +22,56 @@ ...@@ -25,52 +22,56 @@
src="@/static/image/arrow_up@3x.png" mode="aspectFit"></image> src="@/static/image/arrow_up@3x.png" mode="aspectFit"></image>
</view> </view>
</view> </view>
<view v-if="ishowDetail" class="bottom-content"> <view v-if="ishowDetail" class="bottom-content" v-for="(item,index) in itemLists" :key="index">
<view class="text-block"> <view class="text-block">
<text class="middle-date">五粮液1618</text> <text class="middle-date">{{item.DESCRIPTION}}</text>
<text class="middle-date-des">产品描述</text> <text class="middle-date-des">产品描述</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">52% 500ml *4</text> <text class="middle-date middle-billno">{{item.INV_GUID}}</text>
<text class="middle-date-des">发票号</text>
</view>
<view class="text-block">
<text class="middle-date">{{item.ZZFLD00002S}}</text>
<text class="middle-date-des">规格</text> <text class="middle-date-des">规格</text>
</view> </view>
<view class="text-block-2"> <view class="text-block-2">
<view class="text-block text-block-1"> <view class="text-block text-block-1">
<text class="middle-date">100</text> <text class="middle-date">{{item.USE_ZZFLD9}}</text>
<text class="middle-date-des">开票件数</text> <text class="middle-date-des">开票件数</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">瓶</text> <text class="middle-date">{{item.ZZFLD00002T}}</text>
<text class="middle-date-des">单位</text> <text class="middle-date-des">单位</text>
</view> </view>
</view> </view>
<view class="text-block-2"> <view class="text-block-2">
<view class="text-block text-block-1"> <view class="text-block text-block-1">
<text class="middle-date">100</text> <text class="middle-date">{{item.NET_PRICE}}</text>
<text class="middle-date-des">单价</text> <text class="middle-date-des">单价</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">4000</text> <text class="middle-date">{{item.USE_QUANTITY}}</text>
<text class="middle-date-des">数量</text> <text class="middle-date-des">数量</text>
</view> </view>
</view> </view>
<view class="text-block-2"> <view class="text-block-2">
<view class="text-block text-block-1"> <view class="text-block text-block-1">
<text class="middle-date">100</text> <text class="middle-date">{{item.REMAIN_ZZFLD9}}</text>
<text class="middle-date-des">剩余开票件数</text> <text class="middle-date-des">剩余开票件数</text>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">17%</text> <text class="middle-date">{{item.ZZFLD00002E}}</text>
<text class="middle-date-des">税率</text> <text class="middle-date-des">税率</text>
</view> </view>
</view> </view>
<view class="text-block-2"> <view class="text-block-2">
<view class="text-block text-block-1"> <!-- <view class="text-block text-block-1">
<text class="middle-date">100</text> <text class="middle-date">{{item.INV_GUID}}</text>
<text class="middle-date-des">剩余发货件数</text> <text class="middle-date-des">剩余发货件数</text>
</view> </view> -->
<view class="text-block"> <view class="text-block">
<text class="middle-date">400,000.00</text> <text class="middle-date">{{item.NET_VALUE}}</text>
<text class="middle-date-des">价税合计</text> <text class="middle-date-des">价税合计</text>
</view> </view>
</view> </view>
...@@ -86,10 +87,21 @@ ...@@ -86,10 +87,21 @@
newsItem: { newsItem: {
type: Object, type: Object,
default: function(e) { default: function(e) {
return {} return {
HEAD: {},
ITEM: []
}
} }
} }
}, },
computed: {
itemHead() {
return this.newsItem.HEAD || {}
},
itemLists() {
return this.newsItem.ITEM || []
},
},
data() { data() {
return { return {
ishowDetail: true ishowDetail: true
...@@ -142,7 +154,6 @@ ...@@ -142,7 +154,6 @@
} }
.title-info__status { .title-info__status {
width: 120rpx;
height: 48rpx; height: 48rpx;
line-height: 48rpx; line-height: 48rpx;
background: #f61d30; background: #f61d30;
......
pages/ticket-order/order-page.nvue
View file @ e6829ce4
<template> <template>
<view class="page-news"> <view class="page-news">
<uni-list ref="list" class="listview" :enableBackToTop="true" :scroll-y="true" @scrolltolower="loadMore()"> <uni-list ref="list" class="listview" :enableBackToTop="true" :scroll-y="true" @scrolltolower="loadMore()">
<uni-refresh class="refresh" @refresh="onrefresh" @pullingdown="onpullingdown" :display="refreshing ? 'show' : 'hide'"> <uni-refresh class="refresh" @refresh="onrefresh" @pullingdown="onpullingdown"
:display="refreshing ? 'show' : 'hide'">
<div class="refresh-view"> <div class="refresh-view">
<image class="refresh-icon" :src="refreshIcon" :style="{width: (refreshing || pulling) ? 0: '32px'}" :class="{'refresh-icon-active': refreshFlag}"></image> <image class="refresh-icon" :src="refreshIcon" :style="{width: (refreshing || pulling) ? 0: '32px'}"
<uni-load-more v-if="refreshing" class="loading-icon" status="loading" :contentText="loadingMoreText"></uni-load-more> :class="{'refresh-icon-active': refreshFlag}"></image>
<uni-load-more v-if="refreshing" class="loading-icon" status="loading"
:contentText="loadingMoreText"></uni-load-more>
<text class="loading-text">{{refreshText}}</text> <text class="loading-text">{{refreshText}}</text>
</div> </div>
</uni-refresh> </uni-refresh>
...@@ -22,7 +25,6 @@ ...@@ -22,7 +25,6 @@
</template> </template>
<script> <script>
import uniList from '@/components/uni-list.vue'; import uniList from '@/components/uni-list.vue';
import uniCell from '@/components/uni-cell.vue'; import uniCell from '@/components/uni-cell.vue';
import uniRefresh from '@/components/uni-refresh.vue'; import uniRefresh from '@/components/uni-refresh.vue';
...@@ -30,6 +32,14 @@ ...@@ -30,6 +32,14 @@
import noData from '@/components/nodata.nvue'; import noData from '@/components/nodata.nvue';
import orderItem from './order-item.nvue'; import orderItem from './order-item.nvue';
import {
mapState
} from 'vuex'
import {
apiGetTicketOrder
} from '@/servers/ticketOrder.js'
export default { export default {
components: { components: {
uniList, uniList,
...@@ -41,7 +51,7 @@ ...@@ -41,7 +51,7 @@
}, },
props: { props: {
nid: { nid: {
type: [Number, String], type: String,
default: '' default: ''
} }
}, },
...@@ -63,27 +73,37 @@ ...@@ -63,27 +73,37 @@
contentrefresh: '', contentrefresh: '',
contentnomore: '' contentnomore: ''
}, },
refreshIcon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAB5QTFRFcHBw3Nzct7e39vb2ycnJioqK7e3tpqam29vb////D8oK7wAAAAp0Uk5T////////////ALLMLM8AAABxSURBVHja7JVBDoAgDASrjqj//7CJBi90iyYeOHTPMwmFZrHjYyyFYYUy1bwUZqtJIYVxhf1a6u0R7iUvWsCcrEtwJHp8MwMdvh2amHduiZD3rpWId9+BgPd7Cc2LIkPyqvlQvKxKBJ//Qwq/CacAAwDUv0a0YuKhzgAAAABJRU5ErkJggg==" refreshIcon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAB5QTFRFcHBw3Nzct7e39vb2ycnJioqK7e3tpqam29vb////D8oK7wAAAAp0Uk5T////////////ALLMLM8AAABxSURBVHja7JVBDoAgDASrjqj//7CJBi90iyYeOHTPMwmFZrHjYyyFYYUy1bwUZqtJIYVxhf1a6u0R7iUvWsCcrEtwJHp8MwMdvh2amHduiZD3rpWId9+BgPd7Cc2LIkPyqvlQvKxKBJ//Qwq/CacAAwDUv0a0YuKhzgAAAABJRU5ErkJggg==",
condition: {
PARTNER: '4001139400',
ROLE: 'WLY001',
INV_STATUS: [{
"SIGN": "I",
"OPTION": "EQ",
LOW: '',
HIGH: ''
}],
MAK_DATE: [{
"SIGN": "I",
"OPTION": "BT",
LOW: '',
HIGH: ''
}]
},
page: {
"PAGE": "1",
"PAGESIZE": "10",
}
} }
}, },
computed: {
...mapState(['sysinfo'])
},
created() { created() {
this.pullTimer = null; this.pullTimer = null;
this.requestParams = {
columnId: this.nid,
minId: 0,
pageSize: 10,
column: 'id,post_id,title,author_name,cover,published_at,comments_count'
};
this._isWidescreen = false; this._isWidescreen = false;
// #ifdef H5 this.loadData()
var mediaQueryOb = uni.createMediaQueryObserver(this)
mediaQueryOb.observe({
minWidth: 768
}, matches => {
this._isWidescreen = matches;
})
// #endif
}, },
methods: { methods: {
loadData(refresh) { loadData(refresh) {
...@@ -93,50 +113,54 @@ ...@@ -93,50 +113,54 @@
this.isLoading = true; this.isLoading = true;
this.isNoData = false; this.isNoData = false;
this.requestParams.time = new Date().getTime() + '';
var startTime = new Date(); let MAK_DATE = []
uni.request({ let INV_STATUS = []
// url: this.$host + 'api/news', if (this.condition.MAK_DATE[0].LOW === '') {
url: 'https://unidemo.dcloud.net.cn/api/news', MAK_DATE = []
data: this.requestParams, } else {
success: (result) => { MAK_DATE = this.condition.MAK_DATE
var endTime = new Date(); }
const data = result.data;
this.isNoData = (data.length <= 0);
const data_list = data.map((news) => { if (this.nid === '') {
return { INV_STATUS = []
id: this.newGuid() + news.id, } else {
newsid: news.id, this.condition.INV_STATUS[0].LOW = this.nid
article_type: 1, INV_STATUS = this.condition.INV_STATUS
datetime: (new Date(news.published_at.replace(/\-/g, '/')).getTime()), }
title: news.title,
image_url: news.cover, const params = {
source: news.author_name, ...this.condition,
comment_count: news.comments_count, INV_STATUS,
post_id: news.post_id MAK_DATE,
}; ...this.page
}); }
apiGetTicketOrder(params).then((res) => {
console.log('loadData', res)
const {
DATA,
PAGE,
TOTAL
} = res
const data_list = DATA;
this.page.PAGE = PAGE
this.isNoData = (data_list.length <= 0);
if (refresh) { if (refresh) {
this.dataList = data_list; this.dataList = data_list;
this.requestParams.minId = 0;
} else { } else {
this.dataList = this.dataList.concat(data_list); this.dataList = this.dataList.concat(data_list);
this.requestParams.minId = data[data.length - 1].id;
} }
if (this.dataList.length > 0 && this._isWidescreen && this.dataList.length <= 10) { if (this.dataList.length > 0 && this._isWidescreen && this.dataList.length <= 10) {
this.goDetail(this.dataList[0]); this.goDetail(this.dataList[0]);
} }
}, }).catch(() => {
fail: (err) => {
if (this.dataList.length == 0) { if (this.dataList.length == 0) {
this.isNoData = true; this.isNoData = true;
} }
}, }).finally(() => {
complete: (e) => {
this.isLoading = false; this.isLoading = false;
if (refresh) { if (refresh) {
this.refreshing = false; this.refreshing = false;
...@@ -149,15 +173,15 @@ ...@@ -149,15 +173,15 @@
this.pulling = false; this.pulling = false;
}, 1000); }, 1000);
} }
} })
});
}, },
loadMore(e) { loadMore(e) {
console.log('loadMore')
this.page.PAGE++
this.loadData(); this.loadData();
}, },
clear() { clear() {
this.dataList.length = 0; this.dataList.length = 0;
this.requestParams.minId = 0;
}, },
goDetail(detail) { goDetail(detail) {
...@@ -169,6 +193,7 @@ ...@@ -169,6 +193,7 @@
this.pulling = true; this.pulling = true;
this.refreshing = true; this.refreshing = true;
this.refreshText = "正在刷新..."; this.refreshText = "正在刷新...";
this.page.PAGE = 1
this.loadData(true); this.loadData(true);
}, },
onrefresh(e) { onrefresh(e) {
...@@ -196,12 +221,6 @@ ...@@ -196,12 +221,6 @@
this.refreshFlag = false; this.refreshFlag = false;
this.refreshText = "下拉可以刷新"; this.refreshText = "下拉可以刷新";
} }
},
newGuid() {
let s4 = function() {
return (65536 * (1 + Math.random()) | 0).toString(16).substring(1);
}
return (s4() + s4() + "-" + s4() + "-4" + s4().substr(0, 3) + "-" + s4() + "-" + s4() + s4() + s4()).toUpperCase();
} }
} }
} }
......
pages/ticket-order/ticket-order.nvue
View file @ e6829ce4
...@@ -77,15 +77,15 @@ ...@@ -77,15 +77,15 @@
tabList: [{ tabList: [{
id: "tab01", id: "tab01",
name: '全部', name: '全部',
newsid: 0 newsid: ''
}, { }, {
id: "tab02", id: "tab02",
name: '待审批', name: '待审批',
newsid: 23 newsid: 'E004'
}, { }, {
id: "tab03", id: "tab03",
name: '已审批', name: '已审批',
newsid: 223 newsid: 'E005'
}], }],
tabIndex: 0, tabIndex: 0,
cacheTab: [], cacheTab: [],
...@@ -465,7 +465,7 @@ ...@@ -465,7 +465,7 @@
flex-wrap: wrap; flex-wrap: wrap;
} }
.empty{ .empty {
height: 124rpx; height: 124rpx;
} }
......
servers/produceMaterial.js
View file @ e6829ce4
...@@ -37,7 +37,7 @@ export async function apiUpdateProduceMaterialPlanData(params) { ...@@ -37,7 +37,7 @@ export async function apiUpdateProduceMaterialPlanData(params) {
* @returns {Promise<AxiosResponse<T>>} * @returns {Promise<AxiosResponse<T>>}
*/ */
export async function apiUpdateProduceMaterialOrder(params) { export async function apiUpdateProduceMaterialOrder(params) {
const res = await apiHelper.post('/sap/bc/ztpm/to_new_crm/transdata/prodplan03', params) const res = await apiHelper.post('/sap/bc/ztpm/to_new_crm/transdata/materialpln', params)
return res return res
} }
...@@ -47,7 +47,7 @@ export async function apiUpdateProduceMaterialOrder(params) { ...@@ -47,7 +47,7 @@ export async function apiUpdateProduceMaterialOrder(params) {
* @returns {Promise<AxiosResponse<T>>} * @returns {Promise<AxiosResponse<T>>}
*/ */
export async function apiSubmitProduceMaterialOrder(params) { export async function apiSubmitProduceMaterialOrder(params) {
const res = await apiHelper.post('/sap/bc/ztpm/to_new_crm/masterdata/materialplnsubm', params) const res = await apiHelper.post('/sap/bc/ztpm/to_new_crm/transdata/materialplnsubm', params)
return res return res
} }
......
servers/salesOrder.js 0 → 100644
View file @ e6829ce4
import apiHelper from './api.helper.js'
/**
* 根据搜索条件查询销售订单信息。
* @param name 账户名
* @returns {Promise<AxiosResponse<T>>}
*/
export async function apiGetSalesOrder(params) {
const res = await apiHelper.post('/sap/bc/ztpm/to_new_crm/transdata/get_so', params)
return res
}
/**
* 根据销售订单ID查询详情。
* @param name 账户名
* @returns {Promise<AxiosResponse<T>>}
*/
export async function apiGetSalesOrderDetail(params) {
const res = await apiHelper.post('/sap/bc/ztpm/to_new_crm/transdata/get_so_by_id', params)
return res
}
servers/ticketOrder.js 0 → 100644
View file @ e6829ce4
import apiHelper from './api.helper.js'
/**
* 根据搜索条件查询制票通知单信息。
* @param name 账户名
* @returns {Promise<AxiosResponse<T>>}
*/
export async function apiGetTicketOrder(params) {
const res = await apiHelper.post('/sap/bc/ztpm/to_new_crm/transdata/zhipiao13', params)
return res
}
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