|
|
@@ -1,5 +1,5 @@
|
|
|
<template>
|
|
|
- <view :style='{"margin-bottom":InputEvent!=""?"100px":0}' ref="all-input">
|
|
|
+ <view :style='{"margin-bottom":InputEvent!=""?"200px":0}' ref="all-input">
|
|
|
<view @click='hidden' class='wrap'>
|
|
|
<view class='title_b'>基本信息</view>
|
|
|
<view class="c-row ">
|
|
|
@@ -256,7 +256,7 @@
|
|
|
</view>
|
|
|
|
|
|
</view>
|
|
|
- <view v-if='flag!=3' style='padding-bottom:300rpx;'>
|
|
|
+ <view v-if='flag!=3' style='padding-bottom:500rpx;'>
|
|
|
<view class='wrap'>
|
|
|
<view style='margin-right:10px;' class='flex justify-between align-item-center'>
|
|
|
<view class='title_b'>化验信息</view>
|
|
|
@@ -434,14 +434,14 @@
|
|
|
<input :disabled='flag==1&&pricedisabled' v-model='gridList.tidalGrainPrice' @blur='inputprice' placeholder="自动获取,不可编辑"
|
|
|
name="input"></input>
|
|
|
</view>
|
|
|
- <button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
|
|
|
+ <!-- <button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button> -->
|
|
|
</view>
|
|
|
<view v-if="gridList.type == '干粮'&&gridList.serviceManagementType==3&&flag!=3" class="c-row">
|
|
|
<view class="title">干粮单价（元/公斤）</view>
|
|
|
<view class="con-list">
|
|
|
<input v-model='gridList.dryGrainPrice' :disabled='pricedisabled' type="digit" @blur='inputprice' placeholder="请输入干粮单价" name="input"></input>
|
|
|
</view>
|
|
|
- <button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
|
|
|
+ <!-- <button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button> -->
|
|
|
</view>
|
|
|
<view v-if="gridList.type == '干粮'&&gridList.serviceManagementType==1&&flag!=3" class="c-row">
|
|
|
<view class="title">干粮单价（元/公斤）</view>
|
|
|
@@ -641,9 +641,14 @@
|
|
|
|
|
|
console.log(this.flag)
|
|
|
var that = this
|
|
|
+
|
|
|
+ uni.showLoading({
|
|
|
+ title:"加载中"
|
|
|
+ })
|
|
|
this.$api.doRequest('get', '/qualityInspectionManagement/api/getQualityInspection', {
|
|
|
id: this.id
|
|
|
}).then(res => {
|
|
|
+ uni.hideLoading()
|
|
|
if (res.data.data) {
|
|
|
let data = res.data.data
|
|
|
if (data.supplementaryRecording == 1) {
|
|
|
@@ -1115,7 +1120,7 @@
|
|
|
}
|
|
|
}
|
|
|
console.log(this.gridList.serviceManagementType)
|
|
|
- debugger
|
|
|
+ // debugger
|
|
|
if(this.gridList.serviceManagementType != 3){ //非收购入库 不需在获取价格
|
|
|
return
|
|
|
}
|
|
|
@@ -1142,6 +1147,10 @@
|
|
|
this.gridList.grade
|
|
|
) {
|
|
|
console.log('123123')
|
|
|
+
|
|
|
+ uni.showLoading({
|
|
|
+ title:"加载中"
|
|
|
+ })
|
|
|
this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {
|
|
|
warehouseId: this.cangid,
|
|
|
goodsName: this.gridList.goodsName,
|
|
|
@@ -1177,6 +1186,7 @@
|
|
|
}
|
|
|
}
|
|
|
// that.tidalGrainPrice = that.gridList.tidalGrainPrice
|
|
|
+ uni.hideLoading()
|
|
|
})
|
|
|
}
|
|
|
|
|
|
@@ -1188,6 +1198,7 @@
|
|
|
this.$delete(this.gridList,'status')
|
|
|
this.gridList.agent=this.userInfo.userName;
|
|
|
|
|
|
+ this.gridList.waterContent = Number(this.gridList.waterContent)
|
|
|
// if(!this.$u.test.isEmpty(this.gridList.tidalGrainPrice)){
|
|
|
// this.gridList.tidalGrainPrice=''
|
|
|
// return
|
|
|
@@ -1308,6 +1319,9 @@
|
|
|
this.$api.msg('杂质不能为空')
|
|
|
return
|
|
|
}
|
|
|
+ debugger
|
|
|
+ console.log(this.gridList.waterContent)
|
|
|
+ console.log(Number(this.gridList.waterContent))
|
|
|
if (!this.gridList.waterContent) {
|
|
|
this.$api.msg('初检水分不能为空')
|
|
|
return
|
