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

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 +'吨。');
                 }
               }
             }

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')),

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -631,38 +631,38 @@
         })
       },
       submit() {
-        for (var i = 0; i < this.freightspace.length; i++) {
-          if (this.freightspace[i].temporaryDriverFlag != 0) {
-            if (!this.freightspace[i].driver) {
-              this.$message({
-                message: '司机姓名不能为空！',
-                type: 'warning'
-              })
-              return
-            }
-            if (!this.freightspace[i].driverPhone) {
-              this.$message({
-                message: '司机电话不能为空！',
-                type: 'warning'
-              })
-              return
-            }
-            if (!this.freightspace[i].carNo) {
-              this.$message({
-                message: '车牌号不能为空！',
-                type: 'warning'
-              })
-              return
-            }
-            if (!this.freightspace[i].loadNetWeight) {
-              this.$message({
-                message: '装载净重不能为空！',
-                type: 'warning'
-              })
-              return
-            }
-          }
-        }
+        // for (var i = 0; i < this.freightspace.length; i++) {
+        //   if (this.freightspace[i].temporaryDriverFlag != 0) {
+        //     if (!this.freightspace[i].driver) {
+        //       this.$message({
+        //         message: '司机姓名不能为空！',
+        //         type: 'warning'
+        //       })
+        //       return
+        //     }
+        //     if (!this.freightspace[i].driverPhone) {
+        //       this.$message({
+        //         message: '司机电话不能为空！',
+        //         type: 'warning'
+        //       })
+        //       return
+        //     }
+        //     if (!this.freightspace[i].carNo) {
+        //       this.$message({
+        //         message: '车牌号不能为空！',
+        //         type: 'warning'
+        //       })
+        //       return
+        //     }
+        //     if (!this.freightspace[i].loadNetWeight) {
+        //       this.$message({
+        //         message: '装载净重不能为空！',
+        //         type: 'warning'
+        //       })
+        //       return
+        //     }
+        //   }
+        // }
         if (sessionStorage.getItem('qy-msg')) {
           this.validateFunc()
         } else {

src/views/warehouse/warehouseManagementGross.vue

@@ -1412,6 +1412,12 @@ export default {
               this.deptBudgetList.inOutFlag = 2
               this.deptBudgetList.pcFlag = 1
               this.deptBudgetList.statusFlag = 3
+              his.deptBudgetList.grossWeight /= 1000
+                this.deptBudgetList.tare /= 1000
+                this.deptBudgetList.netWeight /= 1000
+                this.deptBudgetList.pureWeight /= 1000
+                this.deptBudgetList.deductionAmount *= 1000
+                this.deptBudgetList.deductionWeight /= 1000
               addstorageputList(this.deptBudgetList)
                 .toPromise()
                 .then((response) => {
@@ -1915,7 +1921,7 @@ export default {
                 this.deptBudgetList.netWeight /= 1000
                 this.deptBudgetList.pureWeight /= 1000
                 this.deptBudgetList.deductionAmount *= 1000
-                this.deptBudgetList.deductionWeight *= 1000
+                this.deptBudgetList.deductionWeight /= 1000
               addstorageputList(this.deptBudgetList)
                 .toPromise()
                 .then((response) => {

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -641,7 +641,7 @@ export default {
     this.dataList.solidGrainWater=this.$route.query.solidGrainWater
     this.dataList.pureWeight=this.$route.query.pureWeight*1000
     this.dataList.deductionAmount=this.$route.query.deductionAmount/1000
-    this.dataList.deductionWeight=this.$route.query.deductionWeight/1000
+    this.dataList.deductionWeight=this.$route.query.deductionWeight*1000
     this.dataList.inOutTypeFlag=1
     if(this.dataList.cost){
       this.isGetCost = true
@@ -1368,7 +1368,7 @@ export default {
               if(!this.dataList.deductionAmount){
                 this.dataList.deductionAmount = 0
               }
-              this.dataList.deductionWeight *= 1000
+              this.dataList.deductionWeight /= 1000
               this.dataList.deductionAmount *= 1000
               addstorageputList(this.dataList)
                 .toPromise()

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -1107,9 +1107,11 @@ export default {
               this.dataList.inOutFlag = 1
               this.dataList.statusFlag = 3
               this.dataList.grossWeight /= 1000
-              this.dataList.tare /= 1000
-              this.dataList.netWeight /= 1000
-              this.dataList.pureWeight /= 1000
+                this.dataList.tare /= 1000
+                this.dataList.netWeight /= 1000
+                this.dataList.pureWeight /= 1000
+                this.dataList.deductionAmount *= 1000
+                this.dataList.deductionWeight /= 1000
               addstorageputList(this.dataList)
                 .toPromise()
                 .then((response) => {

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">{{

src/views/warehouse/warehouseManagementTare.vue

@@ -990,10 +990,10 @@ export default {
               this.deptBudgetList.inOutFlag = 1
               this.deptBudgetList.pcFlag = 1
               this.deptBudgetList.statusFlag = 1
-              this.deptBudgetList.grossWeight /= 1000
-              this.deptBudgetList.tare /= 1000
-              this.deptBudgetList.netWeight /= 1000
-              this.deptBudgetList.pureWeight /= 1000
+              his.deptBudgetList.grossWeight /= 1000
+                this.deptBudgetList.tare /= 1000
+                this.deptBudgetList.netWeight /= 1000
+                this.deptBudgetList.pureWeight /= 1000
               addstorageputList(this.deptBudgetList)
                 .toPromise()
                 .then((response) => {
@@ -1408,6 +1408,12 @@ 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.deductionAmount *= 1000
+                this.deptBudgetList.deductionWeight /= 1000
             this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
             this.deptBudgetList.inOutFlag = 1
             this.deptBudgetList.statusFlag = 3

src/views/warehouse/weightedsubsidiary.vue

@@ -120,7 +120,7 @@
         </el-table-column>
         <el-table-column prop="costAfter" label="入库后加权成本" >
           <template slot-scope="scope">
-            <div>{{scope.row.costAfter}}<span v-if='scope.row.grainType'>(改)</span></div>
+            <div>{{scope.row.costAfter}}<span v-if='!scope.row.grainType'>(改)</span></div>
           </template>
         </el-table-column>
         <el-table-column  prop="createDate" label="更新日期">