gjy 3 سال پیش
والد
کامیت
708624440f

+ 2 - 2
config/index.js

@@ -1,9 +1,9 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	// baseUrlNew: 'http://192.168.1.122:8090/',
+	baseUrlNew: 'http://192.168.1.120:8090/',
 	// baseUrlNew: 'http://192.168.1.103:9100/',
 	// baseUrlNew: 'https://apitest.eliangeyun.com/',
-	baseUrlNew: 'http://api1.eliangeyun.com/',
+	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

+ 8 - 1
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

+ 8 - 1
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