Commit a7747202 authored by youjie's avatar youjie

修复url 销售

parent e36a729a
<style> <style>
.jz_LineHeadeBox{ .jz_LineHeadeBox{
/* position: fixed; padding-top: 41.2vw;
left: 0;
right: 0;
top: 0;
z-index: 1; */
padding-top: 41.2vw;
position: relative; position: relative;
} }
.jz_LineHeade{ .jz_LineHeade{
...@@ -341,7 +336,7 @@ ...@@ -341,7 +336,7 @@
'active0':msg.teamType==0, 'active0':msg.teamType==0,
'active1':msg.teamType==1, 'active1':msg.teamType==1,
'active2':msg.teamType==2}"> 'active2':msg.teamType==2}">
<headerLine :type="msg.teamType" :title="msg.teamType==1?'小包团':''"></headerLine> <headerLine></headerLine>
<view class="search-box" style="margin-top: 24rpx;"> <view class="search-box" style="margin-top: 24rpx;">
<view class="date" @click="showBranch=true"> <view class="date" @click="showBranch=true">
<u-icon name="location" color="#B99846" size="24"></u-icon> <u-icon name="location" color="#B99846" size="24"></u-icon>
...@@ -359,7 +354,7 @@ ...@@ -359,7 +354,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="height: 100rpx;width: 100%;"> <view style="height: 80rpx;width: 100%;">
<u-dropdown ref="uDropdown" @open="open" @close="close" active-color="#000" inactive-color="#444"> <u-dropdown ref="uDropdown" @open="open" @close="close" active-color="#000" inactive-color="#444">
<u-dropdown-item v-model="msg.orderBy" :title="optionsTitle[0]" :options="orderBys" @change="changeOrderBy"> <u-dropdown-item v-model="msg.orderBy" :title="optionsTitle[0]" :options="orderBys" @change="changeOrderBy">
</u-dropdown-item> </u-dropdown-item>
...@@ -518,7 +513,7 @@ ...@@ -518,7 +513,7 @@
<script> <script>
import canlendar from "./components/time/index.vue" import canlendar from "./components/time/index.vue"
import auth from "@/components/auth/index.vue"; import auth from "@/components/auth/index.vue";
import headerLine from "./components/headerLine"; import headerLine from "@/components/header/header";//"./components/headerLine";
export default { export default {
components: { components: {
canlendar, canlendar,
......
...@@ -989,7 +989,7 @@ ...@@ -989,7 +989,7 @@
<u-number-box size="28" @change="yeChange" :min="0" :max="crCount" v-model="yeCount"></u-number-box> <u-number-box size="28" @change="yeChange" :min="0" :max="crCount" v-model="yeCount"></u-number-box>
</view> </view>
<view class="line-flex" style="padding: 30rpx; background: #fff" <view class="line-flex" style="padding: 30rpx; background: #fff"
v-if="SaleList&&SaleList.length>1" @click="showSalePreviwe=true"> v-if="!createBy&&SaleList&&SaleList.length>1" @click="showSalePreviwe=true">
<text style="font-size: 28rpx; color: #111; font-weight: 500">销售</text> <text style="font-size: 28rpx; color: #111; font-weight: 500">销售</text>
<text style=" <text style="
font-size: 22rpx; font-size: 22rpx;
...@@ -1200,7 +1200,8 @@ ...@@ -1200,7 +1200,8 @@
}, { }, {
name: '' name: ''
} }
] ],
createBy: 0,
}; };
}, },
created() {}, created() {},
...@@ -1226,7 +1227,7 @@ ...@@ -1226,7 +1227,7 @@
}) })
} }
if (option.createBy) { if (option.createBy) {
this.SaleId = option.createBy this.createBy = option.createBy
}else{ }else{
this.getSale() this.getSale()
} }
...@@ -1332,7 +1333,7 @@ ...@@ -1332,7 +1333,7 @@
if (res.resultCode == 1) { if (res.resultCode == 1) {
if(res.data.length>0){ if(res.data.length>0){
this.SaleList = res.data this.SaleList = res.data
if(res.data.length==1){ if(res.data.length==1&&!this.createBy){
this.SaleName = res.data[0].EmName this.SaleName = res.data[0].EmName
this.SaleId = res.data[0].CreateBy this.SaleId = res.data[0].CreateBy
} }
...@@ -1742,7 +1743,7 @@ ...@@ -1742,7 +1743,7 @@
this.is_show_auth = 1; this.is_show_auth = 1;
return; return;
} }
if (this.SaleList&&this.SaleList.length>1&&this.SaleId==0) { if (this.SaleList&&this.SaleList.length>1&&this.SaleId==0&&this.createBy==0) {
uni.showToast({ uni.showToast({
title: "请选择销售", title: "请选择销售",
icon: "none", icon: "none",
...@@ -1782,8 +1783,7 @@ ...@@ -1782,8 +1783,7 @@
this.delMsg.cityId + this.delMsg.cityId +
"&lineId=" + "&lineId=" +
this.dataList.lineId + this.dataList.lineId +
"&CreateBy=" + "&CreateBy=" +(this.createBy?this.createBy:this.SaleId);
this.SaleId;
console.log("tParams", tParams); console.log("tParams", tParams);
uni.navigateTo({ uni.navigateTo({
url: "/pages/jiuzhai/jz_Reserve?currentPriceInfo=" + url: "/pages/jiuzhai/jz_Reserve?currentPriceInfo=" +
......
...@@ -528,7 +528,7 @@ ...@@ -528,7 +528,7 @@
realCurrentPriceInfo: {}, realCurrentPriceInfo: {},
customer: {}, customer: {},
CreateBy: 0, CreateBy: 0,
showPz:true, showPz:false,
pzCoupon:null pzCoupon:null
}; };
}, },
...@@ -645,6 +645,7 @@ ...@@ -645,6 +645,7 @@
x.denomination =x.expansionModel.denomination x.denomination =x.expansionModel.denomination
} }
}) })
console.log(this.pzCoupon,'------')
this.showPz = this.pzCoupon?true:false this.showPz = this.pzCoupon?true:false
}, },
changecheckbox(e, index, item) { changecheckbox(e, index, item) {
......
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