Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/erp/deliveryfeedback/details.vue

@@ -220,7 +220,7 @@
 					<view>
 						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.loadingDate}}</view>
 						<view v-else @click='train(index)'>{{item.loadingDate?item.loadingDate:'请选择日期'}}</view>
-						<u-picker :mask-close-able='false' v-model="item.show2" mode="time" @cancel='datecancel()' @confirm='dateChange2($event,index)' :params="params">
+						<u-picker :mask-close-able='false' v-model="item.show2" mode="time" @cancel='datecancel()' @confirm='dateChange1($event,index)' :params="params">
 						</u-picker>
 					</view>
 				</view>

pages/erpbusiness/add_quality_testing.vue

@@ -156,13 +156,13 @@
 
 			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">车牌号</view>
-				<view class="con-list" v-show='gridList.inOutType!="移库入库"||gridList.outType!="汽运"'>
+				<view class="con-list" v-show='(gridList.inOutType!="移库入库"||gridList.outType!="汽运")&&gridList.tranTaskFlag!="1"'>
 					<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard" :disabled="true"
 						placeholder="请输入车牌号" name="input"></input>
 					<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false"
 						:defaultValue="gridList.carNumber" @keyboardClick="handleClick"></master-keyboard>
 				</view>
-				<view class="con-list" v-show='gridList.inOutType=="移库入库"&&gridList.outType=="汽运"'>
+				<view class="con-list" v-show='gridList.inOutType=="移库入库"&&gridList.outType=="汽运"||gridList.tranTaskFlag=="1"'>
 					<view @click='show9=true'>{{gridList.carNumber?gridList.carNumber:'请选择车牌号'}}</view>
 					<u-picker :range="tranCarInfoList" range-key="carNo1" @confirm='carNopicker($event,1)'
 						v-model="show9" mode="selector">
@@ -549,6 +549,7 @@
 				Isedit: false,
 				MykeywordShow: false,
 				InputEvent: '',
+				tranTaskFlag:0,
 				dryGrainPrice: 0,
 				tidalGrainPrice: 0,
 				modalName: '',
@@ -1418,7 +1419,6 @@
 						delete this.gridList.colorLustre
 						delete this.gridList.reColorLustre
 					}
-
 					if (this.gridList.inOutType == '采购入库') {
 						this.warehouseTradeCount = '000' + this.warehouseTradeCount
 						// this.gridList.qualityNo='CGRK'+this.getdate()+this.commonWarehouseNo+this.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
@@ -1448,7 +1448,8 @@
 					} else if (this.contractNolist.inOutType == '贸易服务入库') {
 						this.gridList.inOutTypeKey = 5
 					} else if (this.contractNolist.inOutType == '退库') {
-
+						//退库有无运输任务标识
+						this.gridList.tranTaskFlag=this.contractNolist.tranTaskFlag
 						this.warehouseTradeCount = '000' + this.warehouseTradeCount
 						// this.gridList.qualityNo = 'CGRK' + this.getdate() + this.commonWarehouseNo + this
 						// .warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)