zhongtianhaoyuan 2 vuotta sitten
vanhempi
commit
7bb2a60d33
1 muutettua tiedostoa jossa 49 lisäystä ja 42 poistoa
  1. 49 42
      src/views/houseSelfCollect/acquisitionManagementAdd.vue

+ 49 - 42
src/views/houseSelfCollect/acquisitionManagementAdd.vue

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