Merge branch 'master' of http://121.40.234.130:8899/root/hl_one

mes/qd/src/api/wms/basedata/st/storattr.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data) {
   return request({
-    url: '/api/stIvtBsrealstorattr',
+    url: '/api/Storattr',
     method: 'post',
     data
   })
@@ -10,7 +10,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: '/api/stIvtBsrealstorattr',
+    url: '/api/Storattr',
     method: 'delete',
     data: ids
   })
@@ -18,7 +18,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: '/api/stIvtBsrealstorattr',
+    url: '/api/Storattr',
     method: 'put',
     data
   })
@@ -26,7 +26,7 @@ export function edit(data) {
 
 export function getStor(params) {
   return request({
-    url: '/api/stIvtBsrealstorattr/getStor',
+    url: '/api/Storattr/getStor',
     method: 'get',
     params
   })
@@ -34,7 +34,7 @@ export function getStor(params) {
 
 export function changeActive(data) {
   return request({
-    url: '/api/stIvtBsrealstorattr/changeActive',
+    url: '/api/Storattr/changeActive',
     method: 'put',
     data
   })
@@ -42,7 +42,7 @@ export function changeActive(data) {
 
 export function queryStor(data) {
   return request({
-    url: '/api/stIvtBsrealstorattr/queryStor',
+    url: '/api/Storattr/queryStor',
     method: 'post',
     data
   })

mes/qd/src/views/wms/storage_manage/product/productIn/DivDialog.vue

@@ -223,6 +223,7 @@ import StructDiv from '@/views/wms/pub/StructDialog'
 import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin'
 import crudPoint from '@/views/wms/scheduler_manage/point/point'
 import AddBox from '@/views/wms/storage_manage/product/productIn/AddBox'
+import crudSectattr from '@/api/wms/basedata/st/sectattr'
 
 export default {
   name: 'DivDialog',
@@ -285,7 +286,7 @@ export default {
   },
   methods: {
     open() {
-      crudProductIn.getSect({ 'stor_id': this.storId }).then(res => {
+      crudSectattr.getSect({ 'stor_id': this.storId }).then(res => {
         this.sects = res.content
       })
       const area_type = 'A1_RK01'