Skip to content

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

修复真机出现问题

parent b5a86c68
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2137 additions and 2098 deletions
pages/group-buy/group-baseinfo.nvue
View file @ 8faaf623
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</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="text" value="" placeholder="请填写" /> <input class="middle-date-des" type="text" v-model="condition.ZZFLD000098" placeholder="请填写" />
</view> </view>
<view class="text-block"> <view class="text-block">
<text class="middle-date">联系人</text> <text class="middle-date">联系人</text>
...@@ -149,7 +149,13 @@ ...@@ -149,7 +149,13 @@
_this.selectedBusiness = { _this.selectedBusiness = {
...data.selectedBusiness ...data.selectedBusiness
} }
_this.condition.BUSOPPID = data.selectedBusiness.ID const {
ID,
NAME
} = data.selectedBusiness
_this.HEADINFO.BUSOPPID = ID // 商机编码
_this.HEADINFO.BUSINAME = NAME // 商机名称
_this.condition.BUSOPPID = ID
}) })
uni.$on('selectedGroupClient', function(data) { uni.$on('selectedGroupClient', function(data) {
console.log('监听到事件来自 selectedGroupClient ，携带参数 msg 为：', data); console.log('监听到事件来自 selectedGroupClient ，携带参数 msg 为：', data);
...@@ -158,9 +164,16 @@ ...@@ -158,9 +164,16 @@
...selectedGroupClient, ...selectedGroupClient,
INFOTP: data.condition.INFOTP INFOTP: data.condition.INFOTP
} }
_this.HEADINFO.INFOTP = data.condition.INFOTP
_this.HEADINFO.GRPUTID = selectedGroupClient.ID const {
_this.condition.GRPUTID = selectedGroupClient.ID ID,
OBJNAME
} = selectedGroupClient
_this.HEADINFO.INFOTP = data.condition.INFOTP // 团购单位类型
_this.HEADINFO.GRPUTID = ID // 团购单位编码
_this.HEADINFO.GRPNAME = OBJNAME // 团购单位名称
_this.condition.GRPUTID = ID
}) })
uni.$on('selectedAddress', function(data) { uni.$on('selectedAddress', function(data) {
console.log('监听到事件来自 selectedAddress ，携带参数 msg 为：', data); console.log('监听到事件来自 selectedAddress ，携带参数 msg 为：', data);
...@@ -168,14 +181,21 @@ ...@@ -168,14 +181,21 @@
const { const {
PARTNER, PARTNER,
IC_O_NAME, IC_O_NAME,
C_O_NAME,
TEL_NUMBER, TEL_NUMBER,
STREET STREET,
NAME_ORG1
} = selectedAddress } = selectedAddress
_this.selectedAddress = { _this.selectedAddress = {
...selectedAddress ...selectedAddress
} }
_this.HEADINFO.ZZFLD00002L = C_O_NAME
_this.HEADINFO.ZZFLD00002M = TEL_NUMBER
_this.HEADINFO.ZZFLD00008T = PARTNER
_this.HEADINFO.ZZFLD00008T_DSCR = NAME_ORG1 // 组织名称
_this.HEADINFO.ZZFLD00002N = STREET
_this.condition.ZZFLD00008T = PARTNER _this.condition.ZZFLD00008T = PARTNER
_this.condition.ZZFLD00002L = IC_O_NAME _this.condition.ZZFLD00002L = C_O_NAME
_this.condition.ZZFLD00002M = TEL_NUMBER _this.condition.ZZFLD00002M = TEL_NUMBER
_this.condition.ZZFLD00002N = STREET _this.condition.ZZFLD00002N = STREET
}) })
......
pages/group-buy/order-upload.nvue
View file @ 8faaf623
...@@ -87,8 +87,8 @@ ...@@ -87,8 +87,8 @@
INFO, INFO,
ITEM, ITEM,
ATTACHMENT, ATTACHMENT,
// "USER_BP": "0081000010", "USER_BP": "0081000010",
// "ROLE": "WLYALL" "ROLE": "WLYALL"
} }
const res = await apiUpdateGroupOrder(params) const res = await apiUpdateGroupOrder(params)
...@@ -101,11 +101,11 @@ ...@@ -101,11 +101,11 @@
const params2 = { const params2 = {
"MODE": "SUBMIT", "MODE": "SUBMIT",
"info": INFO2, "INFO": INFO2,
'ITEM': ITEM2, 'ITEM': ITEM2,
"attachment": ATTACHMENT2, "ATTACHMENT": ATTACHMENT2,
// "USER_BP": "0081000010", "USER_BP": "0081000010",
// "ROLE": "WLYALL" "ROLE": "WLYALL"
} }
const res2 = await apiUpdateGroupOrder(params2) const res2 = await apiUpdateGroupOrder(params2)
console.log('apiUpdateGroupOrder', res2) console.log('apiUpdateGroupOrder', res2)
...@@ -114,12 +114,12 @@ ...@@ -114,12 +114,12 @@
INFO: INFO3, INFO: INFO3,
ITEM: ITEM3, ITEM: ITEM3,
ATTACHMENT: ATTACHMENT3, ATTACHMENT: ATTACHMENT3,
} = res2 } = res2.DATA
this.orderInfo = INFO3 this.orderInfo = INFO3
let groupOrder = { let groupOrder = {
...this.groupOrder, ...this.groupOrder,
INFO: INFO3, INFO: INFO3,
ITEM: ITEM_INNER3, ITEM: ITEM3,
ATTACHMENT: ATTACHMENT3, ATTACHMENT: ATTACHMENT3,
} }
this.$uStore({ this.$uStore({
...@@ -157,6 +157,9 @@ ...@@ -157,6 +157,9 @@
}, },
fnCheckOrderByNo() { fnCheckOrderByNo() {
this.$refs.popup.close() this.$refs.popup.close()
uni.navigateTo({
url: '/pages/my-order/my-order'
})
}, },
submit() { submit() {
this.updateGroupOrder() this.updateGroupOrder()
......
pages/group-buy/quota-order.nvue
View file @ 8faaf623
...@@ -18,7 +18,8 @@ ...@@ -18,7 +18,8 @@
<picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector" <picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector"
:value="salesCenterIndex" range-key='VALUE' :range="selectedSalesCenterArr"> :value="salesCenterIndex" range-key='VALUE' :range="selectedSalesCenterArr">
<view class="uni-input"> <view class="uni-input">
{{selectedSalesCenterArr[salesCenterIndex] && selectedSalesCenterArr[salesCenterIndex].VALUE || '请选择'}} <text
class="uni-input-text">{{selectedSalesCenterArr[salesCenterIndex] && selectedSalesCenterArr[salesCenterIndex].VALUE || '请选择'}}</text>
</view> </view>
</picker> </picker>
</view> </view>
...@@ -249,8 +250,16 @@ ...@@ -249,8 +250,16 @@
}, },
calcInnerTotal(e, item, i) { calcInnerTotal(e, item, i) {
console.log('sss', item, e) console.log('sss', item, e)
let value = e.target.value
let value = 0
if (e.target.value) {
value = e.target.value
e.target.value = value * 1 e.target.value = value * 1
} else {
value = e.detail.value
e.detail.value = value * 1
}
this.planinnerLists.forEach((product, index) => { this.planinnerLists.forEach((product, index) => {
if (i === index) { if (i === index) {
product.quantity = value * 1 product.quantity = value * 1
...@@ -405,6 +414,11 @@ ...@@ -405,6 +414,11 @@
flex: 1; flex: 1;
} }
.uni-input-text {
font-size: 14px;
color: #888;
}
.icon-arrow { .icon-arrow {
position: absolute; position: absolute;
right: 0; right: 0;
......
pages/my-order/my-order.nvue
View file @ 8faaf623
...@@ -418,9 +418,9 @@ ...@@ -418,9 +418,9 @@
} }
.icon-arrow { .icon-arrow {
width: 28rpx; width: 32rpx;
height: 16rpx; height: 20rpx;
margin-left: 16rpx; margin-left: 12rpx;
margin-top: 24rpx; margin-top: 24rpx;
transition-property: transform; transition-property: transform;
transition-duration: 0.15s; transition-duration: 0.15s;
......
pages/my-order/order-item.nvue
View file @ 8faaf623
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<text class="title-no">订单编号：{{newsItem.object_id}}</text> <text class="title-no">订单编号：{{newsItem.object_id}}</text>
<view class="title-info"> <view class="title-info">
<button class="title-info__status title-info__status-done" type="default"><text <button class="title-info__status title-info__status-done" type="default"><text
class="item-block-btn__text">{{newsItem.status_text}}</text></button> class="item-block-btn__text title-info__status-done__text">{{newsItem.status}}</text></button>
</view> </view>
</view> </view>
<view class="middle view"> <view class="middle view">
...@@ -88,8 +88,6 @@ ...@@ -88,8 +88,6 @@
background: #f61d30; background: #f61d30;
border-radius: 80rpx 200rpx 200rpx 80rpx; border-radius: 80rpx 200rpx 200rpx 80rpx;
border: 1px solid #f61d30; border: 1px solid #f61d30;
font-size: 12px;
color: #fff;
text-align: center; text-align: center;
} }
...@@ -107,6 +105,10 @@ ...@@ -107,6 +105,10 @@
height: 48rpx; height: 48rpx;
line-height: 48rpx; line-height: 48rpx;
font-size: 12px; font-size: 12px;
color: #fff;
}
.title-info__status-done__text {
color: #888888; color: #888888;
} }
......
pages/no-quota/order-upload.nvue
View file @ 8faaf623
...@@ -155,10 +155,10 @@ ...@@ -155,10 +155,10 @@
}, 300) }, 300)
}, },
fnCheckOrderByNo() { fnCheckOrderByNo() {
// uni.navigateTo({
// url:'/pages/home/home'
// })
this.$refs.popup.close() this.$refs.popup.close()
uni.navigateTo({
url: '/pages/my-order/my-order'
})
}, },
submit() { submit() {
this.updateQuotaOrder() this.updateQuotaOrder()
......
pages/no-quota/quota-order.nvue
View file @ 8faaf623
...@@ -260,8 +260,16 @@ ...@@ -260,8 +260,16 @@
}, },
calcInnerTotal(e, item, i) { calcInnerTotal(e, item, i) {
console.log('sss', item, e) console.log('sss', item, e)
let value = e.target.value
let value = 0
if (e.target.value) {
value = e.target.value
e.target.value = value * 1 e.target.value = value * 1
} else {
value = e.detail.value
e.detail.value = value * 1
}
this.planinnerLists.forEach((product, index) => { this.planinnerLists.forEach((product, index) => {
if (i === index) { if (i === index) {
product.quantity = value * 1 product.quantity = value * 1
......
pages/order-detail-group/order-detail-group.nvue
View file @ 8faaf623
<template> <template>
<view class="lists"> <view class="lists" :style="mainHeight">
<view class="status_bar" :style="navHeight"></view> <view class="status_bar" :style="navHeight"></view>
<view class="header-bg"></view> <view class="header-bg"></view>
<view class="main"> <view class="main">
<scroll-view class="scroll-area view" :scroll-top="scrollTop" scroll-y="true"> <list scrollable>
<cell class="view scroll-area">
<view class="order-main view"> <view class="order-main view">
<view class="top"> <view class="top">
<text class="title-no">订单编号：{{INFO.OBJECT_ID}}</text> <text class="title-no">订单编号：{{INFO.OBJECT_ID}}</text>
<view class="title-info"> <view class="title-info">
<button class="title-info__status" type="default"><text <button class="title-info__status" type="default"><text
class="item-block-btn__text">{{INFO.STATUS_TEXT}}</text></button> class="item-block-btn__text">{{INFO.STATUS}}</text></button>
</view> </view>
</view> </view>
<view class="order-main-middle view"> <view class="order-main-middle view">
...@@ -25,7 +24,7 @@ ...@@ -25,7 +24,7 @@
</view> </view>
<view class="text-block text-block-last"> <view class="text-block text-block-last">
<view class="middle-date-right"> <view class="middle-date-right">
<text class="middle-date">{{INFO.OBJECT_ID}}</text> <text class="middle-date">{{INFO.TOTAL_AMOUNT}}</text>
</view> </view>
<text class="middle-date-des middle-date-right">金额</text> <text class="middle-date-des middle-date-right">金额</text>
</view> </view>
...@@ -51,7 +50,8 @@ ...@@ -51,7 +50,8 @@
</view> </view>
</view> </view>
<view class="order-middle view" :class="{'order-middle-auto':ishowReceiveDetail}"> <view class="order-middle view" :class="{'order-middle-auto':!ishowReceiveDetail}" ref='receiveInfo'
:style="receiveInfoHeightComputed">
<view class="middle view"> <view class="middle view">
<view class="item-block item-block-name"> <view class="item-block item-block-name">
<text class="item-block-label">收货信息</text> <text class="item-block-label">收货信息</text>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="empty-block"></view>
<view class="middle view" v-for="(item,index) in ITEM" :key="index"> <view class="middle view" v-for="(item,index) in ITEM" :key="index">
<view class="item-block item-block-name"> <view class="item-block item-block-name">
<text class="item-block-label">订购产品</text> <text class="item-block-label">订购产品</text>
...@@ -107,34 +107,6 @@ ...@@ -107,34 +107,6 @@
</view> </view>
</view> </view>
<view class="middle view">
<view class="block-detal">
<view class="block-detal-item">
<text class="detal-item-label">产品</text>
<text class="detal-item-value">1618五粮液 500ml*6</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">数量</text>
<text class="detal-item-value">25</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">合数</text>
<text class="detal-item-value">25</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">单价</text>
<text class="detal-item-value">¥880</text>
</view>
<view class="block-detal-item block-detal-item-last">
<text class="detal-item-label"></text>
<view class="detal-item-value">
<text class="item-value-intotal">小计：</text>
<text class="item-value-intotal-num">¥20,000.00</text>
</view>
</view>
</view>
</view>
<view class="float-btn-block"> <view class="float-btn-block">
<view class="float-btn" @click="handleShowReceiveDetail"> <view class="float-btn" @click="handleShowReceiveDetail">
<text class="float-btn__text">{{ishowReceiveDetail?'收起':'展示完整信息'}}</text> <text class="float-btn__text">{{ishowReceiveDetail?'收起':'展示完整信息'}}</text>
...@@ -164,7 +136,8 @@ ...@@ -164,7 +136,8 @@
</view> </view>
</view> </view>
</view> </view>
</scroll-view> </cell>
</list>
</view> </view>
</view> </view>
...@@ -190,7 +163,8 @@ ...@@ -190,7 +163,8 @@
ITEM: [], ITEM: [],
INFO: {}, INFO: {},
ATTACHMENT: [] ATTACHMENT: []
} },
receiveInfoHeight: '132',
} }
}, },
computed: { computed: {
...@@ -208,8 +182,18 @@ ...@@ -208,8 +182,18 @@
}, },
ATTACHMENT() { ATTACHMENT() {
return this.orderDetail.ATTACHMENT || [] return this.orderDetail.ATTACHMENT || []
},
receiveInfoHeightComputed() {
return {
"height": `${this.receiveInfoHeight}px`
} }
}, },
mainHeight() {
return {
'height': `${this.sysinfo.safeArea.height }px`,
}
},
},
onLoad(option) { onLoad(option) {
this.orderItem = JSON.parse(option.order) this.orderItem = JSON.parse(option.order)
this.getOrderDetail() this.getOrderDetail()
...@@ -224,6 +208,12 @@ ...@@ -224,6 +208,12 @@
}, },
handleShowReceiveDetail() { handleShowReceiveDetail() {
this.ishowReceiveDetail = !this.ishowReceiveDetail this.ishowReceiveDetail = !this.ishowReceiveDetail
if (this.ishowReceiveDetail === true) {
this.receiveInfoHeight = `${260*this.ITEM.length+275}`
} else {
this.receiveInfoHeight = '132'
}
}, },
} }
} }
...@@ -246,9 +236,11 @@ ...@@ -246,9 +236,11 @@
flex-direction: column; flex-direction: column;
flex: 1; flex: 1;
background: #f0f4f5; background: #f0f4f5;
overflow-y: scroll;
} }
.main { .main {
position: relative;
flex-direction: column; flex-direction: column;
margin-top: -164rpx; margin-top: -164rpx;
padding: 0 16rpx; padding: 0 16rpx;
...@@ -256,6 +248,7 @@ ...@@ -256,6 +248,7 @@
.scroll-area { .scroll-area {
flex: 1; flex: 1;
overflow-y: scroll;
} }
.order-main { .order-main {
...@@ -285,7 +278,7 @@ ...@@ -285,7 +278,7 @@
.title-info__status { .title-info__status {
height: 48rpx; height: 48rpx;
line-height: 48rpx; line-height: 44rpx;
background: #f61d30; background: #f61d30;
border-radius: 80rpx 200rpx 200rpx 80rpx; border-radius: 80rpx 200rpx 200rpx 80rpx;
border: 1px solid #f61d30; border: 1px solid #f61d30;
...@@ -369,15 +362,18 @@ ...@@ -369,15 +362,18 @@
.order-middle { .order-middle {
position: relative; position: relative;
background-color: #fff;
height: 1580rpx;
overflow: hidden;
padding-bottom: 60rpx; padding-bottom: 60rpx;
margin-bottom: 16rpx; margin-bottom: 16rpx;
} }
.order-middle-auto { .order-middle-auto {
height: 290rpx; // height: 290rpx;
}
.empty-block {
height: 8px;
background: #f0f4f5;
} }
.middle { .middle {
......
pages/order-detail-noquota/order-detail-noquota.nvue
View file @ 8faaf623
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<text class="title-no">订单编号：{{INFO.OBJECT_ID}}</text> <text class="title-no">订单编号：{{INFO.OBJECT_ID}}</text>
<view class="title-info"> <view class="title-info">
<button class="title-info__status title-info__status-done" type="default"><text <button class="title-info__status title-info__status-done" type="default"><text
class="title-info__status-text">{{INFO.STATUS_TEXT}}</text> class="title-info__status-text">{{INFO.STATUS}}</text>
</button> </button>
</view> </view>
</view> </view>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</view> </view>
<view class="text-block text-block-last"> <view class="text-block text-block-last">
<view class="middle-date-right"> <view class="middle-date-right">
<text class="middle-date">{{INFO.OBJECT_ID}}</text> <text class="middle-date">{{INFO.TOTAL_AMOUNT}}</text>
</view> </view>
<text class="middle-date-des middle-date-right">金额</text> <text class="middle-date-des middle-date-right">金额</text>
</view> </view>
...@@ -64,36 +64,6 @@ ...@@ -64,36 +64,6 @@
</view> </view>
</view> </view>
<!-- <view class="middle view">
<view class="item-block item-block-name">
<text class="item-block-label">电商配额酒年度计划（1-5月）</text>
</view>
<view class="block-detal">
<view class="block-detal-item">
<text class="detal-item-label">产品</text>
<text class="detal-item-value">1618五粮液 500ml*6</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">数量</text>
<text class="detal-item-value">25</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">合数</text>
<text class="detal-item-value">25</text>
</view>
<view class="block-detal-item">
<text class="detal-item-label">单价</text>
<text class="detal-item-value">¥880</text>
</view>
<view class="block-detal-item block-detal-item-last">
<text class="detal-item-label"></text>
<view class="detal-item-value">
<text class="item-value-intotal">小计：</text>
<text class="item-value-intotal-num">¥20,000.00</text>
</view>
</view>
</view>
</view> -->
<view class="float-btn-block"> <view class="float-btn-block">
<view class="float-btn" @click="handleShowReceiveDetail"> <view class="float-btn" @click="handleShowReceiveDetail">
...@@ -148,7 +118,7 @@ ...@@ -148,7 +118,7 @@
INFO: {}, INFO: {},
ATTACHMENT: [] ATTACHMENT: []
}, },
receiveInfoHeight: '132', receiveInfoHeight: '145',
} }
}, },
computed: { computed: {
...@@ -188,9 +158,9 @@ ...@@ -188,9 +158,9 @@
handleShowReceiveDetail() { handleShowReceiveDetail() {
this.ishowReceiveDetail = !this.ishowReceiveDetail this.ishowReceiveDetail = !this.ishowReceiveDetail
if (this.ishowReceiveDetail === true) { if (this.ishowReceiveDetail === true) {
this.receiveInfoHeight = '480' this.receiveInfoHeight = `${260*this.ITEM.length}`
} else { } else {
this.receiveInfoHeight = '132' this.receiveInfoHeight = '145'
} }
}, },
} }
...@@ -250,7 +220,7 @@ ...@@ -250,7 +220,7 @@
.title-info__status { .title-info__status {
height: 48rpx; height: 48rpx;
line-height: 48rpx; line-height: 44rpx;
background: #f61d30; background: #f61d30;
border-radius: 8rpx 200rpx 200rpx 8rpx; border-radius: 8rpx 200rpx 200rpx 8rpx;
border: 1px solid #f61d30; border: 1px solid #f61d30;
...@@ -263,6 +233,10 @@ ...@@ -263,6 +233,10 @@
border: 0; border: 0;
} }
.title-info__status-text {
font-size: 12px;
}
.title-info__status-done { .title-info__status-done {
background: #f8f8f8; background: #f8f8f8;
color: #888888; color: #888888;
...@@ -317,6 +291,7 @@ ...@@ -317,6 +291,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
text-align: right;
} }
.order-middle { .order-middle {
...@@ -328,7 +303,7 @@ ...@@ -328,7 +303,7 @@
} }
.order-middle-auto { .order-middle-auto {
height: auto; // height: auto;
} }
.middle { .middle {
......
pages/order-detail-quota/order-detail-quota.nvue
View file @ 8faaf623
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<text class="title-no">订单编号：{{INFO.OBJECT_ID}}</text> <text class="title-no">订单编号：{{INFO.OBJECT_ID}}</text>
<view class="title-info"> <view class="title-info">
<button class="title-info__status" type="default"> <button class="title-info__status" type="default">
<text class="title-info__status-text">{{INFO.STATUS_TEXT}}</text> <text class="title-info__status-text">{{INFO.STATUS}}</text>
</button> </button>
</view> </view>
</view> </view>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</view> </view>
<view class="text-block text-block-last"> <view class="text-block text-block-last">
<view class="middle-date-right"> <view class="middle-date-right">
<text class="middle-date">{{INFO.OBJECT_ID}}</text> <text class="middle-date">{{INFO.TOTAL_AMOUNT}}</text>
</view> </view>
<text class="middle-date-des middle-date-right">金额</text> <text class="middle-date-des middle-date-right">金额</text>
</view> </view>
...@@ -269,9 +269,8 @@ ...@@ -269,9 +269,8 @@
} }
.title-info__status { .title-info__status {
width: 160rpx;
height: 48rpx; height: 48rpx;
line-height: 48rpx; line-height: 44rpx;
background: #f61d30; background: #f61d30;
border-radius: 200rpx; border-radius: 200rpx;
border: 1px solid #f61d30; border: 1px solid #f61d30;
...@@ -341,6 +340,7 @@ ...@@ -341,6 +340,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
text-align: right;
} }
.order-middle { .order-middle {
......
pages/produce-material/produce-material.nvue
View file @ 8faaf623
...@@ -333,9 +333,9 @@ ...@@ -333,9 +333,9 @@
} }
.icon-arrow { .icon-arrow {
width: 28rpx; width: 32rpx;
height: 16rpx; height: 20rpx;
margin-left: 16rpx; margin-left: 12rpx;
margin-top: 24rpx; margin-top: 24rpx;
transition-property: transform; transition-property: transform;
transition-duration: 0.15s; transition-duration: 0.15s;
......
pages/produce-order/produce-order.nvue
View file @ 8faaf623
...@@ -324,9 +324,9 @@ ...@@ -324,9 +324,9 @@
} }
.icon-arrow { .icon-arrow {
width: 28rpx; width: 32rpx;
height: 16rpx; height: 20rpx;
margin-left: 16rpx; margin-left: 12rpx;
margin-top: 24rpx; margin-top: 24rpx;
transition-property: transform; transition-property: transform;
transition-duration: 0.15s; transition-duration: 0.15s;
......
pages/produce-order/produce-plan.nvue
View file @ 8faaf623
...@@ -370,7 +370,7 @@ ...@@ -370,7 +370,7 @@
flex-direction: column; flex-direction: column;
padding: 32rpx 16rpx 0; padding: 32rpx 16rpx 0;
background: #f0f4f5; background: #f0f4f5;
// height: 100%; flex: 1;
} }
.middle { .middle {
......
pages/purchase-plan/purchase-plan.nvue
View file @ 8faaf623
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="lists"> <view class="lists">
<view class="status_bar" :style="navHeight"></view> <view class="status_bar" :style="navHeight"></view>
<view class="header-bg"></view> <view class="header-bg"></view>
<view class="main"> <view class="main" :style="mainHeight">
<view class="middle view planout-block-item"> <view class="middle view planout-block-item">
<view class="text-block"> <view class="text-block">
<text class="middle-date">年度</text> <text class="middle-date">年度</text>
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
</view> </view>
</view> </view>
<view class="lists-block"> <list class="scroll-area view">
<scroll-view class="scroll-area" :scroll-top="scrollTop" scroll-y="true"> <cell v-for="(item,index) in lists" :key="item.plan_number">
<view class="middle view planout-block-item" v-for="(item,index) in lists" :key="item.plan_number"> <view class="scroll-item">
<view class="item-block item-block-code"> <view class="item-block item-block-code">
<text class="item-block-label">单号：{{item.plan_number}}</text> <text class="item-block-label">单号：{{item.plan_number}}</text>
</view> </view>
...@@ -72,8 +72,9 @@ ...@@ -72,8 +72,9 @@
</view> </view>
</view> </view>
</view> </view>
</scroll-view> </cell>
</view> <view class="planout-block-item__last"> </view>
</list>
</view> </view>
</view> </view>
...@@ -132,6 +133,17 @@ ...@@ -132,6 +133,17 @@
'height': `${this.sysinfo.safeArea.top + 44}px` 'height': `${this.sysinfo.safeArea.top + 44}px`
} }
}, },
mainHeight() {
return {
'height': `${this.sysinfo.safeArea.height - 44 }px`,
}
},
scrollHeight() {
return {
'height': `${this.sysinfo.safeArea.height - 44 - 156 }px`
}
},
}, },
created() { created() {
this.condition.RT_GJAHR[0].LOW = timeFormat(new Date(), 'yyyy') this.condition.RT_GJAHR[0].LOW = timeFormat(new Date(), 'yyyy')
...@@ -144,6 +156,7 @@ ...@@ -144,6 +156,7 @@
...this.condition ...this.condition
} }
const res = await apiSalesPlan(params) const res = await apiSalesPlan(params)
const { const {
lt_result, lt_result,
page, page,
...@@ -151,7 +164,6 @@ ...@@ -151,7 +164,6 @@
} = res } = res
this.page.PAGE = page this.page.PAGE = page
this.page.PAGESIZE = pagesize this.page.PAGESIZE = pagesize
this.lists = lt_result.map((item) => { this.lists = lt_result.map((item) => {
item.checked = false item.checked = false
return item return item
...@@ -208,17 +220,19 @@ ...@@ -208,17 +220,19 @@
flex-direction: column; flex-direction: column;
background: #f0f4f5; background: #f0f4f5;
flex: 1; flex: 1;
height: 100%;
} }
.main { .main {
flex-direction: column; flex-direction: column;
margin-top: -164rpx; margin-top: -164rpx;
padding: 0 16rpx; padding: 0 16rpx;
height: calc(100% - 147px + 85px);
overflow: hidden; overflow: hidden;
} }
.scroll-area {
overflow-y: scroll;
}
.middle { .middle {
background-color: #fff; background-color: #fff;
border-radius: 16rpx; border-radius: 16rpx;
...@@ -293,18 +307,22 @@ ...@@ -293,18 +307,22 @@
flex-direction: column; flex-direction: column;
} }
.lists-block { .planout-block-item {
height: calc(100% - 140px); margin-bottom: 32rpx;
overflow-y: scroll;
}
.scroll-area {
padding-bottom: 40px;
} }
.planout-block-item { .scroll-item {
flex: 1; flex: 1;
display: flex;
flex-direction: column;
margin-bottom: 32rpx; margin-bottom: 32rpx;
background-color: #fff;
border-radius: 16rpx;
padding: 32rpx 64rpx 40rpx 48rpx;
}
.planout-block-item__last {
height: 40px;
} }
.item-block { .item-block {
......
pages/quota/order-upload.nvue
View file @ 8faaf623
...@@ -164,6 +164,9 @@ ...@@ -164,6 +164,9 @@
}, },
fnCheckOrderByNo() { fnCheckOrderByNo() {
this.$refs.popup.close() this.$refs.popup.close()
uni.navigateTo({
url: '/pages/my-order/my-order'
})
}, },
submit() { submit() {
this.updateQuotaOrder() this.updateQuotaOrder()
......
pages/quota/quota-order.nvue
View file @ 8faaf623
...@@ -408,8 +408,15 @@ ...@@ -408,8 +408,15 @@
// 计算小计 // 计算小计
calcInnerTotal(e, item, i) { calcInnerTotal(e, item, i) {
console.log('sss', item, e) console.log('sss', item, e)
let value = e.target.value let value = 0
if (e.target.value) {
value = e.target.value
e.target.value = value * 1 e.target.value = value * 1
} else {
value = e.detail.value
e.detail.value = value * 1
}
this.planinnerLists.forEach((product, index) => { this.planinnerLists.forEach((product, index) => {
if (i === index) { if (i === index) {
product.quantity = value * 1 product.quantity = value * 1
......
pages/select-product-pro/select-product-pro.vue
View file @ 8faaf623
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<view class="middle view"> <view class="middle 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="text" v-model="condition.product" placeholder="模糊查询，请手动加*" /> <input class="middle-date-des" type="text" v-model="condition.product" placeholder="模糊查询" />
</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>
......
pages/select-product/select-product.vue
View file @ 8faaf623
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<view class="middle view"> <view class="middle 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="text" v-model="condition.product" placeholder="模糊查询，请手动加*" /> <input class="middle-date-des" type="text" v-model="condition.product" placeholder="模糊查询" />
</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>
......
pages/ticket-order/ticket-order.nvue
View file @ 8faaf623
...@@ -412,9 +412,9 @@ ...@@ -412,9 +412,9 @@
} }
.icon-arrow { .icon-arrow {
width: 28rpx; width: 32rpx;
height: 16rpx; height: 20rpx;
margin-left: 16rpx; margin-left: 12rpx;
margin-top: 24rpx; margin-top: 24rpx;
transition-property: transform; transition-property: transform;
transition-duration: 0.15s; transition-duration: 0.15s;
......
unpackage/dist/dev/app-plus/app-service.js
View file @ 8faaf623
This diff is collapsed.
unpackage/dist/dev/app-plus/app-view.js
View file @ 8faaf623
...@@ -13856,11 +13856,7 @@ var render = function() { ...@@ -13856,11 +13856,7 @@ var render = function() {
), ),
_c("v-uni-input", { _c("v-uni-input", {
staticClass: _vm._$g(7, "sc"), staticClass: _vm._$g(7, "sc"),
attrs: { attrs: { type: "text", placeholder: "模糊查询", _i: 7 },
type: "text",
placeholder: "模糊查询，请手动加*",
_i: 7
},
model: { model: {
value: _vm._$g(7, "v-model"), value: _vm._$g(7, "v-model"),
callback: function($$v) { callback: function($$v) {
...@@ -14333,11 +14329,7 @@ var render = function() { ...@@ -14333,11 +14329,7 @@ var render = function() {
), ),
_c("v-uni-input", { _c("v-uni-input", {
staticClass: _vm._$g(7, "sc"), staticClass: _vm._$g(7, "sc"),
attrs: { attrs: { type: "text", placeholder: "模糊查询", _i: 7 },
type: "text",
placeholder: "模糊查询，请手动加*",
_i: 7
},
model: { model: {
value: _vm._$g(7, "v-model"), value: _vm._$g(7, "v-model"),
callback: function($$v) { callback: function($$v) {
unpackage/dist/dev/app-plus/pages/apply-delivery/apply-delivery.js
View file @ 8faaf623
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/pages/login/login.js
View file @ 8faaf623
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/pages/plan/plan.js
View file @ 8faaf623
This source diff could not be displayed because it is too large. You can view the blob instead.
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