gjy 2 роки тому
батько
коміт
faf027d913

+ 3 - 3
config/index.js

@@ -3,14 +3,14 @@ const dev = {
 	// baseUrl: 'http://localhost:8080/',
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
-	baseUrlNew: 'http://192.168.110.9:9888/',
-	// baseUrlNew: 'http://192.168.110.138:8090/',
+	// baseUrlNew: 'http://192.168.110.9:9888/',
+	baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	baseUrlNew: 'https://api2.eliangeyun.com/',
+	// baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

+ 15 - 8
pages/erpbusiness/add_quality_testing.vue

@@ -1119,23 +1119,30 @@
 				console.log(this.gridList, 111111111111)
 			},
 			outtypepicker(e, status) {
+				console.log(e,status)
 				if (status == 0) {
 					this.gridList.outType = this.multiSelector[e[0]].name
 				} else {
-					if (this.multiSelector[e[0]].name == '他运') {
+					if (this.multiSelector1[e[0]].name == '他运') {
 						this.goodsdisabled = false
 						this.gridList.outType = this.multiSelector1[e[0]].name
 					} else {
 						this.gridList.outType = '自运'
 						this.goodsdisabled = true
-						this.outType = this.multiSelector[e[0]].name
+						this.outType = this.multiSelector1[e[0]].name
 						this.gridList.contractNo = this.multiSelector1[i].contractNo
-						for (let i = 0; i < this.contractNolist.length; i++) {
-							if (this.gridList.contractNo == this.contractNolist[i].contractNo) {
-								this.gridList.goodsName = this.outContractNo[q].goodsName
-								this.gridList.goodsNameKey = this.outContractNo[q].goodsNameKey
-							}
-						}
+						// if (this.gridList.contractNo == this.contractNolist[i].contractNo) {
+						// 	this.gridList.goodsName = this.outContractNo[q].goodsName
+						// 	this.gridList.goodsNameKey = this.outContractNo[q].goodsNameKey
+						// }
+						this.$api.doRequest('get', '/contractManagementInfo/getInContract', {
+							contractNo: this.gridList.contractNo,
+							compId: uni.getStorageSync('pcUserInfo').compId
+						}).then(res => {
+							this.contractNolist = res.data.data
+							this.gridList.goodsName = this.contractNolist.goodsName
+							this.gridList.goodsNameKey = this.contractNolist.goodsNameKey
+						})
 						this.waterContentChange()
 					}
 				}

+ 2 - 2
pages/erpbusiness/customer.vue

@@ -13,7 +13,7 @@
 				<!-- <text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text> -->
 			</view>
 		</view>
-		<view class="content">
+		<!-- <view class="content">
 			<view style='padding-left:20px;color:#AFB3BF;font-size:14px;' v-if='show==false'>近期客户</view>
 
 			<view v-for='item in gridList'>
@@ -27,7 +27,7 @@
 					{{item.customerName}}({{item.bankCard}})
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="content content1">
 			<view style='padding-left:20px;color:#AFB3BF;font-size:14px;' v-if='show==false'>登记客户</view>