Skip to content

W
wly-APP
Commit 8c2f3e00 authored by xiangzj's avatar xiangzj
Browse files
Options

下单问题

parent 8a6f5547
Hide whitespace changes
Inline Side-by-side
Showing with 1411 additions and 235 deletions
pages/address-manage/address-manage.nvue
View file @ 8c2f3e00
......@@ -2,7 +2,16 @@
<view class="order view">
<view class="status_bar" :style="navHeight"></view>
<view class="listview">
<list class="cell-list" v-if="lists.length > 0" :show-scrollbar='false' loadmoreoffset='100'
<view class="add-btn" v-if="!isShow">
<button class="mini-btn btn" type="default" size="mini" @tap="handleMy()">
<text class="btn-text ">新增我的客户</text>
</button>
<text style="flex:1;"></text>
<button class="mini-btn btn" type="default" size="mini" @tap="handleAdd()">
<text class="btn-text">新增地址</text>
</button>
</view>
<list class="cell-list" v-if="!isShow&&lists.length > 0" :show-scrollbar='false' loadmoreoffset='100'
@loadmore="scrolltolower">
<cell @click="handleChecked(item)" v-for="item in lists" :key='item.NUMBER'>
<view class="cell-list-block">
......@@ -33,8 +42,113 @@
</view>
</cell>
</list>
<no-data class="no-data" v-else @retry="loadMore"></no-data>
<no-data class="no-data" v-if="!isShow&&lists.length === 0" @retry="loadMore"></no-data>
<view class="middle view" v-if="isShow">
<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">
<input class="middle-date-des" type="text" v-model="address.PARTNER"
placeholder="" disabled="true"/>
</view>
</view>
</view>
</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">
<input class="middle-date-des" type="text" v-model="address.NAME_LAST"
placeholder="请输入" :disabled='isDisabled'/>
</view>
</view>
</view>
</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">
<input class="middle-date-des" type="text" v-model="address.C_O_NAME"
placeholder="请输入" />
</view>
</view>
</view>
</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">
<input class="middle-date-des" type="text" v-model="address.TEL_NUMBER"
placeholder="请输入" />
</view>
</view>
</view>
</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">
<picker class="picker-block" @change="bindPickerChange($event,'provincecode')"
range-key='BEZEI' mode="selector" :value="address.REGION_T"
:range="provincecode">
<text class="uni-input">{{address.REGION_T}}</text>
</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>
<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,'citycode')"
range-key='CITY_NAME' mode="selector" :value="address.CITY_CODE_T"
:range="citycode">
<text class="uni-input">{{address.CITY_CODE_T}}</text>
</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>
<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,'streetCode')"
range-key='MC_STREET' mode="selector" :value="address.STREETCODE_T"
:range="streetCode">
<text class="uni-input">{{address.STREETCODE_T}}</text>
</picker>
</view>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode=""></image>
</view>
</view>
<view class="text-block text-block-last">
<text class="middle-date">地址</text>
</view>
<view class="remark">
<textarea class="remark-text" v-model="address.STREET" />
</view>
</view>
</view>
<view class="bottom" v-if="isShow">
<button class="btn btn-l" type="default" @tap="isShow=false">
<text class="btn-text btn-text-l">取消</text>
</button>
<button class="btn" type="default" @tap="confirm()">
<text class="btn-text">确定</text>
</button>
</view>
</view>
</template>
......@@ -47,7 +161,14 @@
import {
apiAddressSelect
} from '@/servers/common.js'
import {
addressCheck,
regionOvs,
cityOvs,
streetOvs,
addressImport,
} from '@/servers/address.js'
import noData from '@/components/nodata.nvue';
const modeMap = {
......@@ -64,6 +185,7 @@
},
data() {
return {
optionHeader: {},
loadingText: '加载中...',
condition: {
'PARTNER': '',
......@@ -85,7 +207,28 @@
toPageParams: {
page: '',
head: ""
}
},
isShow: false,
provincecode: [],
citycode: [],
streetCode: [],
address: {
"PARTNER": "",
"NAME_LAST": "",
"ZZFLD000016": "",
"PARTNER_YG": "",
"C_O_NAME": "",
"TEL_NUMBER": "",
"REGION": "",
"REGION_T": "",
"CITY_CODE": "",
"CITY_CODE_T": "",
"STREETCODE": "",
"STREETCODE_T": "",
"STREET": ""
},
isDisabled: false,
addHead:{}
}
},
computed: {
......@@ -105,6 +248,7 @@
} = option
this.toPageParams.page = from
this.toPageParams.head = JSON.parse(head)
this.optionHeader = { ...this.toPageParams.head }
}
},
onPullDownRefresh() {
......@@ -115,12 +259,136 @@
uni.stopPullDownRefresh();
}, 600);
},
onBackPress(event) {
if(this.isShow){
uni.navigateTo({
url: `/pages/address-manage/address-manage?from=groupBaseInfo&head=${JSON.stringify(this.optionHeader)}`
});
this.isShow = false
return false
}
},
created() {
// this.condition.PARTNER = this.userInfo.code
this.reset()
this.getAddress(true)
},
methods: {
async confirm(){
try{
const params = {
HEAD:{ ...this.addHead },
INFO:{ ...this.address },
role: "WLY001",
}
const res = await addressImport(params)
if(res.MSGTYPE === 'S'){
uni.showToast({
title: res.MESSAGE,
duration: 2000,
icon: 'none'
});
const item = {
...res.DATA,
NAME_ORG1: res.DATA.NAME_LAST
}
uni.$emit('selectedAddress', {
selectedAddress: item
})
uni.navigateBack()
}
}catch(e){
}
console.log(this.address,this.toPageParams.head)
},
handleMy(){
if(!this.toPageParams.head.GRPNAME){
uni.showToast({
title: '请先选择团购单位',
duration: 2000,
icon: 'none'
});
return
}
this.isShow = true
this.isDisabled = false
this.GetAddressCheck('')
},
handleAdd(){
if(!this.toPageParams.head.ZZFLD00008T_DSCR){
uni.showToast({
title: '请先选择收货单位',
duration: 2000,
icon: 'none'
});
return
}
this.isShow = true
this.isDisabled = true
this.GetAddressCheck('X')
},
async GetAddressCheck(type){
try{
const params = {
head: this.toPageParams.head,
mode: type,
role: "WLY001"
}
const res = await addressCheck(params)
this.addHead = {...res.DATA.HEAD}
this.address = {...res.DATA.INFO}
const res1 = await regionOvs()
this.provincecode = res1.DATA
}catch(e){
//TODO handle the exception
}
},
bindPickerChange(e, type) {
console.log('picker发送选择改变，携带值为', e, type)
const index = e.detail.value
switch (type) {
case 'provincecode':
this.address.REGION = this.provincecode[index].BLAND
this.address.REGION_T = this.provincecode[index].BEZEI
this.getCityOvs(this.address.REGION)
break;
case 'citycode':
this.address.CITY_CODE = this.citycode[index].CITY_CODE
this.address.CITY_CODE_T = this.citycode[index].CITY_NAME
this.getStreetOvs(this.address.CITY_CODE)
break;
case 'streetCode':
this.address.STREETCODE = this.streetCode[index].STRT_CODE
this.address.STREETCODE_T = this.streetCode[index].MC_STREET
break;
}
},
async getStreetOvs(code){
try{
const params = {
"CITY_CODE": code,
'role': "WLY001"
}
const res = await streetOvs(params)
this.streetCode = res.DATA
}catch(e){
//TODO handle the exception
}
},
async getCityOvs(code){
try{
const params = {
"REGION": code,
'role': "WLY001"
}
const res = await cityOvs(params)
this.citycode = res.DATA
}catch(e){
//TODO handle the exception
}
},
async getAddress(isRefresh) {
if (this.loadParams.isDone) {
return
......@@ -324,4 +592,180 @@
font-size: 12px;
color: #999;
}
.btn {
flex: 1;
height: 80rpx;
background: $wly-primary-color;
border-radius: 46rpx;
width: 100px;
}
.btn-l {
margin-right: 300rpx;
border: 1px solid $wly-primary-color;
background-color: transparent;
}
.add-btn{
justify-content: space-around;
margin-bottom: 16rpx;
display: flex;
flex-direction: row;
}
.btn-text {
color: #fff;
font-size: 34rpx;
}
.btn-text-l {
color: $wly-primary-color;
}
.bottom {
position: fixed;
bottom: 0;
left: 0;
z-index: 10;
width: 750rpx;
height: 140rpx;
padding: 0 32rpx;
background-color: #fff;
justify-content: space-between;
align-items: center;
}
.middle {
background-color: #fff;
border-radius: 16rpx;
padding: 0 48rpx;
margin-bottom: 32rpx;
}
.view {
display: flex;
flex-direction: column;
}
.text-block {
display: flex;
overflow: hidden;
height: 96rpx;
border-bottom: 1px solid #f4f5f6;
}
.text-block-last {
margin-bottom: 0;
border-bottom: 0;
}
.no-border {
border: 0;
}
.middle-date {
flex: 3;
font-size: 28rpx;
color: #999;
margin-bottom: 8rpx;
line-height: 96rpx;
}
.middle-date-des {
display: flex;
align-items: center;
flex: 4;
font-size: 28rpx;
color: $text-base-color;
height: 96rpx;
line-height: 96rpx;
}
.middle-date-product{
display: flex;
align-items: center;
flex: 4;
font-size: 28rpx;
color: $text-base-color;
height: 96rpx;
}
.middle-date-buttons {}
.uni-input-placeholder {
color: #DBDBDB;
}
.picker-year {
position: relative;
align-items: center;
// padding-left: 14rpx;
}
.uni-list-cell {
flex: 1;
padding-right: 52rpx;
}
.uni-list-cell-db {
flex: 1;
}
.picker-block {
flex: 1;
height: 100%;
}
.uni-input {
line-height: 100%;
font-size: 14px;
color: $text-base-color;
}
.icon-arrow {
position: absolute;
right: 22rpx;
top: 40rpx;
width: 7px;
height: 10px;
z-index: 10;
}
.icon-search {
width: 11px;
height: 12px;
top: 36rpx;
}
.remark {
margin-bottom: 24px;
}
.remark-text {
flex: 1;
height: 180rpx;
background: #f5f6f7;
border-radius: 4px;
padding: 12rpx 18rpx;
}
.diy-entry {
width: 140rpx;
height: 68rpx;
background: #f8f8f8;
border-radius: 8px;
line-height: 68rpx;
border: 1px solid #f8f8f8;
margin-left: 16rpx;
}
.diy-icon {
width: 24rpx;
height: 20rpx;
margin-right: 8rpx;
}
.diy-entry-text {
color: #333;
font-size: 12px;
}
.planout-block-item {
margin-top: 48rpx;
}
</style>
pages/breakwords-clue/breakwords-clue.vue
View file @ 8c2f3e00
......@@ -334,13 +334,12 @@
<text class="middle-date-des">{{distributerByBarcode.productDisChaManagerName}}</text>
</view>
</view>
<view class="middle view">
<view class="upload-area view">
<text class="title">门头照片</text>
<view class="pic-lists">
<uni-file-picker ref='files' :auto-upload='false' v-model="fileList" file-mediatype="image"
:imageStyles="imageStyles" @select="select" @progress="progress" @success="success"
<uni-file-picker ref='files' :auto-upload='false' v-model="fileDoorList" file-mediatype="image"
:imageStyles="imageStyles" @select="select($event,'door')" @progress="progress" @success="success"
@fail='fail'>
<text>+</text>
</uni-file-picker>
......@@ -350,8 +349,8 @@
<view class="upload-area view">
<text class="title">产品照片</text>
<view class="pic-lists">
<uni-file-picker ref='files' :auto-upload='false' v-model="fileList" file-mediatype="image"
:imageStyles="imageStyles" @select="select" @progress="progress" @success="success"
<uni-file-picker ref='files' :auto-upload='false' v-model="fileProList" file-mediatype="image"
:imageStyles="imageStyles" @select="select($event,'pro')" @progress="progress" @success="success"
@fail='fail'>
<text>+</text>
</uni-file-picker>
......@@ -361,8 +360,8 @@
<view class="upload-area view">
<text class="title">发票/收据照片</text>
<view class="pic-lists">
<uni-file-picker ref='files' :auto-upload='false' v-model="fileList" file-mediatype="image"
:imageStyles="imageStyles" @select="select" @progress="progress" @success="success"
<uni-file-picker ref='files' :auto-upload='false' v-model="fileBillList" file-mediatype="image"
:imageStyles="imageStyles" @select="select($event,'bill')" @progress="progress" @success="success"
@fail='fail'>
<text>+</text>
</uni-file-picker>
......@@ -445,15 +444,17 @@
auditNotes: '',
barcode: '',
receiveAmount: '',
doorPicUrl: 'https://t7.baidu.com/it/u=2487758541,1861252964&fm=193&f=GIF',
productPicUrl: 'https://t7.baidu.com/it/u=2487758541,1861252964&fm=193&f=GIF',
invoicePicUrl: 'https://t7.baidu.com/it/u=2487758541,1861252964&fm=193&f=GIF',
receiptPicUrl: 'https://t7.baidu.com/it/u=2487758541,1861252964&fm=193&f=GIF',
doorPicUrl: '',
productPicUrl: '',
invoicePicUrl: '',
receiptPicUrl: '',
},
pickerIndexs: {
submitMethodIndex: 0
},
fileList: [],
fileDoorList: [],
fileProList: [],
fileBillList: [],
selectDataOptions: {
'SubmitMethod': [],
'ViolationType': [],
......@@ -691,7 +692,7 @@
'provinceCode': this.condition.provinceCode,
'provinceName': this.condition.provinceName,
'pwdInfo': this.condition.pwdInfo,
'receiptPicUrl': this.condition.receiptPicUrl,
'receiptPicUrl': this.condition.invoicePicUrl,
'receiveAmount': this.condition.receiveAmount-0,
'submitMethod': this.condition.submitMethod,
'submitSource': 'DISTRIBUTER',
......@@ -734,8 +735,21 @@
console.log('上传进度：', e)
},
// 选择文件
select(e) {
console.log('选择文件：', e, this.fileList)
select(e,type) {
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) {
......
pages/breakwords-mission-confirm/breakwords-mission-confirm.nvue
View file @ 8c2f3e00
......@@ -151,7 +151,7 @@
</view>
</view>
<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="uni-list-cell">
<view class="uni-list-cell-db">
......@@ -192,6 +192,16 @@
</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="children-block">
<image class="children-block-icon" src="@/static/image/usercenter_purchaseplan@3x.png" mode="">
......
pages/breakwords-mission-detail/breakwords-mission-detail.nvue
View file @ 8c2f3e00
......@@ -375,7 +375,7 @@
align-items: center;
flex: 5.5;
font-size: 24rpx;
color: $text-base-color;
color:red;
height: 96rpx;
line-height: 96rpx;
}
......@@ -391,18 +391,15 @@
.uni-list-cell {
flex: 1;
height: 100%;
padding-right: 52rpx;
}
.uni-list-cell-db {
flex: 1;
height: 100%;
}
.picker-block {
flex: 1;
height: 100%;
}
.icon-arrow {
......@@ -505,4 +502,8 @@
color: #fff;
font-size: 34rpx;
}
.uni-input-text {
font-size: 24rpx;
color: $text-base-color;
}
</style>
pages/group-buy/group-baseinfo.nvue
View file @ 8c2f3e00
......@@ -36,16 +36,33 @@
</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">
<picker class="picker-block" @change="bindPickerYearChange" mode="selector"
<view class="middle-date-des uni-list picker-year right-box">
<checkbox-group>
<checkbox
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">
<text class="uni-input-text">{{status[condition.ZZFLD000099].value}}</text>
</picker>
</view>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</picker> -->
<!-- <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>
<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 class="text-block">
......@@ -112,13 +129,14 @@
condition: {
'GRPUTID': '', // 团购单位编码
'BUSOPPID': '', // 商机编码
'ZZFLD000099': 0, // 是否盒外刻字
'ZZFLD000099': false, // 是否盒外刻字
'ZZFLD00008T': '', // 收货方
'ZZFLD000098': '', // 喷码内容
'ZZFLD00002L': '', // 收货联系人
'ZZFLD00002M': '', // 收货联系电话
'ZZFLD00002N': '', // 收货地址
'PENGMETHOD': '', // 喷码方式
'ZZFLD00009CX': false, //企业内购
},
designIndex: 0,
status: [{
......@@ -261,12 +279,21 @@
uni.$off('selectedPaintDesign')
},
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() {
const params = {
'PARTNER': this.userInfo.code
}
console.log(this.isKeepData,'isKeepDataisKeepData')
console.log(this.isKeepData,this.groupOrder,'isKeepDataisKeepData')
const res = await apiInitGroupData(params)
const {
HEAD,
......@@ -295,6 +322,8 @@
'ID': this.groupOrder.INFO.BUSOPPID,
'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 = {
NAME_ORG1: this.groupOrder.INFO.ZZFLD00008T_DSCR,
......@@ -327,15 +356,16 @@
}
},
bindPickerYearChange(e) {
console.log('picker发送选择改变，携带值为', e.detail.value)
this.condition.ZZFLD000099 = e.detail.value
console.log('picker发送选择改变，携带值为', e)
this.HEADINFO.ZZFLD000098 = this.condition.ZZFLD000098 = this.groupOrder.baseinfo.ZZFLD000098 = e.detail.value.length > 0 ? '企业内购' : ''
// this.condition.ZZFLD000099 = e.detail.value
},
bindPickerPaintDesignChange(e) {
console.log('picker发送选择改变，携带值为', e.detail.value)
this.paintDesignIndex = e.detail.value
switch (e.detail.value) {
case 1:
this.condition.ZZFLD000098 = ''
this.condition.ZZFLD000098 = this.condition.GRPUTID
break;
case 2:
this.condition.ZZFLD000098 = this.selectedGroupClient.OBJNAME
......@@ -379,7 +409,11 @@
'YXDY': this.selectedSalesCenterArr,
...this.condition
},
'INFO': this.HEADINFO,
'INFO': {
...this.HEADINFO,
ZZFLD00009CX: this.condition.ZZFLD00009CX,
ZZFLD000099: this.condition.ZZFLD000099
},
}
this.$uStore({
name: 'groupOrder',
......@@ -534,4 +568,17 @@
.btn-text-l {
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>
pages/group-buy/order-upload.nvue
View file @ 8c2f3e00
<template>
<view class="lists">
<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>
<scroll-view class="scroll-area view" scroll-y="true">
<view class="block-detal">
<view class="block-detal-item">
<text class="detal-item-label">营销单元</text>
<text class="detal-item-value">{{groupOrder.INFO.Marketing}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">业务员</text>
<text class="detal-item-value">{{groupOrder .INFO.ZZFLD000004_DSCR}}</text>
</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 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 class="banner-title">订购产品</view>
<view class="block-detal" v-for="item in groupOrder.ITEM">
<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="popup-content-content">
<text class="popup-content-content__title">提交成功</text>
<text class="popup-content-content__title2">订单号：{{ orderInfo.OBJECT_ID }}</text>
<view class="block-detal-item">
<text class="detal-item-label">小计</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 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 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>
</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>
</template>
......@@ -74,6 +121,14 @@
}
}
},
intotalComputed() {
let money = 0
this.groupOrder.ITEM.forEach((item) => {
money += item.NET_VALUE * 1
})
return money
return money
}
},
methods: {
async updateGroupOrder() {
......@@ -377,4 +432,52 @@
background: #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>
pages/group-buy/quota-order.nvue
View file @ 8c2f3e00
......@@ -10,9 +10,9 @@
</view>
</view>
<view class="middle summary upload salescenter">
<text class="middle-date">营销中心</text>
<view class="middle-date-des uni-list picker-year">
<view class="summary upload salescenter top-radius">
<text class="top-date">营销中心</text>
<view class="top-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector"
......@@ -27,8 +27,18 @@
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view>
</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-top="scrollTop" scroll-y="true" style="min-height: 1700rpx;">
<view class="view">
<view class="planout-block">
<text class="planout-block-title">订购产品</text>
......@@ -118,6 +128,7 @@
export default {
data() {
return {
Marketing: '',
scrollTop: 0,
mode: 'inner',
selectedSalesCenter: {},
......@@ -219,7 +230,8 @@
console.log(this.isKeepData,'this.isKeepData',this.groupOrder)
const {
INFO,
ITEM
ITEM,
baseinfo
} = this.groupOrder
this.HEADINFO = INFO
this.planinnerLists[0] = {
......@@ -227,6 +239,10 @@
...ITEM[0]
}
this.productInitInfo = ITEM[0]
if(baseinfo && baseinfo.YXDY.length === 1){
this.salesCenterIndex = 0
this.Marketing = this.selectedSalesCenterArr[0].VALUE
}
// 回显营销
if(this.isKeepData){
this.selectedSalesCenterArr.forEach((ele,idx) => {
......@@ -396,6 +412,7 @@
this.salesCenterIndex = e.detail.value
this.selectedSalesCenter = this.selectedSalesCenterArr[this.salesCenterIndex]
this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY
this.Marketing = this.selectedSalesCenter.VALUE
},
nextStep() {
if (this.planinnerLists.some((item) => {
......@@ -413,7 +430,7 @@
"baseinfo": this.groupOrder.baseinfo,
'ITEM': this.planinnerLists,
'ATTACHMENT': [],
'INFO': this.HEADINFO,
'INFO':{ ...this.HEADINFO,Marketing:this.Marketing},
}
this.$uStore({
name: 'groupOrder',
......@@ -543,14 +560,16 @@
.summary {
display: flex;
margin-bottom: 32rpx;
height: 176rpx;
margin-bottom: 10rpx;
height: 100rpx;
padding: 0 48rpx 0 24rpx;
justify-content: space-between;
background: #fff;
}
.salescenter {
height: 100rpx;
height: 80rpx;
margin-bottom: 0;
}
.icon_plan {
......@@ -585,7 +604,7 @@
.swipe-right-block {
width: 152rpx;
background: linear-gradient(90deg, #fb4d61, #ff0f00 100%);
background: #ff0f00;
border-radius: 0px 8px 8px 0px;
display: flex;
align-items: center;
......@@ -669,4 +688,45 @@
.btn-text-l {
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>
pages/login/login.nvue
View file @ 8c2f3e00
......@@ -30,8 +30,8 @@
placeholder-class='placeholder-text' />
</view> -->
</view>
<!-- <view class="mui-input-row mui-checkbox rememberAll">
<view class="rememberNum">
<view class="mui-input-row mui-checkbox remember-all">
<view class="remember-num">
<checkbox-group @change="checkboxChangeNum">
<checkbox
color="#FF1D32"
......@@ -39,10 +39,10 @@
type="checkbox"
:checked="rememberAt"
@tap="rememberAt = !rememberAt"
class="RememberCheck"
class="remember-check"
>
</checkbox>
<lable for="chkRemNum" class="RememberPass">记住账号</lable>
<text for="chkRemNum" class="remember-pass">记住账号</text>
</checkbox-group>
</view>
<view class="">
......@@ -53,14 +53,13 @@
type="checkbox"
:checked="rememberPsw"
@tap="rememberPsw = !rememberPsw"
class="RememberCheck"
class="remember-check"
>
</checkbox>
<lable for="chkRem" class="RememberPass">记住密码</lable>
<text for="chkRem" class="remember-pass">记住密码</text>
</checkbox-group>
</view>
</view> -->
</view>
<view class="bottom">
<button class="btn" type="default" @click="goLogin" :class="{ 'btn-disabled': disabled }"
:disabled="disabled"><text class="btn-text">{{loginBtnText}}</text></button>
......@@ -304,10 +303,6 @@
.mui-checkbox input[type='checkbox']:checked:before {
color: #00bbb1;
}
.RememberPass {
color: #adadad;
margin-top: 5px;
}
.login {
display: flex;
flex-direction: column;
......@@ -409,13 +404,22 @@
font-size: 28rpx;
color: #666660;
}
.rememberAll{
.remember-all{
margin-bottom: 28rpx;
}
.rememberNum{
.remember-num{
margin-right: 60rpx;
}
.RememberCheck{
.remember-check{
margin-right: 10rpx;
}
.remember-pass {
color: #adadad;
margin-top: 8rpx;
font-size: 32rpx;
}
/deep/ .uni-checkbox-input{
width: 40rpx;
height: 40rpx;
}
</style>
pages/no-quota/order-upload.nvue
View file @ 8c2f3e00
<template>
<view class="lists">
<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>
<scroll-view class="scroll-area view" scroll-y="true">
<view class="block-detal">
<view class="block-detal-item">
<text class="detal-item-label">营销单元</text>
<text class="detal-item-value">{{noQuotaOrder.INFO.Marketing}}</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">业务员</text>
<text class="detal-item-value">{{noQuotaOrder.INFO.ZZFLD000004_DSCR}}</text>
</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 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 class="banner-title">订购产品</view>
<view class="block-detal" v-for="item in noQuotaOrder.ITEM">
<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="popup-content-content">
<text class="popup-content-content__title">提交成功</text>
<text class="popup-content-content__title2">订单号：{{ orderInfo.OBJECT_ID }}</text>
<view class="block-detal-item">
<text class="detal-item-label">小计</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 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 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>
</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>
</template>
......@@ -79,6 +126,13 @@
}
}
},
intotalComputed() {
let money = 0
this.noQuotaOrder.ITEM.forEach((item) => {
money += item.NET_VALUE * 1
})
return money
}
},
methods: {
async updateQuotaOrder() {
......@@ -404,4 +458,52 @@
background: #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>
pages/no-quota/quota-order.nvue
View file @ 8c2f3e00
......@@ -9,8 +9,7 @@
<text class="summary-num">{{intotalComputed}}</text>
</view>
</view>
<view class="middle summary upload salescenter">
<view class="summary upload salescenter top-radius">
<text class="middle-date">营销中心</text>
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
......@@ -27,8 +26,17 @@
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view>
</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="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="planout-block">
<text class="planout-block-title">订购产品</text>
......@@ -130,7 +138,8 @@
'product_info': {},
}],
HEADINFO: {},
productInitInfo: {}
productInitInfo: {},
Marketing: '',
}
},
computed: {
......@@ -196,6 +205,7 @@
this.selectedSalesCenterArr = YXDY
if(YXDY.length === 1){
this.salesCenterIndex = 0
this.Marketing = this.selectedSalesCenterArr[0].VALUE
}
if (this.isKeepData) {
const {
......@@ -351,6 +361,7 @@
this.salesCenterIndex = e.detail.value
this.selectedSalesCenter = this.selectedSalesCenterArr[this.salesCenterIndex]
this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY
this.Marketing = this.selectedSalesCenter.VALUE
},
nextStep() {
if (this.salesCenterIndex === -1) {
......@@ -366,7 +377,7 @@
'ITEM': this.planinnerLists,
'item_d': [],
'ATTACHMENT': [],
'INFO': this.HEADINFO,
'INFO':{ ...this.HEADINFO,Marketing:this.Marketing},
}
this.$uStore({
name: 'noQuotaOrder',
......@@ -497,14 +508,16 @@
.summary {
display: flex;
margin-bottom: 32rpx;
height: 176rpx;
height: 100rpx;
margin-bottom: 10rpx;
padding: 0 48rpx 0 24rpx;
justify-content: space-between;
}
.salescenter {
height: 100rpx;
height: 80rpx;
background: #fff;
margin-bottom: 0;
}
.icon_plan {
......@@ -539,7 +552,7 @@
.swipe-right-block {
width: 152rpx;
background: linear-gradient(90deg, #fb4d61, #ff0f00 100%);
background: #ff0f00;
border-radius: 0px 8px 8px 0px;
display: flex;
align-items: center;
......@@ -622,4 +635,36 @@
.btn-text-l {
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>
pages/order-detail-quota/order-detail-quota.nvue
View file @ 8c2f3e00
......@@ -49,7 +49,7 @@
</view>
<view class="block-detal-item">
<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 class="block-detal-item">
<text class="detal-item-label">产品</text>
......@@ -508,4 +508,4 @@
.icon-arrow-rotate {
transform: rotate(180deg);
}
</style>
</style>
pages/produce-material/produce-plan.nvue
View file @ 8c2f3e00
......@@ -657,4 +657,7 @@
background: #ff1d32;
border: 1px solid #ff1d32;
}
.scroll-area{
min-height: 2666rpx;
}
</style>
pages/produce-order/produce-plan.nvue
View file @ 8c2f3e00
......@@ -638,4 +638,7 @@
background: #ff1d32;
border: 1px solid #ff1d32;
}
.scroll-area{
min-height: 2666rpx;
}
</style>
pages/purchase-receive/purchase-receive.nvue
View file @ 8c2f3e00
......@@ -74,13 +74,13 @@
</view>
<view class="text-block">
<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-db">
<text class="uni-input">{{orderItem.spurtCodeUnitName}}</text>
</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 class="text-block text-block-last">
......@@ -239,17 +239,23 @@
_this.orderItem.receiveCityCode = data.selectShuntAdressAccountInfo.city_code
_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() {
uni.$off('selectShuntAccountInfo')
uni.$off('selectShuntAdressAccountInfo')
uni.$off('selectShuntCode')
},
beforeDestroy() {
uni.$off('selectShuntAccountInfo')
uni.$off('selectShuntAdressAccountInfo')
uni.$off('selectShuntCode')
},
created() {
// 是否分流：B0099
......
pages/quota/order-upload.nvue
View file @ 8c2f3e00
<template>
<view class="lists">
<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>
<scroll-view class="scroll-area view" scroll-y="true">
<view class="block-detal">
<view class="block-detal-item">
<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 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 class="banner-title">计划内</view>
<view class="block-detal" v-for="item in quotaOrder.ITEM_INNER">
<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.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 class="bottom-area"></view>
<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>
<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">
<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>
......@@ -39,7 +135,8 @@
@click="fnCheckOrderByNo()">查看订单</text>
</view>
</view>
</uni-popup>
</uni-popup>
</scroll-view>
</view>
</template>
......@@ -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: {
async updateQuotaOrder() {
......@@ -387,4 +494,51 @@
background: #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>
......
pages/quota/quota-order.nvue
View file @ 8c2f3e00
......@@ -9,10 +9,9 @@
<text class="summary-num">{{intotalComputed}}</text>
</view>
</view>
<view class="middle summary upload salescenter">
<text class="middle-date">营销中心</text>
<view class="middle-date-des uni-list picker-year">
<view class="summary upload salescenter top-radius">
<text class="top-date">营销中心</text>
<view class="top-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector"
......@@ -27,8 +26,20 @@
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view>
</view>
<scroll-view class="scroll-area view" :scroll-top="scrollTop" scroll-y="true">
<!-- <view class="top-bot-border"></view> -->
<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="planout-block">
<text class="planout-block-title">计划内</text>
......@@ -41,31 +52,30 @@
<view class="text-block title-first">
<text class="middle-date title-first__text">{{index+1}}</text>
</view>
<view class="text-block" @click="selectPlanOrder(item,index)">
<text class="middle-date">计划编号</text>
<view class="text-block" @click="selectProduct(index,'inner')">
<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>
<text class="middle-date-des">{{item.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="selectProduct(index,'inner')">
<text class="middle-date">产品</text>
<view class="text-block" @click="selectPlanOrder(item,index)">
<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.DESCRIPTION}}</text>
<text class="middle-date-des">{{item.ZZFLD000005}}</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="item.quantity"
......@@ -91,7 +101,7 @@
</view>
<view class="view">
<view class="view" v-if="planoutLists.length > 0">
<view class="planout-block">
<text class="planout-block-title">计划外</text>
</view>
......@@ -105,7 +115,7 @@
<view class="text-block title-first">
<text class="middle-date title-first__text">{{index+1}}</text>
</view>
<view class="text-block" @click="selectProduct(index,'outer')">
<view class="text-block">
<text class="middle-date">产品</text>
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
......@@ -113,15 +123,24 @@
<text class="middle-date-des">{{item.DESCRIPTION}}</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>
<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 class="text-block">
<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)"
@blur="updateQuotaData(index,'outer',item)" placeholder="请填写" />
@blur="updateQuotaData(index,'outer',item)" placeholder="请填写" /> -->
</view>
<view class="text-block">
<text class="middle-date">单价</text>
......@@ -200,7 +219,9 @@
'salesplan_info': {}
}],
HEADINFO: {},
productInitInfo: {}
productInitInfo: {},
Marketing: '',
USE: null,
}
},
computed: {
......@@ -300,13 +321,16 @@
this.selectedSalesCenterArr = YXDY
if(YXDY.length === 1){
this.salesCenterIndex = 0
this.Marketing = this.selectedSalesCenterArr[0].VALUE
}
if (this.isKeepData) {
const {
INFO,
ITEM_INNER: ITEM_INNER2,
ITEM_OUTER
ITEM_OUTER,
USE
} = this.quotaOrder
this.USE = USE
this.HEADINFO = {
...HEAD,
...INFO
......@@ -334,7 +358,6 @@
let item_outer = []
let productAfterInit = this.updateProductByInit(productIndex, mode, product)
console.log('productAfterInit', productAfterInit)
// 销售计划编号、产品编号和件数 都有才请求
......@@ -361,12 +384,14 @@
}
const res = await apiUpdateQuotaData(params)
console.log('updateQuotaData', res)
this.USE = null
const {
ITEM_INNER,
ITEM_OUTER,
INFO
INFO,
USE
} = res.DATA
this.USE = USE
this.HEADINFO = {
...this.HEADINFO,
...INFO
......@@ -404,7 +429,7 @@
this.planoutLists.push(ITEM_OUTER)
}
} else {
this.planoutLists = ITEM_OUTER
this.planoutLists = [{...ITEM_OUTER[0], quantity:ITEM_OUTER[0].ZZFLD000009}]
}
}
console.log('planinnerLists', this.planinnerLists)
......@@ -445,7 +470,7 @@
if (i === productIndex) {
item.ORDERED_PROD = PRODUCT_ID
item.DESCRIPTION = SHORT_TEXT
item.ZZFLD000009 = item.quantity
item.quantity = item.ZZFLD000009
obj = item
}
return item
......@@ -556,6 +581,7 @@
this.salesCenterIndex = e.detail.value
this.selectedSalesCenter = this.selectedSalesCenterArr[this.salesCenterIndex]
this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY
this.Marketing = this.selectedSalesCenter.VALUE
},
nextStep() {
if (this.salesCenterIndex === -1) {
......@@ -572,7 +598,8 @@
'ITEM_OUTER': this.planoutLists,
'item_d': [],
'ATTACHMENT': [],
'INFO': this.HEADINFO,
'INFO':{ ...this.HEADINFO,Marketing:this.Marketing},
'USE': this.USE
}
this.$uStore({
name: 'quotaOrder',
......@@ -618,7 +645,6 @@
.text-block {
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
border-bottom: 1px solid #f4f5f6;
}
......@@ -703,15 +729,17 @@
}
.summary {
background-color: #fff;
display: flex;
margin-bottom: 32rpx;
height: 176rpx;
margin-bottom: 10rpx;
height: 100rpx;
padding: 0 48rpx 0 24rpx;
justify-content: space-between;
}
.salescenter {
height: 100rpx;
height: 80rpx;
margin-bottom: 0;
}
.icon_plan {
......@@ -746,7 +774,7 @@
.swipe-right-block {
width: 152rpx;
background: linear-gradient(90deg, #fb4d61, #ff0f00 100%);
background: #ff0f00;
border-radius: 0px 8px 8px 0px;
display: flex;
align-items: center;
......@@ -829,4 +857,38 @@
.btn-text-l {
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>
......
pages/select-customer/select-customer.nvue
View file @ 8c2f3e00
......@@ -6,7 +6,21 @@
</view>
<view class="main" :style="mainHeight">
<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>
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
......@@ -16,7 +30,7 @@
</view>
</view>
</view>
<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">
......@@ -26,6 +40,20 @@
</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 class="planout-block">
......@@ -33,33 +61,41 @@
<text class="btn-text">查询</text>
</button>
</view>
<list ref="list" class="scroll-area view" loadmoreoffset='100' @loadmore="scrolltolower"
:show-scrollbar='false'>
<refresh @refresh="refresh" :display="refreshing ? 'show' : 'hide'">
</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="item-block item-block-code">
<text class="item-block-label">客户编号：{{item.partner}}</text>
<text class="item-block-label">客户编号：{{item.info.partner}}</text>
</view>
<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 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 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 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 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 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>
</cell>
......@@ -70,7 +106,7 @@
</cell>
<view class="planout-block-item__last"> </view>
</list>
<no-data v-if="lists.length===0"></no-data>
</view>
</view>
</template>
......@@ -81,12 +117,17 @@
} from 'vuex'
import {
getCustomerList
getCustomerList,
querySysDictionaryDetailsByCode,
getCtrbase
} from '@/servers/purchaseList.js'
import timeFormat from '@/uview-ui/libs/function/timeFormat.js'
import noData from '@/components/nodata.nvue';
export default {
components: {
noData,
},
data() {
return {
scrollTop: 0,
......@@ -105,9 +146,16 @@
},
typesIndex: 0,
lists: [],
customerType: '',
customerCode: '',
searchCode: '',
searchName: '',
marketUnit: '',
marketUnitCode: '',
orderItem: {},
selectShuntAdressAccountInfo: {}
selectShuntCode: {},
customerTypeArr: [],
marketUnitArr: [],
}
},
computed: {
......@@ -136,29 +184,96 @@
}
},
created() {
this.getCtrbase()
this.getSelectDictDataOrigin('A0009')
this.reset()
this.getSalesPlanTypes(true);
// this.getSalesPlanTypes(true);
},
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) {
this.selectShuntAdressAccountInfo = item
uni.$emit('selectShuntAdressAccountInfo', {
selectShuntAdressAccountInfo: item
this.selectShuntCode = item
uni.$emit('selectShuntCode', {
selectShuntCode: item
})
uni.navigateBack()
},
search() {
this.reset()
this.getSalesPlan(true, this.searchName);
this.getSalesPlan(true, );
},
async getSalesPlan(isRefresh, customerCode = this.orderItem.shuntingCustomer) {
async getSalesPlan(isRefresh) {
if (this.loadParams.isDone) {
return
}
const params = {
'partner': customerCode,
'role': "WLY001"
page: 1,
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({
......@@ -291,6 +406,7 @@
}
.text-block {
display: flex;
overflow: hidden;
height: 96rpx;
margin-bottom: 14rpx;
......@@ -318,17 +434,18 @@
overflow: hidden;
text-overflow: ellipsis;
color: #888;
white-space: nowrap;
}
.picker-year {
position: relative;
border-radius: 4px;
align-items: center;
line-height: normal;
}
.uni-list-cell {
flex: 1;
// height: 100%;
}
.uni-list-cell-db {
......@@ -338,6 +455,7 @@
.picker-block {
flex: 1;
}
.uni-input-text {
font-size: 14px;
......@@ -356,6 +474,7 @@
.planout-block-lists {
display: flex;
flex-direction: column;
overflow: hidden;
}
.planout-block-item {
......
pages/select-shunt-list/select-shunt-list.nvue
View file @ 8c2f3e00
......@@ -22,11 +22,11 @@
</view>
</view>
</cell>
<cell>
<!-- <cell>
<view class="loading-more" v-if='lists.length>2'>
<text class="loading-more-text">{{loadingText}}</text>
</view>
</cell>
</cell> -->
<view class="planout-block-item__last"> </view>
</list>
......@@ -121,8 +121,7 @@
}
const params = {
// 'customerCode': this.orderItem.orderCust,
'customerCode': '4000005000',
'customerCode': this.userInfo.code,
'type': '2',
}
......@@ -183,7 +182,7 @@
this.loadingText = '加载中'
},
async getSalesPlanTypes() {
this.getSalesPlan()
this.getSalesPlan(true)
},
bindPickerTypesChange(e) {
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