Sfoglia il codice sorgente

修改多边界计算价格

achao 2 anni fa
parent
commit
76c3319d87
1 ha cambiato i file con 59 aggiunte e 3 eliminazioni
  1. 59 3
      src/views/houseSelfCollect/acquisitionManagementAdd.vue

+ 59 - 3
src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -231,6 +231,10 @@ export default {
   watch: {},
   watch: {},
   data() {
   data() {
     return {
     return {
+      leftFJPrice:{},
+      leftFJIndex:0,
+      rightFJPrice:{},
+      rightFJIndex:0,
       isSolidFood: false,
       isSolidFood: false,
       isShowTip: false,
       isShowTip: false,
       price: 0,
       price: 0,
@@ -1522,9 +1526,8 @@ export default {
                 _obj.priceOther = this.keepTwoDecimal(priceList[i].val)
                 _obj.priceOther = this.keepTwoDecimal(priceList[i].val)
               }
               }
             }
             }
-
             _list.push(_obj)
             _list.push(_obj)
-            // console.log('_list', _list)
+            console.log('_list', _list)
           }
           }
         } else {
         } else {
           _obj = {}
           _obj = {}
@@ -1576,9 +1579,12 @@ export default {
       let that = this
       let that = this
       this.left = []
       this.left = []
       this.right = []
       this.right = []
+      
       let _priceList = this.priceList
       let _priceList = this.priceList
       for (let i = 0; i < _priceList.length; i++) {
       for (let i = 0; i < _priceList.length; i++) {
         for (let k = 0; k < _priceList[i].checkList.length; k++) {
         for (let k = 0; k < _priceList[i].checkList.length; k++) {
+          this.rightFJIndex=0
+          this.leftFJIndex=0
           let _leftObj = {}
           let _leftObj = {}
           _leftObj.level = _priceList[i].checkList[k]
           _leftObj.level = _priceList[i].checkList[k]
           _leftObj.basicUnitPrice = parseFloat(_priceList[i].basicUnitPrice)
           _leftObj.basicUnitPrice = parseFloat(_priceList[i].basicUnitPrice)
@@ -1662,13 +1668,38 @@ export default {
                   if (j == index) {
                   if (j == index) {
                     baseprice = parseFloat(_priceList[i].basicUnitPrice)
                     baseprice = parseFloat(_priceList[i].basicUnitPrice)
                   } else {
                   } else {
-                    baseprice = parseFloat(
+                      if(_priceList[i].detailList[j].type==5){
+                        this.leftFJIndex++
+                        if(this.leftFJIndex==1){
+                          baseprice = parseFloat(
+                      parseFloat(_priceList[i].basicUnitPrice) +
+                        ((parseFloat(_priceList[i].detailList[j + 2].water) -
+                          parseFloat(_priceList[i].detailList[j].water)) /
+                          0.1) *
+                          parseFloat(_priceList[i].detailList[j + 1].jfprice)
+                    )
+                    this.leftFJPrice = baseprice
+                        }else if(this.leftFJIndex>1){
+                          baseprice = parseFloat(
+                      parseFloat(this.leftFJPrice) +
+                        ((parseFloat(_priceList[i].detailList[j + 2].water) -
+                          parseFloat(_priceList[i].detailList[j].water)) /
+                          0.1) *
+                          parseFloat(_priceList[i].detailList[j + 1].jfprice)
+                    )
+                    this.leftFJPrice = baseprice
+                        }
+                      }else{
+                        baseprice = parseFloat(
                       parseFloat(_priceList[i].basicUnitPrice) +
                       parseFloat(_priceList[i].basicUnitPrice) +
                         ((parseFloat(_priceList[i].detailList[j + 2].water) -
                         ((parseFloat(_priceList[i].detailList[j + 2].water) -
                           parseFloat(_priceList[i].detailList[j].water)) /
                           parseFloat(_priceList[i].detailList[j].water)) /
                           0.1) *
                           0.1) *
                           parseFloat(_priceList[i].detailList[j + 1].jfprice)
                           parseFloat(_priceList[i].detailList[j + 1].jfprice)
                     )
                     )
+                      }
+
+                  
                   }
                   }
                   _leftObj.priceList.push({
                   _leftObj.priceList.push({
                     index: j,
                     index: j,
@@ -1729,6 +1760,29 @@ export default {
                   if (k == index) {
                   if (k == index) {
                     baseprice = parseFloat(_priceList[i].basicUnitPrice)
                     baseprice = parseFloat(_priceList[i].basicUnitPrice)
                   } else {
                   } else {
+                    if(_priceList[i].detailList[k].type==5){
+                      this.rightFJIndex++
+                      if(this.rightFJIndex==1){
+                        baseprice = parseFloat(
+                      parseFloat(_priceList[i].basicUnitPrice) -
+                        ((parseFloat(_priceList[i].detailList[k].water) -
+                          parseFloat(_priceList[i].detailList[k - 2].water)) /
+                          0.1) *
+                          parseFloat(_priceList[i].detailList[k - 1].jfprice)
+                    )
+                    this.rightFJPrice = baseprice
+                      }else if(this.rightFJIndex>1){
+                        baseprice = parseFloat(
+                      parseFloat(this.rightFJPrice) -
+                        ((parseFloat(_priceList[i].detailList[k].water) -
+                          parseFloat(_priceList[i].detailList[k - 2].water)) /
+                          0.1) *
+                          parseFloat(_priceList[i].detailList[k - 1].jfprice)
+                    )
+                    this.rightFJPrice = baseprice
+                      }
+                    }else{
+                      
                     baseprice = parseFloat(
                     baseprice = parseFloat(
                       parseFloat(_priceList[i].basicUnitPrice) -
                       parseFloat(_priceList[i].basicUnitPrice) -
                         ((parseFloat(_priceList[i].detailList[k].water) -
                         ((parseFloat(_priceList[i].detailList[k].water) -
@@ -1736,6 +1790,8 @@ export default {
                           0.1) *
                           0.1) *
                           parseFloat(_priceList[i].detailList[k - 1].jfprice)
                           parseFloat(_priceList[i].detailList[k - 1].jfprice)
                     )
                     )
+                    }
+
                   }
                   }
                   _rightObj.priceList.push({
                   _rightObj.priceList.push({
                     index: k,
                     index: k,