完善仓库接口

src/api/baseinfo/goodsShelves/goodsShelves.js

@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehouserack/listPage',
+      url: '/wms/apiadmin/warehouserack/listPage',
       method: 'post',
       data: params,
     })
@@ -15,7 +15,7 @@ export default {
   // 修改是否可用状态
   updateIsEnable: function(sid,isEnable) {
   	return request({
-  		url: '/wms/apiadmin/base/wmswarehouserack/updateIsEnable/'+sid+"/"+isEnable
+  		url: '/wms/apiadmin/warehouserack/updateIsEnable/'+sid+"/"+isEnable
   	});
   },
 
@@ -23,7 +23,7 @@ export default {
   // 新增、保存
   saveGoodsShelves: function(data) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehouserack/saveOrUpdate',
+      url: '/wms/apiadmin/warehouserack/saveOrUpdate',
       method: 'post',
       data: data
     });
@@ -32,7 +32,7 @@ export default {
   // 初始化
   initGoodsShelves: function(data) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehouserack/initialization/' + data,
+      url: '/wms/apiadmin/warehouserack/initialization/' + data,
       method: 'get'
     });
   },

src/api/baseinfo/warehouse/warehouse.js

@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehouseinfo/listPage',
+      url: '/wms/apiadmin/warehouseinfo/listPage',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -14,7 +14,7 @@ export default {
   // 仓库查询
   getAllWarehouse: function(params) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
+      url: '/wms/apiadmin/warehouseinfo/listAll',
       method: 'post',
       data: params,
       headers: {
@@ -27,7 +27,7 @@ export default {
   // 修改是否可用状态
   updateIsEnable: function(sid,isEnable) {
   	return request({
-  		url: '/wms/apiadmin/base/wmswarehouseinfo/updateStatus/'+sid+"/"+isEnable
+  		url: '/wms/apiadmin/warehouseinfo/updateStatus/'+sid+"/"+isEnable
   	});
   },
 
@@ -35,7 +35,7 @@ export default {
   // 新增、保存
   saveWarehouse: function(data) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehouseinfo/saveOrUpdate',
+      url: '/wms/apiadmin/warehouseinfo/saveOrUpdate',
       method: 'post',
       data: data,
       headers: { 'Content-Type': 'application/json' }
@@ -45,7 +45,7 @@ export default {
   // 初始化
   initWarehouse: function(data) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehouseinfo/initialization/' + data,
+      url: '/wms/apiadmin/warehouseinfo/initialization/' + data,
       method: 'get'
     });
   },

src/api/baseinfo/warehouseArea/warehouseArea.js

@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehousearea/listPage',
+      url: '/wms/apiadmin/warehousearea/listPage',
       method: 'post',
       data: params,
     })
@@ -14,7 +14,7 @@ export default {
   // 库区查询
   getAllWarehousearea: function(params) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehousearea/listAll',
+      url: '/wms/apiadmin/warehousearea/listAll',
      method: 'post',
      data: params,
      headers: {
@@ -27,7 +27,7 @@ export default {
   // 修改是否可用状态
   updateIsEnable: function(sid,isEnable) {
   	return request({
-  		url: '/wms/apiadmin/base/wmswarehousearea/updateIsEnable/'+sid+"/"+isEnable
+  		url: '/wms/apiadmin/warehousearea/updateIsEnable/'+sid+"/"+isEnable
   	});
   },
 
@@ -35,7 +35,7 @@ export default {
   // 新增、保存
   saveWarehousearea: function(data) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehousearea/saveOrUpdate',
+      url: '/wms/apiadmin/warehousearea/saveOrUpdate',
       method: 'post',
       data: data
     });
@@ -44,7 +44,7 @@ export default {
   // 初始化
   initWarehousearea: function(data) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehousearea/initialization/' + data,
+      url: '/wms/apiadmin/warehousearea/initialization/' + data,
       method: 'get'
     });
   },

src/api/baseinfo/warehouseAreaType/warehouseAreaType.js

@@ -6,7 +6,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehouseareatype/listPage',
+      url: '/wms/apiadmin/warehouseareatype/listPage',
       method: 'post',
       data: params,
     })
@@ -15,7 +15,7 @@ export default {
   // 库去类型查询
   getAllWarehouseareatype: function(params) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehouseareatype/listAll',
+      url: '/wms/apiadmin/warehouseareatype/listAll',
       method: 'post',
       data: params,
       headers: {
@@ -29,7 +29,7 @@ export default {
   // 修改是否可用状态
   updateIsEnable: function(sid,isEnable) {
   	return request({
-  		url: '/wms/apiadmin/base/wmswarehouseareatype/updateIsEnable/'+sid+"/"+isEnable
+  		url: '/wms/apiadmin/warehouseareatype/updateIsEnable/'+sid+"/"+isEnable
   	});
   },
 
@@ -37,7 +37,7 @@ export default {
   // 新增、保存
   saveWarehousearea: function(data) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehouseareatype/saveOrUpdate',
+      url: '/wms/apiadmin/warehouseareatype/saveOrUpdate',
       method: 'post',
       data: data
     });
@@ -46,7 +46,7 @@ export default {
   // 初始化
   initWarehousearea: function(data) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehouseareatype/initialization/' + data,
+      url: '/wms/apiadmin/warehouseareatype/initialization/' + data,
       method: 'get'
     });
   },

src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue

@@ -69,6 +69,10 @@
           locationName: '',
           locationSid: '',
           remarks: '',
+          useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+          createOrgSid: window.sessionStorage.getItem('orgSid'),
+          userSid: window.sessionStorage.getItem('userSid'),
 
         },
         warehouseList: [],
@@ -80,12 +84,14 @@
     },
     methods: {
       initData() {
-
+        var parpams = {
-        req2.getAllWarehouse().then(resp => {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+        req2.getAllWarehouse(parpams).then(resp => {
           this.warehouseList = resp.data
         })
 
-        req3.getAllWarehousearea().then(resp => {
+        req3.getAllWarehousearea(parpams).then(resp => {
           this.warehouseAreaList = resp.data
         })
 
@@ -111,19 +117,22 @@
       handleReturn(isreload) {
         if (isreload === 'true') this.$emit('reloadlist')
         this.formobj = {
-       sid: '',
+          sid: '',
-       rackName: '',
+          rackName: '',
-       rackCode: '',
+          rackCode: '',
-       warehouseName: '',
+          warehouseName: '',
-       warehouseSid: '',
+          warehouseSid: '',
-       locationName: '',
+          locationName: '',
-       locationSid: '',
+          locationSid: '',
-       remarks: '',
+          remarks: '',
+          useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+          createOrgSid: window.sessionStorage.getItem('orgSid'),
+          userSid: window.sessionStorage.getItem('userSid'),
         }
         this.$emit('doback')
       },
-      showAdd() {
+      showAdd() {},
-      },
       showEdit(row) {
         req.initGoodsShelves(row.sid)
           .then(resp => {

src/views/baseInfo/warehouses/warehouse/index.vue

@@ -159,6 +159,9 @@
 			},
 			loadList() {
 				this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
 				req.listPage(this.queryParams).then((resp) => {
 					this.tableLoading = false
 					if (resp.success) {

src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue

@@ -104,7 +104,11 @@
           squareMeter: '',
           sortNo: '',
           remarks: '',
-          warehouseType: "0"
+          warehouseType: "0",
+          useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+          createOrgSid: window.sessionStorage.getItem('orgSid'),
+          userSid: window.sessionStorage.getItem('userSid'),
         },
       }
     },
@@ -147,7 +151,11 @@
          squareMeter: '',
          sortNo: '',
          remarks: '',
-         warehouseType: "0"
+         warehouseType: "0",
+         useOrgSid: window.sessionStorage.getItem('departmentSid'),
+         orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+         createOrgSid: window.sessionStorage.getItem('orgSid'),
+         userSid: window.sessionStorage.getItem('userSid'),
         }
         this.$emit('doback')
       },

src/views/baseInfo/warehouses/warehouseArea/index.vue

@@ -158,6 +158,9 @@
 			},
 			loadList() {
 				this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
 				req.listPage(this.queryParams).then((resp) => {
 					this.tableLoading = false
 					if (resp.success) {

src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue

@@ -80,7 +80,11 @@
           warehouseName: '',
           warehouseSid: '',
           areaTypeSid: "",
-          areaTypeName: ""
+          areaTypeName: "",
+          useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+          createOrgSid: window.sessionStorage.getItem('orgSid'),
+          userSid: window.sessionStorage.getItem('userSid'),
 
         },
         warehouseList: [],
@@ -92,11 +96,14 @@
     },
     methods: {
       initData() {
-        req2.getAllWarehouse().then(resp => {
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+        req2.getAllWarehouse(parpams).then(resp => {
           this.warehouseList = resp.data
         })
 
-        req3.getAllWarehouseareatype().then(resp => {
+        req3.getAllWarehouseareatype(parpams).then(resp => {
           this.warehouseTypeList = resp.data
         })
 
@@ -129,7 +136,11 @@
           unit: '',
           remarks: '',
           areaTypeSid: "",
-          areaTypeName: ""
+          areaTypeName: "",
+          useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+          createOrgSid: window.sessionStorage.getItem('orgSid'),
+          userSid: window.sessionStorage.getItem('userSid'),
 
         }
         this.$emit('doback')

src/views/baseInfo/warehouses/warehouseAreaType/index.vue

@@ -155,6 +155,9 @@
 			},
 			loadList() {
 				this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
 				req.listPage(this.queryParams).then((resp) => {
 					this.tableLoading = false
 					if (resp.success) {

src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue

@@ -44,6 +44,11 @@
           sid: '',
           warehouseAreaTypeName: '',
           remarks: '',
+          useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+          createOrgSid: window.sessionStorage.getItem('orgSid'),
+          userSid: window.sessionStorage.getItem('userSid'),
+
 
         },
       }
@@ -71,7 +76,13 @@
         if (isreload === 'true') this.$emit('reloadlist')
         this.formobj = {
           sid: '',
+          warehouseAreaTypeName: '',
           remarks: '',
+          useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+          createOrgSid: window.sessionStorage.getItem('orgSid'),
+          userSid: window.sessionStorage.getItem('userSid'),
+
         }
         this.$emit('doback')
       },