更新

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -60,8 +60,8 @@
                 v-model="baseInfoForm.paramType"
                 :disabled="!isEdit"
               >
-                <el-radio label="1" >扣重比</el-radio>
-                <el-radio label="2">降幅</el-radio>
+                <el-radio label="1" >升水扣重</el-radio>
+                <el-radio label="2">升水扣钱</el-radio>
               </el-radio-group>
             </el-form-item>
           </div>
@@ -863,7 +863,6 @@
             case '新增':
               isValidate = this.validate()
               if (isValidate) {
-                debugger
                 purchasePriceAdd(this.baseInfoForm).toPromise().then((response) => {
                   // this.tableData = response.records
                   this.isCountShow = false
@@ -1047,8 +1046,7 @@
             }
           }
            console.log(index)
-          if(this.baseInfoForm.paramType == '2'){
-            for (let j = index; j >= 0; j--) {
+          for (let j = index; j >= 0; j--) {
               if (_priceList[i].detailList[j] && _priceList[i].detailList[j].type != 4) {
                 if (_priceList[i].detailList[j].type != 1) {
                   let baseprice = ''
@@ -1099,7 +1097,6 @@
                 }
               }
             }
-          }
           
             // for (let j = (_priceList[i].detailList.length + 1) / 2 - 1; j > 0; j--) {
             //   if (_priceList[i].detailList[j] && _priceList[i].detailList[j].type != 4) {
@@ -1128,18 +1125,17 @@
             // }
             this.left.push(_leftObj)
             console.log('this.left', this.left)
-            for (let k = index; k <= _priceList[i].detailList.length; k++) {
-              if (_priceList[i].detailList[k] && _priceList[i].detailList[k].type != 4) {
-                if (_priceList[i].detailList[k].type != 3) {
-                  let baseprice = ''
-                  if(this.baseInfoForm.paramType == '1'){
+            if(this.baseInfoForm.paramType == '2'){
+              for (let k = index; k <= _priceList[i].detailList.length; k++) {
+                if (_priceList[i].detailList[k] && _priceList[i].detailList[k].type != 4) {
+                  if (_priceList[i].detailList[k].type != 3) {
+                    let baseprice = ''
                     if (k == index) {
-                      baseprice = parseFloat(this.baseInfoForm.dryGrainPrice)
+                        baseprice = parseFloat(_priceList[i].basicUnitPrice)
                     } else {
-                      baseprice = parseFloat(parseFloat(this.baseInfoForm.dryGrainPrice) - (parseFloat(_priceList[i].detailList[k+2]
-                        .water) - parseFloat(_priceList[i].detailList[k].water)) / 0.1 * (this.baseInfoForm.dryGrainPrice * (parseFloat(_priceList[i].detailList[k + 2].water) - parseFloat(_priceList[i].detailList[
-                        k].water))*parseFloat(_priceList[i].detailList[k + 1].jfprice)/100/((parseFloat(_priceList[i].detailList[k + 2].water) - parseFloat(_priceList[i].detailList[
-                        k].water))/0.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))
                     }
                     _rightObj.priceList.push({
                       index: k,
@@ -1147,21 +1143,28 @@
                       priceEnd: parseFloat(_priceList[i].detailList[k + 2].water),
                       type: parseFloat(_priceList[i].detailList[k].type),
                       water: _priceList[i].detailList[k].water,
-                      jfprice: parseFloat(this.baseInfoForm.dryGrainPrice * (parseFloat(_priceList[i].detailList[k + 2].water) - parseFloat(_priceList[i].detailList[
-                        k].water))*parseFloat(_priceList[i].detailList[k + 1].jfprice)/100/((parseFloat(_priceList[i].detailList[k + 2].water) - parseFloat(_priceList[i].detailList[
-                        k].water))/0.1)),
+                      jfprice: parseFloat(_priceList[i].detailList[k + 1].jfprice),
                       baseprice: baseprice,
                       price: (parseFloat(_priceList[i].detailList[k + 2].water) - parseFloat(_priceList[i].detailList[
                         k].water)) / 0.1 * parseFloat(_priceList[i].detailList[k + 1].jfprice)
                     })
                   }
-                  else{
-                    if (k == index) {
-                      baseprice = parseFloat(_priceList[i].basicUnitPrice)
+                }
+              }
+            }
+            else{
+              for (let k = 0; k <= _priceList[i].detailList.length; k++) {
+                if (_priceList[i].detailList[k] && _priceList[i].detailList[k].type != 4) {
+                  if (_priceList[i].detailList[k].type != 3) {
+                    let baseprice = ''
+                    if (k == 0) {
+                        baseprice = parseFloat(this.baseInfoForm.dryGrainPrice)
                     } else {
-                      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))
+                      var waterCount = 0
+                      for(var p=0;p<_rightObj.priceList.length;p++){
+                        waterCount += (_rightObj.priceList[p].priceEnd - _rightObj.priceList[p].priceStart)*_rightObj.priceList[p].param/100
+                      }
+                      baseprice = parseFloat(parseFloat(this.baseInfoForm.dryGrainPrice) * ( 1- waterCount))
                     }
                     _rightObj.priceList.push({
                       index: k,
@@ -1169,18 +1172,19 @@
                       priceEnd: parseFloat(_priceList[i].detailList[k + 2].water),
                       type: parseFloat(_priceList[i].detailList[k].type),
                       water: _priceList[i].detailList[k].water,
-                      jfprice: parseFloat(_priceList[i].detailList[k + 1].jfprice),
+                      param:_priceList[i].detailList[k + 1].jfprice,
+                      jfprice: parseFloat(this.baseInfoForm.dryGrainPrice * (parseFloat(_priceList[i].detailList[k + 2].water) - parseFloat(_priceList[i].detailList[
+                        k].water))*parseFloat(_priceList[i].detailList[k + 1].jfprice)/100/((parseFloat(_priceList[i].detailList[k + 2].water) - parseFloat(_priceList[i].detailList[
+                        k].water))/0.1)),
                       baseprice: baseprice,
                       price: (parseFloat(_priceList[i].detailList[k + 2].water) - parseFloat(_priceList[i].detailList[
                         k].water)) / 0.1 * parseFloat(_priceList[i].detailList[k + 1].jfprice)
                     })
                   }
-                  
                 }
               }
             }
 
-
             // for (let k = (_priceList[i].detailList.length + 1) / 2 - 1; k <= _priceList[i].detailList.length; k++) {
             //   if (_priceList[i].detailList[k] && _priceList[i].detailList[k].type != 4) {
             //     if (_priceList[i].detailList[k].type != 3) {
@@ -1214,7 +1218,6 @@
       // 获取当前价格左右价格区间数据
       getOtherPrice(list, water, direction) {},
       calculatePriceRight(_waterMax) {
-        debugger
         //获取每个分界值
         let _listResult = []
         for (let i = 0; i < this.right.length; i++) {

src/views/houseSelfCollect/inspectInfo.vue

@@ -53,7 +53,7 @@
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item v-else label="扣杂" span="1" prop="buckleMiscellaneous">
-              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.buckleMiscellaneous" placeholder="请输入扣杂" maxlength="100" size="small"
+              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.buckleMiscellaneous" @input="waterContentChange" placeholder="请输入扣杂" maxlength="100" size="small"
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="类型" span="1" prop="type">
@@ -193,6 +193,7 @@
           tidalGrainPrice: 0,
           buckleWeightRatio: 0,
           natureOfGrainPurchase:'贸易粮',
+          buckleMiscellaneous:0,
           type:'潮粮'
         }
       }
@@ -200,7 +201,7 @@
       this.warehouseName = this.$route.query.warehouseName
       this.cangNo = this.$route.query.warehouseNo
       this.count = Number(this.$route.query.count) + 1
-      this.purchasePriceList = this.$route.query.purchasePriceList
+      // this.purchasePriceList = this.$route.query.purchasePriceList
       this.id = this.$route.query.id
       if (this.types == 2) {
         this.disabled = true
@@ -676,7 +677,7 @@
             .toPromise()
             .then((response) => {
               if(that.inspect.paramType == '1'){
-                that.inspect.tidalGrainPrice = parseFloat(response) - parseFloat(that.inspect.buckleMiscellaneous)/100*parseFloat(that.inspect.dryGrainPrice)
+                that.inspect.tidalGrainPrice = parseFloat(parseFloat(response) - parseFloat(that.inspect.buckleMiscellaneous)/100*parseFloat(that.inspect.dryGrainPrice)).toFixed(4)
               }else{
                 that.inspect.tidalGrainPrice = response
               }
@@ -728,6 +729,7 @@
           .then((response) => {
             this.goodNameList = []
             this.goodNameList = response
+            this.purchasePriceList = response
           })
         // 品级
         packList({
@@ -776,6 +778,7 @@
             .toPromise()
             .then((response) => {
               this.inspect = response
+              this.purchasePriceList = this.inspect.purchasePriceList
             })
         }
       },

src/views/houseSelfCollect/inspectionManagement.vue

@@ -151,9 +151,7 @@ export default {
       isShowPrint: false,
       printData: {},
       deductWeight:'',//扣重比
-      saleLimit:'',
-      purchasePriceList:[]
-
+      saleLimit:''
     }
   },
   activated() {
@@ -188,8 +186,7 @@ export default {
           id: row.id,
           warehouseName: this.warehouseName,
           count: this.warehouseCount,
-          warehouseNo: this.warehouseNo,
-          purchasePriceList:this.purchasePriceList
+          warehouseNo: this.warehouseNo
         },
       })
     },
@@ -201,7 +198,6 @@ export default {
           this.warehouseNo = this.warehouseList[i].No
           this.cangid = this.warehouseList[i].id
           this.WAREHOUSE[1].payname = this.warehouseList[i].value
-          this.purchasePriceList = this.warehouseList[i].purchasePriceList
         }
       }
       this.getList()
@@ -255,14 +251,12 @@ export default {
               value: response[i].warehouseName,
               id: response[i].id,
               count: response[i].count,
-              purchasePriceList: response[i].purchasePriceList,
               No:response[i].commonWarehouseNo
             })
             if (this.cangid&&this.cangid == response[i].id) {
               this.warehouseName = response[i].warehouseName
               this.warehouseCount =  response[i].count
               this.warehouseNo =  response[i].commonWarehouseNo
-              this.purchasePriceList =  response[i].purchasePriceList
             } 
           }
           if(this.warehouseList.length > 0 && !this.cangid){
@@ -270,7 +264,6 @@ export default {
             this.warehouseCount =  this.warehouseList[0].count
             this.warehouseNo =  this.warehouseList[0].No
             this.cangid =  this.warehouseList[0].id
-            this.purchasePriceList =  this.warehouseList[0].purchasePriceList
             this.WAREHOUSE[1].payname = this.warehouseList[0].value
           }
           this.getList()

src/views/houseSelfCollect/paymentManagement.vue

@@ -390,22 +390,10 @@ export default {
       this.getList()
     },
     settlement(index, row) {
-      var data = {}
-      var data1 = {}
-      for (let i = 0; i < this.warehouseList.length; i++) {
-        if (this.warehouseList[i].id == this.warehouseNameKey) {
-          data = this.warehouseList[i]
-        }
-      }
-      for (let i = 0; i < data.purchasePriceList.length; i++) {
-        if (data.purchasePriceList[i].goodsName == row.goodsName) {
-          data1 = data.purchasePriceList[i]
-        }
-      }
       if (row.goodsName)
         this.$router.push({
           path: 'settlement',
-          query: { type: index, id: row.id, waterMin: data1.waterMin }
+          query: { type: index, id: row.id }
         })
     },
     payment() {

src/views/houseSelfCollect/settlement.vue

@@ -491,13 +491,18 @@ export default {
           } 
           this.paymentList.buckleWeightRatio = this.paymentList.qualityInspectionManagement.buckleWeightRatio
           this.paymentList.tidalGrainPrice = this.paymentList.tidalGrainPrice.toFixed(4)
-          this.paymentList.qualityInspectionManagement.waterMin=this.$route.query.waterMin
-          this.paymentList.qualityInspectionManagement.weightDeduction=(this.paymentList.qualityInspectionManagement.waterContent-this.paymentList.qualityInspectionManagement.waterMin)*this.paymentList.buckleWeightRatio
-          this.paymentList.qualityInspectionManagement.weightDeduction=this.paymentList.qualityInspectionManagement.weightDeduction.toFixed(2)
-          this.paymentList.base=(100-this.paymentList.qualityInspectionManagement.weightDeduction)/100
-          this.paymentList.base = this.paymentList.base.toFixed(3)
-          this.paymentList.pureWeight=this.paymentList.base*this.paymentList.weighingManagement.netWeight
-          this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
+          if(this.paymentList.qualityInspectionManagement.paramType == '2'){
+            this.paymentList.qualityInspectionManagement.weightDeduction=(this.paymentList.qualityInspectionManagement.waterContent-this.paymentList.qualityInspectionManagement.waterMin)*this.paymentList.buckleWeightRatio
+            this.paymentList.qualityInspectionManagement.weightDeduction=this.paymentList.qualityInspectionManagement.weightDeduction.toFixed(2)
+            this.paymentList.base=(100-this.paymentList.qualityInspectionManagement.weightDeduction)/100
+            this.paymentList.base = this.paymentList.base.toFixed(3)
+            this.paymentList.pureWeight=this.paymentList.base*this.paymentList.weighingManagement.netWeight
+            this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
+          }
+          else{
+            this.paymentList.pureWeight=this.paymentList.weighingManagement.netWeight * (100 - this.paymentList.param)/100
+            this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
+          }
           if(!this.paymentList.dryGrainPrice){
             this.paymentList.dryGrainPrice=this.paymentList.qualityInspectionManagement.tidalGrainPrice/this.paymentList.base
           }

src/views/houseSelfCollect/weighingManagement.vue

@@ -200,7 +200,6 @@ export default {
         if (this.warehouseList[i].value == e) {
           this.warehouseId = this.warehouseList[i].warehouseId
           this.cangid = this.warehouseList[i].warehouseId
-          this.purchasePriceList = this.warehouseList[i].warehouseList
           this.allowEdit = this.warehouseList[i].allowEdit
           this.WAREHOUSE[2].payname = this.warehouseList[i].value
           this.common.name  =  this.warehouseList[i].value
@@ -231,7 +230,7 @@ export default {
           warehouseId: this.warehouseId,
           monitorUrl1: this.monitorUrl1,
           monitorUrl2: this.monitorUrl2,
-          purchasePriceList: this.purchasePriceList,
+          purchasePriceList: this.weighingList.qualityInspectionManagement.purchasePriceList,
           allowEdit:this.allowEdit
         },
       })
@@ -260,7 +259,6 @@ export default {
             this.warehouseList.push({
               value: response[i].warehouseName,
               warehouseId: response[i].id,
-              warehouseList:response[i].purchasePriceList,
               allowEdit:response[i].allowEdit,
               monitorUrl1:response[i].monitorUrl1,
               monitorUrl2:response[i].monitorUrl2
@@ -273,14 +271,12 @@ export default {
               this.warehouseNo =  response[i].commonWarehouseNo
               this.monitorUrl1 =  response[i].monitorUrl1
               this.monitorUrl2 =  response[i].monitorUrl2
-              this.purchasePriceList =  response[i].purchasePriceList
             }
           }
            if(this.warehouseList.length > 0 && !this.cangid){
             this.warehouseName = this.warehouseList[0].value
             this.cangid =  this.warehouseList[0].warehouseId
             this.warehouseId =  this.warehouseList[0].warehouseId
-            this.purchasePriceList =  this.warehouseList[0].purchasePriceList
             this.WAREHOUSE[1].payname = this.warehouseList[0].value
             this.common.name  =  this.warehouseList[0].value
             this.monitorUrl1 =  this.warehouseList[0].monitorUrl1

src/views/houseSelfCollect/weightCheck.vue

@@ -158,7 +158,8 @@
     grossWeight,
     getamount,
     getPrint,
-    getweighingList
+    getweighingList,
+    getinspectLookGoods
   } from '@/model/houseSelfCollect/index'
   import weightCheckPrint from './component/weightCheckPrint.vue'
   import html2canvas from 'html2canvas'
@@ -225,8 +226,8 @@
         this.$route.query.grossWeight = 0
       }
       this.weighingList.grossWeight = this.$route.query.grossWeight
-      this.purchasePriceList = this.$route.query.purchasePriceList
-      console.log(this.purchasePriceList, '上限')
+      // this.purchasePriceList = this.$route.query.purchasePriceList
+      // console.log(this.purchasePriceList, '上限')
       this.allowEdit = this.$route.query.allowEdit
       if (this.allowEdit == 0) {
         this.disabled = true
@@ -257,6 +258,14 @@
         this.getList()
       },
       getList() {
+        // 货名
+        getinspectLookGoods({
+            warehouseId: this.cangid
+          })
+          .toPromise()
+          .then((response) => {
+            this.purchasePriceList = response
+          })
         getweighingList({
             compId: sessionStorage.getItem('ws-pf_compId'),
             currentPage: this.currentPage,

src/views/outboundManagement/weighingManagement.vue

@@ -204,7 +204,6 @@
 						}
 						this.warehouseName = this.warehouseList[0].value
 						this.warehouseId = this.warehouseList[0].warehouseId
-						this.purchasePriceList = this.warehouseList[0].warehouseList
 						this.getList()
 					})
 			},