Skip to content

W
wly-APP
Commit 6779e8df authored by xiangzj's avatar xiangzj
Browse files
Options

优化

parent 4407f7f6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 753 additions and 67 deletions
pages/group-buy/group-baseinfo.nvue
View file @ 6779e8df
......@@ -314,6 +314,7 @@
}
this.HEADINFO = HEAD
if (this.isKeepData) {
this.planinnerLists = [ ...this.groupOrder.ITEM ]
this.selectedGroupClient = {
'OBJNAME': this.groupOrder.INFO.GRPNAME,
'ID': this.groupOrder.INFO.GRPUTID
......
pages/group-buy/quota-order.nvue
View file @ 6779e8df
......@@ -234,10 +234,11 @@
baseinfo
} = this.groupOrder
this.HEADINFO = INFO
this.planinnerLists[0] = {
...this.planinnerLists[0],
...ITEM[0]
}
// this.planinnerLists[0] = {
// ...this.planinnerLists[0],
// ...ITEM[0]
// }
this.planinnerLists = [ ...ITEM ]
this.productInitInfo = ITEM[0]
if(baseinfo && baseinfo.YXDY.length === 1){
this.salesCenterIndex = 0
......@@ -298,7 +299,6 @@
...this.HEADINFO,
...INFO
}
if (mode === 'inner') {
this.planinnerLists = this.planinnerLists.map((item, i) => {
if (i === productIndex) {
......@@ -441,6 +441,16 @@
this.$emit('click', 'orderUpload')
},
preStep() {
let groupOrder = {
"baseinfo": this.groupOrder.baseinfo,
'ITEM': this.planinnerLists,
'ATTACHMENT': [],
'INFO':{ ...this.HEADINFO,Marketing:this.Marketing},
}
this.$uStore({
name: 'groupOrder',
value: groupOrder
});
this.$emit('click', 'groupBaseinfo', true)
},
...mapMutations(["$uStore"]),
......
pages/information/information.nvue
View file @ 6779e8df
......@@ -9,11 +9,16 @@
@scrolltolower='scrolltolower'>
<list class="scroll-area view" loadmoreoffset='100' show-scrollbar='false' @loadmore="scrolltolower">
<cell class="list-cell" v-for="(item,index) in lists" :key='index'>
<view class="middle view planout-block-item">
<text class="middle-date-des middle-date-des-select">{{item.IMG_URL}}</text>
<text class="middle-date-des middle-date-des-select">{{item.TITLE}}</text>
<text class="middle-date-des middle-date-des-select">{{item.CONTENT}}</text>
<text class="middle-date-des middle-date-des-select">{{item.DATE}}</text>
<view class="middle view planout-block-item content">
<view class="content-left">
<image class="swiper-item-img" :src="item.IMG_URL" mode="widthFix">
</image>
</view>
<view class="content-right">
<text class="content-title">{{item.TITLE}}</text>
<text class="content-texts">{{item.CONTENT}}</text>
<text class="content-text content-date">{{item.DATE}}</text>
</view>
</view>
<view class="empty-block"></view>
</cell>
......@@ -289,4 +294,33 @@
.scroll-area {
overflow-y: scroll;
}
.content{
flex-direction: row;
}
.content-left{
width: 284rpx;
height: 174rpx;
}
.content-right{
flex-direction: column;
padding-left: 34rpx;
flex: 1;
}
.content-title{
color: #333;
font-size: 32rpx;
margin-bottom: 10rpx;
}
.content-date{
margin-top: 10rpx;
color: #888;
font-size: 28rpx;
vertical-align: middle;
}
.content-texts{
color: #888;
font-size: 28rpx;
height: 60rpx;
vertical-align: middle;
}
</style>
pages/message-list/message-list-page.nvue
View file @ 6779e8df
......@@ -177,7 +177,7 @@
return
}
const params = {
id: item.id
ids: item.id
}
uni.showLoading({
......@@ -335,4 +335,4 @@
font-size: 12px;
color: #999;
}
</style>
</style>
pages/message/message.nvue
View file @ 6779e8df
......@@ -70,14 +70,22 @@
msgStatus: type
}
let res = await apiFindUnreadMsg(params)
if (type === 0) {
if (res.data.Total - 0 > 0){
uni.setTabBarBadge({
index:3,
text: res.data.Total.toString()
})
}else {
uni.removeTabBarBadge({
index:3
})
}
}
if (res.status === 1 && res.data.Rows.length > 0) {
if (type === 0) {
this.unreadList = res.data.Rows
this.unreadCount = res.data.Total
uni.setTabBarBadge({
index:3,
text: res.data.Total.toString()
})
} else {
this.readList = res.data.Rows
}
......@@ -192,4 +200,4 @@
margin-right: 28rpx;
text-align: center;
}
</style>
</style>
pages/order-detail-quota/order-detail-quota.nvue
View file @ 6779e8df
......@@ -201,7 +201,7 @@
},
scrollHeight() {
return {
'height': `${this.sysinfo.safeArea.height - 58 }px`,
'height': `${this.sysinfo.safeArea.height - 64 }px`,
}
},
},
......
pages/produce-material/produce-plan.nvue
View file @ 6779e8df
......@@ -354,8 +354,7 @@
if(res2.msgtype !== 'S'){
return
}
this.orderInfo = res.HEAD
this.orderInfo = {...res2.head}
this.$refs.popup.open('center')
}catch(e){
//TODO handle the exception
......
pages/purchase-plan-detail/purchase-plan-detail.vue 0 → 100644
View file @ 6779e8df
<template>
<view class="lists">
<view class="status_bar" :style="navHeight"></view>
<view class="header-bg">
<image class="header-bg-img" src="@/static/image/nav_bg@3x.png" mode="scaleToFill"></image>
</view>
<view class="main">
<view class="middle 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="uni-input">{{clueDetail.wlybrand_text}}</text>
</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">
<text class="uni-input">{{clueDetail.report_type_text}}</text>
</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">
<text class="uni-input">{{clueDetail.cust_name}}</text>
<!-- <text class="uni-input">{{clueDetail.cust_name}}-{{clueDetail.customer_type_text}}</text> -->
</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">
<text class="uni-input">{{clueDetail.sal_center_name}}</text>
</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">
<text class="uni-input">{{clueDetail.sales_emp_name}}</text>
</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">
<text class="uni-input">{{clueDetail.gjahr}}-{{clueDetail.monat}}</text>
</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">
<text class="uni-input">{{clueDetail.plan_type_text}}</text>
</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">
<text class="uni-input">{{clueDetail.total_qty}}</text>
</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">
<text class="uni-input">{{clueDetail.initplan_qty}}</text>
</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">
<text class="uni-input">{{clueDetail.billing_qty}}</text>
</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">
<text class="uni-input">{{clueDetail.atp_qty}}</text>
</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">
<text class="uni-input">{{clueDetail.remain_qty}}</text>
</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">
<text class="uni-input">{{clueDetail.total_amt}}</text>
</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">
<text class="uni-input">{{clueDetail.initplan_amt}}</text>
</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">
<text class="uni-input">{{clueDetail.billing_amt}}</text>
</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">
<text class="uni-input">{{clueDetail.atp_amt}}</text>
</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">
<text class="uni-input">{{clueDetail.remain_amt}}</text>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="bottom-area"></view>
</view>
</view>
</template>
<script>
import {
mapState
} from 'vuex'
import {
apiGetClueInfo,
} from '@/servers/breakwords.js'
export default {
data() {
return {
condition: {
id: ''
},
clueDetail: {},
}
},
computed: {
...mapState(['sysinfo']),
navHeight() {
return {
'height': `${this.sysinfo.safeArea.top + 44}px`
}
},
},
onLoad(option) {
this.clueDetail = JSON.parse(option.planDetail)
uni.setNavigationBarTitle({
title: this.clueDetail.plan_number
});
},
methods: {
}
}
</script>
<style lang="scss" scoped>
.view {
display: flex;
flex-direction: column;
}
.status_bar {
height: var(--status-bar-height);
}
.header-bg {
height: 284rpx;
margin-top: -88rpx;
}
.header-bg-img {
width: 100%;
}
.lists {
position: relative;
flex-direction: column;
background: #f0f4f5;
}
.main {
position: relative;
overflow-y: scroll;
flex-direction: column;
margin-top: -164rpx;
border-radius: 16rpx;
padding: 0 16rpx;
}
.middle {
background-color: #fff;
border-radius: 16rpx;
padding: 0 48rpx;
margin-bottom: 32rpx;
}
.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: 24rpx;
line-height: 96rpx;
color: #999;
margin-bottom: 8rpx;
}
.middle-date-des {
align-items: center;
flex: 5.5;
font-size: 24rpx;
color: $text-base-color;
height: 96rpx;
line-height: 96rpx;
}
.uni-input-placeholder {
color: #DBDBDB;
}
.picker-year {
position: relative;
align-items: center;
// padding-left: 14rpx;
}
.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 {
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;
font-size: 24rpx;
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;
}
.upload-area {
padding-top: 32rpx;
padding-bottom: 32rpx;
.title {
font-size: 28rpx;
color: #333;
font-weight: 500;
}
.pic-lists {
margin-top: 24rpx;
margin-bottom: 20rpx;
}
.des {
color: #1C84FF;
font-size: 20rpx;
}
}
.bottom-area {
height: 140rpx;
margin-top: 12rpx;
}
</style>
pages/purchase-plan/purchase-plan.nvue
View file @ 6779e8df
This diff is collapsed.
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