Skip to content

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

修复真机出现问题

parent b5a86c68
Expand all Hide 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 @@
</view>
<view class="text-block">
<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 class="text-block">
<text class="middle-date">联系人</text>
......@@ -149,7 +149,13 @@
_this.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) {
console.log('监听到事件来自 selectedGroupClient ，携带参数 msg 为：', data);
......@@ -158,9 +164,16 @@
...selectedGroupClient,
INFOTP: data.condition.INFOTP
}
_this.HEADINFO.INFOTP = data.condition.INFOTP
_this.HEADINFO.GRPUTID = selectedGroupClient.ID
_this.condition.GRPUTID = selectedGroupClient.ID
const {
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) {
console.log('监听到事件来自 selectedAddress ，携带参数 msg 为：', data);
......@@ -168,14 +181,21 @@
const {
PARTNER,
IC_O_NAME,
C_O_NAME,
TEL_NUMBER,
STREET
STREET,
NAME_ORG1
} = selectedAddress
_this.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.ZZFLD00002L = IC_O_NAME
_this.condition.ZZFLD00002L = C_O_NAME
_this.condition.ZZFLD00002M = TEL_NUMBER
_this.condition.ZZFLD00002N = STREET
})
......
pages/group-buy/order-upload.nvue
View file @ 8faaf623
......@@ -87,8 +87,8 @@
INFO,
ITEM,
ATTACHMENT,
// "USER_BP": "0081000010",
// "ROLE": "WLYALL"
"USER_BP": "0081000010",
"ROLE": "WLYALL"
}
const res = await apiUpdateGroupOrder(params)
......@@ -101,11 +101,11 @@
const params2 = {
"MODE": "SUBMIT",
"info": INFO2,
"INFO": INFO2,
'ITEM': ITEM2,
"attachment": ATTACHMENT2,
// "USER_BP": "0081000010",
// "ROLE": "WLYALL"
"ATTACHMENT": ATTACHMENT2,
"USER_BP": "0081000010",
"ROLE": "WLYALL"
}
const res2 = await apiUpdateGroupOrder(params2)
console.log('apiUpdateGroupOrder', res2)
......@@ -114,12 +114,12 @@
INFO: INFO3,
ITEM: ITEM3,
ATTACHMENT: ATTACHMENT3,
} = res2
} = res2.DATA
this.orderInfo = INFO3
let groupOrder = {
...this.groupOrder,
INFO: INFO3,
ITEM: ITEM_INNER3,
ITEM: ITEM3,
ATTACHMENT: ATTACHMENT3,
}
this.$uStore({
......@@ -157,6 +157,9 @@
},
fnCheckOrderByNo() {
this.$refs.popup.close()
uni.navigateTo({
url: '/pages/my-order/my-order'
})
},
submit() {
this.updateGroupOrder()
......
pages/group-buy/quota-order.nvue
View file @ 8faaf623
......@@ -18,7 +18,8 @@
<picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector"
:value="salesCenterIndex" range-key='VALUE' :range="selectedSalesCenterArr">
<view class="uni-input">
{{selectedSalesCenterArr[salesCenterIndex] && selectedSalesCenterArr[salesCenterIndex].VALUE || '请选择'}}
<text
class="uni-input-text">{{selectedSalesCenterArr[salesCenterIndex] && selectedSalesCenterArr[salesCenterIndex].VALUE || '请选择'}}</text>
</view>
</picker>
</view>
......@@ -249,8 +250,16 @@
},
calcInnerTotal(e, item, i) {
console.log('sss', item, e)
let value = e.target.value
e.target.value = value * 1
let value = 0
if (e.target.value) {
value = e.target.value
e.target.value = value * 1
} else {
value = e.detail.value
e.detail.value = value * 1
}
this.planinnerLists.forEach((product, index) => {
if (i === index) {
product.quantity = value * 1
......@@ -405,6 +414,11 @@
flex: 1;
}
.uni-input-text {
font-size: 14px;
color: #888;
}
.icon-arrow {
position: absolute;
right: 0;
......
pages/my-order/my-order.nvue
View file @ 8faaf623
......@@ -418,9 +418,9 @@
}
.icon-arrow {
width: 28rpx;
height: 16rpx;
margin-left: 16rpx;
width: 32rpx;
height: 20rpx;
margin-left: 12rpx;
margin-top: 24rpx;
transition-property: transform;
transition-duration: 0.15s;
......
pages/my-order/order-item.nvue
View file @ 8faaf623
......@@ -4,7 +4,7 @@
<text class="title-no">订单编号：{{newsItem.object_id}}</text>
<view class="title-info">
<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 class="middle view">
......@@ -88,8 +88,6 @@
background: #f61d30;
border-radius: 80rpx 200rpx 200rpx 80rpx;
border: 1px solid #f61d30;
font-size: 12px;
color: #fff;
text-align: center;
}
......@@ -107,6 +105,10 @@
height: 48rpx;
line-height: 48rpx;
font-size: 12px;
color: #fff;
}
.title-info__status-done__text {
color: #888888;
}
......
pages/no-quota/order-upload.nvue
View file @ 8faaf623
......@@ -155,10 +155,10 @@
}, 300)
},
fnCheckOrderByNo() {
// uni.navigateTo({
// url:'/pages/home/home'
// })
this.$refs.popup.close()
uni.navigateTo({
url: '/pages/my-order/my-order'
})
},
submit() {
this.updateQuotaOrder()
......
pages/no-quota/quota-order.nvue
View file @ 8faaf623
......@@ -260,8 +260,16 @@
},
calcInnerTotal(e, item, i) {
console.log('sss', item, e)
let value = e.target.value
e.target.value = value * 1
let value = 0
if (e.target.value) {
value = e.target.value
e.target.value = value * 1
} else {
value = e.detail.value
e.detail.value = value * 1
}
this.planinnerLists.forEach((product, index) => {
if (i === index) {
product.quantity = value * 1
......
pages/order-detail-noquota/order-detail-noquota.nvue
View file @ 8faaf623
......@@ -8,7 +8,7 @@
<text class="title-no">订单编号：{{INFO.OBJECT_ID}}</text>
<view class="title-info">
<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>
</view>
</view>
......@@ -23,7 +23,7 @@
</view>
<view class="text-block text-block-last">
<view class="middle-date-right">
<text class="middle-date">{{INFO.OBJECT_ID}}</text>
<text class="middle-date">{{INFO.TOTAL_AMOUNT}}</text>
</view>
<text class="middle-date-des middle-date-right">金额</text>
</view>
......@@ -64,36 +64,6 @@
</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" @click="handleShowReceiveDetail">
......@@ -148,7 +118,7 @@
INFO: {},
ATTACHMENT: []
},
receiveInfoHeight: '132',
receiveInfoHeight: '145',
}
},
computed: {
......@@ -188,9 +158,9 @@
handleShowReceiveDetail() {
this.ishowReceiveDetail = !this.ishowReceiveDetail
if (this.ishowReceiveDetail === true) {
this.receiveInfoHeight = '480'
this.receiveInfoHeight = `${260*this.ITEM.length}`
} else {
this.receiveInfoHeight = '132'
this.receiveInfoHeight = '145'
}
},
}
......@@ -250,7 +220,7 @@
.title-info__status {
height: 48rpx;
line-height: 48rpx;
line-height: 44rpx;
background: #f61d30;
border-radius: 8rpx 200rpx 200rpx 8rpx;
border: 1px solid #f61d30;
......@@ -263,6 +233,10 @@
border: 0;
}
.title-info__status-text {
font-size: 12px;
}
.title-info__status-done {
background: #f8f8f8;
color: #888888;
......@@ -317,6 +291,7 @@
display: flex;
align-items: center;
justify-content: flex-end;
text-align: right;
}
.order-middle {
......@@ -328,7 +303,7 @@
}
.order-middle-auto {
height: auto;
// height: auto;
}
.middle {
......
pages/order-detail-quota/order-detail-quota.nvue
View file @ 8faaf623
......@@ -8,7 +8,7 @@
<text class="title-no">订单编号：{{INFO.OBJECT_ID}}</text>
<view class="title-info">
<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>
</view>
</view>
......@@ -23,7 +23,7 @@
</view>
<view class="text-block text-block-last">
<view class="middle-date-right">
<text class="middle-date">{{INFO.OBJECT_ID}}</text>
<text class="middle-date">{{INFO.TOTAL_AMOUNT}}</text>
</view>
<text class="middle-date-des middle-date-right">金额</text>
</view>
......@@ -269,9 +269,8 @@
}
.title-info__status {
width: 160rpx;
height: 48rpx;
line-height: 48rpx;
line-height: 44rpx;
background: #f61d30;
border-radius: 200rpx;
border: 1px solid #f61d30;
......@@ -341,6 +340,7 @@
display: flex;
align-items: center;
justify-content: flex-end;
text-align: right;
}
.order-middle {
......
pages/produce-material/produce-material.nvue
View file @ 8faaf623
......@@ -333,9 +333,9 @@
}
.icon-arrow {
width: 28rpx;
height: 16rpx;
margin-left: 16rpx;
width: 32rpx;
height: 20rpx;
margin-left: 12rpx;
margin-top: 24rpx;
transition-property: transform;
transition-duration: 0.15s;
......
pages/produce-order/produce-order.nvue
View file @ 8faaf623
......@@ -324,9 +324,9 @@
}
.icon-arrow {
width: 28rpx;
height: 16rpx;
margin-left: 16rpx;
width: 32rpx;
height: 20rpx;
margin-left: 12rpx;
margin-top: 24rpx;
transition-property: transform;
transition-duration: 0.15s;
......
pages/produce-order/produce-plan.nvue
View file @ 8faaf623
......@@ -370,7 +370,7 @@
flex-direction: column;
padding: 32rpx 16rpx 0;
background: #f0f4f5;
// height: 100%;
flex: 1;
}
.middle {
......
pages/purchase-plan/purchase-plan.nvue
View file @ 8faaf623
......@@ -2,7 +2,7 @@
<view class="lists">
<view class="status_bar" :style="navHeight"></view>
<view class="header-bg"></view>
<view class="main">
<view class="main" :style="mainHeight">
<view class="middle view planout-block-item">
<view class="text-block">
<text class="middle-date">年度</text>
......@@ -37,9 +37,9 @@
</view>
</view>
<view class="lists-block">
<scroll-view class="scroll-area" :scroll-top="scrollTop" scroll-y="true">
<view class="middle view planout-block-item" v-for="(item,index) in lists" :key="item.plan_number">
<list class="scroll-area view">
<cell v-for="(item,index) in lists" :key="item.plan_number">
<view class="scroll-item">
<view class="item-block item-block-code">
<text class="item-block-label">单号：{{item.plan_number}}</text>
</view>
......@@ -72,8 +72,9 @@
</view>
</view>
</view>
</scroll-view>
</view>
</cell>
<view class="planout-block-item__last"> </view>
</list>
</view>
</view>
......@@ -132,6 +133,17 @@
'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() {
this.condition.RT_GJAHR[0].LOW = timeFormat(new Date(), 'yyyy')
......@@ -144,6 +156,7 @@
...this.condition
}
const res = await apiSalesPlan(params)
const {
lt_result,
page,
......@@ -151,7 +164,6 @@
} = res
this.page.PAGE = page
this.page.PAGESIZE = pagesize
this.lists = lt_result.map((item) => {
item.checked = false
return item
......@@ -208,17 +220,19 @@
flex-direction: column;
background: #f0f4f5;
flex: 1;
height: 100%;
}
.main {
flex-direction: column;
margin-top: -164rpx;
padding: 0 16rpx;
height: calc(100% - 147px + 85px);
overflow: hidden;
}
.scroll-area {
overflow-y: scroll;
}
.middle {
background-color: #fff;
border-radius: 16rpx;
......@@ -293,18 +307,22 @@
flex-direction: column;
}
.lists-block {
height: calc(100% - 140px);
overflow-y: scroll;
}
.scroll-area {
padding-bottom: 40px;
.planout-block-item {
margin-bottom: 32rpx;
}
.planout-block-item {
.scroll-item {
flex: 1;
display: flex;
flex-direction: column;
margin-bottom: 32rpx;
background-color: #fff;
border-radius: 16rpx;
padding: 32rpx 64rpx 40rpx 48rpx;
}
.planout-block-item__last {
height: 40px;
}
.item-block {
......
pages/quota/order-upload.nvue
View file @ 8faaf623
......@@ -164,6 +164,9 @@
},
fnCheckOrderByNo() {
this.$refs.popup.close()
uni.navigateTo({
url: '/pages/my-order/my-order'
})
},
submit() {
this.updateQuotaOrder()
......
pages/quota/quota-order.nvue
View file @ 8faaf623
......@@ -408,8 +408,15 @@
// 计算小计
calcInnerTotal(e, item, i) {
console.log('sss', item, e)
let value = e.target.value
e.target.value = value * 1
let value = 0
if (e.target.value) {
value = e.target.value
e.target.value = value * 1
} else {
value = e.detail.value
e.detail.value = value * 1
}
this.planinnerLists.forEach((product, index) => {
if (i === index) {
product.quantity = value * 1
......
pages/select-product-pro/select-product-pro.vue
View file @ 8faaf623
......@@ -6,7 +6,7 @@
<view class="middle view">
<view class="text-block ">
<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 class="text-block text-block-last">
<text class="middle-date">产品编码</text>
......
pages/select-product/select-product.vue
View file @ 8faaf623
......@@ -6,7 +6,7 @@
<view class="middle view">
<view class="text-block ">
<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 class="text-block text-block-last">
<text class="middle-date">产品编码</text>
......
pages/ticket-order/ticket-order.nvue
View file @ 8faaf623
......@@ -412,9 +412,9 @@
}
.icon-arrow {
width: 28rpx;
height: 16rpx;
margin-left: 16rpx;
width: 32rpx;
height: 20rpx;
margin-left: 12rpx;
margin-top: 24rpx;
transition-property: transform;
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() {
),
_c("v-uni-input", {
staticClass: _vm._$g(7, "sc"),
attrs: {
type: "text",
placeholder: "模糊查询，请手动加*",
_i: 7
},
attrs: { type: "text", placeholder: "模糊查询", _i: 7 },
model: {
value: _vm._$g(7, "v-model"),
callback: function($$v) {
......@@ -14333,11 +14329,7 @@ var render = function() {
),
_c("v-uni-input", {
staticClass: _vm._$g(7, "sc"),
attrs: {
type: "text",
placeholder: "模糊查询，请手动加*",
_i: 7
},
attrs: { type: "text", placeholder: "模糊查询", _i: 7 },
model: {
value: _vm._$g(7, "v-model"),
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