From 4ebbc7365390940c2e4aa35f42ce6edd03885e6e Mon Sep 17 00:00:00 2001
From: ludj <ldj_willow@163.com>
Date: Fri, 16 Dec 2022 14:17:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=89=8D=E7=AB=AFWMS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/wms/basedata/classstandard.js     |  82 ---
 .../src/api/wms/basedata/customerbase.js      |  27 -
 .../src/api/wms/basedata/materialbase.js      |  58 --
 .../src/api/wms/basedata/mdPbMeasureunit.js   |  35 --
 .../src/api/wms/basedata/supplierbase.js      |  27 -
 nladmin-ui/src/api/wms/pdm/device.js          |  74 ---
 nladmin-ui/src/api/wms/pdm/outmaterial.js     |  51 --
 nladmin-ui/src/api/wms/pdm/workorder.js       |  99 ----
 nladmin-ui/src/api/wms/sch/point.js           |  71 ---
 nladmin-ui/src/api/wms/sch/region.js          |  52 --
 nladmin-ui/src/api/wms/sch/task.js            |  64 --
 .../src/views/wms/basedata/class/index.vue    | 404 -------------
 .../src/views/wms/basedata/customer/index.vue | 334 -----------
 .../src/views/wms/basedata/material/index.vue | 437 --------------
 .../src/views/wms/basedata/measure/index.vue  | 178 ------
 .../src/views/wms/basedata/supp/index.vue     | 344 -----------
 .../src/views/wms/basedata/vehicle/index.vue  | 240 --------
 .../src/views/wms/basedata/vehicle/vehicle.js |  34 --
 nladmin-ui/src/views/wms/pdm/device/index.vue | 151 -----
 .../wms/pdm/workerorder/OutMaterDialog.vue    | 158 -----
 .../views/wms/pdm/workerorder/ViewDialog.vue  | 354 -----------
 .../src/views/wms/pdm/workerorder/index.vue   | 476 ---------------
 nladmin-ui/src/views/wms/pub/DeviceDialog.vue | 173 ------
 nladmin-ui/src/views/wms/pub/MaterDialog.vue  | 212 -------
 nladmin-ui/src/views/wms/pub/PointDialog.vue  | 177 ------
 .../views/wms/sch/point/MaterialDialog.vue    | 155 -----
 .../src/views/wms/sch/point/ViewDialog.vue    | 280 ---------
 .../views/wms/sch/point/WorkOrderDialog.vue   | 158 -----
 nladmin-ui/src/views/wms/sch/point/index.vue  | 553 ------------------
 nladmin-ui/src/views/wms/sch/region/index.vue | 149 -----
 nladmin-ui/src/views/wms/sch/task/index.vue   | 381 ------------
 .../src/views/wms/st/cppoint/cppInRegion.vue  | 188 ------
 .../src/views/wms/st/cppoint/cppInventory.vue | 401 -------------
 .../src/views/wms/st/cppoint/cppOutRegion.vue | 206 -------
 nladmin-ui/src/views/wms/st/cppoint/index.vue |  31 -
 nladmin-ui/src/views/wms/st/regionio.js       |  35 --
 nladmin-ui/src/views/wms/st/structivt.js      |  43 --
 nladmin-ui/src/views/wms/st/ysa/index.vue     |  32 -
 nladmin-ui/src/views/wms/st/ysa/inventory.vue | 412 -------------
 .../src/views/wms/st/ysa/ysqInRegion.vue      | 188 ------
 .../src/views/wms/st/ysa/ysqOutRegion.vue     | 190 ------
 41 files changed, 7714 deletions(-)
 delete mode 100644 nladmin-ui/src/api/wms/basedata/classstandard.js
 delete mode 100644 nladmin-ui/src/api/wms/basedata/customerbase.js
 delete mode 100644 nladmin-ui/src/api/wms/basedata/materialbase.js
 delete mode 100644 nladmin-ui/src/api/wms/basedata/mdPbMeasureunit.js
 delete mode 100644 nladmin-ui/src/api/wms/basedata/supplierbase.js
 delete mode 100644 nladmin-ui/src/api/wms/pdm/device.js
 delete mode 100644 nladmin-ui/src/api/wms/pdm/outmaterial.js
 delete mode 100644 nladmin-ui/src/api/wms/pdm/workorder.js
 delete mode 100644 nladmin-ui/src/api/wms/sch/point.js
 delete mode 100644 nladmin-ui/src/api/wms/sch/region.js
 delete mode 100644 nladmin-ui/src/api/wms/sch/task.js
 delete mode 100644 nladmin-ui/src/views/wms/basedata/class/index.vue
 delete mode 100644 nladmin-ui/src/views/wms/basedata/customer/index.vue
 delete mode 100644 nladmin-ui/src/views/wms/basedata/material/index.vue
 delete mode 100644 nladmin-ui/src/views/wms/basedata/measure/index.vue
 delete mode 100644 nladmin-ui/src/views/wms/basedata/supp/index.vue
 delete mode 100644 nladmin-ui/src/views/wms/basedata/vehicle/index.vue
 delete mode 100644 nladmin-ui/src/views/wms/basedata/vehicle/vehicle.js
 delete mode 100644 nladmin-ui/src/views/wms/pdm/device/index.vue
 delete mode 100644 nladmin-ui/src/views/wms/pdm/workerorder/OutMaterDialog.vue
 delete mode 100644 nladmin-ui/src/views/wms/pdm/workerorder/ViewDialog.vue
 delete mode 100644 nladmin-ui/src/views/wms/pdm/workerorder/index.vue
 delete mode 100644 nladmin-ui/src/views/wms/pub/DeviceDialog.vue
 delete mode 100644 nladmin-ui/src/views/wms/pub/MaterDialog.vue
 delete mode 100644 nladmin-ui/src/views/wms/pub/PointDialog.vue
 delete mode 100644 nladmin-ui/src/views/wms/sch/point/MaterialDialog.vue
 delete mode 100644 nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
 delete mode 100644 nladmin-ui/src/views/wms/sch/point/WorkOrderDialog.vue
 delete mode 100644 nladmin-ui/src/views/wms/sch/point/index.vue
 delete mode 100644 nladmin-ui/src/views/wms/sch/region/index.vue
 delete mode 100644 nladmin-ui/src/views/wms/sch/task/index.vue
 delete mode 100644 nladmin-ui/src/views/wms/st/cppoint/cppInRegion.vue
 delete mode 100644 nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue
 delete mode 100644 nladmin-ui/src/views/wms/st/cppoint/cppOutRegion.vue
 delete mode 100644 nladmin-ui/src/views/wms/st/cppoint/index.vue
 delete mode 100644 nladmin-ui/src/views/wms/st/regionio.js
 delete mode 100644 nladmin-ui/src/views/wms/st/structivt.js
 delete mode 100644 nladmin-ui/src/views/wms/st/ysa/index.vue
 delete mode 100644 nladmin-ui/src/views/wms/st/ysa/inventory.vue
 delete mode 100644 nladmin-ui/src/views/wms/st/ysa/ysqInRegion.vue
 delete mode 100644 nladmin-ui/src/views/wms/st/ysa/ysqOutRegion.vue

diff --git a/nladmin-ui/src/api/wms/basedata/classstandard.js b/nladmin-ui/src/api/wms/basedata/classstandard.js
deleted file mode 100644
index 0c216de..0000000
--- a/nladmin-ui/src/api/wms/basedata/classstandard.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/Classstandard',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/Classstandard/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/Classstandard',
-    method: 'put',
-    data
-  })
-}
-
-export function getClass(params) {
-  return request({
-    url: 'api/Classstandard/loadClass',
-    method: 'get',
-    params
-  })
-}
-
-export function getClassSuperior(ids) {
-  const data = ids.length || ids.length === 0 ? ids : Array.of(ids)
-  return request({
-    url: 'api/Classstandard/superior',
-    method: 'post',
-    data
-  })
-}
-
-export function getClassType(params) {
-  return request({
-    url: 'api/Classstandard/getClass',
-    method: 'get',
-    params
-  })
-}
-export function queryClassById(params) {
-  return request({
-    url: 'api/Classstandard/queryClassById',
-    method: 'get',
-    params
-  })
-}
-// 传入分类标识和级别
-export function getType(params) {
-  return request({
-    url: 'api/Classstandard/getType',
-    method: 'get',
-    params
-  })
-}
-
-export function getClassTable(params) {
-  return request({
-    url: 'api/Classstandard/getClassTable',
-    method: 'get',
-    params
-  })
-}
-
-export function getClassName() {
-  return request({
-    url: 'api/Classstandard/getClassName',
-    method: 'get'
-  })
-}
-
-export default { add, edit, del, getClass, getClassSuperior, getClassType, getClassTable, getType, queryClassById, getClassName }
diff --git a/nladmin-ui/src/api/wms/basedata/customerbase.js b/nladmin-ui/src/api/wms/basedata/customerbase.js
deleted file mode 100644
index 6523c03..0000000
--- a/nladmin-ui/src/api/wms/basedata/customerbase.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/customerbase',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/customerbase/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/customerbase',
-    method: 'put',
-    data
-  })
-}
-
-export default { add, edit, del }
diff --git a/nladmin-ui/src/api/wms/basedata/materialbase.js b/nladmin-ui/src/api/wms/basedata/materialbase.js
deleted file mode 100644
index 719b2a1..0000000
--- a/nladmin-ui/src/api/wms/basedata/materialbase.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/Materialbase',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/Materialbase/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/Materialbase',
-    method: 'put',
-    data
-  })
-}
-
-export function getMaterOptType(data) {
-  return request({
-    url: 'api/Materialbase/getMaterOptType',
-    method: 'post',
-    data
-  })
-}
-
-export function isAlongMaterType(data) {
-  return request({
-    url: 'api/Materialbase/isAlongMaterType',
-    method: 'post',
-    data
-  })
-}
-
-export function synchronize(data) {
-  return request({
-    url: 'api/Materialbase/synchronize',
-    method: 'post',
-    data
-  })
-}
-
-export function getProductSeries() {
-  return request({
-    url: 'api/Materialbase/getProductSeries',
-    method: 'get'
-  })
-}
-
-export default { add, edit, del, getMaterOptType, isAlongMaterType, synchronize, getProductSeries }
diff --git a/nladmin-ui/src/api/wms/basedata/mdPbMeasureunit.js b/nladmin-ui/src/api/wms/basedata/mdPbMeasureunit.js
deleted file mode 100644
index ae700b9..0000000
--- a/nladmin-ui/src/api/wms/basedata/mdPbMeasureunit.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/mdPbMeasureunit',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/mdPbMeasureunit/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/mdPbMeasureunit',
-    method: 'put',
-    data
-  })
-}
-
-export function getUnit(params) {
-  return request({
-    url: 'api/mdPbMeasureunit/getUnit',
-    method: 'get',
-    params
-  })
-}
-
-export default { add, edit, del, getUnit }
diff --git a/nladmin-ui/src/api/wms/basedata/supplierbase.js b/nladmin-ui/src/api/wms/basedata/supplierbase.js
deleted file mode 100644
index d04cf8b..0000000
--- a/nladmin-ui/src/api/wms/basedata/supplierbase.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/supplierbase',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/supplierbase/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/supplierbase',
-    method: 'put',
-    data
-  })
-}
-
-export default { add, edit, del }
diff --git a/nladmin-ui/src/api/wms/pdm/device.js b/nladmin-ui/src/api/wms/pdm/device.js
deleted file mode 100644
index b901755..0000000
--- a/nladmin-ui/src/api/wms/pdm/device.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/device',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/device/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/device',
-    method: 'put',
-    data
-  })
-}
-
-export function getWorkprocedure() {
-  return request({
-    url: 'api/device/getWorkprocedure',
-    method: 'get'
-  })
-}
-
-export function getItemByDevice(data) {
-  return request({
-    url: 'api/device/getItemByDevice',
-    method: 'post',
-    data
-  })
-}
-
-export function savaDeviceItem(data) {
-  return request({
-    url: 'api/device/savaDeviceItem',
-    method: 'post',
-    data
-  })
-}
-
-export function getItemByDeviceId(data) {
-  return request({
-    url: 'api/device/getItemByDeviceId',
-    method: 'post',
-    data
-  })
-}
-
-export function copyAdd(data) {
-  return request({
-    url: 'api/device/copyAdd',
-    method: 'post',
-    data
-  })
-}
-
-export function changeActive(data) {
-  return request({
-    url: 'api/device/changeActive',
-    method: 'put',
-    data
-  })
-}
-
-export default { add, edit, del, getWorkprocedure, getItemByDeviceId, copyAdd, changeActive }
diff --git a/nladmin-ui/src/api/wms/pdm/outmaterial.js b/nladmin-ui/src/api/wms/pdm/outmaterial.js
deleted file mode 100644
index 8ee469f..0000000
--- a/nladmin-ui/src/api/wms/pdm/outmaterial.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/Materialbase',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/Materialbase/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/Materialbase',
-    method: 'put',
-    data
-  })
-}
-
-export function getMaterOptType(data) {
-  return request({
-    url: 'api/Materialbase/getMaterOptType',
-    method: 'post',
-    data
-  })
-}
-
-export function isAlongMaterType(data) {
-  return request({
-    url: 'api/Materialbase/isAlongMaterType',
-    method: 'post',
-    data
-  })
-}
-
-export function synchronize(data) {
-  return request({
-    url: 'api/Materialbase/synchronize',
-    method: 'post',
-    data
-  })
-}
-
-export default { add, edit, del, getMaterOptType, isAlongMaterType, synchronize }
diff --git a/nladmin-ui/src/api/wms/pdm/workorder.js b/nladmin-ui/src/api/wms/pdm/workorder.js
deleted file mode 100644
index 4d4f364..0000000
--- a/nladmin-ui/src/api/wms/pdm/workorder.js
+++ /dev/null
@@ -1,99 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/workorder',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/workorder',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/workorder',
-    method: 'put',
-    data
-  })
-}
-
-export function submits(data) {
-  return request({
-    url: 'api/workorder/submits',
-    method: 'put',
-    data
-  })
-}
-
-export function getDevice(data) {
-  return request({
-    url: 'api/workorder/getDevice',
-    method: 'post',
-    data
-  })
-}
-
-export function getTable(data) {
-  return request({
-    url: 'api/workorder/getTable',
-    method: 'post',
-    data
-  })
-}
-
-export function openStart(data) {
-  return request({
-    url: 'api/workorder/openStart',
-    method: 'post',
-    data
-  })
-}
-
-export function saveReport(data) {
-  return request({
-    url: 'api/workorder/saveReport',
-    method: 'post',
-    data
-  })
-}
-
-export function finish(data) {
-  return request({
-    url: 'api/workorder/finish',
-    method: 'post',
-    data
-  })
-}
-
-export function forceFinish(data) {
-  return request({
-    url: 'api/workorder/forceFinish',
-    method: 'post',
-    data
-  })
-}
-
-export function getReportWork(data) {
-  return request({
-    url: 'api/workorder/getReportWork',
-    method: 'post',
-    data
-  })
-}
-
-export function getDtl(data) {
-  return request({
-    url: 'api/workorder/getDtl',
-    method: 'post',
-    data
-  })
-}
-
-export default { add, edit, del, submits, getDevice, getTable, openStart, saveReport, finish, getReportWork, forceFinish, getDtl }
diff --git a/nladmin-ui/src/api/wms/sch/point.js b/nladmin-ui/src/api/wms/sch/point.js
deleted file mode 100644
index 7a78111..0000000
--- a/nladmin-ui/src/api/wms/sch/point.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/point',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/point/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/point',
-    method: 'put',
-    data
-  })
-}
-export function findPoints(area_type) {
-  return request({
-    url: 'api/point/area_type/' + area_type
-  })
-}
-
-export function changeActive(data) {
-  return request({
-    url: 'api/point/changeActive',
-    method: 'put',
-    data
-  })
-}
-
-export function getPoint(data) {
-  return request({
-    url: '/api/point/getPoint',
-    method: 'post',
-    data
-  })
-}
-
-export function getRegion() {
-  return request({
-    url: '/api/point/getRegion',
-    method: 'get'
-  })
-}
-
-export function changeUsed(data) {
-  return request({
-    url: 'api/point/changeUsed',
-    method: 'post',
-    data: data
-  })
-}
-
-export function changeLock(data) {
-  return request({
-    url: 'api/point/changeLock',
-    method: 'post',
-    data: data
-  })
-}
-
-export default { add, edit, del, changeActive, findPoints, getPoint, getRegion, changeUsed, changeLock }
diff --git a/nladmin-ui/src/api/wms/sch/region.js b/nladmin-ui/src/api/wms/sch/region.js
deleted file mode 100644
index 6cfc1e9..0000000
--- a/nladmin-ui/src/api/wms/sch/region.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/region',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/region/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/region',
-    method: 'put',
-    data
-  })
-}
-
-export function changeActive(data) {
-  return request({
-    url: 'api/region/changeActive',
-    method: 'put',
-    data
-  })
-}
-
-export function getPointStatusSelectById(id) {
-  return request({
-    url: 'api/region/getPointStatusSelectById',
-    method: 'post',
-    data: id
-  })
-}
-
-export function getPointTypeSelectById(id) {
-  return request({
-    url: 'api/region/getPointTypeSelectById',
-    method: 'post',
-    data: id
-  })
-}
-
-
-export default { add, edit, del, changeActive, getPointStatusSelectById, getPointTypeSelectById }
diff --git a/nladmin-ui/src/api/wms/sch/task.js b/nladmin-ui/src/api/wms/sch/task.js
deleted file mode 100644
index 678aacc..0000000
--- a/nladmin-ui/src/api/wms/sch/task.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/task',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/task/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/task',
-    method: 'put',
-    data
-  })
-}
-
-export function getTaskStatus() {
-  return request({
-    url: 'api/task/taskStatus',
-    method: 'get'
-  })
-}
-
-export function getTaskType() {
-  return request({
-    url: 'api/task/taskType',
-    method: 'get'
-  })
-}
-
-export function getFinishType() {
-  return request({
-    url: 'api/task/finishType',
-    method: 'get'
-  })
-}
-
-export function operation(data) {
-  return request({
-    url: 'api/task/operation',
-    method: 'put',
-    data
-  })
-}
-
-export default {
-  add,
-  edit,
-  del,
-  operation,
-  getTaskStatus,
-  getTaskType,
-  getFinishType
-}
diff --git a/nladmin-ui/src/views/wms/basedata/class/index.vue b/nladmin-ui/src/views/wms/basedata/class/index.vue
deleted file mode 100644
index 3357c37..0000000
--- a/nladmin-ui/src/views/wms/basedata/class/index.vue
+++ /dev/null
@@ -1,404 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
-        <el-form
-          :inline="true"
-          class="demo-form-inline"
-          label-position="right"
-          label-width="90px"
-          label-suffix=":"
-        >
-          <el-form-item label="分类名称">
-            <el-select
-              v-model="query.class_code"
-              placeholder="请选择分类名称"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 185px;"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in classNames"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <rrOperation :crud="crud" />
-        </el-form>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
-        <el-button
-          slot="right"
-          class="filter-item"
-          size="mini"
-          type="success"
-          icon="el-icon-s-operation"
-          @click="ToExpandall"
-        >
-          全部展开
-        </el-button>
-      </crudOperation>
-      <!--表单组件-->
-      <el-dialog
-        :close-on-click-modal="false"
-        :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
-        :title="crud.status.title"
-        width="500px"
-      >
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="分类编码" prop="class_code">
-            <el-input v-model="form.class_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="分类名称" prop="class_name">
-            <el-input v-model="form.class_name" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="简要描述" prop="class_desc">
-            <el-input v-model="form.class_desc" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="顶级类目">
-            <el-radio-group v-model="form.isTop" style="width: 140px">
-              <el-radio label="1">是</el-radio>
-              <el-radio label="0">否</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="form.isTop === '0'" style="margin-bottom: 0;" label="上级类目" prop="pid">
-            <treeselect
-              v-model="form.parent_class_id"
-              :load-options="loadClass"
-              :options="classes"
-              style="width: 370px;"
-              placeholder="选择上级类目"
-            />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table
-        ref="table"
-        v-loading="crud.loading"
-        lazy
-        :load="getClassDatas"
-        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-        :data="crud.data"
-        row-key="id"
-        @select="crud.selectChange"
-        @select-all="crud.selectAllChange"
-        @selection-change="crud.selectionChangeHandler"
-      >
-        <el-table-column prop="class_code" label="分类编码" />
-        <el-table-column prop="class_name" label="分类名称" />
-        <el-table-column prop="class_desc" label="分类简要描述" />
-        <el-table-column prop="update_optname" label="修改人" />
-        <el-table-column prop="update_time" label="修改时间" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="is_modify" :formatter="modifyFormat" label="是否可修改" />
-        <el-table-column
-          v-permission="['admin','Classstandard:edit','Classstandard:del']"
-          label="操作"
-          width="250px"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <udOperation
-              style="display: inline"
-              :data="scope.row"
-              :permission="permission"
-              :disabled-edit="scope.row.is_modify === '0'"
-              :disabled-dle="scope.row.is_modify === '0'"
-              msg="确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！"
-            />
-            <el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus-outline" @click="crud.toAddAndData(addSibling(scope.row))">新增同级</el-button>
-            <el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus" @click="crud.toAddAndData(addChildren(scope.row))">新增子级</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-  </div>
-</template>
-
-<script>
-import crudClassstandard from '@/api/wms/basedata/classstandard'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import rrOperation from '@crud/RR.operation'
-import pagination from '@crud/Pagination'
-
-let defaultForm = {
-  class_id: null,
-  base_data_type: null,
-  path_code: null,
-  class_code: null,
-  long_class_code: null,
-  class_name: null,
-  class_desc: null,
-  parent_class_id: null,
-  is_leaf: null,
-  sub_count: null,
-  is_modify: null,
-  is_delete: null,
-  class_level: null,
-  ext_id: null,
-  ext_parent_id: null,
-  create_id: null,
-  create_name: null,
-  create_time: null,
-  update_optid: null,
-  update_optname: null,
-  update_time: null,
-  isTop: '1'
-}
-export default {
-  name: 'Classstandard',
-  dicts: ['base_data'],
-  components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '基础类别',
-      url: 'api/Classstandard',
-      idField: 'class_id',
-      sort: 'class_id,desc',
-      crudMethod: { ...crudClassstandard },
-      optShow: {
-        add: true,
-        reset: true
-      }
-    })
-  },
-  data() {
-    return {
-      classes: [],
-      classNames: [],
-      permission: {},
-      rules: {
-        class_id: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        path_code: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        class_code: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        class_name: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        is_leaf: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        is_modify: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        is_delete: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        create_id: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        create_name: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        create_time: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  created() {
-    this.getClassNames() // 获取分类
-  },
-  methods: {
-    getClassNames() {
-      crudClassstandard.getClassName().then((res) => { // 获取分类名称，查询根据分类编码查找对应分支树
-        this.classNames = res
-      })
-    },
-    getClassDatas(tree, treeNode, resolve) {
-      const params = { pid: tree.id }
-      setTimeout(() => {
-        crudClassstandard.getClass(params).then(res => {
-          resolve(res.content)
-        })
-      }, 100)
-    },
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    modifyFormat(row, index) {
-      if (row.is_modify === '1') {
-        return '是'
-      } else {
-        return '否'
-      }
-    },
-    dataTypeChange(data) {
-      crudClassstandard.getClass({ base_data_type: data }).then(res => {
-        this.classes = res.content.map(function(obj) {
-          if (obj.hasChildren) {
-            obj.children = null
-          }
-          return obj
-        })
-      })
-    },
-    // 新增与编辑前做的操作
-    [CRUD.HOOK.afterToCU](crud, form) {
-      if (form.parent_class_id !== '0' && form.parent_class_id !== null) {
-        form.isTop = '0'
-      } else if (form.class_id !== '0' && form.class_id !== null) {
-        form.isTop = '1'
-      }
-      form.enabled = `${form.enabled}`
-      if (form.class_id != null) {
-        this.getSubTypes(form.id)
-      } else {
-        this.getClass()
-      }
-    },
-    // 提交前的验证
-    [CRUD.HOOK.afterValidateCU]() {
-      if (this.form.parent_class_id !== null && this.form.parent_class_id === this.form.class_id) {
-        this.$message({
-          message: '顶级类目不能为空',
-          type: 'warning'
-        })
-        return false
-      }
-      if (this.form.isTop === '1') {
-        this.form.parent_class_id = 0
-      }
-      return true
-    },
-    getSubTypes(id) {
-      crudClassstandard.getClassSuperior(id).then(res => {
-        const date = res.content
-        this.buildClass(date)
-        this.classes = date
-      })
-    },
-    getClass() {
-      crudClassstandard.getClass({ enabled: true }).then(res => {
-        this.classes = res.content.map(function(obj) {
-          if (obj.hasChildren) {
-            obj.children = null
-          }
-          return obj
-        })
-      })
-    },
-    buildClass(classes) {
-      classes.forEach(data => {
-        if (data.children) {
-          this.buildClass(data.children)
-        }
-        if (data.hasChildren && !data.children) {
-          data.children = null
-        }
-      })
-    },
-    // 获取弹窗内部门数据
-    loadClass({ action, parentNode, callback }) {
-      if (action === LOAD_CHILDREN_OPTIONS) {
-        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
-          parentNode.children = res.content.map(function(obj) {
-            if (obj.hasChildren) {
-              obj.children = null
-            }
-            return obj
-          })
-          setTimeout(() => {
-            callback()
-          }, 100)
-        })
-      }
-    },
-    clearFrom() {
-      defaultForm = {
-        id: null,
-        class_id: null,
-        base_data_type: null,
-        path_code: null,
-        class_code: null,
-        long_class_code: null,
-        class_name: null,
-        class_desc: null,
-        parent_class_id: null,
-        is_leaf: null,
-        sub_count: null,
-        is_modify: null,
-        is_delete: null,
-        class_level: null,
-        ext_id: null,
-        ext_parent_id: null,
-        create_id: null,
-        create_name: null,
-        create_time: null,
-        update_optid: null,
-        update_optname: null,
-        update_time: null,
-        isTop: null
-      }
-    },
-    addSibling(row) {
-      this.clearFrom() // 将默认的表单数据清除
-      defaultForm.id = row.id // 获取分类树的id - 懒加载依赖此id，不可为空
-      defaultForm.class_id = row.class_id
-      defaultForm.parent_class_id = row.parent_class_id ? row.parent_class_id : null // 同级为父类class_id
-      defaultForm.isTop = row.isTop
-      return defaultForm
-    },
-    addChildren(row) {
-      this.clearFrom()
-      defaultForm.id = row.id // 获取分类树的id
-      defaultForm.class_id = row.parent_class_id
-      defaultForm.parent_class_id = row.id // 子级为本身的class_id
-      defaultForm.isTop = row.isTop
-      return defaultForm
-    },
-    // 全部展开 参考：https://www.cnblogs.com/toughy/p/12667805.html
-    ToExpandall() {
-      const els = document.getElementsByClassName('el-table__expand-icon')
-      if (this.crud.data.length !== 0 && els.length !== 0) {
-        for (let j1 = 0; j1 < els.length; j1++) {
-          els[j1].classList.add('dafult')
-        }
-        if (this.$el.getElementsByClassName('el-table__expand-icon--expanded')) {
-          const open = this.$el.getElementsByClassName('el-table__expand-icon--expanded')
-          for (let j = 0; j < open.length; j++) {
-            open[j].classList.remove('dafult')
-          }
-          const dafult = this.$el.getElementsByClassName('dafult')
-          for (let a = 0; a < dafult.length; a++) {
-            dafult[a].click()
-          }
-        }
-      }
-    },
-    hand(value) {
-      this.crud.toQuery()
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/nladmin-ui/src/views/wms/basedata/customer/index.vue b/nladmin-ui/src/views/wms/basedata/customer/index.vue
deleted file mode 100644
index 74d9741..0000000
--- a/nladmin-ui/src/views/wms/basedata/customer/index.vue
+++ /dev/null
@@ -1,334 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <el-input
-        v-model="query.search"
-        clearable
-        style="width: 300px"
-        size="mini"
-        placeholder="输入客户编码或客户名称"
-        prefix-icon="el-icon-search"
-        class="filter-item"
-      />
-      <rrOperation />
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog
-        :close-on-click-modal="false"
-        :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
-        :title="crud.status.title"
-        width="1000px"
-      >
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
-          <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item label="客户编码" prop="cust_code">
-                <el-input v-model="form.cust_code" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="客户名称 " prop="cust_name">
-                <el-input v-model="form.cust_name" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="法人代表">
-                <el-input v-model="form.jurid_name" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item label="税务登记号">
-                <el-input v-model="form.tax_no" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="工商注册号">
-                <el-input v-model="form.register_no" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="经营许可证号">
-                <el-input v-model="form.manage_lice_no" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item label="营业执照">
-                <el-input v-model="form.busi_char_name" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="邮政编码">
-                <el-input v-model="form.zip_code" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="公司电话">
-                <el-input v-model="form.corp_tele_no" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item label="公司地址">
-                <el-input v-model="form.corp_address" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="外部标识">
-                <el-input v-model="form.ext_id" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="是否启用" prop="is_used">
-                <el-radio v-model="form.is_used" label="0">否</el-radio>
-                <el-radio v-model="form.is_used" label="1">是</el-radio>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="基础分类" prop="class_id">
-                <treeselect
-                  v-model="form.class_id"
-                  :load-options="loadClass"
-                  :options="classes"
-                  style="width: 200px;"
-                  placeholder="请选择"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-form-item label="备注">
-            <el-input v-model="form.remark" style="width: 600px;" type="textarea" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table
-        ref="table"
-        v-loading="crud.loading"
-        :data="crud.data"
-        size="mini"
-        style="width: 100%;"
-        @selection-change="crud.selectionChangeHandler"
-      >
-        <el-table-column prop="cust_code" label="客户编码" />
-        <el-table-column prop="cust_name" label="客户名称 " />
-        <el-table-column prop="corp_tele_no" label="公司电话" />
-        <el-table-column prop="corp_address" label="公司地址" />
-        <el-table-column prop="jurid_name" label="法人代表" />
-        <el-table-column prop="update_optname" label="修改者" />
-        <el-table-column prop="update_time" label="修改时间" width="150" />
-        <el-table-column label="启用" align="center" prop="is_used">
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.is_used"
-              active-color="#409EFF"
-              inactive-color="#F56C6C"
-              active-value="1"
-              inactive-value="0"
-              @change="changeEnabled(scope.row, scope.row.is_used)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-permission="['admin','customerbase:edit','customerbase:del']"
-          label="操作"
-          width="150px"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-  </div>
-</template>
-
-<script>
-import crudCustomerbase from '@/api/wms/basedata/customerbase'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import crudClassstandard from '@/api/wms/basedata/classstandard'
-
-const defaultForm = {
-  cust_id: null,
-  cust_code: null,
-  cust_name: null,
-  jurid_name: null,
-  tax_no: null,
-  register_no: null,
-  manage_lice_no: null,
-  busi_char_name: null,
-  area_id: null,
-  zip_code: null,
-  corp_tele_no: null,
-  corp_address: null,
-  create_id: null,
-  create_name: null,
-  create_time: null,
-  update_optid: null,
-  update_optname: null,
-  update_time: null,
-  is_used_time: null,
-  is_used: '1',
-  is_delete: null,
-  ext_id: null,
-  remark: null,
-  class_id: null
-}
-export default {
-  name: 'Customerbase',
-  dicts: ['is_used'],
-  components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '客户基础表',
-      url: 'api/customerbase',
-      optShow: {
-        add: true,
-        reset: true
-      },
-      idField: 'cust_id',
-      sort: 'cust_id,desc',
-      crudMethod: { ...crudCustomerbase }
-    })
-  },
-  data() {
-    return {
-      permission: {},
-      classes: [],
-      rules: {
-        cust_id: [
-          { required: true, message: '客户标识不能为空', trigger: 'blur' }
-        ],
-        cust_code: [
-          { required: true, message: '客户编码不能为空', trigger: 'blur' }
-        ],
-        cust_name: [
-          { required: true, message: '客户名称 不能为空', trigger: 'blur' }
-        ],
-        create_id: [
-          { required: true, message: '创建人不能为空', trigger: 'blur' }
-        ],
-        create_name: [
-          { required: true, message: '创建人不能为空', trigger: 'blur' }
-        ],
-        create_time: [
-          { required: true, message: '创建时间不能为空', trigger: 'blur' }
-        ],
-        is_used: [
-          { required: true, message: '是否启用不能为空', trigger: 'blur' }
-        ],
-        is_delete: [
-          { required: true, message: '是否删除不能为空', trigger: 'blur' }
-        ],
-        class_id: [
-          { required: true, message: '基础分类不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    [CRUD.HOOK.afterToCU](crud, form) {
-      if (form.material_type_id != null) {
-        this.getSubTypes(form.material_type_id)
-      } else {
-        this.getClass()
-      }
-    },
-    getSubTypes(id) {
-      crudClassstandard.getClassSuperior(id).then(res => {
-        const date = res.content
-        this.buildClass(date)
-        this.classes = date
-      })
-    },
-    getClass() {
-      crudClassstandard.getClass({ enabled: true, 'base_data_type': '05' }).then(res => {
-        this.classes = res.content.map(function(obj) {
-          if (obj.hasChildren) {
-            obj.children = null
-          }
-          return obj
-        })
-      })
-    },
-    // 获取弹窗内部门数据
-    loadClass({ action, parentNode, callback }) {
-      if (action === LOAD_CHILDREN_OPTIONS) {
-        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
-          parentNode.children = res.content.map(function(obj) {
-            if (obj.hasChildren) {
-              obj.children = null
-            }
-            return obj
-          })
-          setTimeout(() => {
-            callback()
-          }, 100)
-        })
-      }
-    },
-    // 改变状态
-    changeEnabled(data, val) {
-      this.$confirm('此操作将 "' + this.dict.label.is_used[val] + '" ' + data.cust_name + ', 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        crudCustomerbase.edit(data).then(res => {
-          this.crud.notify(this.dict.label.is_used[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        }).catch(() => {
-          if (data.is_used === '0') {
-            data.is_used = '1'
-            return
-          }
-          if (data.is_used === '1') {
-            data.is_used = '0'
-          }
-        })
-      }).catch(() => {
-        if (data.is_used === '0') {
-          data.is_used = '1'
-          return
-        }
-        if (data.is_used === '1') {
-          data.is_used = '0'
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/nladmin-ui/src/views/wms/basedata/material/index.vue b/nladmin-ui/src/views/wms/basedata/material/index.vue
deleted file mode 100644
index 3908729..0000000
--- a/nladmin-ui/src/views/wms/basedata/material/index.vue
+++ /dev/null
@@ -1,437 +0,0 @@
-<template>
-  <div v-loading.fullscreen.lock="fullscreenLoading" class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <el-row>
-        <el-col :span="8">
-          <el-row>
-            <el-col :span="7">
-              <span style="line-height:36px;text-align: center">物料类别：</span>
-            </el-col>
-            <el-col :span="12">
-              <treeselect
-                v-model="query.material_type_id"
-                :load-options="loadChildNodes"
-                :options="classes1"
-                style="width: 200px;"
-                placeholder="请选择"
-              />
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="8">
-          模糊查询：
-          <el-input
-            v-model="query.search"
-            clearable
-            style="width: 200px"
-            size="mini"
-            placeholder="输入物料编码或名称"
-            prefix-icon="el-icon-search"
-            class="filter-item"
-          />
-        </el-col>
-        <el-col :span="8">
-          <rrOperation />
-        </el-col>
-      </el-row>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-position"
-          size="mini"
-          @click="synchronize()"
-        >
-          同步
-        </el-button>
-      </crudOperation>
-      <!--表单组件-->
-      <el-dialog
-        :close-on-click-modal="false"
-        :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
-        :title="crud.status.title"
-        width="1200px"
-      >
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="物料编码" prop="material_code">
-                <el-input v-model="form.material_code" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="物料名称" prop="material_name">
-                <el-input v-model="form.material_name" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-
-              <el-form-item label="规格" prop="material_spec">
-                <label slot="label">规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</label>
-                <el-input v-model="form.material_spec" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="型号" prop="material_model">
-                <label slot="label">型&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
-                <el-input v-model="form.material_model" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="外部标识" prop="ext_id">
-                <el-input v-model="form.ext_id" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="物料分类" prop="material_type_id">
-                <treeselect
-                  v-model="form.material_type_id"
-                  :load-options="loadChildNodes"
-                  :options="classes2"
-                  style="width: 200px;"
-                  placeholder="请选择"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="产品系列">
-                <treeselect
-                  v-model="form.product_series"
-                  :options="classes3"
-                  :auto-load-root-options="false"
-                  :load-options="loadChildNodes"
-                  style="width: 200px;"
-                  placeholder="请选择"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="静置时间" prop="standing_time">
-                <el-input-number v-model="form.standing_time" :controls="false" :min="0" label="分钟" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="是否启用" prop="is_used">
-                <el-radio v-model="form.is_used" label="0">否</el-radio>
-                <el-radio v-model="form.is_used" label="1">是</el-radio>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table
-        ref="table"
-        v-loading="crud.loading"
-        :data="crud.data"
-        size="mini"
-        style="width: 100%;"
-        @selection-change="crud.selectionChangeHandler"
-      >
-        <el-table-column prop="material_code" label="物料编码" width="160" />
-        <el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
-        <el-table-column prop="material_spec" label="物料规格" width="140" />
-        <el-table-column prop="material_model" label="物料型号" />
-        <el-table-column prop="class_name" label="物料分类" width="140" />
-        <el-table-column prop="unit_name" label="计量单位" />
-        <el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />
-        <el-table-column prop="product_series_name" label="系列" />
-        <el-table-column label="启用" align="center" prop="is_used">
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.is_used"
-              active-color="#409EFF"
-              inactive-color="#F56C6C"
-              active-value="1"
-              inactive-value="0"
-              @change="changeEnabled(scope.row, scope.row.is_used)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column prop="update_optname" label="修改人" />
-        <el-table-column prop="update_time" label="修改时间" width="135" />
-        <el-table-column
-          v-permission="['admin','Materialbase:edit','Materialbase:del']"
-          fixed="right"
-          label="操作"
-          width="120px"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-  </div>
-</template>
-
-<script>
-import crudMaterialbase from '@/api/wms/basedata/materialbase'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import crudClassstandard from '@/api/wms/basedata/classstandard'
-import crudMdPbMeasureunit from '@/api/wms/basedata/mdPbMeasureunit'
-
-const defaultForm = {
-  material_id: null,
-  ass_unit_id: null,
-  material_code: null,
-  material_name: null,
-  material_spec: null,
-  material_model: null,
-  english_name: null,
-  base_unit_id: null,
-  approve_fileno: null,
-  print_no: null,
-  material_type_id: null,
-  len_unit_id: null,
-  length: null,
-  width: null,
-  height: null,
-  weight_unit_id: null,
-  gross_weight: null,
-  net_weight: null,
-  cubage_unit_id: null,
-  cubage: null,
-  create_id: null,
-  create_name: null,
-  create_time: null,
-  update_optid: null,
-  update_optname: null,
-  update_time: null,
-  is_used_time: null,
-  is_used: null,
-  is_delete: null,
-  ext_id: null,
-  material_height_type: null,
-  product_series: null
-}
-export default {
-  name: 'Materialbase',
-  // 数据字典
-  dicts: ['is_used'],
-  components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '物料',
-      optShow: { add: true, reset: true },
-      url: 'api/Materialbase',
-      idField: 'material_id',
-      sort: 'material_id,desc',
-      crudMethod: { ...crudMaterialbase }
-    })
-  },
-  data() {
-    return {
-      classes1: [],
-      classes2: [],
-      classes3: [],
-      fullscreenLoading: false,
-      measure_unit: [],
-      productSeries: [],
-      permission: {},
-      rules: {
-        material_id: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        material_code: [
-          { required: true, message: '物料编码不能为空', trigger: 'blur' }
-        ],
-        material_name: [
-          { required: true, message: '物料名称不能为空', trigger: 'blur' }
-        ],
-        material_type_id: [
-          { required: true, message: '物料分类不能为空', trigger: 'blur' }
-        ],
-        create_id: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        create_time: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        is_used: [
-          { required: true, message: '是否启用不能为空', trigger: 'blur' }
-        ],
-        material_height_type: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  created() {
-    this.initClass1()
-    this.initClass2()
-    this.initClass3()
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    initClass1() {
-      const param = {
-        parent_class_code: '09'
-      }
-      crudClassstandard.getClassType(param).then(res => {
-        const data = res.content
-        this.buildTree(data)
-        this.classes1 = data
-      })
-    },
-    initClass2() {
-      const param = {
-        parent_class_code: '09'
-      }
-      crudClassstandard.getClassType(param).then(res => {
-        const data = res.content
-        this.buildTree(data)
-        this.classes2 = data
-      })
-    },
-    initClass3() {
-      const param = {
-        parent_class_code: '07'
-      }
-      crudClassstandard.getClassType(param).then(res => {
-        const data = res.content
-        this.buildTree(data)
-        this.classes3 = data
-      })
-    },
-    [CRUD.HOOK.beforeToCU](crud, form) {
-      crudMdPbMeasureunit.getUnit().then(res => {
-        this.measure_unit = res.content
-      })
-      // 物料标识为空，新增
-      if (!form.material_type_id) {
-        form.material_type_id = null // 必须为null，否则会出现unknown
-      } else { // 更新
-        this.getSubTypes('02', form.material_type_id)
-      }
-      // 物料系列为空，新增
-      if (!form.product_series) {
-        form.product_series = null // 必须为null，否则会出现unknown
-      } else { // 更新
-        this.getSubTypes('03', form.product_series)
-      }
-    },
-    getSubTypes(type, id) {
-      const that = this
-      crudClassstandard.getClassSuperior(id).then(res => {
-        const data = res.content
-        that.buildTree(data)
-        if (type == '02') {
-          that.classes2 = data
-        }
-        if (type == '03') {
-          that.classes3 = data
-        }
-      })
-    },
-    synchronize() {
-      this.fullscreenLoading = true
-      crudMaterialbase.synchronize(this.crud.query).then(res => {
-        this.fullscreenLoading = false
-        this.crud.notify('同步成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-      }).catch(() => {
-        this.fullscreenLoading = false
-      })
-    },
-    queryClassId() {
-      const param = {
-        'class_idStr': this.class_idStr
-      }
-      crudClassstandard.queryClassById(param).then(res => {
-        this.classes = res.content.map(obj => {
-          if (obj.hasChildren) {
-            obj.children = null
-          }
-          return obj
-        })
-      })
-    },
-    buildTree(classes) {
-      classes.forEach(data => {
-        if (data.children) {
-          this.buildTree(data.children)
-        }
-        if (data.hasChildren && !data.children) {
-          data.children = null // 重点代码
-        }
-      })
-    },
-    // 改变状态
-    changeEnabled(data, val) {
-      this.$confirm('此操作将 "' + this.dict.label.is_used[val] + '" ' + data.material_name + ', 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        crudMaterialbase.edit(data).then(res => {
-          this.crud.notify(this.dict.label.is_used[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        }).catch(() => {
-          if (data.is_used === '0') {
-            data.is_used = '1'
-            return
-          }
-          if (data.is_used === '1') {
-            data.is_used = '0'
-          }
-        })
-      }).catch(() => {
-        if (data.is_used === '0') {
-          data.is_used = '1'
-          return
-        }
-        if (data.is_used === '1') {
-          data.is_used = '0'
-        }
-      })
-    },
-    // 获取子节点数据
-    loadChildNodes({ action, parentNode, callback }) {
-      if (action === LOAD_CHILDREN_OPTIONS) {
-        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
-          parentNode.children = res.content.map(function(obj) {
-            if (obj.hasChildren) {
-              obj.children = null
-            }
-            return obj
-          })
-          setTimeout(() => {
-            callback()
-          }, 100)
-        })
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/nladmin-ui/src/views/wms/basedata/measure/index.vue b/nladmin-ui/src/views/wms/basedata/measure/index.vue
deleted file mode 100644
index 9f0838e..0000000
--- a/nladmin-ui/src/views/wms/basedata/measure/index.vue
+++ /dev/null
@@ -1,178 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <el-input
-        v-model="query.search"
-        clearable
-        style="width: 300px"
-        size="mini"
-        placeholder="输入单位编码或单位名称"
-        prefix-icon="el-icon-search"
-        class="filter-item"
-      />
-      <rrOperation />
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="编码" prop="unit_code">
-            <el-input v-model="form.unit_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="名称" prop="unit_name">
-            <el-input v-model="form.unit_name" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="外部标识" prop="ext_id">
-            <el-input v-model="form.ext_id" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="数据精度" prop="qty_precision">
-            <!--            <el-input v-model="form.qty_precision" style="width: 370px;" />-->
-            <el-input-number v-model="form.qty_precision" :min="1" :max="6" label="描述文字" style="width: 150px;" @change="handleChange" />
-          </el-form-item>
-          <el-form-item label="是否启用" prop="is_used">
-            <el-radio v-model="form.is_used" label="0">否</el-radio>
-            <el-radio v-model="form.is_used" label="1">是</el-radio>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column prop="unit_code" label="编码" />
-        <el-table-column prop="unit_name" label="名称" />
-        <el-table-column prop="qty_precision" label="数据精度" />
-        <el-table-column prop="update_optname" label="修改者" />
-        <el-table-column prop="update_time" label="修改时间" width="135" />
-        <el-table-column prop="is_used" label="启用 ">
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.is_used"
-              active-color="#409EFF"
-              inactive-color="#F56C6C"
-              active-value="1"
-              inactive-value="0"
-              @change="changeEnabled(scope.row, scope.row.is_used)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column v-permission="['admin','mdPbMeasureunit:edit','mdPbMeasureunit:del']" fixed="right" label="操作" width="150px" align="center">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-  </div>
-</template>
-
-<script>
-import crudMdPbMeasureunit from '@/api/wms/basedata/mdPbMeasureunit'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-const defaultForm = { measure_unit_id: null, unit_code: null, unit_name: null, qty_precision: null, is_used: '1', create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null, ext_id: null }
-export default {
-  dicts: ['is_used'],
-  name: 'MdPbMeasureunit',
-  // eslint-disable-next-line vue/no-unused-components
-  components: { pagination, crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({ title: '计量单位',
-      url: 'api/mdPbMeasureunit',
-      optShow: {
-        add: true,
-        reset: true
-      },
-      idField: 'measure_unit_id',
-      sort: 'measure_unit_id,desc',
-      crudMethod: { ...crudMdPbMeasureunit }})
-  },
-  data() {
-    return {
-      permission: {
-      },
-      rules: {
-        measure_unit_id: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        unit_code: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        unit_name: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        qty_precision: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        is_used: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        create_id: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        create_name: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        create_time: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        is_delete: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ]
-      }}
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    // 改变状态
-    changeEnabled(data, val) {
-      this.$confirm('此操作将 "' + this.dict.label.is_used[val] + '" ' + data.unit_name + ', 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        crudMdPbMeasureunit.edit(data).then(res => {
-          this.crud.notify(this.dict.label.is_used[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        }).catch(() => {
-          if (data.is_used === '0') {
-            data.is_used = '1'
-            return
-          }
-          if (data.is_used === '1') {
-            data.is_used = '0'
-          }
-        })
-      }).catch(() => {
-        if (data.is_used === '0') {
-          data.is_used = '1'
-          return
-        }
-        if (data.is_used === '1') {
-          data.is_used = '0'
-        }
-      })
-    },
-    handleChange(value) {
-      console.log(value)
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/nladmin-ui/src/views/wms/basedata/supp/index.vue b/nladmin-ui/src/views/wms/basedata/supp/index.vue
deleted file mode 100644
index 487f0bd..0000000
--- a/nladmin-ui/src/views/wms/basedata/supp/index.vue
+++ /dev/null
@@ -1,344 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <el-input
-        v-model="query.search"
-        clearable
-        style="width: 300px"
-        size="mini"
-        placeholder="输入供应商编码或名称"
-        prefix-icon="el-icon-search"
-        class="filter-item"
-      />
-      <rrOperation />
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog
-        :close-on-click-modal="false"
-        :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
-        :title="crud.status.title"
-        width="1200px"
-      >
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="130px">
-          <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item label="供应商编码" prop="supp_code">
-                <el-input v-model="form.supp_code" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="供应商名称 " prop="supp_name">
-                <el-input v-model="form.supp_name" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="法人代表">
-                <el-input v-model="form.jurid_name" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item label="税务登记号">
-                <el-input v-model="form.tax_no" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="工商注册号">
-                <el-input v-model="form.register_no" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="经营许可证号">
-                <el-input v-model="form.manage_lice_no" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item label="营业执照">
-                <el-input v-model="form.busi_char_name" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="条码打印起始值">
-                <el-input v-model="form.barcode_print" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="邮政编码">
-                <el-input v-model="form.zip_code" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item label="公司电话">
-                <el-input v-model="form.corp_tele_no" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="公司地址">
-                <el-input v-model="form.corp_address" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="是否启用" prop="is_used">
-                <el-radio v-model="form.is_used" label="0">否</el-radio>
-                <el-radio v-model="form.is_used" label="1">是</el-radio>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item label="外部标识">
-                <el-input v-model="form.ext_id" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="资金计划履约天数">
-                <el-input v-model="form.honour_days" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="基础分类" prop="class_id">
-                <treeselect
-                  v-model="form.class_id"
-                  :load-options="loadClass"
-                  :options="classes"
-                  style="width: 200px;"
-                  placeholder="请选择"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-form-item label="备注">
-            <el-input v-model="form.remark" style="width: 600px;" type="textarea" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table
-        ref="table"
-        v-loading="crud.loading"
-        :data="crud.data"
-        size="mini"
-        style="width: 100%;"
-        @selection-change="crud.selectionChangeHandler"
-      >
-        <el-table-column prop="supp_code" label="供应商编码" />
-        <el-table-column prop="supp_name" label="供应商名称 " />
-        <el-table-column prop="corp_address" label="公司地址" />
-        <el-table-column prop="corp_tele_no" label="公司电话" />
-        <el-table-column prop="jurid_name" label="法人代表" />
-        <el-table-column prop="update_optname" label="修改者" />
-        <el-table-column prop="update_time" label="修改时间" width="150" />
-        <el-table-column label="启用" align="center" prop="is_used">
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.is_used"
-              active-color="#409EFF"
-              inactive-color="#F56C6C"
-              active-value="1"
-              inactive-value="0"
-              @change="changeEnabled(scope.row, scope.row.is_used)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-permission="['admin','Supplierbase:edit','Supplierbase:del']"
-          label="操作"
-          width="150px"
-          lign="center"
-        >
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-  </div>
-</template>
-
-<script>
-import crudSupplierbase from '@/api/wms/basedata/supplierbase'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import rrOperation from '@crud/RR.operation'
-import crudClassstandard from '@/api/wms/basedata/classstandard'
-import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-
-const defaultForm = {
-  supp_id: null,
-  supp_code: null,
-  supp_name: null,
-  jurid_name: null,
-  tax_no: null,
-  register_no: null,
-  manage_lice_no: null,
-  busi_char_name: null,
-  area_id: null,
-  zip_code: null,
-  corp_tele_no: null,
-  corp_address: null,
-  create_id: null,
-  create_name: null,
-  create_time: null,
-  update_optid: null,
-  update_optname: null,
-  update_time: null,
-  is_used_time: null,
-  is_used: '1',
-  is_delete: null,
-  ext_id: null,
-  barcode_print: null,
-  class_code: null,
-  remark: null,
-  honour_days: null
-}
-export default {
-  name: 'Supplierbase',
-  components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  // 数据字典
-  dicts: ['is_used'],
-  cruds() {
-    return CRUD({
-      title: '供应商',
-      url: 'api/supplierbase',
-      optShow: {
-        add: true,
-        reset: true
-      },
-      idField: 'supp_id',
-      sort: 'supp_id,desc',
-      crudMethod: { ...crudSupplierbase }
-    })
-  },
-  data() {
-    return {
-      permission: {},
-      classes: [],
-      rules: {
-        supp_code: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        supp_name: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        create_id: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        create_name: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        create_time: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        is_used: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        is_delete: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        class_id: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    [CRUD.HOOK.afterToCU](crud, form) {
-      if (form.material_type_id != null) {
-        this.getSubTypes(form.material_type_id)
-      } else {
-        this.getClass()
-      }
-    },
-    getSubTypes(id) {
-      crudClassstandard.getClassSuperior(id).then(res => {
-        const date = res.content
-        this.buildClass(date)
-        this.classes = date
-      })
-    },
-    getClass() {
-      crudClassstandard.getClass({ enabled: true, 'base_data_type': '04' }).then(res => {
-        this.classes = res.content.map(function(obj) {
-          if (obj.hasChildren) {
-            obj.children = null
-          }
-          return obj
-        })
-      })
-    },
-    // 获取弹窗内部门数据
-    loadClass({ action, parentNode, callback }) {
-      if (action === LOAD_CHILDREN_OPTIONS) {
-        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
-          parentNode.children = res.content.map(function(obj) {
-            if (obj.hasChildren) {
-              obj.children = null
-            }
-            return obj
-          })
-          setTimeout(() => {
-            callback()
-          }, 100)
-        })
-      }
-    },
-    // 改变状态
-    changeEnabled(data, val) {
-      this.$confirm('此操作将 "' + this.dict.label.is_used[val] + '" ' + data.supp_code + ', 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        crudSupplierbase.edit(data).then(res => {
-          this.crud.notify(this.dict.label.is_used[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        }).catch(() => {
-          if (data.is_used === '0') {
-            data.is_used = '1'
-            return
-          }
-          if (data.is_used === '1') {
-            data.is_used = '0'
-          }
-        })
-      }).catch(() => {
-        if (data.is_used === '0') {
-          data.is_used = '1'
-          return
-        }
-        if (data.is_used === '1') {
-          data.is_used = '0'
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/nladmin-ui/src/views/wms/basedata/vehicle/index.vue b/nladmin-ui/src/views/wms/basedata/vehicle/index.vue
deleted file mode 100644
index 51d0881..0000000
--- a/nladmin-ui/src/views/wms/basedata/vehicle/index.vue
+++ /dev/null
@@ -1,240 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
-        <el-form
-          :inline="true"
-          class="demo-form-inline"
-          label-position="right"
-          label-width="80px"
-          label-suffix=":"
-        >
-          <el-form-item label="载具类型">
-            <el-select
-              v-model="query.vehicle_type"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-              style="width: 180px;"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.vehicle_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="载具号">
-            <el-input
-              v-model="query.vehicle_code"
-              clearable
-              size="mini"
-              placeholder="载具号"
-              style="width: 180px;"
-              class="filter-item"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <rrOperation/>
-        </el-form>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-printer"
-          size="mini"
-          :disabled="crud.selections.length < 1"
-          @click="print"
-        >
-          打印
-        </el-button>
-      </crudOperation>
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="载具编码" prop="vehicle_code">
-            <el-input v-model="form.vehicle_code" :disabled="true" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="载具类型">
-            <el-select
-              v-model="form.vehicle_type"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 370px;"
-              @change="getVehicle"
-            >
-              <el-option
-                v-for="item in dict.vehicle_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="载具数量" prop="num">
-            <el-input-number :precision="0" :min="1" :max="99" v-model="form.num" style="width: 200px;" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="info" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">生成</el-button>
-          <el-button type="primary" @click="addAndprint">生成并打印</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="vehicle_code" label="载具编码" />
-        <el-table-column prop="vehicle_type" label="载具类型" >
-          <template slot-scope="scope">
-            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="create_name" label="创建人" />
-        <el-table-column prop="create_time" label="创建时间" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-              :is-visiable-edit="false"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-  </div>
-</template>
-
-<script>
-import crudVehicle from './vehicle'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import { getLodop } from '@/assets/js/lodop/LodopFuncs'
-
-const defaultForm = { num: 1, vehicle_id: null, vehicle_code: null, vehicle_name: null, one_code: null, two_code: null, rfid_code: null, vehicle_type: null, vehicle_width: null, vehicle_long: null, vehicle_height: null, overstruct_type: null, occupystruct_qty: null, ext_id: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
-export default {
-  name: 'Vehicle',
-  dicts:['vehicle_type'],
-  components: { pagination, crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '载具维护',
-      url: 'api/vehicle',
-      idField: 'vehicle_id',
-      sort: 'vehicle_id,desc',
-      crudMethod: { ...crudVehicle },
-      optShow: {
-        add: true,
-        edit: false,
-        del: false,
-        download: false,
-        reset: true
-      }
-    })
-  },
-  data() {
-    return {
-      permission: {
-      },
-      rules: {
-        vehicle_code: [
-          { required: true, message: '载具编码不能为空', trigger: 'blur' }
-        ],
-        vehicle_type: [
-          { required: true, message: '载具类型不能为空', trigger: 'blur' }
-        ],
-        overstruct_type: [
-          { required: true, message: '载具超仓位类型不能为空', trigger: 'blur' }
-        ],
-        occupystruct_qty: [
-          { required: true, message: '占仓位数不能为空', trigger: 'blur' }
-        ]
-      }}
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    hand() {
-      this.crud.toQuery()
-    },
-    getVehicle(code) {
-      if (!code) {
-        this.crud.notify('请选择载具类型', CRUD.NOTIFICATION_TYPE.INFO)
-        this.form.vehicle_code = ''
-        return false
-      }
-      crudVehicle.getVehicle(code).then(res => {
-        this.form.vehicle_code = res.value
-      })
-    },
-    addAndprint() {
-      const data = this.form
-      if (!this.form.vehicle_type) {
-        this.crud.notify('载具类型不能为空', CRUD.NOTIFICATION_TYPE.INFO)
-        return false
-      }
-      if (!this.form.num) {
-        this.crud.notify('数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
-        return false
-      }
-      crudVehicle.add(data).then(res => {
-        res.forEach((item) => {
-          const LODOP = getLodop()
-          LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
-          // 打印纸张大小设置https://www.it610.com/article/2094844.html
-          LODOP.SET_PRINT_PAGESIZE(1, '50mm', '30mm', '1')
-          // LODOP.ADD_PRINT_RECT('0mm', '0mm', '50mm', '30mm', 0, 1)
-          LODOP.ADD_PRINT_BARCODE('4.3mm', '6.2mm', '40mm', '20mm', '128Auto', item)
-          // LODOP.PREVIEW()// 预览
-          LODOP.PRINT()// 打印
-        })
-        this.crud.status.add = CRUD.STATUS.NORMAL
-        this.crud.toQuery()
-        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-      })
-    },
-    print() {
-      const _selectData = this.$refs.table.selection
-      if (!_selectData || _selectData.length < 1) {
-        this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      for (let i = 0; i < _selectData.length; i++) {
-        const code = _selectData[i].vehicle_code
-        const LODOP = getLodop()
-        LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
-        // 打印纸张大小设置https://www.it610.com/article/2094844.html
-        LODOP.SET_PRINT_PAGESIZE(1, '50mm', '30mm', '')
-        // LODOP.ADD_PRINT_RECT('0mm', '0mm', '48mm', '28mm', 0, 1)
-        LODOP.ADD_PRINT_BARCODE('4.3mm', '8.2mm', '40mm', '20mm', '128Auto', code)
-        // LODOP.PREVIEW()// 预览
-        LODOP.PRINT()// 打印
-        this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.crud.toQuery()
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/nladmin-ui/src/views/wms/basedata/vehicle/vehicle.js b/nladmin-ui/src/views/wms/basedata/vehicle/vehicle.js
deleted file mode 100644
index 871a486..0000000
--- a/nladmin-ui/src/views/wms/basedata/vehicle/vehicle.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/vehicle',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/vehicle/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/vehicle',
-    method: 'put',
-    data
-  })
-}
-
-export function getVehicle(code) {
-  return request({
-    url: 'api/vehicle/getVehicle/' + code,
-    method: 'get'
-  })
-}
-
-export default { add, edit, del, getVehicle }
diff --git a/nladmin-ui/src/views/wms/pdm/device/index.vue b/nladmin-ui/src/views/wms/pdm/device/index.vue
deleted file mode 100644
index f192457..0000000
--- a/nladmin-ui/src/views/wms/pdm/device/index.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
-        <label class="el-form-item-label">模糊搜索</label>
-        <el-input
-          v-model="query.search"
-          clearable
-          size="small"
-          placeholder="请输入设备编码或名称"
-          style="width: 220px;"
-          class="filter-item"
-        />
-        <rrOperation :crud="crud" />
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="设备编码" prop="device_code">
-            <el-input v-model="form.device_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="设备名称" prop="device_name">
-            <el-input v-model="form.device_name" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="设备型号">
-            <el-input v-model="form.device_model" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="设备产能">
-            <el-input v-model="form.productivity" type="number" oninput="value = value.replace(/[^\d]/g, '')" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="外部编码">
-            <el-input v-model="form.extend_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="备注">
-            <el-input v-model="form.remark" :rows="3" type="textarea" style="width: 370px;" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="device_code" label="设备编码" />
-        <el-table-column prop="device_name" label="设备名称" min-width="200" show-overflow-tooltip />
-        <el-table-column prop="device_model" label="设备型号" min-width="200" show-overflow-tooltip />
-        <el-table-column prop="productivity" label="设备产能" />
-        <el-table-column label="是否启用" align="center" prop="is_used">
-          <template slot-scope="scope">
-            <el-switch
-              :value="format_is_used(scope.row.is_used)"
-              active-color="#409EFF"
-              inactive-color="#F56C6C"
-              @change="changeEnabled(scope.row, scope.row.is_used)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column prop="remark" label="备注" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-  </div>
-</template>
-
-<script>
-import crudDevice from '@/api/wms/pdm/device'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-
-const defaultForm = { device_id: null, device_code: null, device_name: null, device_model: null, workprocedure_id: null, extend_code: null, devicebill_id: null, remark: null, is_active: null, create_id: null, create_name: null, create_time: null, is_delete: null, productivity: null }
-export default {
-  name: 'Device',
-  components: { pagination, crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({ title: '生产设备', url: 'api/device', idField: 'device_id', sort: 'device_id,desc',
-      optShow: {
-        add: true,
-        edit: false,
-        del: false,
-        reset: true,
-        download: false
-      },
-      crudMethod: { ...crudDevice }})
-  },
-  data() {
-    return {
-      permission: {
-      },
-      rules: {
-        device_code: [
-          { required: true, message: '设备编码不能为空', trigger: 'blur' }
-        ],
-        device_name: [
-          { required: true, message: '设备名称不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    changeEnabled(data, val) {
-      let msg = '此操作将停用设备，是否继续！'
-      if (val !== '1') {
-        msg = '此操作将启用设备，是否继续！'
-      }
-      this.$confirm(msg, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        crudDevice.changeActive(data).then(res => {
-          this.crud.toQuery()
-          this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        }).catch(() => {
-          data.is_used = !data.is_used
-        })
-      }).catch(() => {
-      })
-    },
-    format_is_used(is_used) {
-      return is_used === '1'
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/nladmin-ui/src/views/wms/pdm/workerorder/OutMaterDialog.vue b/nladmin-ui/src/views/wms/pdm/workerorder/OutMaterDialog.vue
deleted file mode 100644
index 758b298..0000000
--- a/nladmin-ui/src/views/wms/pdm/workerorder/OutMaterDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<template>
-  <el-dialog
-    title="物料选择"
-    append-to-body
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    width="1000px"
-    @close="close"
-    @open="open"
-  >
-    <el-form
-      :inline="true"
-      class="demo-form-inline"
-      label-position="right"
-      label-width="80px"
-      label-suffix=":"
-    >
-      <el-form-item label="模糊搜索">
-        <el-input
-          v-model="query.search"
-          clearable
-          size="mini"
-          placeholder="编码、名称"
-          @keyup.enter.native="crud.toQuery"
-        />
-      </el-form-item>
-      <rrOperation />
-    </el-form>
-
-    <!--表格渲染-->
-    <el-table
-      ref="table"
-      v-loading="crud.loading"
-      :data="crud.data"
-      style="width: 100%;"
-      size="mini"
-      border
-      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-      @select="handleSelectionChange"
-      @select-all="onSelectAll"
-      @current-change="clickChange"
-    >
-      <el-table-column v-if="!isSingle" type="selection" width="55" />
-      <el-table-column v-if="isSingle" label="选择" width="55">
-        <template slot-scope="scope">
-          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip />
-      <el-table-column prop="material_name" label="物料名称" min-width="100" show-overflow-tooltip />
-      <el-table-column prop="material_spec" label="规格" min-width="100" show-overflow-tooltip />
-      <el-table-column prop="net_weight" label="物料净重" min-width="100" show-overflow-tooltip />
-    </el-table>
-    <!--分页组件-->
-    <pagination />
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="submit">确 定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-
-import crudMaterialbase from '@/api/wms/pdm/outmaterial'
-import CRUD, { header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import pagination from '@crud/Pagination'
-
-export default {
-  name: 'OutMaterDtl',
-  components: { rrOperation, pagination },
-  cruds() {
-    return CRUD({ title: '物料', url: '/api/Materialbase', crudMethod: { ...crudMaterialbase }, optShow: {}})
-  },
-  mixins: [presenter(), header()],
-  dicts: ['product_series'],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    isSingle: {
-      type: Boolean,
-      default: true
-    },
-    materOptCode: {
-      type: String,
-      default: '00'
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      classes: [],
-      tableRadio: null,
-      class_idStr: null,
-      checkrow: null,
-      rows: []
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue) {
-        this.dialogVisible = newValue
-      }
-    }
-  },
-  methods: {
-    clickChange(item) {
-      this.tableRadio = item
-    },
-    seriesFormat(row) {
-      return this.dict.label.product_series[row.product_series]
-    },
-    open() {
-    },
-    handleSelectionChange(val, row) {
-      if (val.length > 1) {
-        this.$refs.table.clearSelection()
-        this.$refs.table.toggleRowSelection(val.pop())
-      } else {
-        this.checkrow = row
-      }
-    },
-    onSelectAll() {
-      this.$refs.table.clearSelection()
-    },
-    close() {
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-    },
-    submit() {
-      // 处理单选
-      if (this.isSingle && this.tableRadio) {
-        this.$emit('update:dialogShow', false)
-        this.$emit('tableChanged2', this.tableRadio)
-        return
-      }
-      this.rows = this.$refs.table.selection
-      if (this.rows.length <= 0) {
-        this.$message('请先勾选物料')
-        return
-      }
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-      this.$emit('tableChanged2', this.rows)
-    }
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-::v-deep .el-dialog__body {
-  padding-top: 0px;
-}
-</style>
-
diff --git a/nladmin-ui/src/views/wms/pdm/workerorder/ViewDialog.vue b/nladmin-ui/src/views/wms/pdm/workerorder/ViewDialog.vue
deleted file mode 100644
index 9619c79..0000000
--- a/nladmin-ui/src/views/wms/pdm/workerorder/ViewDialog.vue
+++ /dev/null
@@ -1,354 +0,0 @@
-<template>
-  <el-dialog
-    title="工单详情"
-    append-to-body
-    fullscreen
-    :visible.sync="dialogVisible"
-    @open="open"
-    @close="close"
-  >
-    <el-card class="box-card" shadow="never">
-      <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="180px">
-        <el-form-item label="工单编码">
-          <el-input v-model="form.produceorder_code" style="width: 200px;" />
-        </el-form-item>
-        <el-form-item label="工单类型">
-          <el-select v-model="form.order_type_scode" style="width: 200px" filterable placeholder="请选择">
-            <el-option
-              v-for="item in dict.pdm_workorder_type"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="所属工序">
-          <el-select
-            v-model="form.workprocedure_id"
-            clearable
-            size="mini"
-            class="filter-item"
-            style="width: 200px;"
-          >
-            <el-option
-              v-for="item in workprocedureList"
-              :key="item.workprocedure_id"
-              :label="item.workprocedure_name"
-              :value="item.workprocedure_id"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="生产日期">
-          <el-date-picker v-model="form.produce_date" type="date" value-format="yyyy-MM-dd" style="width: 200px;" />
-        </el-form-item>
-        <el-form-item v-if="false" label="物料标识">
-          <el-input v-model="form.material_id" style="width: 200px;" />
-        </el-form-item>
-        <el-form-item label="物料编码">
-          <el-input
-            v-model="form.material_code"
-            style="width: 200px;"
-            clearable
-            @focus="materialShow=true"
-            @clear="form.material_id='',form.material_code='',form.material_name='',form.material_spec=''"
-          />
-        </el-form-item>
-        <el-form-item label="物料名称">
-          <el-input
-            v-model="form.material_name"
-            style="width: 200px;"
-            disabled
-          />
-        </el-form-item>
-        <el-form-item label="物料规格">
-          <el-input
-            v-model="form.material_spec"
-            style="width: 200px;"
-            disabled
-          />
-        </el-form-item>
-        <el-form-item label="物料单重">
-          <el-input v-model="form.material_weight" style="width: 200px;" />
-        </el-form-item>
-        <el-form-item label="计划数量">
-          <el-input v-model="form.plan_qty" style="width: 200px;" />
-        </el-form-item>
-        <el-form-item label="计划开始时间">
-          <el-date-picker
-            v-model="form.planproducestart_date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetime"
-            style="width: 200px;"
-          />
-        </el-form-item>
-        <el-form-item label="计划结束时间">
-          <el-date-picker
-            v-model="form.planproduceend_date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetime"
-            style="width: 200px;"
-          />
-        </el-form-item>
-        <el-form-item label="实际开始时间">
-          <el-date-picker
-            v-model="form.realproducestart_date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetime"
-            style="width: 200px;"
-          />
-        </el-form-item>
-        <el-form-item label="实际结束时间">
-          <el-date-picker
-            v-model="form.realproduceend_date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetime"
-            style="width: 200px;"
-          />
-        </el-form-item>
-        <el-form-item label="产品系列">
-          <treeselect
-            v-model="form.product_series"
-            disabled
-            :options="classes3"
-            :auto-load-root-options="false"
-            :load-options="loadChildNodes"
-            style="width: 200px;"
-            placeholder=""
-          />
-        </el-form-item>
-        <el-form-item label="销售单标识">
-          <el-input v-model="form.sale_id" style="width: 200px;" />
-        </el-form-item>
-        <el-form-item label="是否搬运">
-          <el-radio
-            v-for="item in dict.is_or_not"
-            :key="item.id"
-            v-model="form.is_needmove"
-            :label="item.value"
-          >{{ item.label }}
-          </el-radio>
-        </el-form-item>
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-        <el-form-item label="允许修改报工数量">
-          <el-radio
-            v-for="item in dict.is_or_not"
-            :key="item.id"
-            v-model="form.is_canupdate_update"
-            :label="item.value"
-          >{{ item.label }}
-          </el-radio>
-        </el-form-item>
-      </el-form>
-    </el-card>
-    <div class="crud-opts2" style="margin-top: 30px;margin-bottom: 15px">
-      <span class="role-span">工单生产记录详情</span>
-      <span class="crud-opts-right2">
-        <!--左侧插槽-->
-        <slot name="left" />
-      </span>
-
-    </div>
-    <!--表格渲染-->
-    <el-table
-      ref="table"
-      :data="tableData"
-      style="width: 100%;"
-      max-height="300"
-      border
-      :highlight-current-row="true"
-      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-    >
-      <el-table-column prop="device_code" label="设备编码" align="center" />
-      <el-table-column prop="device_name" label="设备名称" align="center" min-width="200" show-overflow-tooltip />
-      <el-table-column prop="produce_qty" label="生产数量" align="center" />
-      <el-table-column prop="init_qty" label="期初数量" align="center" />
-      <el-table-column prop="finish_qty" label="期末数量" align="center" />
-      <el-table-column prop="finishproduct_qty" label="完成数量" align="center" />
-      <el-table-column prop="operatetime_start" label="开始时间" align="center" min-width="130" show-overflow-tooltip />
-      <el-table-column prop="operatetime_end" label="结束时间" align="center" min-width="130" show-overflow-tooltip />
-      <el-table-column prop="nick_name" label="操作人" align="center" />
-    </el-table>
-
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="dialogVisible = false">确定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { crud } from '@crud/crud'
-import crudProduceshiftorder from '@/api/wms/pdm/workorder'
-import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import crudClassstandard from '@/api/wms/basedata/classstandard'
-
-export default {
-  name: 'ViewDialog',
-  components: { Treeselect },
-  dicts: ['pdm_workorder_status', 'is_used', 'pdm_workorder_type', 'is_or_not'],
-  mixins: [crud()],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    bussConfig: {
-      type: Object
-    },
-    openParam: {
-      type: Object
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      classes3: [],
-      form: {
-        sale_id: null,
-        workorder_id: null,
-        produceorder_code: null,
-        producedeviceorder_code: null,
-        shift_type_scode: null,
-        workprocedure_id: null,
-        produce_date: null,
-        plan_qty: null,
-        real_qty: null,
-        material_id: null,
-        material_code: null,
-        material_weight: null,
-        planproducestart_date: null,
-        planproduceend_date: null,
-        realproducestart_date: null,
-        realproduceend_date: null,
-        order_status: null,
-        is_needmove: null,
-        order_type_scode: null,
-        create_id: null,
-        create_name: null,
-        create_time: null,
-        update_optid: null,
-        update_optname: null,
-        update_time: null,
-        sysdeptid: null,
-        syscompanyid: null,
-        is_delete: null,
-        material_name: null,
-        device_id: null,
-        is_canupdate_update: null,
-        material_spec: null
-      },
-      workprocedureList: [],
-      tableData: [],
-      rules: {
-      }
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue) {
-        this.dialogVisible = newValue
-      }
-    }
-  },
-  methods: {
-    open() {
-      this.initClass3()
-      this.is_null()
-      crudProduceshiftorder.getDtl({ workorder_id: this.form.workorder_id }).then(res => {
-        this.tableData = res
-      })
-    },
-    is_null() {
-      // 物料系列为空，新增
-      if (!this.form.product_series) {
-        this.form.product_series = null // 必须为null，否则会出现unknown
-      } else { // 更新
-        this.getSubTypes('03', this.form.product_series)
-      }
-    },
-    getSubTypes(type, id) {
-      const that = this
-      crudClassstandard.getClassSuperior(id).then(res => {
-        const data = res.content
-        that.buildTree(data)
-        if (type === '03') {
-          that.classes3 = data
-        }
-      })
-    },
-    queryClassId() {
-      const param = {
-        'class_idStr': this.class_idStr
-      }
-      crudClassstandard.queryClassById(param).then(res => {
-        this.classes = res.content.map(obj => {
-          if (obj.hasChildren) {
-            obj.children = null
-          }
-          return obj
-        })
-      })
-    },
-    buildTree(classes) {
-      classes.forEach(data => {
-        if (data.children) {
-          this.buildTree(data.children)
-        }
-        if (data.hasChildren && !data.children) {
-          data.children = null // 重点代码
-        }
-      })
-    },
-    // 获取子节点数据
-    loadChildNodes({ action, parentNode, callback }) {
-      if (action === LOAD_CHILDREN_OPTIONS) {
-        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
-          parentNode.children = res.content.map(function(obj) {
-            if (obj.hasChildren) {
-              obj.children = null
-            }
-            return obj
-          })
-          setTimeout(() => {
-            callback()
-          }, 100)
-        })
-      }
-    },
-    initClass3() {
-      const param = {
-        parent_class_code: '07'
-      }
-      crudClassstandard.getClassType(param).then(res => {
-        const data = res.content
-        this.buildTree(data)
-        this.classes3 = data
-      })
-    },
-    close() {
-      this.$emit('AddChanged')
-    },
-    setForm(row) {
-      this.dialogVisible = true
-      this.form = row
-    }
-  }
-}
-</script>
-
-<style>
-.crud-opts2 {
-  padding: 0 0;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-}
-.crud-opts2 .crud-opts-right2 {
-  margin-left: auto;
-  padding: 4px 4px;
-}
-.input-with-select  {
-  background-color: #fff;
-}
-</style>
diff --git a/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
deleted file mode 100644
index 169fab4..0000000
--- a/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
+++ /dev/null
@@ -1,476 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <el-form
-          :inline="true"
-          class="demo-form-inline"
-          label-position="right"
-          label-width="90px"
-          label-suffix=":"
-        >
-          <!-- 搜索 -->
-          <el-form-item label="工单编号">
-            <el-input
-              v-model="query.produceorder_code"
-              clearable
-              size="small"
-              placeholder="请输入工单编号"
-              style="width: 200px;"
-              class="filter-item"
-            />
-          </el-form-item>
-          <el-form-item label="物料搜索">
-            <el-input
-              v-model="query.material"
-              clearable
-              size="small"
-              placeholder="物料编码、名称或规格"
-              style="width: 200px;"
-              class="filter-item"
-            />
-          </el-form-item>
-          <el-form-item label=" 工单状态">
-            <el-select
-              v-model="order_status"
-              style="width: 200px"
-              clearable
-              multiple
-              placeholder="请选择"
-              class="filter-item"
-              @change="handTaskStatus"
-            >
-              <el-option
-                label="未完成"
-                value="-1"
-              />
-              <el-option
-                v-for="item in dict.pdm_workorder_status"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="工序名称">
-            <el-select
-              v-model="query.workorder_procedure"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 200px"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in dict.workorder_procedure"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="生产日期">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00','23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
-          <rrOperation :crud="crud" />
-        </el-form>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-position"
-          size="mini"
-          :disabled="is_disabled(crud.selections.length,crud.selections[0])"
-          @click="submits(crud.selections[0])"
-        >
-          开工
-        </el-button>
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="danger"
-          icon="el-icon-position"
-          size="mini"
-          :disabled="crud.selections.length !== 1"
-          @click="forceFinish(crud.selections[0])"
-        >
-          强制完成
-        </el-button>
-      </crudOperation>
-      <!--表单组件-->
-      <el-dialog
-        :close-on-click-modal="false"
-        :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
-        :title="crud.status.title"
-        width="1200px"
-      >
-        <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="160px">
-          <el-form-item label="生产日期" prop="produce_date">
-            <el-date-picker v-model="form.produce_date" type="date" value-format="yyyy-MM-dd" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item v-if="false" label="物料标识" prop="material_id">
-            <el-input v-model="form.material_id" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="生产设备">
-            <el-input
-              v-model="form.device_code"
-              style="width: 200px;"
-              clearable
-              @focus="deviceShow=true"
-              @clear="form.device_id='', form.device_code=''"
-            />
-          </el-form-item>
-          <el-form-item label="物料编码" prop="material_code">
-            <el-input
-              v-model="form.material_code"
-              style="width: 200px;"
-              clearable
-              @focus="materialShow=true"
-              @clear="form.material_id='',form.material_code='',form.material_name='',form.material_spec=''"
-            />
-          </el-form-item>
-          <el-form-item label="物料名称" prop="material_name">
-            <el-input
-              v-model="form.material_name"
-              style="width: 200px;"
-              disabled
-            />
-          </el-form-item>
-          <el-form-item label="物料规格" prop="material_spec">
-            <el-input
-              v-model="form.material_spec"
-              style="width: 200px;"
-              disabled
-            />
-          </el-form-item>
-          <el-form-item label="计划数量" prop="plan_qty">
-            <el-input v-model="form.plan_qty" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="载具类型" prop="vehicle_type">
-            <el-select v-model="form.vehicle_type" style="width: 200px" filterable placeholder="请选择">
-              <el-option
-                v-for="item in dict.vehicle_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="工单状态">
-            <el-select
-              v-model="form.order_status"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 200px"
-            >
-              <el-option
-                v-for="item in dict.pdm_workorder_status"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="所属工序">
-            <el-select
-              v-model="form.workorder_procedure"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 200px"
-            >
-              <el-option
-                v-for="item in dict.workorder_procedure"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="计划开始时间" prop="planproducestart_date">
-            <el-date-picker
-              v-model="form.planproducestart_date"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetime"
-              style="width: 200px;"
-            />
-          </el-form-item>
-          <el-form-item label="计划结束时间" prop="planproduceend_date">
-            <el-date-picker
-              v-model="form.planproduceend_date"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetime"
-              style="width: 200px;"
-            />
-          </el-form-item>
-          <el-form-item label="是否搬运" prop="is_needmove">
-            <el-radio
-              v-for="item in dict.is_or_not"
-              :key="item.id"
-              v-model="form.is_needmove"
-              :label="item.value"
-            >{{ item.label }}
-            </el-radio>
-          </el-form-item>
-
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table
-        ref="table"
-        v-loading="crud.loading"
-        :data="crud.data"
-        size="mini"
-        style="width: 100%;"
-        @selection-change="crud.selectionChangeHandler"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识" />
-        <el-table-column prop="workorder_code" label="工单编号" width="120px">
-          <!--          <template slot-scope="scope">-->
-          <!--            <el-link type="warning" @click="toView(scope.row)">{{ scope.row.produceorder_code }}</el-link>-->
-          <!--          </template>-->
-        </el-table-column>
-        <el-table-column prop="order_status" label="工单状态">
-          <template slot-scope="scope">
-            {{ dict.label.pdm_workorder_status[scope.row.order_status] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="produce_date" label="生产日期" width="100px" />
-        <el-table-column prop="plan_qty" label="计划数量" />
-        <el-table-column prop="real_qty" label="实际数量" />
-        <el-table-column v-if="false" prop="material_id" label="物料标识" />
-        <el-table-column prop="device_name" label="设备" width="100" show-overflow-tooltip />
-        <el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
-        <el-table-column prop="material_name" label="物料名称" width="100" show-overflow-tooltip />
-        <el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip />
-        <el-table-column prop="planproducestart_date" label="计划开始时间" min-width="150" show-overflow-tooltip />
-        <el-table-column prop="planproduceend_date" label="计划结束时间" min-width="150" show-overflow-tooltip />
-        <el-table-column prop="realproducestart_date" label="实际开始时间" min-width="150" show-overflow-tooltip />
-        <el-table-column prop="realproduceend_date" label="实际结束时间" min-width="150" show-overflow-tooltip />
-        <el-table-column prop="vehicle_type" label="载具类型" min-width="120" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="is_needmove" label="是否搬运">
-          <template slot-scope="scope">
-            {{ dict.label.is_or_not[scope.row.is_needmove] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="create_name" label="创建人" />
-        <el-table-column prop="create_time" label="创建时间" width="150" />
-        <el-table-column prop="update_optname" label="修改人" />
-        <el-table-column prop="update_time" label="修改时间" width="150" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-    <MaterDtl :dialog-show.sync="materialShow" :is-single="true" @setMaterValue="setMaterValue" />
-    <DeviceDialog :dialog-show.sync="deviceShow" :is-single="true" @tableChanged="tableChanged" />
-    <ViewDialog ref="child3" />
-  </div>
-</template>
-
-<script>
-import crudWorkorder from '@/api/wms/pdm/workorder'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import MaterDtl from '@/views/wms/pub/MaterDialog'
-import ViewDialog from '@/views/wms/pdm/workerorder/ViewDialog'
-import DeviceDialog from '@/views/wms/pub/DeviceDialog'
-
-const defaultForm = {
-  workorder_id: null,
-  produceorder_code: null,
-  producedeviceorder_code: null,
-  shift_type_scode: '01',
-  workprocedure_id: null,
-  produce_date: null,
-  plan_qty: null,
-  real_qty: null,
-  material_id: null,
-  material_code: null,
-  material_weight: null,
-  vehicle_type: null,
-  planproducestart_date: null,
-  planproduceend_date: null,
-  realproducestart_date: null,
-  realproduceend_date: null,
-  order_status: '1',
-  is_needmove: '1',
-  order_type_scode: '1',
-  create_id: null,
-  create_name: null,
-  create_time: null,
-  update_optid: null,
-  update_optname: null,
-  update_time: null,
-  sysdeptid: null,
-  syscompanyid: null,
-  is_delete: null,
-  material_name: null,
-  device_id: null,
-  device_code: null,
-  is_canupdate_update: '1',
-  material_spec: null,
-  sale_id: null
-}
-export default {
-  name: 'Produceshiftorder',
-  components: { pagination, crudOperation, rrOperation, udOperation, MaterDtl, ViewDialog, DeviceDialog },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  dicts: ['pdm_workorder_status', 'is_used', 'is_or_not', 'vehicle_type', 'workorder_procedure'],
-  cruds() {
-    return CRUD({
-      title: '工单', url: 'api/workorder', idField: 'workorder_id', sort: 'workorder_id,desc',
-      optShow: {
-        add: true,
-        edit: false,
-        del: false,
-        download: false,
-        reset: true
-      },
-      query: {
-        order_status: '-1'
-      },
-      crudMethod: { ...crudWorkorder }
-    })
-  },
-  data() {
-    return {
-      classes3: [],
-      materType: '01',
-      materialShow: false,
-      deviceShow: false,
-      workprocedureList: [],
-      order_status: ['-1'],
-      permission: {},
-      rules: {
-        produceorder_code: [
-          { required: true, message: '生产班次工单编号不能为空', trigger: 'blur' }
-        ],
-        producedeviceorder_code: [
-          { required: true, message: '机台工单号不能为空', trigger: 'blur' }
-        ],
-        produce_date: [
-          { required: true, message: '生产日期不能为空', trigger: 'blur' }
-        ],
-        plan_qty: [
-          { required: true, message: '计划数量不能为空', trigger: 'blur' }
-        ],
-        material_code: [
-          { required: true, message: '物料编码不能为空', trigger: 'change' }
-        ],
-        planproducestart_date: [
-          { required: true, message: '计划生产开始时间不能为空', trigger: 'blur' }
-        ],
-        planproduceend_date: [
-          { required: true, message: '计划生产结束时间不能为空', trigger: 'blur' }
-        ],
-        order_status: [
-          { required: true, message: '工单状态不能为空', trigger: 'blur' }
-        ],
-        is_needmove: [
-          { required: true, message: '是否搬运不能为空', trigger: 'blur' }
-        ],
-        order_type_scode: [
-          { required: true, message: '工单类型不能为空', trigger: 'blur' }
-        ],
-        is_canupdate_update: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  created() {
-  },
-  methods: {
-    // 工单状态多选搜索
-    handTaskStatus(value) {
-      this.$forceUpdate()
-      if (value) {
-        this.order_status = JSON.parse(JSON.stringify(value))
-        this.query.order_status = this.order_status.toString()
-      }
-      this.crud.toQuery()
-    },
-    // 查看
-    toView(row) {
-      console.log(row)
-      if (row !== null) {
-        this.$refs.child3.setForm(row)
-      }
-    },
-    // 强制完成
-    forceFinish(data) {
-      crudWorkorder.forceFinish({ row: data }).then(res => {
-        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.crud.toQuery()
-      })
-    },
-    // 取两位小数点
-    rounding(row, column) {
-      return parseFloat(row[column.property]).toFixed(2)
-    },
-    // 下发按钮禁用条件
-    is_disabled(len, row) {
-      if (len === 1 && row.order_status === '00') {
-        return false
-      } else {
-        return true
-      }
-    },
-    // 新增编辑给form表单物料相关信息赋值
-    setMaterValue(row) {
-      this.form.material_id = row.material_id
-      this.form.material_code = row.material_code
-      this.form.material_name = row.material_name
-      this.form.material_spec = row.material_spec
-    },
-    tableChanged(row) {
-      this.form.device_id = row.device_id
-      this.form.device_code = row.device_code
-    },
-    // 下发
-    submits(row) {
-      crudWorkorder.submits({ workorder_id: row.workorder_id }).then(res => {
-        this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.crud.toQuery()
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/nladmin-ui/src/views/wms/pub/DeviceDialog.vue b/nladmin-ui/src/views/wms/pub/DeviceDialog.vue
deleted file mode 100644
index bee81f6..0000000
--- a/nladmin-ui/src/views/wms/pub/DeviceDialog.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-<template>
-  <el-dialog
-    title="请选择设备"
-    append-to-body
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    width="1000px"
-    @close="close"
-    @open="open"
-  >
-    <el-row style="margin-bottom: 10px;">
-      <el-col :span="22">
-        <el-form :inline="true" class="demo-form-inline">
-          <el-form-item :inline="true" label="模糊搜索:">
-            <el-input v-model="query.search" placeholder="请输入编码、名称" />
-          </el-form-item>
-          <rrOperation />
-        </el-form>
-      </el-col>
-    </el-row>
-    <!--表格渲染-->
-    <el-table
-      ref="table"
-      v-loading="crud.loading"
-      :data="crud.data"
-      style="width: 100%;"
-      size="mini"
-      border
-      :cell-style="{'text-align':'center'}"
-      :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
-      @select="handleSelectionChange"
-      @select-all="onSelectAll"
-      @current-change="clickChange"
-    >
-      <el-table-column v-if="!isSingle" type="selection" width="55" />
-      <el-table-column v-if="isSingle" label="选择" width="55">
-        <template slot-scope="scope">
-          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="device_code" label="设备编码" show-overflow-tooltip />
-      <el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
-      <el-table-column prop="device_model" label="设备型号" show-overflow-tooltip />
-      <el-table-column prop="device_model" label="设备型号" show-overflow-tooltip />
-      <el-table-column prop="extend_code" label="外部编码" show-overflow-tooltip />
-    </el-table>
-    <!--分页组件-->
-    <pagination />
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="submit">确 定</el-button>
-    </span>
-
-  </el-dialog>
-</template>
-
-<script>
-
-import CRUD, { header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import pagination from '@crud/Pagination'
-import crudDevice from '@/api/wms/pdm/device'
-
-export default {
-  name: 'EndPointDialog',
-  components: { rrOperation, pagination },
-  cruds() {
-    return CRUD({ title: '设备', url: 'api/device', crudMethod: { ...crudDevice }, optShow: {}})
-  },
-  mixins: [presenter(), header()],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    isSingle: {
-      type: Boolean,
-      default: true
-    },
-    openParam: {
-      type: Object,
-      default: null
-    }
-  },
-  data() {
-    return {
-      formInline: {
-        search: ''
-      },
-      tableRadio: '',
-      tableData: [],
-      dialogVisible: false,
-      material: {}
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue, oldValue) {
-        this.dialogVisible = newValue
-      }
-    }
-  },
-  methods: {
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done()
-        })
-        .catch(_ => {
-        })
-    },
-    open() {
-      this.query.region_id = this.openParam
-      this.crud.toQuery()
-    },
-    close() {
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-    },
-    submit() {
-      // 处理单选
-      if (this.isSingle && this.tableRadio) {
-        this.$emit('update:dialogShow', false)
-        this.$emit('tableChanged', this.tableRadio)
-        return
-      }
-      this.rows = this.$refs.table.selection
-      if (this.rows.length <= 0) {
-        this.$message('请选择设备')
-        return
-      }
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-      this.$emit('tableChanged', this.rows)
-    },
-    handleSelectionChange(val, row) {
-      if (val.length > 1) {
-        this.$refs.table.clearSelection()
-        this.$refs.table.toggleRowSelection(val.pop())
-      } else {
-        this.checkrow = row
-      }
-    },
-    onSelectAll() {
-      this.$refs.table.clearSelection()
-    },
-    clickChange(item) {
-      this.tableRadio = item
-    },
-    hand(value) {
-      this.crud.toQuery()
-    }
-  }
-}
-</script>
-
-<style scoped>
-.crud-opts2 {
-  padding: 4px 0;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-}
-
-.crud-opts2 .crud-opts-right2 {
-  margin-left: auto;
-}
-
-.el-table_body tr.current-row>td {
-  background-color: #e9e500;
-}
-</style>
diff --git a/nladmin-ui/src/views/wms/pub/MaterDialog.vue b/nladmin-ui/src/views/wms/pub/MaterDialog.vue
deleted file mode 100644
index 8427c24..0000000
--- a/nladmin-ui/src/views/wms/pub/MaterDialog.vue
+++ /dev/null
@@ -1,212 +0,0 @@
-<template>
-  <el-dialog
-    title="物料选择"
-    append-to-body
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    width="1000px"
-    @close="close"
-    @open="open"
-  >
-    <el-form
-      :inline="true"
-      class="demo-form-inline"
-      label-position="right"
-      label-width="80px"
-      label-suffix=":"
-    >
-      <el-form-item label="物料类别">
-        <treeselect
-          v-model="query.material_type_id"
-          :load-options="loadClass"
-          :options="classes"
-          style="width: 200px;"
-          placeholder="选择物料类别"
-        />
-      </el-form-item>
-      <el-form-item label="模糊搜索">
-        <el-input
-          v-model="query.search"
-          clearable
-          size="mini"
-          placeholder="编码、名称"
-          @keyup.enter.native="crud.toQuery"
-        />
-      </el-form-item>
-      <rrOperation />
-    </el-form>
-
-    <!--表格渲染-->
-    <el-table
-      ref="table"
-      v-loading="crud.loading"
-      :data="crud.data"
-      style="width: 100%;"
-      size="mini"
-      border
-      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-      @select="handleSelectionChange"
-      @select-all="onSelectAll"
-      @current-change="clickChange"
-    >
-      <el-table-column v-if="!isSingle" type="selection" width="55" />
-      <el-table-column v-if="isSingle" label="选择" width="55">
-        <template slot-scope="scope">
-          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip />
-      <el-table-column prop="material_name" label="物料名称" min-width="200" show-overflow-tooltip />
-      <el-table-column prop="material_spec" label="规格" show-overflow-tooltip />
-      <el-table-column prop="material_model" label="型号" show-overflow-tooltip />
-      <el-table-column prop="class_code" label="分类编码" show-overflow-tooltip />
-      <el-table-column prop="class_name" label="物料分类" show-overflow-tooltip />
-      <el-table-column prop="unit_name" label="计量单位" />
-    </el-table>
-    <!--分页组件-->
-    <pagination />
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="submit">确 定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-
-import crudMaterialbase from '@/api/wms/basedata/materialbase'
-import CRUD, { header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import pagination from '@crud/Pagination'
-import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import crudClassstandard from '@/api/wms/basedata/classstandard'
-
-export default {
-  name: 'MaterDtl',
-  components: { rrOperation, pagination, Treeselect },
-  cruds() {
-    return CRUD({ title: '物料', url: 'api/Materialbase', crudMethod: { ...crudMaterialbase }, optShow: {}})
-  },
-  mixins: [presenter(), header()],
-  dicts: ['product_series'],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    isSingle: {
-      type: Boolean,
-      default: true
-    },
-    materOptCode: {
-      type: String,
-      default: '00'
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      classes: [],
-      tableRadio: null,
-      class_idStr: null,
-      checkrow: null,
-      rows: []
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue) {
-        this.dialogVisible = newValue
-      }
-    }
-  },
-  methods: {
-    clickChange(item) {
-      this.tableRadio = item
-    },
-    seriesFormat(row) {
-      return this.dict.label.product_series[row.product_series]
-    },
-    open() {
-      const param = {
-        'materOpt_code': this.materOptCode
-      }
-      crudMaterialbase.getMaterOptType(param).then(res => {
-        this.class_idStr = res.class_idStr
-        this.crud.query.class_idStr = res.class_idStr
-        this.crud.toQuery()
-        this.queryClassId()
-      })
-    },
-    queryClassId() {
-      const param = {
-        'class_idStr': this.class_idStr
-      }
-      crudClassstandard.queryClassById(param).then(res => {
-        this.classes = res.content.map(obj => {
-          if (obj.hasChildren) {
-            obj.children = null
-          }
-          return obj
-        })
-      })
-    },
-    handleSelectionChange(val, row) {
-      if (this.isSingle) {
-        if (val.length > 1) {
-          this.$refs.table.clearSelection()
-          this.$refs.table.toggleRowSelection(val.pop())
-        } else {
-          this.checkrow = row
-        }
-      }
-    },
-    onSelectAll() {
-      this.$refs.table.clearSelection()
-    },
-    close() {
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-    },
-    submit() {
-      // 处理单选
-      if (this.isSingle && this.tableRadio) {
-        this.$emit('update:dialogShow', false)
-        this.$emit('setMaterValue', this.tableRadio)
-        return
-      }
-      this.rows = this.$refs.table.selection
-      if (this.rows.length <= 0) {
-        this.$message('请先勾选物料')
-        return
-      }
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-      this.$emit('setMaterValue', this.rows)
-    },
-    loadClass({ action, parentNode, callback }) {
-      if (action === LOAD_CHILDREN_OPTIONS) {
-        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
-          parentNode.children = res.content.map(function(obj) {
-            if (obj.hasChildren) {
-              obj.children = null
-            }
-            return obj
-          })
-          setTimeout(() => {
-            callback()
-          }, 100)
-        })
-      }
-    }
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-::v-deep .el-dialog__body {
-  padding-top: 0px;
-}
-</style>
-
diff --git a/nladmin-ui/src/views/wms/pub/PointDialog.vue b/nladmin-ui/src/views/wms/pub/PointDialog.vue
deleted file mode 100644
index 54de594..0000000
--- a/nladmin-ui/src/views/wms/pub/PointDialog.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<template>
-  <el-dialog
-    title="请选择点位"
-    append-to-body
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    width="1000px"
-    @close="close"
-    @open="open"
-  >
-    <el-row style="margin-bottom: 10px;">
-      <el-col :span="22">
-        <el-form :inline="true" class="demo-form-inline">
-          <el-form-item :inline="true" label="模糊搜索:">
-            <el-input v-model="query.search" placeholder="请输入点位编码或名称" />
-          </el-form-item>
-          <rrOperation />
-        </el-form>
-      </el-col>
-    </el-row>
-    <!--表格渲染-->
-    <el-table
-      ref="table"
-      v-loading="crud.loading"
-      :data="crud.data"
-      style="width: 100%;"
-      size="mini"
-      border
-      :cell-style="{'text-align':'center'}"
-      :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
-      @select="handleSelectionChange"
-      @select-all="onSelectAll"
-      @current-change="clickChange"
-    >
-      <el-table-column v-if="!isSingle" type="selection" width="55" />
-      <el-table-column v-if="isSingle" label="选择" width="55">
-        <template slot-scope="scope">
-          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="point_code" label="终点点位编码" show-overflow-tooltip />
-      <el-table-column prop="point_name" label="终点点位名称" show-overflow-tooltip />
-      <el-table-column prop="region_name" label="所属区域" show-overflow-tooltip />
-      <el-table-column prop="point_type" label="点位类型">
-        <template slot-scope="scope">
-          {{ dict.label.sch_point_type[scope.row.point_type] }}
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页组件-->
-    <pagination />
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="submit">确 定</el-button>
-    </span>
-
-  </el-dialog>
-</template>
-
-<script>
-
-import CRUD, { header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import pagination from '@crud/Pagination'
-import crudPoint from '@/api/wms/sch/point'
-
-export default {
-  name: 'EndPointDialog',
-  components: { rrOperation, pagination },
-  dicts: ['sch_point_type'],
-  cruds() {
-    return CRUD({ title: '终点点位', url: 'api/point/selectPoint', crudMethod: { ...crudPoint }, optShow: {}})
-  },
-  mixins: [presenter(), header()],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    isSingle: {
-      type: Boolean,
-      default: true
-    },
-    openParam: {
-      type: Object,
-      default: null
-    }
-  },
-  data() {
-    return {
-      formInline: {
-        search: ''
-      },
-      tableRadio: '',
-      tableData: [],
-      dialogVisible: false,
-      material: {}
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue, oldValue) {
-        this.dialogVisible = newValue
-      }
-    }
-  },
-  methods: {
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done()
-        })
-        .catch(_ => {
-        })
-    },
-    open() {
-      this.query.region_id = this.openParam
-      this.crud.toQuery()
-    },
-    close() {
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-    },
-    submit() {
-      // 处理单选
-      if (this.isSingle && this.tableRadio) {
-        this.$emit('update:dialogShow', false)
-        this.$emit('tableChanged2', this.tableRadio)
-        return
-      }
-      this.rows = this.$refs.table.selection
-      if (this.rows.length <= 0) {
-        this.$message('请先选择终点点位')
-        return
-      }
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-      this.$emit('tableChanged2', this.rows)
-    },
-    handleSelectionChange(val, row) {
-      if (val.length > 1) {
-        this.$refs.table.clearSelection()
-        this.$refs.table.toggleRowSelection(val.pop())
-      } else {
-        this.checkrow = row
-      }
-    },
-    onSelectAll() {
-      this.$refs.table.clearSelection()
-    },
-    clickChange(item) {
-      this.tableRadio = item
-    },
-    hand(value) {
-      this.crud.toQuery()
-    }
-  }
-}
-</script>
-
-<style scoped>
-.crud-opts2 {
-  padding: 4px 0;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-}
-
-.crud-opts2 .crud-opts-right2 {
-  margin-left: auto;
-}
-
-.el-table_body tr.current-row>td {
-  background-color: #e9e500;
-}
-</style>
diff --git a/nladmin-ui/src/views/wms/sch/point/MaterialDialog.vue b/nladmin-ui/src/views/wms/sch/point/MaterialDialog.vue
deleted file mode 100644
index b5f8400..0000000
--- a/nladmin-ui/src/views/wms/sch/point/MaterialDialog.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-  <el-dialog
-    title="物料选择"
-    append-to-body
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    width="1000px"
-    @close="close"
-    @open="open"
-  >
-    <el-form
-      :inline="true"
-      class="demo-form-inline"
-      label-position="right"
-      label-width="80px"
-      label-suffix=":"
-    >
-      <el-form-item label="物料名称">
-        <el-input
-          v-model="query.search"
-          clearable
-          size="mini"
-          placeholder="物料名称"
-          @keyup.enter.native="crud.toQuery"
-        />
-      </el-form-item>
-      <rrOperation />
-    </el-form>
-
-    <!--表格渲染-->
-    <el-table
-      ref="table"
-      v-loading="crud.loading"
-      :data="crud.data"
-      style="width: 100%;"
-      size="mini"
-      border
-      :cell-style="{'text-align':'center'}"
-      :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
-      @select="handleSelectionChange"
-      @select-all="onSelectAll"
-      @current-change="clickChange"
-    >
-      <el-table-column v-if="!isSingle" type="selection" width="55" />
-      <el-table-column v-if="isSingle" label="选择" width="55">
-        <template slot-scope="scope">
-          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
-        </template>
-      </el-table-column>
-      <el-table-column prop="material_code" label="物料编码" width="160" />
-      <el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
-      <el-table-column prop="material_spec" label="物料规格" width="140" />
-      <el-table-column prop="material_model" label="物料型号" />
-      <el-table-column prop="class_name" label="物料分类" width="140" />
-      <el-table-column prop="unit_name" label="计量单位" />
-      <el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />
-      <el-table-column prop="product_series_name" label="系列" />
-      <el-table-column prop="update_optname" label="修改人" />
-      <el-table-column prop="update_time" label="修改时间" width="135" />
-    </el-table>
-    <!--分页组件-->
-    <pagination />
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="submit">确 定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-
-import CRUD, { header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import pagination from '@crud/Pagination'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-
-export default {
-  name: 'MaterialDialog',
-  components: { rrOperation, pagination },
-  dicts: ['is_used'],
-  cruds() {
-    return CRUD({ title: '生产任务', url: 'api/Materialbase', optShow: {}})
-  },
-  mixins: [presenter(), header()],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    isSingle: {
-      type: Boolean,
-      default: true
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      tableRadio: null,
-      tableData: []
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue) {
-        this.dialogVisible = newValue
-      }
-    }
-  },
-  methods: {
-    clickChange(item) {
-      this.tableRadio = item
-    },
-    open() {
-
-    },
-    handleSelectionChange(val, row) {
-      if (val.length > 1) {
-        this.$refs.table.clearSelection()
-        this.$refs.table.toggleRowSelection(val.pop())
-      } else {
-        this.checkrow = row
-      }
-    },
-    onSelectAll() {
-      this.$refs.table.clearSelection()
-    },
-    close() {
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-    },
-    submit() {
-      // 处理单选
-      if (this.isSingle && this.tableRadio) {
-        this.$emit('update:dialogShow', false)
-        this.$emit('tableChanged3', this.tableRadio)
-        return
-      }
-      this.rows = this.$refs.table.selection
-      if (this.rows.length <= 0) {
-        this.$message('请先勾选物料')
-        return
-      }
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-      this.$emit('tableChanged3', this.rows)
-    }
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .el-dialog__body {
-    padding-top: 0px;
-  }
-</style>
-
diff --git a/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue b/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
deleted file mode 100644
index d8321dc..0000000
--- a/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
+++ /dev/null
@@ -1,280 +0,0 @@
-<template>
-  <el-dialog
-    title="点位详情"
-    append-to-body
-    fullscreen
-    :visible.sync="dialogVisible"
-    @open="open"
-    @close="close"
-  >
-    <el-card class="box-card" shadow="never">
-      <div slot="header" class="clearfix">
-        <span style="font-weight: bold;font-size: 15px;">点位信息:</span>
-        <!--        <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
-      </div>
-
-      <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
-        <el-form-item label="区域编码">
-          <el-input v-model="form.region_code" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="区域名称">
-          <el-input v-model="form.region_name" style="width: 200px;"/>
-        </el-form-item>
-
-        <el-form-item label="点位编码">
-          <el-input v-model="form.point_code" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="点位名称">
-          <el-input v-model="form.point_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="点位类型">
-          <el-input v-model="form.point_type_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="点位状态">
-          <el-input v-model="form.point_status_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="锁定类型">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="载具类型">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="载具编码">
-          <el-input v-model="form.vehicle_code" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="载具数量">
-          <el-input v-model="form.vehicle_qty" style="width: 200px;"/>
-        </el-form-item>
-
-      </el-form>
-    </el-card>
-
-    <el-card class="box-card" shadow="always">
-      <div slot="header" class="clearfix">
-        <span style="font-weight: bold;font-size: 15px;">库存信息:</span>
-        <!--        <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
-      </div>
-
-      <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
-        <el-form-item label="物料编码">
-          <el-input v-model="form.region_code" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="物料名称">
-          <el-input v-model="form.region_name" style="width: 200px;"/>
-        </el-form-item>
-
-        <el-form-item label="物料规格">
-          <el-input v-model="form.point_code" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="物料批次">
-          <el-input v-model="form.point_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="库存量">
-          <el-input v-model="form.point_type_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="计量单位">
-          <el-input v-model="form.point_status_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="入库时间">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="静置时间(分)">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
-        </el-form-item>
-      </el-form>
-    </el-card>
-
-    <el-card class="box-card" shadow="always">
-      <div slot="header" class="clearfix">
-        <span style="font-weight: bold;font-size: 15px;">库存信息:</span>
-        <!--        <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
-      </div>
-
-      <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
-        <el-form-item label="物料编码">
-          <el-input v-model="form.region_code" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="物料名称">
-          <el-input v-model="form.region_name" style="width: 200px;"/>
-        </el-form-item>
-
-        <el-form-item label="物料规格">
-          <el-input v-model="form.point_code" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="物料批次">
-          <el-input v-model="form.point_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="库存量">
-          <el-input v-model="form.point_type_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="计量单位">
-          <el-input v-model="form.point_status_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="入库时间">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="静置时间(分)">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
-        </el-form-item>
-      </el-form>
-    </el-card>
-
-    <el-card class="box-card" shadow="always">
-      <div slot="header" class="clearfix">
-        <span style="font-weight: bold;font-size: 15px;">库存信息:</span>
-        <!--        <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
-      </div>
-
-      <el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
-        <el-form-item label="物料编码">
-          <el-input v-model="form.region_code" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="物料名称">
-          <el-input v-model="form.region_name" style="width: 200px;"/>
-        </el-form-item>
-
-        <el-form-item label="物料规格">
-          <el-input v-model="form.point_code" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="物料批次">
-          <el-input v-model="form.point_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="库存量">
-          <el-input v-model="form.point_type_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="计量单位">
-          <el-input v-model="form.point_status_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="入库时间">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item label="静置时间(分)">
-          <el-input v-model="form.lock_type_name" style="width: 200px;"/>
-        </el-form-item>
-      </el-form>
-    </el-card>
-
-    <!--表格渲染-->
-    <el-card class="box-card" shadow="always">
-      <div slot="header" class="clearfix">
-        <span style="font-weight: bold;font-size: 15px;">更新记录:</span>
-        <!--        <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
-      </div>
-      <el-table
-        ref="table"
-        :data="tableData"
-        style="width: 100%;"
-        max-height="300"
-        border
-        :highlight-current-row="true"
-        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-      >
-        <el-table-column prop="device_code" label="设备编码" align="center"/>
-        <el-table-column prop="device_name" label="设备名称" align="center" min-width="200" show-overflow-tooltip/>
-        <el-table-column prop="produce_qty" label="生产数量" align="center"/>
-        <el-table-column prop="init_qty" label="期初数量" align="center"/>
-        <el-table-column prop="finish_qty" label="期末数量" align="center"/>
-        <el-table-column prop="finishproduct_qty" label="完成数量" align="center"/>
-        <el-table-column prop="operatetime_start" label="开始时间" align="center" min-width="130" show-overflow-tooltip/>
-        <el-table-column prop="operatetime_end" label="结束时间" align="center" min-width="130" show-overflow-tooltip/>
-        <el-table-column prop="nick_name" label="操作人" align="center"/>
-      </el-table>
-    </el-card>
-    <!--<span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="dialogVisible = false">确定</el-button>
-    </span>-->
-  </el-dialog>
-</template>
-
-<script>
-import { crud } from '@crud/crud'
-
-export default {
-  name: 'ViewDialog',
-  components: {},
-  dicts: [],
-  mixins: [crud()],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      classes3: [],
-      parentData: {},
-      form: {
-        sale_id: null,
-        workorder_id: null,
-        produceorder_code: null,
-        producedeviceorder_code: null,
-        shift_type_scode: null,
-        workprocedure_id: null,
-        produce_date: null,
-        plan_qty: null,
-        real_qty: null,
-        material_id: null,
-        material_code: null,
-        material_weight: null,
-        planproducestart_date: null,
-        planproduceend_date: null,
-        realproducestart_date: null,
-        realproduceend_date: null,
-        order_status: null,
-        is_needmove: null,
-        order_type_scode: null,
-        create_id: null,
-        create_name: null,
-        create_time: null,
-        update_optid: null,
-        update_optname: null,
-        update_time: null,
-        sysdeptid: null,
-        syscompanyid: null,
-        is_delete: null,
-        material_name: null,
-        device_id: null,
-        is_canupdate_update: null,
-        material_spec: null
-      },
-      workprocedureList: [],
-      tableData: [],
-      rules: {}
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue) {
-        this.dialogVisible = newValue
-      }
-    }
-  },
-  methods: {
-    open() {
-
-    },
-    close() {
-      this.$emit('AddChanged')
-    },
-    setParentData(parentData) {
-      if (parentData) {
-        this.dialogVisible = true
-        this.form = parentData
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-::v-deep .el-card__header {
-  padding: 5px 0 5px 10px;
-  background-color: #f8f8f9;
-}
-::v-deep .el-card__body {
-  padding: 10px 0 10px 0;
-}
-</style>
diff --git a/nladmin-ui/src/views/wms/sch/point/WorkOrderDialog.vue b/nladmin-ui/src/views/wms/sch/point/WorkOrderDialog.vue
deleted file mode 100644
index 77eb03f..0000000
--- a/nladmin-ui/src/views/wms/sch/point/WorkOrderDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<template>
-  <el-dialog
-    title="工单选择"
-    append-to-body
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    width="1000px"
-    @close="close"
-    @open="open"
-  >
-    <el-form
-      :inline="true"
-      class="demo-form-inline"
-      label-position="right"
-      label-width="80px"
-      label-suffix=":"
-    >
-      <el-form-item label="物料名称">
-        <el-input
-          v-model="query.search"
-          clearable
-          size="mini"
-          placeholder="物料名称"
-          @keyup.enter.native="crud.toQuery"
-        />
-      </el-form-item>
-      <rrOperation />
-    </el-form>
-
-    <!--表格渲染-->
-    <el-table
-      ref="table"
-      v-loading="crud.loading"
-      :data="crud.data"
-      style="width: 100%;"
-      size="mini"
-      border
-      :cell-style="{'text-align':'center'}"
-      :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
-      @select="handleSelectionChange"
-      @select-all="onSelectAll"
-      @current-change="clickChange"
-    >
-      <el-table-column v-if="!isSingle" type="selection" width="55" />
-      <el-table-column v-if="isSingle" label="选择" width="55">
-        <template slot-scope="scope">
-          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
-        </template>
-      </el-table-column>
-      <el-table-column prop="workorder_code" label="工单编号" width="120px"/>
-      <el-table-column v-if="false" prop="material_id" label="物料标识" />
-      <el-table-column prop="device_name" label="设备" width="100" show-overflow-tooltip />
-      <el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
-      <el-table-column prop="material_name" label="物料名称" width="100" show-overflow-tooltip />
-      <el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip />
-      <el-table-column prop="vehicle_type" label="载具类型" min-width="120" show-overflow-tooltip>
-        <template slot-scope="scope">
-          {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="update_optname" label="修改人" />
-      <el-table-column prop="update_time" label="修改时间" width="150" />
-    </el-table>
-    <!--分页组件-->
-    <pagination />
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="submit">确 定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-
-import CRUD, { header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import pagination from '@crud/Pagination'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-
-export default {
-  name: 'WorkOrderDialog',
-  components: { rrOperation, pagination },
-  dicts: ['is_used', 'vehicle_type'],
-  cruds() {
-    return CRUD({ title: '生产工单', url: 'api/workorder', optShow: {}})
-  },
-  mixins: [presenter(), header()],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    isSingle: {
-      type: Boolean,
-      default: true
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      tableRadio: null,
-      tableData: []
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue) {
-        this.dialogVisible = newValue
-      }
-    }
-  },
-  methods: {
-    clickChange(item) {
-      this.tableRadio = item
-    },
-    open() {
-
-    },
-    handleSelectionChange(val, row) {
-      if (val.length > 1) {
-        this.$refs.table.clearSelection()
-        this.$refs.table.toggleRowSelection(val.pop())
-      } else {
-        this.checkrow = row
-      }
-    },
-    onSelectAll() {
-      this.$refs.table.clearSelection()
-    },
-    close() {
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-    },
-    submit() {
-      // 处理单选
-      if (this.isSingle && this.tableRadio) {
-        this.$emit('update:dialogShow', false)
-        this.$emit('tableChanged4', this.tableRadio)
-        return
-      }
-      this.rows = this.$refs.table.selection
-      if (this.rows.length <= 0) {
-        this.$message('请先勾选物料')
-        return
-      }
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-      this.$emit('tableChanged4', this.rows)
-    }
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .el-dialog__body {
-    padding-top: 0px;
-  }
-</style>
-
diff --git a/nladmin-ui/src/views/wms/sch/point/index.vue b/nladmin-ui/src/views/wms/sch/point/index.vue
deleted file mode 100644
index 1980111..0000000
--- a/nladmin-ui/src/views/wms/sch/point/index.vue
+++ /dev/null
@@ -1,553 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <el-form
-          :inline="true"
-          class="demo-form-inline"
-          label-position="right"
-          label-width="90px"
-          label-suffix=":"
-        >
-          <el-form-item label="模糊搜索">
-            <el-input
-              v-model="query.name"
-              clearable
-              size="mini"
-              placeholder="编码名称"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="区域类型">
-            <el-select
-              v-model="query.region_id"
-              clearable
-              filterable
-              size="mini"
-              placeholder="区域类型"
-              class="filter-item"
-              @change="getPointStatusAndTypeList(query.region_id, 1)"
-            >
-              <el-option
-                v-for="item in regionList"
-                :label="item.region_name"
-                :value="item.region_id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="点位类型">
-            <el-select
-              v-model="query.point_type"
-              clearable
-              size="mini"
-              placeholder="点位类型"
-              class="filter-item"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in pointTypesList"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="点位状态">
-            <el-select
-              v-model="query.point_status"
-              clearable
-              filterable
-              size="mini"
-              placeholder="点位状态"
-              class="filter-item"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in pointStatusList"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624')"
-            label="块"
-          >
-            <el-input
-              v-model="query.block_num"
-              clearable
-              size="mini"
-              placeholder="块"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')"
-            label="排"
-          >
-            <el-input
-              v-model="query.row_num"
-              clearable
-              size="mini"
-              placeholder="排"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')"
-            label="列"
-          >
-            <el-input
-              v-model="query.col_num"
-              clearable
-              size="mini"
-              placeholder="列"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')"
-            label="层"
-          >
-            <el-input
-              v-model="query.layer_num"
-              clearable
-              size="mini"
-              placeholder="层"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="锁定类型">
-            <el-switch
-              v-model="query.lock_type"
-              active-value="2"
-              inactive-value="1"
-              active-color="#409EFF"
-              inactive-color="#C0CCDA"
-              @change="hand"
-            />
-          </el-form-item>
-
-          <el-form-item label="是否启用">
-            <el-switch
-              v-model="query.is_used"
-              active-value="0"
-              inactive-value="1"
-              active-color="#C0CCDA"
-              inactive-color="#409EFF"
-              @change="hand"
-            />
-          </el-form-item>
-          <rrOperation />
-        </el-form>
-
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
-        <el-button
-          v-if="crud.query.is_used == 0"
-          slot="right"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-circle-check"
-          :disabled="crud.selections.length === 0"
-          @click="changeUsed(crud.selections, 1)"
-        >
-          启用
-        </el-button>
-        <el-button
-          v-if="crud.query.is_used == 1"
-          slot="right"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-circle-close"
-          :disabled="crud.selections.length === 0"
-          @click="changeUsed(crud.selections, 0)"
-        >
-          禁用
-        </el-button>
-        <el-button
-          v-if="crud.query.lock_type == 1"
-          slot="right"
-          class="filter-item"
-          size="mini"
-          type="danger"
-          icon="el-icon-circle-check"
-          :disabled="crud.selections.length === 0"
-          @click="changeLock(crud.selections, 2)"
-        >
-          锁定
-        </el-button>
-        <el-button
-          v-if="crud.query.lock_type == 2"
-          slot="right"
-          class="filter-item"
-          size="mini"
-          type="danger"
-          icon="el-icon-circle-close"
-          :disabled="crud.selections.length === 0"
-          @click="changeLock(crud.selections, 1)"
-        >
-          解锁
-        </el-button>
-      </crudOperation>
-      <!--表单组件-->
-      <el-dialog
-        :close-on-click-modal="false"
-        :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
-        :title="crud.status.title"
-        width="520px"
-      >
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
-          <el-form-item v-if="false" label="点位标识" prop="point_id">
-            <el-input v-model="form.point_id" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="所属区域" prop="region_id">
-            <el-select
-              v-model="form.region_id"
-              placeholder="请选择"
-              style="width: 370px;"
-              @change="getPointStatusAndTypeList(form.region_id, 2)"
-            >
-              <el-option
-                v-for="item in regionList"
-                :label="item.region_name"
-                :value="item.region_id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="点位编码" prop="point_code">
-            <el-input v-model="form.point_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="点位名称" prop="point_name">
-            <el-input v-model="form.point_name" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item v-show="pointStatusDialogList.length > 0" label="点位状态" prop="point_status">
-            <el-select
-              v-model="form.point_status"
-              size="mini"
-              placeholder="点位状态"
-              class="filter-item"
-              style="width: 370px;"
-              clearable
-            >
-              <el-option
-                v-for="item in pointStatusDialogList"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="锁定类型" prop="lock_type">
-            <el-select
-              v-model="form.lock_type"
-              size="mini"
-              placeholder="锁定类型"
-              class="filter-item"
-              style="width: 370px;"
-            >
-              <el-option
-                v-for="item in dict.d_lock_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item v-show="pointTypesDialogList.length > 0" label="点位类型" prop="device_point_type">
-            <el-select
-              v-model="form.point_type"
-              size="mini"
-              placeholder="设备点位类型"
-              class="filter-item"
-              style="width: 370px;"
-            >
-              <el-option
-                v-for="item in pointTypesDialogList"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
-            <el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
-          </el-form-item>
-          <el-form-item v-if="form.point_status === '3'" label="库存数" prop="ivt_qty">
-            <el-input-number :controls="false" class="clear-number-input" v-model="form.ivt_qty" type="number" :min="1" :precision="3" :max="99999" label="库存数" size="mini" />
-          </el-form-item>
-          <el-form-item v-if="form.point_status === '3'" label="物料来源">
-            <el-radio-group v-model="choose" size="mini">
-              <el-radio-button label="物料" />
-              <el-radio-button label="工单" />
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="false" label="物料名称" prop="vehicle_code">
-            <el-input suffix-icon="el-icon-date" v-model="form.material_id" clearable style="width: 370px;" @focus="getMaterial" />
-          </el-form-item>
-          <el-form-item v-if="form.point_status === '3'" label="物料名称" prop="vehicle_code">
-            <el-input v-model="form.material_name" clearable style="width: 370px;" @focus="getMaterial" />
-          </el-form-item>
-          <el-form-item label="备注">
-            <el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table
-        ref="table"
-        v-loading="crud.loading"
-        :data="crud.data"
-        size="mini"
-        style="width: 100%;"
-        @selection-change="crud.selectionChangeHandler"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="point_code" label="点位编码" sortable width="120" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <el-link type="warning" @click="toView(scope.row)">{{ scope.row.point_code }}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column prop="point_name" label="点位名称" width="150" sortable show-overflow-tooltip />
-        <el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
-        <el-table-column prop="point_type_name" label="点位类型" />
-        <el-table-column prop="point_status_name" label="点位状态" />
-        <el-table-column prop="lock_type_name" label="锁定类型" />
-        <el-table-column prop="vehicle_type" label="载具类型" min-width="120">
-          <template slot-scope="scope">
-            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="vehicle_code" label="载具编码" min-width="120"/>
-        <el-table-column prop="vehicle_qty" label="载具数量" />
-        <el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="is_used" label="是否启用">
-          <template slot-scope="scope">
-            {{ scope.row.is_used == '1' ? '是' : '否' }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="update_optname" label="修改人" />
-        <el-table-column prop="update_time" label="修改时间" width="150" />
-        <el-table-column
-          v-permission="[]"
-          label="操作"
-          fixed="right"
-          width="120px"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-    <MaterialDialog :dialog-show.sync="materialDialog" @tableChanged3="tableChanged" />
-    <WorkOrderDialog :dialog-show.sync="workOrderDialog" @tableChanged4="tableChanged" />
-    <ViewDialog ref="viewDialog" />
-  </div>
-</template>
-
-<script>
-import crudRegion from '@/api/wms/sch/region'
-import crudPoint, { changeActive } from '@/api/wms/sch/point'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import ViewDialog from '@/views/wms/sch/point/ViewDialog'
-import MaterialDialog from '@/views/wms/sch/point/MaterialDialog'
-import WorkOrderDialog from '@/views/wms/sch/point/WorkOrderDialog'
-
-const defaultForm = {
-  point_id: null,
-  point_code: null,
-  point_name: null,
-  point_type: null,
-  point_status: null,
-  lock_type: '1',
-  vehicle_code: null,
-  source_id: null,
-  remark: null,
-  is_used: null,
-  is_delete: null,
-  create_id: null,
-  create_name: null,
-  create_time: null,
-  update_optid: null,
-  update_optname: null,
-  update_time: null
-}
-export default {
-  name: 'Point',
-  dicts: ['vehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'vehicle_type'],
-  components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation, ViewDialog },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '点位',
-      url: 'api/point',
-      idField: 'point_id',
-      optShow: {
-        add: true,
-        edit: true,
-        del: true,
-        download: false,
-        reset: true
-      },
-      crudMethod: { ...crudPoint }
-    })
-  },
-
-  data() {
-    return {
-      syncLoading: false,
-      materialDialog: false,
-      workOrderDialog: false,
-      choose: '物料',
-      invtypelist: [],
-      pointStatusList: [],
-      pointStatusDialogList: [],
-      pointTypesList: [],
-      pointTypesDialogList: [],
-      options: [],
-      regionList: [],
-      permission: {},
-      rules: {
-        point_code: [
-          { required: true, message: '点位编码不能为空', trigger: 'blur' }
-        ],
-        point_name: [
-          { required: true, message: '点位名称不能为空', trigger: 'blur' }
-        ],
-        point_type: [
-          { required: true, message: '点位类型不能为空', trigger: 'blur' }
-        ],
-        region_id: [
-          { required: true, message: '区域类型不能为空', trigger: 'blur' }
-        ],
-        lock_type: [
-          { required: true, message: '锁定类型不能为空', trigger: 'blur' }
-        ]
-
-      }
-    }
-  },
-  created() {
-    crudPoint.getRegion().then(res => {
-      this.regionList = res
-    })
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    [CRUD.HOOK.afterToCU]() {
-      if (this.form.region_id) {
-        this.getPointStatusAndTypeList(this.form.region_id, 2)
-      }
-    },
-    hand(value) {
-      this.crud.toQuery()
-    },
-    format_is_used(is_used) {
-      return is_used === '1'
-    },
-    changeEnabled(data, val) {
-      let msg = '此操作将停用点位，是否继续！'
-      if (val !== '1') {
-        msg = '此操作将启用点位，是否继续！'
-      }
-      this.$confirm(msg, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        changeActive(data).then(res => {
-          this.crud.toQuery()
-          this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        }).catch(() => {
-          data.is_used = !data.is_used
-        })
-      }).catch(() => {
-      })
-    },
-    getPointStatusAndTypeList(id, flag) {
-      if (id) {
-        this.getPointStatusList(id, flag)
-        this.getPointTypeList(id, flag)
-      }
-      if (flag === 1) {
-        this.crud.toQuery()
-      }
-    },
-    getPointStatusList(id, flag) {
-      crudRegion.getPointStatusSelectById(id).then(res => {
-        if (flag === 1) {
-          this.pointStatusList = res
-        } else {
-          this.pointStatusDialogList = res
-        }
-      })
-    },
-    getPointTypeList(id, flag) {
-      crudRegion.getPointTypeSelectById(id).then(res => {
-        if (flag === 1) {
-          this.pointTypesList = res
-        } else {
-          this.pointTypesDialogList = res
-        }
-      })
-    },
-    changeUsed(data, flag) { // 更改启用状态
-      const param = {}
-      param.data = data
-      param.used = flag
-      crudPoint.changeUsed(param).then(res => {
-        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.crud.toQuery()
-      })
-    },
-    changeLock(data, flag) { // 更改锁定状态
-      const param = {}
-      param.data = data
-      param.lock_type = flag
-      crudPoint.changeLock(param).then(res => {
-        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.crud.toQuery()
-      })
-    },
-    toView(row) {
-      if (row) {
-        this.$refs.viewDialog.setParentData(row)
-      }
-    },
-    getMaterial() {
-      if (this.choose == '物料') {
-        this.materialDialog = true
-      } else {
-        this.workOrderDialog = true
-      }
-    },
-    tableChanged(row) {
-      this.form.material_name = row.material_name
-      this.form.material_id = row.material_id
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/nladmin-ui/src/views/wms/sch/region/index.vue b/nladmin-ui/src/views/wms/sch/region/index.vue
deleted file mode 100644
index f98d1a2..0000000
--- a/nladmin-ui/src/views/wms/sch/region/index.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
-        <label class="el-form-item-label">模糊搜索</label>
-        <el-input
-          v-model="query.region_code"
-          clearable
-          placeholder="编码、名称"
-          style="width: 185px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <rrOperation :crud="crud" />
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog
-        :close-on-click-modal="false"
-        :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
-        :title="crud.status.title"
-        width="550px"
-      >
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
-          <el-form-item label="区域编码" prop="region_code">
-            <el-input v-model="form.region_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="区域名称" prop="region_name">
-            <el-input v-model="form.region_name" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="点位类型说明">
-            <el-input v-model="form.point_type_explain" type="textarea" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="点位状态说明">
-            <el-input v-model="form.point_status_explain" type="textarea" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="备注">
-            <el-input v-model="form.remark" type="textarea" style="width: 370px;" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table
-        ref="table"
-        v-loading="crud.loading"
-        :data="crud.data"
-        size="mini"
-        style="width: 100%;"
-        @selection-change="crud.selectionChangeHandler"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column v-if="false" prop="region_id" label="区域标识" />
-        <el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')"/>
-        <el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
-        <el-table-column prop="point_type_explain" label="点位类型说明" :min-width="flexWidth('point_type_explain',crud.data,'点位类型说明')" />
-        <el-table-column prop="point_status_explain" label="点位状态说明" :min-width="flexWidth('point_status_explain',crud.data,'点位状态说明')" />
-        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')"/>
-        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')"/>
-        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-  </div>
-</template>
-
-<script>
-import crudRegion, { changeActive } from '@/api/wms/sch/region'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-
-const defaultForm = {
-  region_id: null,
-  region_code: null,
-  region_name: null,
-  point_type_explain: null,
-  point_status_explain: null,
-  remark: null,
-  create_id: null,
-  create_name: null,
-  create_time: null,
-  update_optid: null,
-  update_optname: null,
-  update_time: null
-}
-export default {
-  name: 'Region',
-  components: { pagination, crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '区域管理',
-      url: 'api/region',
-      idField: 'region_id',
-      sort: 'region_id,desc',
-      crudMethod: { ...crudRegion },
-      optShow: {
-        add: true,
-        edit: false,
-        del: false,
-        download: false,
-        reset: true
-      }
-    })
-  },
-  data() {
-    return {
-      permission: {},
-      rules: {
-        region_code: [
-          { required: true, message: '区域编码不能为空', trigger: 'blur' }
-        ],
-        region_name: [
-          { required: true, message: '区域名称不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/nladmin-ui/src/views/wms/sch/task/index.vue b/nladmin-ui/src/views/wms/sch/task/index.vue
deleted file mode 100644
index 5a73580..0000000
--- a/nladmin-ui/src/views/wms/sch/task/index.vue
+++ /dev/null
@@ -1,381 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <el-form
-          :inline="true"
-          class="demo-form-inline"
-          label-position="right"
-          label-width="80px"
-          label-suffix=":"
-        >
-          <el-form-item label="任务号">
-            <label slot="label">任&nbsp;&nbsp;务&nbsp;号:</label>
-            <el-input
-              v-model="query.task_code"
-              clearable
-              style="width: 180px"
-              placeholder="任务号"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="载具号">
-            <label slot="label">载&nbsp;&nbsp;具&nbsp;号:</label>
-            <el-input
-              v-model="query.vehicle_code"
-              clearable
-              style="width: 180px"
-              placeholder="载具号"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="点位编码">
-            <el-input
-              v-model="query.point_code"
-              clearable
-              style="width: 180px"
-              placeholder="起点"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="任务类型">
-            <treeselect
-              v-model="query.task_type"
-              :load-options="loadChildNodes"
-              :options="classes1"
-              style="width: 180px"
-              placeholder="请选择"
-            />
-          </el-form-item>
-          <el-form-item label="完成方式">
-            <el-select
-              v-model="query.finished_type"
-              style="width: 180px"
-              placeholder="完成方式"
-              class="filter-item"
-              clearable
-              @change="hand"
-            >
-              <el-option
-                v-for="item in finishTypeList"
-                :key="item.code"
-                clearable
-                :label="item.name"
-                :value="item.code"
-              />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="创建时间">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
-
-          <el-form-item label="任务状态">
-            <el-select
-              v-model="query.task_status"
-              multiple
-              style="width: 400px"
-              placeholder="任务状态"
-              class="filter-item"
-              clearable
-              @change="handTaskStatus"
-            >
-              <el-option
-                v-for="item in taskStatusList"
-                :key="item.code"
-                :label="item.name"
-                :value="item.code"
-              />
-            </el-select>
-          </el-form-item>
-          <rrOperation />
-        </el-form>
-
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
-      <!--表格渲染-->
-      <el-table
-        ref="table"
-        v-loading="crud.loading"
-        :data="crud.data"
-        size="mini"
-        style="width: 100%;"
-        @selection-change="crud.selectionChangeHandler"
-      >
-        <el-table-column type="selection" width="50" />
-        <el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
-        <el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
-        <el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
-        <el-table-column v-if="false" prop="task_type" label="任务类型" />
-        <el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip >
-          <template slot-scope="scope">
-            {{ dict.label.acs_task_type[scope.row.acs_task_type] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
-        <el-table-column v-if="false" prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
-        <el-table-column v-if="false" prop="task_status" label="任务状态" />
-        <el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
-        <el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip >
-          <template slot-scope="scope">
-            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="vehicle_code" label="载具编码" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="point_code1" label="点位1" width="100" />
-        <el-table-column prop="point1_region_name" label="区域1" width="120" />
-        <el-table-column prop="point_code2" label="点位2" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="point2_region_name" label="区域2" min-width="120" show-overflow-tooltip />
-        <!--<el-table-column prop="point_code3" label="点位3" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="point3_region_name" label="区域3" min-width="120" show-overflow-tooltip />-->
-        <!--<el-table-column prop="point_code3" label="点位3" width="85" />
-        <el-table-column prop="point_code4" label="点位4" width="85" />-->
-        <el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip />
-        <el-table-column prop="create_time" label="创建时间" width="135" />
-        <el-table-column prop="update_time" label="修改时间" width="135" />
-        <el-table-column
-          v-permission="['admin','instruction:edit','instruction:del']"
-          fixed="right"
-          label="操作"
-          width="160px"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              icon="el-icon-upload"
-              @click="doOperate(scope.row, 'c')"
-            >下发</el-button>
-            <el-button
-              type="text"
-              icon="el-icon-success"
-              @click="doOperate(scope.row, 'a')"
-            >完成</el-button>
-            <el-button
-              type="text"
-              icon="el-icon-error"
-              @click="doOperate(scope.row, 'b')"
-            >取消</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-    <el-dialog
-      title="任务详情"
-      :fullscreen="fullscreen"
-      :visible.sync="viewDialogVisible"
-      width="30%"
-    >
-      <!--  组件-->
-      <component
-        :is="currentComponent"
-        :task-uuid="task_id"
-        :dialog-visible="viewDialogVisible"
-      />
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="viewDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="viewDialogVisible = false">确 定</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import crudTask from '@/api/wms/sch/task'
-import CRUD, { crud, header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import crudClassstandard from '@/api/wms/basedata/classstandard'
-
-export default {
-  name: 'Task',
-  dicts: ['acs_task_type', 'vehicle_type'],
-  components: {
-    pagination, crudOperation, rrOperation, Treeselect, udOperation
-  },
-  mixins: [presenter(), header(), crud()],
-  cruds() {
-    return CRUD({
-      title: '任务',
-      url: 'api/task',
-      idField: 'task_id',
-      sort: 'task_id,desc',
-      crudMethod: { ...crudTask },
-      query: {
-        task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', finished_type: '', task_status: ''
-      },
-      optShow: {
-        add: false,
-        edit: false,
-        del: false,
-        download: false,
-        reset: true
-      }
-    })
-  },
-  data() {
-    return {
-      viewDialogVisible: false,
-      fullscreen: false,
-      currentComponent: '',
-      openParam: {},
-      create_time: [],
-      taskStatusList: [],
-      taskTypeList: [],
-      finishTypeList: [],
-      permission: {
-
-      },
-      rules: {},
-      classes1: []
-    }
-  },
-  created() {
-    this.initClass1()
-    crudTask.getTaskStatus().then(data => {
-      this.taskStatusList = data
-    })
-    crudTask.getFinishType().then(data => {
-      this.finishTypeList = data
-    })
-    this.crud.query.task_status = ['-1']
-    this.crud.toQuery()
-  },
-  methods: {
-    initClass1() {
-      const param = {
-        parent_class_code: 'task_type'
-      }
-      crudClassstandard.getClassType(param).then(res => {
-        const data = res.content
-        this.buildTree(data)
-        this.classes1 = data
-      })
-    },
-    buildTree(classes) {
-      classes.forEach(data => {
-        if (data.children) {
-          this.buildTree(data.children)
-        }
-        if (data.hasChildren && !data.children) {
-          data.children = null // 重点代码
-        }
-      })
-    },
-    // 获取子节点数据
-    loadChildNodes({ action, parentNode, callback }) {
-      if (action === LOAD_CHILDREN_OPTIONS) {
-        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
-          parentNode.children = res.content.map(function(obj) {
-            if (obj.hasChildren) {
-              obj.children = null
-            }
-            return obj
-          })
-          setTimeout(() => {
-            callback()
-          }, 100)
-        })
-      }
-    },
-    hand(value) {
-      this.crud.toQuery()
-    },
-    handTaskStatus(value) {
-      if (value) {
-        this.query.task_status = this.task_status.toString()
-      }
-      this.crud.toQuery()
-    },
-    formatTaskStatusName(row, column) {
-      for (const item of this.taskStatusList) {
-        if (item.code === row.task_status) {
-          return item.name
-        }
-      }
-      return ''
-    },
-    doOperate(row, command) {
-      let method_name = ''
-      switch (command) {
-        case 'a':// 完成
-          method_name = 'forceFinish'
-          break
-        case 'b':// 取消
-          method_name = 'cancel'
-          break
-        case 'c':// 下发
-          method_name = 'immediateNotifyAcs'
-          break
-        case 'd':// 详情
-          method_name = 'view'
-          break
-      }
-      if (method_name === 'view') {
-        this.view(row)
-        return
-      }
-      const data = {
-        task_id: row.task_id,
-        method_name: method_name
-      }
-      crudTask.operation(data).then(res => {
-        this.crud.toQuery()
-        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-      }).catch(err => {
-        console.log(err.response.data.message)
-      })
-    },
-    view(row) {
-      this.task_id = row.task_id
-      switch (row.task_type) {
-        case '01':// 入库
-          this.fullscreen = true
-          this.currentComponent = 'IOStore'
-          break
-        case '02':// 出库
-          this.fullscreen = true
-          this.currentComponent = 'IOStore'
-          break
-        case '03':// 入空载具
-          this.crud.notify('入空载具无详情', CRUD.NOTIFICATION_TYPE.INFO)
-          return
-        case '04':// 出空载具
-          this.crud.notify('出空载具无详情', CRUD.NOTIFICATION_TYPE.INFO)
-          return
-        case '05':// 转储
-          this.fullscreen = true
-          this.currentComponent = 'DumpInv'
-          break
-        case '06':// 质检
-          this.fullscreen = true
-          this.currentComponent = 'Quality'
-          break
-      }
-      this.viewDialogVisible = true
-    }
-
-  }
-
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/nladmin-ui/src/views/wms/st/cppoint/cppInRegion.vue b/nladmin-ui/src/views/wms/st/cppoint/cppInRegion.vue
deleted file mode 100644
index 7ded65d..0000000
--- a/nladmin-ui/src/views/wms/st/cppoint/cppInRegion.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-  <div>
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <el-form
-          :inline="true"
-          class="demo-form-inline"
-          label-position="right"
-          label-width="90px"
-          label-suffix=":"
-        >
-          <el-form-item label="单据编号">
-            <el-input
-              v-model="query.bill_code"
-              clearable
-              size="mini"
-              style="width: 185px;"
-              placeholder="单据编号"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="单据状态">
-            <el-select
-              v-model="query.bill_status"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 185px;"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in dict.st_bill_status"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="入库时间">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
-          <rrOperation :crud="crud" />
-        </el-form>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="单据编号" prop="bill_code">
-            <el-input v-model="form.bill_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="出入类型" prop="io_type">
-            <el-input v-model="form.io_type" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="批次">
-            <el-input v-model="form.pcsn" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="载具编码">
-            <el-input v-model="form.vehicle_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="数量">
-            <el-input v-model="form.qty" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="单据状态" prop="bill_status">
-            <el-input v-model="form.bill_status" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="起始点位编码">
-            <el-input v-model="form.start_point_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="终点点位编码">
-            <el-input v-model="form.end_point_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="起始区域">
-            <el-input v-model="form.start_region_id" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="终点区域">
-            <el-input v-model="form.end_region_id" style="width: 370px;" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="bill_code" label="单据编号" min-width="150" />
-        <el-table-column prop="io_type" label="出入类型">
-          <template slot-scope="scope">
-            {{ dict.label.io_type[scope.row.io_type] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="pcsn" label="批次" />
-        <el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip />
-        <el-table-column prop="qty" label="数量" :formatter="crud.formatNum3" />
-        <el-table-column prop="bill_status" label="单据状态">
-          <template slot-scope="scope">
-            {{ dict.label.st_bill_status[scope.row.bill_status] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="start_point_code" label="起点" min-width="120" />
-        <el-table-column prop="end_point_code" label="终点" min-width="120" />
-        <!--        <el-table-column prop="start_region_id" label="起始区域" />-->
-        <!--        <el-table-column prop="end_region_id" label="终点区域" />-->
-        <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="update_optname" label="修改人" min-width="100" />
-        <el-table-column prop="update_time" label="修改时间" min-width="140" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-  </div>
-</template>
-
-<script>
-import crudBill from '@/views/wms/st/regionio'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-
-const defaultForm = { iostorinv_id: null, bill_code: null, io_type: null, material_id: null, pcsn: null, vehicle_code: null, qty: null, qty_unit_id: null, bill_status: null, start_point_code: null, end_point_code: null, start_region_id: null, end_region_id: null, cust_id: null, create_mode: null, task_id: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, confirm_optid: null, confirm_optname: null, confirm_time: null, is_delete: null }
-export default {
-  name: 'CppInRegion',
-  components: { pagination, crudOperation, rrOperation, udOperation },
-  dicts: ['io_type', 'st_bill_status'],
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '养生区入库管理',
-      url: 'api/regionio',
-      idField: 'qty_unit_id',
-      sort: 'qty_unit_id,desc',
-      query: {
-        io_type: '1',
-        io_region: "'CPQYA01'"
-      },
-      crudMethod: { ...crudBill }
-    })
-  },
-  data() {
-    return {
-      permission: {
-      },
-      rules: {
-        bill_code: [
-          { required: true, message: '单据编号不能为空', trigger: 'blur' }
-        ],
-        io_type: [
-          { required: true, message: '出入类型不能为空', trigger: 'blur' }
-        ],
-        bill_status: [
-          { required: true, message: '单据状态不能为空', trigger: 'blur' }
-        ]
-      }}
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue b/nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue
deleted file mode 100644
index 2424ee8..0000000
--- a/nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue
+++ /dev/null
@@ -1,401 +0,0 @@
-<template>
-  <div>
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <el-form
-          :inline="true"
-          class="demo-form-inline"
-          label-position="right"
-          label-width="90px"
-          label-suffix=":"
-        >
-          <el-form-item label="点位编码">
-            <el-input
-              v-model="query.point_code"
-              clearable
-              size="mini"
-              style="width: 185px;"
-              placeholder="点位编码"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="物料编码">
-            <el-input
-              v-model="query.material_code"
-              clearable
-              size="mini"
-              style="width: 185px;"
-              placeholder="物料编码"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="点位状态">
-            <el-select
-              v-model="query.point_status"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 185px;"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in pointStatusList"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="载具类型">
-            <el-select
-              v-model="query.vehicle_type"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 185px;"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.vehicle_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="排">
-            <el-input
-              v-model="query.row_num"
-              clearable
-              size="mini"
-              style="width: 185px;"
-              placeholder="排"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="列">
-            <el-input
-              v-model="query.col_num"
-              clearable
-              size="mini"
-              style="width: 185px;"
-              placeholder="列"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="层">
-            <el-input
-              v-model="query.layer_num"
-              clearable
-              size="mini"
-              style="width: 185px;"
-              placeholder="层"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="锁定类型">
-            <el-select
-              v-model="query.lock_type"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 185px;"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.d_lock_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="入库时间">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
-
-          <el-form-item label="是否启用">
-            <el-switch
-              v-model="query.is_used"
-              active-value="0"
-              inactive-value="1"
-              active-color="#C0CCDA"
-              inactive-color="#409EFF"
-              @change="hand"
-            />
-          </el-form-item>
-          <rrOperation :crud="crud" />
-        </el-form>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" >
-        <el-button
-          slot="right"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-sort"
-          :disabled="crud.selections.length === 0"
-          @click="outInventory(crud.selections)"
-        >
-          出库
-        </el-button>
-        <el-button
-          v-if="showTab"
-          slot="right"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-s-promotion"
-          size="mini"
-          @click="changeShowTab">
-          编辑
-        </el-button>
-        <el-button
-          v-if="!showTab"
-          slot="right"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-s-promotion"
-          size="mini"
-          :disabled="crud.selections.length === 0"
-          @click="doEdit(crud.data)">
-          保存
-        </el-button>
-      </crudOperation>
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="550px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
-          <el-form-item label="点位编码" prop="standing_time">
-            <el-input v-model="form.point_code" style="width: 370px;" :disabled="true"/>
-          </el-form-item>
-          <el-form-item label="托盘类型">
-            <el-select
-              v-model="form.vehicle_type"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 370px;"
-            >
-              <el-option
-                v-for="item in dict.vehicle_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="锁定类型">
-            <el-select
-              v-model="form.lock_type"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 185px;"
-            >
-              <el-option
-                v-for="item in dict.d_lock_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="point_code" label="点位编码" min-width="100" show-overflow-tooltip/>
-        <el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip/>
-        <el-table-column prop="pcsn" label="批次" />
-        <el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" width="100">
-          <template slot-scope="scope">
-            <el-input type="text" v-model="scope.row.ivt_qty" v-show="!showTab" />
-            <span v-show="showTab">{{scope.row.ivt_qty}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="material_code" label="物料编码" >
-          <template slot-scope="scope">
-            <el-input type="text" v-model="scope.row.material_code" v-show="!showTab" />
-            <span v-show="showTab">{{scope.row.material_code}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="material_name" label="物料名称" min-width="120"/>
-        <el-table-column prop="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip/>
-        <el-table-column prop="point_status_name" label="点位状态" width="120">
-          <template slot-scope="scope">
-            <el-select
-              v-show="!showTab"
-              v-model="scope.row.point_status"
-              clearable
-              filterable
-              size="mini"
-            >
-              <el-option
-                v-for="item in pointStatusList"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-            <span v-show="showTab">{{scope.row.point_status_name}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="vehicle_type" label="托盘类型" min-width="100">
-          <template slot-scope="scope">
-            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="is_used" label="是否启用" >
-          <template slot-scope="scope">
-            <el-switch
-              v-show="!showTab"
-              v-model="scope.row.is_used"
-              active-value="0"
-              inactive-value="1"
-              active-color="#C0CCDA"
-              inactive-color="#409EFF"
-            />
-            <span v-show="showTab">{{ scope.row.is_used=='1' ? '是' : '否' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="lock_type" label="锁定类型" width="120">
-          <template slot-scope="scope">
-            <el-select
-              v-model="scope.row.lock_type"
-              v-show="!showTab"
-              clearable
-              filterable
-              size="mini"
-            >
-              <el-option
-                v-for="item in dict.d_lock_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-            <span v-show="showTab">{{ dict.label.d_lock_type[scope.row.lock_type] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="update_optname" label="修改人" />
-        <el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-              :is-visiable-del="false"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-  </div>
-</template>
-
-<script>
-import crudStructivt from '../structivt'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import crudRegion from '@/api/wms/sch/region'
-
-const defaultForm = { point_id: null, point_code: null, pcsn: null, material_id: null, ivt_qty: null, qty_unit_id: null, instorage_time: null, ext_code: null, point_status: null, vehicle_type: null, row_num: null, col_num: null, layer_num: null, remark: null, is_used: null, is_lock: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
-export default {
-  name: 'CppInventory',
-  dicts: ['sch_point_status', 'vehicle_type', 'is_used', 'd_lock_type'],
-  components: { pagination, crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '成品库区',
-      url: 'api/structivt',
-      idField: 'point_id',
-      sort: 'point_id,desc',
-      optShow: {
-        add: false,
-        edit: true,
-        del: false,
-        download: false,
-        reset: true
-      },
-      query: {
-        region_code: "'CPQYA01'"
-      }
-    })
-  },
-  data() {
-    return {
-      showTab: true,
-      pointStatusList: [],
-      permission: {
-      },
-      rules: {
-        is_used: [
-          { required: true, message: '是否启用不能为空', trigger: 'blur' }
-        ],
-        is_lock: [
-          { required: true, message: '是否锁定不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  created() {
-    this.getPointStatusList('1557538851726168064')
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    hand(value) {
-      this.crud.toQuery()
-    },
-    outInventory(values) {
-      console.log(values)
-      crudStructivt.outInventory(values).then(res => {
-        this.crud.notify('出库成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.crud.toQuery()
-      })
-    },
-    getPointStatusList(id) {
-      crudRegion.getPointStatusSelectById(id).then(res => {
-        this.pointStatusList = res
-      })
-    },
-    changeShowTab() {
-      this.showTab = !this.showTab
-    },
-    doEdit(datas) {
-      if (datas.length > 0) {
-        crudStructivt.batchEdit(datas).then(res => {
-          this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-          this.crud.toQuery()
-        })
-      }
-      this.showTab = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/nladmin-ui/src/views/wms/st/cppoint/cppOutRegion.vue b/nladmin-ui/src/views/wms/st/cppoint/cppOutRegion.vue
deleted file mode 100644
index d32a6f3..0000000
--- a/nladmin-ui/src/views/wms/st/cppoint/cppOutRegion.vue
+++ /dev/null
@@ -1,206 +0,0 @@
-<template>
-  <div>
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <el-form
-          :inline="true"
-          class="demo-form-inline"
-          label-position="right"
-          label-width="90px"
-          label-suffix=":"
-        >
-          <el-form-item label="单据编号">
-            <el-input
-              v-model="query.bill_code"
-              clearable
-              size="mini"
-              style="width: 185px;"
-              placeholder="单据编号"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="单据状态">
-            <el-select
-              v-model="query.bill_status"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 185px;"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in dict.st_bill_status"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="入库时间">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
-          <rrOperation :crud="crud" />
-        </el-form>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" >
-        <el-button
-          slot="right"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-position"
-          :disabled="crud.selections.length === 0"
-          @click="makeTask(crud.selections)"
-        >
-          生成任务
-        </el-button>
-      </crudOperation>
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="单据编号" prop="bill_code">
-            <el-input v-model="form.bill_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="出入类型" prop="io_type">
-            <el-input v-model="form.io_type" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="批次">
-            <el-input v-model="form.pcsn" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="载具编码">
-            <el-input v-model="form.vehicle_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="数量">
-            <el-input v-model="form.qty" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="单据状态" prop="bill_status">
-            <el-input v-model="form.bill_status" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="起始点位编码">
-            <el-input v-model="form.start_point_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="终点点位编码">
-            <el-input v-model="form.end_point_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="起始区域">
-            <el-input v-model="form.start_region_id" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="终点区域">
-            <el-input v-model="form.end_region_id" style="width: 370px;" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="bill_code" label="单据编号" min-width="150" />
-        <el-table-column prop="io_type" label="出入类型">
-          <template slot-scope="scope">
-            {{ dict.label.io_type[scope.row.io_type] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="pcsn" label="批次" />
-        <el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip />
-        <el-table-column prop="qty" label="数量" :formatter="crud.formatNum3" />
-        <el-table-column prop="bill_status" label="单据状态">
-          <template slot-scope="scope">
-            {{ dict.label.st_bill_status[scope.row.bill_status] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="start_point_code" label="起点" min-width="120" />
-        <el-table-column prop="end_point_code" label="终点" min-width="120" />
-        <!--        <el-table-column prop="start_region_id" label="起始区域" />-->
-        <!--        <el-table-column prop="end_region_id" label="终点区域" />-->
-        <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="update_optname" label="修改人" min-width="100" />
-        <el-table-column prop="update_time" label="修改时间" min-width="140" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-  </div>
-</template>
-
-<script>
-import crudBill from '@/views/wms/st/regionio'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-
-const defaultForm = { iostorinv_id: null, bill_code: null, io_type: null, material_id: null, pcsn: null, vehicle_code: null, qty: null, qty_unit_id: null, bill_status: null, start_point_code: null, end_point_code: null, start_region_id: null, end_region_id: null, cust_id: null, create_mode: null, task_id: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, confirm_optid: null, confirm_optname: null, confirm_time: null, is_delete: null }
-export default {
-  name: 'CppOutRegion',
-  components: { pagination, crudOperation, rrOperation, udOperation },
-  dicts: ['io_type', 'st_bill_status'],
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '成品区出库管理',
-      url: 'api/regionio',
-      idField: 'qty_unit_id',
-      sort: 'qty_unit_id,desc',
-      query: {
-        io_type: '2',
-        io_region: "'CPQYA01'"
-      },
-      crudMethod: { ...crudBill }
-    })
-  },
-  data() {
-    return {
-      permission: {
-      },
-      rules: {
-        bill_code: [
-          { required: true, message: '单据编号不能为空', trigger: 'blur' }
-        ],
-        io_type: [
-          { required: true, message: '出入类型不能为空', trigger: 'blur' }
-        ],
-        bill_status: [
-          { required: true, message: '单据状态不能为空', trigger: 'blur' }
-        ]
-      }}
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    makeTask(values) {
-      crudBill.makeTask(values).then(res => {
-        this.crud.notify('生成任务成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.crud.toQuery()
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/nladmin-ui/src/views/wms/st/cppoint/index.vue b/nladmin-ui/src/views/wms/st/cppoint/index.vue
deleted file mode 100644
index 9c486f5..0000000
--- a/nladmin-ui/src/views/wms/st/cppoint/index.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-tabs type="border-card">
-      <el-tab-pane>
-        <span slot="label"><i class="el-icon-date"></i> 库存查询</span>
-        <cpp-inventory/>
-      </el-tab-pane>
-      <el-tab-pane label="入库管理">
-        <cpp-in-region/>
-      </el-tab-pane>
-      <el-tab-pane label="出库管理">
-        <cpp-out-region/>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-
-import CppInventory from '@/views/wms/st/cppoint/cppInventory'
-import CppInRegion from '@/views/wms/st/cppoint/cppInRegion'
-import CppOutRegion from '@/views/wms/st/cppoint/cppOutRegion'
-export default {
-  name: 'Cppoint',
-  components: { CppOutRegion, CppInRegion, CppInventory }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/nladmin-ui/src/views/wms/st/regionio.js b/nladmin-ui/src/views/wms/st/regionio.js
deleted file mode 100644
index f9997c2..0000000
--- a/nladmin-ui/src/views/wms/st/regionio.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/regionio',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/regionio/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/regionio',
-    method: 'put',
-    data
-  })
-}
-
-export function makeTask(data) {
-  return request({
-    url: 'api/regionio/makeTask',
-    method: 'post',
-    data: data
-  })
-}
-
-export default { add, edit, del, makeTask }
diff --git a/nladmin-ui/src/views/wms/st/structivt.js b/nladmin-ui/src/views/wms/st/structivt.js
deleted file mode 100644
index 411cd72..0000000
--- a/nladmin-ui/src/views/wms/st/structivt.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/structivt',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/structivt/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/structivt',
-    method: 'put',
-    data
-  })
-}
-
-export function outInventory(data) {
-  return request({
-    url: 'api/structivt/outInventory',
-    method: 'post',
-    data: data
-  })
-}
-
-export function batchEdit(data) {
-  return request({
-    url: 'api/structivt/batchEdit',
-    method: 'post',
-    data: data
-  })
-}
-
-export default { add, edit, del, outInventory, batchEdit }
diff --git a/nladmin-ui/src/views/wms/st/ysa/index.vue b/nladmin-ui/src/views/wms/st/ysa/index.vue
deleted file mode 100644
index a0cbceb..0000000
--- a/nladmin-ui/src/views/wms/st/ysa/index.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-tabs type="border-card">
-      <el-tab-pane>
-        <span slot="label"><i class="el-icon-date"></i> 库存查询</span>
-        <Inventory/>
-      </el-tab-pane>
-      <el-tab-pane label="修改记录">
-      </el-tab-pane>
-      <el-tab-pane label="入库管理">
-        <ysq-in-region/>
-      </el-tab-pane>
-      <el-tab-pane label="出库管理">
-        <ysq-out-region/>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-import Inventory from '@/views/wms/st/ysa/inventory'
-import YsqInRegion from '@/views/wms/st/ysa/ysqInRegion'
-import YsqOutRegion from '@/views/wms/st/ysa/ysqOutRegion'
-export default {
-  name: 'Ysapoint',
-  components: { YsqOutRegion, YsqInRegion, Inventory }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/nladmin-ui/src/views/wms/st/ysa/inventory.vue b/nladmin-ui/src/views/wms/st/ysa/inventory.vue
deleted file mode 100644
index 282c600..0000000
--- a/nladmin-ui/src/views/wms/st/ysa/inventory.vue
+++ /dev/null
@@ -1,412 +0,0 @@
-<template>
-  <div>
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <el-form
-          :inline="true"
-          class="demo-form-inline"
-          label-position="right"
-          label-width="90px"
-          label-suffix=":"
-        >
-          <el-form-item label="点位编码">
-            <el-input
-              v-model="query.point_code"
-              clearable
-              size="mini"
-              style="width: 185px;"
-              placeholder="点位编码"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="物料编码">
-            <el-input
-              v-model="query.material_code"
-              clearable
-              size="mini"
-              style="width: 185px;"
-              placeholder="物料编码"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="点位状态">
-            <el-select
-              v-model="query.point_status"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 185px;"
-              @change="querys"
-            >
-              <el-option
-                v-for="item in pointStatusList"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="载具类型">
-            <el-select
-              v-model="query.vehicle_type"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 185px;"
-              @change="querys"
-            >
-              <el-option
-                v-for="item in dict.vehicle_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="块">
-            <el-input
-              v-model="query.block_num"
-              clearable
-              size="mini"
-              style="width: 185px;"
-              placeholder="块"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="排">
-            <el-input
-              v-model="query.row_num"
-              clearable
-              size="mini"
-              style="width: 185px;"
-              placeholder="排"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="列">
-            <el-input
-              v-model="query.col_num"
-              clearable
-              size="mini"
-              style="width: 185px;"
-              placeholder="列"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="锁定类型">
-            <el-select
-              v-model="query.lock_type"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 185px;"
-              @change="querys"
-            >
-              <el-option
-                v-for="item in dict.d_lock_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="入库时间">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="是否启用">
-            <el-switch
-              v-model="query.is_used"
-              active-value="0"
-              inactive-value="1"
-              active-color="#C0CCDA"
-              inactive-color="#409EFF"
-              @change="querys"
-            />
-          </el-form-item>
-          <rrOperation :crud="crud" />
-        </el-form>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
-        <el-button
-          v-if="showTab"
-          slot="right"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-s-promotion"
-          size="mini"
-          @click="changeShowTab">
-          编辑
-        </el-button>
-        <el-button
-          v-if="!showTab"
-          slot="right"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-s-promotion"
-          size="mini"
-          :disabled="crud.selections.length === 0"
-          @click="doEdit(crud.data)">
-          保存
-        </el-button>
-      </crudOperation>
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="550px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
-          <el-form-item label="点位编码" prop="standing_time">
-            <el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
-          </el-form-item>
-          <el-form-item label="点位状态">
-            <el-select
-              v-model="form.point_status"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 370px;"
-            >
-              <el-option
-                v-for="item in pointStatusList"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="托盘类型">
-            <el-select
-              v-model="form.vehicle_type"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 370px;"
-            >
-              <el-option
-                v-for="item in dict.vehicle_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="静置时间(min)" prop="standing_time">
-            <el-input v-model="form.standing_time" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="锁定类型">
-            <el-select
-              v-model="form.lock_type"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 185px;"
-            >
-              <el-option
-                v-for="item in dict.d_lock_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="point_code" label="点位编码" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
-        <el-table-column prop="pcsn" label="批次" />
-        <el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" width="100">
-          <template slot-scope="scope">
-            <el-input type="text" v-model="scope.row.ivt_qty" v-show="!showTab" />
-            <span v-show="showTab">{{scope.row.ivt_qty}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="material_code" label="物料编码" >
-          <template slot-scope="scope">
-            <el-input type="text" v-model="scope.row.material_code" v-show="!showTab" />
-            <span v-show="showTab">{{scope.row.material_code}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="material_name" label="物料名称" />
-        <el-table-column prop="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip/>
-        <el-table-column prop="point_status" label="点位状态" width="120">
-          <template slot-scope="scope">
-            <el-select
-              v-show="!showTab"
-              v-model="scope.row.point_status"
-              clearable
-              filterable
-              size="mini"
-            >
-              <el-option
-                v-for="item in pointStatusList"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-            <span v-show="showTab">{{scope.row.point_status_name}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="lock_type" label="锁定类型" width="120">
-          <template slot-scope="scope">
-            <el-select
-              v-model="scope.row.lock_type"
-              v-show="!showTab"
-              clearable
-              filterable
-              size="mini"
-            >
-              <el-option
-                v-for="item in dict.d_lock_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-            <span v-show="showTab">{{ dict.label.d_lock_type[scope.row.lock_type] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="is_used" label="是否启用">
-          <template slot-scope="scope">
-            <el-switch
-              v-show="!showTab"
-              v-model="scope.row.is_used"
-              active-value="0"
-              inactive-value="1"
-              active-color="#C0CCDA"
-              inactive-color="#409EFF"
-            />
-            <span v-show="showTab">{{ scope.row.is_used=='1' ? '是' : '否' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="vehicle_type" label="托盘类型" min-width="150">
-          <template slot-scope="scope">
-            <el-select
-              v-show="!showTab"
-              v-model="scope.row.vehicle_type"
-              clearable
-              filterable
-              size="mini"
-            >
-              <el-option
-                v-for="item in dict.vehicle_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-            <span v-show="showTab">{{ dict.label.vehicle_type[scope.row.vehicle_type] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="vehicle_code" label="托盘号" />
-        <el-table-column prop="standing_time" label="静置时间(min)" min-width="120" />
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-  </div>
-</template>
-
-<script>
-import crudStructivt from '../structivt'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import crudRegion from '@/api/wms/sch/region'
-
-const defaultForm = { point_id: null, point_code: null, pcsn: null, material_id: null, ivt_qty: null, qty_unit_id: null, instorage_time: null, ext_code: null, point_status: null, vehicle_type: null, standing_time: null, block_num: null, row_num: null, col_num: null, layer_num: null, remark: null, is_used: null, is_lock: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
-export default {
-  name: 'Inventory',
-  components: { pagination, crudOperation, rrOperation, udOperation },
-  dicts: ['vehicle_type', 'is_used', 'd_lock_type'],
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '养生A区',
-      url: 'api/structivt',
-      idField: 'point_id',
-      sort: 'point_id,desc',
-      optShow: {
-        add: false,
-        edit: true,
-        del: false,
-        download: false,
-        reset: true
-      },
-      query: {
-        region_code: "'YSQA01', 'YSAQKTPQ01'"
-      },
-      crudMethod: { ...crudStructivt }
-    })
-  },
-  data() {
-    return {
-      showTab: true,
-      pointStatusList: [],
-      permission: {
-      },
-      rules: {
-        is_used: [
-          { required: true, message: '是否启用不能为空', trigger: 'blur' }
-        ],
-        is_lock: [
-          { required: true, message: '是否锁定不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  created() {
-    this.getPointStatusList('1557539288307077120')
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    querys() {
-      this.crud.toQuery()
-    },
-    hand(value) {
-      // 块排列 的参数整合
-      if (this.locations.length > 0) {
-        this.query.locationsOptions = this.locations[0] + '/' + this.locations[1] + '/' + this.locations[2]
-      }
-      this.crud.toQuery()
-    },
-    changeShowTab() {
-      this.showTab = !this.showTab
-    },
-    getPointStatusList(id) {
-      crudRegion.getPointStatusSelectById(id).then(res => {
-        this.pointStatusList = res
-      })
-    },
-    doEdit(datas) {
-      if (datas.length > 0) {
-        crudStructivt.batchEdit(datas).then(res => {
-          this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-          this.crud.toQuery()
-        })
-      }
-      this.showTab = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/nladmin-ui/src/views/wms/st/ysa/ysqInRegion.vue b/nladmin-ui/src/views/wms/st/ysa/ysqInRegion.vue
deleted file mode 100644
index 6dad621..0000000
--- a/nladmin-ui/src/views/wms/st/ysa/ysqInRegion.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-  <div>
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <el-form
-          :inline="true"
-          class="demo-form-inline"
-          label-position="right"
-          label-width="90px"
-          label-suffix=":"
-        >
-          <el-form-item label="单据编号">
-            <el-input
-              v-model="query.bill_code"
-              clearable
-              size="mini"
-              style="width: 185px;"
-              placeholder="单据编号"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="单据状态">
-            <el-select
-              v-model="query.bill_status"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 185px;"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in dict.st_bill_status"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="入库时间">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
-          <rrOperation :crud="crud" />
-        </el-form>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="单据编号" prop="bill_code">
-            <el-input v-model="form.bill_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="出入类型" prop="io_type">
-            <el-input v-model="form.io_type" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="批次">
-            <el-input v-model="form.pcsn" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="载具编码">
-            <el-input v-model="form.vehicle_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="数量">
-            <el-input v-model="form.qty" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="单据状态" prop="bill_status">
-            <el-input v-model="form.bill_status" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="起始点位编码">
-            <el-input v-model="form.start_point_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="终点点位编码">
-            <el-input v-model="form.end_point_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="起始区域">
-            <el-input v-model="form.start_region_id" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="终点区域">
-            <el-input v-model="form.end_region_id" style="width: 370px;" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="bill_code" label="单据编号" min-width="150" />
-        <el-table-column prop="io_type" label="出入类型">
-          <template slot-scope="scope">
-            {{ dict.label.io_type[scope.row.io_type] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="pcsn" label="批次" />
-        <el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip />
-        <el-table-column prop="qty" label="数量" :formatter="crud.formatNum3" />
-        <el-table-column prop="bill_status" label="单据状态">
-          <template slot-scope="scope">
-            {{ dict.label.st_bill_status[scope.row.bill_status] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="start_point_code" label="起点" min-width="120" />
-        <el-table-column prop="end_point_code" label="终点" min-width="120" />
-        <!--        <el-table-column prop="start_region_id" label="起始区域" />-->
-        <!--        <el-table-column prop="end_region_id" label="终点区域" />-->
-        <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="update_optname" label="修改人" min-width="100" />
-        <el-table-column prop="update_time" label="修改时间" min-width="140" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-  </div>
-</template>
-
-<script>
-import crudBill from '@/views/wms/st/regionio'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-
-const defaultForm = { iostorinv_id: null, bill_code: null, io_type: null, material_id: null, pcsn: null, vehicle_code: null, qty: null, qty_unit_id: null, bill_status: null, start_point_code: null, end_point_code: null, start_region_id: null, end_region_id: null, cust_id: null, create_mode: null, task_id: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, confirm_optid: null, confirm_optname: null, confirm_time: null, is_delete: null }
-export default {
-  name: 'YsqInRegion',
-  components: { pagination, crudOperation, rrOperation, udOperation },
-  dicts: ['io_type', 'st_bill_status'],
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '养生区入库管理',
-      url: 'api/regionio',
-      idField: 'qty_unit_id',
-      sort: 'qty_unit_id,desc',
-      crudMethod: { ...crudBill },
-      query: {
-        io_type: '1',
-        io_region: "'YSQA01', 'YSAQKTPQ01'"
-      }
-    })
-  },
-  data() {
-    return {
-      permission: {
-      },
-      rules: {
-        bill_code: [
-          { required: true, message: '单据编号不能为空', trigger: 'blur' }
-        ],
-        io_type: [
-          { required: true, message: '出入类型不能为空', trigger: 'blur' }
-        ],
-        bill_status: [
-          { required: true, message: '单据状态不能为空', trigger: 'blur' }
-        ]
-      }}
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/nladmin-ui/src/views/wms/st/ysa/ysqOutRegion.vue b/nladmin-ui/src/views/wms/st/ysa/ysqOutRegion.vue
deleted file mode 100644
index 2adb600..0000000
--- a/nladmin-ui/src/views/wms/st/ysa/ysqOutRegion.vue
+++ /dev/null
@@ -1,190 +0,0 @@
-<template>
-  <div>
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <el-form
-          :inline="true"
-          class="demo-form-inline"
-          label-position="right"
-          label-width="90px"
-          label-suffix=":"
-        >
-          <el-form-item label="单据编号">
-            <el-input
-              v-model="query.bill_code"
-              clearable
-              size="mini"
-              style="width: 185px;"
-              placeholder="单据编号"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="单据状态">
-            <el-select
-              v-model="query.bill_status"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 185px;"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in dict.st_bill_status"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="入库时间">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
-          <rrOperation :crud="crud" />
-        </el-form>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="单据编号" prop="bill_code">
-            <el-input v-model="form.bill_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="出入类型" prop="io_type">
-            <el-input v-model="form.io_type" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="批次">
-            <el-input v-model="form.pcsn" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="载具编码">
-            <el-input v-model="form.vehicle_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="数量">
-            <el-input v-model="form.qty" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="单据状态" prop="bill_status">
-            <el-input v-model="form.bill_status" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="起始点位编码">
-            <el-input v-model="form.start_point_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="终点点位编码">
-            <el-input v-model="form.end_point_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="起始区域">
-            <el-input v-model="form.start_region_id" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="终点区域">
-            <el-input v-model="form.end_region_id" style="width: 370px;" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="bill_code" label="单据编号" min-width="150"/>
-        <el-table-column prop="io_type" label="出入类型" >
-          <template slot-scope="scope">
-            {{ dict.label.io_type[scope.row.io_type] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="pcsn" label="批次" />
-        <el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip/>
-        <el-table-column prop="qty" label="数量" :formatter="crud.formatNum3"/>
-        <el-table-column prop="bill_status" label="单据状态" >
-          <template slot-scope="scope">
-            {{ dict.label.st_bill_status[scope.row.bill_status] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="start_point_code" label="起始点位编码" min-width="120"/>
-        <el-table-column prop="end_point_code" label="终点点位编码" min-width="120"/>
-<!--        <el-table-column prop="start_region_id" label="起始区域" />-->
-<!--        <el-table-column prop="end_region_id" label="终点区域" />-->
-        <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="update_optname" label="修改人姓名" min-width="100"/>
-        <el-table-column prop="update_time" label="修改时间" min-width="140"/>
-        <el-table-column prop="confirm_optname" label="确认人姓名" min-width="100"/>
-        <el-table-column prop="confirm_time" label="确认时间" min-width="140"/>
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-  </div>
-</template>
-
-<script>
-import crudBill from '@/views/wms/st/regionio'
-import CRUD, {crud, form, header, presenter} from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-
-const defaultForm = { iostorinv_id: null, bill_code: null, io_type: null, material_id: null, pcsn: null, vehicle_code: null, qty: null, qty_unit_id: null, bill_status: null, start_point_code: null, end_point_code: null, start_region_id: null, end_region_id: null, cust_id: null, create_mode: null, task_id: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, confirm_optid: null, confirm_optname: null, confirm_time: null, is_delete: null }
-export default {
-  name: 'YsqOutRegion',
-  components: { pagination, crudOperation, rrOperation, udOperation },
-  dicts: ['io_type', 'st_bill_status'],
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '养生区入库管理',
-      url: 'api/regionio',
-      idField: 'qty_unit_id',
-      sort: 'qty_unit_id,desc',
-      crudMethod: { ...crudBill },
-      query: {
-        io_type: '2',
-        io_region: "'YSQA01', 'YSAQKTPQ01'"
-      }
-    })
-  },
-  data() {
-    return {
-      permission: {
-      },
-      rules: {
-        bill_code: [
-          { required: true, message: '单据编号不能为空', trigger: 'blur' }
-        ],
-        io_type: [
-          { required: true, message: '出入类型不能为空', trigger: 'blur' }
-        ],
-        bill_status: [
-          { required: true, message: '单据状态不能为空', trigger: 'blur' }
-        ]
-      }    }
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

From 040734cd924c4f5c3054ca73cebbc00ca656ff81 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Fri, 16 Dec 2022 14:22:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=BF=E6=8D=A2opt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/modules/common/base/BaseDTO.java   |  6 ++--
 .../controller/role/SysRoleController.java    |  6 ++++
 .../nl/system/service/dept/dao/SysDept.java   |  6 ++--
 .../org/nl/system/service/dict/dao/Dict.java  |  6 ++--
 .../service/dict/impl/SysDictServiceImpl.java | 16 +++++------
 .../nl/system/service/menu/dao/SysMenu.java   |  6 ++--
 .../nl/system/service/param/dao/Param.java    |  6 ++--
 .../param/impl/SysParamServiceImpl.java       |  8 +++---
 .../nl/system/service/role/dao/SysRole.java   |  4 +--
 .../nl/system/service/user/dao/SysUser.java   |  8 +++---
 .../service/user/dao/mapper/SysUserMapper.xml |  8 +++---
 .../service/user/dto/SysUserDetail.java       |  2 +-
 nladmin-ui/src/views/system/user/index.vue    | 28 +++++++++----------
 13 files changed, 58 insertions(+), 52 deletions(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java
index 2a277af..bce5112 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java
@@ -18,11 +18,11 @@ public class BaseDTO  implements Serializable {
 
     private String createName;
 
-    private Long createId;
+    private String createId;
 
-    private String updateOptname;
+    private String updateName;
 
-    private Long updateOptid;
+    private String updateId;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java
index 7a119ef..4302205 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java
@@ -38,6 +38,12 @@ public class SysRoleController {
         return new ResponseEntity<>(TableDataInfo.build(roleService.query(param, page)), HttpStatus.OK);
     }
 
+    @ApiOperation("查询所有角色")
+    @GetMapping("/all")
+    public ResponseEntity<Object> queryAll() {
+        return new ResponseEntity<>(roleService.list(), HttpStatus.OK);
+    }
+
     @Log("新增角色")
     @ApiOperation("新增角色")
     @PostMapping
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/SysDept.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/SysDept.java
index d46f54c..557e04d 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/SysDept.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/SysDept.java
@@ -54,19 +54,19 @@ public class SysDept implements Serializable {
      */
     private String isUsed;
 
-    private Long createId;
+    private String createId;
 
     /**
      * 创建者
      */
     private String createName;
 
-    private Long updateOptid;
+    private String updateId;
 
     /**
      * 更新者
      */
-    private String updateOptname;
+    private String updateName;
 
     /**
      * 创建日期
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/Dict.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/Dict.java
index fdb36e9..923464e 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/Dict.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/Dict.java
@@ -77,7 +77,7 @@ public class Dict implements Serializable {
     /**
      * 创建人
      */
-    private Long createId;
+    private String createId;
 
     /**
      * 创建人
@@ -92,12 +92,12 @@ public class Dict implements Serializable {
     /**
      * 修改人
      */
-    private Long updateOptid;
+    private String updateId;
 
     /**
      * 修改人
      */
-    private String updateOptname;
+    private String updateName;
 
     /**
      * 修改时间
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java
index f8dffa7..ad0b3fc 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java
@@ -64,8 +64,8 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, Dict> impleme
         dict.setCreateId(currentUserId);
         dict.setCreateName(nickName);
         dict.setCreateTime(date);
-        dict.setUpdateOptid(currentUserId);
-        dict.setUpdateOptname(nickName);
+        dict.setupdateId(currentUserId);
+        dict.setupdateName(nickName);
         dict.setUpdateTime(date);
         sysDictMapper.insert(dict);
     }
@@ -83,8 +83,8 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, Dict> impleme
         dicts.forEach(di -> {
             di.setCode(dto.getCode());
             di.setName(dto.getName());
-            di.setUpdateOptid(currentUserId);
-            di.setUpdateOptname(currentNickName);
+            di.setupdateId(currentUserId);
+            di.setupdateName(currentNickName);
             di.setUpdateTime(DateUtil.now());
             sysDictMapper.updateById(di);
         });
@@ -139,8 +139,8 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, Dict> impleme
         dict.setCreateId(SecurityUtils.getCurrentUserId());
         dict.setCreateName(SecurityUtils.getCurrentNickName());
         dict.setCreateTime(DateUtil.now());
-        dict.setUpdateOptid(SecurityUtils.getCurrentUserId());
-        dict.setUpdateOptname(SecurityUtils.getCurrentNickName());
+        dict.setupdateId(SecurityUtils.getCurrentUserId());
+        dict.setupdateName(SecurityUtils.getCurrentNickName());
         dict.setUpdateTime(DateUtil.now());
         sysDictMapper.insert(dict);
     }
@@ -154,8 +154,8 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, Dict> impleme
         Dict one = sysDictMapper.selectOne(new LambdaQueryWrapper<Dict>().eq(Dict::getLabel, dict.getLabel())
                 .eq(Dict::getCode, dict.getCode()));
         if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("标签[" + dict.getLabel() + "]已存在");
-        resources.setUpdateOptid(SecurityUtils.getCurrentUserId());
-        resources.setUpdateOptname(SecurityUtils.getCurrentNickName());
+        resources.setupdateId(SecurityUtils.getCurrentUserId());
+        resources.setupdateName(SecurityUtils.getCurrentNickName());
         resources.setUpdateTime(DateUtil.now());
         sysDictMapper.updateById(resources);
     }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java
index d0d330b..b96c7ec 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java
@@ -107,7 +107,7 @@ public class SysMenu implements Serializable {
     /**
      * 创建人标识
      */
-    private Long createId;
+    private String createId;
 
     /**
      * 创建人
@@ -122,12 +122,12 @@ public class SysMenu implements Serializable {
     /**
      * 修改人标识
      */
-    private Long updateOptid;
+    private String updateId;
 
     /**
      * 修改人
      */
-    private String updateOptname;
+    private String updateName;
 
     /**
      * 修改时间
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/Param.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/Param.java
index 6659303..91b30ca 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/Param.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/Param.java
@@ -58,7 +58,7 @@ public class Param implements Serializable {
     /**
      * 创建者ID
      */
-    private Long createId;
+    private String createId;
 
     /**
      * 创建者
@@ -73,12 +73,12 @@ public class Param implements Serializable {
     /**
      * 修改者ID
      */
-    private Long updateOptid;
+    private String updateId;
 
     /**
      * 修改者
      */
-    private String updateOptname;
+    private String updateName;
 
     /**
      * 修改时间
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java
index 3b1f4cf..625b6f4 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java
@@ -54,8 +54,8 @@ public class SysParamServiceImpl extends ServiceImpl<SysParamMapper, Param> impl
         param.setCreateId(currentUserId);
         param.setCreateName(nickName);
         param.setCreateTime(now);
-        param.setUpdateOptid(currentUserId);
-        param.setUpdateOptname(nickName);
+        param.setupdateId(currentUserId);
+        param.setupdateName(nickName);
         param.setUpdateTime(now);
         paramMapper.insert(param);
     }
@@ -65,8 +65,8 @@ public class SysParamServiceImpl extends ServiceImpl<SysParamMapper, Param> impl
     public void update(Param param) {
         Param paramObj = paramMapper.selectById(param.getId());
         if (ObjectUtil.isEmpty(paramObj)) throw new BadRequestException("被删除或无权限，操作失败!");
-        param.setUpdateOptid(SecurityUtils.getCurrentUserId());
-        param.setUpdateOptname(SecurityUtils.getCurrentNickName());
+        param.setupdateId(SecurityUtils.getCurrentUserId());
+        param.setupdateName(SecurityUtils.getCurrentNickName());
         param.setUpdateTime(DateUtil.now());
         paramMapper.updateById(param);
     }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/SysRole.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/SysRole.java
index 1e101a3..81b45c9 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/SysRole.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/SysRole.java
@@ -64,7 +64,7 @@ public class SysRole implements Serializable {
     /**
      * 创建人标识
      */
-    private Long createId;
+    private String createId;
 
     /**
      * 创建人
@@ -79,7 +79,7 @@ public class SysRole implements Serializable {
     /**
      * 修改人标识
      */
-    private Long updateId;
+    private String updateId;
 
     /**
      * 修改人
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java
index 05cf241..0590255 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java
@@ -28,7 +28,7 @@ public class SysUser implements Serializable {
      * 用户标识
      */
     @TableId(value = "user_id", type = IdType.INPUT)
-    private Long userId;
+    private String userId;
 
     /**
      * 登录账号
@@ -93,7 +93,7 @@ public class SysUser implements Serializable {
     /**
      * 创建人标识
      */
-    private Long createId;
+    private String createId;
 
     /**
      * 创建人
@@ -108,12 +108,12 @@ public class SysUser implements Serializable {
     /**
      * 修改人标识
      */
-    private Long updateOptid;
+    private String updateId;
 
     /**
      * 修改人
      */
-    private String updateOptname;
+    private String updateName;
 
     /**
      * 修改时间
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml
index a32d986..7a4dd79 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml
@@ -18,8 +18,8 @@
         sys_user.create_id as createId,
         sys_user.create_name as createName,
         sys_user.create_time as createTime,
-        sys_user.update_optid as updateOptid,
-        sys_user.update_optname as updateOptname,
+        sys_user.update_optid as updateId,
+        sys_user.update_optname as updateName,
         sys_user.update_time as updateTime,
         sys_user.extperson_id as extpersonId,
         sys_user.extuser_id as extuserId
@@ -41,8 +41,8 @@
         <result column="create_id" property="createId" />
         <result column="create_name" property="createName" />
         <result column="create_time" property="createTime" />
-        <result column="update_optid" property="updateOptid" />
-        <result column="update_optname" property="updateOptname" />
+        <result column="update_optid" property="updateId" />
+        <result column="update_optname" property="updateName" />
         <result column="update_tim" property="updateTime" />
         <result column="extperson_id" property="extpersonId" />
         <result column="extuser_i" property="extuserId" />
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/SysUserDetail.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/SysUserDetail.java
index 0fb5aeb..fe219e3 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/SysUserDetail.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/SysUserDetail.java
@@ -1,5 +1,6 @@
 package org.nl.system.service.user.dto;
 
+import cn.hutool.core.util.IdUtil;
 import lombok.Data;
 import org.nl.system.service.dept.dao.SysDept;
 import org.nl.system.service.role.dao.SysRole;
@@ -13,7 +14,6 @@ import java.util.List;
  */
 @Data
 public class SysUserDetail extends SysUser {
-
     private List<SysDept> depts;
 
     private List<SysRole> roles;
diff --git a/nladmin-ui/src/views/system/user/index.vue b/nladmin-ui/src/views/system/user/index.vue
index ab58a0b..653dd32 100644
--- a/nladmin-ui/src/views/system/user/index.vue
+++ b/nladmin-ui/src/views/system/user/index.vue
@@ -72,7 +72,7 @@
               <el-input v-model.number="form.phone" style="width: 200px;" />
             </el-form-item>
             <el-form-item label="姓名" prop="preson_name">
-              <el-input v-model="form.person_name" style="width: 200px;" />
+              <el-input v-model="form.personName" style="width: 200px;" />
             </el-form-item>
             <el-form-item label="邮箱" prop="email">
               <el-input v-model="form.email" style="width: 200px;" />
@@ -124,9 +124,9 @@
                 <!--:disabled="level !== 1 && item.level <= level"-->
                 <el-option
                   v-for="item in roles"
-                  :key="item.role_id"
+                  :key="item.roleId"
                   :label="item.name"
-                  :value="item.role_id"
+                  :value="item.roleId"
                 />
               </el-select>
             </el-form-item>
@@ -147,11 +147,11 @@
           <el-table-column :selectable="checkboxT" type="selection" width="55" />
           <el-table-column prop="username" label="用户名" :min-width="flexWidth('username',crud.data,'用户名')" />
           <el-table-column
-            prop="person_name"
+            prop="personName"
             label="姓名"
             :min-width="flexWidth('personName',crud.data,'姓名')"
           />
-          <el-table-column prop="gender" label="性别" :min-width="flexWidth('person_name',crud.data,'性别')" />
+          <el-table-column prop="gender" label="性别" :min-width="flexWidth('personName',crud.data,'性别')" />
           <el-table-column prop="phone" label="电话" :min-width="flexWidth('phone',crud.data,'电话')" />
           <el-table-column prop="email" label="邮箱" :min-width="flexWidth('email',crud.data,'邮箱')" />
           <el-table-column show-overflow-tooltip prop="deptnames" label="部门" />
@@ -248,7 +248,7 @@
           <el-input v-model="dataDialog.username" disabled style="width: 200px;" />
         </el-form-item>
         <el-form-item label="姓名" prop="preson_name">
-          <el-input v-model="dataDialog.person_name" disabled style="width: 200px;" />
+          <el-input v-model="dataDialog.personName" disabled style="width: 200px;" />
         </el-form-item>
         <el-table
           ref="dialogTable"
@@ -309,7 +309,7 @@
         </el-table-column>
         <el-table-column prop="permission_name" label="权限范围" min-width="100" show-overflow-tooltip />
         <el-table-column prop="dept_name" label="部门名称" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="person_name" label="用户名称" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="personName" label="用户名称" min-width="100" show-overflow-tooltip />
       </el-table>
     </el-dialog>
     <relevance-user-dialog :dialog-show.sync="relevanceUser" :is-single="false" :users="userIds" @selectUsers="selectUsers" />
@@ -338,7 +338,7 @@ const defaultForm = {
   dept_id: null,
   depts: [],
   username: null,
-  person_name: null,
+  personName: null,
   gender: '男',
   email: null,
   isUsed: '1',
@@ -368,15 +368,15 @@ export default {
         del: ['admin', 'user:del']
       },
       enabledTypeOptions: [
-        { key: '1', display_name: '激活' },
-        { key: '0', display_name: '锁定' }
+        { key: true, display_name: '激活' },
+        { key: false, display_name: '锁定' }
       ],
       rules: {
         username: [
           { required: true, message: '请输入用户名', trigger: 'blur' },
           { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
         ],
-        person_name: [
+        personName: [
           { required: true, message: '请输入用户姓名', trigger: 'blur' },
           { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
         ]
@@ -573,7 +573,7 @@ export default {
     },
     normalizer(node) {
       return {
-        id: node.dept_id,
+        id: node.deptId,
         label: node.name,
         children: node.children
       }
@@ -672,10 +672,10 @@ export default {
     //     // permissions
     //     crudDataPermission.getDataPermissionOption().then(res => {
     //       this.permissions = res
-    //       this.dataDialog.person_name = row.person_name
+    //       this.dataDialog.personName = row.personName
     //       this.dataDialog.username = row.username
     //       this.dataDialog.user_id = row.user_id
-    //       this.dataPermissionTitle = '[' + row.person_name + '] 数据权限'
+    //       this.dataPermissionTitle = '[' + row.personName + '] 数据权限'
     //       this.dataPerm = true
     //       // 回显数据
     //       crudDataPermission.getDataShow(row.user_id).then(res => {