Commit 8c2f3e00 authored by xiangzj's avatar xiangzj

下单问题

parent 8a6f5547
This diff is collapsed.
...@@ -334,13 +334,12 @@ ...@@ -334,13 +334,12 @@
<text class="middle-date-des">{{distributerByBarcode.productDisChaManagerName}}</text> <text class="middle-date-des">{{distributerByBarcode.productDisChaManagerName}}</text>
</view> </view>
</view> </view>
<view class="middle view"> <view class="middle view">
<view class="upload-area view"> <view class="upload-area view">
<text class="title">门头照片</text> <text class="title">门头照片</text>
<view class="pic-lists"> <view class="pic-lists">
<uni-file-picker ref='files' :auto-upload='false' v-model="fileList" file-mediatype="image" <uni-file-picker ref='files' :auto-upload='false' v-model="fileDoorList" file-mediatype="image"
:imageStyles="imageStyles" @select="select" @progress="progress" @success="success" :imageStyles="imageStyles" @select="select($event,'door')" @progress="progress" @success="success"
@fail='fail'> @fail='fail'>
<text>+</text> <text>+</text>
</uni-file-picker> </uni-file-picker>
...@@ -350,8 +349,8 @@ ...@@ -350,8 +349,8 @@
<view class="upload-area view"> <view class="upload-area view">
<text class="title">产品照片</text> <text class="title">产品照片</text>
<view class="pic-lists"> <view class="pic-lists">
<uni-file-picker ref='files' :auto-upload='false' v-model="fileList" file-mediatype="image" <uni-file-picker ref='files' :auto-upload='false' v-model="fileProList" file-mediatype="image"
:imageStyles="imageStyles" @select="select" @progress="progress" @success="success" :imageStyles="imageStyles" @select="select($event,'pro')" @progress="progress" @success="success"
@fail='fail'> @fail='fail'>
<text>+</text> <text>+</text>
</uni-file-picker> </uni-file-picker>
...@@ -361,8 +360,8 @@ ...@@ -361,8 +360,8 @@
<view class="upload-area view"> <view class="upload-area view">
<text class="title">发票/收据照片</text> <text class="title">发票/收据照片</text>
<view class="pic-lists"> <view class="pic-lists">
<uni-file-picker ref='files' :auto-upload='false' v-model="fileList" file-mediatype="image" <uni-file-picker ref='files' :auto-upload='false' v-model="fileBillList" file-mediatype="image"
:imageStyles="imageStyles" @select="select" @progress="progress" @success="success" :imageStyles="imageStyles" @select="select($event,'bill')" @progress="progress" @success="success"
@fail='fail'> @fail='fail'>
<text>+</text> <text>+</text>
</uni-file-picker> </uni-file-picker>
...@@ -445,15 +444,17 @@ ...@@ -445,15 +444,17 @@
auditNotes: '', auditNotes: '',
barcode: '', barcode: '',
receiveAmount: '', receiveAmount: '',
doorPicUrl: 'https://t7.baidu.com/it/u=2487758541,1861252964&fm=193&f=GIF', doorPicUrl: '',
productPicUrl: 'https://t7.baidu.com/it/u=2487758541,1861252964&fm=193&f=GIF', productPicUrl: '',
invoicePicUrl: 'https://t7.baidu.com/it/u=2487758541,1861252964&fm=193&f=GIF', invoicePicUrl: '',
receiptPicUrl: 'https://t7.baidu.com/it/u=2487758541,1861252964&fm=193&f=GIF', receiptPicUrl: '',
}, },
pickerIndexs: { pickerIndexs: {
submitMethodIndex: 0 submitMethodIndex: 0
}, },
fileList: [], fileDoorList: [],
fileProList: [],
fileBillList: [],
selectDataOptions: { selectDataOptions: {
'SubmitMethod': [], 'SubmitMethod': [],
'ViolationType': [], 'ViolationType': [],
...@@ -691,7 +692,7 @@ ...@@ -691,7 +692,7 @@
'provinceCode': this.condition.provinceCode, 'provinceCode': this.condition.provinceCode,
'provinceName': this.condition.provinceName, 'provinceName': this.condition.provinceName,
'pwdInfo': this.condition.pwdInfo, 'pwdInfo': this.condition.pwdInfo,
'receiptPicUrl': this.condition.receiptPicUrl, 'receiptPicUrl': this.condition.invoicePicUrl,
'receiveAmount': this.condition.receiveAmount-0, 'receiveAmount': this.condition.receiveAmount-0,
'submitMethod': this.condition.submitMethod, 'submitMethod': this.condition.submitMethod,
'submitSource': 'DISTRIBUTER', 'submitSource': 'DISTRIBUTER',
...@@ -734,8 +735,21 @@ ...@@ -734,8 +735,21 @@
console.log('上传进度:', e) console.log('上传进度:', e)
}, },
// 选择文件 // 选择文件
select(e) { select(e,type) {
console.log('选择文件:', e, this.fileList) console.log(e,'选择文件')
switch (type){
case 'door':
this.condition.doorPicUrl = e.tempFilePaths[e.tempFilePaths.length - 1]
break;
case 'pro':
this.condition.productPicUrl = e.tempFilePaths[e.tempFilePaths.length - 1]
break;
case 'bill':
this.condition.invoicePicUrl = e.tempFilePaths[e.tempFilePaths.length - 1]
break;
default:
break;
}
}, },
// 上传成功 // 上传成功
success(e) { success(e) {
......
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
</view> </view>
</view> </view>
<view class="text-block text-block-last"> <view class="text-block text-block-last">
<text class="middle-date">物流公司</text> <text class="middle-date">期望物流公司</text>
<view class="middle-date-des uni-list picker-year"> <view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
...@@ -192,6 +192,16 @@ ...@@ -192,6 +192,16 @@
</view> </view>
</view> </view>
</view> </view>
<view class="text-block text-block-last">
<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="uni-input-text">{{ contactLetterDetail.shipMethod}}</text>
</view>
</view>
</view>
</view>
<view class="text-block-children "> <view class="text-block-children ">
<view class="children-block"> <view class="children-block">
<image class="children-block-icon" src="@/static/image/usercenter_purchaseplan@3x.png" mode=""> <image class="children-block-icon" src="@/static/image/usercenter_purchaseplan@3x.png" mode="">
......
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
align-items: center; align-items: center;
flex: 5.5; flex: 5.5;
font-size: 24rpx; font-size: 24rpx;
color: $text-base-color; color:red;
height: 96rpx; height: 96rpx;
line-height: 96rpx; line-height: 96rpx;
} }
...@@ -391,18 +391,15 @@ ...@@ -391,18 +391,15 @@
.uni-list-cell { .uni-list-cell {
flex: 1; flex: 1;
height: 100%;
padding-right: 52rpx; padding-right: 52rpx;
} }
.uni-list-cell-db { .uni-list-cell-db {
flex: 1; flex: 1;
height: 100%;
} }
.picker-block { .picker-block {
flex: 1; flex: 1;
height: 100%;
} }
.icon-arrow { .icon-arrow {
...@@ -505,4 +502,8 @@ ...@@ -505,4 +502,8 @@
color: #fff; color: #fff;
font-size: 34rpx; font-size: 34rpx;
} }
.uni-input-text {
font-size: 24rpx;
color: $text-base-color;
}
</style> </style>
...@@ -36,16 +36,33 @@ ...@@ -36,16 +36,33 @@
</view> </view>
<view class="text-block"> <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="middle-date-des uni-list picker-year right-box">
<view class="uni-list-cell"> <checkbox-group>
<view class="uni-list-cell-db"> <checkbox
<picker class="picker-block" @change="bindPickerYearChange" mode="selector" color="#FF1D32"
id="ZZFLD000099"
type="checkbox"
:checked="condition.ZZFLD000099"
@tap="condition.ZZFLD000099 = !condition.ZZFLD000099"/>
</checkbox-group>
<!-- <picker class="picker-block" mode="selector"
range-key='value' :value="condition.ZZFLD000099" :range="status"> range-key='value' :value="condition.ZZFLD000099" :range="status">
<text class="uni-input-text">{{status[condition.ZZFLD000099].value}}</text> <text class="uni-input-text">{{status[condition.ZZFLD000099].value}}</text>
</picker> </picker> -->
</view> <!-- <image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image> -->
</view> </view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image> </view>
<view class="text-block">
<text class="middle-date">企业内购</text>
<view class="middle-date-des uni-list picker-year right-box">
<checkbox-group @change="bindPickerYearChange">
<checkbox
color="#FF1D32"
id="ZZFLD00009CX"
type="checkbox"
:checked="condition.ZZFLD00009CX"
@tap="condition.ZZFLD00009CX = !condition.ZZFLD00009CX"/>
</checkbox-group>
</view> </view>
</view> </view>
<view class="text-block"> <view class="text-block">
...@@ -112,13 +129,14 @@ ...@@ -112,13 +129,14 @@
condition: { condition: {
'GRPUTID': '', // 团购单位编码 'GRPUTID': '', // 团购单位编码
'BUSOPPID': '', // 商机编码 'BUSOPPID': '', // 商机编码
'ZZFLD000099': 0, // 是否盒外刻字 'ZZFLD000099': false, // 是否盒外刻字
'ZZFLD00008T': '', // 收货方 'ZZFLD00008T': '', // 收货方
'ZZFLD000098': '', // 喷码内容 'ZZFLD000098': '', // 喷码内容
'ZZFLD00002L': '', // 收货联系人 'ZZFLD00002L': '', // 收货联系人
'ZZFLD00002M': '', // 收货联系电话 'ZZFLD00002M': '', // 收货联系电话
'ZZFLD00002N': '', // 收货地址 'ZZFLD00002N': '', // 收货地址
'PENGMETHOD': '', // 喷码方式 'PENGMETHOD': '', // 喷码方式
'ZZFLD00009CX': false, //企业内购
}, },
designIndex: 0, designIndex: 0,
status: [{ status: [{
...@@ -261,12 +279,21 @@ ...@@ -261,12 +279,21 @@
uni.$off('selectedPaintDesign') uni.$off('selectedPaintDesign')
}, },
methods: { methods: {
radioChange: function(evt) {
for (let i = 0; i < this.status.length; i++) {
if (this.status[i].key === evt.detail.key) {
alert(i)
// this.current = i;
break;
}
}
},
// 初始化订单数据 // 初始化订单数据
async initGroupData() { async initGroupData() {
const params = { const params = {
'PARTNER': this.userInfo.code 'PARTNER': this.userInfo.code
} }
console.log(this.isKeepData,'isKeepDataisKeepData') console.log(this.isKeepData,this.groupOrder,'isKeepDataisKeepData')
const res = await apiInitGroupData(params) const res = await apiInitGroupData(params)
const { const {
HEAD, HEAD,
...@@ -295,6 +322,8 @@ ...@@ -295,6 +322,8 @@
'ID': this.groupOrder.INFO.BUSOPPID, 'ID': this.groupOrder.INFO.BUSOPPID,
'NAME': this.groupOrder.INFO.BUSINAME 'NAME': this.groupOrder.INFO.BUSINAME
} }
this.condition.ZZFLD00009CX = this.HEADINFO.ZZFLD00009CX = this.groupOrder.INFO.ZZFLD00009CX
this.condition.ZZFLD000099 = this.HEADINFO.ZZFLD000099 = this.groupOrder.INFO.ZZFLD000099
// 收货单位 // 收货单位
this.selectedAddress = { this.selectedAddress = {
NAME_ORG1: this.groupOrder.INFO.ZZFLD00008T_DSCR, NAME_ORG1: this.groupOrder.INFO.ZZFLD00008T_DSCR,
...@@ -327,15 +356,16 @@ ...@@ -327,15 +356,16 @@
} }
}, },
bindPickerYearChange(e) { bindPickerYearChange(e) {
console.log('picker发送选择改变,携带值为', e.detail.value) console.log('picker发送选择改变,携带值为', e)
this.condition.ZZFLD000099 = e.detail.value this.HEADINFO.ZZFLD000098 = this.condition.ZZFLD000098 = this.groupOrder.baseinfo.ZZFLD000098 = e.detail.value.length > 0 ? '企业内购' : ''
// this.condition.ZZFLD000099 = e.detail.value
}, },
bindPickerPaintDesignChange(e) { bindPickerPaintDesignChange(e) {
console.log('picker发送选择改变,携带值为', e.detail.value) console.log('picker发送选择改变,携带值为', e.detail.value)
this.paintDesignIndex = e.detail.value this.paintDesignIndex = e.detail.value
switch (e.detail.value) { switch (e.detail.value) {
case 1: case 1:
this.condition.ZZFLD000098 = '' this.condition.ZZFLD000098 = this.condition.GRPUTID
break; break;
case 2: case 2:
this.condition.ZZFLD000098 = this.selectedGroupClient.OBJNAME this.condition.ZZFLD000098 = this.selectedGroupClient.OBJNAME
...@@ -379,7 +409,11 @@ ...@@ -379,7 +409,11 @@
'YXDY': this.selectedSalesCenterArr, 'YXDY': this.selectedSalesCenterArr,
...this.condition ...this.condition
}, },
'INFO': this.HEADINFO, 'INFO': {
...this.HEADINFO,
ZZFLD00009CX: this.condition.ZZFLD00009CX,
ZZFLD000099: this.condition.ZZFLD000099
},
} }
this.$uStore({ this.$uStore({
name: 'groupOrder', name: 'groupOrder',
...@@ -534,4 +568,17 @@ ...@@ -534,4 +568,17 @@
.btn-text-l { .btn-text-l {
color: $wly-primary-color; color: $wly-primary-color;
} }
/deep/ .uni-checkbox-input{
color: #FF1D32 !important;
border-color: #FF1D32;
}
/deep/ .uni-checkbox-input:hover{
border-color: #FF1D32 !important;
}
.right-box{
position: absolute;
right: 0;
top: 0px;
z-index: 10;
}
</style> </style>
<template> <template>
<view class="lists"> <view class="lists">
<view class="middle summary"> <scroll-view class="scroll-area view" scroll-y="true">
<view class="summary-block"> <view class="block-detal">
<image class="icon_plan" src="@/static/image/icon_plan@3x.png" mode=""></image> <view class="block-detal-item">
<text class="upload-text">附件上传</text> <text class="detal-item-label">营销单元</text>
</view> <text class="detal-item-value">{{groupOrder.INFO.Marketing}}</text>
<view class="upload-block"> </view>
<uni-file-picker ref='files' :auto-upload='false' v-model="fileList" file-mediatype="image" <view class="block-detal-item">
:imageStyles="imageStyles" @select="select" @progress="progress" @success="success" @fail='fail'> <text class="detal-item-label">业务员</text>
<text>+</text> <text class="detal-item-value">{{groupOrder .INFO.ZZFLD000004_DSCR}}</text>
</uni-file-picker> </view>
<view class="block-detal-item">
<text class="detal-item-label">创建日期</text>
<text class="detal-item-value">{{groupOrder.INFO.POSTING_DATE}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">合计金额</text>
<text class="detal-item-value">{{intotalComputed}}</text>
</view>
<view class="block-detal-item block-detal-item-last">
<text class="detal-item-label">备注</text>
<!-- <text class="detal-item-value">{{groupOrder.INFO.ZZFLD000028}}</text> -->
</view>
<text class="remark-text">
{{groupOrder.INFO.ZZFLD000028}}
</text>
</view> </view>
</view> <view class="banner-title">订购产品</view>
<view class="block-detal" v-for="item in groupOrder.ITEM">
<view class="bottom-area"></view> <view class="block-detal-item">
<text class="detal-item-label">产品名称</text>
<view class="bottom"> <text class="detal-item-value">{{item.DESCRIPTION}}</text>
<button class="btn btn-l" type="default" @tap="preStep"> </view>
<text class="btn-text btn-text-l">上一步</text> <view class="block-detal-item">
</button> <text class="detal-item-label">数量(件)</text>
<button class="btn" type="default" @tap="submit"> <text class="detal-item-value">{{item.quantity}}</text>
<text class="btn-text">提交</text> </view>
</button> <view class="block-detal-item">
</view> <text class="detal-item-label">单价</text>
<text class="detal-item-value">{{item.NET_PRICE}}</text>
<uni-popup ref="popup" background-color="#fff" @change="change" :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>
<view class="popup-content-content"> <view class="block-detal-item">
<text class="popup-content-content__title">提交成功</text> <text class="detal-item-label">小计</text>
<text class="popup-content-content__title2">订单号:{{ orderInfo.OBJECT_ID }}</text> <text class="detal-item-value">{{item.NET_VALUE}}</text>
</view>
</view>
<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>
</view> </view>
<view class="popup-content-foot"> <view class="upload-block">
<text class="popup-content-foot__btn" @click="fnBackHome()">回到首页</text> <uni-file-picker ref='files' :auto-upload='false' v-model="fileList" file-mediatype="image"
<text class="popup-content-foot__btn popup-content-foot__sure" :imageStyles="imageStyles" @select="select" @progress="progress" @success="success" @fail='fail'>
@click="fnCheckOrderByNo()">查看订单</text> <text>+</text>
</uni-file-picker>
</view> </view>
</view> </view>
</uni-popup>
<view class="bottom-area"></view>
<view class="bottom">
<button class="btn btn-l" type="default" @tap="preStep">
<text class="btn-text btn-text-l">上一步</text>
</button>
<button class="btn" type="default" @tap="submit">
<text class="btn-text">提交</text>
</button>
</view>
<uni-popup ref="popup" background-color="#fff" @change="change" :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">订单号:{{ orderInfo.OBJECT_ID }}</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> </view>
</template> </template>
...@@ -74,6 +121,14 @@ ...@@ -74,6 +121,14 @@
} }
} }
}, },
intotalComputed() {
let money = 0
this.groupOrder.ITEM.forEach((item) => {
money += item.NET_VALUE * 1
})
return money
return money
}
}, },
methods: { methods: {
async updateGroupOrder() { async updateGroupOrder() {
...@@ -377,4 +432,52 @@ ...@@ -377,4 +432,52 @@
background: #ff1d32; background: #ff1d32;
border: 1px solid #ff1d32; border: 1px solid #ff1d32;
} }
.block-detal {
display: flex;
flex-direction: column;
background: #fff;
border-radius: 20rpx;
padding: 32rpx;
margin-bottom: 20rpx;
}
.block-detal-item {
display: flex;
margin-bottom: 32rpx;
justify-content: space-between;
}
.block-detal-item-last {
margin-bottom: 0;
}
.detal-item-label {
color: #999;
font-size: 24rpx;
}
.detal-item-value {
color: #333;
font-size: 28rpx;
}
.remark-text {
flex: 1;
min-height: 100rpx;
background: #f5f6f7;
border-radius: 4px;
padding: 12rpx 18rpx;
margin-top: 10rpx;
word-break: break-all;
font-size: 28rpx;
}
.remark{
background: #fff;
padding: 0 10px;
}
.banner-title{
background: #fff;
border-radius: 16rpx;
padding: 20rpx;
margin-bottom: 20rpx;
}
</style> </style>
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
</view> </view>
</view> </view>
<view class="middle summary upload salescenter"> <view class="summary upload salescenter top-radius">
<text class="middle-date">营销中心</text> <text class="top-date">营销中心</text>
<view class="middle-date-des uni-list picker-year"> <view class="top-date-des uni-list picker-year">
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector" <picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector"
...@@ -27,8 +27,18 @@ ...@@ -27,8 +27,18 @@
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image> <image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view> </view>
</view> </view>
<view class="summary upload salescenter">
<scroll-view class="scroll-area view" :scroll-top="scrollTop" scroll-y="true"> <text class="top-date">业务员</text>
<text class="top-date-des">{{HEADINFO.ZZFLD000004_DSCR}}</text>
</view>
<!-- <view class="top-bot-border"></view> -->
<view class="summary upload salescenter">
<text class="top-date">备注</text>
</view>
<view class="remark bot-radius">
<textarea class="remark-text" v-model="HEADINFO.ZZFLD000028" />
</view>
<scroll-view class="scroll-area view" :scroll-top="scrollTop" scroll-y="true" style="min-height: 1700rpx;">
<view class="view"> <view class="view">
<view class="planout-block"> <view class="planout-block">
<text class="planout-block-title">订购产品</text> <text class="planout-block-title">订购产品</text>
...@@ -118,6 +128,7 @@ ...@@ -118,6 +128,7 @@
export default { export default {
data() { data() {
return { return {
Marketing: '',
scrollTop: 0, scrollTop: 0,
mode: 'inner', mode: 'inner',
selectedSalesCenter: {}, selectedSalesCenter: {},
...@@ -219,7 +230,8 @@ ...@@ -219,7 +230,8 @@
console.log(this.isKeepData,'this.isKeepData',this.groupOrder) console.log(this.isKeepData,'this.isKeepData',this.groupOrder)
const { const {
INFO, INFO,
ITEM ITEM,
baseinfo
} = this.groupOrder } = this.groupOrder
this.HEADINFO = INFO this.HEADINFO = INFO
this.planinnerLists[0] = { this.planinnerLists[0] = {
...@@ -227,6 +239,10 @@ ...@@ -227,6 +239,10 @@
...ITEM[0] ...ITEM[0]
} }
this.productInitInfo = ITEM[0] this.productInitInfo = ITEM[0]
if(baseinfo && baseinfo.YXDY.length === 1){
this.salesCenterIndex = 0
this.Marketing = this.selectedSalesCenterArr[0].VALUE
}
// 回显营销 // 回显营销
if(this.isKeepData){ if(this.isKeepData){
this.selectedSalesCenterArr.forEach((ele,idx) => { this.selectedSalesCenterArr.forEach((ele,idx) => {
...@@ -396,6 +412,7 @@ ...@@ -396,6 +412,7 @@
this.salesCenterIndex = e.detail.value this.salesCenterIndex = e.detail.value
this.selectedSalesCenter = this.selectedSalesCenterArr[this.salesCenterIndex] this.selectedSalesCenter = this.selectedSalesCenterArr[this.salesCenterIndex]
this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY
this.Marketing = this.selectedSalesCenter.VALUE
}, },
nextStep() { nextStep() {
if (this.planinnerLists.some((item) => { if (this.planinnerLists.some((item) => {
...@@ -413,7 +430,7 @@ ...@@ -413,7 +430,7 @@
"baseinfo": this.groupOrder.baseinfo, "baseinfo": this.groupOrder.baseinfo,
'ITEM': this.planinnerLists, 'ITEM': this.planinnerLists,
'ATTACHMENT': [], 'ATTACHMENT': [],
'INFO': this.HEADINFO, 'INFO':{ ...this.HEADINFO,Marketing:this.Marketing},
} }
this.$uStore({ this.$uStore({
name: 'groupOrder', name: 'groupOrder',
...@@ -543,14 +560,16 @@ ...@@ -543,14 +560,16 @@
.summary { .summary {
display: flex; display: flex;
margin-bottom: 32rpx; margin-bottom: 10rpx;
height: 176rpx; height: 100rpx;
padding: 0 48rpx 0 24rpx; padding: 0 48rpx 0 24rpx;
justify-content: space-between; justify-content: space-between;
background: #fff;
} }
.salescenter { .salescenter {
height: 100rpx; height: 80rpx;
margin-bottom: 0;
} }
.icon_plan { .icon_plan {
...@@ -585,7 +604,7 @@ ...@@ -585,7 +604,7 @@
.swipe-right-block { .swipe-right-block {
width: 152rpx; width: 152rpx;
background: linear-gradient(90deg, #fb4d61, #ff0f00 100%); background: #ff0f00;
border-radius: 0px 8px 8px 0px; border-radius: 0px 8px 8px 0px;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -669,4 +688,45 @@ ...@@ -669,4 +688,45 @@
.btn-text-l { .btn-text-l {
color: $wly-primary-color; color: $wly-primary-color;
} }
</style> .remark-text {
flex: 1;
height: 120rpx;
background: #f5f6f7;
border-radius: 4px;
padding: 12rpx 18rpx;
margin-bottom: 40rpx;
font-size: 28rpx;
}
.remark{
background: #fff;
padding: 0 10px;
}
.top-bot-border{
border-bottom: 1px solid #f4f5f6;
margin: 0 24px 0 12px;
}
.top-date {
flex: 2;
font-size: 28rpx;
line-height: 80rpx;
color: #333;
margin-bottom: 8rpx;
}
.top-date-des {
flex: 3;
font-size: 28rpx;
line-height: 80rpx;
height: 80rpx;
color: #888;
}
.bot-radius{
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
}
.top-radius{
border-top-left-radius: 10px;
border-top-right-radius: 10px;
}
</style>
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
placeholder-class='placeholder-text' /> placeholder-class='placeholder-text' />
</view> --> </view> -->
</view> </view>
<!-- <view class="mui-input-row mui-checkbox rememberAll"> <view class="mui-input-row mui-checkbox remember-all">
<view class="rememberNum"> <view class="remember-num">
<checkbox-group @change="checkboxChangeNum"> <checkbox-group @change="checkboxChangeNum">
<checkbox <checkbox
color="#FF1D32" color="#FF1D32"
...@@ -39,10 +39,10 @@ ...@@ -39,10 +39,10 @@
type="checkbox" type="checkbox"
:checked="rememberAt" :checked="rememberAt"
@tap="rememberAt = !rememberAt" @tap="rememberAt = !rememberAt"
class="RememberCheck" class="remember-check"
> >
</checkbox> </checkbox>
<lable for="chkRemNum" class="RememberPass">记住账号</lable> <text for="chkRemNum" class="remember-pass">记住账号</text>
</checkbox-group> </checkbox-group>
</view> </view>
<view class=""> <view class="">
...@@ -53,14 +53,13 @@ ...@@ -53,14 +53,13 @@
type="checkbox" type="checkbox"
:checked="rememberPsw" :checked="rememberPsw"
@tap="rememberPsw = !rememberPsw" @tap="rememberPsw = !rememberPsw"
class="RememberCheck" class="remember-check"
> >
</checkbox> </checkbox>
<lable for="chkRem" class="RememberPass">记住密码</lable> <text for="chkRem" class="remember-pass">记住密码</text>
</checkbox-group> </checkbox-group>
</view> </view>
</view> --> </view>
<view class="bottom"> <view class="bottom">
<button class="btn" type="default" @click="goLogin" :class="{ 'btn-disabled': disabled }" <button class="btn" type="default" @click="goLogin" :class="{ 'btn-disabled': disabled }"
:disabled="disabled"><text class="btn-text">{{loginBtnText}}</text></button> :disabled="disabled"><text class="btn-text">{{loginBtnText}}</text></button>
...@@ -304,10 +303,6 @@ ...@@ -304,10 +303,6 @@
.mui-checkbox input[type='checkbox']:checked:before { .mui-checkbox input[type='checkbox']:checked:before {
color: #00bbb1; color: #00bbb1;
} }
.RememberPass {
color: #adadad;
margin-top: 5px;
}
.login { .login {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -409,13 +404,22 @@ ...@@ -409,13 +404,22 @@
font-size: 28rpx; font-size: 28rpx;
color: #666660; color: #666660;
} }
.rememberAll{ .remember-all{
margin-bottom: 28rpx; margin-bottom: 28rpx;
} }
.rememberNum{ .remember-num{
margin-right: 60rpx; margin-right: 60rpx;
} }
.RememberCheck{ .remember-check{
margin-right: 10rpx; margin-right: 10rpx;
} }
.remember-pass {
color: #adadad;
margin-top: 8rpx;
font-size: 32rpx;
}
/deep/ .uni-checkbox-input{
width: 40rpx;
height: 40rpx;
}
</style> </style>
<template> <template>
<view class="lists"> <view class="lists">
<view class="middle summary"> <scroll-view class="scroll-area view" scroll-y="true">
<view class="summary-block"> <view class="block-detal">
<image class="icon_plan" src="@/static/image/icon_plan@3x.png" mode=""></image> <view class="block-detal-item">
<text class="upload-text">附件上传</text> <text class="detal-item-label">营销单元</text>
</view> <text class="detal-item-value">{{noQuotaOrder.INFO.Marketing}}</text>
<view class="upload-block"> </view>
<uni-file-picker ref='files' :auto-upload='false' v-model="fileList" file-mediatype="image" <view class="block-detal-item">
:imageStyles="imageStyles" @select="select" @progress="progress" @success="success" @fail='fail'> <text class="detal-item-label">业务员</text>
<text>+</text> <text class="detal-item-value">{{noQuotaOrder.INFO.ZZFLD000004_DSCR}}</text>
</uni-file-picker> </view>
<view class="block-detal-item">
<text class="detal-item-label">创建日期</text>
<text class="detal-item-value">{{noQuotaOrder.INFO.POSTING_DATE}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">合计金额</text>
<text class="detal-item-value">{{intotalComputed}}</text>
</view>
<view class="block-detal-item block-detal-item-last">
<text class="detal-item-label">备注</text>
<!-- <text class="detal-item-value">{{noQuotaOrder.INFO.ZZFLD000028}}</text> -->
</view>
<text class="remark-text">
{{noQuotaOrder.INFO.ZZFLD000028}}
</text>
</view> </view>
</view> <view class="banner-title">订购产品</view>
<view class="block-detal" v-for="item in noQuotaOrder.ITEM">
<view class="bottom-area"></view> <view class="block-detal-item">
<text class="detal-item-label">产品名称</text>
<view class="bottom"> <text class="detal-item-value">{{item.DESCRIPTION}}</text>
<button class="btn btn-l" type="default" @tap="preStep"> </view>
<text class="btn-text btn-text-l">上一步</text> <view class="block-detal-item">
</button> <text class="detal-item-label">数量(件)</text>
<button class="btn" type="default" @tap="submit"> <text class="detal-item-value">{{item.quantity}}</text>
<text class="btn-text">提交</text> </view>
</button> <view class="block-detal-item">
</view> <text class="detal-item-label">单价</text>
<text class="detal-item-value">{{item.NET_PRICE}}</text>
<uni-popup ref="popup" background-color="#fff" @change="change" :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>
<view class="popup-content-content"> <view class="block-detal-item">
<text class="popup-content-content__title">提交成功</text> <text class="detal-item-label">小计</text>
<text class="popup-content-content__title2">订单号:{{ orderInfo.OBJECT_ID }}</text> <text class="detal-item-value">{{item.NET_VALUE}}</text>
</view>
</view>
<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>
</view> </view>
<view class="popup-content-foot"> <view class="upload-block">
<text class="popup-content-foot__btn" @click="fnBackHome()">回到首页</text> <uni-file-picker ref='files' :auto-upload='false' v-model="fileList" file-mediatype="image"
<text class="popup-content-foot__btn popup-content-foot__sure" :imageStyles="imageStyles" @select="select" @progress="progress" @success="success" @fail='fail'>
@click="fnCheckOrderByNo()">查看订单</text> <text>+</text>
</uni-file-picker>
</view> </view>
</view> </view>
</uni-popup>
<view class="bottom-area"></view>
<view class="bottom">
<button class="btn btn-l" type="default" @tap="preStep">
<text class="btn-text btn-text-l">上一步</text>
</button>
<button class="btn" type="default" @tap="submit">
<text class="btn-text">提交</text>
</button>
</view>
<uni-popup ref="popup" background-color="#fff" @change="change" :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">订单号:{{ orderInfo.OBJECT_ID }}</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> </view>
</template> </template>
...@@ -79,6 +126,13 @@ ...@@ -79,6 +126,13 @@
} }
} }
}, },
intotalComputed() {
let money = 0
this.noQuotaOrder.ITEM.forEach((item) => {
money += item.NET_VALUE * 1
})
return money
}
}, },
methods: { methods: {
async updateQuotaOrder() { async updateQuotaOrder() {
...@@ -404,4 +458,52 @@ ...@@ -404,4 +458,52 @@
background: #ff1d32; background: #ff1d32;
border: 1px solid #ff1d32; border: 1px solid #ff1d32;
} }
.block-detal {
display: flex;
flex-direction: column;
background: #fff;
border-radius: 20rpx;
padding: 32rpx;
margin-bottom: 20rpx;
}
.block-detal-item {
display: flex;
margin-bottom: 32rpx;
justify-content: space-between;
}
.block-detal-item-last {
margin-bottom: 0;
}
.detal-item-label {
color: #999;
font-size: 24rpx;
}
.detal-item-value {
color: #333;
font-size: 28rpx;
}
.remark-text {
flex: 1;
min-height: 100rpx;
background: #f5f6f7;
border-radius: 4px;
padding: 12rpx 18rpx;
margin-top: 10rpx;
word-break: break-all;
font-size: 28rpx;
}
.remark{
background: #fff;
padding: 0 10px;
}
.banner-title{
background: #fff;
border-radius: 16rpx;
padding: 20rpx;
margin-bottom: 20rpx;
}
</style> </style>
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
<text class="summary-num">{{intotalComputed}}</text> <text class="summary-num">{{intotalComputed}}</text>
</view> </view>
</view> </view>
<view class="summary upload salescenter top-radius">
<view class="middle summary upload salescenter">
<text class="middle-date">营销中心</text> <text class="middle-date">营销中心</text>
<view class="middle-date-des uni-list picker-year"> <view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell"> <view class="uni-list-cell">
...@@ -27,8 +26,17 @@ ...@@ -27,8 +26,17 @@
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image> <image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view> </view>
</view> </view>
<view class="summary upload salescenter">
<scroll-view class="scroll-area view" :scroll-top="scrollTop" scroll-y="true"> <text class="top-date">业务员</text>
<text class="top-date-des">{{HEADINFO.ZZFLD000004_DSCR}}</text>
</view>
<view class="summary upload salescenter">
<text class="top-date">备注</text>
</view>
<view class="remark bot-radius">
<textarea class="remark-text" v-model="HEADINFO.ZZFLD000028" />
</view>
<scroll-view class="scroll-area view" :scroll-top="scrollTop" scroll-y="true" style="min-height: 1700rpx;">
<view class="view"> <view class="view">
<view class="planout-block"> <view class="planout-block">
<text class="planout-block-title">订购产品</text> <text class="planout-block-title">订购产品</text>
...@@ -130,7 +138,8 @@ ...@@ -130,7 +138,8 @@
'product_info': {}, 'product_info': {},
}], }],
HEADINFO: {}, HEADINFO: {},
productInitInfo: {} productInitInfo: {},
Marketing: '',
} }
}, },
computed: { computed: {
...@@ -196,6 +205,7 @@ ...@@ -196,6 +205,7 @@
this.selectedSalesCenterArr = YXDY this.selectedSalesCenterArr = YXDY
if(YXDY.length === 1){ if(YXDY.length === 1){
this.salesCenterIndex = 0 this.salesCenterIndex = 0
this.Marketing = this.selectedSalesCenterArr[0].VALUE
} }
if (this.isKeepData) { if (this.isKeepData) {
const { const {
...@@ -351,6 +361,7 @@ ...@@ -351,6 +361,7 @@
this.salesCenterIndex = e.detail.value this.salesCenterIndex = e.detail.value
this.selectedSalesCenter = this.selectedSalesCenterArr[this.salesCenterIndex] this.selectedSalesCenter = this.selectedSalesCenterArr[this.salesCenterIndex]
this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY
this.Marketing = this.selectedSalesCenter.VALUE
}, },
nextStep() { nextStep() {
if (this.salesCenterIndex === -1) { if (this.salesCenterIndex === -1) {
...@@ -366,7 +377,7 @@ ...@@ -366,7 +377,7 @@
'ITEM': this.planinnerLists, 'ITEM': this.planinnerLists,
'item_d': [], 'item_d': [],
'ATTACHMENT': [], 'ATTACHMENT': [],
'INFO': this.HEADINFO, 'INFO':{ ...this.HEADINFO,Marketing:this.Marketing},
} }
this.$uStore({ this.$uStore({
name: 'noQuotaOrder', name: 'noQuotaOrder',
...@@ -497,14 +508,16 @@ ...@@ -497,14 +508,16 @@
.summary { .summary {
display: flex; display: flex;
margin-bottom: 32rpx; height: 100rpx;
height: 176rpx; margin-bottom: 10rpx;
padding: 0 48rpx 0 24rpx; padding: 0 48rpx 0 24rpx;
justify-content: space-between; justify-content: space-between;
} }
.salescenter { .salescenter {
height: 100rpx; height: 80rpx;
background: #fff;
margin-bottom: 0;
} }
.icon_plan { .icon_plan {
...@@ -539,7 +552,7 @@ ...@@ -539,7 +552,7 @@
.swipe-right-block { .swipe-right-block {
width: 152rpx; width: 152rpx;
background: linear-gradient(90deg, #fb4d61, #ff0f00 100%); background: #ff0f00;
border-radius: 0px 8px 8px 0px; border-radius: 0px 8px 8px 0px;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -622,4 +635,36 @@ ...@@ -622,4 +635,36 @@
.btn-text-l { .btn-text-l {
color: $wly-primary-color; color: $wly-primary-color;
} }
</style> .remark-text {
flex: 1;
height: 120rpx;
background: #f5f6f7;
border-radius: 4px;
padding: 12rpx 18rpx;
margin-bottom: 40rpx;
font-size: 28rpx;
}
.remark{
background: #fff;
padding: 0 10px;
}
.top-bot-border{
border-bottom: 1px solid #f4f5f6;
margin: 0 24px 0 12px;
}
.top-date {
flex: 2;
font-size: 28rpx;
line-height: 80rpx;
color: #333;
margin-bottom: 8rpx;
}
.bot-radius{
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
}
.top-radius{
border-top-left-radius: 10px;
border-top-right-radius: 10px;
}
</style>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</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.ZZFLD00002Q_Z1}}</text> <text class="detal-item-value">{{item.ZZFLD00002Q_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>
...@@ -508,4 +508,4 @@ ...@@ -508,4 +508,4 @@
.icon-arrow-rotate { .icon-arrow-rotate {
transform: rotate(180deg); transform: rotate(180deg);
} }
</style> </style>
...@@ -657,4 +657,7 @@ ...@@ -657,4 +657,7 @@
background: #ff1d32; background: #ff1d32;
border: 1px solid #ff1d32; border: 1px solid #ff1d32;
} }
.scroll-area{
min-height: 2666rpx;
}
</style> </style>
...@@ -638,4 +638,7 @@ ...@@ -638,4 +638,7 @@
background: #ff1d32; background: #ff1d32;
border: 1px solid #ff1d32; border: 1px solid #ff1d32;
} }
.scroll-area{
min-height: 2666rpx;
}
</style> </style>
...@@ -74,13 +74,13 @@ ...@@ -74,13 +74,13 @@
</view> </view>
<view class="text-block"> <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="middle-date-des uni-list picker-year" @click="handleCustomer">
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<text class="uni-input">{{orderItem.spurtCodeUnitName}}</text> <text class="uni-input">{{orderItem.spurtCodeUnitName}}</text>
</view> </view>
</view> </view>
<!-- <image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode=""></image> --> <image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode=""></image>
</view> </view>
</view> </view>
<view class="text-block text-block-last"> <view class="text-block text-block-last">
...@@ -239,17 +239,23 @@ ...@@ -239,17 +239,23 @@
_this.orderItem.receiveCityCode = data.selectShuntAdressAccountInfo.city_code _this.orderItem.receiveCityCode = data.selectShuntAdressAccountInfo.city_code
_this.orderItem.receiveCityName = data.selectShuntAdressAccountInfo.city_name _this.orderItem.receiveCityName = data.selectShuntAdressAccountInfo.city_name
})
uni.$on('selectShuntCode', function(data) {
console.log('监听到事件来自 selectShuntCode ,携带参数 msg 为:', data);
_this.orderItem.spurtCodeUnit = data.selectShuntCode.info.partner
_this.orderItem.spurtCodeUnitName = data.selectShuntCode.info.name_org1
}) })
}, },
onUnload() { onUnload() {
uni.$off('selectShuntAccountInfo') uni.$off('selectShuntAccountInfo')
uni.$off('selectShuntAdressAccountInfo') uni.$off('selectShuntAdressAccountInfo')
uni.$off('selectShuntCode')
}, },
beforeDestroy() { beforeDestroy() {
uni.$off('selectShuntAccountInfo') uni.$off('selectShuntAccountInfo')
uni.$off('selectShuntAdressAccountInfo') uni.$off('selectShuntAdressAccountInfo')
uni.$off('selectShuntCode')
}, },
created() { created() {
// 是否分流:B0099 // 是否分流:B0099
......
<template> <template>
<view class="lists"> <view class="lists">
<view class="middle summary"> <scroll-view class="scroll-area view" scroll-y="true">
<view class="summary-block"> <view class="block-detal">
<image class="icon_plan" src="@/static/image/icon_plan@3x.png" mode=""></image> <view class="block-detal-item">
<text class="upload-text">附件上传</text> <text class="detal-item-label">营销单元</text>
<text class="detal-item-value">{{quotaOrder.INFO.Marketing}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">业务员</text>
<text class="detal-item-value">{{quotaOrder.INFO.ZZFLD000004_DSCR}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">创建日期</text>
<text class="detal-item-value">{{quotaOrder.INFO.POSTING_DATE}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">合计金额</text>
<text class="detal-item-value">{{intotalComputed}}</text>
</view>
<view class="block-detal-item block-detal-item-last">
<text class="detal-item-label">备注</text>
<!-- <text class="detal-item-value">{{quotaOrder.INFO.ZZFLD000028}}</text> -->
</view>
<text class="remark-text">
{{quotaOrder.INFO.ZZFLD000028}}
</text>
</view> </view>
<view class="upload-block"> <view class="banner-title">计划内</view>
<uni-file-picker ref='files' :auto-upload='false' v-model="fileList" file-mediatype="image" <view class="block-detal" v-for="item in quotaOrder.ITEM_INNER">
:imageStyles="imageStyles" @select="select" @progress="progress" @success="success" @fail='fail'> <view class="block-detal-item">
<text>+</text> <text class="detal-item-label">产品名称</text>
</uni-file-picker> <text class="detal-item-value">{{item.DESCRIPTION}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">数量(件)</text>
<text class="detal-item-value">{{item.quantity}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">单价</text>
<text class="detal-item-value">{{item.NET_PRICE}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">小计</text>
<text class="detal-item-value">{{item.NET_VALUE}}</text>
</view>
</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-item">
<text class="detal-item-label">产品名称</text>
<text class="detal-item-value">{{item.DESCRIPTION}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">数量(件)</text>
<text class="detal-item-value">{{item.quantity}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">单价</text>
<text class="detal-item-value">{{item.NET_PRICE}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">小计</text>
<text class="detal-item-value">{{item.NET_VALUE}}</text>
</view>
</view>
<view class="banner-title" v-if="quotaOrder.USE&&quotaOrder.USE.length>0">占用销售计划明细</view>
<view class="block-detal" v-for="item in quotaOrder.USE">
<view class="block-detal-item">
<text class="detal-item-label">销售计划编号</text>
<text class="detal-item-value">{{item.ZZFLD00000C}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">计划类型</text>
<text class="detal-item-value">{{item.ZZFLD00000D_TEXT}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">月份</text>
<text class="detal-item-value">{{item.ZZFLD00000G}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">年度</text>
<text class="detal-item-value">{{item.ZZFLD00000F}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">总计划量</text>
<text class="detal-item-value">{{item.ZZFLD00000H}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">本次占用计划数量</text>
<text class="detal-item-value">{{item.ZZFLD00000R}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">剩余可用计划量</text>
<text class="detal-item-value">{{item.ZZFLD00000P}}</text>
</view>
</view>
<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>
</view>
<view class="upload-block">
<uni-file-picker ref='files' :auto-upload='false' v-model="fileList" file-mediatype="image"
:imageStyles="imageStyles" @select="select" @progress="progress" @success="success" @fail='fail'>
<text>+</text>
</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>
...@@ -39,7 +135,8 @@ ...@@ -39,7 +135,8 @@
@click="fnCheckOrderByNo()">查看订单</text> @click="fnCheckOrderByNo()">查看订单</text>
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
</scroll-view>
</view> </view>
</template> </template>
...@@ -74,6 +171,16 @@ ...@@ -74,6 +171,16 @@
} }
} }
}, },
intotalComputed() {
let money = 0
this.quotaOrder.ITEM_INNER.length > 0 && this.quotaOrder.ITEM_INNER.forEach((item) => {
money += item.NET_VALUE * 1
})
this.quotaOrder.ITEM_OUTER.length > 0 && this.quotaOrder.ITEM_OUTER.forEach((item) => {
money += item.NET_VALUE * 1
})
return money
}
}, },
methods: { methods: {
async updateQuotaOrder() { async updateQuotaOrder() {
...@@ -387,4 +494,51 @@ ...@@ -387,4 +494,51 @@
background: #ff1d32; background: #ff1d32;
border: 1px solid #ff1d32; border: 1px solid #ff1d32;
} }
.block-detal {
display: flex;
flex-direction: column;
background: #fff;
border-radius: 20rpx;
padding: 32rpx;
margin-bottom: 20rpx;
}
.block-detal-item {
display: flex;
margin-bottom: 32rpx;
justify-content: space-between;
}
.block-detal-item-last {
margin-bottom: 0;
}
.detal-item-label {
color: #999;
font-size: 24rpx;
}
.detal-item-value {
color: #333;
font-size: 28rpx;
}
.remark-text {
flex: 1;
min-height: 100rpx;
background: #f5f6f7;
border-radius: 4px;
padding: 12rpx 18rpx;
margin-top: 10rpx;
word-break: break-all;
font-size: 28rpx;
}
.remark{
background: #fff;
padding: 0 10px;
}
.banner-title{
background: #fff;
border-radius: 16rpx; padding: 20rpx;
margin-bottom: 20rpx;
}
</style> </style>
......
...@@ -9,10 +9,9 @@ ...@@ -9,10 +9,9 @@
<text class="summary-num">{{intotalComputed}}</text> <text class="summary-num">{{intotalComputed}}</text>
</view> </view>
</view> </view>
<view class="summary upload salescenter top-radius">
<view class="middle summary upload salescenter"> <text class="top-date">营销中心</text>
<text class="middle-date">营销中心</text> <view class="top-date-des uni-list picker-year">
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector" <picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector"
...@@ -27,8 +26,20 @@ ...@@ -27,8 +26,20 @@
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image> <image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view> </view>
</view> </view>
<!-- <view class="top-bot-border"></view> -->
<scroll-view class="scroll-area view" :scroll-top="scrollTop" scroll-y="true"> <view class="summary upload salescenter">
<text class="top-date">业务员</text>
<text class="top-date-des">{{HEADINFO.ZZFLD000004_DSCR}}</text>
</view>
<!-- <view class="top-bot-border"></view> -->
<view class="summary upload salescenter">
<text class="top-date">备注</text>
</view>
<view class="remark bot-radius">
<textarea class="remark-text" v-model="HEADINFO.ZZFLD000028" />
</view>
<scroll-view class="scroll-area view" scroll-y="true" style="min-height: 1700rpx;">
<view class="view"> <view class="view">
<view class="planout-block"> <view class="planout-block">
<text class="planout-block-title">计划内</text> <text class="planout-block-title">计划内</text>
...@@ -41,31 +52,30 @@ ...@@ -41,31 +52,30 @@
<view class="text-block title-first"> <view class="text-block title-first">
<text class="middle-date title-first__text">{{index+1}}</text> <text class="middle-date title-first__text">{{index+1}}</text>
</view> </view>
<view class="text-block" @click="selectPlanOrder(item,index)"> <view class="text-block" @click="selectProduct(index,'inner')">
<text class="middle-date">计划编号</text> <text class="middle-date">产品</text>
<view class="middle-date-des uni-list picker-year"> <view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<text class="middle-date-des">{{item.ZZFLD000005}}</text> <text class="middle-date-des">{{item.DESCRIPTION}}</text>
</view> </view>
</view> </view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"> <image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit">
</image> </image>
</view> </view>
</view> </view>
<view class="text-block" @click="selectProduct(index,'inner')"> <view class="text-block" @click="selectPlanOrder(item,index)">
<text class="middle-date">产品</text> <text class="middle-date">计划编号</text>
<view class="middle-date-des uni-list picker-year"> <view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<text class="middle-date-des">{{item.DESCRIPTION}}</text> <text class="middle-date-des">{{item.ZZFLD000005}}</text>
</view> </view>
</view> </view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"> <image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit">
</image> </image>
</view> </view>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">数量(件)</text> <text class="middle-date">数量(件)</text>
<input class="middle-date-des" type="number" :value="item.quantity" <input class="middle-date-des" type="number" :value="item.quantity"
...@@ -91,7 +101,7 @@ ...@@ -91,7 +101,7 @@
</view> </view>
<view class="view"> <view class="view" v-if="planoutLists.length > 0">
<view class="planout-block"> <view class="planout-block">
<text class="planout-block-title">计划外</text> <text class="planout-block-title">计划外</text>
</view> </view>
...@@ -105,7 +115,7 @@ ...@@ -105,7 +115,7 @@
<view class="text-block title-first"> <view class="text-block title-first">
<text class="middle-date title-first__text">{{index+1}}</text> <text class="middle-date title-first__text">{{index+1}}</text>
</view> </view>
<view class="text-block" @click="selectProduct(index,'outer')"> <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="middle-date-des uni-list picker-year">
<view class="uni-list-cell"> <view class="uni-list-cell">
...@@ -113,15 +123,24 @@ ...@@ -113,15 +123,24 @@
<text class="middle-date-des">{{item.DESCRIPTION}}</text> <text class="middle-date-des">{{item.DESCRIPTION}}</text>
</view> </view>
</view> </view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"> </view>
</image> </view>
<view class="text-block">
<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">{{item.ZZFLD000005}}</text>
</view>
</view>
</view> </view>
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">数量(件)</text> <text class="middle-date">数量(件)</text>
<input class="middle-date-des" type="number" :value="item.quantity" <text class="middle-date-des">{{item.quantity}}</text>
<!-- <input class="middle-date-des" type="number" :value="item.quantity"
@input="calcOuterTotal($event,item,index)" @input="calcOuterTotal($event,item,index)"
@blur="updateQuotaData(index,'outer',item)" placeholder="请填写" /> @blur="updateQuotaData(index,'outer',item)" placeholder="请填写" /> -->
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">单价</text> <text class="middle-date">单价</text>
...@@ -200,7 +219,9 @@ ...@@ -200,7 +219,9 @@
'salesplan_info': {} 'salesplan_info': {}
}], }],
HEADINFO: {}, HEADINFO: {},
productInitInfo: {} productInitInfo: {},
Marketing: '',
USE: null,
} }
}, },
computed: { computed: {
...@@ -300,13 +321,16 @@ ...@@ -300,13 +321,16 @@
this.selectedSalesCenterArr = YXDY this.selectedSalesCenterArr = YXDY
if(YXDY.length === 1){ if(YXDY.length === 1){
this.salesCenterIndex = 0 this.salesCenterIndex = 0
this.Marketing = this.selectedSalesCenterArr[0].VALUE
} }
if (this.isKeepData) { if (this.isKeepData) {
const { const {
INFO, INFO,
ITEM_INNER: ITEM_INNER2, ITEM_INNER: ITEM_INNER2,
ITEM_OUTER ITEM_OUTER,
USE
} = this.quotaOrder } = this.quotaOrder
this.USE = USE
this.HEADINFO = { this.HEADINFO = {
...HEAD, ...HEAD,
...INFO ...INFO
...@@ -334,7 +358,6 @@ ...@@ -334,7 +358,6 @@
let item_outer = [] let item_outer = []
let productAfterInit = this.updateProductByInit(productIndex, mode, product) let productAfterInit = this.updateProductByInit(productIndex, mode, product)
console.log('productAfterInit', productAfterInit) console.log('productAfterInit', productAfterInit)
// 销售计划编号、产品编号和件数 都有才请求 // 销售计划编号、产品编号和件数 都有才请求
...@@ -361,12 +384,14 @@ ...@@ -361,12 +384,14 @@
} }
const res = await apiUpdateQuotaData(params) const res = await apiUpdateQuotaData(params)
console.log('updateQuotaData', res) console.log('updateQuotaData', res)
this.USE = null
const { const {
ITEM_INNER, ITEM_INNER,
ITEM_OUTER, ITEM_OUTER,
INFO INFO,
USE
} = res.DATA } = res.DATA
this.USE = USE
this.HEADINFO = { this.HEADINFO = {
...this.HEADINFO, ...this.HEADINFO,
...INFO ...INFO
...@@ -404,7 +429,7 @@ ...@@ -404,7 +429,7 @@
this.planoutLists.push(ITEM_OUTER) this.planoutLists.push(ITEM_OUTER)
} }
} else { } else {
this.planoutLists = ITEM_OUTER this.planoutLists = [{...ITEM_OUTER[0], quantity:ITEM_OUTER[0].ZZFLD000009}]
} }
} }
console.log('planinnerLists', this.planinnerLists) console.log('planinnerLists', this.planinnerLists)
...@@ -445,7 +470,7 @@ ...@@ -445,7 +470,7 @@
if (i === productIndex) { if (i === productIndex) {
item.ORDERED_PROD = PRODUCT_ID item.ORDERED_PROD = PRODUCT_ID
item.DESCRIPTION = SHORT_TEXT item.DESCRIPTION = SHORT_TEXT
item.ZZFLD000009 = item.quantity item.quantity = item.ZZFLD000009
obj = item obj = item
} }
return item return item
...@@ -556,6 +581,7 @@ ...@@ -556,6 +581,7 @@
this.salesCenterIndex = e.detail.value this.salesCenterIndex = e.detail.value
this.selectedSalesCenter = this.selectedSalesCenterArr[this.salesCenterIndex] this.selectedSalesCenter = this.selectedSalesCenterArr[this.salesCenterIndex]
this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY
this.Marketing = this.selectedSalesCenter.VALUE
}, },
nextStep() { nextStep() {
if (this.salesCenterIndex === -1) { if (this.salesCenterIndex === -1) {
...@@ -572,7 +598,8 @@ ...@@ -572,7 +598,8 @@
'ITEM_OUTER': this.planoutLists, 'ITEM_OUTER': this.planoutLists,
'item_d': [], 'item_d': [],
'ATTACHMENT': [], 'ATTACHMENT': [],
'INFO': this.HEADINFO, 'INFO':{ ...this.HEADINFO,Marketing:this.Marketing},
'USE': this.USE
} }
this.$uStore({ this.$uStore({
name: 'quotaOrder', name: 'quotaOrder',
...@@ -618,7 +645,6 @@ ...@@ -618,7 +645,6 @@
.text-block { .text-block {
overflow: hidden; overflow: hidden;
height: 96rpx; height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6; border-bottom: 1px solid #f4f5f6;
} }
...@@ -703,15 +729,17 @@ ...@@ -703,15 +729,17 @@
} }
.summary { .summary {
background-color: #fff;
display: flex; display: flex;
margin-bottom: 32rpx; margin-bottom: 10rpx;
height: 176rpx; height: 100rpx;
padding: 0 48rpx 0 24rpx; padding: 0 48rpx 0 24rpx;
justify-content: space-between; justify-content: space-between;
} }
.salescenter { .salescenter {
height: 100rpx; height: 80rpx;
margin-bottom: 0;
} }
.icon_plan { .icon_plan {
...@@ -746,7 +774,7 @@ ...@@ -746,7 +774,7 @@
.swipe-right-block { .swipe-right-block {
width: 152rpx; width: 152rpx;
background: linear-gradient(90deg, #fb4d61, #ff0f00 100%); background: #ff0f00;
border-radius: 0px 8px 8px 0px; border-radius: 0px 8px 8px 0px;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -829,4 +857,38 @@ ...@@ -829,4 +857,38 @@
.btn-text-l { .btn-text-l {
color: $wly-primary-color; color: $wly-primary-color;
} }
.remark-text {
flex: 1;
height: 120rpx;
background: #f5f6f7;
border-radius: 4px;
padding: 12rpx 18rpx;
margin-bottom: 40rpx;
font-size: 28rpx;
}
.remark{
background: #fff;
padding: 0 10px;
}
.top-bot-border{
border-bottom: 1px solid #f4f5f6;
margin: 0 24px 0 12px;
}
.top-date {
flex: 2;
font-size: 28rpx;
line-height: 80rpx;
color: #333;
margin-bottom: 8rpx;
}
.top-date-des {
flex: 3;
font-size: 28rpx;
line-height: 80rpx;
height: 80rpx;
color: #888;
}
.bot-radius{ border-bottom-left-radius: 10px; border-bottom-right-radius: 10px; }
.top-radius{ border-top-left-radius: 10px; border-top-right-radius: 10px; }
</style> </style>
......
...@@ -6,7 +6,21 @@ ...@@ -6,7 +6,21 @@
</view> </view>
<view class="main" :style="mainHeight"> <view class="main" :style="mainHeight">
<view class="middle view planout-block-item"> <view class="middle view planout-block-item">
<view class="text-block text-block-last"> <view class="text-block">
<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">
<picker class="picker-block" @change="bindPickerChange($event,'type')" :value="customerType"
range-key='name' mode="selector" :range="customerTypeArr">
<view class="uni-input">{{customerType || '请选择'}}</view>
</picker>
</view>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode=""></image>
</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="middle-date-des uni-list picker-year">
<view class="uni-list-cell"> <view class="uni-list-cell">
...@@ -16,7 +30,7 @@ ...@@ -16,7 +30,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="text-block text-block-last"> <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="middle-date-des uni-list picker-year">
<view class="uni-list-cell"> <view class="uni-list-cell">
...@@ -26,6 +40,20 @@ ...@@ -26,6 +40,20 @@
</view> </view>
</view> </view>
</view> </view>
<view class="text-block text-block-last">
<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">
<picker class="picker-block" @change="bindPickerChange($event,'unit')" :value="marketUnit"
range-key='MC_SHORT' mode="selector" :range="marketUnitArr">
<view class="uni-input">{{marketUnit || '请选择'}}</view>
</picker>
</view>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode=""></image>
</view>
</view>
</view> </view>
<view class="planout-block"> <view class="planout-block">
...@@ -33,33 +61,41 @@ ...@@ -33,33 +61,41 @@
<text class="btn-text">查询</text> <text class="btn-text">查询</text>
</button> </button>
</view> </view>
<list ref="list" class="scroll-area view" loadmoreoffset='100' @loadmore="scrolltolower" <list ref="list" class="scroll-area view" loadmoreoffset='100' @loadmore="scrolltolower"
:show-scrollbar='false'> :show-scrollbar='false'>
<refresh @refresh="refresh" :display="refreshing ? 'show' : 'hide'"> <refresh @refresh="refresh" :display="refreshing ? 'show' : 'hide'">
</refresh> </refresh>
<cell v-for="(item,index) in lists" :key="item.guid" @click="handleChecked(item)"> <cell v-for="(item,index) in lists" :key="index" @click="handleChecked(item)">
<view class="scroll-item"> <view class="scroll-item">
<view class="item-block item-block-code"> <view class="item-block item-block-code">
<text class="item-block-label">客户编号:{{item.partner}}</text> <text class="item-block-label">客户编号:{{item.info.partner}}</text>
</view> </view>
<view class="item-block item-block-code"> <view class="item-block item-block-code">
<text class="item-block-label">客户名称:{{item.partner_name}}</text> <text class="item-block-label">客户名称:{{item.info.name_org1}}</text>
</view> </view>
<view class="item-block item-block-code"> <view class="item-block item-block-code">
<text class="item-block-label">客户类型:{{item.partner_name}}</text> <text class="item-block-label">客户类型:{{item.info.zzfld000016_text}}</text>
</view> </view>
<view class="item-block item-block-code"> <view class="item-block item-block-code">
<text class="item-block-label">旧编码:{{item.c_o_name}}</text> <text class="item-block-label">旧编码:{{item.info.zzfld000017}}</text>
</view> </view>
<view class="item-block item-block-code"> <view class="item-block item-block-code">
<text class="item-block-label">法人姓名:{{item.tel_number}}</text> <text class="item-block-label">法人姓名:{{item.info.zzfld000018}}</text>
</view> </view>
<view class="item-block item-block-code"> <view class="item-block item-block-code">
<text class="item-block-label">电话:{{item.street}}</text> <text class="item-block-label">电话:{{item.info.zzfld000019}}</text>
</view> </view>
<view class="item-block item-block-code"> <view class="item-block item-block-code">
<text class="item-block-label">统一社会信用代码:{{item.street}}</text> <text class="item-block-label">统一社会信用代码:{{item.info.zzfld00001a}}</text>
</view>
<view class="item-block item-block-code">
<text class="item-block-label">负责员工编号:{{item.info.sales_emp}}</text>
</view>
<view class="item-block item-block-code">
<text class="item-block-label">负责人姓名:{{item.info.sales_emp_name}}</text>
</view>
<view class="item-block item-block-code">
<text class="item-block-label">创建日:{{item.info.crdat}}</text>
</view> </view>
</view> </view>
</cell> </cell>
...@@ -70,7 +106,7 @@ ...@@ -70,7 +106,7 @@
</cell> </cell>
<view class="planout-block-item__last"> </view> <view class="planout-block-item__last"> </view>
</list> </list>
<no-data v-if="lists.length===0"></no-data>
</view> </view>
</view> </view>
</template> </template>
...@@ -81,12 +117,17 @@ ...@@ -81,12 +117,17 @@
} from 'vuex' } from 'vuex'
import { import {
getCustomerList getCustomerList,
querySysDictionaryDetailsByCode,
getCtrbase
} from '@/servers/purchaseList.js' } from '@/servers/purchaseList.js'
import timeFormat from '@/uview-ui/libs/function/timeFormat.js' import timeFormat from '@/uview-ui/libs/function/timeFormat.js'
import noData from '@/components/nodata.nvue';
export default { export default {
components: {
noData,
},
data() { data() {
return { return {
scrollTop: 0, scrollTop: 0,
...@@ -105,9 +146,16 @@ ...@@ -105,9 +146,16 @@
}, },
typesIndex: 0, typesIndex: 0,
lists: [], lists: [],
customerType: '',
customerCode: '',
searchCode: '',
searchName: '', searchName: '',
marketUnit: '',
marketUnitCode: '',
orderItem: {}, orderItem: {},
selectShuntAdressAccountInfo: {} selectShuntCode: {},
customerTypeArr: [],
marketUnitArr: [],
} }
}, },
computed: { computed: {
...@@ -136,29 +184,96 @@ ...@@ -136,29 +184,96 @@
} }
}, },
created() { created() {
this.getCtrbase()
this.getSelectDictDataOrigin('A0009')
this.reset() this.reset()
this.getSalesPlanTypes(true); // this.getSalesPlanTypes(true);
}, },
methods: { methods: {
bindPickerChange(e,type) {
const index = e.detail.value || 0
switch (type) {
case 'type':
this.customerType = this.customerTypeArr[index].name
this.customerCode = this.customerTypeArr[index].value
break;
case 'unit':
this.marketUnit = this.marketUnitArr[index].MC_SHORT
this.marketUnitCode = this.marketUnitArr[index].SOBID
break;
}
},
async getCtrbase(){
const params = {
'role': "WLY001",
'sobid': '',
'value': '1',
}
const res = await getCtrbase(params)
this.marketUnitArr = res.DATA || []
},
getSelectDictDataOrigin(dictcode) {
querySysDictionaryDetailsByCode({'code': dictcode})
.then(res => {
if(res.data.Rows.length > 0){
switch (dictcode){
case 'A0009':
this.customerTypeArr = res.data.Rows
break;
default:
break;
}
}
})
.catch(() => {})
},
handleChecked(item) { handleChecked(item) {
this.selectShuntAdressAccountInfo = item this.selectShuntCode = item
uni.$emit('selectShuntAdressAccountInfo', { uni.$emit('selectShuntCode', {
selectShuntAdressAccountInfo: item selectShuntCode: item
}) })
uni.navigateBack() uni.navigateBack()
}, },
search() { search() {
this.reset() this.reset()
this.getSalesPlan(true, this.searchName); this.getSalesPlan(true, );
}, },
async getSalesPlan(isRefresh, customerCode = this.orderItem.shuntingCustomer) { async getSalesPlan(isRefresh) {
if (this.loadParams.isDone) { if (this.loadParams.isDone) {
return return
} }
const params = { const params = {
'partner': customerCode, page: 1,
'role': "WLY001" pagesize: 50,
partner: this.userInfo.code,
role: "WLY001",
mode: 'HQZY',
RT_PARTNER: this.searchCode?[{
SIGN: 'I',
OPTION: 'CP',
LOW: '*' + this.searchCode + '*',
HIGH: '',
}]:[],
RT_NAME_ORG1: this.searchName?[{
SIGN: 'I',
OPTION: 'CP',
LOW: '*' + this.searchName + '*',
HIGH: '',
}]:[],
RT_ZZFLD000016: this.customerType?[{
SIGN: 'I',
OPTION: 'CP',
LOW: '*' + this.customerType + '*',
HIGH: '',
}]:[],
RT_SAL_CENTER: this.marketUnit?[{
SIGN: 'I',
OPTION: 'CP',
LOW: '*' + this.marketUnit + '*',
HIGH: '',
}]:[],
} }
uni.showLoading({ uni.showLoading({
...@@ -291,6 +406,7 @@ ...@@ -291,6 +406,7 @@
} }
.text-block { .text-block {
display: flex;
overflow: hidden; overflow: hidden;
height: 96rpx; height: 96rpx;
margin-bottom: 14rpx; margin-bottom: 14rpx;
...@@ -318,17 +434,18 @@ ...@@ -318,17 +434,18 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
color: #888; color: #888;
white-space: nowrap;
} }
.picker-year { .picker-year {
position: relative; position: relative;
border-radius: 4px; border-radius: 4px;
align-items: center; align-items: center;
line-height: normal;
} }
.uni-list-cell { .uni-list-cell {
flex: 1; flex: 1;
// height: 100%;
} }
.uni-list-cell-db { .uni-list-cell-db {
...@@ -338,6 +455,7 @@ ...@@ -338,6 +455,7 @@
.picker-block { .picker-block {
flex: 1; flex: 1;
} }
.uni-input-text { .uni-input-text {
font-size: 14px; font-size: 14px;
...@@ -356,6 +474,7 @@ ...@@ -356,6 +474,7 @@
.planout-block-lists { .planout-block-lists {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden;
} }
.planout-block-item { .planout-block-item {
......
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
</view> </view>
</view> </view>
</cell> </cell>
<cell> <!-- <cell>
<view class="loading-more" v-if='lists.length>2'> <view class="loading-more" v-if='lists.length>2'>
<text class="loading-more-text">{{loadingText}}</text> <text class="loading-more-text">{{loadingText}}</text>
</view> </view>
</cell> </cell> -->
<view class="planout-block-item__last"> </view> <view class="planout-block-item__last"> </view>
</list> </list>
...@@ -121,8 +121,7 @@ ...@@ -121,8 +121,7 @@
} }
const params = { const params = {
// 'customerCode': this.orderItem.orderCust, 'customerCode': this.userInfo.code,
'customerCode': '4000005000',
'type': '2', 'type': '2',
} }
...@@ -183,7 +182,7 @@ ...@@ -183,7 +182,7 @@
this.loadingText = '加载中' this.loadingText = '加载中'
}, },
async getSalesPlanTypes() { async getSalesPlanTypes() {
this.getSalesPlan() this.getSalesPlan(true)
}, },
bindPickerTypesChange(e) { bindPickerTypesChange(e) {
console.log('bindPickerTypesChange', e.detail.value) console.log('bindPickerTypesChange', e.detail.value)
......
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