|
|
@@ -315,9 +315,8 @@
|
|
|
name="input" type="digit"></input> -->
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="c-row ">
|
|
|
- <view v-show='gridList.goodsName!="大豆"' class="title">容重（克/升）</view>
|
|
|
- <view v-show='gridList.goodsName=="大豆"' class="title">蛋白</view>
|
|
|
+ <view class="c-row" v-if="gridList.goodsName!='大豆'">
|
|
|
+ <view class="title">容重（克/升）</view>
|
|
|
<view class="con-list">
|
|
|
<MyNumberInput :myvalue="gridList.bulkDensity" :Isedit="Isedit" :IsShow="MykeywordShow"
|
|
|
:myevent="'bulkDensity'" @setValue="mykeywordset" v-if="InputEvent=='bulkDensity'"
|
|
|
@@ -327,7 +326,18 @@
|
|
|
<!-- <input v-model='gridList.bulkDensity' placeholder="请输入容重" name="input" type="digit" @input="obtainPrice"></input> -->
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="c-row ">
|
|
|
+ <view class="c-row" v-else>
|
|
|
+ <view class="title">蛋白</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <MyNumberInput :myvalue="gridList.protein" :Isedit="Isedit" :IsShow="MykeywordShow"
|
|
|
+ :myevent="'protein'" @setValue="mykeywordset" v-if="InputEvent=='protein'"
|
|
|
+ @Cancelword="Cancelword" @goNext="goNext('protein')"></MyNumberInput>
|
|
|
+ <input v-else v-model='gridList.protein' placeholder="请输入蛋白"
|
|
|
+ @click="SetInputKey('protein')" name="input" type="digit" @input="obtainPrice"></input>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="c-row " v-if="gridList.goodsName != '大豆'">
|
|
|
<view class="title">不完善粒（%）</view>
|
|
|
<view class="con-list">
|
|
|
<MyNumberInput :myvalue="gridList.imperfectGrain" :Isedit="Isedit" :IsShow="MykeywordShow"
|
|
|
@@ -337,6 +347,16 @@
|
|
|
placeholder="请输入不完整粒占比" name="input" type="digit"></input>
|
|
|
</view>
|
|
|
</view>
|
|
|
+ <view class="c-row" v-else>
|
|
|
+ <view class="title">完整粒率（%）</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <MyNumberInput :myvalue="gridList.completeGrain" :Isedit="Isedit" :IsShow="MykeywordShow"
|
|
|
+ :myevent="'completeGrain'" @setValue="mykeywordset" v-if="InputEvent=='completeGrain'"
|
|
|
+ @Cancelword="Cancelword" @goNext="goNext('impurity')"></MyNumberInput>
|
|
|
+ <input v-else v-model='gridList.completeGrain'
|
|
|
+ placeholder="请输入完善粒率占比" name="input" type="digit"></input>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
<view class="c-row ">
|
|
|
<view class="title">杂质（%）</view>
|
|
|
<view class="con-list">
|
|
|
@@ -367,8 +387,37 @@
|
|
|
placeholder="请输入热损伤占比" name="input" type="digit"></input>
|
|
|
</view>
|
|
|
</view>
|
|
|
-
|
|
|
-
|
|
|
+ <view class="c-row" v-if="gridList.goodsName == '大豆'">
|
|
|
+ <view class="title">转基因</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <MyNumberInput :myvalue="gridList.transgene" :Isedit="Isedit" :IsShow="MykeywordShow"
|
|
|
+ :myevent="'transgene'" @setValue="mykeywordset" v-if="InputEvent=='transgene'"
|
|
|
+ @Cancelword="Cancelword" @goNext="goNext('transgene')"></MyNumberInput>
|
|
|
+ <view @click="transgeneShow=true">
|
|
|
+ {{gridList.transgene}}
|
|
|
+ </view>
|
|
|
+ <!-- 转基因 -->
|
|
|
+ <u-picker :range="transgeneList" range-key="value" @confirm='transgeneClick($event)' v-model="transgeneShow"
|
|
|
+ mode="selector">
|
|
|
+ </u-picker>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="c-row" v-if="gridList.goodsName == '大豆'">
|
|
|
+ <view class="title">色泽/气味</view>
|
|
|
+ <view class="con-list">
|
|
|
+ <MyNumberInput :myvalue="gridList.colorLustre" :Isedit="Isedit" :IsShow="MykeywordShow"
|
|
|
+ :myevent="'colorLustre'" @setValue="mykeywordset" v-if="InputEvent=='colorLustre'"
|
|
|
+ @Cancelword="Cancelword" @goNext="goNext('colorLustre')"></MyNumberInput>
|
|
|
+ <!-- <input v-else v-model='gridList.colorLustre' @click="SetInputKey('colorLustre')"
|
|
|
+ placeholder="请选择色泽/气味是否正常" name="input" type="digit"></input> -->
|
|
|
+ <div @click="colorLustreShow = true">{{gridList.colorLustre}}</div>
|
|
|
+
|
|
|
+ <!-- 转基因 -->
|
|
|
+ <u-picker :range="colorLustreList" range-key="value" @confirm='colorLustreClick($event)' v-model="colorLustreShow"
|
|
|
+ mode="selector">
|
|
|
+ </u-picker>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3" class="c-row">
|
|
|
<view class="title">水分增价（元/吨）</view>
|
|
|
<view class="con-list">
|
|
|
@@ -457,12 +506,13 @@
|
|
|
<view class="but_css" @click="close">返回</view>
|
|
|
</view>
|
|
|
</u-popup>
|
|
|
+
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
var that;
|
|
|
- const Equ_List = ['waterContent', 'bulkDensity', 'imperfectGrain', 'impurity', 'mildewGrain', 'jiaorenli'];
|
|
|
+ const Equ_List = ['waterContent', 'bulkDensity', 'imperfectGrain', 'impurity', 'mildewGrain', 'jiaorenli','protein','completeGrain'];
|
|
|
import dragButton from "@/components/drag-button/drag-button.vue";
|
|
|
import keyboard from "@/components/master-keyboard/master-keyboard.vue";
|
|
|
import MyNumberInput from "@/components/MyNumberInput.vue";
|
|
|
@@ -552,7 +602,6 @@
|
|
|
username: "请更改昵称",
|
|
|
contractFlag: 10,
|
|
|
gridList: {
|
|
|
-
|
|
|
outType: '汽运',
|
|
|
natureOfGrainPurchase: '贸易粮',
|
|
|
type: '',
|
|
|
@@ -747,7 +796,11 @@
|
|
|
],
|
|
|
cangid: '',
|
|
|
|
|
|
- inType: "" //入库类型
|
|
|
+ inType: "" ,//入库类型
|
|
|
+ transgeneShow:false,
|
|
|
+ transgeneList:[{value:'非转基因'},{value:'转基因'}],
|
|
|
+ colorLustreShow : false,
|
|
|
+ colorLustreList:[{value:'正常'},{value:'异常'}]
|
|
|
}
|
|
|
},
|
|
|
// #ifndef MP
|
|
|
@@ -943,7 +996,6 @@
|
|
|
customerNumberCard: this.gridList.customerNumberCard,
|
|
|
warehouseName: this.gridList.warehouseName
|
|
|
}).then(res => {
|
|
|
- console.log(3)
|
|
|
uni.hideLoading();
|
|
|
if (res.data.data.A + res.data.data.B + res.data.data.C * 50 > res.data.data.D - 50) {
|
|
|
that.redstatus = true
|
|
|
@@ -959,10 +1011,15 @@
|
|
|
that.$forceUpdate()
|
|
|
})
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ colorLustreClick(e){
|
|
|
+ this.gridList.colorLustre = this.colorLustreList[e[0]].value
|
|
|
+ },
|
|
|
+ transgeneClick(e){
|
|
|
+ this.gridList.transgene = this.transgeneList[e[0]].value
|
|
|
+ },
|
|
|
Cancelword() {
|
|
|
this.bottomHeight = '10rpx';
|
|
|
this.MykeywordShow = false;
|
|
|
@@ -1084,10 +1141,11 @@
|
|
|
obtainPrice() { //根据容重获取价格
|
|
|
if (this.gridList.goodsName && this.cangid && this.gridList.bulkDensity) {
|
|
|
// if (!this.gridList.dryGrainPrice || this.gridList.dryGrainPrice == 0) {
|
|
|
+ let quality = this.gridList.goodsName=='大豆'?this.gridList.protein:this.gridList.bulkDensity
|
|
|
this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {
|
|
|
warehouseId: this.cangid,
|
|
|
goodsName: this.gridList.goodsName,
|
|
|
- bulkDensity: this.gridList.bulkDensity
|
|
|
+ bulkDensity: quality
|
|
|
}).then(res => {
|
|
|
if (res.data.data != 0) {
|
|
|
this.gridList.dryGrainPrice = res.data.data
|
|
|
@@ -1342,6 +1400,17 @@
|
|
|
this.gridList.gradeKey = this.gradeList[1].key
|
|
|
// this.gridList.grade = this.contractNolist.grade
|
|
|
this.gridList.inOutType = this.contractNolist.inOutType
|
|
|
+ if(this.gridList.goodsName == "大豆"){ //货名为大豆是设置默认
|
|
|
+ this.gridList.transgene= "非转基因"
|
|
|
+ this.gridList.reTransgene= "非转基因"
|
|
|
+ this.gridList.colorLustre = "正常"
|
|
|
+ this.gridList.reColorLustre = "正常"
|
|
|
+ }else{
|
|
|
+ delete this.gridList.transgene
|
|
|
+ delete this.gridList.reTransgene
|
|
|
+ delete this.gridList.colorLustre
|
|
|
+ delete this.gridList.reColorLustre
|
|
|
+ }
|
|
|
|
|
|
if (this.gridList.inOutType == '采购入库') {
|
|
|
this.warehouseTradeCount = '000' + this.warehouseTradeCount
|
|
|
@@ -1820,8 +1889,9 @@
|
|
|
this.$api.msg('容重不能为空')
|
|
|
return
|
|
|
}
|
|
|
- } else {
|
|
|
- if (!this.gridList.bulkDensity) {
|
|
|
+ }
|
|
|
+ if(this.gridList.goodsName == "大豆"){
|
|
|
+ if (!this.gridList.protein) {
|
|
|
this.$api.msg('蛋白不能为空')
|
|
|
return
|
|
|
}
|
zhongtianhaoyuan