Skip to content

W
wly-APP
Commit 46b92c3c authored by xiangzj's avatar xiangzj
Browse files
Options

要货和销售计划修复

parent 666007cc
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 34 deletions
pages/group-buy/order-upload.nvue
View file @ 46b92c3c
......@@ -49,7 +49,7 @@
<view class="middle summary">
<view class="summary-block">
<image class="icon_plan" src="@/static/image/icon_plan@3x.png" mode=""></image>
<text class="upload-text">附件上传</text>
<text class="upload-text">附件上传(最多上传4张图片)</text>
</view>
<view class="upload-block">
<uni-file-picker ref='files' limit="4" :auto-upload='false' v-model="fileList" file-mediatype="image"
......
pages/my-order/my-order.nvue
View file @ 46b92c3c
......@@ -198,13 +198,15 @@
},
bindPickerStatusChange(e) {
console.log('bindPickerStatusChange', e)
this.condition.status[0].low = this.selectProcessStatus[e.detail.value].value
this.statusView = this.selectProcessStatus[e.detail.value].name
const idx = e.detail.value || 0
this.condition.status[0].low = this.selectProcessStatus[idx].value
this.statusView = this.selectProcessStatus[idx].name
},
bindPickerTypeChange(e) {
console.log('bindPickerTypeChange', e)
this.condition.process_type[0].low = this.selectProcessType[e.detail.value].value
this.typeView = this.selectProcessType[e.detail.value].name
const idx = e.detail.value || 0
this.condition.process_type[0].low = this.selectProcessType[idx].value
this.typeView = this.selectProcessType[idx].name
},
bindPickerYearChange(e) {
console.log('bindPickerYearChange', e.detail.value)
......
pages/no-quota/order-upload.nvue
View file @ 46b92c3c
......@@ -49,7 +49,7 @@
<view class="middle summary">
<view class="summary-block">
<image class="icon_plan" src="@/static/image/icon_plan@3x.png" mode=""></image>
<text class="upload-text">附件上传</text>
<text class="upload-text">附件上传(最多上传4张图片)</text>
</view>
<view class="upload-block">
<uni-file-picker ref='files' limit="4" :auto-upload='false' v-model="fileList" file-mediatype="image"
......
pages/order-detail-noquota/order-detail-noquota.nvue
View file @ 46b92c3c
......@@ -18,6 +18,9 @@
</view>
</view>
<view class="order-main-middle view">
<view class="middle-title middle-unit">
<text class="middle-title__text middle-unit__text">{{INFO.ZZFLD000001_TEXT}}</text>
</view>
<view class="middle-title">
<text class="middle-title__text">{{INFO.PROCESS_TYPE_TEXT}}</text>
</view>
......@@ -302,6 +305,12 @@
color: $text-base-color;
font-family: PingFangSC, PingFangSC-Medium;
}
.middle-unit {
// margin-bottom: 12rpx;
}
.middle-unit__text {
font-size: 24rpx;
}
.text-block {
flex: 1;
......
pages/order-detail-quota/order-detail-quota.nvue
View file @ 46b92c3c
......@@ -216,6 +216,7 @@
}
const res = await apiGetSalesOrderDetail(params)
this.orderDetail = res.DATA
this.handleShowReceiveDetail()
},
handleShowReceiveDetail() {
this.ishowReceiveDetail = !this.ishowReceiveDetail
......
pages/produce-material/order-list.nvue
View file @ 46b92c3c
......@@ -32,6 +32,11 @@
<text class="detal-item-label">吨数</text>
<text class="detal-item-value">{{item.planqty_ton}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">包材保证金</text>
<text class="detal-item-value">{{item.by_dmbtr}}</text>
</view>
<view class="block-detal-item block-detal-item-last">
<text class="detal-item-label">备注</text>
<text class="detal-item-value">{{item.remark}}</text>
......
pages/purchase-plan-detail/purchase-plan-detail.vue
View file @ 46b92c3c
......@@ -7,7 +7,7 @@
<view class="main">
<view class="middle view">
<view class="text-block">
<text class="middle-date">品牌</text>
<text class="middle-date">存货分类</text>
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
......@@ -27,7 +27,7 @@
</view>
</view>
<view class="text-block">
<text class="middle-date">门店</text>
<text class="middle-date">客户名称</text>
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
......
pages/purchase-plan/purchase-plan.nvue
View file @ 46b92c3c
......@@ -118,7 +118,7 @@
<text class="loading-more-text">{{loadingText}}</text>
</view>
</cell>
<view class="planout-block-item__last"> </view>
<!-- <view class="planout-block-item__last"> </view> -->
</list>
<!-- </scroll-view> -->
<no-data v-if="lists.length === 0"></no-data>
......
pages/purchase/purchase.nvue
View file @ 46b92c3c
......@@ -25,8 +25,8 @@
<text class="item-block-value">{{item.infTypeTextView}}</text>
</view>
<view class="item-block item-block-code">
<text class="item-block-label">发票类型</text>
<text class="item-block-value">{{item.invTypeTextView}}</text>
<text class="item-block-label">营销中心</text>
<text class="item-block-value">{{item.zzfld000001TextView}}</text>
</view>
<view class="item-block item-block-code">
<text class="item-block-label">产品</text>
......@@ -58,13 +58,13 @@
<text class="loading-more-text">{{loadingText}}</text>
</view>
</cell>
<cell>
<cell v-if='lists.length===0'>
<view class="empty-block" v-if='lists.length===0'>
<image class="icon-empty" src="@/static/image/no_data@3x.png" mode=""></image>
<text class="empty-text">暂无数据</text>
</view>
</cell>
<view class="planout-block-item__last"> </view>
<!-- <view class="planout-block-item__last"> </view> -->
</list>
</view>
......@@ -91,8 +91,8 @@
loadingText: '加载中...',
refreshing: false,
page: {
"PAGE": "1",
"PAGESIZE": "10",
"page": "1",
"pagesize": "10",
},
loadParams: {
total: 0,
......@@ -114,7 +114,7 @@
},
mainHeight() {
return {
'height': `${this.sysinfo.safeArea.height - 44 }px`,
'height': `${this.sysinfo.safeArea.height - 44 - 30 }px`,
}
},
scrollHeight() {
......@@ -125,10 +125,12 @@
},
onShow() {
this.lists = []
this.reset()
this.getSalesPlanTypes(true)
},
created() {
this.reset()
// this.reset()
// this.getSalesPlan(true)
},
methods: {
purchaseBtn(item) {
......@@ -137,10 +139,10 @@
})
},
async getSalesPlan(isRefresh) {
const params = {
...this.page,
}
// const params = {
// ...this.page,
// }
const params = `?page=${this.page.page}&pagesize=${this.page.pagesize}`
uni.showLoading({
title: '加载中'
});
......@@ -152,14 +154,11 @@
const {
data,
page,
pagesize,
total
} = res
this.page.PAGE = page * 1
this.page.PAGESIZE = pagesize * 1
this.loadParams.total = total * 1
this.loadParams.totalPage = Math.ceil(total * 1 / this.page.PAGESIZE * 1)
this.page.page = data.page * 1
// this.page.pagesize = 20 * 1
this.loadParams.total = data.Total * 1
this.loadParams.totalPage = Math.ceil(data.Total * 1 / this.page.pagesize * 1)
const dataMap = data && data.Rows.length>0 && data.Rows.map((item) => {
item.checked = false
return item
......@@ -193,8 +192,8 @@
},
scrolltolower() {
console.log('onReachBottom');
if (this.page.PAGE < this.loadParams.totalPage) {
this.page.PAGE++
if (this.page.page < this.loadParams.totalPage) {
this.page.page++
this.getSalesPlan()
} else {
this.loadParams.isDone = true
......@@ -208,11 +207,11 @@
isDone: false,
isRefresh: false
}
this.page.PAGE = 1
this.page.page = 1
this.lists = []
this.loadingText = '加载中'
},
async getSalesPlanTypes() {
getSalesPlanTypes() {
this.getSalesPlan()
},
}
......
pages/quota/order-upload.nvue
View file @ 46b92c3c
......@@ -99,7 +99,7 @@
<view class="middle summary">
<view class="summary-block">
<image class="icon_plan" src="@/static/image/icon_plan@3x.png" mode=""></image>
<text class="upload-text">附件上传</text>
<text class="upload-text">附件上传(最多上传4张图片)</text>
</view>
<view class="upload-block">
<uni-file-picker ref='files' limit="4" :auto-upload='false' v-model="fileList" file-mediatype="image"
......
pages/select-sale-plan/select-sale-plan.vue
View file @ 46b92c3c
......@@ -71,6 +71,14 @@
</template> -->
<view class="middle view planout-block-item" v-for="(item,index) in lists" :key='index'
@click="handleChecked($event,item, index)">
<view class="text-block">
<text class="middle-date">年度</text>
<text class="middle-date-des">{{item.GJAHR}}</text>
</view>
<view class="text-block">
<text class="middle-date">月份</text>
<text class="middle-date-des">{{item.MONAT}}</text>
</view>
<view class="text-block">
<text class="middle-date">计划编码</text>
<text class="middle-date-des">{{item.PLAN_NUMBER}}</text>
......
servers/purchaseList.js
View file @ 46b92c3c
......@@ -7,7 +7,7 @@ import apiHelper from './api.helper.js'
* @returns {Promise<AxiosResponse<T>>}
*/
export async function apiPurchaseList(params) {
const res = await apiHelper.post('/crm-app/Invinfo/getUnFinishedInv', params)
const res = await apiHelper.post('/crm-app/Invinfo/getUnFinishedInv'+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