UI更改

pages/group-buy/group-baseinfo.nvue

@@ -4,7 +4,11 @@
 			<view class="main">
 			<view class="middle view planout-block-item">
 				<view class="text-block" @click="selectGroupClient">
+					<view class="middle-date">
+						<text class="mustPosIcon">*</text>
 						<text class="middle-date">团购单位</text>
+					</view>
+					<!-- <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">
@@ -26,7 +30,11 @@
 					</view>
 				</view>
 				<view class="text-block" @click="selectAddress">
+					<view class="middle-date">
+						<text class="mustPosIcon">*</text>
 						<text class="middle-date">收货单位</text>
+					</view>
+					<!-- <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">
@@ -68,7 +76,11 @@
 					</view>
 				</view>
 				<view class="text-block">
+					<view class="middle-date">
+						<text class="mustPosIcon">*</text>
 						<text class="middle-date">喷码方式</text>
+					</view>
+					<!-- <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">
@@ -373,7 +385,7 @@
 				this.paintDesignIndex = e.detail.value
 				switch (e.detail.value) {
 					case 1:
-						this.condition.ZZFLD000098 = this.condition.GRPUTID
+						this.condition.ZZFLD000098 = ''
 						break;
 					case 2:
 						this.condition.ZZFLD000098 = this.selectedGroupClient.OBJNAME
@@ -508,6 +520,7 @@
 		line-height: 96rpx;
 		color: #333;
 		margin-bottom: 8rpx;
+		margin-left: 4rpx;
 	}
 
 	.middle-date-des {
@@ -620,4 +633,9 @@
 		top: 0px;
 		z-index: 10;
 	}
+	.mustPosIcon{
+	 	color: #FF1D32;
+	 	position: relative;
+	 	top: 30rpx;
+	}
 </style>

pages/group-buy/quota-order.nvue

@@ -11,6 +11,7 @@
 		</view>
 
 		<view class="summary upload salescenter top-radius">
+			<text class="mustIcon">*</text>
 			<text class="top-date">营销中心</text>
 			<view class="top-date-des uni-list picker-year">
 				<view class="uni-list-cell">
@@ -53,7 +54,11 @@
 							</view>
 							<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>
+								</view>
+								<!-- <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">
@@ -65,7 +70,11 @@
 								</view>
 							</view>
 							<view class="text-block" @click="selectProduct(index,'inner')">
+								<view class="middle-date">
+									<text class="mustPosIcon">*</text>
 									<text class="middle-date">产品</text>
+								</view>
+								<!-- <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">
@@ -77,7 +86,11 @@
 								</view>
 							</view>
 							<view class="text-block">
+								<view class="middle-date">
+									<text class="mustPosIcon">*</text>
 									<text class="middle-date">数量（件）</text>
+								</view>
+								<!-- <text class="middle-date">数量（件）</text> -->
 								<input class="middle-date-des" type="number" :value="item.quantity"
 									@input="calcInnerTotal($event,item,index)"
 									@blur="updateQuotaData(index,'inner',item)" placeholder="请填写" />
@@ -135,8 +148,8 @@
 				salesCenterIndex: -1,
 				planinnerLists: [{
 					checked: false,
-					'ZZFLD00002Q_TEXT': '请选择',
-					"DESCRIPTION": "请选择",
+					'ZZFLD00002Q_TEXT': '',
+					"DESCRIPTION": "",
 					'NET_PRICE': 0,
 					'NET_VALUE': 0,
 					'quantity': 0,
@@ -394,8 +407,8 @@
 					checked: false,
 					"PRODUCT_ID": "",
 					"ORDERED_PROD": "",
-					'ZZFLD00002Q_TEXT': '请选择',
-					"DESCRIPTION": "请选择",
+					'ZZFLD00002Q_TEXT': '',
+					"DESCRIPTION": "",
 					"SHORT_TEXT": "",
 					'NET_PRICE': 0,
 					'NET_VALUE': 0,
@@ -495,21 +508,29 @@
 	}
 
 	.middle-date {
-		flex: 2;
+		flex: 3;
 		font-size: 28rpx;
 		line-height: 96rpx;
 		color: #333;
 		margin-bottom: 8rpx;
+		margin-left: 4rpx;
 	}
 
 	.middle-date-des {
 		flex: 3;
 		font-size: 28rpx;
-		line-height: 96rpx;
+		// line-height: 96rpx;
+		height: 96rpx;
+		color: #888;
+		margin-top: 10rpx;
+	}
+	.middle-date-pro {
+		flex: 3;
+		font-size: 28rpx;
+		// margin-top: 10rpx;
 		height: 96rpx;
 		color: #888;
 	}
-
 	.picker-year {
 		position: relative;
 		border-radius: 4px;
@@ -721,6 +742,7 @@
 		line-height: 80rpx;
 		color: #333;
 		margin-bottom: 8rpx;
+		margin-left: 4rpx;
 	}
 	
 	.top-date-des {
@@ -739,4 +761,14 @@
 		border-top-left-radius: 10px;
 		border-top-right-radius: 10px;
 	}
+	.mustIcon {
+		width: 16rpx;
+		height: 40rpx;
+		color: #FF1D32;
+	}
+	.mustPosIcon{
+		color: #FF1D32;
+		position: relative;
+		top: 30rpx;
+	}
 </style>

pages/message/message.nvue

@@ -61,7 +61,7 @@
 		},
 		methods: {
 			async getMessageList(type) {
-				console.log(1)
+				try{
 					let params = {
 						customer: this.userInfo.code,
 						msgType: 'app',
@@ -83,14 +83,19 @@
 						}
 					}
 					if (res.status === 1) {
-					if (type === 0) {
-						this.unreadList = res.data.Rows || []
+						if (type - 0 === 0) {
+							this.unreadList = res.data.Rows.length > 0 ? res.data.Rows : [{MSGTITLE: '暂无内容'}]
 							this.unreadCount = res.data.Total || 0
 						} else {
-						this.readList = res.data.Rows || []
+							this.readList = res.data.Rows.length > 0 ? res.data.Rows : [{MSGTITLE: '暂无内容'}]
 						}
 					}
-
+				}catch(e){
+					this.unreadCount =  0
+					uni.removeTabBarBadge({
+						index:3
+					})
+				}
 			},
 			goMessageList(type) {
 				uni.navigateTo({

pages/my-order/my-order.nvue

@@ -35,12 +35,12 @@
 					</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">
-								<picker class="picker-block" @change="bindPickerYearChange" mode="date"
-									:value="condition.posting_date [0].low" fields='year'>
+								<picker class="picker-block" @cancel='cancelBtn' @change="bindPickerYearChange" mode="date"
+									:value="condition.posting_date [0].low" fields='day'>
 									<text class="uni-input-text">{{condition.posting_date [0].low}}</text>
 								</picker>
 							</view>
@@ -49,7 +49,7 @@
 					</view>
 				</view>
 				<view class="text-block text-block-last">
-					<text class="middle-date">销售计划编号</text>
+					<text class="middle-date">销售订单编号</text>
 					<input class="middle-date-des" type="text" v-model="condition.object_id[0].low" placeholder="请输入" />
 				</view>
 			</view>
@@ -111,8 +111,18 @@
 					user_bp: '',
 					posting_date: [{sign: "I", option: "EQ", low: "", high: ""}]
 				},
-				selectProcessType: [],
-				selectProcessStatus: [],
+				selectProcessType: [
+					{
+						name: '全部',
+						value: '',
+					}
+				],
+				selectProcessStatus: [
+					{
+						name: '全部',
+						value: '',
+					}
+				],
 				page: {
 					"PAGE": "1",
 					"PAGESIZE": "10",
@@ -162,6 +172,9 @@
 			this.getSalesPlan(true);
 		},
 		methods: {
+			cancelBtn() {
+				this.condition.posting_date [0].low = ''
+			},
 			search() {
 				console.log(this.condition)
 				this.reset()
@@ -173,10 +186,10 @@
 					if(res.data.Rows.length>0){
 						switch (key) {
 							case 'selectProcessType':
-								this.selectProcessType = res.data.Rows
+								this.selectProcessType = [...this.selectProcessType, ...res.data.Rows]
 								break;
 							case 'selectProcessStatus':
-								this.selectProcessStatus = res.data.Rows
+								this.selectProcessStatus = [...this.selectProcessStatus, ...res.data.Rows]
 								break;
 						}
 					}

pages/my-order/order-item.nvue

@@ -13,7 +13,7 @@
 			</view>
 			<view class="text-block-box">
 				<view class="text-block text-block-last">
-					<text class="middle-date">{{newsItem.posting_date}}</text>
+					<text class="middle-date">{{formatSapDate(newsItem.posting_date)}} {{formatSapTime(newsItem.posting_time)}}</text>
 					<text class="middle-date-des">下单日期</text>
 				</view>
 				<view class="text-block text-block-last">
@@ -41,6 +41,14 @@
 			return {}
 		},
 		methods: {
+			formatSapTime(time){
+			  if (!time) return ''
+			  return time.replace(/^(\d{2})(\d{2})(\d{2})/, '$1:$2:$3')
+			},
+			formatSapDate(date, c = '-'){
+			  if (!date) return ''
+			  return date.replace(/^(\d{4})(\d{2})(\d{2})/, `$1${c}$2${c}$3`)
+			},
 			click() {
 				this.$emit('click');
 			},

pages/no-quota/quota-order.nvue

@@ -10,8 +10,9 @@
 			</view>
 		</view>
 		<view class="summary upload salescenter top-radius">
-			<text class="middle-date">营销中心</text>
-			<view class="middle-date-des uni-list picker-year">
+			<text class="mustIcon">*</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">
 						<picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector"
@@ -50,11 +51,15 @@
 								<text class="middle-date title-first__text">{{index+1}}</text>
 							</view>
 							<view class="text-block" @click="selectProduct(index,'inner')">
+								<view class="middle-date">
+									<text class="mustPosIcon">*</text>
 									<text class="middle-date">产品</text>
-								<view class="middle-date-des uni-list picker-year">
+								</view>
+								<!-- <text class="middle-date">产品</text> -->
+								<view class="middle-date-pro 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-pro">{{item.DESCRIPTION}}</text>
 										</view>
 									</view>
 									<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit">
@@ -62,7 +67,11 @@
 								</view>
 							</view>
 							<view class="text-block">
+								<view class="middle-date">
+									<text class="mustPosIcon">*</text>
 									<text class="middle-date">数量（件）</text>
+								</view>
+								<!-- <text class="middle-date">数量（件）</text> -->
 								<input class="middle-date-des" type="number" :value="item.quantity"
 									@input="calcInnerTotal($event,item,index)"
 									@blur="updateNoQuotaData(index,'inner',item)" placeholder="请填写" />
@@ -122,15 +131,12 @@
 			return {
 				scrollTop: 0,
 				mode: 'inner',
-				selectedSalesCenterArr: [{
-					KEY: -1,
-					VALUE: ''
-				}],
+				selectedSalesCenterArr: [],
 				selectedSalesCenter: {},
 				salesCenterIndex: -1,
 				planinnerLists: [{
 					checked: false,
-					'DESCRIPTION': "请选择",
+					'DESCRIPTION': "",
 					'NET_PRICE': 0,
 					'quantity': 0,
 					'total': 0,
@@ -345,7 +351,7 @@
 					checked: false,
 					"PRODUCT_ID": "",
 					"ORDERED_PROD": "",
-					"DESCRIPTION": "请选择",
+					"DESCRIPTION": "",
 					"SHORT_TEXT": "",
 					'NET_PRICE': 0,
 					'NET_VALUE': 0,
@@ -433,11 +439,12 @@
 	}
 
 	.middle-date {
-		flex: 2;
+		flex: 3;
 		font-size: 28rpx;
 		line-height: 96rpx;
 		color: #333;
 		margin-bottom: 8rpx;
+		margin-left: 4rpx;
 	}
 
 	.middle-date-des {
@@ -447,7 +454,13 @@
 		height: 96rpx;
 		color: #888;
 	}
-
+	.middle-date-pro {
+		flex: 3;
+		font-size: 28rpx;
+		margin-top: 10rpx;
+		height: 96rpx;
+		color: #888;
+	}
 	.picker-year {
 		position: relative;
 		border-radius: 4px;
@@ -658,6 +671,14 @@
 		line-height: 80rpx;
 		color: #333;
 		margin-bottom: 8rpx;
+		margin-left: 4rpx;
+	}
+	.top-date-des {
+		flex: 3;
+		font-size: 28rpx;
+		line-height: 80rpx;
+		height: 80rpx;
+		color: #888;
 	}
 	.bot-radius{
 		border-bottom-left-radius: 10px;
@@ -667,4 +688,14 @@
 		border-top-left-radius: 10px;
 		border-top-right-radius: 10px;
 	}
+	.mustIcon {
+		width: 16rpx;
+		height: 40rpx;
+		color: #FF1D32;
+	}
+	.mustPosIcon{
+		color: #FF1D32;
+		position: relative;
+		top: 30rpx;
+	}
 </style>

pages/order-detail-group/order-detail-group.nvue

@@ -95,12 +95,12 @@
 										<text class="detal-item-value">{{item.DESCRIPTION}}</text>
 									</view>
 									<view class="block-detal-item">
-										<text class="detal-item-label">数量（件）</text>
+										<text class="detal-item-label">件数</text>
 										<text class="detal-item-value">{{item.ZZFLD000009}}</text>
 									</view>
 									<view class="block-detal-item">
-										<text class="detal-item-label">盒数</text>
-										<text class="detal-item-value">{{item.ZZFLD00002W}}</text>
+										<text class="detal-item-label">数量</text>
+										<text class="detal-item-value">{{item.ZZFLD000009*item.ZZFLD00002W}}</text>
 									</view>
 									<view class="block-detal-item">
 										<text class="detal-item-label">单价</text>

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

@@ -48,12 +48,12 @@
 										<text class="detal-item-value">{{item.DESCRIPTION}}</text>
 									</view>
 									<view class="block-detal-item">
-										<text class="detal-item-label">数量（件）</text>
+										<text class="detal-item-label">件数</text>
 										<text class="detal-item-value">{{item.ZZFLD000009}}</text>
 									</view>
 									<view class="block-detal-item">
-										<text class="detal-item-label">盒数</text>
-										<text class="detal-item-value">{{item.ZZFLD00002W}}</text>
+										<text class="detal-item-label">数量</text>
+										<text class="detal-item-value">{{item.ZZFLD000009*item.ZZFLD00002W}}</text>
 									</view>
 									<view class="block-detal-item">
 										<text class="detal-item-label">单价</text>

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

@@ -56,12 +56,12 @@
 										<text class="detal-item-value">{{item.DESCRIPTION}}</text>
 									</view>
 									<view class="block-detal-item">
-										<text class="detal-item-label">数量（件）</text>
+										<text class="detal-item-label">件数</text>
 										<text class="detal-item-value">{{item.ZZFLD000009}}</text>
 									</view>
 									<view class="block-detal-item">
-										<text class="detal-item-label">盒数</text>
-										<text class="detal-item-value">{{item.ZZFLD00002W}}</text>
+										<text class="detal-item-label">数量</text>
+										<text class="detal-item-value">{{item.ZZFLD000009*item.ZZFLD00002W}}</text>
 									</view>
 									<view class="block-detal-item">
 										<text class="detal-item-label">单价</text>

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

@@ -95,12 +95,12 @@
 										<text class="detal-item-value">{{item.DESCRIPTION}}</text>
 									</view>
 									<view class="block-detal-item">
-										<text class="detal-item-label">数量（件）</text>
+										<text class="detal-item-label">件数</text>
 										<text class="detal-item-value">{{item.ZZFLD000009}}</text>
 									</view>
 									<view class="block-detal-item">
-										<text class="detal-item-label">盒数</text>
-										<text class="detal-item-value">{{item.ZZFLD00002W}}</text>
+										<text class="detal-item-label">数量</text>
+										<text class="detal-item-value">{{item.ZZFLD000009*item.ZZFLD00002W}}</text>
 									</view>
 									<view class="block-detal-item">
 										<text class="detal-item-label">单价</text>

pages/produce-material/produce-plan.nvue

@@ -102,7 +102,7 @@
 				<view class="popup-content-content">
 					<text class="popup-content-content__title">提交成功</text>
 					<!-- <text class="popup-content-content__title2">生产备料编号：{{ orderInfo.OBJECT_ID }}</text> -->
-					<text class="popup-content-content__title2">生产备料单号：{{ orderInfo.PACKPL_ID }}</text>
+					<text class="popup-content-content__title2">生产备料单号：{{ orderInfo.packpl_id }}</text>
 				</view>
 				<view class="popup-content-foot">
 					<text class="popup-content-foot__btn" @click="resetData()">继续添加</text>

pages/purchase/purchase.nvue

@@ -12,13 +12,17 @@
 				</refresh>
 				<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">年度</text>
+							<text class="item-block-value">{{item.annual}}</text>
+						</view>
 						<view class="item-block item-block-code">
 							<text class="item-block-label">计划类型</text>
 							<text class="item-block-value">{{item.zZFLD00002QTextView}}</text>
 						</view>
 						<view class="item-block item-block-code">
-							<text class="item-block-label">年度</text>
-							<text class="item-block-value">{{item.annual}}</text>
+							<text class="item-block-label">制票类型</text>
+							<text class="item-block-value">{{item.infTypeTextView}}</text>
 						</view>
 						<view class="item-block item-block-code">
 							<text class="item-block-label">发票类型</text>

pages/quota/quota-order.nvue

@@ -10,6 +10,7 @@
 			</view>
 		</view>
 		<view class="summary upload salescenter top-radius">
+			<text class="mustIcon">*</text>
 			<text class="top-date">营销中心</text>
 			<view class="top-date-des uni-list picker-year">
 				<view class="uni-list-cell">
@@ -53,11 +54,16 @@
 								<text class="middle-date title-first__text">{{index+1}}</text>
 							</view>
 							<view class="text-block" @click="selectProduct(index,'inner')">
+								<view class="middle-date">
+									<text class="mustPosIcon">*</text>
 									<text class="middle-date">产品</text>
-								<view class="middle-date-des uni-list picker-year">
+								</view>
+								<!-- <text class="mustPosIcon">*</text> -->
+								<!-- <text class="middle-date">产品</text> -->
+								<view class="middle-date-pro 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-pro">{{item.DESCRIPTION}}</text>
 										</view>
 									</view>
 									<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit">
@@ -65,7 +71,12 @@
 								</view>
 							</view>
 							<view class="text-block" @click="selectPlanOrder(item,index)">
+								<view class="middle-date">
+									<text class="mustPosIcon">*</text>
 									<text class="middle-date">计划编号</text>
+								</view>
+								<!-- <text class="mustPosIcon">*</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">
@@ -77,7 +88,12 @@
 								</view>
 							</view>
 							<view class="text-block">
+								<view class="middle-date">
+									<text class="mustPosIcon">*</text>
 									<text class="middle-date">数量（件）</text>
+								</view>
+								<!-- <text class="mustPosIcon">*</text> -->
+								<!-- <text class="middle-date">数量（件）</text> -->
 								<input class="middle-date-des" type="number" :value="item.quantity"
 									@input="calcInnerTotal($event,item,index)"
 									@blur="updateQuotaData(index,'inner',item)" placeholder="请填写" />
@@ -117,10 +133,10 @@
 							</view>
 							<view class="text-block">
 								<text class="middle-date">产品</text>
-								<view class="middle-date-des uni-list picker-year">
+								<view class="middle-date-pro 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-pro">{{item.DESCRIPTION}}</text>
 										</view>
 									</view>
 								</view>
@@ -197,10 +213,7 @@
 			return {
 				scrollTop: 0,
 				mode: 'inner',
-				selectedSalesCenterArr: [{
-					KEY: -1,
-					VALUE: ''
-				}],
+				selectedSalesCenterArr: [],
 				selectedSalesCenter: {},
 				salesCenterIndex: -1,
 				planoutLists: [],
@@ -209,7 +222,7 @@
 					"PRODUCT_ID": "",
 					"ORDERED_PROD": "",
 					'ZZFLD000005': '请选择',
-					'DESCRIPTION': "请选择",
+					'DESCRIPTION': "",
 					"SHORT_TEXT": "",
 					'NET_PRICE': 0,
 					'quantity': 0,
@@ -413,14 +426,15 @@
 					if (ITEM_OUTER && ITEM_OUTER[0] && product && product.salesplan_info) {
 						if (this.planoutLists.length > 0) {
 							let isHasOutTargetIndex = this.planoutLists.findIndex((out) => {
-								return out.NUMBER_INT === ITEM_OUTER[0].ITEM_OUTER
+								return out.NUMBER_INT === ITEM_OUTER[0].NUMBER_INT
 							})
-							if (isHasOutTargetIndex) {
+							if (!isHasOutTargetIndex) {
 								this.planoutLists = this.planoutLists.map((out, i) => {
 									if (isHasOutTargetIndex === i) {
 										out = {
 											...out,
-											...ITEM_OUTER[0]
+											...ITEM_OUTER[0],
+											quantity: ITEM_OUTER[0].ZZFLD000009
 										}
 									}
 									return out
@@ -431,6 +445,8 @@
 						} else {
 							this.planoutLists = [{...ITEM_OUTER[0], quantity:ITEM_OUTER[0].ZZFLD000009}]
 						}
+					}else{
+						this.planoutLists = []
 					}
 					console.log('planinnerLists', this.planinnerLists)
 				} else {
@@ -654,11 +670,12 @@
 	}
 
 	.middle-date {
-		flex: 2;
+		flex: 3;
 		font-size: 28rpx;
 		line-height: 96rpx;
 		color: #333;
 		margin-bottom: 8rpx;
+		margin-left: 4rpx;
 	}
 
 	.middle-date-des {
@@ -668,6 +685,13 @@
 		height: 96rpx;
 		color: #888;
 	}
+	.middle-date-pro {
+		flex: 3;
+		font-size: 28rpx;
+		margin-top: 10rpx;
+		height: 96rpx;
+		color: #888;
+	}
 
 	.picker-year {
 		position: relative;
@@ -747,7 +771,16 @@
 		height: 36rpx;
 		margin-right: 8rpx;
 	}
-
+	.mustIcon {
+		width: 16rpx;
+		height: 40rpx;
+		color: #FF1D32;
+	}
+	.mustPosIcon{
+		color: #FF1D32;
+		position: relative;
+		top: 30rpx;
+	}
 	.summary-num {
 		font-size: 32rpx;
 		color: #333;
@@ -880,6 +913,7 @@
 		line-height: 80rpx;
 		color: #333;
 		margin-bottom: 8rpx;
+		margin-left: 4rpx;
 	}
 	
 	.top-date-des {

pages/select-group-plan/select-group-plan.vue

@@ -32,16 +32,24 @@
 				<view class="middle view planout-block-item" v-for="(item,index) in lists" :key='index'
 					@click="handleChecked($event,item, index)">
 					<view class="text-block">
-						<text class="middle-date">年度</text>
-						<text class="middle-date-des">{{item.GJAHR}}</text>
+						<text class="middle-date">计划类型描述</text>
+						<text class="middle-date-des">{{item.PLAN_TYPE_DESC}}</text>
 					</view>
 					<view class="text-block">
 						<text class="middle-date">计划类型编号</text>
 						<text class="middle-date-des">{{item.PLAN_TYPE}}</text>
 					</view>
 					<view class="text-block">
-						<text class="middle-date">计划类型描述</text>
-						<text class="middle-date-des">{{item.PLAN_TYPE_DESC}}</text>
+						<text class="middle-date">年度</text>
+						<text class="middle-date-des">{{item.GJAHR}}</text>
+					</view>
+					<view class="text-block">
+						<text class="middle-date">月份</text>
+						<text class="middle-date-des">{{item.MONTH}}</text>
+					</view>
+					<view class="text-block">
+						<text class="middle-date">剩余可用量</text>
+						<text class="middle-date-des">{{item.AVAILABLE_QTY}}</text>
 					</view>
 				</view>
 

pages/select-product/select-product.vue

@@ -32,7 +32,7 @@
 					</view>
 					<view class="text-block">
 						<text class="middle-date middle-date-select">产品描述</text>
-						<text class="middle-date-des middle-date-des-select">{{item.SHORT_TEXT}}</text>
+						<text class="middle-date-pro middle-date-des-select">{{item.SHORT_TEXT}}</text>
 					</view>
 					<view class="text-block">
 						<text class="middle-date middle-date-select">存货分类</text>
@@ -353,6 +353,12 @@
 		text-overflow: ellipsis;
 		color: #888;
 	}
+	.middle-date-pro {
+		flex: 3;
+		font-size: 28rpx;
+		height: 96rpx;
+		color: #888;
+	}
 
 	.middle-date-select {
 		color: #888;

pages/ticket-order/order-item.nvue

@@ -38,11 +38,11 @@
 				<view class="text-block-2">
 					<view class="text-block text-block-1">
 						<text class="middle-date">{{item.use_zzfld9}}</text>
-						<text class="middle-date-des">开票件数</text>
+						<text class="middle-date-des">开票件数({{item.zzfld00002t}})</text>
 					</view>
 					<view class="text-block">
-						<text class="middle-date">{{item.zzfld00002t}}</text>
-						<text class="middle-date-des">单位</text>
+						<text class="middle-date">{{item.use_quantity}}</text>
+						<text class="middle-date-des">数量(瓶)</text>
 					</view>
 				</view>
 				<view class="text-block-2">
@@ -51,30 +51,30 @@
 						<text class="middle-date-des">单价</text>
 					</view>
 					<view class="text-block">
-						<text class="middle-date">{{item.use_quantity}}</text>
-						<text class="middle-date-des">数量</text>
+						<text class="middle-date">{{item.net_value}}</text>
+						<text class="middle-date-des">价税合计</text>
 					</view>
 				</view>
 				<view class="text-block-2">
 					<view class="text-block text-block-1">
-						<text class="middle-date">{{item.remain_zzfld9}}</text>
-						<text class="middle-date-des">剩余开票件数</text>
-					</view>
-					<view class="text-block">
 						<text class="middle-date">{{item.zzfld00002e}}</text>
 						<text class="middle-date-des">税率</text>
 					</view>
+					<view class="text-block">
+						<text class="middle-date">{{item.remain_zzfld9}}</text>
+						<text class="middle-date-des">剩余开票件数</text>
 					</view>
-				<view class="text-block-2">
+				</view>
+				<!-- <view class="text-block-2"> -->
 					<!-- 	<view class="text-block text-block-1">
 						<text class="middle-date">{{item.INV_GUID}}</text>
 						<text class="middle-date-des">剩余发货件数</text>
 					</view> -->
-					<view class="text-block">
+					<!-- <view class="text-block">
 						<text class="middle-date">{{item.net_value}}</text>
 						<text class="middle-date-des">价税合计</text>
-					</view>
-				</view>
+					</view> -->
+				<!-- </view> -->
 			</view>
 		</view>
 

servers/api.helper.js

@@ -190,11 +190,11 @@ class Request {
 						config.baseUrl = 'http://221.10.127.60:5000/cyj'
 					} else if (config.url.indexOf('wmdpwebservices') !== -1) {
 						// config.baseUrl = 'http://10.0.134.182:9001'
-						config.baseUrl = 'http://221.10.127.60:5000/scm'
+						config.baseUrl = 'http://221.10.127.60:5000/gateway/sczx'
 						// config.baseUrl = ''
 					} else if (config.url.indexOf('wmdp-storeapp') !== -1) {
 						// config.baseUrl = 'http://10.0.134.128:8080'
-						config.baseUrl = 'http://221.10.127.60:5000/zdcx'
+						config.baseUrl = 'http://221.10.127.60:5000/gateway/zdcx'
 					} else {
 						// http://10.0.134.182:8000
 						config.baseUrl = 'http://221.10.127.60:5000/wlySap'