Skip to content

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

整理配额、非配额、团购下单逻辑

parent 421dd34e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 587 additions and 642 deletions
pages/address-manage/address-manage.nvue
View file @ e396f332
......@@ -41,6 +41,13 @@
apiAddressSelect
} from '@/servers/common.js'
const modeMap = {
'quotaOrder': 'QUOTA',
'noQuotaOrder': 'NO_QUOTA',
'groupOrder': 'GGTG',
'groupBaseInfo': 'GGTG',
}
export default {
data() {
......@@ -50,10 +57,15 @@
'NAME_ORG1': '',
'C_O_NAME': '',
},
page: {
"PAGE": "1",
"PAGESIZE": "10",
},
lists: [],
selectedAddress: {},
toPageParams: {
page: ''
page: '',
head: ""
}
}
},
......@@ -69,9 +81,11 @@
console.log('select-saleplan', option)
if (option && option.from) {
const {
from
from,
head
} = option
this.toPageParams.page = from
this.toPageParams.head = JSON.parse(head)
}
},
created() {
......@@ -85,17 +99,13 @@
C_O_NAME
} = this.condition
const params = {
"MODE": "GGTG",
"PAGE": "1",
"PAGESIZE": "10",
"INFO": {
"CUSTOMER": "0050000215",
"GRPUTID": "CVG00000N5C"
},
...this.page,
"MODE": modeMap[this.toPageParams.page],
"INFO": this.toPageParams.head,
"INPUT": {
"PARTNER": "",
"NAME_ORG1": "",
"C_O_NAME": ""
PARTNER,
NAME_ORG1,
C_O_NAME
}
}
const res = await apiAddressSelect(params)
......@@ -103,7 +113,7 @@
item.checked = false
return item
})
console.log('ddd2', res)
console.log('getAddress', res)
},
handleChecked(item) {
this.selectedAddress = item
......
pages/group-buy/group-baseinfo.nvue
View file @ e396f332
......@@ -80,20 +80,20 @@
</template>
<script>
import {
apiInitGroupData,
} from '@/servers/groupOrder.js'
import {
mapMutations,
mapState
} from 'vuex'
export default {
data() {
return {
selectedBusiness: {},
selectedGroupClient: {
ADDRESS: "中南海",
CITYDESC: "北京市",
DISTRICTDESC: "东城区",
ID: "CVG00000FGI",
OBJNAME: "哈工",
PROVICEDESC: "北京市",
SALESAREADESC: "北京营销战区",
SUBSALESAREADESC: "北京基地"
},
selectedGroupClient: {},
selectedAddress: {},
condition: {
'GRPUTID': '', // 团购单位编码
......@@ -114,9 +114,23 @@
key: 1,
value: '是',
}
]
],
selectedSalesCenterArr: [{
KEY: -1,
VALUE: ''
}],
planinnerLists: [{
checked: false,
'quantity': 0,
'total': 0,
'product_info': {},
}],
HEADINFO: {},
}
},
computed: {
...mapState(['groupOrder', 'userInfo']),
},
onBackPress(event) {
console.log('event', event)
uni.switchTab({
......@@ -124,29 +138,72 @@
})
return false
},
created() {
this.initGroupData()
},
mounted() {
console.log('监听到事件来自 update');
let _this = this
uni.$once('selectedBusiness', function(data) {
uni.$on('selectedBusiness', function(data) {
console.log('监听到事件来自 selectedBusiness ，携带参数 msg 为：', data);
_this.selectedBusiness = {
...data.selectedBusiness
}
_this.condition.BUSOPPID = data.selectedBusiness.ID
})
uni.$once('selectedGroupClient', function(data) {
uni.$on('selectedGroupClient', function(data) {
console.log('监听到事件来自 selectedGroupClient ，携带参数 msg 为：', data);
const selectedGroupClient = data.selectedGroupClient
_this.selectedGroupClient = {
...data.selectedGroupClient
...selectedGroupClient,
INFOTP: data.condition.INFOTP
}
_this.HEADINFO.INFOTP = data.condition.INFOTP
_this.HEADINFO.GRPUTID = selectedGroupClient.ID
_this.condition.GRPUTID = selectedGroupClient.ID
})
uni.$once('selectedAddress', function(data) {
uni.$on('selectedAddress', function(data) {
console.log('监听到事件来自 selectedAddress ，携带参数 msg 为：', data);
const selectedAddress = data.selectedAddress
const {
PARTNER,
IC_O_NAME,
TEL_NUMBER,
STREET
} = selectedAddress
_this.selectedAddress = {
...data.selectedAddress
...selectedAddress
}
_this.condition.ZZFLD00008T = PARTNER
_this.condition.ZZFLD00002L = IC_O_NAME
_this.condition.ZZFLD00002M = TEL_NUMBER
_this.condition.ZZFLD00002N = STREET
})
},
onUnload() {
uni.$off('selectedBusiness')
uni.$off('selectedGroupClient')
uni.$off('selectedAddress')
},
methods: {
// 初始化订单数据
async initGroupData() {
const params = {
'PARTNER': this.userInfo.customerCode
}
const res = await apiInitGroupData(params)
const {
HEAD,
YXDY,
ITEM
} = res
this.selectedSalesCenterArr = YXDY
this.planinnerLists[0] = {
...this.planinnerLists[0],
...ITEM[0]
}
this.HEADINFO = HEAD
},
bindPickerYearChange(e) {
console.log('picker发送选择改变，携带值为', e.detail.value)
this.condition.ZZFLD000099 = e.detail.value
......@@ -163,10 +220,24 @@
},
selectAddress() {
uni.navigateTo({
url: `/pages/address-manage/address-manage?from=groupBaseInfo`
url: `/pages/address-manage/address-manage?from=groupBaseInfo&head=${JSON.stringify(this.HEADINFO)}`
});
},
nextStep() {
let groupOrder = {
'ITEM': this.planinnerLists,
'ATTACHMENT': [],
'baseinfo': {
'YXDY': this.selectedSalesCenterArr,
...this.condition
},
'INFO': this.HEADINFO,
}
this.$uStore({
name: 'groupOrder',
value: groupOrder
});
console.log('groupBaseInfo', groupOrder)
this.$emit('click', 'quotaOrder')
},
preStep() {
......@@ -174,6 +245,7 @@
url: `/pages/go-order/go-order`
})
},
...mapMutations(["$uStore"]),
}
}
</script>
......
pages/group-buy/order-upload.nvue
View file @ e396f332
......@@ -31,7 +31,7 @@
</view>
<view class="popup-content-content">
<text class="popup-content-content__title">支付成功</text>
<text class="popup-content-content__title2">订单号：{{ orderNo }}</text>
<text class="popup-content-content__title2">订单号：{{ orderInfo.OBJECT_ID }}</text>
</view>
<view class="popup-content-foot">
<text class="popup-content-foot__btn" @click="fnBackHome()">回到首页</text>
......@@ -48,16 +48,23 @@
apiUpdateGroupOrder
} from '@/servers/groupOrder.js'
import {
mapMutations,
mapState
} from 'vuex'
export default {
data() {
return {
orderNo: '',
orderInfo: {},
orderInfo: {
OBJECT_ID: ''
},
fileList: [],
}
},
computed: {
...mapState(['noQuotaOrder']),
...mapState(['groupOrder']),
imageStyles() {
return {
width: 64,
......@@ -70,110 +77,55 @@
},
methods: {
async updateGroupOrder() {
const {
INFO,
ITEM,
ATTACHMENT
} = this.groupOrder
const params = {
"MODE": "SAVE",
"info": {
"GUID": "00000000000000000000000000000000",
"OBJECT_ID": "",
"PROCESS_TYPE": "ZS01",
"CUSTOMER": "0050000215",
"CUST_NAME": "崇州顺辰商贸有限公司",
"CUSTOMER_TYPE": "V003",
"ZZFLD000000": "",
"ZZFLD000028": "",
"ZZFLD00002D": "81000010",
"ZZFLD00002D_DSCR": "董平",
"POSTING_DATE": "20220321",
"STATUS": "E0001",
"ZZFLD000001": "0005000006",
"ZZFLD00003E": "",
"ZZFLD000002": "230",
"ZZFLD000003": "000000510100",
"ZZFLD000004": "",
"ZZFLD000004_DSCR": "",
"ZZFLD00002J": "",
"ZZFLD00002K": "",
"ZZFLD00002L": "",
"ZZFLD00002M": "",
"ZZFLD00002N": "",
"SALES_ORG": "0 50000025",
"CHANNEL": "",
"DIVISION": "",
"CUST_PRIC_PROC": "1",
"TAX_GROUP_BP_01": "FULL",
"ZZFLD00003C": "",
"ZZFLD00009O": "0.00",
"ZZFLD00009Q": "0.00",
"ZHKYE": "0.00"
},
'ITEM': [{
"GUID": "00000000000000000000000000000000",
"HEADER": "00000000000000000000000000000000",
"NUMBER_INT": "0000000010",
"ITM_TYPE": "",
"ZZFLD000029": "V001",
"ZZFLD000005": "3800000826",
"ZZFLD000005_Z1": "",
"ZZFLD000006": "20220322",
"ZZFLD00002Q": "V001",
"ZZFLD00002Q_Z1": "",
"ORDERED_PROD": "040001005280115668",
"DESCRIPTION": "五粮液.1618(131) 52%618mL×6",
"ZZFLD00002S": "52%618ML×6",
"UNIT": "KAR",
"ZZFLD00002T": "盒",
"QUANTITY": 6.000,
"ZZFLD00002U": 6.00,
"ZZFLD00002W": 6.00,
"ZZFLD000009": 1.00,
"INVENTORY": 0.00,
"ZZFLD00002E": " 13.00%",
"NET_PRICE": 769.00,
"ZZFLD00002X": 769.00,
"NET_VALUE": 4614.00,
"ZZFLD00002Z": 4614.00,
"ZZFLD00002A": "",
"ZZFLD00002F": " 100.00%",
"ZZFLD00002G": 769.00,
"ZZFLD00002I": 0.00,
"ZZFLD000007": 0.00,
"ZZFLD000032": 0.00,
"ZZFLD00002O": 0.00,
"ZZFLD000035": 0.00,
"ZZFLD00002B": "",
"ZZFLD000008": "",
"ZZFLD00002P": "0000000000",
"CURRENCY": "",
"MODE": "",
"WAREHOUSE": "",
"PRDTYPE": "",
"YEAR": "0000",
"ZZFLD00002Q_D": ""
}],
"attachment": [],
"USER_BP": "0081000010",
"ROLE": "WLYALL"
INFO,
ITEM,
ATTACHMENT,
// "USER_BP": "0081000010",
// "ROLE": "WLYALL"
}
const res = await apiUpdateGroupOrder(params)
const {
ATTACHMENT,
ATTACHMENT: ATTACHMENT2,
HISTORY,
INFO,
ITEM
INFO: INFO2,
ITEM: ITEM2
} = res.DATA
const params2 = {
"MODE": "SUBMIT",
"info": INFO,
'ITEM': ITEM,
"attachment": ATTACHMENT,
"USER_BP": "0081000010",
"ROLE": "WLYALL"
"info": INFO2,
'ITEM': ITEM2,
"attachment": ATTACHMENT2,
// "USER_BP": "0081000010",
// "ROLE": "WLYALL"
}
const res2 = await apiUpdateGroupOrder(params2)
console.log('ddd2', res2)
this.orderInfo = res2
console.log('apiUpdateGroupOrder', res2)
const {
INFO: INFO3,
ITEM: ITEM3,
ATTACHMENT: ATTACHMENT3,
} = res2
this.orderInfo = INFO3
let groupOrder = {
...this.groupOrder,
INFO: INFO3,
ITEM: ITEM_INNER3,
ATTACHMENT: ATTACHMENT3,
}
this.$uStore({
name: 'groupOrder',
value: groupOrder
});
this.$refs.popup.open('center')
},
change(e) {
......@@ -212,6 +164,7 @@
preStep() {
this.$emit('click', 'quotaOrder')
},
...mapMutations(["$uStore"]),
}
}
</script>
......
pages/group-buy/quota-order.nvue
View file @ e396f332
This diff is collapsed.
pages/no-quota/order-upload.nvue
View file @ e396f332
......@@ -31,7 +31,7 @@
</view>
<view class="popup-content-content">
<text class="popup-content-content__title">提交成功</text>
<text class="popup-content-content__title2">订单号：{{ orderNo }}</text>
<text class="popup-content-content__title2">订单号：{{ orderInfo.OBJECT_ID }}</text>
</view>
<view class="popup-content-foot">
<text class="popup-content-foot__btn" @click="fnBackHome()">回到首页</text>
......@@ -57,7 +57,9 @@
data() {
return {
orderNo: '',
orderInfo: {},
orderInfo: {
OBJECT_ID: ''
},
fileList: [],
}
},
......@@ -75,110 +77,54 @@
},
methods: {
async updateQuotaOrder() {
const {
INFO,
ITEM,
ATTACHMENT
} = this.noQuotaOrder
const params = {
"MODE": "SAVE",
"info": {
"GUID": "00000000000000000000000000000000",
"OBJECT_ID": "",
"PROCESS_TYPE": "ZS01",
"CUSTOMER": "0050000215",
"CUST_NAME": "崇州顺辰商贸有限公司",
"CUSTOMER_TYPE": "V003",
"ZZFLD000000": "",
"ZZFLD000028": "",
"ZZFLD00002D": "81000010",
"ZZFLD00002D_DSCR": "董平",
"POSTING_DATE": "20220321",
"STATUS": "E0001",
"ZZFLD000001": "0005000006",
"ZZFLD00003E": "",
"ZZFLD000002": "230",
"ZZFLD000003": "000000510100",
"ZZFLD000004": "",
"ZZFLD000004_DSCR": "",
"ZZFLD00002J": "",
"ZZFLD00002K": "",
"ZZFLD00002L": "",
"ZZFLD00002M": "",
"ZZFLD00002N": "",
"SALES_ORG": "0 50000025",
"CHANNEL": "",
"DIVISION": "",
"CUST_PRIC_PROC": "1",
"TAX_GROUP_BP_01": "FULL",
"ZZFLD00003C": "",
"ZZFLD00009O": "0.00",
"ZZFLD00009Q": "0.00",
"ZHKYE": "0.00"
},
'ITEM': [{
"GUID": "00000000000000000000000000000000",
"HEADER": "00000000000000000000000000000000",
"NUMBER_INT": "0000000010",
"ITM_TYPE": "",
"ZZFLD000029": "V001",
"ZZFLD000005": "3800000826",
"ZZFLD000005_Z1": "",
"ZZFLD000006": "20220322",
"ZZFLD00002Q": "V001",
"ZZFLD00002Q_Z1": "",
"ORDERED_PROD": "040001005280115668",
"DESCRIPTION": "五粮液.1618(131) 52%618mL×6",
"ZZFLD00002S": "52%618ML×6",
"UNIT": "KAR",
"ZZFLD00002T": "盒",
"QUANTITY": 6.000,
"ZZFLD00002U": 6.00,
"ZZFLD00002W": 6.00,
"ZZFLD000009": 1.00,
"INVENTORY": 0.00,
"ZZFLD00002E": " 13.00%",
"NET_PRICE": 769.00,
"ZZFLD00002X": 769.00,
"NET_VALUE": 4614.00,
"ZZFLD00002Z": 4614.00,
"ZZFLD00002A": "",
"ZZFLD00002F": " 100.00%",
"ZZFLD00002G": 769.00,
"ZZFLD00002I": 0.00,
"ZZFLD000007": 0.00,
"ZZFLD000032": 0.00,
"ZZFLD00002O": 0.00,
"ZZFLD000035": 0.00,
"ZZFLD00002B": "",
"ZZFLD000008": "",
"ZZFLD00002P": "0000000000",
"CURRENCY": "",
"MODE": "",
"WAREHOUSE": "",
"PRDTYPE": "",
"YEAR": "0000",
"ZZFLD00002Q_D": ""
}],
"item_d": [],
"USE": [],
"attachment": []
INFO,
ITEM,
// "item_d": [],
// "USE": [],
ATTACHMENT
}
const res = await apiUpdateNoQuotaOrder(params)
const {
ATTACHMENT,
ATTACHMENT: ATTACHMENT2,
HISTORY,
INFO,
ITEM
INFO: INFO2,
ITEM: ITEM2
} = res.DATA
const params2 = {
"USER_BP": "81000010",
// "USER_BP": "81000010",
"MODE": "SUBMIT",
"info": INFO,
'ITEM': ITEM,
"item_d": [],
"attachment": ATTACHMENT
"info": INFO2,
'ITEM': ITEM2,
// "item_d": [],
"attachment": ATTACHMENT2
}
const res2 = await apiUpdateNoQuotaOrder(params2)
console.log('ddd2', res2)
this.orderInfo = res2
console.log('updateQuotaOrder', res2)
const {
INFO: INFO3,
ITEM: ITEM3,
ATTACHMENT: ATTACHMENT3,
} = res2
this.orderInfo = INFO3
let noQuotaOrder = {
INFO: INFO3,
ITEM: ITEM3,
ATTACHMENT: ATTACHMENT3,
}
this.$uStore({
name: 'noQuotaOrder',
value: noQuotaOrder
});
this.$refs.popup.open('center')
},
change(e) {
......@@ -209,6 +155,9 @@
}, 300)
},
fnCheckOrderByNo() {
// uni.navigateTo({
// url:'/pages/home/home'
// })
this.$refs.popup.close()
},
submit() {
......
pages/no-quota/quota-order.nvue
View file @ e396f332
This diff is collapsed.
pages/quota/order-upload.nvue
View file @ e396f332
......@@ -31,7 +31,7 @@
</view>
<view class="popup-content-content">
<text class="popup-content-content__title">提交成功</text>
<text class="popup-content-content__title2">订单号：{{ orderNo }}</text>
<text class="popup-content-content__title2">订单号：{{ orderInfo.OBJECT_ID }}</text>
</view>
<view class="popup-content-foot">
<text class="popup-content-foot__btn" @click="fnBackHome()">回到首页</text>
......@@ -57,7 +57,9 @@
data() {
return {
orderNo: '',
orderInfo: {},
orderInfo: {
OBJECT_ID: ''
},
fileList: [],
}
},
......@@ -75,138 +77,62 @@
},
methods: {
async updateQuotaOrder() {
const {
INFO,
ITEM_INNER,
ITEM_OUTER,
ATTACHMENT
} = this.quotaOrder
const params = {
"USER_BP": "81000010",
// "USER_BP": "81000010",
"MODE": "SAVE",
"info": {
"GUID": "00000000000000000000000000000000",
"OBJECT_ID": "",
"PROCESS_TYPE": "ZS01",
"CUSTOMER": "0050000215",
"CUST_NAME": "崇州顺辰商贸有限公司",
"CUSTOMER_TYPE": "V003",
"ZZFLD000000": "",
"ZZFLD000028": "",
"ZZFLD00002D": "81000010",
"ZZFLD00002D_DSCR": "董平",
"POSTING_DATE": "20220321",
"STATUS": "E0001",
"ZZFLD000001": "0005000006",
"ZZFLD00003E": "",
"ZZFLD000002": "230",
"ZZFLD000003": "000000510100",
"ZZFLD000004": "",
"ZZFLD000004_DSCR": "",
"ZZFLD00002J": "",
"ZZFLD00002K": "",
"ZZFLD00002L": "",
"ZZFLD00002M": "",
"ZZFLD00002N": "",
"SALES_ORG": "0 50000025",
"CHANNEL": "",
"DIVISION": "",
"CUST_PRIC_PROC": "1",
"TAX_GROUP_BP_01": "FULL",
"ZZFLD00003C": "",
"ZZFLD00009O": "0.00",
"ZZFLD00009Q": "0.00",
"ZHKYE": "0.00"
},
'ITEM_INNER': [{
"GUID": "00000000000000000000000000000000",
"HEADER": "00000000000000000000000000000000",
"NUMBER_INT": "0000000010",
"ITM_TYPE": "",
"ZZFLD000029": "V001",
"ZZFLD000005": "3800000826",
"ZZFLD000005_Z1": "",
"ZZFLD000006": "20220322",
"ZZFLD00002Q": "V001",
"ZZFLD00002Q_Z1": "",
"ORDERED_PROD": "040001005280115668",
"DESCRIPTION": "五粮液.1618(131) 52%618mL×6",
"ZZFLD00002S": "52%618ML×6",
"UNIT": "KAR",
"ZZFLD00002T": "盒",
"QUANTITY": 6.000,
"ZZFLD00002U": 6.00,
"ZZFLD00002W": 6.00,
"ZZFLD000009": 1.00,
"INVENTORY": 0.00,
"ZZFLD00002E": " 13.00%",
"NET_PRICE": 769.00,
"ZZFLD00002X": 769.00,
"NET_VALUE": 4614.00,
"ZZFLD00002Z": 4614.00,
"ZZFLD00002A": "",
"ZZFLD00002F": " 100.00%",
"ZZFLD00002G": 769.00,
"ZZFLD00002I": 0.00,
"ZZFLD000007": 0.00,
"ZZFLD000032": 0.00,
"ZZFLD00002O": 0.00,
"ZZFLD000035": 0.00,
"ZZFLD00002B": "",
"ZZFLD000008": "",
"ZZFLD00002P": "0000000000",
"CURRENCY": "",
"MODE": "",
"WAREHOUSE": "",
"PRDTYPE": "",
"YEAR": "0000",
"ZZFLD00002Q_D": ""
}],
"item_outer": [],
"item_d": [],
"USE": [{
"CLIENT": "",
"RECORD_ID": "00000000000000000000000000000000",
"PARENT_ID": "00000000000000000000000000000000",
"OBJECT_ID": "00000000000000000000000000000000",
"ZZFLD00000C": "3800000826",
"ZZFLD00000D": "V001",
"ZZFLD00000E": "0102",
"ZZFLD00000F": "2022",
"ZZFLD00000G": "04",
"ZZFLD00000H": 10.00,
"ZZFLD00000I": "",
"ZZFLD00000J": 10.00,
"ZZFLD00000K": "",
"ZZFLD00000L": 1.00,
"ZZFLD00000M": "",
"ZZFLD00000N": 0.00,
"ZZFLD00000O": "",
"ZZFLD00000P": 9.00,
"ZZFLD00000Q": "",
"ZZFLD00000R": 1.00,
"ZZFLD00000S": ""
}],
"attachment": []
INFO,
ITEM_INNER,
ITEM_OUTER,
// "item_d": [],
// "USE": [],
ATTACHMENT
}
const res = await apiUpdateQuotaOrder(params)
const {
ATTACHMENT,
ATTACHMENT: ATTACHMENT2,
HISTORY,
INFO,
ITEM_INNER,
ITEM_OUTER,
INFO: INFO2,
ITEM_INNER: ITEM_INNER2,
ITEM_OUTER: ITEM_OUTER2,
USE
} = res.DATA
const params2 = {
"USER_BP": "81000010",
// "USER_BP": "81000010",
"MODE": "SUBMIT",
"info": INFO,
'ITEM_INNER': ITEM_INNER,
"item_outer": ITEM_OUTER,
"item_d": [],
"USE": USE,
"attachment": ATTACHMENT
INFO: INFO2,
'ITEM_INNER': ITEM_INNER2,
"ITEM_OUTER": ITEM_OUTER2,
// "item_d": [],
// "USE": USE,
"ATTACHMENT": ATTACHMENT2
}
const res2 = await apiUpdateQuotaOrder(params2)
console.log('ddd2', res2)
this.orderInfo = res2
console.log('updateQuotaOrder', res2)
const {
INFO: INFO3,
ITEM_INNER: ITEM_INNER3,
ITEM_OUTER: ITEM_OUTER3,
ATTACHMENT: ATTACHMENT3,
} = res2
this.orderInfo = INFO3
let quotaOrder = {
INFO: INFO3,
ITEM_INNER: ITEM_INNER3,
ITEM_OUTER: ITEM_OUTER3,
ATTACHMENT: ATTACHMENT3,
}
this.$uStore({
name: 'quotaOrder',
value: quotaOrder
});
this.$refs.popup.open('center')
},
change(e) {
......
pages/quota/quota-order.nvue
View file @ e396f332
......@@ -77,7 +77,7 @@
</view>
<view class="text-block text-block-last">
<text class="middle-date">小计</text>
<text class="middle-date-des">{{item.total}}</text>
<text class="middle-date-des">{{item.NET_VALUE}}</text>
</view>
</view>
<template v-slot:right>
......@@ -109,7 +109,7 @@
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<text class="middle-date-des">{{item.SHORT_TEXT}}</text>
<text class="middle-date-des">{{item.DESCRIPTION}}</text>
</view>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit">
......@@ -139,41 +139,6 @@
</uni-swipe-action-item>
</uni-swipe-action>
<!-- <view class="text-block" @click="selectProduct(-1)">
<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">
<text class="middle-date-des">{{selectedProductInner.DESCRIPTION}}</text>
</view>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view>
</view>
<view class="text-block" @click="selectPlanOrder">
<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">
<text class="middle-date-des">{{selectedSalePlan.PLAN_NUMBER}}</text>
</view>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view>
</view>
<view class="text-block">
<text class="middle-date">数量（件）</text>
<input class="middle-date-des" type="number" :value="selectedProductInner.quantity"
@input="calcInnerTotal($event,selectedProductInner)" placeholder="请填写" />
</view>
<view class="text-block">
<text class="middle-date">单价</text>
<text class="middle-date-des">{{selectedProductInner.NET_PRICE}}</text>
</view>
<view class="text-block text-block-last">
<text class="middle-date">小计</text>
<text class="middle-date-des">{{selectedProductInner.total}}</text>
</view> -->
</view>
<view class="bottom-area"></view>
......@@ -229,10 +194,10 @@
intotalComputed() {
let money = 0
this.planinnerLists.forEach((item) => {
money += item.total
money += item.NET_VALUE
})
this.planoutLists.forEach((item) => {
money += item.total
money += item.NET_VALUE
})
return money
}
......@@ -314,14 +279,13 @@
async updateQuotaData(productIndex, mode, product) {
console.log('updateQuotaData---entry', productIndex, mode, product)
let productId = ''
let item_type = ''
let item_inner = []
let item_outer = []
let productAfterInit = this.updateProductByInit(productIndex, mode, product)
console.log('2222', productAfterInit)
console.log('productAfterInit', productAfterInit)
// 销售计划编号、产品编号和件数 都有才请求
if (!(productAfterInit?.product_info?.PRODUCT_ID && productAfterInit?.salesplan_info?.PLAN_NUMBER &&
......@@ -349,8 +313,14 @@
console.log('updateQuotaData', res)
const {
ITEM_INNER,
ITEM_OUTER
ITEM_OUTER,
INFO
} = res.DATA
this.HEADINFO = {
...this.HEADINFO,
...INFO
}
if (mode === 'inner') {
this.planinnerLists = this.planinnerLists.map((item, i) => {
if (i === productIndex) {
......@@ -359,7 +329,7 @@
...product,
...ITEM_INNER[0]
}
item.product_info = ITEM_INNER[0]
// item.product_info = ITEM_INNER[0]
}
return item
})
......@@ -524,14 +494,16 @@
nextStep() {
let quotaOrder = {
'ITEM_INNER': this.planinnerLists,
'item_outer': this.planoutLists,
'ITEM_OUTER': this.planoutLists,
'item_d': [],
'attachment': []
'ATTACHMENT': [],
'INFO': this.HEADINFO,
}
this.$uStore({
name: 'quotaOrder',
value: quotaOrder
});
console.log('quotaOrder', quotaOrder)
this.$emit('click', 'orderUpload')
},
preStep() {
......
pages/select-business/select-business.vue
View file @ e396f332
......@@ -3,7 +3,7 @@
<view class="status_bar" :style="navHeight"></view>
<view class="header-bg"></view>
<view class="main">
<view class="middle view planout-block-item">
<view class="middle view">
<view class="text-block">
<text class="middle-date">商机名称</text>
<input class="middle-date-des" type="text" v-model="condition.BUNAME" placeholder="请填写" />
......@@ -83,18 +83,13 @@
OWNERCODE: '',
CUNAME: ''
},
page: {
"PAGE": "1",
"PAGESIZE": "10",
},
lists: [],
selectedBusiness: {},
selectedGroupClient: {
ADDRESS: "中南海",
CITYDESC: "北京市",
DISTRICTDESC: "东城区",
ID: "CVG00000FGI",
OBJNAME: "哈工",
PROVICEDESC: "北京市",
SALESAREADESC: "北京营销战区",
SUBSALESAREADESC: "北京基地"
},
selectedGroupClient: {},
toPageParams: {
page: ''
}
......@@ -167,8 +162,7 @@
CUNAME
} = this.condition
const params = {
'page': 1,
'pagesize': '10',
...this.page,
"input": {
BUNAME: '',
OWNERCODE: '',
......@@ -239,6 +233,7 @@
overflow-y: scroll;
background: #f0f4f5;
overflow-x: hidden;
height: 100%;
}
.main {
......
pages/select-group-client/select-group-client.vue
View file @ e396f332
......@@ -3,7 +3,7 @@
<view class="status_bar" :style="navHeight"></view>
<view class="header-bg"></view>
<view class="main">
<view class="middle view planout-block-item">
<view class="middle view">
<view class="text-block">
<text class="middle-date">团购单位类型</text>
<view class="middle-date-des uni-list picker-year">
......@@ -80,15 +80,28 @@
'INFOTP': '',
'COMPANY_NAME': ''
},
page: {
"PAGE": "1",
"PAGESIZE": "10",
},
lists: [],
selectedGroupClient: {},
selectedSalePlanTypes: [{
KEY: '2',
VALUE: 'ddd'
}],
KEY: '',
VALUE: '无'
}, {
KEY: '个人',
VALUE: '个人'
},
{
KEY: '单位',
VALUE: '单位'
}
],
typesIndex: 0,
toPageParams: {
page: ''
page: '',
head: {}
}
}
},
......@@ -105,7 +118,8 @@
// console.log('onNavigationBarButtonTap：', e, this.isOpened, this.selectedGroupClient);
if (this.isOpened === 'left' && this.selectedGroupClient && this.selectedGroupClient.ID) {
uni.$emit('selectedGroupClient', {
selectedGroupClient: this.selectedGroupClient
selectedGroupClient: this.selectedGroupClient,
condition: this.condition
})
uni.navigateBack({})
return
......@@ -148,8 +162,7 @@
COMPANY_NAME
} = this.condition
const params = {
'page': 1,
'pagesize': '10',
...this.page,
"input": {
INFOTP,
COMPANY_NAME
......@@ -168,7 +181,8 @@
// console.log('getSalesPlanTypes', res)
// },
search() {
this.page.PAGE = 1
this.getGroupClient()
},
bindPickerTypesChange(e) {
console.log('picker发送选择改变，携带值为', e.detail.value)
......
servers/groupOrder.js
View file @ e396f332
import apiHelper from './api.helper.js'
/**
* 公关团购销售订单初始化数据
* @param
* @returns {Promise<AxiosResponse<T>>}
*/
export async function apiInitGroupData(params) {
const res = await apiHelper.post('/sap/bc/ztpm/to_new_crm/transdata/so_ggtg_init', params)
return res
}
/**
* 销售订单行项目选择或修改后进行页面数据更新
* @param
......@@ -21,6 +31,7 @@ export async function apiUpdateGroupOrder(params) {
}
export default {
apiInitGroupData,
apiUpdateGroupData,
apiUpdateGroupOrder
}
servers/noQuotaOrder.js
View file @ e396f332
import apiHelper from './api.helper.js'
/**
* 非配额酒销售订单初始化数据
* @param
* @returns {Promise<AxiosResponse<T>>}
*/
export async function apiInitNoQuotaData(params) {
const res = await apiHelper.post('/sap/bc/ztpm/to_new_crm/transdata/so_noquota_init', params)
return res
}
/**
* 销售订单行项目选择或修改后进行页面数据更新
* @param
......@@ -21,6 +31,7 @@ export async function apiUpdateNoQuotaOrder(params) {
}
export default {
apiInitNoQuotaData,
apiUpdateNoQuotaData,
apiUpdateNoQuotaOrder
}
store/index.js
View file @ e396f332
......@@ -45,19 +45,22 @@ const store = new Vuex.Store({
},
quotaOrder: {
'ITEM_INNER': [],
'item_outer': [],
'ITEM_OUTER': [],
'item_d': [],
'attachment': []
'ATTACHMENT': [],
'INFO': {}
},
noQuotaOrder: {
'ITEM_INNER': [],
'item_outer': [],
'ITEM': [],
'item_d': [],
'attachment': []
'ATTACHMENT': [],
'INFO': {}
},
groupOrder: {
'ITEM': [],
'attachment': []
'ATTACHMENT': [],
'INFO': {},
'baseinfo': {}
}
},
mutations: {
......
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