前端sdy

src/lang/zh.js

@@ -488,7 +488,7 @@
     salesContractAdd: '销售合同添加',
     purchaseContractAdd: '采购合同添加',
     purchaseContractEdit: '采购合同编辑',
-    //仓库管理、
+    //仓库管理
     warehouseManagementList: '仓库管理',
      warehouseManagementAdd: '仓库管理添加',
     warehouseManagementEdit: '仓库管理编辑',
@@ -4695,7 +4695,7 @@
   //仓库管理
   warehouseManagement: {
     warehouseManagementList: '仓库管理',
-     warehouseManagementAdd: '仓库管理添加',
+    warehouseManagementAdd: '仓库管理添加',
     warehouseManagementEdit: '仓库管理编辑',
     warehouseManagementPut: '入库',
     warehouseManagementDelivery: '出库',

src/views/warehouse/warehouseManagementIoss.vue

@@ -267,7 +267,6 @@ export default {
     this.deptBudgetList1.positionId = this.deptBudgetList.positionId
     this.loaddata()
     this.showType = this.isShow
-    console.log(this.deptBudgetList)
   },
   methods: {
     //返回按钮

src/views/warehouse/warehouseManagementIossRecord.vue

@@ -167,6 +167,7 @@ export default {
   },
   methods: {
     returnWarehouse() {
+      
       this.$router.go(-1)
     },
     dateFormat(fmt, date) {

src/views/warehouse/warehouseManagementList.vue

@@ -330,9 +330,7 @@ export default {
           baseId: item.warehouseId,
           positionId: item.binNumberId,
           warehouseName: item.warehouseName,
-        },
-        params: {
-          remark: item.remark,
+           remark: item.remark,
           binNumber: item.binNumber,
           capacity: item.capacity,
         },

src/views/warehouse/warehouseManagementLook.vue

@@ -61,7 +61,9 @@
           </ws-form-item>
           <!--仓库所在地-->
           <ws-form-item label="仓库所在地" span="1" prop="warehouseLocation">
-            {{ deptBudgetList.warehousePrivate }}{{deptBudgetList.warehouseCity}}{{deptBudgetList.warehouseArea}}
+            {{ deptBudgetList.warehousePrivate
+            }}{{ deptBudgetList.warehouseCity
+            }}{{ deptBudgetList.warehouseArea }}
           </ws-form-item>
           <!--详细地址-->
           <ws-form-item
@@ -99,8 +101,7 @@
               {{ item.maxStorage }}
             </ws-form-item>
             <!--现有储量-->
-            <ws-form-item label="现有储量" span="1" prop="nowStorage">
-    
+            <ws-form-item :label="wwss" span="1" prop="nowStorage" >
               {{ item.nowStorage }}
             </ws-form-item>
             <!--备注（选填）-->
@@ -142,6 +143,7 @@ export default {
     isShow(val) {
       this.showType = val
     },
+ 
   },
   data() {
     return {
@@ -192,17 +194,23 @@ export default {
     this.showType = this.isShow
     this.loaddata()
   },
-  computed : {
-   totalStorage :function() {
-     var sum  = 0
-     if(this.deptBudgetList.warehousePositionInfoList){
-       for(var i = 0;i < this.deptBudgetList.warehousePositionInfoList.length; i++ ){
-      sum += Number(this.deptBudgetList.warehousePositionInfoList[i].maxStorage)
-     }
-     }    
-     return sum
+  computed: {
+    totalStorage: function () {
+      var sum = 0
+      if (this.deptBudgetList.warehousePositionInfoList) {
+        for (
+          var i = 0;
+          i < this.deptBudgetList.warehousePositionInfoList.length;
+          i++
+        ) {
+          sum += Number(
+            this.deptBudgetList.warehousePositionInfoList[i].maxStorage
+          )
+        }
+      }
+      return sum
     },
-},
+  },
   methods: {
     //返回按钮
     returnWarehouse() {

src/views/warehouse/warehouseManagementRecord.vue

@@ -30,8 +30,8 @@
           src="../../../public/img/cangku.png"
           alt=""
         />
-        <span style="color: #323233">{{ deptBudgetList.warehouseName }}库</span>
-        <span class="ware">{{ binNumber }}仓位(容量{{ capacity }}吨)</span>
+        <span style="color: #323233">{{ deptBudgetList.warehouseName }}</span>
+        <span class="ware">{{binNumber}}仓位(容量{{capacity}}吨)</span>
       </h2>
       <p
         style="
@@ -41,7 +41,7 @@
           width: 245px;
         "
       >
-        备注：{{ remark }}
+        备注：{{remark }}
       </p>
 
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
@@ -295,6 +295,7 @@ export default {
       submitType: true,
       selectpackingMethod: {},
       size: 10,
+     deptBudgetList1: {},
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       packtypeList: {},
@@ -317,14 +318,14 @@ export default {
       accessoryTFs: false,
     }
   },
+ 
   activated() {
     this.deptBudgetList.baseId = this.$route.query.baseId
     this.deptBudgetList.positionId = this.$route.query.positionId
     this.deptBudgetList.warehouseName = this.$route.query.warehouseName
-    this.remark = this.$route.params.remark
-    this.binNumber = this.$route.params.binNumber
-    this.capacity = this.$route.params.capacity
-    console.log(111)
+    this.remark = this.$route.query.remark
+    this.binNumber = this.$route.query.binNumber
+    this.capacity = this.$route.query.capacity
     this.getList()
     this.showType = this.isShow
   },

vue.config.js

@@ -144,7 +144,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-        target: 'http://192.168.1.124:8090/',
+        target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',