Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
W
wly-APP
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘川
wly-APP
Commits
1ca95ba9
Commit
1ca95ba9
authored
Nov 08, 2022
by
xiangzj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug处理
parent
aedb6fa6
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
700 additions
and
584 deletions
+700
-584
order-upload.nvue
pages/group-buy/order-upload.nvue
+2
-2
message.nvue
pages/message/message.nvue
+4
-4
my-order.nvue
pages/my-order/my-order.nvue
+4
-2
order-upload.nvue
pages/no-quota/order-upload.nvue
+1
-1
order-detail-group.nvue
pages/order-detail-group/order-detail-group.nvue
+2
-2
order-detail-noquota.nvue
pages/order-detail-noquota/order-detail-noquota.nvue
+1
-1
order-detail-quota.nvue
pages/order-detail-quota/order-detail-quota.nvue
+2
-2
order-other-detail.nvue
pages/order-other-detail/order-other-detail.nvue
+1
-1
produce-plan.nvue
pages/produce-material/produce-plan.nvue
+1
-1
produce-plan.nvue
pages/produce-order/produce-plan.nvue
+1
-1
purchase-main.nvue
pages/purchase-main/purchase-main.nvue
+7
-2
purchase-plan.nvue
pages/purchase-plan/purchase-plan.nvue
+12
-4
purchase-receive.nvue
pages/purchase-receive/purchase-receive.nvue
+105
-9
purchase.nvue
pages/purchase/purchase.nvue
+4
-0
order-upload.nvue
pages/quota/order-upload.nvue
+547
-546
select-product-pro.vue
pages/select-product-pro/select-product-pro.vue
+6
-6
No files found.
pages/group-buy/order-upload.nvue
View file @
1ca95ba9
...
@@ -229,7 +229,7 @@
...
@@ -229,7 +229,7 @@
},
},
fnCheckOrderByNo() {
fnCheckOrderByNo() {
this.$refs.popup.close()
this.$refs.popup.close()
uni.
navigate
To({
uni.
redirect
To({
url: '/pages/my-order/my-order'
url: '/pages/my-order/my-order'
})
})
},
},
...
@@ -485,4 +485,4 @@
...
@@ -485,4 +485,4 @@
padding: 20rpx;
padding: 20rpx;
margin-bottom: 20rpx;
margin-bottom: 20rpx;
}
}
</style>
</style>
pages/message/message.nvue
View file @
1ca95ba9
...
@@ -82,12 +82,12 @@
...
@@ -82,12 +82,12 @@
})
})
}
}
}
}
if (res.status === 1
&& res.data.Rows.length > 0
) {
if (res.status === 1) {
if (type === 0) {
if (type === 0) {
this.unreadList = res.data.Rows
this.unreadList = res.data.Rows
|| []
this.unreadCount = res.data.Total
this.unreadCount = res.data.Total
|| 0
} else {
} else {
this.readList = res.data.Rows
this.readList = res.data.Rows
|| []
}
}
}
}
...
...
pages/my-order/my-order.nvue
View file @
1ca95ba9
...
@@ -221,11 +221,13 @@
...
@@ -221,11 +221,13 @@
if (this.loadParams.isDone) {
if (this.loadParams.isDone) {
return
return
}
}
const condition = JSON.parse(JSON.stringify(this.condition))
const params = {
const params = {
...this.page,
...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.posting_date[0].low && delete params.posting_date
!params.process_type[0].low && delete params.process_type
!params.process_type[0].low && delete params.process_type
!params.status[0].low && delete params.status
!params.status[0].low && delete params.status
...
...
pages/no-quota/order-upload.nvue
View file @
1ca95ba9
...
@@ -252,7 +252,7 @@
...
@@ -252,7 +252,7 @@
},
},
fnCheckOrderByNo() {
fnCheckOrderByNo() {
this.$refs.popup.close()
this.$refs.popup.close()
uni.
navigate
To({
uni.
redirect
To({
url: '/pages/my-order/my-order'
url: '/pages/my-order/my-order'
})
})
},
},
...
...
pages/order-detail-group/order-detail-group.nvue
View file @
1ca95ba9
...
@@ -95,7 +95,7 @@
...
@@ -95,7 +95,7 @@
<text class="detal-item-value">{{item.DESCRIPTION}}</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">{{item.ZZFLD000009}}</text>
<text class="detal-item-value">{{item.ZZFLD000009}}</text>
</view>
</view>
<view class="block-detal-item">
<view class="block-detal-item">
...
@@ -560,4 +560,4 @@
...
@@ -560,4 +560,4 @@
color: #F61D30;
color: #F61D30;
font-size: 12px;
font-size: 12px;
}
}
</style>
</style>
pages/order-detail-noquota/order-detail-noquota.nvue
View file @
1ca95ba9
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
<text class="detal-item-value">{{item.DESCRIPTION}}</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">{{item.ZZFLD000009}}</text>
<text class="detal-item-value">{{item.ZZFLD000009}}</text>
</view>
</view>
<view class="block-detal-item">
<view class="block-detal-item">
...
...
pages/order-detail-quota/order-detail-quota.nvue
View file @
1ca95ba9
...
@@ -56,7 +56,7 @@
...
@@ -56,7 +56,7 @@
<text class="detal-item-value">{{item.DESCRIPTION}}</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">{{item.ZZFLD000009}}</text>
<text class="detal-item-value">{{item.ZZFLD000009}}</text>
</view>
</view>
<view class="block-detal-item">
<view class="block-detal-item">
...
@@ -95,7 +95,7 @@
...
@@ -95,7 +95,7 @@
<text class="detal-item-value">{{item.DESCRIPTION}}</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">{{item.ZZFLD000009}}</text>
<text class="detal-item-value">{{item.ZZFLD000009}}</text>
</view>
</view>
<view class="block-detal-item">
<view class="block-detal-item">
...
...
pages/order-other-detail/order-other-detail.nvue
View file @
1ca95ba9
...
@@ -95,7 +95,7 @@
...
@@ -95,7 +95,7 @@
<text class="detal-item-value">{{item.DESCRIPTION}}</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">{{item.ZZFLD000009}}</text>
<text class="detal-item-value">{{item.ZZFLD000009}}</text>
</view>
</view>
<view class="block-detal-item">
<view class="block-detal-item">
...
...
pages/produce-material/produce-plan.nvue
View file @
1ca95ba9
...
@@ -310,7 +310,7 @@
...
@@ -310,7 +310,7 @@
},
},
fnCheckOrderByNo() {
fnCheckOrderByNo() {
this.$refs.popup.close()
this.$refs.popup.close()
uni.
navigate
To({
uni.
redirect
To({
url: `/pages/produce-material/produce-material`
url: `/pages/produce-material/produce-material`
})
})
},
},
...
...
pages/produce-order/produce-plan.nvue
View file @
1ca95ba9
...
@@ -300,7 +300,7 @@
...
@@ -300,7 +300,7 @@
},
},
fnCheckOrderByNo() {
fnCheckOrderByNo() {
this.$refs.popup.close()
this.$refs.popup.close()
uni.
navigate
To({
uni.
redirect
To({
url: `/pages/produce-order/produce-order`
url: `/pages/produce-order/produce-order`
})
})
},
},
...
...
pages/purchase-main/purchase-main.nvue
View file @
1ca95ba9
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
</view>
</view>
<view class="text-block">
<view class="text-block">
<text class="middle-date">产品编号</text>
<text class="middle-date">产品编号</text>
<text class="middle-date-
pro
">{{ele.productCode}}</text>
<text class="middle-date-
des
">{{ele.productCode}}</text>
</view>
</view>
<view class="text-block">
<view class="text-block">
<text class="middle-date">未发货件数</text>
<text class="middle-date">未发货件数</text>
...
@@ -189,7 +189,11 @@
...
@@ -189,7 +189,11 @@
// this.getSelectDictDataOrigin('A0054')
// this.getSelectDictDataOrigin('A0054')
this.getSelectDictDataOrigin('A0052')
this.getSelectDictDataOrigin('A0052')
// this.getProdDeliveryPlan()
// this.getProdDeliveryPlan()
this.getChannelType()
},
watch:{
'orderItem.planType':function(res,res1){
res && this.getChannelType()
}
},
},
methods: {
methods: {
async getProdDeliveryPlan(){
async getProdDeliveryPlan(){
...
@@ -418,5 +422,6 @@
...
@@ -418,5 +422,6 @@
height: 96rpx;
height: 96rpx;
color: $text-base-color;
color: $text-base-color;
vertical-align: middle;
vertical-align: middle;
margin-top: 10rpx;
}
}
</style>
</style>
pages/purchase-plan/purchase-plan.nvue
View file @
1ca95ba9
...
@@ -80,13 +80,14 @@
...
@@ -80,13 +80,14 @@
<cell v-for="(item,index) in lists" :key="item.plan_number">
<cell v-for="(item,index) in lists" :key="item.plan_number">
<view class="scroll-item" @click="checkDetal(item)">
<view class="scroll-item" @click="checkDetal(item)">
<view class="item-block item-block-code">
<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>
<view class="item-block item-block-name">
<view class="item-block item-block-name">
<text class="item-block-label item-block__label">{{item.plan_type_text}}</text>
<text class="item-block-label item-block__label">{{item.plan_type_text}}</text>
</view>
</view>
<view class="item-block">
<view class="item-block">
<text class="item-block-label-des">{{item.gjahr}}-{{item.monat}}</text>
<text class="item-block-label-des">{{item.gjahr}}-{{item.monat}}</text>
<text class="item-block-right-des">{{item.report_type_text}}</text>
</view>
</view>
<view class="block-detal">
<view class="block-detal">
<view class="block-detal-item">
<view class="block-detal-item">
...
@@ -209,7 +210,7 @@
...
@@ -209,7 +210,7 @@
},
},
orderStatusSelected: {
orderStatusSelected: {
'value': '',
'value': '',
'name': '
全部品牌
'
'name': '
存货分类
'
},
},
punishPlanSelected: {
punishPlanSelected: {
'value': '',
'value': '',
...
@@ -353,16 +354,17 @@
...
@@ -353,16 +354,17 @@
if (this.loadParams.isDone) {
if (this.loadParams.isDone) {
return
return
}
}
const condition = JSON.parse(JSON.stringify(this.condition))
const params = {
const params = {
...this.page,
...this.page,
...
this.
condition
...condition
}
}
this.orderStatusSelected.value ? "" : delete params.wlybrand
this.orderStatusSelected.value ? "" : delete params.wlybrand
this.punishTypeSelected.value ? "" : delete params.report_type
this.punishTypeSelected.value ? "" : delete params.report_type
this.punishPlanSelected.value ? "" : delete params.plan_type
this.punishPlanSelected.value ? "" : delete params.plan_type
params.GJAHR[0].LOW ? "" : delete params.GJAHR
params.GJAHR[0].LOW ? "" : delete params.GJAHR
params.monat[0].LOW ? "" : delete params.monat
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({
uni.showLoading({
title: '加载中'
title: '加载中'
});
});
...
@@ -642,6 +644,12 @@
...
@@ -642,6 +644,12 @@
font-size: 28rpx;
font-size: 28rpx;
color: #333;
color: #333;
}
}
.item-block-right-des {
flex: 1;
text-align: right;
font-size: 28rpx;
color: #333;
}
.block-detal {
.block-detal {
display: flex;
display: flex;
...
...
pages/purchase-receive/purchase-receive.nvue
View file @
1ca95ba9
...
@@ -133,6 +133,22 @@
...
@@ -133,6 +133,22 @@
</button>
</button>
</view>
</view>
</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>
</scroll-view>
</view>
</view>
</template>
</template>
...
@@ -162,7 +178,8 @@
...
@@ -162,7 +178,8 @@
quantity: '',
quantity: '',
remark: '',
remark: '',
fileList: [],
fileList: [],
scrollTop: 0
scrollTop: 0,
objectId: ''
}
}
},
},
props: {
props: {
...
@@ -256,6 +273,20 @@
...
@@ -256,6 +273,20 @@
// this.queryData()
// this.queryData()
},
},
methods: {
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() {
handleCustomer() {
uni.navigateTo({
uni.navigateTo({
url: `/pages/select-customer/select-customer?order=${JSON.stringify(this.orderItem)}`
url: `/pages/select-customer/select-customer?order=${JSON.stringify(this.orderItem)}`
...
@@ -400,14 +431,16 @@
...
@@ -400,14 +431,16 @@
params.wantGoodsDetailList = JSON.stringify(params.wantGoodsDetailList)
params.wantGoodsDetailList = JSON.stringify(params.wantGoodsDetailList)
const res = await advance(params)
const res = await advance(params)
if (res.status == 1) {
if (res.status == 1) {
uni.showToast({
this.objectId = res.data.bizData.wantCode
title: '要货成功',
this.$refs.popup.open('center')
duration: 2000,
// uni.showToast({
icon: 'none'
// title: '要货成功',
});
// duration: 2000,
uni.switchTab({
// icon: 'none'
url: '/pages/purchase/purchase'
// });
})
// uni.switchTab({
// url: '/pages/purchase/purchase'
// })
}
}
}
}
} catch (e) {
} catch (e) {
...
@@ -630,4 +663,67 @@
...
@@ -630,4 +663,67 @@
.btn-text-l {
.btn-text-l {
color: $wly-primary-color;
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>
</style>
pages/purchase/purchase.nvue
View file @
1ca95ba9
...
@@ -12,6 +12,10 @@
...
@@ -12,6 +12,10 @@
</refresh>
</refresh>
<cell v-for="(item,index) in lists" :key="item.plan_number">
<cell v-for="(item,index) in lists" :key="item.plan_number">
<view class="scroll-item">
<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">
<view class="item-block item-block-code">
<text class="item-block-label">年度</text>
<text class="item-block-label">年度</text>
<text class="item-block-value">{{item.annual}}</text>
<text class="item-block-value">{{item.annual}}</text>
...
...
pages/quota/order-upload.nvue
View file @
1ca95ba9
<template>
<template>
<view class="lists">
<view class="lists">
<scroll-view class="scroll-area view" scroll-y="true">
<scroll-view class="scroll-area view" scroll-y="true">
<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">{{quotaOrder.INFO.Marketing}}</text>
<text class="detal-item-value">{{quotaOrder.INFO.Marketing}}</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">{{quotaOrder.INFO.ZZFLD000004_DSCR}}</text>
<text class="detal-item-value">{{quotaOrder.INFO.ZZFLD000004_DSCR}}</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">{{quotaOrder.INFO.POSTING_DATE}}</text>
<text class="detal-item-value">{{quotaOrder.INFO.POSTING_DATE}}</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">{{intotalComputed}}</text>
<text class="detal-item-value">{{intotalComputed}}</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>
<!-- <text class="detal-item-value">{{quotaOrder.INFO.ZZFLD000028}}</text> -->
<!-- <text class="detal-item-value">{{quotaOrder.INFO.ZZFLD000028}}</text> -->
</view>
</view>
<text class="remark-text">
<text class="remark-text">
{{quotaOrder.INFO.ZZFLD000028}}
{{quotaOrder.INFO.ZZFLD000028}}
</text>
</text>
</view>
</view>
<view class="banner-title">计划内</view>
<view class="banner-title">计划内</view>
<view class="block-detal" v-for="item in quotaOrder.ITEM_INNER">
<view class="block-detal" v-for="item in quotaOrder.ITEM_INNER">
<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">{{item.DESCRIPTION}}</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">{{item.quantity}}</text>
<text class="detal-item-value">{{item.quantity}}</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">{{item.NET_PRICE}}</text>
<text class="detal-item-value">{{item.NET_PRICE}}</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">{{item.NET_VALUE}}</text>
<text class="detal-item-value">{{item.NET_VALUE}}</text>
</view>
</view>
</view>
</view>
<view class="banner-title" v-if="quotaOrder.ITEM_OUTER.length > 0">计划外</view>
<view class="banner-title" v-if="quotaOrder.ITEM_OUTER.length > 0">计划外</view>
<view class="block-detal" v-for="item in quotaOrder.ITEM_OUTER">
<view class="block-detal" v-for="item in quotaOrder.ITEM_OUTER">
<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">{{item.DESCRIPTION}}</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">{{item.quantity}}</text>
<text class="detal-item-value">{{item.quantity}}</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">{{item.NET_PRICE}}</text>
<text class="detal-item-value">{{item.NET_PRICE}}</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">{{item.NET_VALUE}}</text>
<text class="detal-item-value">{{item.NET_VALUE}}</text>
</view>
</view>
</view>
</view>
<view class="banner-title" v-if="quotaOrder.USE&"aOrder.USE.length>0">占用销售计划明细</view>
<view class="banner-title" v-if="quotaOrder.USE&"aOrder.USE.length>0">占用销售计划明细</view>
<view class="block-detal" v-for="item in quotaOrder.USE">
<view class="block-detal" v-for="item in quotaOrder.USE">
<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">{{item.ZZFLD00000C}}</text>
<text class="detal-item-value">{{item.ZZFLD00000C}}</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">{{item.ZZFLD00000D_TEXT}}</text>
<text class="detal-item-value">{{item.ZZFLD00000D_TEXT}}</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">{{item.ZZFLD00000G}}</text>
<text class="detal-item-value">{{item.ZZFLD00000G}}</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">{{item.ZZFLD00000F}}</text>
<text class="detal-item-value">{{item.ZZFLD00000F}}</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">{{item.ZZFLD00000H}}</text>
<text class="detal-item-value">{{item.ZZFLD00000H}}</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">{{item.ZZFLD00000R}}</text>
<text class="detal-item-value">{{item.ZZFLD00000R}}</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">{{item.ZZFLD00000P}}</text>
<text class="detal-item-value">{{item.ZZFLD00000P}}</text>
</view>
</view>
</view>
</view>
<view class="middle summary">
<view class="middle summary">
<view class="summary-block">
<view class="summary-block">
<image class="icon_plan" src="@/static/image/icon_plan@3x.png" mode=""></image>
<image class="icon_plan" src="@/static/image/icon_plan@3x.png" mode=""></image>
<text class="upload-text">附件上传</text>
<text class="upload-text">附件上传</text>
</view>
</view>
<view class="upload-block">
<view class="upload-block">
<uni-file-picker ref='files' limit="4" :auto-upload='false' v-model="fileList" file-mediatype="image"
<uni-file-picker ref='files' limit="4" :auto-upload='false' v-model="fileList" file-mediatype="image"
:imageStyles="imageStyles" @select="select" @progress="progress" @success="success" @fail='fail'>
:imageStyles="imageStyles" @select="select" @progress="progress" @success="success" @fail='fail'>
<text>+</text>
<text>+</text>
</uni-file-picker>
</uni-file-picker>
</view>
</view>
</view>
</view>
<view class="bottom-area"></view>
<view class="bottom-area"></view>
<view class="bottom">
<view class="bottom">
<button class="btn btn-l" type="default" @tap="preStep">
<button class="btn btn-l" type="default" @tap="preStep">
<text class="btn-text btn-text-l">上一步</text>
<text class="btn-text btn-text-l">上一步</text>
</button>
</button>
<button class="btn" type="default" @tap="submit">
<button class="btn" type="default" @tap="submit">
<text class="btn-text">提交</text>
<text class="btn-text">提交</text>
</button>
</button>
</view>
</view>
<uni-popup ref="popup" background-color="#fff" @change="change" :mask-click='false'>
<uni-popup ref="popup" background-color="#fff" @change="change" :mask-click='false'>
<view class="popup-content">
<view class="popup-content">
<view class="popup-content-head">
<view class="popup-content-head">
<image class="popup-content-head__icon" src="@/static/image/order_success@3x.png" mode=""></image>
<image class="popup-content-head__icon" src="@/static/image/order_success@3x.png" mode=""></image>
</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>
</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="fnBackHome()">回到首页</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>
</view>
</view>
</uni-popup>
</uni-popup>
</scroll-view>
</scroll-view>
</view>
</view>
</template>
</template>
<script>
<script>
import {
import {
apiUpdateQuotaOrder
apiUpdateQuotaOrder
} from '@/servers/quotaOrder.js'
} from '@/servers/quotaOrder.js'
import {
import {
mapMutations,
mapMutations,
mapState
mapState
} from 'vuex'
} from 'vuex'
export default {
export default {
data() {
data() {
return {
return {
orderNo: '',
orderNo: '',
orderInfo: {
orderInfo: {
OBJECT_ID: ''
OBJECT_ID: ''
},
},
fileList: [],
fileList: [],
}
}
},
},
computed: {
computed: {
...mapState(['quotaOrder', 'userInfo']),
...mapState(['quotaOrder', 'userInfo']),
imageStyles() {
imageStyles() {
return {
return {
width: 64,
width: 64,
height: 64,
height: 64,
border: {
border: {
radius: '50%'
radius: '50%'
}
}
}
}
},
},
intotalComputed() {
intotalComputed() {
let money = 0
let money = 0
this.quotaOrder.ITEM_INNER.length > 0 && this.quotaOrder.ITEM_INNER.forEach((item) => {
this.quotaOrder.ITEM_INNER.length > 0 && this.quotaOrder.ITEM_INNER.forEach((item) => {
money += item.NET_VALUE * 1
money += item.NET_VALUE * 1
})
})
this.quotaOrder.ITEM_OUTER.length > 0 && this.quotaOrder.ITEM_OUTER.forEach((item) => {
this.quotaOrder.ITEM_OUTER.length > 0 && this.quotaOrder.ITEM_OUTER.forEach((item) => {
money += item.NET_VALUE * 1
money += item.NET_VALUE * 1
})
})
return money.toFixed(2)
return money.toFixed(2)
}
}
},
},
methods: {
methods: {
async updateQuotaOrder() {
async updateQuotaOrder() {
let res1 = null
let res1 = null
try{
try{
const {
const {
INFO,
INFO,
ITEM_INNER,
ITEM_INNER,
ITEM_OUTER,
ITEM_OUTER,
ATTACHMENT
ATTACHMENT
} = this.quotaOrder
} = this.quotaOrder
const params = {
const params = {
"USER_BP": this.userInfo.code,
"USER_BP": this.userInfo.code,
"ROLE": 'WLY001',
"ROLE": 'WLY001',
"MODE": "SAVE",
"MODE": "SAVE",
INFO,
INFO,
ITEM_INNER,
ITEM_INNER,
ITEM_OUTER,
ITEM_OUTER,
// "item_d": [],
// "item_d": [],
// "USE": [],
// "USE": [],
ATTACHMENT
ATTACHMENT
}
}
res1 = await apiUpdateQuotaOrder(params)
res1 = await apiUpdateQuotaOrder(params)
if(res1.MSGTYPE !== 'S'){
if(res1.MSGTYPE !== 'S'){
return
return
}
}
}catch(e){
}catch(e){
//TODO handle the exception
//TODO handle the exception
}
}
try{
try{
const {
const {
ATTACHMENT: ATTACHMENT2,
ATTACHMENT: ATTACHMENT2,
HISTORY,
HISTORY,
INFO: INFO2,
INFO: INFO2,
ITEM_INNER: ITEM_INNER2,
ITEM_INNER: ITEM_INNER2,
ITEM_OUTER: ITEM_OUTER2,
ITEM_OUTER: ITEM_OUTER2,
USE
USE
} = res1.DATA
} = res1.DATA
const params2 = {
const params2 = {
"USER_BP": this.userInfo.code,
"USER_BP": this.userInfo.code,
"ROLE": 'WLY001',
"ROLE": 'WLY001',
"MODE": "SUBMIT",
"MODE": "SUBMIT",
INFO: INFO2,
INFO: INFO2,
'ITEM_INNER': ITEM_INNER2,
'ITEM_INNER': ITEM_INNER2,
"ITEM_OUTER": ITEM_OUTER2,
"ITEM_OUTER": ITEM_OUTER2,
// "item_d": [],
// "item_d": [],
// "USE": USE,
// "USE": USE,
"ATTACHMENT": ATTACHMENT2
"ATTACHMENT": ATTACHMENT2
}
}
const res2 = await apiUpdateQuotaOrder(params2)
const res2 = await apiUpdateQuotaOrder(params2)
if(res2.MSGTYPE !== 'S'){
if(res2.MSGTYPE !== 'S'){
return
return
}
}
console.log('updateQuotaOrder', res2)
console.log('updateQuotaOrder', res2)
const {
const {
INFO: INFO3,
INFO: INFO3,
ITEM_INNER: ITEM_INNER3,
ITEM_INNER: ITEM_INNER3,
ITEM_OUTER: ITEM_OUTER3,
ITEM_OUTER: ITEM_OUTER3,
ATTACHMENT: ATTACHMENT3,
ATTACHMENT: ATTACHMENT3,
} = res2.DATA
} = res2.DATA
this.orderInfo = INFO3
this.orderInfo = INFO3
let quotaOrder = {
let quotaOrder = {
INFO: INFO3,
INFO: INFO3,
ITEM_INNER: ITEM_INNER3,
ITEM_INNER: ITEM_INNER3,
ITEM_OUTER: ITEM_OUTER3,
ITEM_OUTER: ITEM_OUTER3,
ATTACHMENT: ATTACHMENT3,
ATTACHMENT: ATTACHMENT3,
}
}
this.$uStore({
this.$uStore({
name: 'quotaOrder',
name: 'quotaOrder',
value: quotaOrder
value: quotaOrder
});
});
this.$refs.popup.open('center')
this.$refs.popup.open('center')
}catch(e){
}catch(e){
//TODO handle the exception
//TODO handle the exception
}
}
},
},
change(e) {
change(e) {
console.log('当前模式:' + e.type + ',状态:' + e.show);
console.log('当前模式:' + e.type + ',状态:' + e.show);
},
},
// 获取上传进度
// 获取上传进度
progress(e) {
progress(e) {
console.log('上传进度:', e)
console.log('上传进度:', e)
},
},
// 选择文件
// 选择文件
select(e) {
select(e) {
console.log('选择文件:', e, this.fileList)
console.log('选择文件:', e, this.fileList)
},
},
// 上传成功
// 上传成功
success(e) {
success(e) {
console.log('上传成功', e)
console.log('上传成功', e)
},
},
// 上传失败
// 上传失败
fail(e) {
fail(e) {
console.log('上传失败:', e)
console.log('上传失败:', e)
},
},
fnBackHome() {
fnBackHome() {
this.$refs.popup.close()
this.$refs.popup.close()
setTimeout(() => {
setTimeout(() => {
uni.switchTab({
uni.switchTab({
url: `/pages/home/home`
url: `/pages/home/home`
})
})
}, 300)
}, 300)
},
},
fnCheckOrderByNo() {
fnCheckOrderByNo() {
this.$refs.popup.close()
this.$refs.popup.close()
uni.navigateTo({
uni.redirectTo({
url: '/pages/my-order/my-order'
url: '/pages/my-order/my-order'
})
})
},
},
submit() {
submit() {
this.updateQuotaOrder()
this.updateQuotaOrder()
// this.$refs.files.upload()
// this.$refs.files.upload()
},
},
preStep() {
preStep() {
this.$emit('click', 'quotaOrder', true)
this.$emit('click', 'quotaOrder', true)
},
},
...mapMutations(["$uStore"]),
...mapMutations(["$uStore"]),
}
}
}
}
</script>
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>
.view {
.view {
flex-direction: column;
flex-direction: column;
}
}
.lists {
.lists {
position: relative;
position: relative;
flex-direction: column;
flex-direction: column;
padding: 0 16rpx;
padding: 0 16rpx;
overflow-y: scroll;
overflow-y: scroll;
}
}
.middle {
.middle {
background-color: #fff;
background-color: #fff;
border-radius: 16rpx;
border-radius: 16rpx;
padding: 32rpx 64rpx 40rpx 48rpx;
padding: 32rpx 64rpx 40rpx 48rpx;
}
}
.summary-block {
.summary-block {
display: flex;
display: flex;
align-items: center;
align-items: center;
}
}
.text-block {
.text-block {
overflow: hidden;
overflow: hidden;
height: 96rpx;
height: 96rpx;
margin-bottom: 14rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
border-bottom: 1px solid #f4f5f6;
}
}
.text-block-last {
.text-block-last {
margin-bottom: 0;
margin-bottom: 0;
border-bottom: 0;
border-bottom: 0;
}
}
.icon-arrow {
.icon-arrow {
position: absolute;
position: absolute;
right: 0;
right: 0;
top: 16px;
top: 16px;
width: 12rpx;
width: 12rpx;
height: 20rpx;
height: 20rpx;
z-index: 10;
z-index: 10;
}
}
.upload-text {
.upload-text {
flex: 2;
flex: 2;
font-size: 32rpx;
font-size: 32rpx;
color: #333;
color: #333;
font-weight: 500;
font-weight: 500;
}
}
.summary {
.summary {
display: flex;
display: flex;
flex-direction: column;
flex-direction: column;
align-items: flex-start;
align-items: flex-start;
margin-bottom: 32rpx;
margin-bottom: 32rpx;
padding: 32rpx 48rpx 140rpx;
padding: 32rpx 48rpx 140rpx;
}
}
.icon_plan {
.icon_plan {
width: 36rpx;
width: 36rpx;
height: 36rpx;
height: 36rpx;
margin-right: 8rpx;
margin-right: 8rpx;
}
}
.upload-block {
.upload-block {
display: flex;
display: flex;
// align-items: center;
// align-items: center;
// justify-content: center;
// justify-content: center;
// align-self: center;
// align-self: center;
// width: 388rpx;
// width: 388rpx;
height: 388rpx;
height: 388rpx;
// background: #f5f6f7;
// background: #f5f6f7;
// border: 1px dashed #dedede;
// border: 1px dashed #dedede;
border-radius: 4px;
border-radius: 4px;
margin-top: 90rpx;
margin-top: 90rpx;
flex-direction: column;
flex-direction: column;
}
}
.uni-file-picker {
.uni-file-picker {
// width: 100%;
// width: 100%;
// height: 100%;
// height: 100%;
}
}
/deep/ .uni-file-picker__container {
/deep/ .uni-file-picker__container {
// width: 100%;
// width: 100%;
// height: 100%;
// height: 100%;
// margin: 0;
// margin: 0;
}
}
.bottom-area {
.bottom-area {
height: 140rpx;
height: 140rpx;
margin-top: 12rpx;
margin-top: 12rpx;
}
}
.bottom {
.bottom {
position: fixed;
position: fixed;
bottom: 0;
bottom: 0;
left: 0;
left: 0;
z-index: 10;
z-index: 10;
width: 750rpx;
width: 750rpx;
height: 140rpx;
height: 140rpx;
padding: 0 32rpx;
padding: 0 32rpx;
background-color: #fff;
background-color: #fff;
justify-content: space-between;
justify-content: space-between;
align-items: center;
align-items: center;
}
}
.btn {
.btn {
flex: 1;
flex: 1;
height: 92rpx;
height: 92rpx;
background: $wly-primary-color;
background: $wly-primary-color;
border-radius: 46rpx;
border-radius: 46rpx;
}
}
.btn-l {
.btn-l {
margin-right: 30rpx;
margin-right: 30rpx;
border: 1px solid $wly-primary-color;
border: 1px solid $wly-primary-color;
background-color: transparent;
background-color: transparent;
}
}
.btn-text {
.btn-text {
color: #fff;
color: #fff;
font-size: 34rpx;
font-size: 34rpx;
}
}
.btn-text-l {
.btn-text-l {
color: $wly-primary-color;
color: $wly-primary-color;
}
}
/deep/ .uni-popup__wrapper {
/deep/ .uni-popup__wrapper {
border-radius: 20rpx;
border-radius: 20rpx;
}
}
.popup-content {
.popup-content {
display: flex;
display: flex;
flex-direction: column;
flex-direction: column;
align-items: center;
align-items: center;
width: 580rpx;
width: 580rpx;
height: 408rpx;
height: 408rpx;
background: #ffffff;
background: #ffffff;
border-radius: 24rpx;
border-radius: 24rpx;
}
}
.popup-content-head {
.popup-content-head {
margin-top: 56rpx;
margin-top: 56rpx;
margin-bottom: 16rpx;
margin-bottom: 16rpx;
}
}
.popup-content-head__icon {
.popup-content-head__icon {
width: 80rpx;
width: 80rpx;
height: 80rpx;
height: 80rpx;
}
}
.popup-content-content {
.popup-content-content {
display: flex;
display: flex;
flex-direction: column;
flex-direction: column;
align-items: center;
align-items: center;
margin-bottom: 52rpx;
margin-bottom: 52rpx;
}
}
.popup-content-content__title {
.popup-content-content__title {
font-size: 32rpx;
font-size: 32rpx;
color: #444;
color: #444;
font-weight: 500;
font-weight: 500;
margin-bottom: 8rpx;
margin-bottom: 8rpx;
}
}
.popup-content-content__title2 {
.popup-content-content__title2 {
color: #999999;
color: #999999;
font-size: 24rpx;
font-size: 24rpx;
}
}
.popup-content-foot {}
.popup-content-foot {}
.popup-content-foot__btn {
.popup-content-foot__btn {
width: 152rpx;
width: 152rpx;
height: 60rpx;
height: 60rpx;
font-size: 22rpx;
font-size: 22rpx;
line-height: 60rpx;
line-height: 60rpx;
background: #ffedee;
background: #ffedee;
text-align: center;
text-align: center;
color: #ff0f00;
color: #ff0f00;
font-weight: 500;
font-weight: 500;
border-radius: 32rpx;
border-radius: 32rpx;
}
}
.popup-content-foot__sure {
.popup-content-foot__sure {
margin-left: 40rpx;
margin-left: 40rpx;
color: #fff;
color: #fff;
background: #ff1d32;
background: #ff1d32;
border: 1px solid #ff1d32;
border: 1px solid #ff1d32;
}
}
.block-detal {
.block-detal {
display: flex;
display: flex;
flex-direction: column;
flex-direction: column;
background: #fff;
background: #fff;
border-radius: 20rpx;
border-radius: 20rpx;
padding: 32rpx;
padding: 32rpx;
margin-bottom: 20rpx;
margin-bottom: 20rpx;
}
}
.block-detal-item {
.block-detal-item {
display: flex;
display: flex;
margin-bottom: 32rpx;
margin-bottom: 32rpx;
justify-content: space-between;
justify-content: space-between;
}
}
.block-detal-item-last {
.block-detal-item-last {
margin-bottom: 0;
margin-bottom: 0;
}
}
.detal-item-label {
.detal-item-label {
color: #999;
color: #999;
font-size: 24rpx;
font-size: 24rpx;
}
}
.detal-item-value {
.detal-item-value {
color: #333;
color: #333;
font-size: 28rpx;
font-size: 28rpx;
}
}
.remark-text {
.remark-text {
flex: 1;
flex: 1;
min-height: 100rpx;
min-height: 100rpx;
background: #f5f6f7;
background: #f5f6f7;
border-radius: 4px;
border-radius: 4px;
padding: 12rpx 18rpx;
padding: 12rpx 18rpx;
margin-top: 10rpx;
margin-top: 10rpx;
word-break: break-all;
word-break: break-all;
font-size: 28rpx;
font-size: 28rpx;
}
}
.remark{
.remark{
background: #fff;
background: #fff;
padding: 0 10px;
padding: 0 10px;
}
}
.banner-title{
.banner-title{
background: #fff;
background: #fff;
border-radius: 16rpx; padding: 20rpx;
border-radius: 16rpx;
margin-bottom: 20rpx;
padding: 20rpx;
}
margin-bottom: 20rpx;
}
</style>
</style>
pages/select-product-pro/select-product-pro.vue
View file @
1ca95ba9
...
@@ -187,19 +187,19 @@
...
@@ -187,19 +187,19 @@
let
SHORT
=
[]
let
SHORT
=
[]
let
PRODUCT_ID
=
[]
let
PRODUCT_ID
=
[]
if
(
this
.
condition
.
code
)
{
if
(
this
.
condition
.
product
)
{
SHORT
=
[{
SHORT
=
[{
SIGN
:
'I'
,
SIGN
:
'I'
,
OPTION
:
'
EQ
'
,
OPTION
:
'
CP
'
,
LOW
:
this
.
condition
.
code
,
LOW
:
'*'
+
this
.
condition
.
product
+
'*'
,
HIGH
:
''
,
HIGH
:
''
,
}]
}]
}
}
if
(
this
.
condition
.
product
)
{
if
(
this
.
condition
.
code
)
{
PRODUCT_ID
=
[{
PRODUCT_ID
=
[{
SIGN
:
'I'
,
SIGN
:
'I'
,
OPTION
:
'
CP
'
,
OPTION
:
'
EQ
'
,
LOW
:
this
.
condition
.
product
,
LOW
:
this
.
condition
.
code
,
HIGH
:
''
,
HIGH
:
''
,
}]
}]
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment