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

pages/business/businessNew.vue

@@ -127,6 +127,8 @@
 				selectPlace: '',
 				mescroll: null,
 				isShowAlert: false,
+				showCancelButton:'true',
+				showCancelButton1:'false',
 				contentStyle: {
 					"font-weight": 700
 				},

pages/erp/receivingfeedback/details.vue

@@ -8,8 +8,9 @@
 			</view>
 			<view class='flex' style='margin-left:10px;align-items: center;'>
 				<view :class='status1=="0"?"active":""' class='statusitem' @click='statuschange1("0")'>全部</view>
-				<view :class='status1=="1"?"active":""' class='statusitem' @click='statuschange1("1")'>已反馈</view>
-				<view :class='status1=="2"?"active":""' class='statusitem' @click='statuschange1("2")'>未反馈</view>
+				<view :class='status1=="2"?"active":""' class='statusitem' @click='statuschange1("2")'>未装车</view>
+				<view :class='status1=="1"?"active":""' class='statusitem' @click='statuschange1("1")'>已装车</view>
+				<view :class='status1=="3"?"active":""' class='statusitem' @click='statuschange1("3")'>已送达</view>
 			</view>
 			<view class="content">
 				<view class="row">
@@ -475,14 +476,22 @@
 					}else{
 						var arr=this.detailData.carInfoList
 					}
-					this.freightspace=arr.filter((item)=>{return item.status=='已送达'})
+					this.freightspace=arr.filter((item)=>{return item.status=='已装车'})
 				}else if(status==2){
 					if(this.carNo==''){
 						var arr=this.detailData.tranCarInfoList
 					}else{
 						var arr=this.detailData.carInfoList
 					}
-					this.freightspace=arr.filter((item)=>{return item.status!='已送达'})
+					this.freightspace=arr.filter((item)=>{return item.status=='未装车'})
+				}
+				else if(status==3){
+					if(this.carNo==''){
+						var arr=this.detailData.tranCarInfoList
+					}else{
+						var arr=this.detailData.carInfoList
+					}
+					this.freightspace=arr.filter((item)=>{return item.status=='已送达'})
 				}
 				if(this.detailData.tranType=="汽运"){
 					for (var i = 0; i < this.freightspace.length; i++) {

pages/erpbusiness/quality_testing.vue

@@ -270,7 +270,7 @@
 			}
 			this.gridList = []
 			this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelfApp', {
-				compId: '',
+				compId: uni.getStorageSync('pcUserInfo').compId,
 				personCharge: this.userInfo.phone
 			}).then(res => {
 				if (res.data.data) {
@@ -376,7 +376,7 @@
 						statusType:this.statusType,
 						managementType: this.managementType,
 						warehouseName: this.warehouseName,
-						compId: '',
+						compId: uni.getStorageSync('pcUserInfo').compId,
 						// pcFlag:1
 					}).then(res => {
 						uni.hideLoading()

pages/user/user.vue

@@ -562,6 +562,7 @@
 						if (res.data.code == 200) {
 							console.log("userInfo", res.data.data)
 							uni.setStorageSync('userInfo', res.data.data)
+							uni.removeStorageSync("cangid")
 							this.$api.doRequest('post', '/commonUser/api/loginQuickly', {
 								mobilePhone: this.userInfo.phone,
 								companyName: this.companyList[e[0]].compName,