Merge branch 'dev' of http://47.101.143.145:8090/77975466/pco into dev

# Conflicts:
#	sp-server/app.pid

app/pages/business-order/report.vue

@@ -80,16 +80,48 @@
 		},
 		methods: {
 			outSelect(e) {
-				this.handlerUpload(e, 'outReport')
+				let that = this;
+				uni.uploadFile({
+					url: that.uploadImageUrl,
+					filePath: e.tempFilePaths[0],
+					name: 'file',
+					success: (resp => {
+						that.form.outReport= JSON.parse(resp.data).data;
+					})
+				})
 			},
 			checkSelect(e) {
-				this.handlerUpload(e, 'checkReport')
+				let that = this;
+				uni.uploadFile({
+					url: that.uploadImageUrl,
+					filePath: e.tempFilePaths[0],
+					name: 'file',
+					success: (resp => {
+						that.form.checkReport= JSON.parse(resp.data).data;
+					})
+				})
 			},
 			disinfectSelect(e) {
-				this.handlerUpload(e, 'disinfectReport')
+				let that = this;
+				uni.uploadFile({
+					url: that.uploadImageUrl,
+					filePath: e.tempFilePaths[0],
+					name: 'file',
+					success: (resp => {
+						that.form.disinfectReport= JSON.parse(resp.data).data;
+					})
+				})
 			},
 			nucleicSelect(e) {
-				this.handlerUpload(e, 'nucleicReport')
+				let that = this;
+				uni.uploadFile({
+					url: that.uploadImageUrl,
+					filePath: e.tempFilePaths[0],
+					name: 'file',
+					success: (resp => {
+						that.form.nucleicReport= JSON.parse(resp.data).data;
+					})
+				})
 			},
 			handlerUpload(e, target) {
 				let that = this;

app/pages/declare/add.vue

@@ -389,7 +389,7 @@
 				}
 				let noArray = chinaCarNo.replace("，", ",").split(",");
 				for (let i in noArray) {
-					let carNo=noArray[i].toUpperCase();
+					noArray[i]=noArray[i].toUpperCase();
 					if (!this.$common.isCarNo(noArray[i])) {
 						this.$common.toast('运输车头牌不正确');
 						return;
@@ -402,6 +402,7 @@
 				}
 				let suffArray = chinaCarNoSuff.replace("，", ",").split(",");
 				for (let i in suffArray) {
+					noArray[i]=noArray[i].toUpperCase();
 					if (!this.$common.isCarNo(suffArray[i])) {
 						this.$common.toast('运输车尾牌不正确');
 						return;

sp-admin/sa-view/car/tb-business-car-list.html

@@ -48,9 +48,9 @@
 					<sa-td name="离场时间" prop="realOutTime" width=180></sa-td>
 					<el-table-column label="操作" fixed="right" width="200px">
 						<template slot-scope="s">
-							<el-button v-if="sa.isAuth('tb-business-car-change')" class="c-btn" type="primary"  v-if="s.row.realInTime==null" @click="inFn(s.row)">确认入场
+							<el-button v-if="sa.isAuth('tb-business-car-change')&&s.row.realInTime==null" class="c-btn" type="primary"  @click="inFn(s.row)">确认入场
 							</el-button>
-							<el-button v-if="sa.isAuth('tb-business-car-change')" class="c-btn" type="primary"  v-if="s.row.realInTime!=null&&s.row.realOutTime==null" @click="outFn(s.row)">确认离场
+							<el-button v-if="sa.isAuth('tb-business-car-change')&&s.row.realInTime!=null&&s.row.realOutTime==null" class="c-btn" type="primary"  @click="outFn(s.row)">确认离场
 							</el-button>
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看
 							</el-button>

sp-admin/sa-view/tb-business/tb-business-add.html

@@ -565,6 +565,13 @@
 					goodsChange(value) {
 						let goods = this.goodsList.filter(obj => obj.name === value).pop();
 						let noNeedIds = goods.noNeedIds.split(',');
+						let list = this.itemTypeList;
+						for (let i in list) {
+							let item=list[i];
+							if(noNeedIds.indexOf(item.id)!==-1){
+								item.itemId=''
+							}
+						}
 						this.needTypeId = goods.needIds.split(',');
 						this.filterTypeList = this.itemTypeList.filter(type => noNeedIds.indexOf(type.id) === -1);
 					},
@@ -681,7 +688,7 @@
 							pageNo: 1,
 							pageSize: 100,
 							judgeStatus: 2,
-							type:0
+							type: 0
 						}, function(resp) {
 							this.customerList = resp.data;
 							if (resp.data.length > 0) {
@@ -734,8 +741,6 @@
 								}
 							}
 						}
-						console.log(chechItem)
-						console.log(this.m)
 						if (!chechItem && this.m.goodsName == '干杂货') {
 							sa.error('请选择特殊车辆或干杂货人工装卸之一')
 							return;

sp-admin/sa-view/tb-business/tb-business-edit.html

@@ -440,6 +440,13 @@
 					goodsChange(value) {
 						let goods = this.goodsList.filter(obj => obj.name === value).pop();
 						let noNeedIds = goods.noNeedIds.split(',');
+						let list = this.itemTypeList;
+						for (let i in list) {
+							let item=list[i];
+							if(noNeedIds.indexOf(item.id)!==-1){
+								item.itemId=''
+							}
+						}
 						this.needTypeId = goods.needIds.split(',');
 						this.filterTypeList = this.itemTypeList.filter(type => noNeedIds.indexOf(type.id) === -1);
 					},

sp-server/app.pid

@@ -1 +0,0 @@
-40532