zhongtianhaoyuan 4 éve
szülő
commit
f3ee2240cb

+ 1 - 1
src/views/warehouse/component/router/index.js

@@ -25,7 +25,7 @@ const warehouseManagementRouter = {
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
       },
-      hidden: true
+       hidden: true
     },
 
     {

+ 1 - 0
src/views/warehouse/warehouseManagementDelivery.vue

@@ -1239,6 +1239,7 @@ export default {
   text-align: left;
   margin-left: 0px;
 }
+
 .small-title {
   position: relative;
   padding: 10px;

+ 19 - 5
src/views/warehouse/warehouseManagementIoss.vue

@@ -23,7 +23,7 @@
     <div class="center">
       <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
         <h2>
-          {{ deptBudgetList1.warehouseName }}
+          {{ deptBudgetList1.warehouseName }}
           <span class="position"> {{ deptBudgetList1.binNumber }}仓位 </span>
         </h2>
         <!-- 货名 -->
@@ -248,8 +248,9 @@ export default {
         // .占比=损耗量÷(累计入库-实际库存)
         num = Math.floor((loss / defect) * 1000000) / 1000
       }
-
-      return num
+      // this.deptBudgetList.inventoryRatio = this.deptBudgetList.inventoryRatio.toFixed(3)
+      //  this.deptBudgetList.inventoryRatio = num
+       return num
     },
   },
   activated() {
@@ -258,6 +259,7 @@ export default {
     // this.getVesselData();
     this.loaddata()
     this.showType = this.isShow
+    console.log(this.deptBudgetList)
   },
 
   mounted() {
@@ -284,6 +286,14 @@ export default {
     },
     //提交按钮
     submit() {
+      if(this.deptBudgetList.physicalInventory <= 0){
+        this.$message({
+          message: '请填写实际库存!',
+          type: 'warning',
+        })
+        return
+      }
+
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
           this.deptBudgetList.surplusInventory =
@@ -315,7 +325,7 @@ export default {
           }
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 1
-
+                  console.log(this.deptBudgetList)
           submitioss(this.deptBudgetList)
             .toPromise()
             .then((response) => {
@@ -378,7 +388,11 @@ export default {
       this.ioss()
     },
     ioss() {
-      ioss(this.deptBudgetList)
+      ioss({baseId:this.deptBudgetList.baseId,
+positionId: this.deptBudgetList.positionId,
+goodsNameKey:this.deptBudgetList.goodsNameKey,
+goodsName:this.deptBudgetList.goodsName,
+})
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response

+ 3 - 0
src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -973,6 +973,9 @@ export default {
   text-align: left;
   margin-left: 0px;
 }
+/deep/[data-v-d228e17e] .el-form-item__label {
+    width: 60px;
+}
 .small-title {
   position: relative;
   padding: 10px;

+ 7 - 0
src/views/warehouse/warehouseManagementPerfectput.vue

@@ -986,6 +986,13 @@ export default {
   width: 160px;
 }
 
+//质检员
+/deep/[data-v-58803672] .el-form-item__label {
+    width: 60px;
+}
+[data-v-58803672] .el-form-item__label {
+    width: 60px;
+}
 //选填
 /deep/.el-form-item {
   width: 50%;

+ 4 - 13
src/views/warehouse/warehouseManagementPut.vue

@@ -1186,6 +1186,7 @@ export default {
     }
   }
 }
+
 .title {
   position: relative;
   padding-left: 10px;
@@ -1220,9 +1221,7 @@ export default {
   height: 2000px;
   margin: 0 auto;
 }
-/deep/.el-form-item__label {
-  width: 160px;
-}
+
 //选填
 /deep/.el-form-item {
   width: 50%;
@@ -1253,16 +1252,6 @@ export default {
   display: inline-grid;
   padding: 2px 4px;
 }
-// .position {
-//   width: 52px;
-//   height: 20px;
-//   background: #afb5cb;
-//   border-radius: 2px;
-//   font-size: 12px;
-//   font-family: PingFangSC-Medium, PingFang SC;
-//   color: #ffffff;
-//   line-height: 20px;
-// }
 //表格文字
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   text-align: left;
@@ -1310,4 +1299,6 @@ export default {
 /deep/.neifor .el-input--small .el-input__inner {
   width: 100%;
 }
+
+
 </style>