Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/layout/index/top/index.vue

@@ -383,7 +383,6 @@
       ...mapActions('common', ['setLocalVessels']),
       ...mapActions('user', ['getUserInfo','toSetShow']),
       payCode() {
-		this.barCode = this.barCode.toLocaleLowerCase()
 		  console.log('input', this.barCode)
         this.btnStatus = {
           status1: false,
@@ -395,10 +394,10 @@
         }
         // let _userCompId = "2710b21efc1e4393930c5dc800010dc4"
         // let _qualityNo = "SGRK202112140060003"
-        let _userCompId = this.barCode.split('&')[0]
+        let _userCompId = this.barCode.split('&')[0].toLocaleLowerCase()
         let _qualityNo = this.barCode.split('&')[1]
-        let _userHouseId = this.barCode.split('&')[2]
-        this.cangid = this.barCode.split('&')[2]
+        let _userHouseId = this.barCode.split('&')[2].toLocaleLowerCase()
+        this.cangid = this.barCode.split('&')[2].toLocaleLowerCase()
         if(_userCompId.indexOf(',') != -1){
          _userCompId =  _userCompId.split(',')[1]
         }

src/views/warehouse/warehouseManagementGross.vue

@@ -96,7 +96,7 @@
                   <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
                 </ws-select>
               </ws-form-item>
-              <ws-form-item label="扣款（元/公斤）" span="1" prop="deductionAmount">
+              <ws-form-item label="扣款（元/吨）" span="1" prop="deductionAmount">
                 <ws-input @input="kkInput(deptBudgetList.deductionAmount)" v-model="deptBudgetList.deductionAmount"
                   placeholder="请输入扣款金额" maxlength="120" size="small" />
                 <el-button v-if="deptBudgetList.warehouseName=='克东千丰库'" class="bg-bottom" type="primary" size="small"
@@ -607,7 +607,7 @@
         if (this.deptBudgetList.warehouseInOutDetail.waterContent) {
           let _water = this.deptBudgetList.warehouseInOutDetail.waterContent
           if (Number(_water) > 14.9) {
-            _price = ((Number(_water) - 14.9) * 0.05).toFixed(3)
+            _price = ((Number(_water) - 14.9) * 50).toFixed(3)
           }
           this.deptBudgetList.deductionAmount = _price
           this.kkInput(_price)
@@ -901,20 +901,20 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.deductionAmount < 0 ||
-          this.deptBudgetList.deductionAmount > 10000 ||
-          (String(this.deptBudgetList.deductionAmount).indexOf('.') != -1 &&
-            String(this.deptBudgetList.deductionAmount).length -
-            (String(this.deptBudgetList.deductionAmount).indexOf('.') + 1) >
-            2)
-        ) {
-          this.$message({
-            message: '扣款输入错误',
-            type: 'warning',
-          })
-          return
-        }
+        // if (
+        //   this.deptBudgetList.deductionAmount < 0 ||
+        //   this.deptBudgetList.deductionAmount > 10000 ||
+        //   (String(this.deptBudgetList.deductionAmount).indexOf('.') != -1 &&
+        //     String(this.deptBudgetList.deductionAmount).length -
+        //     (String(this.deptBudgetList.deductionAmount).indexOf('.') + 1) >
+        //     2)
+        // ) {
+        //   this.$message({
+        //     message: '扣款输入错误',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.deptBudgetList.cost) {
           this.$message({
             message: '未获取到成本，请编辑后提交',

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -100,7 +100,7 @@
                   <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
                 </ws-select>
               </ws-form-item>
-              <ws-form-item label="扣款（元/公斤）" span="1" prop="deductionAmount">
+              <ws-form-item label="扣款（元/吨）" span="1" prop="deductionAmount">
                 <ws-input @input="kkInput(dataList.deductionAmount)" v-model="dataList.deductionAmount"
                   placeholder="请输入扣款金额" maxlength="120" size="small" />
               <el-button v-if="dataList.warehouseName=='克东千丰库'" class="bg-bottom" type="primary" size="small"
@@ -554,7 +554,7 @@
             value: '3',
           },
         ],
-        tare: "",
+        tare: '',
       }
     },
     mounted() {},
@@ -605,7 +605,7 @@
       this.dataList.tidalGrainWater = this.$route.query.tidalGrainWater
       this.dataList.solidGrainWater = this.$route.query.solidGrainWater
       this.dataList.pureWeight = Math.round(this.$route.query.pureWeight * 1000)
-      this.dataList.deductionAmount = this.$route.query.deductionAmount / 1000
+      this.dataList.deductionAmount = this.$route.query.deductionAmount 
       this.dataList.deductionWeight = Math.round(
         this.$route.query.deductionWeight * 1000
       )
@@ -627,7 +627,7 @@
         if (this.dataList.warehouseInOutDetail.waterContent) {
           let _water = this.dataList.warehouseInOutDetail.waterContent
           if (Number(_water) > 14.9) {
-            _price = ((Number(_water) - 14.9) * 0.05).toFixed(3)
+            _price = ((Number(_water) - 14.9) * 50).toFixed(3)
           }
           this.dataList.deductionAmount = _price
           this.kkInput(_price)
@@ -1009,20 +1009,20 @@
           })
           return
         }
-        if (
-          this.dataList.deductionAmount < 0 ||
-          this.dataList.deductionAmount > 10000 ||
-          (String(this.dataList.deductionAmount).indexOf('.') != -1 &&
-            String(this.dataList.deductionAmount).length -
-            (String(this.dataList.deductionAmount).indexOf('.') + 1) >
-            2)
-        ) {
-          this.$message({
-            message: '扣款输入错误',
-            type: 'warning',
-          })
-          return
-        }
+        // if (
+        //   this.dataList.deductionAmount < 0 ||
+        //   this.dataList.deductionAmount > 10000 ||
+        //   (String(this.dataList.deductionAmount).indexOf('.') != -1 &&
+        //     String(this.dataList.deductionAmount).length -
+        //     (String(this.dataList.deductionAmount).indexOf('.') + 1) >
+        //     2)
+        // ) {
+        //   this.$message({
+        //     message: '扣款输入错误',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.dataList.cost) {
           this.$message({
             message: '未获取到成本，请编辑后提交',
@@ -1389,9 +1389,9 @@
                 this.dataList.deductionWeight = (
                   this.dataList.deductionWeight / 1000
                 ).toFixed(2)
-                this.dataList.deductionAmount = Math.round(
-                  this.dataList.deductionAmount * 1000
-                )
+                // this.dataList.deductionAmount = Math.round(
+                //   this.dataList.deductionAmount * 1000
+                // )
                 addstorageputList(this.dataList)
                   .toPromise()
                   .then((response) => {