前端dev

src/lang/zh.js

@@ -4852,6 +4852,7 @@ export default {
     warehouselocation: '成本管理  /  库点费用',
     weightedsubsidiary: '加权明细',
     costmanagement: '成本管理',
+    warehouseManagement:'全部仓库',
     warehouseManagementAdd: '仓库管理添加',
     warehouseManagementEdit: '仓库管理编辑',
     warehouseManagementPut: '入库',

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -1262,6 +1262,13 @@
         if (this.reader) {
           this.reader.cancel()
         }
+        if(!this.deptBudgetList.binNumber){
+          this.$message({
+            message: '请选择仓位号',
+            type: 'warning',
+          })
+          return
+        }
         if (!this.deptBudgetList.goodsName) {
           this.$message({
             message: '货名不能为空',

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -169,7 +169,7 @@
 
             </div>
 
-            <el-table ref="singleTable" :data="carList" highlight-current-row @current-change="handleCurrentChange"
+            <el-table  ref="singleTable" :data="carList" highlight-current-row @current-change="handleCurrentChange"
               style="width: 100%; overflow-y: scroll !important;; height: calc(100vh - 54vh);margin-top:20px">
               <el-table-column property="number" label="业务编号">
               </el-table-column>
@@ -745,8 +745,10 @@
           this.carList1 = this.pListTotal
           if (this.pList.length != 0) {
             this.setCurrent(this.pList[0])
-
             this.weighingList = this.pList[0]
+            this.weighingList.inOutType = this.pList[0].qualityInspectionManagement.inOutType
+            this.weighingList.inOutTypeKey = this.pList[0].qualityInspectionManagement.inOutTypeKey
+            console.log(this.weighingList)
             this.carWeightInfo = {
               carNumber: this.pList[0].carNumber,
               type: this.information,
@@ -1363,6 +1365,9 @@
                       warehousing.deductionAmount = Number(warehousing.deductionAmount) * 1000
                       warehousing.deductionWeight /= 1000
                       warehousing.inOutFlag = 2
+                      console.log(that.weighingList)
+                      warehousing.inOutTypeKey=that.weighingList.inOutTypeKey
+                      warehousing.inOutType=that.weighingList.inOutType
                       warehousing.id=warehousing.warehouseInOutId
                       // delete that.inOutDate.status
                       that.inOutDate = Object.assign(that.inOutDate, warehousing)
@@ -1620,9 +1625,9 @@
     // background: #f6f7fc;
   }
 
-  /deep/.el-table td {
-    background: #e7e8ef;
-  }
+  // /deep/.el-table td {
+  //   background: #e7e8ef;
+  // }
 
   /deep/.el-table--enable-row-transition .el-table__body td {
     text-align: center;
@@ -1924,4 +1929,16 @@
     padding: 0 20px;
     margin-top: 20px;
   }
+  /deep/.el-table__body .current-row td{
+    border-top: 4px solid #2aff7c ;
+    border-bottom: 4px solid #2aff7c ;
+  }
+  /deep/.el-table__body .current-row td:first-child{
+    border-left: 4px solid #2aff7c ;
+    // border-bottom: 1px solid #2aff7c ;
+  }
+  /deep/.el-table__body .current-row td:last-child{
+    border-right: 4px solid #2aff7c ;
+    // border-bottom: 1px solid #2aff7c ;
+  }
 </style>