Skip to content

W
wly-APP
Commit 1ca95ba9 authored by xiangzj's avatar xiangzj
Browse files
Options

bug处理

parent aedb6fa6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 700 additions and 584 deletions
pages/group-buy/order-upload.nvue
View file @ 1ca95ba9
......@@ -229,7 +229,7 @@
},
fnCheckOrderByNo() {
this.$refs.popup.close()
uni.navigateTo({
uni.redirectTo({
url: '/pages/my-order/my-order'
})
},
......@@ -485,4 +485,4 @@
padding: 20rpx;
margin-bottom: 20rpx;
}
</style>
</style>
pages/message/message.nvue
View file @ 1ca95ba9
......@@ -82,12 +82,12 @@
})
}
}
if (res.status === 1 && res.data.Rows.length > 0) {
if (res.status === 1) {
if (type === 0) {
this.unreadList = res.data.Rows
this.unreadCount = res.data.Total
this.unreadList = res.data.Rows || []
this.unreadCount = res.data.Total || 0
} else {
this.readList = res.data.Rows
this.readList = res.data.Rows || []
}
}
......
pages/my-order/my-order.nvue
View file @ 1ca95ba9
......@@ -221,11 +221,13 @@
if (this.loadParams.isDone) {
return
}
const condition = JSON.parse(JSON.stringify(this.condition))
const params = {
...this.page,
...this.condition
...condition
}
!params.object_id[0].low && delete params.object_id
params.object_id[0].low = params.object_id[0].low ? '*' + params.object_id[0].low + '*' : delete params.object_id
// !params.object_id[0].low && delete params.object_id
!params.posting_date[0].low && delete params.posting_date
!params.process_type[0].low && delete params.process_type
!params.status[0].low && delete params.status
......
pages/no-quota/order-upload.nvue
View file @ 1ca95ba9
......@@ -252,7 +252,7 @@
},
fnCheckOrderByNo() {
this.$refs.popup.close()
uni.navigateTo({
uni.redirectTo({
url: '/pages/my-order/my-order'
})
},
......
pages/order-detail-group/order-detail-group.nvue
View file @ 1ca95ba9
......@@ -95,7 +95,7 @@
<text class="detal-item-value">{{item.DESCRIPTION}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">数量（件)）</text>
<text class="detal-item-label">数量（件）</text>
<text class="detal-item-value">{{item.ZZFLD000009}}</text>
</view>
<view class="block-detal-item">
......@@ -560,4 +560,4 @@
color: #F61D30;
font-size: 12px;
}
</style>
</style>
pages/order-detail-noquota/order-detail-noquota.nvue
View file @ 1ca95ba9
......@@ -48,7 +48,7 @@
<text class="detal-item-value">{{item.DESCRIPTION}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">数量（件)）</text>
<text class="detal-item-label">数量（件）</text>
<text class="detal-item-value">{{item.ZZFLD000009}}</text>
</view>
<view class="block-detal-item">
......
pages/order-detail-quota/order-detail-quota.nvue
View file @ 1ca95ba9
......@@ -56,7 +56,7 @@
<text class="detal-item-value">{{item.DESCRIPTION}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">数量（件)）</text>
<text class="detal-item-label">数量（件）</text>
<text class="detal-item-value">{{item.ZZFLD000009}}</text>
</view>
<view class="block-detal-item">
......@@ -95,7 +95,7 @@
<text class="detal-item-value">{{item.DESCRIPTION}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">数量（件)）</text>
<text class="detal-item-label">数量（件）</text>
<text class="detal-item-value">{{item.ZZFLD000009}}</text>
</view>
<view class="block-detal-item">
......
pages/order-other-detail/order-other-detail.nvue
View file @ 1ca95ba9
......@@ -95,7 +95,7 @@
<text class="detal-item-value">{{item.DESCRIPTION}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">数量（件)）</text>
<text class="detal-item-label">数量（件）</text>
<text class="detal-item-value">{{item.ZZFLD000009}}</text>
</view>
<view class="block-detal-item">
......
pages/produce-material/produce-plan.nvue
View file @ 1ca95ba9
......@@ -310,7 +310,7 @@
},
fnCheckOrderByNo() {
this.$refs.popup.close()
uni.navigateTo({
uni.redirectTo({
url: `/pages/produce-material/produce-material`
})
},
......
pages/produce-order/produce-plan.nvue
View file @ 1ca95ba9
......@@ -300,7 +300,7 @@
},
fnCheckOrderByNo() {
this.$refs.popup.close()
uni.navigateTo({
uni.redirectTo({
url: `/pages/produce-order/produce-order`
})
},
......
pages/purchase-main/purchase-main.nvue
View file @ 1ca95ba9
......@@ -65,7 +65,7 @@
</view>
<view class="text-block">
<text class="middle-date">产品编号</text>
<text class="middle-date-pro">{{ele.productCode}}</text>
<text class="middle-date-des">{{ele.productCode}}</text>
</view>
<view class="text-block">
<text class="middle-date">未发货件数</text>
......@@ -189,7 +189,11 @@
// this.getSelectDictDataOrigin('A0054')
this.getSelectDictDataOrigin('A0052')
// this.getProdDeliveryPlan()
this.getChannelType()
},
watch:{
'orderItem.planType':function(res,res1){
res && this.getChannelType()
}
},
methods: {
async getProdDeliveryPlan(){
......@@ -418,5 +422,6 @@
height: 96rpx;
color: $text-base-color;
vertical-align: middle;
margin-top: 10rpx;
}
</style>
pages/purchase-plan/purchase-plan.nvue
View file @ 1ca95ba9
......@@ -80,13 +80,14 @@
<cell v-for="(item,index) in lists" :key="item.plan_number">
<view class="scroll-item" @click="checkDetal(item)">
<view class="item-block item-block-code">
<text class="item-block-label">单号：{{item.plan_number}}</text>
<text class="item-block-label">销售计划编号：{{item.plan_number}}</text>
</view>
<view class="item-block item-block-name">
<text class="item-block-label item-block__label">{{item.plan_type_text}}</text>
</view>
<view class="item-block">
<text class="item-block-label-des">{{item.gjahr}}-{{item.monat}}</text>
<text class="item-block-right-des">{{item.report_type_text}}</text>
</view>
<view class="block-detal">
<view class="block-detal-item">
......@@ -209,7 +210,7 @@
},
orderStatusSelected: {
'value': '',
'name': '全部品牌'
'name': '存货分类'
},
punishPlanSelected: {
'value': '',
......@@ -353,16 +354,17 @@
if (this.loadParams.isDone) {
return
}
const condition = JSON.parse(JSON.stringify(this.condition))
const params = {
...this.page,
...this.condition
...condition
}
this.orderStatusSelected.value ? "" : delete params.wlybrand
this.punishTypeSelected.value ? "" : delete params.report_type
this.punishPlanSelected.value ? "" : delete params.plan_type
params.GJAHR[0].LOW ? "" : delete params.GJAHR
params.monat[0].LOW ? "" : delete params.monat
params.plan_number[0].LOW ? "" : delete params.plan_number
params.plan_number[0].LOW = params.plan_number[0].LOW ? '*' + params.plan_number[0].LOW + '*' : delete params.plan_number
uni.showLoading({
title: '加载中'
});
......@@ -642,6 +644,12 @@
font-size: 28rpx;
color: #333;
}
.item-block-right-des {
flex: 1;
text-align: right;
font-size: 28rpx;
color: #333;
}
.block-detal {
display: flex;
......
pages/purchase-receive/purchase-receive.nvue
View file @ 1ca95ba9
......@@ -133,6 +133,22 @@
</button>
</view>
</view>
<uni-popup ref="popup" background-color="#fff" :mask-click='false'>
<view class="popup-content">
<view class="popup-content-head">
<image class="popup-content-head__icon" src="@/static/image/order_success@3x.png" mode=""></image>
</view>
<view class="popup-content-content">
<text class="popup-content-content__title">提交成功</text>
<text class="popup-content-content__title2">订单号：{{ objectId }}</text>
</view>
<view class="popup-content-foot">
<text class="popup-content-foot__btn" @click="fnBackHome()">回到首页</text>
<text class="popup-content-foot__btn popup-content-foot__sure"
@click="fnCheckOrderByNo()">查看订单</text>
</view>
</view>
</uni-popup>
</scroll-view>
</view>
</template>
......@@ -162,7 +178,8 @@
quantity: '',
remark: '',
fileList: [],
scrollTop: 0
scrollTop: 0,
objectId: ''
}
},
props: {
......@@ -256,6 +273,20 @@
// this.queryData()
},
methods: {
fnCheckOrderByNo() {
this.$refs.popup.close()
uni.redirectTo({
url: '/pages/my-purchase/my-purchase'
})
},
fnBackHome() {
this.$refs.popup.close()
setTimeout(() => {
uni.switchTab({
url: `/pages/home/home`
})
}, 300)
},
handleCustomer() {
uni.navigateTo({
url: `/pages/select-customer/select-customer?order=${JSON.stringify(this.orderItem)}`
......@@ -400,14 +431,16 @@
params.wantGoodsDetailList = JSON.stringify(params.wantGoodsDetailList)
const res = await advance(params)
if (res.status == 1) {
uni.showToast({
title: '要货成功',
duration: 2000,
icon: 'none'
});
uni.switchTab({
url: '/pages/purchase/purchase'
})
this.objectId = res.data.bizData.wantCode
this.$refs.popup.open('center')
// uni.showToast({
// title: '要货成功',
// duration: 2000,
// icon: 'none'
// });
// uni.switchTab({
// url: '/pages/purchase/purchase'
// })
}
}
} catch (e) {
......@@ -630,4 +663,67 @@
.btn-text-l {
color: $wly-primary-color;
}
/deep/ .uni-popup__wrapper {
border-radius: 20rpx;
}
.popup-content {
display: flex;
flex-direction: column;
align-items: center;
width: 580rpx;
height: 408rpx;
background: #ffffff;
border-radius: 24rpx;
}
.popup-content-head {
margin-top: 56rpx;
margin-bottom: 16rpx;
}
.popup-content-head__icon {
width: 80rpx;
height: 80rpx;
}
.popup-content-content {
display: flex;
flex-direction: column;
align-items: center;
margin-bottom: 52rpx;
}
.popup-content-content__title {
font-size: 32rpx;
color: #444;
font-weight: 500;
margin-bottom: 8rpx;
}
.popup-content-content__title2 {
color: #999999;
font-size: 24rpx;
}
.popup-content-foot {}
.popup-content-foot__btn {
width: 152rpx;
height: 60rpx;
font-size: 22rpx;
line-height: 60rpx;
background: #ffedee;
text-align: center;
color: #ff0f00;
font-weight: 500;
border-radius: 32rpx;
}
.popup-content-foot__sure {
margin-left: 40rpx;
color: #fff;
background: #ff1d32;
border: 1px solid #ff1d32;
}
</style>
pages/purchase/purchase.nvue
View file @ 1ca95ba9
......@@ -12,6 +12,10 @@
</refresh>
<cell v-for="(item,index) in lists" :key="item.plan_number">
<view class="scroll-item">
<view class="item-block item-block-code">
<text class="item-block-label">计划类型</text>
<text class="item-block-value">{{item.zZFLD00002QTextView}}</text>
</view>
<view class="item-block item-block-code">
<text class="item-block-label">年度</text>
<text class="item-block-value">{{item.annual}}</text>
......
pages/quota/order-upload.nvue
View file @ 1ca95ba9
This diff is collapsed.
pages/select-product-pro/select-product-pro.vue
View file @ 1ca95ba9
......@@ -187,19 +187,19 @@
let SHORT = []
let PRODUCT_ID = []
if (this.condition.code) {
if (this.condition.product) {
SHORT = [{
SIGN: 'I',
OPTION: 'EQ',
LOW: this.condition.code,
OPTION: 'CP',
LOW: '*' + this.condition.product + '*',
HIGH: '',
}]
}
if (this.condition.product) {
if (this.condition.code) {
PRODUCT_ID = [{
SIGN: 'I',
OPTION: 'CP',
LOW: this.condition.product,
OPTION: 'EQ',
LOW: this.condition.code,
HIGH: '',
}]
}
......
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