ccj пре 2 година
родитељ
комит
29b093e936

+ 2 - 2
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
 }

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "2.1.194",
-    "versionCode" : 21194,
+    "versionName" : "2.1.196",
+    "versionCode" : 21196,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

+ 1 - 1
pages/erpbusiness/add_quality_testing.vue

@@ -949,7 +949,7 @@
 		onLoad(options) {
 			that = this
 			var date = new Date()
-			console.log(this.cangid)
+			console.log('options',options)
 			this.commonWarehouseNo = options.commonWarehouseNo
 			this.gridList.warehouseName = options.warehouseName
 			this.cangid = options.cangid

+ 2 - 2
pages/erpbusiness/quality_testing.vue

@@ -280,7 +280,7 @@
 						if (that.cangid && that.cangid == list[i].id) {
 							that.warehouse = list[i]
 							that.warehouseName = list[i].warehouseName
-							// that.commonWarehouseNo = list[i].commonWarehouseNo
+							that.commonWarehouseNo = list[i].commonWarehouseNo
 							// uni.setStorageSync('purchasePriceList',list[i].purchasePriceList)
 							break
 						}
@@ -291,7 +291,7 @@
 						that.warehouseName = that.selector[0].warehouseName
 						// that.warehouseCount = that.selector[0].count
 						// that.warehouseTradeCount = that.selector[0].tradeCount
-						// that.commonWarehouseNo = that.selector[0].commonWarehouseNo
+						that.commonWarehouseNo = that.selector[0].commonWarehouseNo
 						that.cangid = that.selector[0].id
 						uni.setStorageSync("cangid", that.cangid)
 						// uni.setStorageSync('purchasePriceList',that.selector[0].purchasePriceList)