前端

config/index.js

@@ -4,7 +4,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.110.9:8099/',
 	// baseUrlNew: 'http://192.168.110.9:9888/',
-	// baseUrlNew: 'http://192.168.110.138:8090/',
+	baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.67:9888/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
@@ -16,7 +16,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// 上传图片的
-	baseUrlNew: 'https://api2.eliangeyun.com/',
+	// baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/erpbusiness/add_quality_testing.vue

@@ -632,6 +632,7 @@
 				isShowPrint: false,
 				isShowAlert: false,
 				disabled1: false,
+				buyer:'',
 				content: '确认初检信息后，初检员不需要再次确认质检信息，是否确定提交?',
 				inputShow: false,
 				params: {
@@ -1518,6 +1519,7 @@
 					compId: uni.getStorageSync('pcUserInfo').compId
 				}).then(res => {
 					this.contractNolist = res.data.data
+					this.buyer=res.data.data.buyer
 					this.gridList.pointOut =this.contractNolist.pointOut
 					if (this.typevalue == 3) {
 						var gooddata = this.goodsList.filter((item) => {
@@ -1851,7 +1853,7 @@
 			gocustomer() {
 				uni.navigateTo({
 					url: '/pages/erpbusiness/customer?cangid=' + this.cangid + '&warehouseName=' + this.gridList
-						.warehouseName + '&goodsName=' + this.gridList.goodsName
+						.warehouseName + '&goodsName=' + this.gridList.goodsName+'&buyer='+this.buyer
 				})
 			},
 			getdate() {

pages/erpbusiness/customer.vue

@@ -116,6 +116,7 @@
 			}
 		},
 		onLoad(options) {
+			this.buyer=options.buyer
 			this.cangid = options.cangid
 			this.warehouseName = options.warehouseName
 			this.goodsName = options.goodsName
@@ -390,12 +391,24 @@
 				var url = ''
 				var data = {}
 				if (this.searchKeyWord.length > 0) {
-					url = '/identityAuthenticationInfo/identityAuthenticationInfoCustomer'
-					data = {
-						warehouseId: that.cangid,
-						goodsName: that.goodsName,
-						searchKeyWord: this.searchKeyWord
+					if(uni.getStorageSync('compName1').company=='黑龙江中天昊元贸易有限公司'){
+						url = '/identityAuthenticationInfo/identityAuthenticationInfoCustomerNew'
+						data = {
+							warehouseId: that.cangid,
+							goodsName: that.goodsName,
+							searchKeyWord: this.searchKeyWord,
+							buyer:this.buyer
+						}
+					}else{
+						url = '/identityAuthenticationInfo/identityAuthenticationInfoCustomer'
+						data = {
+							warehouseId: that.cangid,
+							goodsName: that.goodsName,
+							searchKeyWord: this.searchKeyWord
+						}
 					}
+					
+					
 				} else {
 					
 						url = '/searchRecordsInfo/selectSearchRecordsInfo'