更新

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -26,7 +26,7 @@
               <el-input type="number" @mousewheel.native.prevent v-model="baseInfoForm.waterBase" @input="changeBaseWater" :disabled="!isEdit"></el-input>
             </el-form-item>
           </div>
-          <div class="grid-content">
+          <div v-if="baseInfoForm.paramType != '1'" class="grid-content">
             <el-form-item label="扣重比">
               <el-input type="number" @mousewheel.native.prevent v-model="baseInfoForm.deductWeight" :disabled="!isEdit"></el-input>
             </el-form-item>
@@ -53,6 +53,19 @@
               <el-input type="number" @mousewheel.native.prevent v-model="baseInfoForm.saleLimit" :disabled="!isEdit"></el-input>
             </el-form-item>
           </div>
+          <div class="grid-content">
+            <el-form-item label="参数类型">
+              <el-radio-group
+                @change="paramTypeChange"
+                v-model="baseInfoForm.paramType"
+                :disabled="!isEdit"
+              >
+                <el-radio label="1" >扣重比</el-radio>
+                <el-radio label="2">降幅</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </div>
+          
         </div>
       </el-form>
       <el-row class="row3">
@@ -79,7 +92,8 @@
           <div class="count">
             <div class="left">
               <div>水分（%）</div>
-              <div>降幅（元/0.1%）</div>
+              <div v-if="baseInfoForm.paramType == '2'">降幅（元/0.1%）</div>
+              <div v-else>扣重比</div>
             </div>
             <div class="right">
               <div class="line"></div>
@@ -303,7 +317,8 @@
             passDate: '',
             dryGrainPrice: '',
             details: [],
-            detailPrints: []
+            detailPrints: [],
+            paramType:'1'
           }
           this.baseInfoForm.warehouseId = this.$route.query.warehouseId
           this.baseInfoForm.warehouseName = this.$route.query.warehouseName
@@ -368,6 +383,9 @@
     },
     mounted() {},
     methods: {
+      paramTypeChange(){
+        // this.makeTableList()
+      },
       // 查看/编辑获取数据
       getData() {
         this.type = this.$route.query.type
@@ -693,14 +711,16 @@
           }
           return false
         }
-        if (this.baseInfoForm.deductWeight == '' || _baseWaterValidate(0, 3, 2, '', 'deductWeight', parseFloat(this
-            .baseInfoForm.deductWeight))) {
-          if (_baseWaterValidate(0, 3, 2, '', 'deductWeight', parseFloat(this.baseInfoForm.deductWeight))) {
-            that.$message.error('扣重比输入错误！');
-          } else {
-            this.$message.error('扣重比不能为空！');
+        if(this.baseInfoForm.paramType == '2'){
+          if (this.baseInfoForm.deductWeight == '' || _baseWaterValidate(0, 3, 2, '', 'deductWeight', parseFloat(this
+              .baseInfoForm.deductWeight))) {
+            if (_baseWaterValidate(0, 3, 2, '', 'deductWeight', parseFloat(this.baseInfoForm.deductWeight))) {
+              that.$message.error('扣重比输入错误！');
+            } else {
+              this.$message.error('扣重比不能为空！');
+            }
+            return false
           }
-          return false
         }
         if (this.baseInfoForm.dryGrainPrice == '' || _baseWaterValidate(0, 1000, 4, '', 'deductWeight', parseFloat(this
             .baseInfoForm.dryGrainPrice))) {
@@ -756,7 +776,7 @@
         }
         for (let i = 0; i < this.priceList.length; i++) {
           let _item = this.priceList[i]
-          if (_item.basicUnitPrice == '' || _baseWaterValidate(0, 50, 2, '', 'deductWeight', parseFloat(_item
+          if (_item.basicUnitPrice == '' || _baseWaterValidate(0, 50, 8, '', 'deductWeight', parseFloat(_item
               .basicUnitPrice))) {
             if (_item.basicUnitPrice == '') {
               that.$message.error('基准单价不能为空！');
@@ -773,12 +793,22 @@
           for (let j = 0; j < _item.detailList.length; j++) {
             let _item1 = _item.detailList[j]
             if (_item1.type == 4) {
-              if (_item1.jfprice == '' || _baseWaterValidate(0, 100, 3, '', 'deductWeight', parseFloat(_item1
+              if (_item1.jfprice == '' || _baseWaterValidate(0, 100, 8, '', 'deductWeight', parseFloat(_item1
                   .jfprice))) {
                 if (_item1.jfprice == '') {
-                  that.$message.error('降幅价格不能为空！');
+                  if(this.baseInfoForm.paramType == '1'){
+                    that.$message.error('扣重比不能为空！');
+                  }
+                  else{
+                    that.$message.error('降幅价格不能为空！');
+                  }
                 } else {
-                  that.$message.error('降幅输入错误！');
+                  if(this.baseInfoForm.paramType == '1'){
+                    that.$message.error('扣重比输入错误！');
+                  }
+                  else{
+                    that.$message.error('降幅输入错误！');
+                  }
                 }
                 return false
               }
@@ -824,7 +854,6 @@
           isValidate = this.validate()
          
         if (isValidate) {
-          this.isCountShow = false
           this.makeTableList()
           this.baseInfoForm.details = []
           this.makePriceDataList()
@@ -856,17 +885,18 @@
               this.getEditCheckList()
               isValidate = this.validate()
               if (isValidate) {
-                purchasePriceEdit(this.baseInfoForm).toPromise().then((response) => {
-                  let that = this
-                  this.$confirm(`是否确定通过？`, {
-                    cancelButtonText: '取消',
-                    confirmButtonText: '确定',
-                    type: 'warning',
-                  }).then(() => {
+                let that = this
+                this.$confirm(`是否确定通过？`, {
+                  cancelButtonText: '取消',
+                  confirmButtonText: '确定',
+                  type: 'warning',
+                }).then(() => {
+                  purchasePriceEdit(this.baseInfoForm).toPromise().then((response) => {
                     //审核
                     that.audit(this.baseInfoForm, true, 2)
                   })
                 })
+                
               }
               break;
           }
@@ -992,24 +1022,50 @@
               if (_priceList[i].detailList[j] && _priceList[i].detailList[j].type != 4) {
                 if (_priceList[i].detailList[j].type != 1) {
                   let baseprice = ''
-                  if (j == index) {
-                    baseprice = parseFloat(_priceList[i].basicUnitPrice)
-                  } else {
-                    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))
+                  if(this.baseInfoForm.paramType == '1'){
+                    if (j == index) {
+                      baseprice = parseFloat(_priceList[i].basicUnitPrice)
+                    } else {
+                      baseprice = parseFloat(parseFloat(_priceList[i].basicUnitPrice) + (parseFloat(_priceList[i].detailList[j + 2]
+                        .water) - parseFloat(_priceList[i].detailList[j].water)) / 0.1 * (this.baseInfoForm.dryGrainPrice * (parseFloat(_priceList[i].detailList[j].water) 
+                              - parseFloat(_priceList[i].detailList[j - 2].water))*parseFloat(_priceList[i].detailList[j - 1].jfprice)/100/((parseFloat(_priceList[i].detailList[j].water) 
+                              - parseFloat(_priceList[i].detailList[j - 2].water))/0.1)))
+                    }
+                    _leftObj.priceList.push({
+                      index: j,
+                      priceStart: parseFloat(_priceList[i].detailList[j].water),
+                      priceEnd: parseFloat(_priceList[i].detailList[j - 2].water),
+                      type: parseFloat(_priceList[i].detailList[j].type),
+                      water: _priceList[i].detailList[j].water,
+                      jfprice: parseFloat(this.baseInfoForm.dryGrainPrice * (parseFloat(_priceList[i].detailList[j].water) 
+                              - parseFloat(_priceList[i].detailList[j - 2].water))*parseFloat(_priceList[i].detailList[j - 1].jfprice)/100/((parseFloat(_priceList[i].detailList[j].water) 
+                              - parseFloat(_priceList[i].detailList[j - 2].water))/0.1)),
+                      baseprice: baseprice,
+                      price: (parseFloat(_priceList[i].detailList[j].water) - parseFloat(_priceList[i].detailList[j -
+                        2].water)) / 0.1 * parseFloat(_priceList[i].detailList[j - 1].jfprice)
+                    })
                   }
-                  _leftObj.priceList.push({
-                    index: j,
-                    priceStart: parseFloat(_priceList[i].detailList[j].water),
-                    priceEnd: parseFloat(_priceList[i].detailList[j - 2].water),
-                    type: parseFloat(_priceList[i].detailList[j].type),
-                    water: _priceList[i].detailList[j].water,
-                    jfprice: parseFloat(_priceList[i].detailList[j - 1].jfprice),
-                    baseprice: baseprice,
-                    price: (parseFloat(_priceList[i].detailList[j].water) - parseFloat(_priceList[i].detailList[j -
-                      2].water)) / 0.1 * parseFloat(_priceList[i].detailList[j - 1].jfprice)
-                  })
+                  else{
+                    if (j == index) {
+                      baseprice = parseFloat(_priceList[i].basicUnitPrice)
+                    } else {
+                      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))
+                    }
+                    _leftObj.priceList.push({
+                      index: j,
+                      priceStart: parseFloat(_priceList[i].detailList[j].water),
+                      priceEnd: parseFloat(_priceList[i].detailList[j - 2].water),
+                      type: parseFloat(_priceList[i].detailList[j].type),
+                      water: _priceList[i].detailList[j].water,
+                      jfprice: parseFloat(_priceList[i].detailList[j - 1].jfprice),
+                      baseprice: baseprice,
+                      price: (parseFloat(_priceList[i].detailList[j].water) - parseFloat(_priceList[i].detailList[j -
+                        2].water)) / 0.1 * parseFloat(_priceList[i].detailList[j - 1].jfprice)
+                    })
+                  }
+                  
                 }
               }
             }
@@ -1044,24 +1100,50 @@
               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(_priceList[i].basicUnitPrice)
-                  } 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))
+                  if(this.baseInfoForm.paramType == '1'){
+                    if (k == index) {
+                      baseprice = parseFloat(_priceList[i].basicUnitPrice)
+                    } else {
+                      baseprice = parseFloat(parseFloat(_priceList[i].basicUnitPrice) - (parseFloat(_priceList[i].detailList[k]
+                        .water) - parseFloat(_priceList[i].detailList[k - 2].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)))
+                    }
+                    _rightObj.priceList.push({
+                      index: k,
+                      priceStart: parseFloat(_priceList[i].detailList[k].water),
+                      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)),
+                      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)
+                    })
                   }
-                  _rightObj.priceList.push({
-                    index: k,
-                    priceStart: parseFloat(_priceList[i].detailList[k].water),
-                    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),
-                    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 {
+                      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,
+                      priceStart: parseFloat(_priceList[i].detailList[k].water),
+                      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),
+                      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)
+                    })
+                  }
+                  
                 }
               }
             }

src/views/houseSelfCollect/inspectInfo.vue

@@ -48,10 +48,14 @@
                   :value="item.goodsName" />
               </ws-select>
             </ws-form-item>
-            <ws-form-item label="扣重比" span="1" prop="buckleWeightRatio">
+            <ws-form-item v-if="inspect.paramType != '1'" label="扣重比" span="1" prop="buckleWeightRatio">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.buckleWeightRatio" placeholder="请输入扣重比" maxlength="100" size="small"
                 :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"
+                :disabled="disabled" />
+            </ws-form-item>
             <ws-form-item label="类型" span="1" prop="type">
               <ws-select v-model="inspect.type" :disabled="disabled" @change="typeChange">
                 <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
@@ -152,8 +156,10 @@
         inspect: {
           tidalGrainPrice: 0,
           buckleWeightRatio: 0,
+          buckleMiscellaneous:0,
           natureOfGrainPurchase:'贸易粮',
-          type:'潮粮'
+          type:'潮粮',
+          paramType:'1'
         },
         disabled: false,
         disabled1: false,
@@ -338,28 +344,31 @@
           })
           return
         }
-        if (
-          this.inspect.buckleWeightRatio < 0 ||
-          this.inspect.buckleWeightRatio > 2
-        ) {
-          this.$message({
-            message: '扣重比输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          String(this.inspect.buckleWeightRatio).indexOf('.') != -1 &&
-          String(this.inspect.buckleWeightRatio).length -
-            (String(this.inspect.buckleWeightRatio).indexOf('.') + 1) >
-            2
-        ) {
-          this.$message({
-            message: '扣重比输入错误',
-            type: 'warning',
-          })
-          return
+        if(this.inspect.paramType == '2'){
+          if (
+            this.inspect.buckleWeightRatio < 0 ||
+            this.inspect.buckleWeightRatio > 2
+          ) {
+            this.$message({
+              message: '扣重比输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            String(this.inspect.buckleWeightRatio).indexOf('.') != -1 &&
+            String(this.inspect.buckleWeightRatio).length -
+              (String(this.inspect.buckleWeightRatio).indexOf('.') + 1) >
+              2
+          ) {
+            this.$message({
+              message: '扣重比输入错误',
+              type: 'warning',
+            })
+            return
+          }
         }
+        
         if (!this.inspect.type) {
           this.$message({
             message: '类型不能为空',
@@ -636,19 +645,21 @@
       //   debugger
       //   if (this.inspect.goodsName) {
       waterContentChange(type) {
+        var that = this
         if (this.inspect.goodsName&&type!='water') {
+          getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
+          .toPromise()
+          .then((response) => { 
+            that.$set(that.inspect,'dryGrainPrice',response)
+            
+          })
           for (var i = 0; i < this.purchasePriceList.length; i++) {
             if (this.purchasePriceList[i].goodsName == this.inspect.goodsName) {
               this.$set(this.inspect,'buckleWeightRatio',this.purchasePriceList[i].deductWeight)
+              this.$set(this.inspect,'paramType',this.purchasePriceList[i].paramType)
+              
             }
           }
-          if(this.inspect.type == '干粮'){
-             getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
-                .toPromise()
-                .then((response) => { 
-                  this.$set(this.inspect,'dryGrainPrice',response)
-                })
-          }
         }
         //潮粮单价改变事件
         if (
@@ -664,43 +675,47 @@
             })
             .toPromise()
             .then((response) => {
-              this.inspect.tidalGrainPrice = response
-              this.unitPrice = response
+              if(that.inspect.paramType == '1'){
+                that.inspect.tidalGrainPrice = parseFloat(response) - parseFloat(that.inspect.buckleMiscellaneous)/100*parseFloat(that.inspect.dryGrainPrice)
+              }else{
+                that.inspect.tidalGrainPrice = response
+              }
+              that.unitPrice = response
             })
         }
         if(this.inspect.goodsName && this.inspect.customerName ){
              // //查看当前用户对应货名有未结算状态的送货
-       let count = 0
-        if (
-          this.inspect.goodsName &&
-          this.inspect.customerName 
-        ) {
-          getCount({
-          compId: sessionStorage.getItem('ws-pf_compId'),
-          customerName: this.inspect.customerName,
-          goodsName: this.inspect.goodsName,
-        })  .toPromise()
-          .then((response) => {
-               count = response
+          let count = 0
+          if (
+            this.inspect.goodsName &&
+            this.inspect.customerName 
+          ) {
+            getCount({
+            compId: sessionStorage.getItem('ws-pf_compId'),
+            customerName: this.inspect.customerName,
+            goodsName: this.inspect.goodsName,
+          })  .toPromise()
+            .then((response) => {
+                count = response
+            })
+          //  货名下拉校验
+          getamount({
+            compId: sessionStorage.getItem('ws-pf_compId'),
+            customerName: this.inspect.customerName,
+            goodsName: this.inspect.goodsName,
           })
-        //  货名下拉校验
-        getamount({
-          compId: sessionStorage.getItem('ws-pf_compId'),
-          customerName: this.inspect.customerName,
-          goodsName: this.inspect.goodsName,
-        })
-          .toPromise()
-          .then((response) => {
-            for (let i = 0; i < this.purchasePriceList.length; i++) {
-              if (this.inspect.goodsName == this.purchasePriceList[i].goodsName) {
-                if ((this.purchasePriceList[i].saleLimit - response/1000 < 50 || count > 0 )&&this.tipFlag) {
-                  this.tipFlag = false
-                  this.$message('当前客户已累计销售我司' +this.inspect.goodsName + (response/1000).toFixed(2) +'吨，最高可售' +this.purchasePriceList[i].saleLimit +'吨。');
+            .toPromise()
+            .then((response) => {
+              for (let i = 0; i < this.purchasePriceList.length; i++) {
+                if (this.inspect.goodsName == this.purchasePriceList[i].goodsName) {
+                  if ((this.purchasePriceList[i].saleLimit - response/1000 < 50 || count > 0 )&&this.tipFlag) {
+                    this.tipFlag = false
+                    this.$message('当前客户已累计销售我司' +this.inspect.goodsName + (response/1000).toFixed(2) +'吨，最高可售' +this.purchasePriceList[i].saleLimit +'吨。');
+                  }
                 }
               }
-            }
-          })
-        }
+            })
+          }
         }
       },
 

src/views/houseSelfCollect/settlement.vue

@@ -141,7 +141,7 @@
                 disabled
               />
             </ws-form-item>
-            <ws-form-item v-if='paymentList.type=="潮粮"' label="扣重比" span="1" prop="waterContent">
+            <ws-form-item v-if="paymentList.type=='潮粮' && paymentList.qualityInspectionManagement.paramType != '1'" label="扣重比" span="1" prop="waterContent">
               <ws-input type="number" @mousewheel.native.prevent
               @input='buckleWeightRatiochange'
               v-model="paymentList.buckleWeightRatio"
@@ -160,7 +160,7 @@
                 disabled
               />
             </ws-form-item>
-            <ws-form-item v-if='paymentList.type=="潮粮"' label="扣重" span="1" prop="waterContent">
+            <ws-form-item v-if='paymentList.type=="潮粮" && paymentList.qualityInspectionManagement.paramType == "1"' label="扣重" span="1" prop="waterContent">
               <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.weightDeduction" placeholder="请输入扣重" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"' label="掉水(%)" span="1" prop="waterContent">
@@ -192,7 +192,7 @@
               />
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"' label="扣杂（公斤）" span="1" prop="waterContent">
-              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.weighingManagement.buckleMiscellaneous" placeholder="请输入扣杂" maxlength="100" size="small" disabled/>
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.buckleMiscellaneous" placeholder="请输入扣杂" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item  label="扣单价（元/公斤）" span="1" prop="unitDeduction">
               <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.unitDeduction" @input="grainMoney" placeholder="请输入扣单价" maxlength="100" size="small" :disabled="disabled"/>
@@ -727,7 +727,7 @@ export default {
       postpaymentedit(this.paymentList).toPromise().then((response) => {
          getpaymentexamine({id:this.$route.query.id}).toPromise().then((response) => {
              this.printData= response
-             console.log(this.printData,"结算打印")
+             console.log(this.printData,'结算打印')
          })
          this.isShowPrint = true
         },

src/views/houseSelfCollect/weightCheck.vue

@@ -86,10 +86,10 @@
               </ws-form-item>
               <el-button type="primary" v-if="index != 0" @click="openPort">重新获取</el-button>
               <div class="formItem">
-                <ws-form-item label="扣杂（公斤）" span="1" prop="buckleWeightRatio" v-if="information == '皮重'">
-                  <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.buckleMiscellaneous" @input="calculation" placeholder="请输入扣杂"
+                <!-- <ws-form-item label="扣重（公斤）" span="1" prop="buckleWeightRatio" v-if="information == '皮重'">
+                  <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.buckleMiscellaneous" @input="calculation" placeholder="请输入扣重"
                     maxlength="100" size="small" />
-                </ws-form-item>
+                </ws-form-item> -->
 
                 <ws-form-item label="净重（公斤）" span="1" prop="netWeight" v-if="information == '皮重'">
                   <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.netWeight" placeholder="请输入净重" maxlength="100" size="small"

vue.config.js

@@ -141,7 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.120:8090/',
+        target: 'http://192.168.1.122:8090/',
         // target: 'http://192.168.1.115:8090/',
         // target: 'http://192.168.1.122:9100/',
         // target: 'http://192.168.1.121:8090/',