更新

config/index.js

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

pages/erpbusiness/acquisitionInspection/acquisitionInspection.vue

@@ -164,12 +164,14 @@
 						that.warehouseId =  that.warehouseList[0].value
 						that.cangid =  that.warehouseList[0].value
 					}
-					
 					this.getList(true)
 				})
 			},
 			//获取列表
 			getList(flag) {
+				uni.showLoading({
+					title:"正在加载"
+				})
 				this.$api.doRequest('get', '/weighingManagement/selectWeighingManagement', {
 					compId: '',
 					currentPage: this.currentPage,
@@ -190,6 +192,16 @@
 					}
 					console.log("--------------------------------")
 					console.log("this.dataList",this.dataList)
+					
+					uni.hideLoading()
+				})
+				.catch(res => {
+					uni.showToast({
+						title: '系统异常，请联系管理员',
+						icon: 'none',
+						duration: 2000
+					})
+					uni.hideLoading()
 				})
 			},
 			selectWarehouse() {

pages/erpbusiness/acquisitionInspection/add_check_the_weight.vue

@@ -43,7 +43,7 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">皮重（公斤）</view>
-				<input class="right-bottom" placeholder="输入皮重"></input>
+				<input class="right-bottom" v-model="detailData.tare" placeholder="输入皮重"></input>
 			</view>
 		</div>
 		<!-- <u-select v-model="isShowContractNo" :list="contractNoList" @confirm="confirmContractNo"></u-select> -->

pages/erpbusiness/acquisitionInspection/tareDetail.vue

@@ -40,9 +40,9 @@
 				<view class="left">皮重（公斤）</view>
 				<input class="right-bottom" placeholder="输入皮重" @input="changeInput" v-model="detailData.tare"></input>
 			</view>
-			<view class="row row-bottom">
-				<view class="left">扣杂（公斤）</view>
-				<input class="right-bottom" placeholder="输入扣杂" @input="changeInput" v-model="detailData.buckleMiscellaneous"></input>
+			<view v-if="detailData.qualityInspectionManagement.paramType == '2'" class="row row-bottom">
+				<view class="left">扣重（公斤）</view>
+				<input class="right-bottom" placeholder="输入扣重" @input="changeInput" v-model="detailData.buckleMiscellaneous"></input>
 			</view>
 			<view class="row row-bottom" style="border: 0;">
 				<view class="left">净重（公斤）</view>

pages/erpbusiness/add_quality_testing.vue

@@ -325,6 +325,15 @@
 		methods: {
 			waterContentChange() {
 				var that = this
+				if(this.gridList.goodsName && this.cangid){
+					this.$api.doRequest('get', '/purchasePrice/dryGrainPrice',{
+						warehouseId:this.cangid,
+						goodsName:this.gridList.goodsName
+					}).then(res => {
+						that.gridList.dryGrainPrice = res.data.data
+					})
+				}
+				
 				if (this.gridList.goodsName) {
 				  for (var i = 0; i < this.purchasePriceList.length; i++) {
 					if (this.purchasePriceList[i].goodsName == this.gridList.goodsName) {
@@ -350,6 +359,9 @@
 					}).then(res => {
 						if(that.gridList.paramType == '1'){
 							that.gridList.tidalGrainPrice = parseFloat(parseFloat(res.data.data) - parseFloat(that.gridList.buckleMiscellaneous)/100*parseFloat(that.gridList.dryGrainPrice)).toFixed(4)
+							if(!that.gridList.tidalGrainPrice){
+								that.gridList.tidalGrainPrice = ''
+							}
 						}else{
 							that.gridList.tidalGrainPrice = res.data.data
 						}

pages/erpbusiness/customer.vue

@@ -161,7 +161,6 @@
 				
 				var that = this
 				var count=''
-				
 				if(item.authenticationStatus=='已认证'){
 					uni.showLoading({title: '加载中'})
 					that.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{
@@ -217,27 +216,27 @@
 				var count=''
 				var that = this
 				var name=item.searchContent.split('(')[0]
-				
 				for(var i=0;i<this.customerList.length;i++){
 					// console.log(name,this.customerList[i].customerName,name==this.customerList[i].customerName)
 					if(this.customerList[i].customerName==name){
+						var tmpName = this.customerList[i].customerName
 						uni.showLoading({title: '加载中'})
 						that.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{
 							commonId:that.userInfo.id,
 							searchContent:this.customerList[i].customerName+'('+this.customerList[i].customerPhone+')',
 							functionType:3
 						}).then(res => {
-							uni.setStorageSync('checkcustomer',this.customerList[i])
+							uni.setStorageSync('checkcustomer',tmpName)
 							that.$api.doRequest('get', '/qualityInspectionManagement/api/settledCount',{
 								compId:'',
-								customerName: that.customerList[i].customerName,
+								customerName: tmpName,
 								goodsName: uni.getStorageSync('goodsName'),
 							}).then(res => {
 								if(res.data.code==200){
 									count=res.data.data
 									that.$api.doRequest('get', '/paymentManagement/cumulant',{
 										compId:'',
-										customerName: that.customerList[i].customerName,
+										customerName: tmpName,
 										goodsName: uni.getStorageSync('goodsName'),
 									}).then(res => {
 										for (let i = 0; i < that.purchasePriceList.length; i++) {
@@ -251,9 +250,9 @@
 									})
 								}
 							})
-							that.show=false
-							uni.navigateBack()							
-							uni.hideLoading()
+							that.show=false					
+							uni.hideLoading()								
+							uni.navigateBack()
 						})
 						.catch(res => {
 							uni.showToast({

pages/erpbusiness/edit_quality_testing.vue

@@ -27,13 +27,20 @@
 						 name="input"></input>
 				</view>
 			</view>
-			<view class="c-row ">
+			<view v-if="gridList.paramType != '1'" class="c-row ">
 				<view class="title">扣重比</view>
 				<view class="con-list">
 					<input v-model='gridList.buckleWeightRatio' placeholder="请输入扣重比"
 						 name="input"></input>
 				</view>
 			</view>
+			<view v-else class="c-row ">
+				<view class="title">扣杂</view>
+				<view class="con-list">
+					<input v-model='gridList.buckleMiscellaneous' placeholder="请输入扣杂" @input="waterContentChange"
+						 name="input"></input>
+				</view>
+			</view>
 			<view class="c-row ">
 				<view class="title">购粮性质</view>
 				<view class="con-list">
@@ -253,6 +260,23 @@
 		methods: {
 			waterContentChange() {
 				var that = this
+				if(this.gridList.goodsName && this.cangid){
+					this.$api.doRequest('get', '/purchasePrice/dryGrainPrice',{
+						warehouseId:this.cangid,
+						goodsName:this.gridList.goodsName
+					}).then(res => {
+						that.gridList.dryGrainPrice = res.data.data
+					})
+				}
+				
+				if (this.gridList.goodsName) {
+				  for (var i = 0; i < this.purchasePriceList.length; i++) {
+					if (this.purchasePriceList[i].goodsName == this.gridList.goodsName) {
+					  this.gridList.buckleWeightRatio = this.purchasePriceList[i].deductWeight
+					  this.gridList.paramType = this.purchasePriceList[i].paramType
+					}
+				  }
+				}
 				var numReg = /^[0-9]*$/
 				var numRe = new RegExp(numReg)
 				//潮粮单价改变事件
@@ -268,7 +292,14 @@
 						waterContent: this.gridList.waterContent,
 						grade: this.gridList.grade,
 					}).then(res => {
-						that.gridList.tidalGrainPrice = res.data.data
+						if(that.gridList.paramType == '1'){
+							that.gridList.tidalGrainPrice = parseFloat(parseFloat(res.data.data) - parseFloat(that.gridList.buckleMiscellaneous)/100*parseFloat(that.gridList.dryGrainPrice)).toFixed(4)
+							if(!that.gridList.tidalGrainPrice){
+								that.gridList.tidalGrainPrice = ''
+							}
+						}else{
+							that.gridList.tidalGrainPrice = res.data.data
+						}
 					})
 				}
 			},

pages/erpbusiness/quality_testing.vue

@@ -262,6 +262,9 @@
 			},
 			getList(flag){
 				var that = this
+				uni.showLoading({
+					title:"正在加载"
+				})
 				this.$api.doRequest('get', 'qualityInspectionManagement/selectQualityInspection',{
 					pageSize: this.pageSize,
 					currentPage: this.currentPage,
@@ -272,6 +275,7 @@
 					compId:'',
 					// pcFlag:1
 				}).then(res => {
+					uni.hideLoading()
 					if(res.data.data){
 						let data = res.data.data.records
 						//采购信息
@@ -291,6 +295,14 @@
 					}
 					// console.log(that.gridList)
 				})
+				.catch(res => {
+					uni.showToast({
+						title: '系统异常，请联系管理员',
+						icon: 'none',
+						duration: 2000
+					})
+					uni.hideLoading()
+				})
 			},
 			edit(item){
 				uni.navigateTo({