前端

public/static/weightCheckInOut.html

@@ -146,11 +146,13 @@
           </tr>
           <tr class="row">
             <td class="col col-bgc">毛重（吨）</td>
-            <td class="col" colspan="2">{{tableData.grossWeight}}</td>
+            <td class="col">{{tableData.grossWeight}}</td>
             <td class="col col-bgc">皮重（吨）</td>
-            <td class="col" colspan="2">{{tableData.tare}}</td>
-            <td class="col col-bgc">净重（吨）</td>
-            <td class="col" colspan="2">{{tableData.netWeight}}</td>
+            <td class="col">{{tableData.tare}}</td>
+            <td class="col col-bgc">扣重（吨）</td>
+            <td class="col" >{{tableData.deductionWeight}}</td>
+            <td class="col col-bgc" colspan="2">净重（吨）</td>
+            <td class="col" >{{tableData.netWeight}}</td>
           </tr>
         </table>
         <div class="bottom">

src/components/balanceAlert.vue

@@ -135,7 +135,8 @@ export default {
               this.deptBudgetList.warehouseName == '哈尔滨依兰库' ||
               this.deptBudgetList.warehouseName == '龙江金信库' ||
               this.deptBudgetList.warehouseName == '白城内陆港'||
-              this.deptBudgetList.warehouseName == '肇东金信库')
+              this.deptBudgetList.warehouseName == '肇东金信库'||
+              this.deptBudgetList.warehouseName == '呼兰大金仓')
           ) {
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])

src/views/contractManagement/purchaseContractEdit.vue

@@ -895,20 +895,21 @@
           })
           return
         }
-        if (!this.deptBudgetList.unitContractPrice) {
+          if (!this.deptBudgetList.unitContractPrice && this.deptBudgetList.priceType == "定价采购") {
           this.$message({
             message: '请输入合同单价！',
             type: 'warning',
           })
           return
         }
+        
         if (
           isNaN(this.deptBudgetList.unitContractPrice) ||
           (String(this.deptBudgetList.unitContractPrice).indexOf('.') != -1 &&
             String(this.deptBudgetList.unitContractPrice).length -
             (String(this.deptBudgetList.unitContractPrice).indexOf('.') + 1) >
             2) ||
-          this.deptBudgetList.unitContractPrice <= 0 ||
+          this.deptBudgetList.unitContractPrice < 0 ||
           this.deptBudgetList.unitContractPrice > 10000
         ) {
           this.$message({
@@ -917,7 +918,7 @@
           })
           return
         }
-        if (!this.deptBudgetList.totalContractPrice) {
+        if (!this.deptBudgetList.totalContractPrice && this.deptBudgetList.priceType == "定价采购") {
           this.$message({
             message: '请输入合同总价！',
             type: 'warning',
@@ -930,7 +931,7 @@
             String(this.deptBudgetList.totalContractPrice).length -
             (String(this.deptBudgetList.totalContractPrice).indexOf('.') + 1) >
             2) ||
-          this.deptBudgetList.totalContractPrice <= 0 ||
+          this.deptBudgetList.totalContractPrice < 0 ||
           this.deptBudgetList.totalContractPrice > 1000000000
         ) {
           this.$message({
@@ -997,13 +998,13 @@
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.waterContent) {
-          this.$message({
-            message: '请输入水分',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.deptBudgetList.contractGoodsInfo.waterContent) {
+        //   this.$message({
+        //     message: '请输入水分',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (
           this.deptBudgetList.contractGoodsInfo.waterContent &&
           String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') != -1 &&
@@ -1025,13 +1026,13 @@
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.impurity) {
-          this.$message({
-            message: '请输入杂质',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.deptBudgetList.contractGoodsInfo.impurity) {
+        //   this.$message({
+        //     message: '请输入杂质',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (
           this.deptBudgetList.contractGoodsInfo.impurity &&
           String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') != -1 &&
@@ -1045,13 +1046,13 @@
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.bulkDensity) {
-          this.$message({
-            message: '请输入容重',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.deptBudgetList.contractGoodsInfo.bulkDensity) {
+        //   this.$message({
+        //     message: '请输入容重',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (
           (this.deptBudgetList.contractGoodsInfo.bulkDensity &&
             String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') != -1 &&
@@ -1066,25 +1067,19 @@
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.mildewGrain) {
-          this.$message({
-            message: '请输入霉变粒',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          !this.deptBudgetList.contractGoodsInfo.mildewGrain ||
-          (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractGoodsInfo.mildewGrain).length -
-            (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
-                '.'
-              ) +
-              1) >
-            2 || this.deptBudgetList.contractGoodsInfo.mildewGrain > 40 || this.deptBudgetList.contractGoodsInfo
-            .mildewGrain < 0)
+        // if (!this.deptBudgetList.contractGoodsInfo.mildewGrain) {
+        //   this.$message({
+        //     message: '请输入霉变粒',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+         if (
+          this.deptBudgetList.contractGoodsInfo.mildewGrain &&
+          String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf('.') != -1 &&
+          String(this.deptBudgetList.contractGoodsInfo.mildewGrain).length -
+          (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf('.') + 1) >
+          2 || this.deptBudgetList.contractGoodsInfo.mildewGrain > 40 || this.deptBudgetList.contractGoodsInfo.mildewGrain < 0
         ) {
           this.$message({
             message: '霉变粒输入错误',
@@ -1092,24 +1087,19 @@
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.jiaorenli) {
-          this.$message({
-            message: '请输入热损伤',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.deptBudgetList.contractGoodsInfo.jiaorenli) {
+        //   this.$message({
+        //     message: '请输入热损伤',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (
-          !this.deptBudgetList.contractGoodsInfo.jiaorenli ||
-          (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf('.') !=
-            -1 &&
-            String(this.deptBudgetList.contractGoodsInfo.jiaorenli).length -
-            (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf(
-                '.'
-              ) +
-              1) >
-            2 || this.deptBudgetList.contractGoodsInfo.jiaorenli > 40 || this.deptBudgetList.contractGoodsInfo
-            .jiaorenli < 0)
+          this.deptBudgetList.contractGoodsInfo.jiaorenli &&
+          String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf('.') != -1 &&
+          String(this.deptBudgetList.contractGoodsInfo.jiaorenli).length -
+          (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf('.') + 1) >
+          2 || this.deptBudgetList.contractGoodsInfo.jiaorenli > 40 || this.deptBudgetList.contractGoodsInfo.jiaorenli < 0
         ) {
           this.$message({
             message: '热损伤输入错误',
@@ -1117,25 +1107,19 @@
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.imperfectGrain) {
-          this.$message({
-            message: '请输入不完善粒',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.deptBudgetList.contractGoodsInfo.imperfectGrain) {
+        //   this.$message({
+        //     message: '请输入不完善粒',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (
-          !this.deptBudgetList.contractGoodsInfo.imperfectGrain ||
-          (String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).length -
-            (String(
-                this.deptBudgetList.contractGoodsInfo.imperfectGrain
-              ).indexOf('.') +
-              1) >
-            2 || this.deptBudgetList.contractGoodsInfo.imperfectGrain > 40 || this.deptBudgetList.contractGoodsInfo
-            .imperfectGrain < 0)
+          this.deptBudgetList.contractGoodsInfo.imperfectGrain &&
+          String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).indexOf('.') != -1 &&
+          String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).length -
+          (String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).indexOf('.') + 1) >
+          2 || this.deptBudgetList.contractGoodsInfo.imperfectGrain > 40 || this.deptBudgetList.contractGoodsInfo.imperfectGrain < 0
         ) {
           this.$message({
             message: '不完善粒输入错误',
@@ -1143,6 +1127,8 @@
           })
           return
         }
+
+
         if (
           (this.deptBudgetList.contractProcessInfo.waterContent > 10000000) ||
           (this.deptBudgetList.contractProcessInfo.waterContent < 0) ||

src/views/contractManagement/salesContractEdit.vue

@@ -238,7 +238,7 @@
             <span class="unchangeable">*</span>
           </ws-form-item>
           <!-- 最终实际交易量（吨） -->
-          <ws-form-item label="最终实际交易量（吨）" span="1" prop="totalContractPrice">
+          <ws-form-item label="最终实际交易量（吨）" span="1" prop="finalTradingVolume">
             <ws-input v-model="deptBudgetList.finalTradingVolume" maxlength="100" placeholder="请输入最终实际交易量"
               size="small" />
           </ws-form-item>
@@ -913,7 +913,7 @@
           })
           return
         }
-        if (!this.deptBudgetList.unitContractPrice) {
+          if (!this.deptBudgetList.unitContractPrice && this.deptBudgetList.priceType == "定价销售") {
           this.$message({
             message: '请输入合同单价！',
             type: 'warning',
@@ -926,7 +926,7 @@
             String(this.deptBudgetList.unitContractPrice).length -
             (String(this.deptBudgetList.unitContractPrice).indexOf('.') + 1) >
             2) ||
-          this.deptBudgetList.unitContractPrice <= 0 ||
+          this.deptBudgetList.unitContractPrice < 0 ||
           this.deptBudgetList.unitContractPrice > 10000
         ) {
           this.$message({
@@ -935,20 +935,21 @@
           })
           return
         }
-        if (!this.deptBudgetList.totalContractPrice) {
+             if (!this.deptBudgetList.totalContractPrice && this.deptBudgetList.priceType == "定价销售") {
           this.$message({
             message: '请输入合同总价！',
             type: 'warning',
           })
           return
         }
+     
         if (
           isNaN(this.deptBudgetList.totalContractPrice) ||
           (String(this.deptBudgetList.totalContractPrice).indexOf('.') != -1 &&
             String(this.deptBudgetList.totalContractPrice).length -
             (String(this.deptBudgetList.totalContractPrice).indexOf('.') + 1) >
             2) ||
-          this.deptBudgetList.totalContractPrice <= 0 ||
+          this.deptBudgetList.totalContractPrice < 0 ||
           this.deptBudgetList.totalContractPrice > 1000000000
         ) {
           this.$message({
@@ -1015,6 +1016,13 @@
           })
           return
         }
+        // if (!this.deptBudgetList.contractGoodsInfo.waterContent) {
+        //   this.$message({
+        //     message: '请输入水分',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (
           this.deptBudgetList.contractGoodsInfo.waterContent &&
           String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') != -1 &&
@@ -1036,6 +1044,13 @@
           })
           return
         }
+        // if (!this.deptBudgetList.contractGoodsInfo.impurity) {
+        //   this.$message({
+        //     message: '请输入杂质',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (
           this.deptBudgetList.contractGoodsInfo.impurity &&
           String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') != -1 &&
@@ -1049,6 +1064,13 @@
           })
           return
         }
+        // if (!this.deptBudgetList.contractGoodsInfo.bulkDensity) {
+        //   this.$message({
+        //     message: '请输入容重',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (
           (this.deptBudgetList.contractGoodsInfo.bulkDensity &&
             String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') != -1 &&
@@ -1063,18 +1085,20 @@
           })
           return
         }
+        // if (!this.deptBudgetList.contractGoodsInfo.mildewGrain) {
+        //   this.$message({
+        //     message: '请输入霉变粒',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (
-          !this.deptBudgetList.contractGoodsInfo.mildewGrain ||
-          (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
-              '.'
-            ) != -1 &&
+          (this.deptBudgetList.contractGoodsInfo.mildewGrain &&
+            String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf('.') != -1 &&
             String(this.deptBudgetList.contractGoodsInfo.mildewGrain).length -
-            (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
-                '.'
-              ) +
-              1) >
-            2 || this.deptBudgetList.contractGoodsInfo.mildewGrain > 40 || this.deptBudgetList.contractGoodsInfo
-            .mildewGrain < 0)
+            (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf('.') + 1) >
+            2) || this.deptBudgetList.contractGoodsInfo.mildewGrain > 40|| this.deptBudgetList.contractGoodsInfo
+          .mildewGrain < 0
         ) {
           this.$message({
             message: '霉变粒输入错误',
@@ -1082,17 +1106,19 @@
           })
           return
         }
-        if (
-          !this.deptBudgetList.contractGoodsInfo.jiaorenli ||
-          (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf('.') !=
-            -1 &&
+        // if (!this.deptBudgetList.contractGoodsInfo.jiaorenli) {
+        //   this.$message({
+        //     message: '请输入热损伤',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+         if (
+          (this.deptBudgetList.contractGoodsInfo.jiaorenli &&
+            String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf('.') != -1 &&
             String(this.deptBudgetList.contractGoodsInfo.jiaorenli).length -
-            (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf(
-                '.'
-              ) +
-              1) >
-            2 || this.deptBudgetList.contractGoodsInfo.jiaorenli > 40 || this.deptBudgetList.contractGoodsInfo
-            .jiaorenli < 0)
+            (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf('.') + 1) >
+            2) || this.deptBudgetList.contractGoodsInfo.jiaorenli > 40|| this.deptBudgetList.contractGoodsInfo.jiaorenli < 0
         ) {
           this.$message({
             message: '热损伤输入错误',
@@ -1100,18 +1126,19 @@
           })
           return
         }
-        if (
-          !this.deptBudgetList.contractGoodsInfo.imperfectGrain ||
-          (String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).indexOf(
-              '.'
-            ) != -1 &&
+        // if (!this.deptBudgetList.contractGoodsInfo.imperfectGrain) {
+        //   this.$message({
+        //     message: '请输入不完善粒',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+         if (
+          (this.deptBudgetList.contractGoodsInfo.imperfectGrain &&
+            String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).indexOf('.') != -1 &&
             String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).length -
-            (String(
-                this.deptBudgetList.contractGoodsInfo.imperfectGrain
-              ).indexOf('.') +
-              1) >
-            2 || this.deptBudgetList.contractGoodsInfo.imperfectGrain > 40 || this.deptBudgetList.contractGoodsInfo
-            .imperfectGrain < 0)
+            (String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).indexOf('.') + 1) >
+            2) || this.deptBudgetList.contractGoodsInfo.imperfectGrain > 40|| this.deptBudgetList.contractGoodsInfo.imperfectGrain < 0
         ) {
           this.$message({
             message: '不完善粒输入错误',
@@ -1119,6 +1146,8 @@
           })
           return
         }
+
+
         if(this.deptBudgetList.contractProcessInfo.goodsNameKey){
 
         if (

src/views/warehouse/warehouseManagementGross.vue

@@ -253,6 +253,10 @@
                 ">
                 <ws-input v-if="options2.length == 0" v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7"
                   size="small" />
+                <el-select v-if="carstatus && options2.length == 0&&deptBudgetList.inOutType=='移库入库'" filterable clearable :filter-method="dataFilter2"
+                  v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange">
+                  <el-option v-for="item in options2" :key="item.constKey" :label="item.carNo" :value="item.carNo" />
+                </el-select>
                 <el-select v-if="carstatus && options2.length > 0" filterable clearable v-model="deptBudgetList.carNoCopy" placeholder="请选择车牌号" class="typeselect" @change="carChange">
                   <el-option v-for="(item,index) in options2" :key="index"
                     :label="item.carNo + '(' + item.tranCarNo + ')'" :value="index" />
@@ -1851,7 +1855,7 @@
                 this.deptBudgetList.tare /= 1000
                 this.deptBudgetList.netWeight /= 1000
                 this.deptBudgetList.pureWeight /= 1000
-                this.deptBudgetList.deductionAmount *= 1000
+                // this.deptBudgetList.deductionAmount *= 1000
                 this.deptBudgetList.deductionWeight /= 1000
                 delete this.deptBudgetList.carNoCopy
                 addstorageputList(this.deptBudgetList)
@@ -1876,18 +1880,22 @@
           })
       },
       tarechange(e) {
-        if (
-          this.deptBudgetList.grossWeight &&
-          this.deptBudgetList.tare &&
-          (this.deptBudgetList.deductionWeight ||
-            this.deptBudgetList.deductionWeight == 0)
-        ) {
-          this.deptBudgetList.netWeight = Number(
-            this.deptBudgetList.grossWeight -
-            this.deptBudgetList.tare -
-            this.deptBudgetList.deductionWeight
-          ).toFixed(2)
+        if(this.deptBudgetList.grossWeight){
+          this.deptBudgetList.netWeight = Number(this.deptBudgetList.grossWeight) - Number(this.deptBudgetList.tare) - Number(this.deptBudgetList.deductionWeight)
         }
+          this.deptBudgetList.netWeight = this.deptBudgetList.netWeight.toFixed(2)
+        // if (
+        //   this.deptBudgetList.grossWeight &&
+        //   (this.deptBudgetList.tare || !this.deptBudgetList.tare) &&
+        //   (this.deptBudgetList.deductionWeight ||
+        //     this.deptBudgetList.deductionWeight == 0)
+        // ) {
+        //   this.deptBudgetList.netWeight = Number(
+        //     this.deptBudgetList.grossWeight -
+        //     this.deptBudgetList.tare -
+        //     this.deptBudgetList.deductionWeight
+        //   ).toFixed(2)
+        // }
       },
       grossWeightchange(e) {
         this.grossWeight = this.deptBudgetList.grossWeight
@@ -2090,20 +2098,20 @@
             return false
           })
       },
-      tarechange(e) {
-        if (
-          this.deptBudgetList.grossWeight &&
-          this.deptBudgetList.tare &&
-          (this.deptBudgetList.deductionWeight ||
-            this.deptBudgetList.deductionWeight == 0)
-        ) {
-          this.deptBudgetList.netWeight = Number(
-            this.deptBudgetList.grossWeight -
-            this.deptBudgetList.tare -
-            this.deptBudgetList.deductionWeight
-          ).toFixed(2)
-        }
-      },
+      // tarechange(e) {
+      //   if (
+      //     this.deptBudgetList.grossWeight &&
+      //     this.deptBudgetList.tare &&
+      //     (this.deptBudgetList.deductionWeight ||
+      //       this.deptBudgetList.deductionWeight == 0)
+      //   ) {
+      //     this.deptBudgetList.netWeight = Number(
+      //       this.deptBudgetList.grossWeight -
+      //       this.deptBudgetList.tare -
+      //       this.deptBudgetList.deductionWeight
+      //     ).toFixed(2)
+      //   }
+      // },
       grossWeightchange(e) {
         this.grossWeight = this.deptBudgetList.grossWeight
         if (

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -422,7 +422,7 @@
         //深度监听，可监听到对象、数组的变化
         handler(val, oldVal) {
           if (val.tare) {
-            this.dataList.netWeight = this.dataList.grossWeight - val.tare
+            this.dataList.netWeight = this.dataList.grossWeight - val.tare - val.deductionWeight
           }
         },
         deep: true, //true 深度监听
@@ -583,6 +583,7 @@
       this.dataList.titleNo = this.$route.query.titleNo
       this.dataList.titleNoOther = this.$route.query.titleNoOther
       this.dataList.carNo = this.$route.query.carNo
+      this.dataList.tranCarNo = this.$route.query.tranCarNo
       this.dataList.carId = this.$route.query.carId
       this.dataList.inOutDate = this.$route.query.inOutDate
       this.dataList.contractNo = this.$route.query.contractNo
@@ -1483,16 +1484,23 @@
       },
       tarechange(e) {
         this.tare = this.dataList.tare
-        if (this.dataList.grossWeight && this.dataList.tare) {
-          this.dataList.netWeight = Number(
-            this.dataList.grossWeight - this.dataList.tare
-          ).toFixed(2)
+        if(this.dataList.grossWeight){
+            this.dataList.netWeight = Number(this.dataList.grossWeight) - Number(this.dataList.tare) - Number(this.dataList.deductionWeight)
         }
+        this.dataList.netWeight = this.dataList.netWeight.toFixed(2)
+        // if (this.dataList.grossWeight && this.dataList.tare) {
+        //   this.dataList.netWeight = Number(
+        //     this.dataList.grossWeight - this.dataList.tare - this.dataList.deductionWeight
+        //   ).toFixed(2)
+        // }
       },
       grossWeightchange(e) {
+         if(!this.dataList.deductionWeight){
+          this.dataList.deductionWeight = 0
+        }
         if (this.dataList.grossWeight && this.dataList.tare) {
           this.dataList.netWeight = Number(
-            this.dataList.grossWeight - this.dataList.tare
+            this.dataList.grossWeight - this.dataList.tare - this.dataList.deductionWeight
           ).toFixed(2)
         }
       },