rev:修改前端引用路由

mes/qd/src/views/wms/analysis_manage/inspection/index.vue

@@ -75,7 +75,7 @@
 </template>
 
 <script>
-import crudInspection from '@/views/wms/ql/inspection/inspectionpoint'
+import crudInspection from '@/views/wms/analysis_manage/inspection/inspectionpoint'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'

mes/qd/src/views/wms/masterdata_manage/master/material/index.vue

@@ -185,7 +185,7 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import Dialog from '@/views/wms/basedata/master/material/Dialog'
+import Dialog from '@/views/wms/masterdata_manage/master/material/Dialog'
 import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudClassstandard from '@/api/wms/basedata/master/classstandard'

mes/qd/src/views/wms/product_manage/sch/point/index.vue

@@ -441,9 +441,9 @@ 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 ViewDialog from '@/views/wms/product_manage/sch/point/ViewDialog'
-import MaterialDialog from '@/views/wms/sch/point/MaterialDialog'
+import MaterialDialog from '@/views/wms/product_manage/sch/point/MaterialDialog'
-import WorkOrderDialog from '@/views/wms/sch/point/WorkOrderDialog'
+import WorkOrderDialog from '@/views/wms/product_manage/sch/point/WorkOrderDialog'
 
 const defaultForm = {
   point_id: null,

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

@@ -1,3 +1,4 @@
+<!--suppress ALL -->
 <template>
   <el-dialog
     :title="crud.status.title"
@@ -180,7 +181,7 @@
 
 <script>
 import CRUD, { crud, form } from '@crud/crud'
-import crudProductIn from '@/views/wms/st/productIn/productin'
+import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
 
 const defaultForm = {

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

@@ -1,3 +1,4 @@
+<!--suppress ALL -->
 <template>
   <el-dialog
     title="物料新增"
@@ -100,7 +101,7 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker/index'
-import crudProductIn from '@/views/wms/st/productIn/productin'
+import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin'
 
 const start = new Date()
 export default {

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

@@ -1,3 +1,4 @@
+<!--suppress ALL -->
 <template>
   <el-dialog
     append-to-body
@@ -201,7 +202,7 @@
 <script>
 import CRUD, { crud } from '@crud/crud'
 import StructDiv from '@/views/wms/pub/StructDialog'
-import crudProductIn from '@/views/wms/st/productIn/productin'
+import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin'
 import crudPoint from '@/api/wms/sch/point'
 import crudRegion from '@/api/wms/sch/region'
 

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

@@ -1,3 +1,4 @@
+<!--suppress ALL -->
 <template>
   <el-dialog
     append-to-body
@@ -149,7 +150,7 @@
 <script>
 
 import { crud } from '@crud/crud'
-import crudProductIn from '@/views/wms/st/productIn/productin'
+import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin'
 
 export default {
   name: 'ViewDialog',

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

@@ -1,3 +1,4 @@
+<!--suppress ALL -->
 <template>
   <div class="app-container">
     <!--工具栏-->
@@ -174,17 +175,17 @@
 </template>
 
 <script>
-import productIn from '@/views/wms/st/productIn/productin'
+import productIn from '@/views/wms/storage_manage/product/productIn/productin'
-import crudProductIn from '@/views/wms/st/productIn/productin'
+import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin'
 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 DateRangePicker from '@/components/DateRangePicker/index'
-import AddDialog from '@/views/wms/st/productIn/AddDialog'
+import AddDialog from '@/views/wms/storage_manage/product/productIn/AddDialog'
-import DivDialog from '@/views/wms/st/productIn/DivDialog'
+import DivDialog from '@/views/wms/storage_manage/product/productIn/DivDialog'
-import ViewDialog from '@/views/wms/st/productIn/ViewDialog'
+import ViewDialog from '@/views/wms/storage_manage/product/productIn/ViewDialog'
 import { mapGetters } from 'vuex'
 
 export default {

mes/qd/src/views/wms/storage_manage/product/productIn/productin.js

@@ -1,192 +1,192 @@
 import request from '@/utils/request'
 
 export function add(data) {
-    return request({
+  return request({
-        url: '/api/in/productIn',
+    url: '/api/in/productIn',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
 export function del(ids) {
-    return request({
+  return request({
-        url: '/api/in/productIn',
+    url: '/api/in/productIn',
-        method: 'delete',
+    method: 'delete',
-        data: ids
+    data: ids
-    })
+  })
 }
 
 export function edit(data) {
-    return request({
+  return request({
-        url: '/api/in/productIn',
+    url: '/api/in/productIn',
-        method: 'put',
+    method: 'put',
-        data
+    data
-    })
+  })
 }
 
 export function getType(params) {
-    return request({
+  return request({
-        url: '/api/in/productIn/getType',
+    url: '/api/in/productIn/getType',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
 
 export function getIODtl(data) {
-    return request({
+  return request({
-        url: '/api/in/productIn/getIODtl',
+    url: '/api/in/productIn/getIODtl',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
 export function insertDtl(data) {
-    return request({
+  return request({
-        url: '/api/in/productIn/insertDtl',
+    url: '/api/in/productIn/insertDtl',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
 export function commit(data) {
-    return request({
+  return request({
-        url: '/api/in/productIn/commit',
+    url: '/api/in/productIn/commit',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
 export function checkVehicle(data) {
-    return request({
+  return request({
-        url: '/api/in/productIn/checkVehicle',
+    url: '/api/in/productIn/checkVehicle',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
 export function confirmvehicle(data) {
-    return request({
+  return request({
-        url: '/api/in/productIn/confirmvehicle',
+    url: '/api/in/productIn/confirmvehicle',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
 export function getDisDtl(data) {
-    return request({
+  return request({
-        url: '/api/in/productIn/getDisDtl',
+    url: '/api/in/productIn/getDisDtl',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
 export function divStruct(data) {
-    return request({
+  return request({
-        url: '/api/in/productIn/divStruct',
+    url: '/api/in/productIn/divStruct',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
 export function unDivStruct(data) {
-    return request({
+  return request({
-        url: '/api/in/productIn/unDivStruct',
+    url: '/api/in/productIn/unDivStruct',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
 export function divPoint(data) {
-    return request({
+  return request({
-        url: '/api/in/productIn/divPoint',
+    url: '/api/in/productIn/divPoint',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
 export function bucketDtl(data) {
-    return request({
+  return request({
-        url: '/api/in/productIn/bucketDtl',
+    url: '/api/in/productIn/bucketDtl',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
 export function updateTask(data) {
-    return request({
+  return request({
-        url: '/api/in/productIn/updateTask',
+    url: '/api/in/productIn/updateTask',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
 export function confirmTask(data) {
-    return request({
+  return request({
-        url: '/api/in/productIn/confirmTask',
+    url: '/api/in/productIn/confirmTask',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
 export function confirm(data) {
-    return request({
+  return request({
-        url: '/api/in/productIn/confirm',
+    url: '/api/in/productIn/confirm',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
 export function delDis(data) {
-    return request({
+  return request({
-        url: '/api/in/productIn/delDis',
+    url: '/api/in/productIn/delDis',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
 export function queryBoxMater(data) {
-    return request({
+  return request({
-        url: '/api/in/productIn/queryBoxMater',
+    url: '/api/in/productIn/queryBoxMater',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
 export function queryStor() {
-    return request({
+  return request({
-        url: '/api/in/productIn/queryStor',
+    url: '/api/in/productIn/queryStor',
-        method: 'post'
+    method: 'post'
-    })
+  })
 }
 
 export function getDisTask(data) {
-    return request({
+  return request({
-        url: '/api/in/productIn/getDisTask',
+    url: '/api/in/productIn/getDisTask',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
 export default {
-    add,
+  add,
-    edit,
+  edit,
-    del,
+  del,
-    getType,
+  getType,
-    insertDtl,
+  insertDtl,
-    getIODtl,
+  getIODtl,
-    commit,
+  commit,
-    checkVehicle,
+  checkVehicle,
-    confirmvehicle,
+  confirmvehicle,
-    getDisDtl,
+  getDisDtl,
-    divStruct,
+  divStruct,
-    unDivStruct,
+  unDivStruct,
-    divPoint,
+  divPoint,
-    delDis,
+  delDis,
-    queryBoxMater,
+  queryBoxMater,
-    bucketDtl,
+  bucketDtl,
-    updateTask,
+  updateTask,
-    confirmTask,
+  confirmTask,
-    confirm,
+  confirm,
-    queryStor,
+  queryStor,
-    getDisTask
+  getDisTask
-}
+}

mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue

@@ -1,3 +1,4 @@
+<!--suppress ALL -->
 <template>
   <el-dialog
     title="出库单编辑"
@@ -183,10 +184,10 @@
 
 <script>
 import CRUD, { crud, form } from '@crud/crud'
-import AddDtl from '@/views/wms/st/productOut/AddDtl'
+import AddDtl from '@/views/wms/storage_manage/product/productOut/AddDtl'
 import MaterDialog from '@/views/wms/pub/MaterDialog'
-import productOut from '@/views/wms/st/productOut/productout'
+import productOut from '@/views/wms/storage_manage/product/productOut/productout'
-import crudProductIn from '@/views/wms/st/productIn/productin'
+import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin'
 
 const defaultForm = {
   bill_code: '',

mes/qd/src/views/wms/storage_manage/product/productOut/AddDtl.vue

@@ -1,3 +1,4 @@
+<!--suppress ALL -->
 <template>
   <el-dialog
     title="物料选择"

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

@@ -1,3 +1,4 @@
+<!--suppress ALL -->
 <template>
   <el-dialog
     append-to-body
@@ -243,8 +244,8 @@
 
 <script>
 import CRUD, { crud } from '@crud/crud'
-import productOut from '@/views/wms/st/productOut/productout'
+import productOut from '@/views/wms/storage_manage/product/productOut/productout'
-import StructIvt from '@/views/wms/st/productOut/StructIvt'
+import StructIvt from '@/views/wms/storage_manage/product/productOut/StructIvt'
 import crudRegion from '@/api/wms/sch/region'
 import crudPoint from '@/api/wms/sch/point'
 

mes/qd/src/views/wms/storage_manage/product/productOut/StructIvt.vue

@@ -1,3 +1,4 @@
+<!--suppress ALL -->
 <template>
   <el-dialog
     append-to-body
@@ -126,7 +127,7 @@
 
 import CRUD, { header } from '@crud/crud'
 // import crudSectattr from '@/views/wms/basedata/st/sect/sectattr'
-import productOut from '@/views/wms/st/productOut/productout'
+import productOut from '@/views/wms/storage_manage/product/productOut/productout'
 // import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {

mes/qd/src/views/wms/storage_manage/product/productOut/ViewDialog.vue

@@ -1,3 +1,4 @@
+<!--suppress ALL -->
 <template>
   <el-dialog
     append-to-body
@@ -150,8 +151,8 @@
 <script>
 
 import { crud } from '@crud/crud'
-import productOut from '@/views/wms/st/productOut/productout'
+import productOut from '@/views/wms/storage_manage/product/productOut/productout'
-import crudProductIn from '@/views/wms/st/productIn/productin'
+import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin'
 
 export default {
   name: 'ViewDialog',

mes/qd/src/views/wms/storage_manage/product/productOut/index.vue

@@ -1,3 +1,4 @@
+<!--suppress ALL -->
 <template>
   <div class="app-container">
     <!--工具栏-->
@@ -169,16 +170,16 @@
 </template>
 
 <script>
-import productOut from '@/views/wms/st/productOut/productout'
+import productOut from '@/views/wms/storage_manage/product/productOut/productout'
 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 AddDialog from '@/views/wms/st/productOut/AddDialog'
+import AddDialog from '@/views/wms/storage_manage/product/productOut/AddDialog'
-import DivDialog from '@/views/wms/st/productOut/DivDialog'
+import DivDialog from '@/views/wms/storage_manage/product/productOut/DivDialog'
-import ViewDialog from '@/views/wms/st/productOut/ViewDialog'
+import ViewDialog from '@//views/wms/storage_manage/product/productOut/ViewDialog'
-import crudProductIn from '@/views/wms/st/productIn/productin'
+import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin'
 
 export default {
   name: 'ProductOut',

mes/qd/src/views/wms/storage_manage/product/productOut/productout.js

@@ -1,228 +1,228 @@
 import request from '@/utils/request'
 
 export function add(data) {
-    return request({
+  return request({
-        url: 'api/productOut',
+    url: 'api/productOut',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 
 export function del(ids) {
-    return request({
+  return request({
-        url: 'api/productOut/',
+    url: 'api/productOut/',
-        method: 'delete',
+    method: 'delete',
-        data: ids
+    data: ids
-    })
+  })
 }
 
 export function edit(data) {
-    return request({
+  return request({
-        url: 'api/productOut',
+    url: 'api/productOut',
-        method: 'put',
+    method: 'put',
-        data
+    data
-    })
+  })
 }
 
 export function getOutBillDtl(data) {
-    return request({
+  return request({
-        url: '/api/productOut/getOutBillDtl',
+    url: '/api/productOut/getOutBillDtl',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function getOutBillDis(data) {
-    return request({
+  return request({
-        url: '/api/productOut/getOutBillDis',
+    url: '/api/productOut/getOutBillDis',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function getOutBillDisDtl(params) {
-    return request({
+  return request({
-        url: '/api/productOut/getOutBillDisDtl',
+    url: '/api/productOut/getOutBillDisDtl',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
 export function getOutBillTask(params) {
-    return request({
+  return request({
-        url: '/api/productOut/getOutBillTask',
+    url: '/api/productOut/getOutBillTask',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
 export function getInvTypes() {
-    return request({
+  return request({
-        url: '/api/productOut/getInvTypes',
+    url: '/api/productOut/getInvTypes',
-        method: 'get'
+    method: 'get'
-    })
+  })
 }
 export function insertDtl(data) {
-    return request({
+  return request({
-        url: '/api/productOut/insertDtl',
+    url: '/api/productOut/insertDtl',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function allDiv(data) {
-    return request({
+  return request({
-        url: '/api/productOut/allDiv',
+    url: '/api/productOut/allDiv',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function allDivOne(data) {
-    return request({
+  return request({
-        url: '/api/productOut/allDivOne',
+    url: '/api/productOut/allDivOne',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function allCancel(data) {
-    return request({
+  return request({
-        url: '/api/productOut/allCancel',
+    url: '/api/productOut/allCancel',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function oneCancel(data) {
-    return request({
+  return request({
-        url: '/api/productOut/oneCancel',
+    url: '/api/productOut/oneCancel',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function setPoint(data) {
-    return request({
+  return request({
-        url: '/api/productOut/setPoint',
+    url: '/api/productOut/setPoint',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function oneSetPoint(data) {
-    return request({
+  return request({
-        url: '/api/productOut/oneSetPoint',
+    url: '/api/productOut/oneSetPoint',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function getStructIvt(params) {
-    return request({
+  return request({
-        url: '/api/productOut/getStructIvt',
+    url: '/api/productOut/getStructIvt',
-        method: 'get',
+    method: 'get',
-        params
+    params
-    })
+  })
 }
 export function manualDiv(data) {
-    return request({
+  return request({
-        url: '/api/productOut/manualDiv',
+    url: '/api/productOut/manualDiv',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function confirm(data) {
-    return request({
+  return request({
-        url: '/api/productOut/confirm',
+    url: '/api/productOut/confirm',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function issueTask(data) {
-    return request({
+  return request({
-        url: '/api/productOut/issueTask',
+    url: '/api/productOut/issueTask',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function finishTask(data) {
-    return request({
+  return request({
-        url: '/api/productOut/finishTask',
+    url: '/api/productOut/finishTask',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function cancleTaskfinish(data) {
-    return request({
+  return request({
-        url: '/api/productOut/cancleTaskfinish',
+    url: '/api/productOut/cancleTaskfinish',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function paramByCodeType(data) {
-    return request({
+  return request({
-        url: '/api/productOut/paramByCodeType',
+    url: '/api/productOut/paramByCodeType',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function schAreaType(data) {
-    return request({
+  return request({
-        url: '/api/productOut/schAreaType',
+    url: '/api/productOut/schAreaType',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function backConfirm(data) {
-    return request({
+  return request({
-        url: '/api/productOut/backConfirm',
+    url: '/api/productOut/backConfirm',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function getType() {
-    return request({
+  return request({
-        url: '/api/productOut/getType',
+    url: '/api/productOut/getType',
-        method: 'get'
+    method: 'get'
-    })
+  })
 }
 export function moneySubmit(data) {
-    return request({
+  return request({
-        url: '/api/productOut/moneySubmit',
+    url: '/api/productOut/moneySubmit',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function getDisNum(data) {
-    return request({
+  return request({
-        url: '/api/productOut/getDisNum',
+    url: '/api/productOut/getDisNum',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function queryBox(data) {
-    return request({
+  return request({
-        url: '/api/productOut/queryBox',
+    url: '/api/productOut/queryBox',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function getOutBillTask2(data) {
-    return request({
+  return request({
-        url: '/api/productOut/getOutBillTask2',
+    url: '/api/productOut/getOutBillTask2',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function cancelTask(data) {
-    return request({
+  return request({
-        url: '/api/productOut/cancelTask',
+    url: '/api/productOut/cancelTask',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function allSetPoint(data) {
-    return request({
+  return request({
-        url: '/api/productOut/allSetPoint',
+    url: '/api/productOut/allSetPoint',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
 export function oneSetPoint2(data) {
-    return request({
+  return request({
-        url: '/api/productOut/oneSetPoint2',
+    url: '/api/productOut/oneSetPoint2',
-        method: 'post',
+    method: 'post',
-        data
+    data
-    })
+  })
 }
-export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask, allSetPoint, oneSetPoint2 }
+export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask, allSetPoint, oneSetPoint2 }

mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/DivDialog.vue

@@ -14,9 +14,11 @@
         <span class="crud-opts-right2">
           <!--左侧插槽-->
           <slot name="left" />
-          <el-button slot="left" type="info" @click="dialogVisible = false"
+          <el-button
-            >关闭</el-button
+            slot="left"
-          >
+            type="info"
+            @click="dialogVisible = false"
+          >关闭</el-button>
         </span>
       </div>
     </span>
@@ -281,17 +283,17 @@
 </template>
 
 <script>
-import CRUD, { crud } from "@crud/crud";
+import CRUD, { crud } from '@crud/crud'
-import StructDiv from "@/views/wms/pub/StructDialog";
+import StructDiv from '@/views/wms/pub/StructDialog'
-import crudSemiProductIn from "@/api/wms/st/in/semiProductIn";
+import crudSemiProductIn from '@/api/wms/st/in/semiProductIn'
-import crudPoint from "@/api/wms/sch/point";
+import crudPoint from '@/api/wms/sch/point'
-import crudRegion from "@/api/wms/sch/region";
+import crudRegion from '@/api/wms/sch/region'
 
 export default {
-  name: "DivDialog",
+  name: 'DivDialog',
   components: { StructDiv },
   mixins: [crud()],
-  dicts: ["IO_BILL_STATUS"],
+  dicts: ['IO_BILL_STATUS'],
   props: {
     dialogShow: {
       type: Boolean,
@@ -303,7 +305,7 @@ export default {
     openParam: {
       type: Array,
       default: () => {
-        return [];
+        return []
       }
     },
     billType: {
@@ -318,8 +320,8 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      stor_id: "",
+      stor_id: '',
-      sect_id: "",
+      sect_id: '',
       sectProp: null,
       bucketProp: {},
       structShow: false,
@@ -331,9 +333,9 @@ export default {
       dis_row: null,
       form: {
         dtl_row: null,
-        storage_qty: "",
+        storage_qty: '',
-        sect_id: "",
+        sect_id: '',
-        stor_id: "",
+        stor_id: '',
         point_code: null,
         checked: true,
         tableMater: []
@@ -341,57 +343,57 @@ export default {
       storlist: [],
       pointlist: [],
       rules: {}
-    };
+    }
   },
   watch: {
     dialogShow: {
       handler(newValue, oldValue) {
-        this.dialogVisible = newValue;
+        this.dialogVisible = newValue
       }
     }
   },
   methods: {
     open() {
       crudRegion.getRegionSelect({ stor_id: this.storId }).then(res => {
-        this.sects = res.content;
+        this.sects = res.content
-      });
+      })
-      const area_type = "A1_RK01";
+      const area_type = 'A1_RK01'
       crudPoint.getPoint({ area_type: area_type }).then(res => {
-        this.pointlist = res;
+        this.pointlist = res
-      });
+      })
     },
     toDelete(data) {
-      data.pop = true;
+      data.pop = true
     },
     close() {
-      this.form.tableMater = [];
+      this.form.tableMater = []
-      this.form.dtl_row = null;
+      this.form.dtl_row = null
-      this.sectProp = null;
+      this.sectProp = null
-      this.$emit("update:dialogShow", false);
+      this.$emit('update:dialogShow', false)
-      this.$emit("AddChanged");
+      this.$emit('AddChanged')
-      this.crud.refresh();
+      this.crud.refresh()
-      this.$refs["form2"].resetFields();
+      this.$refs['form2'].resetFields()
     },
     clcikRow(row, column, event) {
-      this.form.dtl_row = row;
+      this.form.dtl_row = row
       crudSemiProductIn
         .getIODtl({ iostorinv_id: this.form.dtl_row.iostorinv_id })
         .then(res => {
-          this.openParam = res;
+          this.openParam = res
-          this.form.dtl_row = res[row.index];
+          this.form.dtl_row = res[row.index]
-        });
+        })
       crudSemiProductIn.getDisDtl(row).then(res => {
-        this.form.tableMater = res;
+        this.form.tableMater = res
-      });
+      })
     },
     clcikRowDis(row, column, event) {
-      this.dis_row = row;
+      this.dis_row = row
     },
     vehicleCheck() {
       if (!this.form.dtl_row) {
-        this.crud.notify("请选择一条入库明细", CRUD.NOTIFICATION_TYPE.INFO);
+        this.crud.notify('请选择一条入库明细', CRUD.NOTIFICATION_TYPE.INFO)
-        this.form.storagevehicle_code = "";
+        this.form.storagevehicle_code = ''
-        return;
+        return
       }
       crudSemiProductIn
         .checkVehicle({
@@ -401,49 +403,49 @@ export default {
         })
         .then(res => {})
         .catch(err => {
-          this.form.storagevehicle_code = "";
+          this.form.storagevehicle_code = ''
-        });
+        })
     },
     tableRowClassName({ row, rowIndex }) {
-      row.index = rowIndex;
+      row.index = rowIndex
     },
     insertvehicle() {
       if (!this.form.dtl_row) {
-        this.crud.notify("请选择一条入库明细", CRUD.NOTIFICATION_TYPE.INFO);
+        this.crud.notify('请选择一条入库明细', CRUD.NOTIFICATION_TYPE.INFO)
-        return;
+        return
       }
       if (!this.form.storagevehicle_code) {
-        this.crud.notify("请输入托盘号", CRUD.NOTIFICATION_TYPE.INFO);
+        this.crud.notify('请输入托盘号', CRUD.NOTIFICATION_TYPE.INFO)
-        return;
+        return
       }
       // 判断是否选择了桶号
       if (this.bucketObj) {
-        if (!(this.bucketObj.status === "01")) {
+        if (!(this.bucketObj.status === '01')) {
-          this.crud.notify("请校验桶状态！", CRUD.NOTIFICATION_TYPE.INFO);
+          this.crud.notify('请校验桶状态！', CRUD.NOTIFICATION_TYPE.INFO)
-          return;
+          return
         }
-        const dis_dtl = JSON.parse(JSON.stringify(this.bucketObj));
+        const dis_dtl = JSON.parse(JSON.stringify(this.bucketObj))
         // 判断选择的桶是否已经被选过
         const flag = this.form.tableMater.some(
           mater => mater.bucketunique === dis_dtl.bucketunique
-        );
+        )
         if (!flag) {
           const flag = this.form.tableMater.some(
             mater => mater.storagevehicle_code !== this.form.storagevehicle_code
-          );
+          )
           if (flag) {
-            this.crud.notify("存在不同载具号", CRUD.NOTIFICATION_TYPE.INFO);
+            this.crud.notify('存在不同载具号', CRUD.NOTIFICATION_TYPE.INFO)
-            return;
+            return
           }
-          dis_dtl.storagevehicle_code = this.form.storagevehicle_code;
+          dis_dtl.storagevehicle_code = this.form.storagevehicle_code
-          dis_dtl.pop = false;
+          dis_dtl.pop = false
-          this.form.tableMater.splice(this.form.tableMater.length, 0, dis_dtl);
+          this.form.tableMater.splice(this.form.tableMater.length, 0, dis_dtl)
           if (this.form.dtl_row.assign_qty) {
             this.form.dtl_row.assign_qty =
               parseFloat(this.form.dtl_row.assign_qty) +
-              parseFloat(this.form.storage_qty);
+              parseFloat(this.form.storage_qty)
           } else {
-            this.form.dtl_row.assign_qty = parseFloat(this.form.storage_qty);
+            this.form.dtl_row.assign_qty = parseFloat(this.form.storage_qty)
           }
           if (
             parseFloat(this.form.dtl_row.unassign_qty) -
@@ -452,108 +454,108 @@ export default {
           ) {
             this.form.dtl_row.unassign_qty =
               parseFloat(this.form.dtl_row.unassign_qty) -
-              parseFloat(this.form.storage_qty);
+              parseFloat(this.form.storage_qty)
           } else {
-            this.form.dtl_row.unassign_qty = 0;
+            this.form.dtl_row.unassign_qty = 0
           }
-          this.openParam.splice(this.form.dtl_row.index, 1, this.form.dtl_row);
+          this.openParam.splice(this.form.dtl_row.index, 1, this.form.dtl_row)
         }
         if (flag) {
-          this.crud.notify("该桶已被加入明细中", CRUD.NOTIFICATION_TYPE.INFO);
+          this.crud.notify('该桶已被加入明细中', CRUD.NOTIFICATION_TYPE.INFO)
         }
       } else {
-        this.crud.notify("请选择桶号", CRUD.NOTIFICATION_TYPE.INFO);
+        this.crud.notify('请选择桶号', CRUD.NOTIFICATION_TYPE.INFO)
-        return;
+        return
       }
     },
     confirmvehicle() {
       if (this.dis_row === null) {
-        this.crud.notify("请先选择一条分配明细！", CRUD.NOTIFICATION_TYPE.INFO);
+        this.crud.notify('请先选择一条分配明细！', CRUD.NOTIFICATION_TYPE.INFO)
-        return;
+        return
       }
-      if (this.dis_row.storagevehicle_code === "") {
+      if (this.dis_row.storagevehicle_code === '') {
-        this.crud.notify("载具号不能为空", CRUD.NOTIFICATION_TYPE.INFO);
+        this.crud.notify('载具号不能为空', CRUD.NOTIFICATION_TYPE.INFO)
-        return;
+        return
       }
       crudSemiProductIn.confirmvehicle(this.dis_row).then(res => {
         crudSemiProductIn
           .getIODtl({ iostorinv_id: this.form.dtl_row.iostorinv_id })
           .then(res => {
-            this.openParam = res;
+            this.openParam = res
-          });
+          })
         crudSemiProductIn.getDisDtl(this.form.dtl_row).then(res => {
-          this.form.tableMater = res;
+          this.form.tableMater = res
-          this.crud.notify("组盘成功！", CRUD.NOTIFICATION_TYPE.SUCCESS);
+          this.crud.notify('组盘成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        });
+        })
-      });
+      })
     },
     sectQueryChange(val) {
-      this.sectProp = val;
+      this.sectProp = val
       if (val.length === 1) {
-        this.stor_id = val[0];
+        this.stor_id = val[0]
-        this.sect_id = "";
+        this.sect_id = ''
       }
       if (val.length === 0) {
-        this.sect_id = "";
+        this.sect_id = ''
-        this.stor_id = "";
+        this.stor_id = ''
       }
       if (val.length === 2) {
-        this.stor_id = val[0];
+        this.stor_id = val[0]
-        this.sect_id = val[1];
+        this.sect_id = val[1]
       }
     },
     tableChanged(row) {
-      this.sect_id = this.form.sect_id;
+      this.sect_id = this.form.sect_id
-      this.form.stor_id = this.stor_id;
+      this.form.stor_id = this.stor_id
       // 新增一行物料时，给行进行赋值
       for (let i = 0; i < this.form.tableMater.length; i++) {
-        this.form.tableMater[i].struct_id = row.point_id;
+        this.form.tableMater[i].struct_id = row.point_id
-        this.form.tableMater[i].struct_code = row.point_code;
+        this.form.tableMater[i].struct_code = row.point_code
-        this.form.tableMater[i].struct_name = row.point_name;
+        this.form.tableMater[i].struct_name = row.point_name
-        this.form.tableMater[i].region_code = row.region_code;
+        this.form.tableMater[i].region_code = row.region_code
-        this.form.tableMater[i].region_name = row.region_name;
+        this.form.tableMater[i].region_name = row.region_name
-        this.form.tableMater.splice(i, 1, this.form.tableMater[i]); // 通过splice 替换数据 触发视图更新
+        this.form.tableMater.splice(i, 1, this.form.tableMater[i]) // 通过splice 替换数据 触发视图更新
       }
       crudSemiProductIn.divStruct(this.form).then(res => {
         crudSemiProductIn
           .getIODtl({
             iostorinv_id: this.form.dtl_row.iostorinv_id,
-            open_flag: "1"
+            open_flag: '1'
           })
           .then(res => {
-            this.openParam = res;
+            this.openParam = res
-          });
+          })
-        this.form.tableMater = [];
+        this.form.tableMater = []
-      });
+      })
     },
     divPoint() {
       if (!this.form.point_code) {
-        this.crud.notify("请选择入库点", CRUD.NOTIFICATION_TYPE.INFO);
+        this.crud.notify('请选择入库点', CRUD.NOTIFICATION_TYPE.INFO)
-        return;
+        return
       }
       if (this.form.tableMater.length === 0) {
-        this.crud.notify("请先选择一条明细！", CRUD.NOTIFICATION_TYPE.INFO);
+        this.crud.notify('请先选择一条明细！', CRUD.NOTIFICATION_TYPE.INFO)
-        return;
+        return
       }
       crudSemiProductIn.divPoint(this.form).then(res => {
         crudSemiProductIn
           .getIODtl({
             iostorinv_id: this.form.dtl_row.iostorinv_id,
-            open_flag: "1"
+            open_flag: '1'
           })
           .then(res => {
-            this.openParam = res;
+            this.openParam = res
-          });
+          })
         crudSemiProductIn.getDisDtl(this.form.dtl_row).then(res => {
-          this.form.tableMater = res;
+          this.form.tableMater = res
-          this.crud.notify("设置起点成功！", CRUD.NOTIFICATION_TYPE.SUCCESS);
+          this.crud.notify('设置起点成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        });
+        })
-      });
+      })
     },
     divStruct() {
       if (this.dis_row === null) {
-        this.crud.notify("请先选择一条分配明细！", CRUD.NOTIFICATION_TYPE.INFO);
+        this.crud.notify('请先选择一条分配明细！', CRUD.NOTIFICATION_TYPE.INFO)
-        return;
+        return
       }
       // 如果勾选了，直接跳后台
       if (this.form.checked) {
@@ -561,65 +563,65 @@ export default {
           this.crud.notify('请先选择区域！', CRUD.NOTIFICATION_TYPE.INFO)
           return
         }
-        this.divBtn = true;
+        this.divBtn = true
-        this.form.stor_id = this.stor_id;
+        this.form.stor_id = this.stor_id
-        this.form.is_pc = "1";
+        this.form.is_pc = '1'
         crudSemiProductIn
           .divStruct(this.form)
           .then(res => {
             crudSemiProductIn
               .getIODtl({
                 iostorinv_id: this.form.dtl_row.iostorinv_id,
-                open_flag: "1"
+                open_flag: '1'
               })
               .then(res => {
-                this.openParam = res;
+                this.openParam = res
-              });
+              })
             crudSemiProductIn.getDisDtl(this.form.dtl_row).then(res => {
-              this.form.tableMater = res;
+              this.form.tableMater = res
-              this.divBtn = false;
+              this.divBtn = false
               this.crud.notify(
-                "分配货位成功！",
+                '分配货位成功！',
                 CRUD.NOTIFICATION_TYPE.SUCCESS
-              );
+              )
-            });
+            })
           })
           .finally(() => {
-            this.divBtn = false;
+            this.divBtn = false
-          });
+          })
       } else {
-        this.structShow = true;
+        this.structShow = true
-        this.$refs.child.getMsg(false);
+        this.$refs.child.getMsg(false)
       }
     },
     unDivStruct() {
       if (this.form.tableMater.length <= 0) {
-        this.crud.notify("不存在载具明细！", CRUD.NOTIFICATION_TYPE.INFO);
+        this.crud.notify('不存在载具明细！', CRUD.NOTIFICATION_TYPE.INFO)
-        return;
+        return
       }
-      const flag = this.form.tableMater.some(mater => !mater.struct_code);
+      const flag = this.form.tableMater.some(mater => !mater.struct_code)
       if (flag) {
-        this.crud.notify("明细存在未分配货位！", CRUD.NOTIFICATION_TYPE.INFO);
+        this.crud.notify('明细存在未分配货位！', CRUD.NOTIFICATION_TYPE.INFO)
-        return;
+        return
       }
       // 如果勾选了，直接跳后台
       crudSemiProductIn.unDivStruct(this.form).then(res => {
         crudSemiProductIn
           .getIODtl({
             iostorinv_id: this.form.dtl_row.iostorinv_id,
-            open_flag: "1"
+            open_flag: '1'
           })
           .then(res => {
-            this.openParam = res;
+            this.openParam = res
-          });
+          })
         crudSemiProductIn.getDisDtl(this.form.dtl_row).then(res => {
-          this.form.tableMater = res;
+          this.form.tableMater = res
-          this.crud.notify("取消分配成功！", CRUD.NOTIFICATION_TYPE.SUCCESS);
+          this.crud.notify('取消分配成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        });
+        })
-      });
+      })
     }
   }
-};
+}
 </script>
 
 <style>

mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/index.vue

@@ -182,9 +182,9 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker/index'
-import AddDialog from '@/views/wms/st/semiProductIn/AddDialog'
+import AddDialog from '@/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog'
-import DivDialog from '@/views/wms/st/semiProductIn/DivDialog'
+import DivDialog from '@/views/wms/storage_manage/semiproduct/semiProductIn/DivDialog'
-import ViewDialog from '@/views/wms/st/semiProductIn/ViewDialog'
+import ViewDialog from '@/views/wms/storage_manage/semiproduct/semiProductIn/ViewDialog'
 import { mapGetters } from 'vuex'
 
 export default {

mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/AddDialog.vue

@@ -183,7 +183,7 @@
 
 <script>
 import CRUD, { crud, form } from '@crud/crud'
-import AddDtl from '@/views/wms/st/semiProductOut/AddDtl'
+import AddDtl from '@/views/wms/storage_manage/semiproduct/semiProductOut/AddDtl'
 import MaterDialog from '@/views/wms/pub/MaterDialog'
 import crudSemiProductIn from '@/api/wms/st/out/semiProductOut'
 const defaultForm = {

mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/DivDialog.vue

@@ -244,7 +244,7 @@
 <script>
 import CRUD, { crud } from '@crud/crud'
 import semiProductOut from '@/api/wms/st/out/semiProductOut'
-import StructIvt from '@/views/wms/st/semiProductOut/StructIvt'
+import StructIvt from '@/views/wms/storage_manage/semiproduct/semiProductOut/StructIvt'
 import crudRegion from '@/api/wms/sch/region'
 import crudPoint from '@/api/wms/sch/point'
 

mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/StructIvt.vue

@@ -126,7 +126,7 @@
 
 import CRUD, { header } from '@crud/crud'
 // import crudSectattr from '@/views/wms/basedata/st/sect/sectattr'
-import productOut from '@/views/wms/st/productOut/productout'
+import productOut from '@/views/wms/storage_manage/product/productOut/productout'
 // import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {

mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/index.vue

@@ -175,9 +175,9 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import AddDialog from '@/views/wms/st/semiProductOut/AddDialog'
+import AddDialog from '@/views/wms/storage_manage/semiproduct/semiProductOut/AddDialog'
-import DivDialog from '@/views/wms/st/semiProductOut/DivDialog'
+import DivDialog from '@/views/wms/storage_manage/semiproduct/semiProductOut/DivDialog'
-import ViewDialog from '@/views/wms/st/semiProductOut/ViewDialog'
+import ViewDialog from '@/views/wms/storage_manage/semiproduct/semiProductOut/ViewDialog'
 import crudSemiProductIn from '@/api/wms/st/in/semiProductIn'
 
 export default {