前端sdy

src/views/warehouse/warehouseManagementAdd.vue

@@ -128,7 +128,7 @@
             />
           </ws-form-item>
           <!--备注（选项）-->
-          <ws-form-item label="备注（选项）" span="1" prop="placeDelivery">
+          <ws-form-item label="备注（选填）" span="1" prop="placeDelivery">
             <ws-input
               v-model="item.remark"
               placeholder="请输入备注"

src/views/warehouse/warehouseManagementIoss.vue

@@ -145,7 +145,7 @@ export default {
   },
   watch: {
     vesselId(val) {
-      this.getList()
+      this.loaddata()
     },
     isShow(val) {
       this.showType = val
@@ -259,6 +259,7 @@ export default {
     this.loaddata()
     this.showType = this.isShow
   },
+   
   mounted() {
     this.deptBudgetList.baseId = this.$route.query.baseId
     this.deptBudgetList.positionId = this.$route.query.positionId

src/views/warehouse/warehouseManagementList.vue

@@ -252,13 +252,13 @@ export default {
           positionId: item.binNumberId,
           warehouseName: item.warehouseName,
           binNumber: item.binNumber,
-           capacity:item.capacity
+          capacity: item.capacity,
         },
       })
     },
     //入库
-    warehousing(item) {  
-        var free = 0
+    warehousing(item) {
+      var free = 0
       for (var i = 0; i < item.warehouseNumViewList.length; i++) {
         free += Number(item.warehouseNumViewList[i].storage)
       }
@@ -269,7 +269,8 @@ export default {
           positionId: item.binNumberId,
           warehouseName: item.warehouseName,
           binNumber: item.binNumber,
-         capacity:item.capacity-free
+          capacity: item.capacity - free,
+          id: item.id,
         },
       })
     },
@@ -306,16 +307,17 @@ export default {
     },
     //待完成//传参
     nocomplete(row) {
-      if(row.number > 0){
-      this.$router.push({
-        path: 'warehouseManagementNoComplete',
-        query: { baseId: row.warehouseId,
-         positionId: row.binNumberId,
-         warehouseName: row.warehouseName,
-          binNumber : row.binNumber
-        },
-      })
-    }
+      if (row.number > 0) {
+        this.$router.push({
+          path: 'warehouseManagementNoComplete',
+          query: {
+            baseId: row.warehouseId,
+            positionId: row.binNumberId,
+            warehouseName: row.warehouseName,
+            binNumber: row.binNumber,
+          },
+        })
+      }
     },
     //记录
     record(item) {

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -208,7 +208,7 @@ export default {
     },
     //编辑
     edits(row) {
-      console.log(row)
+      console.log(row.goodsNameKey)
       if (row.inOutFlag == 2) {
         this.$store.dispatch('app/setdeptBudgetList', row)
         this.$router.push({

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -384,9 +384,9 @@ export default {
     this.dataList.inOutType = this.$route.query.inOutType
     this.dataList.compId = this.$route.query.compId
     this.dataList.goodsName = this.$route.query.goodsName
-    this.dataList.goodsNameKey = Number(this.$route.goodsNameKey)
+    this.dataList.goodsNameKey = Number(this.$route.query.goodsNameKey)
     this.dataList.inOutFlag = this.$route.inOutFlag
-    this.dataList.inOutTypeKey = Number(this.$route.inOutTypeKey)
+    this.dataList.inOutTypeKey = Number(this.$route.query.inOutTypeKey)
     this.dataList.statusFlag = this.$route.statusFlag
     console.log(this.dataList)
   },
@@ -428,33 +428,13 @@ export default {
     },
     //提交按钮
     submit() {
-      console.log(this.dataList)
-      // if (
-      //   this.deptBudgetList.warehouseInOutDetail.qualityInspector.length < 2 ||
-      //   this.deptBudgetList.warehouseInOutDetail.qualityInspector > 10
-      // ) {
-      //   this.$message({
-      //     message: '质检员姓名长度错误！',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
-      // if (
-      //   this.deptBudgetList.warehouseInOutDetail.qualityInspector.length < 2 ||
-      //   deptBudgetList.warehouseInOutDetail.qualityInspector > 10
-      // ) {
-      //   this.$message({
-      //     message: '质检员姓名长度错误！',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
-
       this.$refs.dataList.validate((valid) => {
         if (valid) {
           this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
           this.dataList.inOutFlag = 1
           this.dataList.statusFlag = 3
+          //  this.deptBudgetList.inOutFlag = 1
+          // this.deptBudgetList.statusFlag = 3
           addstorageputList(this.dataList)
             .toPromise()
             .then((response) => {

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -384,9 +384,9 @@ export default {
     this.dataList.inOutType = this.$route.query.inOutType
     this.dataList.compId = this.$route.query.compId
     this.dataList.goodsName = this.$route.query.goodsName
-    this.dataList.goodsNameKey = Number(this.$route.goodsNameKey)
+    this.dataList.goodsNameKey = Number(this.$route.query.goodsNameKey)
     this.dataList.inOutFlag = this.$route.inOutFlag
-    this.dataList.inOutTypeKey = Number(this.$route.inOutTypeKey)
+    this.dataList.inOutTypeKey = Number(this.$route.query.inOutTypeKey)
     this.dataList.statusFlag = this.$route.statusFlag
     console.log(this.dataList)
   },
@@ -408,7 +408,7 @@ export default {
               this.dataList.compId = sessionStorage.getItem(
                 'ws-pf_compId'
               )
-              this.dataList.inOutFlag = 1
+              this.dataList.inOutFlag = 2
               this.dataList.statusFlag = 1
               addstorageputList(this.dataList)
                 .toPromise()
@@ -428,7 +428,6 @@ export default {
     },
     //提交按钮
     submit() {
-      console.log(123456)
       this.$confirm(`确定提交入库信息`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
@@ -440,7 +439,7 @@ export default {
               this.dataList.compId = sessionStorage.getItem(
                 'ws-pf_compId'
               )
-              this.dataList.inOutFlag = 1
+              this.dataList.inOutFlag = 2
               this.dataList.statusFlag = 3
               addstorageputList(this.dataList)
                 .toPromise()

src/views/warehouse/warehouseManagementPut.vue

@@ -677,6 +677,8 @@ export default {
           return
         }
       }
+      this.deptBudgetList.id = this.$route.query.id
+      console.log(this.deptBudgetList.id,1111111111)
 
         this.$confirm(`确定提交入库信息`, {
         cancelButtonText: '取消',