bug修复

pages/address-manage/address-manage.nvue

@@ -173,12 +173,12 @@
 	import {
 		apiAddressSelect
 	} from '@/servers/common.js'
-	import {
+	import {
 		addressCheck,
 		regionOvs,
 		cityOvs,
 		streetOvs,
-		addressImport,
+		addressImport,
 	} from '@/servers/address.js'
 	
 	import noData from '@/components/nodata.nvue';
@@ -787,4 +787,4 @@
 	.planout-block-item {
 		margin-top: 48rpx;
 	}
-</style>
+</style>

pages/breakwords-handle/breakwords-handle.nvue

@@ -263,8 +263,9 @@
 			},
 			bindPickerTypesChange(e) {
 				console.log('bindPickerTypesChange', e.detail.value)
-				this.punishTypeSelected = this.selectDataOptions['PunishType'][e.detail.value]
-				if (e.detail.value === 0) {
+				const idx = e.detail.value || 0
+				this.punishTypeSelected = this.selectDataOptions['PunishType'][idx]
+				if (idx === 0) {
 					this.condition.punishTypes = []
 				} else {
 					this.condition.punishTypes[0] = this.punishTypeSelected.code
@@ -274,8 +275,9 @@
 			},
 			bindPickerStatusChange(e) {
 				console.log('bindPickerStatusChange', e.detail.value)
-				this.orderStatusSelected = this.selectDataOptions['ProcessOrderStatus'][e.detail.value]
-				if (e.detail.value === 0) {
+				const idx = e.detail.value || 0
+				this.orderStatusSelected = this.selectDataOptions['ProcessOrderStatus'][idx]
+				if (idx === 0) {
 					this.condition.statusList = []
 				} else {
 					this.condition.statusList[0] = this.orderStatusSelected.code
@@ -284,7 +286,7 @@
 			},
 			bindPickerYearChange(e) {
 				console.log('bindPickerYearChange', e.detail.value)
-				this.condition.year = e.detail.value
+				this.condition.year = e.detail.value || 0
 				this.getProcessOrder(true)
 			},
 			checkDetal(item,type) {

pages/go-order/go-order.nvue

@@ -7,7 +7,7 @@
 					<image class="icon-address" src="@/static/image/order_quota@3x.png" mode="aspectFit"></image>
 					<view class="cell-list-block__content">
 						<text class="cell-list-block__title">配额酒单</text>
-						<text class="cell-list-block__desc">Wine List</text>
+						<!-- <text class="cell-list-block__desc">Wine List</text> -->
 					</view>
 					<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
 				</view>
@@ -15,7 +15,7 @@
 					<image class="icon-address" src="@/static/image/order_noquota@3x.png" mode="aspectFit"></image>
 					<view class="cell-list-block__content">
 						<text class="cell-list-block__title">非配额酒单</text>
-						<text class="cell-list-block__desc">Wine List</text>
+						<!-- <text class="cell-list-block__desc">Wine List</text> -->
 					</view>
 					<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
 				</view>
@@ -23,7 +23,7 @@
 					<image class="icon-address" src="@/static/image/order_group@3x.png" mode="aspectFit"></image>
 					<view class="cell-list-block__content">
 						<text class="cell-list-block__title">公关团购订单</text>
-						<text class="cell-list-block__desc">Group buying List</text>
+						<!-- <text class="cell-list-block__desc">Group buying List</text> -->
 					</view>
 					<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
 				</view>

pages/group-buy/quota-order.nvue

@@ -12,7 +12,7 @@
 
 		<view class="summary upload salescenter top-radius">
 			<text class="mustIcon">*</text>
-			<text class="top-date">营销中心</text>
+			<text class="top-date">营销单元</text>
 			<view class="top-date-des uni-list picker-year">
 				<view class="uni-list-cell">
 					<view class="uni-list-cell-db">
@@ -52,33 +52,33 @@
 							<view class="text-block title-first">
 								<text class="middle-date title-first__text">{{index+1}}</text>
 							</view>
-							<view class="text-block" v-if="item.isBigSingleProduct === 'TRUE'"
-								@click="selectPlanOrder(item,index)">
+							<view class="text-block" style="height: auto;" @click="selectProduct(index,'inner')">
 								<view class="middle-date">
 									<text class="mustPosIcon">*</text>
-									<text class="middle-date">计划编号</text>
+									<text class="middle-date">产品</text>
 								</view>
-								<!-- <text class="middle-date">计划编号</text> -->
+								<!-- <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="middle-date-des">{{item.ZZFLD00002Q_TEXT}}</text>
+											<text class="middle-date-des">{{item.DESCRIPTION}}</text>
 										</view>
 									</view>
 									<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit">
 									</image>
 								</view>
 							</view>
-							<view class="text-block" style="height: auto;" @click="selectProduct(index,'inner')">
+							<view class="text-block" v-if="item.isBigSingleProduct === 'TRUE'"
+								@click="selectPlanOrder(item,index)">
 								<view class="middle-date">
 									<text class="mustPosIcon">*</text>
-									<text class="middle-date">产品</text>
+									<text class="middle-date">计划编号</text>
 								</view>
-								<!-- <text class="middle-date">产品</text> -->
+								<!-- <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="middle-date-des">{{item.DESCRIPTION}}</text>
+											<text class="middle-date-des">{{item.ZZFLD00002Q_TEXT}}</text>
 										</view>
 									</view>
 									<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit">
@@ -428,17 +428,52 @@
 				this.Marketing = this.selectedSalesCenter.VALUE
 			},
 			nextStep() {
-				if (this.planinnerLists.some((item) => {
-						return item.isBigSingleProduct === 'TRUE' && item.ZZFLD00002Q === ''
-					})) {
+				if (this.salesCenterIndex === -1) {
 					uni.showToast({
-						title: '计划编号不能为空',
+						title: '请先选择营销中心',
+						duration: 2000,
+						icon: 'none'
+					});
+					return
+				}
+				
+				const nameFlag = this.planinnerLists.every(function(item){
+								return item.DESCRIPTION 
+							});
+				if (!nameFlag) {
+					uni.showToast({
+						title: '请先选择产品',
+						duration: 2000,
+						icon: 'none'
+					});
+					return
+				}
+				const planFlag = this.planinnerLists.every(function(item){
+						if(item.isBigSingleProduct === 'TRUE'){
+							return item.ZZFLD00002Q
+						}else{
+							return true
+						}
+					});
+				if (!planFlag) {
+					uni.showToast({
+						title: '请先选择计划编号',
+						duration: 2000,
+						icon: 'none'
+					});
+					return
+				}
+				const quantityFlag = this.planinnerLists.every(function(item){
+								return item.quantity 
+							});
+				if (!quantityFlag) {
+					uni.showToast({
+						title: '请先填写数量',
 						duration: 2000,
 						icon: 'none'
 					});
 					return
 				}
-
 				let groupOrder = {
 					"baseinfo": this.groupOrder.baseinfo,
 					'ITEM': this.planinnerLists,
@@ -497,8 +532,6 @@
 
 	.text-block {
 		overflow: hidden;
-		height: 96rpx;
-		margin-bottom: 14rpx;
 		border-bottom: 1px solid #f4f5f6;
 	}
 
@@ -512,7 +545,6 @@
 		font-size: 28rpx;
 		line-height: 96rpx;
 		color: #333;
-		margin-bottom: 8rpx;
 		margin-left: 4rpx;
 	}
 

pages/home/home.vue

@@ -20,36 +20,37 @@
 		</view>
 		<view class="content">
 			<view class="todo-box block">
-				<text class="title">常用查询</text>
+				<text class="title">常用操作</text>
 				<view class="amount-block">
-					<view class="order-amount" @click="entryHandle('purchase-plan')">
+					<view class="order-amount" @click="goHandle('go-order')">
 						<view class="order-amount--wrapper">
-							<image class="entry-icon" src="@/static/image/home_report@3x.png" mode="aspectFit">
+							<image class="entry-icon" src="@/static/image/order.png" mode="aspectFit">
 							</image>
-							<text class="order-amount--num">销售计划</text>
+							<text class="order-amount--num">下单</text>
 						</view>
 					</view>
-					<view class="order-amount" @click="entryHandle('my-order')">
+					<view class="order-amount" @click="goHandle('purchase')">
 						<view class="order-amount--wrapper">
-							<image class="entry-icon" src="@/static/image/home_marketclue@3x.png" mode="aspectFit">
+							<image class="entry-icon" src="@/static/image/purchase.png" mode="aspectFit">
 							</image>
-							<text class="order-amount--num">销售订单</text>
+							<text class="order-amount--num">要货</text>
 						</view>
 					</view>
-					<view class="order-amount" @click="entryHandle('billing-invoice')">
+					<view class="order-amount" @click="entryHandle('purchase-plan')">
 						<view class="order-amount--wrapper">
-							<image class="entry-icon" src="@/static/image/home_breakmission@3x.png" mode="aspectFit">
+							<image class="entry-icon" src="@/static/image/plan.png" mode="aspectFit">
 							</image>
-							<text class="order-amount--num">账票管理</text>
+							<text class="order-amount--num">销售计划</text>
 						</view>
 					</view>
-					<view class="order-amount" @click="entryHandle('ticket-order')">
+					<view class="order-amount" @click="entryHandle('my-order')">
 						<view class="order-amount--wrapper">
-							<image class="entry-icon" src="@/static/image/home_breakrule@3x.png" mode="aspectFit">
+							<image class="entry-icon" src="@/static/image/sale.png" mode="aspectFit">
 							</image>
-							<text class="order-amount--num">制票通知单</text>
+							<text class="order-amount--num">销售订单</text>
 						</view>
 					</view>
+					
 				</view>
 			</view>
 			<!-- 	<view class="notice-block block">
@@ -405,6 +406,11 @@
 			change(e) {
 				this.current = e.detail.current;
 			},
+			goHandle(path){
+				uni.switchTab({
+					url: `/pages/${path}/${path}`
+				})
+			},
 			entryHandle(path) {
 				// uni.showToast({
 				// 	title: '开发中...',
@@ -514,10 +520,9 @@
 	.content {
 		flex: 1;
 		width: 100%;
-		padding: 32rpx 36rpx 24px;
 		box-sizing: border-box;
 		background: #ffffff;
-		border-radius: 32rpx 32rpx 0px 0px;
+		border-radius: 20rpx 20rpx 0px 0px;
 		z-index: 10;
 	}
 
@@ -530,20 +535,26 @@
 			font-size: 14px;
 			color: #333;
 			font-weight: 600;
-			margin-bottom: 24rpx;
+			margin-bottom: 10rpx;
+			padding: 10rpx 0 0 10rpx;
 		}
 	}
 
 	.amount-block {
 		display: flex;
 		flex-direction: row;
-		margin-top: 8px;
-		margin-bottom: 8px;
+		margin: 16rpx 10rpx 40rpx;
 	}
 
 	.order-amount {
 		flex: 1;
-		height: 70px;
+		box-shadow: 3px 1px 5px rgba(0, 0, 0, 0.15);
+		background: #fdfdfd;
+		padding: 20rpx 16rpx 20rpx;
+		border-radius: 4px;
+		margin: 0 5px;
+		// height: 70px;
+		
 	}
 
 	.order-amount--wrapper {

pages/my-order/my-order.nvue

@@ -421,7 +421,7 @@
 	.icon-arrow {
 		position: absolute;
 		right: 0;
-		top: 16px;
+		// top: 16px;
 		width: 12rpx;
 		height: 20rpx;
 		z-index: 10;

pages/my-purchase/order-item.nvue

@@ -94,13 +94,17 @@
 					<text class="detal-item-label">喷码单位</text>
 					<text class="detal-item-value detal-item-value2">{{newsItem.spurtCodeUnitName}}</text>
 				</view>
+				<view class="block-detal-item">
+					<text class="detal-item-label">联系人</text>
+					<text class="detal-item-value detal-item-value2">{{newsItem.contacPerson}}</text>
+				</view>
 				<view class="block-detal-item">
 					<text class="detal-item-label">联系人电话</text>
 					<text class="detal-item-value detal-item-value2">{{newsItem.contactNumber}}</text>
 				</view>
 				<view class="block-detal-item">
 					<text class="detal-item-label">收货地址</text>
-					<text class="detal-item-value detal-item-value2">{{newsItem.receiveAddress}}</text>
+					<text class="detal-item-value detal-item-value3">{{newsItem.receiveAddress}}</text>
 				</view>
 				<view class="block-detal-item">
 					<text class="detal-item-label">备注</text>
@@ -397,7 +401,13 @@
 		// flex: 2;
 		// text-align: left;
 	}
-
+	.detal-item-value3{
+		padding-left: 60rpx;
+		font-size: 24rpx;
+		width: 200%;
+		flex: 2;
+		text-align: left;
+	}
 	.receive-info {
 		position: relative;
 		display: flex;

pages/no-quota/quota-order.nvue

@@ -11,7 +11,7 @@
 		</view>
 		<view class="summary upload salescenter top-radius">
 			<text class="mustIcon">*</text>
-			<text class="top-date">营销中心</text>
+			<text class="top-date">营销单元</text>
 			<view class="top-date-des uni-list picker-year">
 				<view class="uni-list-cell">
 					<view class="uni-list-cell-db">
@@ -339,7 +339,7 @@
 					});
 				} else {
 					uni.showToast({
-						title: '请先选择营销中心',
+						title: '请先选择营销单元',
 						duration: 2000,
 						icon: 'none'
 					});
@@ -361,7 +361,7 @@
 				}
 				this.planinnerLists.unshift(product)
 			},
-			// 选择营销中心
+			// 选择营销单元
 			bindPickerSalesCenterChange(e) {
 				console.log('picker发送选择改变，携带值为', e.detail.value)
 				this.salesCenterIndex = e.detail.value
@@ -372,7 +372,29 @@
 			nextStep() {
 				if (this.salesCenterIndex === -1) {
 					uni.showToast({
-						title: '请先选择营销中心',
+						title: '请先选择营销单元',
+						duration: 2000,
+						icon: 'none'
+					});
+					return
+				}
+				const nameFlag = this.planinnerLists.every(function(item){
+								return item.DESCRIPTION 
+							});
+				if (!nameFlag) {
+					uni.showToast({
+						title: '请先选择产品',
+						duration: 2000,
+						icon: 'none'
+					});
+					return
+				}
+				const quantityFlag = this.planinnerLists.every(function(item){
+								return item.quantity 
+							});
+				if (!quantityFlag) {
+					uni.showToast({
+						title: '请先填写数量',
 						duration: 2000,
 						icon: 'none'
 					});
@@ -428,8 +450,6 @@
 
 	.text-block {
 		overflow: hidden;
-		height: 96rpx;
-		margin-bottom: 14rpx;
 		border-bottom: 1px solid #f4f5f6;
 	}
 
@@ -443,7 +463,6 @@
 		font-size: 28rpx;
 		line-height: 96rpx;
 		color: #333;
-		margin-bottom: 8rpx;
 		margin-left: 4rpx;
 	}
 

pages/order-detail-noquota/order-detail-noquota.nvue

@@ -63,8 +63,8 @@
 										<text class="detal-item-value">{{item.NET_PRICE}}</text>
 									</view>
 									<view class="block-detal-item block-detal-item-last">
-										<text class="detal-item-label"></text>
-										<view class="detal-item-value">
+										<text class="detal-total-label"></text>
+										<view class="detal-total-value">
 											<text class="item-value-intotal">小计：</text>
 											<text class="item-value-intotal-num">{{item.NET_VALUE}}</text>
 										</view>
@@ -399,6 +399,7 @@
 	.detal-item-label {
 		color: #999;
 		font-size: 24rpx;
+		flex: 1;
 	}
 
 	.detal-item-file {
@@ -409,6 +410,18 @@
 	.detal-item-value {
 		color: #333;
 		font-size: 28rpx;
+		width: 200%;
+		flex: 2;
+		text-align: right;
+		justify-content: end;
+	}
+	.detal-total-label {
+		color: #999;
+		font-size: 24rpx;
+	}
+	.detal-total-value {
+		color: #333;
+		font-size: 28rpx;
 	}
 
 	.item-value-intotal {

pages/order-detail-quota/order-detail-quota.nvue

@@ -71,8 +71,8 @@
 										<text class="detal-item-value">{{item.NET_PRICE}}</text>
 									</view>
 									<view class="block-detal-item block-detal-item-last">
-										<text class="detal-item-label"></text>
-										<view class="detal-item-value">
+										<text class="detal-total-label"></text>
+										<view class="detal-total-value">
 											<text class="item-value-intotal">小计：</text>
 											<text class="item-value-intotal-num">{{item.NET_VALUE}}</text>
 										</view>
@@ -110,8 +110,8 @@
 										<text class="detal-item-value">{{item.NET_PRICE}}</text>
 									</view>
 									<view class="block-detal-item block-detal-item-last">
-										<text class="detal-item-label"></text>
-										<view class="detal-item-value">
+										<text class="detal-total-label"></text>
+										<view class="detal-total-value">
 											<text class="item-value-intotal">小计：</text>
 											<text class="item-value-intotal-num">{{item.NET_VALUE}}</text>
 										</view>
@@ -225,7 +225,7 @@
 				this.ishowReceiveDetail = !this.ishowReceiveDetail
 				if (this.ishowReceiveDetail === true) {
 					let len = this.ITEM_INNER.length + this.ITEM_OUTER.length
-					this.receiveInfoHeight = `${350*len}`
+					this.receiveInfoHeight = len - 1 ===0 ? '380' : 350*len
 				} else {
 					this.receiveInfoHeight = '132'
 				}
@@ -429,6 +429,7 @@
 	.detal-item-label {
 		color: #999;
 		font-size: 24rpx;
+		flex: 1;
 	}
 
 	.detal-item-file {
@@ -439,6 +440,19 @@
 	.detal-item-value {
 		color: #333;
 		font-size: 28rpx;
+		width: 200%;
+		flex: 2;
+		text-align: right;
+		justify-content: end;
+		font-size: 28rpx;
+	}
+	.detal-total-label {
+		color: #999;
+		font-size: 24rpx;
+	}
+	.detal-total-value {
+		color: #333;
+		font-size: 28rpx;
 	}
 
 	.item-value-intotal {

pages/order-other-detail/order-other-detail.nvue

@@ -110,8 +110,8 @@
 										<text class="detal-item-value">{{item.NET_PRICE}}</text>
 									</view>
 									<view class="block-detal-item block-detal-item-last">
-										<text class="detal-item-label"></text>
-										<view class="detal-item-value">
+										<text class="detal-total-label"></text>
+										<view class="detal-total-value">
 											<text class="item-value-intotal">小计：</text>
 											<text class="item-value-intotal-num">{{item.NET_VALUE}}</text>
 										</view>
@@ -462,6 +462,7 @@
 	.detal-item-label {
 		color: #999;
 		font-size: 24rpx;
+		flex: 1;
 	}
 
 	.detal-item-file {
@@ -472,6 +473,18 @@
 	.detal-item-value {
 		color: #333;
 		font-size: 28rpx;
+		width: 200%;
+		flex: 2;
+		text-align: right;
+		justify-content: end;
+	}
+	.detal-total-label {
+		color: #999;
+		font-size: 24rpx;
+	}
+	.detal-total-value {
+		color: #333;
+		font-size: 28rpx;
 	}
 
 	.item-value-intotal {

pages/order-trends/order-trends.nvue

@@ -69,7 +69,7 @@
 						<view class="middle view planout-block-item">
 							<view class="text-block">
 								<text class="middle-date">{{item.OBJECT_ID}}</text>
-								<text class="middle-date-des">{{item.DESCRIPTION}}</text>
+								<text class="middle-pro-des">{{item.DESCRIPTION}}</text>
 							</view>
 							<view class="text-block">
 								<text class="middle-date">制票通知单</text>
@@ -420,7 +420,7 @@
 	}
 
 	.middle-date-des {
-		flex: 3;
+		flex: 2;
 		font-size: 28rpx;
 		line-height: 96rpx;
 		height: 96rpx;
@@ -429,6 +429,15 @@
 		text-overflow: ellipsis;
 		color: #888;
 	}
+	.middle-pro-des {
+		display: flex;
+		flex: 2;
+		font-size: 28rpx;
+		// height: 96rpx;
+		color: #888;
+		margin-top: 10rpx;
+		align-items: center;
+	}
 
 	.middle-date-select {
 		color: #888;

pages/purchase-main/purchase-main.nvue

@@ -35,7 +35,7 @@
 					</view>
 					<view class="text-block">
 						<text class="middle-date">渠道类型</text>
-						<view class="middle-date-des uni-list picker-year">
+						<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,'channelType')" :value="orderItem.channelsType"
@@ -85,7 +85,7 @@
 					</view>
 					<view class="text-block text-block-last">
 						<text class="middle-date">本次要货件数</text>
-						<input class="middle-date-des" type="text" v-model="ele.wantQuantity" placeholder="请输入" />
+						<input class="middle-date-address" type="text" v-model="ele.wantQuantity" placeholder="请输入" />
 					</view>
 				</view>
 					</uni-cell>
@@ -143,7 +143,7 @@
 				scrollTop: 0,
 				deliveryPlanArr : [],
 				ticketTypeArr : [],
-				channelTypeArr : [],
+				// channelTypeArr : [],
 				marketPlaceArr : [],
 			}
 		},
@@ -154,6 +154,10 @@
 					return {}
 				}
 			},
+			channelTypeArr: {
+				type: Array,
+				default: () => []
+			}
 		},
 		computed: {
 			navHeight() {
@@ -191,9 +195,9 @@
 			// this.getProdDeliveryPlan()
 		},
 		watch:{
-			'orderItem.planType':function(res,res1){
-				res && this.getChannelType()
-			}
+			// 'orderItem.planType':function(res,res1){
+			// 	res && this.getChannelType()
+			// }
 		},
 		methods: {
 			async getProdDeliveryPlan(){
@@ -236,6 +240,25 @@
 				}
 			},
 			nextStep() {
+				if (!this.orderItem.channelTypeName) {
+					uni.showToast({
+						title: '请先选择渠道',
+						duration: 2000,
+						icon: 'none'
+					});
+					return
+				}
+				const numFlag = this.orderItem.wantGoodsDetailList.every(function(item){
+						return item.wantQuantity 
+					});
+				if (!numFlag) {
+					uni.showToast({
+						title: '请先填写要货数量',
+						duration: 2000,
+						icon: 'none'
+					});
+					return
+				}
 				this.$emit('click', 'purchaseReceive')
 				// uni.navigateTo({
 				// 	url: `/pages/purchase-receive/purchase-receive?order=${JSON.stringify(this.orderItem)}`
@@ -244,6 +267,9 @@
 			async getChannelType(){
 				const res = await getChannelType({'salePlan': this.orderItem.planType})
 				this.channelTypeArr = res.data
+				if (!this.channelTypeArr.length) {
+					this.channelTypeArr = [{ value: 'S', name: '社会化渠道' }]
+				  }
 			},
 			getSelectDictDataOrigin(dictcode) {
 			  querySysDictionaryDetailsByCode({'code': dictcode})
@@ -330,7 +356,7 @@
 	.text-block {
 		overflow: hidden;
 		height: 96rpx;
-		margin-bottom: 14rpx;
+		// margin-bottom: 14rpx;
 		border-bottom: 1px solid #f4f5f6;
 	}
 
@@ -342,23 +368,23 @@
 	.middle-date {
 		flex: 2;
 		font-size: 28rpx;
-		line-height: 96rpx;
 		color: #999;
 		margin-bottom: 8rpx;
+		padding-top: 30rpx;
 	}
 
 	.middle-date-des {
 		flex: 3;
 		font-size: 28rpx;
 		height: 96rpx;
-		line-height: 96rpx;
 		color: $text-base-color;
+		padding-top: 30rpx;
+		justify-content: start;
 	}
 
 	.picker-year {
 		position: relative;
 		align-items: center;
-		padding-left: 14rpx;
 	}
 
 	.uni-list-cell {
@@ -424,4 +450,11 @@
 		vertical-align: middle;
 		margin-top: 10rpx;
 	}
+	.middle-date-address {
+		flex: 3;
+		font-size: 28rpx;
+		height: 96rpx;
+		line-height: 96rpx;
+		color: $text-base-color;
+	}
 </style>

pages/purchase-plan/purchase-plan.nvue

@@ -268,7 +268,7 @@
 		// 	}, 600);
 		// },
 		created() {
-			this.condition.GJAHR[0].LOW = timeFormat(new Date(), 'yyyy')
+			// this.condition.GJAHR[0].LOW = timeFormat(new Date(), 'yyyy')
 			this.condition.MV_BP = this.userInfo.code
 			this.reset()
 			this.getSelectDictDataOrigin('A0001','PunishType')
@@ -758,4 +758,4 @@
 		color: #fff;
 		font-size: 34rpx;
 	}
-</style>
+</style>

pages/purchase-receive/purchase-receive.nvue

@@ -46,38 +46,38 @@
 						</view>
 					</view>
 				</view>
-				<view class="middle view">
-					<view class="text-block" v-if="orderItem.isShunt - 1 === 0" @click="handleShuntAdress">
-						<text class="middle-date">分流收货单位</text>
-						<view class="middle-date-des uni-list picker-year" >
+				<view class="middle view address-view">
+					<view class="text-address" v-if="orderItem.isShunt - 1 === 0" @click="handleShuntAdress">
+						<text class="middle-date-unit">分流收货单位</text>
+						<view class="middle-date-des-unit uni-list picker-year" >
 							<view class="uni-list-cell">
 								<view class="uni-list-cell-db">
-									<text class="uni-input">{{orderItem.shuntReceiveUnitName}}</text>
+									<text class="middle-date-address-text">{{orderItem.shuntReceiveUnitName}}</text>
 								</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-des uni-list picker-year">
+					<view class="text-address">
+						<text class="middle-date-unit">收货单位</text>
+						<view class="middle-date-des-unit uni-list picker-year">
 							<view class="uni-list-cell">
 								<view class="uni-list-cell-db">
 									<picker class="picker-block" @change="bindPickerChange($event,'receive')" :value="orderItem.receiveUnitName"
 										range-key='partner_name' mode="selector" :range="receiveUnitArr">
-										<text class="uni-input">{{orderItem.receiveUnitName}}</text>
+										<text class="middle-date-address-text">{{orderItem.receiveUnitName}}</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-des uni-list picker-year" @click="handleCustomer">
+					<view class="text-address">
+						<text class="middle-date-unit">喷码单位</text>
+						<view class="middle-date-des-unit uni-list picker-year" @click="handleCustomer">
 							<view class="uni-list-cell">
 								<view class="uni-list-cell-db">
-									<text class="uni-input">{{orderItem.spurtCodeUnitName}}</text>
+									<text class="middle-date-address-text">{{orderItem.spurtCodeUnitName}}</text>
 								</view>
 							</view>
 							<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode=""></image>
@@ -93,9 +93,9 @@
 						<text class="middle-date">联系人电话</text>
 						<input class="middle-date-des" type="text" v-model="orderItem.contactNumber" placeholder="请输入" />
 					</view>
-					<view class="text-block">
-						<text class="middle-date">收货地址</text>
-						<input class="middle-date-des" type="text" v-model="orderItem.receiveAddress" placeholder="请输入" />
+					<view class="text-address">
+						<text class="middle-date-add">收货地址</text>
+						<text class="middle-date-des-add">{{orderItem.receiveAddress}}</text>
 					</view>
 					<view class="text-block text-block-last">
 						<text class="middle-date">备注</text>
@@ -425,6 +425,32 @@
 				this.$emit('click', 'purchaseMain')
 			},
 			async nextStep() {
+				if(this.orderItem.isShunt - 1 === 0){
+					if (!this.orderItem.shuntDealerName) {
+						uni.showToast({
+							title: '请先选择分流经销商',
+							duration: 2000,
+							icon: 'none'
+						});
+						return
+					}
+					if (!this.orderItem.shuntTypeName) {
+						uni.showToast({
+							title: '请先选择分流渠道',
+							duration: 2000,
+							icon: 'none'
+						});
+						return
+					}
+					if (!this.orderItem.shuntReceiveUnitName) {
+						uni.showToast({
+							title: '请先选择分流收货单位',
+							duration: 2000,
+							icon: 'none'
+						});
+						return
+					}
+				}
 				try {
 					const params = JSON.parse(JSON.stringify(this.orderItem))
 					params.wantGoodsDetailList = JSON.stringify(params.wantGoodsDetailList)
@@ -501,11 +527,18 @@
 		padding: 32rpx 64rpx 0 48rpx;
 		margin-bottom: 16rpx;
 	}
+	.address-view{
+		flex: 1;
+	}
 
 	.text-block {
 		overflow: hidden;
-		height: 96rpx;
-		margin-bottom: 14rpx;
+		// height: 96rpx;
+		// margin-bottom: 14rpx;
+		border-bottom: 1px solid #f4f5f6;
+	}
+	.text-address {
+		overflow: hidden;
 		border-bottom: 1px solid #f4f5f6;
 	}
 
@@ -519,7 +552,6 @@
 		font-size: 28rpx;
 		line-height: 96rpx;
 		color: #999;
-		margin-bottom: 8rpx;
 	}
 
 	.middle-date-des {
@@ -529,11 +561,28 @@
 		line-height: 96rpx;
 		color: $text-base-color;
 	}
-
+	.middle-date-address {
+		color: #333;
+		font-size: 28rpx;
+		flex: 3;
+		padding-top: 10rpx;
+		justify-content: start;
+		font-size: 28rpx;
+		height: 96rpx;
+	}
+	.middle-date-address-text {
+		color: #333;
+		font-size: 28rpx;
+		flex: 1;
+		justify-content: start;
+		font-size: 28rpx;
+		height: 70rpx;
+		line-height: 34rpx;
+		align-items: center;
+	}
 	.picker-year {
 		position: relative;
 		align-items: center;
-		padding-left: 14rpx;
 	}
 
 	.uni-list-cell {
@@ -733,4 +782,36 @@
 		background: #ff1d32;
 		border: 1px solid #ff1d32;
 	}
+	.middle-date-unit {
+		flex: 2;
+		font-size: 28rpx;
+		color: #999;
+		margin-bottom: 8rpx;
+		padding-top: 30rpx;
+	}
+	
+	.middle-date-des-unit {
+		flex: 3;
+		font-size: 28rpx;
+		min-height: 96rpx;
+		color: $text-base-color;
+		padding-top: 30rpx;
+		justify-content: start;
+	}
+	.middle-date-add {
+		flex: 2;
+		font-size: 28rpx;
+		color: #999;
+		margin-bottom: 8rpx;
+		padding-top: 30rpx;
+	}
+	
+	.middle-date-des-add {
+		flex: 3;
+		font-size: 28rpx;
+		min-height: 124rpx;
+		color: $text-base-color;
+		padding-top: 30rpx;
+		justify-content: start;
+	}
 </style>

pages/purchase/purchase-apply.nvue

@@ -2,7 +2,7 @@
 	<view class="apply-history view" :style="winHeight">
 		<view class="status_bar" :style="navHeight"></view>
 		<view class="apply-history-wrapper view">
-			<component :style="componentHeight" :orderItem='detail' :is="currentTabComponent" @click="changeComponent" @submit="submit"></component>
+			<component :style="componentHeight" :orderItem='detail' :channelTypeArr='channelTypeArr' :is="currentTabComponent" @click="changeComponent" @submit="submit"></component>
 		</view>
 	</view>
 </template>
@@ -10,7 +10,7 @@
 	import {
 		mapState
 	} from 'vuex'
-	import { initAppWantGoods } from '@/servers/purchaseList.js'
+	import { initAppWantGoods, getChannelType } from '@/servers/purchaseList.js'
 
 	import purchaseMain from '../purchase-main/purchase-main'
 	import purchaseReceive from '../purchase-receive/purchase-receive'
@@ -26,6 +26,7 @@
 		},
 		data() {
 			return {
+				channelTypeArr: [],
 				currentTabComponent: 'purchaseMain',
 				topHeight: '',
 				detail: {},
@@ -118,10 +119,18 @@
 			this.getDetail()
 		},
 		methods: {
+			async getChannelType(){
+				const res = await getChannelType({'salePlan': this.detail.planType})
+				this.channelTypeArr = res.data
+				if (!this.channelTypeArr.length) {
+					this.channelTypeArr = [{ value: 'S', name: '社会化渠道' }]
+				  }
+			},
 			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.getChannelType()
 			},
 			changeComponent(com) {
 				this.currentTabComponent = com;

pages/purchase/purchase.nvue

@@ -25,7 +25,7 @@
 							<text class="item-block-value">{{item.infTypeTextView}}</text>
 						</view>
 						<view class="item-block item-block-code">
-							<text class="item-block-label">营销中心</text>
+							<text class="item-block-label">营销单元</text>
 							<text class="item-block-value">{{item.zzfld000001TextView}}</text>
 						</view>
 						<view class="item-block item-block-code">

pages/ticket-order/ticket-order.nvue

@@ -7,7 +7,7 @@
 		<view class="main" :style="mainHeight">
 			<view class="middle view planout-block-item">
 				<view class="text-block">
-					<text class="middle-date">订单类型</text>
+					<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">
@@ -21,7 +21,7 @@
 					</view>
 				</view>
 				<view class="text-block">
-					<text class="middle-date">订单状态</text>
+					<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">
@@ -71,7 +71,7 @@
 						<text class="loading-more-text">{{loadingText}}</text>
 					</view>
 				</cell>
-				<view class="planout-block-item__last"> </view>
+				<!-- <view class="planout-block-item__last"> </view> -->
 			</list>
 			<no-data v-if="lists.length === 0"></no-data>
 		</view>
@@ -408,7 +408,7 @@
 	.icon-arrow {
 		position: absolute;
 		right: 0;
-		top: 16px;
+		// top: 16px;
 		width: 12rpx;
 		height: 20rpx;
 		z-index: 10;