更新

config/index.js

@@ -1,8 +1,8 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrlNew: 'http://192.168.1.119:9100/',
-	// baseUrlNew: 'http://192.168.1.117:8090/',
-	baseUrlNew: 'http://api1.eliangeyun.com/',
+	baseUrlNew: 'http://192.168.1.117:8090/',
+	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }
@@ -10,3 +10,4 @@ const dev = {
 export function def() {
 	return dev
 }
+

pages/erp/exWarehousing/exWarehousing.vue

@@ -112,9 +112,9 @@
 				<!-- <view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
 				<!-- 自运合同车牌号需下拉 -->
 				<view v-show="showCar" @click="carno = true">
-					{{detailData.carNo?detailData.carNo :"请选择车牌号"}}
+					{{detailData.carNo?detailData.carNo +'（'+detailData.tranCarNo+'）':"请选择车牌号"}}
 				</view>
-				<u-picker :range="carList" range-key="carNo" @confirm='carPicker($event)' v-model="carno"
+				<u-picker :range="carList" range-key="carNo1" @confirm='carPicker($event)' v-model="carno"
 					mode="selector">
 				</u-picker>
 			</view>
@@ -491,7 +491,7 @@
 									
 									if (res.data.data[i].tranCarInfoList) {
 										for(var num = 0 ; num < res.data.data[i].tranCarInfoList.length; num++){
-										   res.data.data[i].tranCarInfoList[num].carNo = res.data.data[i].tranCarInfoList[num].carNo + '（'+res.data.data[i].tranCarInfoList[num].tranCarNo+'）'
+										   res.data.data[i].tranCarInfoList[num].carNo1 = res.data.data[i].tranCarInfoList[num].carNo + '（'+res.data.data[i].tranCarInfoList[num].tranCarNo+'）'
 										}
 										this.carList = res.data.data[i].tranCarInfoList //车牌号下拉列表
 									}
@@ -648,6 +648,7 @@
 			},
 			carPicker(e) {
 				// this.detailData.gradeKey = e[0] + 1
+				// this.detailData.tranCarNo = this.carList[e].tranCarNo
 				this.detailData.carNo = this.carList[e].carNo
 				this.detailData.tranCarNo = this.carList[e].tranCarNo
 				this.detailData.carId = this.carList[e].id

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -101,8 +101,8 @@
 				<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false" :defaultValue="detailData.carNo" @keyboardClick="handleClick"></master-keyboard>
 				<!-- <view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
 				<!-- 自运合同车牌号需下拉 -->
-				<view v-if="!carno" v-show="showCar" @click="carno = true">{{detailData.carNo?detailData.carNo :"请选择车牌号"}}</view>
-				<u-picker :range="carList" range-key="carNo" @confirm='carPicker($event)' v-model="carno" mode="selector">
+				<view v-if="!carno" v-show="showCar" @click="carno = true">{{detailData.carNo?detailData.carNo +'（'+detailData.tranCarNo+'）':"请选择车牌号"}}</view>
+				<u-picker :range="carList" range-key="carNo1" @confirm='carPicker($event)' v-model="carno" mode="selector">
 				</u-picker>
 			</view>
 			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
@@ -397,7 +397,7 @@
 								}
 								if(res.data.data[i].tranCarInfoList){
 									for(var num = 0 ; num < res.data.data[i].tranCarInfoList.length; num++){
-									   res.data.data[i].tranCarInfoList[num].carNo = res.data.data[i].tranCarInfoList[num].carNo + '（'+res.data.data[i].tranCarInfoList[num].tranCarNo+'）'
+									   res.data.data[i].tranCarInfoList[num].carNo1 = res.data.data[i].tranCarInfoList[num].carNo + '（'+res.data.data[i].tranCarInfoList[num].tranCarNo+'）'
 									}
 									this.carList = res.data.data[i].tranCarInfoList   //车牌号下拉列表
 								}

pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -111,8 +111,8 @@
 				<!-- <input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input> -->
 				<!-- <view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
 				<!-- 自运合同车牌号需下拉 -->
-				<view v-if="!carno" v-show="showCar" @click="carno = true">{{detailData.carNo? detailData.carNo:"请选择车牌号"}}</view>
-				<u-picker :range="carList" range-key="carNo" @confirm='carPicker($event)' v-model="carno" mode="selector">
+				<view v-if="!carno" v-show="showCar" @click="carno = true">{{detailData.carNo? detailData.carNo+'（'+detailData.tranCarNo+'）':"请选择车牌号"}}</view>
+				<u-picker :range="carList" range-key="carNo1" @confirm='carPicker($event)' v-model="carno" mode="selector">
 				</u-picker>
 			</view>
 			<view class="row row-bottom" v-if="detailData.outType=='火运'">
@@ -422,7 +422,7 @@
 								}
 								if(res.data.data[i].tranCarInfoList){
 									for(var num = 0 ; num < res.data.data[i].tranCarInfoList.length; num++){
-									   res.data.data[i].tranCarInfoList[num].carNo = res.data.data[i].tranCarInfoList[num].carNo + '（'+res.data.data[i].tranCarInfoList[num].tranCarNo+'）'
+									   res.data.data[i].tranCarInfoList[num].carNo1 = res.data.data[i].tranCarInfoList[num].carNo + '（'+res.data.data[i].tranCarInfoList[num].tranCarNo+'）'
 									}
 									this.carList = res.data.data[i].tranCarInfoList   //车牌号下拉列表
 								}

pages/erp/warehousing/warehousing.vue

@@ -118,8 +118,8 @@
 				<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false" :defaultValue="detailData.carNo" @keyboardClick="handleClick"></master-keyboard>
 				<!-- <view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
 				<!-- 自运合同车牌号需下拉 -->
-				<view v-show="showCar" @click="carno = true">{{detailData.carNo? detailData.carNo:"请选择车牌号"}}</view>
-				<u-picker :range="carList" range-key="carNo" @confirm='carPicker($event)' v-model="carno"
+				<view v-show="showCar" @click="carno = true">{{detailData.carNo? detailData.carNo+'（'+detailData.tranCarNo+'）':"请选择车牌号"}}</view>
+				<u-picker :range="carList" range-key="carNo1" @confirm='carPicker($event)' v-model="carno"
 					mode="selector">
 				</u-picker>
 			</view>
@@ -496,9 +496,9 @@
 											this.showCar = false
 										}
 										if (res.data.data[i].tranCarInfoList) {
-											for(var num = 0 ; num < res.data.data[i].tranCarInfoList.length; num++){
-											   res.data.data[i].tranCarInfoList[num].carNo = res.data.data[i].tranCarInfoList[num].carNo + '（'+res.data.data[i].tranCarInfoList[num].tranCarNo+'）'
-											}
+											// for(var num = 0 ; num < res.data.data[i].tranCarInfoList.length; num++){
+											//    res.data.data[i].tranCarInfoList[num].carNo1 = res.data.data[i].tranCarInfoList[num].carNo + '（'+res.data.data[i].tranCarInfoList[num].tranCarNo+'）'
+											// }
 											this.carList = res.data.data[i].tranCarInfoList //车牌号下拉列表
 										}
 									}