Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -506,7 +506,6 @@
       },
       // 添加粮价设置
       newSetPrice() {
-        this.isCountShow = false
         let _newObj = {
           index: 0,
           checkList: [],
@@ -569,6 +568,7 @@
                 type: 'warning'
               });
             } else {
+              that.baseInfoForm.details.split(index,1)
               that.priceList.splice(index, 1)
             }
           })
@@ -631,13 +631,11 @@
           if (typeof(_pointVal1) == "string") _pointVal1 = _pointVal1.length
           let _tobeVal1 = _val1 % point
           if (type == "waterBase") {
-
             if (_val1 <= max && _val1 >= min && _pointVal1 <= saveNum && _tobeVal1 == 0) {
               return false
             }
           }
           if (type == "deductWeight") {
-
             if (_val1 <= max && _val1 >= min && _pointVal1 <= saveNum) {
               return false
             }
@@ -752,7 +750,7 @@
         }
         return true
       },
-      getEditChecList(){
+      getEditCheckList(){
             let _data = this.baseInfoForm.details
             let _list = []
           for(let k = 0;k<_data.length;k++){
@@ -783,7 +781,7 @@
             }
             break;
           case "编辑":
-             this.getEditChecList()
+             this.getEditCheckList()
             isValidate = this.validate()
             if (isValidate) {
               purchasePriceEdit(this.baseInfoForm).toPromise().then((response) => {
@@ -791,7 +789,7 @@
               })
             }
             case "审核中":
-             this.getEditChecList()
+             this.getEditCheckList()
             isValidate = this.validate()
             if (isValidate) {
               purchasePriceEdit(this.baseInfoForm).toPromise().then((response) => {
@@ -801,6 +799,7 @@
                     confirmButtonText: '确定',
                     type: 'warning',
                   }).then(() => {
+                    //审核
                     that.audit(this.baseInfoForm,true,2)
                   })
               })
@@ -966,8 +965,8 @@
                 prcieList.push(this.keepTwoDecimal(_price))
               } else if (_waterMin >= _list[k].priceStart && _waterMin < _list[k].priceEnd) {
                 // 当前区间段价格+其他区间段价格
-                let _otherPice = this.getOtherPrice(_list, _list[k], "leftBasic")
-                let _price1 = (_list[k].priceEnd - _waterMin) / 0.5 * _list[k].betweenPrice + _otherPice;
+                // let _otherPice = this.getOtherPrice(_list, _list[k], "leftBasic")
+                // let _price1 = (_list[k].priceEnd - _waterMin) / 0.5 * _list[k].betweenPrice + _otherPice;
                 prcieList.push(basePrice + _price1)
 
               }
@@ -985,8 +984,8 @@
                 prcieList.push(this.keepTwoDecimal(_price))
               } else if (_waterMin > _list[k].priceStart && _waterMin <= _list[k].priceEnd) {
                 // 当前段价格+其他段价格
-                let _otherPice2 = this.getOtherPrice(_list, _list[k], "rightBasic")
-                let _price2 = (_waterMin - _list[k].priceEnd) / 0.5 * _list[k].betweenPrice + _otherPice2;
+                // let _otherPice2 = this.getOtherPrice(_list, _list[k], "rightBasic")
+                // let _price2 = (_waterMin - _list[k].priceEnd) / 0.5 * _list[k].betweenPrice + _otherPice2;
                 prcieList.push(basePrice - _price2)
               }
             }