Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
W
wly-APP
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘川
wly-APP
Commits
b3d2b475
Commit
b3d2b475
authored
Feb 27, 2023
by
xiangzj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
IOS兼容问题处理
parent
a74ab47d
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
182 additions
and
26 deletions
+182
-26
quota-order.nvue
pages/group-buy/quota-order.nvue
+5
-2
quota-order.nvue
pages/no-quota/quota-order.nvue
+5
-2
order-detail-noquota.nvue
pages/order-detail-noquota/order-detail-noquota.nvue
+1
-1
order-detail-quota.nvue
pages/order-detail-quota/order-detail-quota.nvue
+40
-2
order-other-detail.nvue
pages/order-other-detail/order-other-detail.nvue
+1
-2
produce-material.nvue
pages/produce-material/produce-material.nvue
+1
-1
produce-plan.nvue
pages/produce-material/produce-plan.nvue
+8
-1
produce-order.nvue
pages/produce-order/produce-order.nvue
+1
-1
produce-plan.nvue
pages/produce-order/produce-plan.nvue
+9
-2
purchase-main.nvue
pages/purchase-main/purchase-main.nvue
+79
-1
purchase-receive.nvue
pages/purchase-receive/purchase-receive.nvue
+8
-3
purchase-apply.nvue
pages/purchase/purchase-apply.nvue
+1
-1
purchase.nvue
pages/purchase/purchase.nvue
+8
-2
quota-order.nvue
pages/quota/quota-order.nvue
+5
-2
select-shunt-adress.nvue
pages/select-shunt-adress/select-shunt-adress.nvue
+10
-3
No files found.
pages/group-buy/quota-order.nvue
View file @
b3d2b475
...
...
@@ -39,7 +39,7 @@
<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;
">
<scroll-view
:scroll-top="scrollTop" scroll-y="true" class="scroll-Y view
">
<view class="view">
<view class="planout-block">
<text class="planout-block-title">订购产品</text>
...
...
@@ -723,7 +723,7 @@
}
.bottom-area {
height:
14
0rpx;
height:
60
0rpx;
margin-top: 12rpx;
}
...
...
@@ -837,4 +837,7 @@
margin-top: 20rpx;
margin-bottom: 20rpx;
}
.scroll-Y {
height: 1000rpx;
}
</style>
pages/no-quota/quota-order.nvue
View file @
b3d2b475
...
...
@@ -37,7 +37,7 @@
<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;
">
<scroll-view
:scroll-top="scrollTop" scroll-y="true" class="scroll-Y view
">
<view class="view">
<view class="planout-block">
<text class="planout-block-title">订购产品</text>
...
...
@@ -640,7 +640,7 @@
}
.bottom-area {
height:
14
0rpx;
height:
60
0rpx;
margin-top: 12rpx;
}
...
...
@@ -752,4 +752,7 @@
margin-top: 20rpx;
margin-bottom: 20rpx;
}
.scroll-Y {
height: 1000rpx;
}
</style>
pages/order-detail-noquota/order-detail-noquota.nvue
View file @
b3d2b475
...
...
@@ -183,7 +183,7 @@
handleShowReceiveDetail() {
this.ishowReceiveDetail = !this.ishowReceiveDetail
if (this.ishowReceiveDetail === true) {
this.receiveInfoHeight = `${280*this.ITEM.length}`
this.receiveInfoHeight = `${280*this.ITEM.length
+ 20
}`
} else {
this.receiveInfoHeight = '145'
}
...
...
pages/order-detail-quota/order-detail-quota.nvue
View file @
b3d2b475
...
...
@@ -38,7 +38,45 @@
</view>
</view>
</view>
<view class="middle view">
<view class="item-block item-block-name" v-if="orderDetail.USE&&orderDetail.USE.length>0">
<text class="item-block-label">占用销售计划明细</text>
</view>
<view class="block-detal" v-for="item in orderDetail.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.ZZFLD00000E_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>
<view class="order-middle view" :class="{'order-middle-auto':ishowReceiveDetail}"
ref='receiveInfo' :style="receiveInfoHeightComputed">
<view class="middle view">
...
...
@@ -226,7 +264,7 @@
this.ishowReceiveDetail = !this.ishowReceiveDetail
if (this.ishowReceiveDetail === true) {
let len = this.ITEM_INNER.length + this.ITEM_OUTER.length
this.receiveInfoHeight = len - 1 ===0 ? '3
8
0' : 350*len
this.receiveInfoHeight = len - 1 ===0 ? '3
9
0' : 350*len
} else {
this.receiveInfoHeight = '132'
}
...
...
pages/order-other-detail/order-other-detail.nvue
View file @
b3d2b475
...
...
@@ -229,9 +229,8 @@
},
handleShowReceiveDetail() {
this.ishowReceiveDetail = !this.ishowReceiveDetail
if (this.ishowReceiveDetail === true) {
const heightNum = this.ITEM.length > 1 ? 1
60: 23
5
const heightNum = this.ITEM.length > 1 ? 1
90: 25
5
this.receiveInfoHeight = `${260*this.ITEM.length + heightNum}`
} else {
this.receiveInfoHeight = '132'
...
...
pages/produce-material/produce-material.nvue
View file @
b3d2b475
...
...
@@ -155,7 +155,7 @@
},
onReady() {
// const webView = this.$mp.page.$getAppWebview
if(this.userBpData.HIGH_ROLE === "FALSE"){
if(this.userBpData.HIGH_ROLE === "FALSE"
|| this.userBpData.FPE_PLAN === "X"
){
const webView = this.$scope.$getAppWebview();
webView.setTitleNViewButtonStyle(0, {
"width": 0,
...
...
pages/produce-material/produce-plan.nvue
View file @
b3d2b475
...
...
@@ -49,7 +49,7 @@
<image class="planout-block-icon" src="@/static/image/order_more@3x.png" @click="addPlanout()"
mode="aspectFit"></image>
</view>
<scroll-view
class="scroll-area view" :scroll-top="scrollTop" scroll-y="true" :show-scrollbar='false'
>
<scroll-view
:scroll-top="scrollTop" scroll-y="true" class="scroll-Y view"
>
<uni-swipe-action class="planout-block-lists">
<uni-swipe-action-item v-for="(item,index) in planinnerLists" :key='index'>
<view class="middle view planout-block-item">
...
...
@@ -659,4 +659,11 @@
.scroll-area{
min-height: 2666rpx;
}
.scroll-Y {
height: 1000rpx;
}
.bottom-area {
height: 200rpx;
margin-top: 12rpx;
}
</style>
pages/produce-order/produce-order.nvue
View file @
b3d2b475
...
...
@@ -155,7 +155,7 @@
},
onReady() {
// const webView = this.$mp.page.$getAppWebview
if(this.userBpData.HIGH_ROLE === "FALSE"){
if(this.userBpData.HIGH_ROLE === "FALSE"
|| this.userBpData.FPE_PLAN === "X"
){
const webView = this.$scope.$getAppWebview();
webView.setTitleNViewButtonStyle(0, {
"width": 0,
...
...
pages/produce-order/produce-plan.nvue
View file @
b3d2b475
...
...
@@ -22,8 +22,7 @@
<image class="planout-block-icon" src="@/static/image/order_more@3x.png" @click="addPlanout()"
mode="aspectFit"></image>
</view>
<scroll-view class="scroll-area view" :scroll-top="scrollTop" scroll-y="true" :show-scrollbar='false'>
<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y view">
<uni-swipe-action class="planout-block-lists">
<uni-swipe-action-item v-for="(item,index) in planinnerLists" :key='index'>
<view class="middle view planout-block-item">
...
...
@@ -66,6 +65,7 @@
</template>
</uni-swipe-action-item>
</uni-swipe-action>
<view class="bottom-area"></view>
</scroll-view>
<uni-popup ref="popup" background-color="#fff" @change="change" :mask-click='false'>
...
...
@@ -641,4 +641,11 @@
.scroll-area{
min-height: 2666rpx;
}
.scroll-Y {
height: 1000rpx;
}
.bottom-area {
height: 200rpx;
margin-top: 12rpx;
}
</style>
pages/purchase-main/purchase-main.nvue
View file @
b3d2b475
...
...
@@ -51,6 +51,47 @@
<text class="middle-date">配额年度</text>
<text class="middle-date-des">{{orderItem.quotasYear}}</text>
</view>
<view class="text-block">
<text class="middle-date">紧急程度</text>
<view class="middle-date-address uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerChange($event,'significance')" :value="orderItem.value"
range-key='name' mode="selector" :range="significanceArr">
<text class="uni-input">{{significanceName}}</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-address uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker class="picker-block" @change="bindPickerChange($event,'isPcj')" :value="orderItem.isPcj"
range-key='name' mode="selector" :range="pcjArr">
<text class="uni-input">{{orderItem.isPcjName}}</text>
</picker>
</view>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode=""></image>
</view>
</view>
<view class="text-block" v-if="orderItem.isPcj == 1">
<text class="middle-date">瓶储截止日期</text>
<view class="middle-date-address uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<picker class="picker-block" mode="date" :value="orderItem.saveEnddate" :start="startDate" @change="bindPickerChange($event,'date')">
<text class="uni-input">{{orderItem.saveEnddate}}</text>
</picker>
</view>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode=""></image>
</view>
</view>
</view>
<uni-cell class="cell-list" v-for="(ele, index) in orderItem.wantGoodsDetailList" :key="ele.id">
...
...
@@ -138,13 +179,15 @@
// kaStoreArea: ' ',
// quantity: ''
// },
significanceName: '正常',
marketPlaceVal: '',
index: 0,
scrollTop: 0,
deliveryPlanArr : [],
ticketTypeArr : [],
// channelTyp
eArr : [],
significanc
eArr : [],
marketPlaceArr : [],
pcjArr: [{value:'0',name: '否'}, {value:'1',name: '是'}]
}
},
props: {
...
...
@@ -160,6 +203,9 @@
}
},
computed: {
startDate() {
return this.getDate();
},
navHeight() {
return {
'height': `${this.sysinfo.safeArea.top + 44}px`
...
...
@@ -192,6 +238,7 @@
this.getSelectDictDataOrigin('A0022')
// this.getSelectDictDataOrigin('A0054')
this.getSelectDictDataOrigin('A0052')
this.getSelectDictDataOrigin('Significance')
// this.getProdDeliveryPlan()
},
watch:{
...
...
@@ -200,6 +247,15 @@
// }
},
methods: {
getDate() {
const date = new Date();
let year = date.getFullYear();
let month = date.getMonth() + 1;
let day = date.getDate();
month = month > 9 ? month : '0' + month;
day = day > 9 ? day : '0' + day;
return `${year}-${month}-${day}`;
},
async getProdDeliveryPlan(){
const params = {
'channel': "",
...
...
@@ -233,6 +289,17 @@
this.orderItem.channelsType = this.channelTypeArr[index].value
this.orderItem.channelTypeName = this.channelTypeArr[index].name
break;
case 'significance':
this.orderItem.significance = this.significanceArr[index].value
this.significanceName= this.significanceArr[index].name
break;
case 'isPcj':
this.orderItem.isPcj = this.pcjArr[index].value
this.orderItem.isPcjName= this.pcjArr[index].name
break;
case 'date':
this.orderItem.saveEnddate = e.detail.value
break;
// case 'marketPlace':
// this.marketPlaceVal = this.marketPlaceArr[index].value
// this.orderItem.kaStoreArea = this.marketPlaceArr[index].name
...
...
@@ -248,6 +315,14 @@
});
return
}
if(this.orderItem.isPcj == 1 && !this.orderItem.saveEnddate){
uni.showToast({
title: '请先选择瓶储截至日期',
duration: 2000,
icon: 'none'
});
return
}
const numFlag = this.orderItem.wantGoodsDetailList.every(function(item){
return item.wantQuantity
});
...
...
@@ -283,6 +358,9 @@
this.ticketTypeArr = res.data.Rows
this.getTicketType(this.ticketTypeArr)
break;
case 'Significance':
this.significanceArr = res.data.Rows
break;
// case 'A0054':
// this.channelTypeArr = res.data.Rows
// break;
...
...
pages/purchase-receive/purchase-receive.nvue
View file @
b3d2b475
...
...
@@ -47,7 +47,7 @@
</view>
</view>
<view class="middle view address-view">
<view class="text-address" v-if="orderItem.isShunt - 1 === 0" @click="handleShuntAdress">
<view class="text-address" v-if="orderItem.isShunt - 1 === 0" @click="handleShuntAd
d
ress">
<text class="middle-date-unit">分流收货单位</text>
<view class="middle-date-des-unit uni-list picker-year" >
<view class="uni-list-cell">
...
...
@@ -306,10 +306,15 @@
url: `/pages/select-shunt-list/select-shunt-list?order=${JSON.stringify(this.orderItem)}`
})
},
handleShuntAdress() {
handleReceiptAddress() {
uni.navigateTo({
url: `/pages/select-shunt-adress/select-shunt-adress?order=${JSON.stringify(this.orderItem)}&type=2`
})
},
handleShuntAddress() {
if(this.orderItem.shuntDealerName){
uni.navigateTo({
url: `/pages/select-shunt-adress/select-shunt-adress?order=${JSON.stringify(this.orderItem)}`
url: `/pages/select-shunt-adress/select-shunt-adress?order=${JSON.stringify(this.orderItem)}
&type=1
`
})
}else{
uni.showToast({
...
...
pages/purchase/purchase-apply.nvue
View file @
b3d2b475
...
...
@@ -129,7 +129,7 @@
async getDetail(){
const res = await initAppWantGoods(this.orderItem)
for(let k in res.data){res.data[k] = res.data[k]===null?'':res.data[k]}
this.detail = {'shuntTypeName': ' ','shuntName': ' ','channelTypeName': '',...res.data}
this.detail = {'shuntTypeName': ' ','shuntName': ' ','channelTypeName': '',...res.data
, isPcj:0, isPcjName:'否',significance: 'normal',
}
this.getChannelType()
},
changeComponent(com) {
...
...
pages/purchase/purchase.nvue
View file @
b3d2b475
...
...
@@ -30,7 +30,7 @@
</view>
<view class="item-block item-block-code">
<text class="item-block-label">产品</text>
<text class="item-
block
-value">{{item.productDesc}}</text>
<text class="item-
pro
-value">{{item.productDesc}}</text>
</view>
<view class="item-block item-block-code">
<text class="item-block-label">开票总量</text>
...
...
@@ -361,7 +361,13 @@
color: $text-base-color;
line-height: 56rpx;
}
.item-pro-value{
color: $text-base-color;
font-size: 24rpx;
width: 200%;
flex: 5.5;
text-align: left;
}
.item-block-code {
}
...
...
pages/quota/quota-order.nvue
View file @
b3d2b475
...
...
@@ -40,7 +40,7 @@
<textarea class="remark-text" v-model="HEADINFO.ZZFLD000028" />
</view>
<scroll-view
class="scroll-area view" scroll-y="true" style="min-height: 1700rpx;
">
<scroll-view
:scroll-top="scrollTop" scroll-y="true" class="scroll-Y view
">
<view class="view">
<view class="planout-block">
<text class="planout-block-title">计划内</text>
...
...
@@ -893,7 +893,7 @@
}
.bottom-area {
height:
14
0rpx;
height:
60
0rpx;
margin-top: 12rpx;
}
...
...
@@ -997,4 +997,7 @@
margin-top: 20rpx;
margin-bottom: 20rpx;
}
.scroll-Y {
height: 1000rpx;
}
</style>
pages/select-shunt-adress/select-shunt-adress.nvue
View file @
b3d2b475
...
...
@@ -43,7 +43,7 @@
<text class="item-block-label">联系电话:{{item.tel_number}}</text>
</view>
<view class="item-block item-block-code">
<text class="item-block-label">收货地址:{{item.street}}</text>
<text class="item-block-label
detal-item-value3
">收货地址:{{item.street}}</text>
</view>
</view>
</cell>
...
...
@@ -91,7 +91,8 @@
lists: [],
searchName: '',
orderItem: {},
selectShuntAdressAccountInfo: {}
selectShuntAdressAccountInfo: {},
addressType: ''
}
},
computed: {
...
...
@@ -118,6 +119,8 @@
this.orderItem = {
...JSON.parse(option.order)
}
// 1分流收货地址,2收货地址
this.addressType = option.type
},
created() {
this.reset()
...
...
@@ -135,7 +138,7 @@
this.reset()
this.getSalesPlan(true, this.searchName);
},
async getSalesPlan(isRefresh, customerCode = this.
orderItem.shuntDealer
) {
async getSalesPlan(isRefresh, customerCode = this.
addressType - 1 === 0 ? this.orderItem.shuntDealer : this.orderItem.customerCode
) {
if (this.loadParams.isDone) {
return
}
...
...
@@ -430,4 +433,8 @@
font-size: 12px;
color: #999;
}
.detal-item-value3{
width: 200%;
flex: 1;
}
</style>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment