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

pages/erpbusiness/add_quality_testing.vue

@@ -834,10 +834,8 @@
 				}
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
 					flag: this.contractFlag,
-
 				}).then(res => {
 					if (res.data.data) {
-						console.log(res.data.data)
 						this.contractNolist = res.data.data
 					}
 				})
@@ -1047,14 +1045,15 @@
 						} else {
 							this.carstatus = false
 						}
+						this.tranCarInfoList = []
 						if (this.contractNolist[i].tranCarInfoList) {
 							for (var q = 0; q < this.contractNolist[i].tranCarInfoList.length; q++) {
-								if(this.contractNolist[i].tranCarInfoList.tranCarNo){
-									this.contractNolist[i].tranCarInfoList[q].carNo1=this.contractNolist[i].tranCarInfoList.carNo+'（'+this.contractNolist[i].tranCarInfoList.tranCarNo+'）'
+								this.contractNolist[i].tranCarInfoList[q].carNo1 = this.contractNolist[i].tranCarInfoList[q].carNo
+								if(this.contractNolist[i].tranCarInfoList[q].tranCarNo){
+									this.contractNolist[i].tranCarInfoList[q].carNo1=this.contractNolist[i].tranCarInfoList[q].carNo+'（'+this.contractNolist[i].tranCarInfoList[q].tranCarNo+'）'
 								}else{
-									this.contractNolist[i].tranCarInfoList[q].carNo1=this.contractNolist[i].tranCarInfoList.carNo
+									this.contractNolist[i].tranCarInfoList[q].carNo1=this.contractNolist[i].tranCarInfoList.carNo	
 								}
-								
 							}
 							this.tranCarInfoList = this.contractNolist[i].tranCarInfoList
 							// this.carstatus = true

pages/leave/the_leave.vue

@@ -38,8 +38,8 @@
 				</view>
 				<view style='position:relative;' class="wrap no-boder">
 					<u-input class='textarea' v-model="detailData.reasonForLeave" :type="type" :border="border"
-						:height="height" :auto-height="autoHeight" />
-					<view style='position:absolute;right:10px;bottom:20px;color:#AFB3BF;'>
+						:height="height" :auto-height="autoHeight" maxlength="100"/>
+					<view style='position:absolute;right:10px;bottom:20px;color:#AFB3BF;' >
 						{{detailData.reasonForLeave.length}}/100个字
 					</view>
 				</view>
@@ -261,7 +261,7 @@
 				// this.endDate1 = e.year + "-" + e.month + "-" + e.day + "-" + e.hour + "-" + e.minute + "-" + e.second
 			},
 			submit() {
-				if (!this.detailData.leaveType) {
+				if (!this.detailData.leaveType || this.detailData.leaveType == '选择请假类型') {
 					this.$api.msg('请假类型不能为空')
 					return
 				}
@@ -269,7 +269,7 @@
 					this.$api.msg('请选择请假开始时间')
 					return
 				}
-				if (!this.detailData.endDate) {
+				if (!this.detailData.endDate || this.detailData.endDate == '选择结束时间') {
 					this.$api.msg('请选择请假结束时间')
 					return
 				}

pages/leave/the_leave_record.vue

@@ -4,7 +4,7 @@
 		<view class='wrap' v-for="(item, index) in tableData" :key="index">
 			<view class="wenzi audit1" v-if="item.approveStatus == '待人事审核' || item.approveStatus == '待主管审核' ">审核中</view>
 			<view class="wenzi audit2" v-if="item.status == '已通过'">已通过</view>
-			<view class="wenzi audit3" v-if="item.status == '未通过'">未通过</view>
+			<view class="wenzi audit3" v-if="item.status == '已驳回'">未通过</view>
 			<view class="c-row">
 				<view class="title">请假类型 : {{item.leaveType}}</view>
 			</view>