前端查看添加增价

config/index.js

@@ -10,7 +10,7 @@ const dev = {
 	// 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
 }

pages/erpbusiness/edit_quality_testing.vue

@@ -582,13 +582,63 @@
 						that.value = false
 					}
 					that.gridList = data
-					if(that.gridList.dryGrainPrice){
-						that.dryGrainPrice=that.gridList.dryGrainPrice
-					}
-					if(that.gridList.tidalGrainPrice){
-						that.tidalGrainPrice=that.gridList.tidalGrainPrice
+					if(that.gridList.type=='干粮'){
+						if (this.gridList.goodsName &&
+							this.gridList.bulkDensity &&
+							this.cangid) {
+							this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {
+								warehouseId: this.cangid,
+								goodsName: this.gridList.goodsName,
+								bulkDensity:this.gridList.bulkDensity
+							}).then(res => {
+								if(res.data.data != 0){
+									this.gridList.dryGrainPrice = res.data.data
+									this.dryGrainPrice = res.data.data
+									this.deductionchange()
+								}
+							})
+						}
+					}else if(that.gridList.type=='潮粮'){
+						if (
+							this.gridList.goodsName &&
+							this.gridList.waterContent &&
+							this.gridList.grade 
+						) {
+						console.log('123123')
+							this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {
+								warehouseId: this.cangid,
+								goodsName: this.gridList.goodsName,
+								waterContent: this.gridList.waterContent,
+								grade: this.gridList.grade,
+							}).then(res => {
+								
+								if (that.gridList.paramType == '1') {
+									// console.log(that.gridList)
+									if(that.gridList.buckleMiscellaneous){
+										that.gridList.tidalGrainPrice = parseFloat(parseFloat(res.data.data) - parseFloat(that
+										.gridList.buckleMiscellaneous) / 100 * parseFloat(that.gridList
+										.dryGrainPrice)).toFixed(4)
+										that.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
+									that.tidalGrainPrice = res.data.data
+								}
+								this.deductionchange()
+							})
+						}
 					}
-					
+					// if(that.gridList.dryGrainPrice){
+					// 	that.dryGrainPrice=that.gridList.dryGrainPrice
+					// }
+					// if(that.gridList.tidalGrainPrice){
+					// 	that.tidalGrainPrice=that.gridList.tidalGrainPrice
+					// }
 					if(!that.gridList.reGrade){
 						that.gridList.reGrade=that.gridList.grade
 					}

pages/erpbusiness/examine_quality_testing.vue

@@ -119,18 +119,7 @@
 				</view>
 			</view>
 			
-			<view v-if="gridList.type == '潮粮'" class="c-row">
-				<view class="title">净重单价（元/公斤）</view>
-				<view class="con-list">
-					{{gridList.tidalGrainPrice}}
-				</view>
-			</view>
-			<view v-if="gridList.type == '干粮'" class="c-row">
-				<view class="title">干粮单价（元/公斤）</view>
-				<view class="con-list">
-					{{gridList.dryGrainPrice}}
-				</view>
-			</view>
+			
 			<view class="c-row ">
 				<view class="title">运输方式</view>
 				<view class="con-list">
@@ -233,6 +222,43 @@
 						<view>{{gridList.reJiaorenli}}</view>
 					</view>
 				</view>
+				<view class="c-row">
+					<view class="title">水分增价（元/吨）</view>
+					<view class="con-list">
+						{{gridList.waterPriceIncrease}}
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">水分扣价（元/吨）</view>
+					<view class="con-list">
+						{{gridList.waterPriceDeduction}}
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">质量增价（元/吨）</view>
+					<view class="con-list">
+						{{gridList.qualityPriceIncrease}}
+					</view>
+				</view>
+				
+				<view class="c-row">
+					<view class="title">质量扣价（元/吨）</view>
+					<view class="con-list">
+						{{gridList.qualityPriceDeduction}}
+					</view>
+				</view>
+				<view v-if="gridList.type == '潮粮'" class="c-row">
+					<view class="title">净重单价（元/公斤）</view>
+					<view class="con-list">
+						{{gridList.tidalGrainPrice}}
+					</view>
+				</view>
+				<view v-if="gridList.type == '干粮'" class="c-row">
+					<view class="title">干粮单价（元/公斤）</view>
+					<view class="con-list">
+						{{gridList.dryGrainPrice}}
+					</view>
+				</view>
 			</view>
 		</view>
 

pages/user/user.vue

@@ -246,7 +246,7 @@
 						src: '../../static/img/myimg/erp.png',
 						tips: 0,
 						url: `/pages/erp/index`,
-						show: true
+						show: uni.getStorageSync('pcUserInfo')?true:false
 					},
 					{
 						num: 1,
@@ -256,7 +256,7 @@
 						src: '../../static/img/myimg/sg.png',
 						tips: 0,
 						url: `/pages/erpbusiness/index`,
-						show: true
+						show: uni.getStorageSync('pcUserInfo')?true:false
 					},
 					{
 						num: 2,
@@ -274,7 +274,7 @@
 						src: '../../static/img/sign/myTask@2x.png',
 						tips: 0,
 						url: '/pages/task/my_task',
-						show: true
+						show: uni.getStorageSync('pcUserInfo')?true:false
 					},
 					{
 						num: 4,
@@ -310,7 +310,7 @@
 						src: '../../static/img/sign/kudianjiankong@2x.png',
 						tips: 0,
 						url: `/pages/user/depotMonitoring`,
-						show: true
+						show: uni.getStorageSync('pcUserInfo')?true:false
 					},
 					{
 						num: 8,
@@ -319,7 +319,7 @@
 						src: '../../static/img/oa_office/oaOffice.png',
 						tips: 0,
 						url: `/pages/oa_office/the_oaOffice`,
-						show: true
+						show: uni.getStorageSync('pcUserInfo')?true:false
 					},
 					// {
 					// 	num: 9,