gjy 3 years ago
parent
commit
5e4f880e2e

+ 1 - 1
src/views/houseSelfCollect/inspectInfo.vue

@@ -783,7 +783,7 @@
               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 +'吨。');
+                  this.$message('当前客户已累计销售我司' +this.inspect.goodsName + (response/1000).toFixed(2) +'吨,最高可售' +this.purchasePriceList[i].saleLimit/1000 +'吨。');
                 }
               }
             }

+ 8 - 1
src/views/houseSelfCollect/weightCheck.vue

@@ -638,7 +638,8 @@
                     ) {
                       //累计售粮超上限不能完成毛检保存
                       let count = (this.purchasePriceList[i].saleLimit - response / 1000).toFixed(2)
-                      console.log(this.weighingList.grossWeight / 1000, '毛重转吨')
+                      // console.log(this.weighingList.grossWeight / 1000, '毛重转吨')
+                      this.weighingList.grossWeight/=1000
                       if (count - this.weighingList.grossWeight / 1000 < 0) {
                         this.$alert(
                           '该客户累计销售' +
@@ -678,6 +679,12 @@
                   }
                 })
             } else if (this.tpyeNo == 2) {
+              this.weighingList.grossWeight/=1000
+              this.weighingList.tare/=1000
+              if(this.weighingList.buckleMiscellaneous){
+                this.weighingList.buckleMiscellaneous/=1000
+              }
+              this.weighingList.netWeight/=1000
               this.weighingList.warehouseId = this.warehouseId;
               (this.weighingList.skinInspector =
                 sessionStorage.getItem('ws-pf_staffName')),

+ 4 - 0
src/views/warehouse/warehouseManagementGross.vue

@@ -1412,6 +1412,10 @@ export default {
               this.deptBudgetList.inOutFlag = 2
               this.deptBudgetList.pcFlag = 1
               this.deptBudgetList.statusFlag = 3
+               this.deptBudgetList.grossWeight /= 1000
+              this.deptBudgetList.tare /= 1000
+              this.deptBudgetList.netWeight /= 1000
+              this.deptBudgetList.pureWeight /= 1000
               addstorageputList(this.deptBudgetList)
                 .toPromise()
                 .then((response) => {

+ 1 - 1
src/views/warehouse/warehouseManagementRecord.vue

@@ -92,7 +92,7 @@
 					<el-table-column prop="deductionWeight" label="扣重(吨)"> </el-table-column>
 					<el-table-column prop="netWeight" label="净重(吨)"></el-table-column>
 					<el-table-column prop="pureWeight" label="纯重(吨)"> </el-table-column>
-					<el-table-column prop="deductionAmount" label="扣款(元/吨)"> </el-table-column>
+					<el-table-column width='120' prop="deductionAmount" label="扣款(元/吨)"> </el-table-column>
 					<el-table-column prop="grade" label="品级" width="80px">
 						<template slot-scope="scope">
 							<span v-if="scope.row.grade == '一等品'" class="top-grade">{{

+ 4 - 0
src/views/warehouse/warehouseManagementTare.vue

@@ -1408,6 +1408,10 @@ export default {
       }).then(() => {
         this.$refs.deptBudgetList.validate((valid) => {
           if (valid) {
+             this.deptBudgetList.grossWeight /= 1000
+              this.deptBudgetList.tare /= 1000
+              this.deptBudgetList.netWeight /= 1000
+              this.deptBudgetList.pureWeight /= 1000
             this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
             this.deptBudgetList.inOutFlag = 1
             this.deptBudgetList.statusFlag = 3