|
@@ -28,6 +28,7 @@
|
|
@input="changeBaseWater" :disabled="!isEdit"></el-input>
|
|
@input="changeBaseWater" :disabled="!isEdit"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</div>
|
|
</div>
|
|
|
|
+
|
|
<!-- <div v-if="baseInfoForm.paramType != '1'" class="grid-content"> -->
|
|
<!-- <div v-if="baseInfoForm.paramType != '1'" class="grid-content"> -->
|
|
<div class="grid-content" v-if="!isSolidFood">
|
|
<div class="grid-content" v-if="!isSolidFood">
|
|
<el-form-item label="扣重比">
|
|
<el-form-item label="扣重比">
|
|
@@ -362,40 +363,42 @@ export default {
|
|
if (_goodsNameList.length == 0) {
|
|
if (_goodsNameList.length == 0) {
|
|
this.goodnameList = response
|
|
this.goodnameList = response
|
|
this.selectVal = response[0].constValue
|
|
this.selectVal = response[0].constValue
|
|
- if (this.selectVal == '玉米淀粉' ||
|
|
|
|
- this.selectVal == '玉米(机收)' ||
|
|
|
|
- this.selectVal == '玉米(酒精)' ||
|
|
|
|
- this.selectVal == '玉米(筛漏)' ||
|
|
|
|
- this.selectVal == '玉米(陈粮)' ||
|
|
|
|
- this.selectVal == '玉米(棒)' ||
|
|
|
|
- this.selectVal == '玉米'
|
|
|
|
- ) {
|
|
|
|
- this.isSolidFood = true
|
|
|
|
- this.baseInfoForm.bulkDensityStandard = 1
|
|
|
|
- } else {
|
|
|
|
- this.isSolidFood = false
|
|
|
|
- this.baseInfoForm.bulkDensityStandard = ''
|
|
|
|
- }
|
|
|
|
|
|
+ // if (this.selectVal == '玉米淀粉' ||
|
|
|
|
+ // this.selectVal == '玉米(机收)' ||
|
|
|
|
+ // this.selectVal == '玉米(酒精)' ||
|
|
|
|
+ // this.selectVal == '玉米(筛漏)' ||
|
|
|
|
+ // this.selectVal == '玉米(陈粮)' ||
|
|
|
|
+ // this.selectVal == '玉米(棒)' ||
|
|
|
|
+ // this.selectVal == '玉米'
|
|
|
|
+ // ) {
|
|
|
|
+ // this.isSolidFood = true
|
|
|
|
+ // this.baseInfoForm.bulkDensityStandard = 1
|
|
|
|
+ // } else {
|
|
|
|
+ // this.isSolidFood = false
|
|
|
|
+ // this.baseInfoForm.bulkDensityStandard = ''
|
|
|
|
+ // }
|
|
|
|
+ this.isSolidFood = false
|
|
|
|
+ this.baseInfoForm.bulkDensityStandard = ''
|
|
this.baseInfoForm.goodsNameKey = response[0].constKey
|
|
this.baseInfoForm.goodsNameKey = response[0].constKey
|
|
} else{
|
|
} else{
|
|
this.goodnameList = _list
|
|
this.goodnameList = _list
|
|
if (_list.length != 0) {
|
|
if (_list.length != 0) {
|
|
this.selectVal = _list[0].constValue
|
|
this.selectVal = _list[0].constValue
|
|
// this.selectVal = _goodsNameList[0]
|
|
// this.selectVal = _goodsNameList[0]
|
|
- if (this.selectVal == '玉米淀粉' ||
|
|
|
|
- this.selectVal == '玉米(机收)' ||
|
|
|
|
- this.selectVal == '玉米(酒精)' ||
|
|
|
|
- this.selectVal == '玉米(筛漏)' ||
|
|
|
|
- this.selectVal == '玉米(陈粮)' ||
|
|
|
|
- this.selectVal == '玉米(棒)' ||
|
|
|
|
- this.selectVal == '玉米'
|
|
|
|
- ) {
|
|
|
|
- this.isSolidFood = true
|
|
|
|
- this.baseInfoForm.bulkDensityStandard = 1
|
|
|
|
- } else {
|
|
|
|
- this.isSolidFood = false
|
|
|
|
- this.baseInfoForm.bulkDensityStandard = ''
|
|
|
|
- }
|
|
|
|
|
|
+ // if (this.selectVal == '玉米淀粉' ||
|
|
|
|
+ // this.selectVal == '玉米(机收)' ||
|
|
|
|
+ // this.selectVal == '玉米(酒精)' ||
|
|
|
|
+ // this.selectVal == '玉米(筛漏)' ||
|
|
|
|
+ // this.selectVal == '玉米(陈粮)' ||
|
|
|
|
+ // this.selectVal == '玉米(棒)' ||
|
|
|
|
+ // this.selectVal == '玉米'
|
|
|
|
+ // ) {
|
|
|
|
+ // this.isSolidFood = true
|
|
|
|
+ // this.baseInfoForm.bulkDensityStandard = 1
|
|
|
|
+ // } else {
|
|
|
|
+ // this.isSolidFood = false
|
|
|
|
+ // this.baseInfoForm.bulkDensityStandard = ''
|
|
|
|
+ // }
|
|
this.baseInfoForm.goodsNameKey = _list[0].constKey
|
|
this.baseInfoForm.goodsNameKey = _list[0].constKey
|
|
|
|
|
|
this.isSolidFood = false
|
|
this.isSolidFood = false
|
|
@@ -522,20 +525,22 @@ export default {
|
|
//构造查看priceList数据
|
|
//构造查看priceList数据
|
|
this.priceList = []
|
|
this.priceList = []
|
|
this.makeLookPriceList()
|
|
this.makeLookPriceList()
|
|
- if (this.selectVal == '玉米淀粉' ||
|
|
|
|
- this.selectVal == '玉米(机收)' ||
|
|
|
|
- this.selectVal == '玉米(酒精)' ||
|
|
|
|
- this.selectVal == '玉米(筛漏)' ||
|
|
|
|
- this.selectVal == '玉米(陈粮)' ||
|
|
|
|
- this.selectVal == '玉米(棒)' ||
|
|
|
|
- this.selectVal == '玉米'
|
|
|
|
- ) {
|
|
|
|
- this.isSolidFood = true
|
|
|
|
- this.baseInfoForm.bulkDensityStandard = 1
|
|
|
|
- } else {
|
|
|
|
|
|
+ // if (this.selectVal == '玉米淀粉' ||
|
|
|
|
+ // this.selectVal == '玉米(机收)' ||
|
|
|
|
+ // this.selectVal == '玉米(酒精)' ||
|
|
|
|
+ // this.selectVal == '玉米(筛漏)' ||
|
|
|
|
+ // this.selectVal == '玉米(陈粮)' ||
|
|
|
|
+ // this.selectVal == '玉米(棒)' ||
|
|
|
|
+ // this.selectVal == '玉米'
|
|
|
|
+ // ) {
|
|
|
|
+ // this.isSolidFood = true
|
|
|
|
+ // this.baseInfoForm.bulkDensityStandard = 1
|
|
|
|
+ // } else {
|
|
|
|
+ // this.isSolidFood = false
|
|
|
|
+ // this.baseInfoForm.bulkDensityStandard = ''
|
|
|
|
+ // }
|
|
this.isSolidFood = false
|
|
this.isSolidFood = false
|
|
this.baseInfoForm.bulkDensityStandard = ''
|
|
this.baseInfoForm.bulkDensityStandard = ''
|
|
- }
|
|
|
|
if (this.$route.query.type != '新增') {
|
|
if (this.$route.query.type != '新增') {
|
|
let _data = this.priceList
|
|
let _data = this.priceList
|
|
this.checkList1 = []
|
|
this.checkList1 = []
|
|
@@ -568,7 +573,7 @@ export default {
|
|
e == '玉米(棒)' ||
|
|
e == '玉米(棒)' ||
|
|
e == '玉米'
|
|
e == '玉米'
|
|
) {
|
|
) {
|
|
- this.isSolidFood = true
|
|
|
|
|
|
+ // this.isSolidFood = true //true
|
|
this.baseInfoForm = {
|
|
this.baseInfoForm = {
|
|
//防止填完数据 后切换货名不清空多余数据
|
|
//防止填完数据 后切换货名不清空多余数据
|
|
warehouseId: '',
|
|
warehouseId: '',
|
|
@@ -597,6 +602,7 @@ export default {
|
|
this.baseInfoForm.bulkDensityStandard = 1
|
|
this.baseInfoForm.bulkDensityStandard = 1
|
|
} else {
|
|
} else {
|
|
this.isSolidFood = false
|
|
this.isSolidFood = false
|
|
|
|
+ // this.isSolidFood = false
|
|
this.baseInfoForm.bulkDensityStandard = ''
|
|
this.baseInfoForm.bulkDensityStandard = ''
|
|
}
|
|
}
|
|
for (let num = 0; num < this.goodnameList.length; num++) {
|
|
for (let num = 0; num < this.goodnameList.length; num++) {
|
|
@@ -1888,7 +1894,8 @@ export default {
|
|
let _pointPrice = []
|
|
let _pointPrice = []
|
|
let _basePrice = 0
|
|
let _basePrice = 0
|
|
if (this.baseInfoForm.bulkDensityStandard == 1) {
|
|
if (this.baseInfoForm.bulkDensityStandard == 1) {
|
|
- this.isSolidFood = true
|
|
|
|
|
|
+ this.isSolidFood = false
|
|
|
|
+ // this.isSolidFood = true
|
|
//以容重查看
|
|
//以容重查看
|
|
_pointPrice = _priceList[0].pointPrice.split(',')
|
|
_pointPrice = _priceList[0].pointPrice.split(',')
|
|
_detailList = _priceList[0].point.split(',')
|
|
_detailList = _priceList[0].point.split(',')
|