更新

config/index.js

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

pages/bill/index.vue

@@ -39,7 +39,7 @@
 				<view>{{item.netWeight}}</view>
 			</view>
 			<view class='flex justify-between align-item-center'>
-				<view style="color:#878C9C;padding:5px;">单价</view><view>{{item.tidalGrainPrice}}</view>
+				<view style="color:#878C9C;padding:5px;">单价</view><view>{{(item.tidalGrainPrice-item.unitDeduction).toFixed(2)}}</view>
 			</view>
 			<view class='flex justify-between align-item-center'>
 				<view style="color:#878C9C;padding:5px;">应付</view>

pages/erpbusiness/acquisitionInspection/acquisitionInspection.vue

@@ -81,9 +81,16 @@
 				dataList: [],
 				pageSize:10,
 				currentPage:1,
+				cangid:''
 			}
 		},
 		onShow() {
+			if(this.cangid){
+				uni.setStorageSync("cangid",this.cangid)
+			}
+			else{
+				this.cangid = uni.getStorageSync("cangid")
+			}
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
 					if (res.data.data == "INVALID") {
 						uni.showModal({
@@ -133,22 +140,31 @@
 		},
 		methods: {
 			loadData() {
+				var that = this
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf', {
 					compId: '',
 					personCharge:this.userInfo.phone
 				}).then(res => {
 					console.log("warehouseBaseInfo", res)
 					let _resData = res.data.data
-					this.warehouseList = []
+					that.warehouseList = []
 					for (let i = 0; i < _resData.length; i++) {
 						let _obj = {
 							"label": _resData[i].warehouseName,
 							"value": _resData[i].id,
 						}
-						this.warehouseList.push(_obj)
+						that.warehouseList.push(_obj)
+						if (that.cangid&&that.cangid == _resData[i].id) {
+						  that.warehouseName = _resData[i].warehouseName
+						  that.warehouseId =  _resData[i].id
+						} 
+					}
+					if(that.warehouseList.length > 0 && !that.cangid){
+						that.warehouseName = that.warehouseList[0].label
+						that.warehouseId =  that.warehouseList[0].value
+						that.cangid =  that.warehouseList[0].value
 					}
-					this.warehouseName = this.warehouseList[0].label
-					this.warehouseId = this.warehouseList[0].value
+					
 					this.getList(true)
 				})
 			},
@@ -183,6 +199,8 @@
 				console.log(e)
 				this.warehouseName = e[0].label
 				this.dataList.warehouseName = e[0].label;
+				this.cangid=e[0].value
+				uni.setStorageSync("cangid",this.cangid)
 				this.getList(true)
 			},
 			//毛重