diff --git a/klp-ui/src/views/wms/coil/abnormalCoil.vue b/klp-ui/src/views/wms/coil/abnormalCoil.vue index ebee8307..ba06d96b 100644 --- a/klp-ui/src/views/wms/coil/abnormalCoil.vue +++ b/klp-ui/src/views/wms/coil/abnormalCoil.vue @@ -50,45 +50,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -133,6 +98,7 @@ import CoilSelector from '@/components/CoilSelector' import CoilNo from '@/components/KLPService/Renderer/CoilNo' import CoilList from "./components/CoilList.vue"; import AbnormalForm from './components/AbnormalForm'; +import AbnormalTable from './components/AbnormalTable'; export default { name: "CoilAbnormal", @@ -141,7 +107,8 @@ export default { CoilSelector, CoilNo, CoilList, - AbnormalForm + AbnormalForm, + AbnormalTable }, data() { return { diff --git a/klp-ui/src/views/wms/coil/abnormalDetail.vue b/klp-ui/src/views/wms/coil/abnormalDetail.vue index 7ce4527e..a8b28af3 100644 --- a/klp-ui/src/views/wms/coil/abnormalDetail.vue +++ b/klp-ui/src/views/wms/coil/abnormalDetail.vue @@ -29,78 +29,16 @@ 新增 - - 修改 - - - 删除 - 导出 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -121,6 +59,7 @@ import { listCoilAbnormal, getCoilAbnormal, delCoilAbnormal, addCoilAbnormal, up import CoilSelector from '@/components/CoilSelector' import CoilNo from '@/components/KLPService/Renderer/CoilNo' import AbnormalForm from './components/AbnormalForm' +import AbnormalTable from './components/AbnormalTable' export default { name: "CoilAbnormal", @@ -128,7 +67,8 @@ export default { components: { CoilSelector, CoilNo, - AbnormalForm + AbnormalForm, + AbnormalTable }, data() { return { diff --git a/klp-ui/src/views/wms/coil/components/AbnormalTable.vue b/klp-ui/src/views/wms/coil/components/AbnormalTable.vue new file mode 100644 index 00000000..a674d38e --- /dev/null +++ b/klp-ui/src/views/wms/coil/components/AbnormalTable.vue @@ -0,0 +1,82 @@ + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/panels/abnormal.vue b/klp-ui/src/views/wms/coil/panels/abnormal.vue index 938aeaa8..bcae9fd4 100644 --- a/klp-ui/src/views/wms/coil/panels/abnormal.vue +++ b/klp-ui/src/views/wms/coil/panels/abnormal.vue @@ -26,39 +26,10 @@ - - - - - - - - - - - - - - - - - - - - - + + @@ -123,12 +94,14 @@ import { listCoilAbnormal, getCoilAbnormal, delCoilAbnormal, addCoilAbnormal, updateCoilAbnormal } from "@/api/wms/coilAbnormal"; import { getMaterialCoil } from '@/api/wms/coil' import AbnormalForm from '../components/AbnormalForm'; +import AbnormalTable from '../components/AbnormalTable'; export default { name: "CoilAbnormal", dicts: ['coil_abnormal_code', 'coil_abnormal_position', 'coil_abnormal_degree'], components: { - AbnormalForm + AbnormalForm, + AbnormalTable, }, data() { return { diff --git a/klp-ui/src/views/wms/report/components/coilTable/index.vue b/klp-ui/src/views/wms/report/components/coilTable/index.vue index 337ba1a4..59cd8e94 100644 --- a/klp-ui/src/views/wms/report/components/coilTable/index.vue +++ b/klp-ui/src/views/wms/report/components/coilTable/index.vue @@ -61,31 +61,9 @@ - - - - - - - - - - - - - - - - - - + + @@ -96,6 +74,7 @@ import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo"; import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue"; import { listCoilAbnormal } from '@/api/wms/coilAbnormal' +import AbnormalTable from '@/views/wms/coil/components/AbnormalTable.vue' export default { name: 'CoilTable', @@ -103,6 +82,7 @@ export default { ProductInfo, RawMaterialInfo, CoilNo, + AbnormalTable, }, props: { columns: {