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

pages/bill/index.vue

@@ -229,7 +229,7 @@
 						searchKeyWord: this.searchKeyWord,
 						searchType: this.searchType,
 						managementType:1,
-						// customerPhone:this.userInfo.phone,
+						customerPhone:this.userInfo.phone,
 						// pcFlag:1
 						// warehouseName:'',
 					}).then(res => {

pages/erpbusiness/acquisitionInspection/acquisitionInspection.vue

@@ -65,6 +65,9 @@
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	export default {
 		data() {
 			return {
@@ -112,6 +115,9 @@
 					}
 				});
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
 		onPullDownRefresh() {
 			this.currentPage=1
 			this.gridList=[]
@@ -128,7 +134,8 @@
 		methods: {
 			loadData() {
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf', {
-					compId: ''
+					compId: '',
+					personCharge:this.userInfo.phone
 				}).then(res => {
 					console.log("warehouseBaseInfo", res)
 					let _resData = res.data.data

pages/erpbusiness/acquisitionInspection/warehouseWeighing.vue

@@ -69,6 +69,9 @@
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	import helper from '@/common/helper.js'; 
 	export default {
 		data() {
@@ -85,6 +88,9 @@
 				cangId:''
 			}
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
 		onShow() {
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
 					if (res.data.data == "INVALID") {
@@ -135,7 +141,8 @@
 			},
 			loadData() {
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf', {
-					compId: ''
+					compId: '',
+					personCharge:this.userInfo.phone
 				}).then(res => {
 					console.log("warehouseBaseInfo", res)
 					let _resData = res.data.data

pages/grain_pulse/enter.vue

@@ -269,9 +269,16 @@
 				this.deptList.licenseAddress = res
 			},
 			singleClick(item) {
-				if (this.mainBusinessType.indexOf(item) == -1) {
+				if (this.mainBusinessType.indexOf(item.name) == -1) {
 					this.mainBusinessType.push(item.name)
 					item.checked = true
+				}else{
+					for (var i = 0; i < this.mainBusinessType.length; i++) {
+						if(this.mainBusinessType[i]==item.name){
+							this.mainBusinessType.splice(i,1)
+						}
+					}
+					item.checked = false
 				}
 			},
 			filterFileType(index, lists) {
@@ -574,10 +581,10 @@
 	}
 	.companyProfilewrap{
 		position:relative;
-		width:100%;
+		width:90%;
 	}
 	.companyProfile{
-		width:90%;height:138px;
+		width:100%;height:138px;
 		background:#F9F9FA;
 		font-size:13px;
 		padding:13px;
@@ -586,7 +593,7 @@
 	.companyProfilecontent{
 		position:absolute;
 		bottom:10px;
-		right:15px;
+		right:0px;
 		font-size:13px;
 	}
 </style>