diff --git a/klp-ui/src/components/DragResizeBox/index.vue b/klp-ui/src/components/DragResizeBox/index.vue
index c57eb104..002df37d 100644
--- a/klp-ui/src/components/DragResizeBox/index.vue
+++ b/klp-ui/src/components/DragResizeBox/index.vue
@@ -254,7 +254,7 @@ export default {
/* 容器样式:改为全屏且无视觉样式 */
.drag-resize-container {
position: fixed; /* 固定定位覆盖整个屏幕 */
- top: 0;
+ top: 0;
left: 0;
width: 100vw;
height: 100vh;
@@ -271,7 +271,7 @@ export default {
box-sizing: border-box;
overflow: hidden;
pointer-events: auto; /* 元素本身响应鼠标事件 */
- z-index: 9999; /* 确保元素在最上层 */
+ z-index: 99999; /* 确保元素在最上层 */
background-color: #ffffff; /* 添加背景色,提升可视性 */
}
diff --git a/klp-ui/src/views/wms/coil/components/ProcessFlow.vue b/klp-ui/src/views/wms/coil/components/ProcessFlow.vue
new file mode 100644
index 00000000..af6b3d5a
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/components/ProcessFlow.vue
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 08547b9f..99b60b8b 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -48,6 +48,10 @@
+
+
+
+
搜索
重置
@@ -82,7 +86,8 @@
+ :floatLayerConfig="floatLayerConfig" @row-click="handleRowClick"
+ :height="showAbnormal ? 'calc(100vh - 400px)' : ''">
@@ -164,7 +169,7 @@
-
@@ -253,7 +258,7 @@
- {{ formatDuration(scope.row.productionDuration * 60 * 1000)}}
+ {{ formatDuration(scope.row.productionDuration * 60 * 1000) }}
@@ -425,11 +430,13 @@
label-width="100px">
{ productionTimeForm.productionStartTime = value; calculateProductionDuration(); }" />
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择生产时间"
+ @change="(value) => { productionTimeForm.productionStartTime = value; calculateProductionDuration(); }" />
{ productionTimeForm.productionEndTime = value; calculateProductionDuration(); }" />
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择生产时间"
+ @change="(value) => { productionTimeForm.productionEndTime = value; calculateProductionDuration(); }" />
@@ -442,14 +449,15 @@
-
-
-
-
-
+
+
+
+
@@ -492,7 +500,11 @@ import { PDFDocument } from 'pdf-lib';
import { listUser } from "@/api/system/user";
import AbnormalList from "./abnormal.vue";
import LogTable from "@/views/wms/warehouse/components/LogTable.vue";
-import { getCoilTagPrintType } from '@/views/wms/coil/js/coilPrint'
+import { getCoilTagPrintType } from '@/views/wms/coil/js/coilPrint';
+import DragResizeBox from '@/components/DragResizeBox/index.vue';
+import ProcessFlow from '../components/ProcessFlow.vue';
+
+
export default {
name: "MaterialCoil",
@@ -513,8 +525,10 @@ export default {
OuterTagPreview,
AbnormalList,
LogTable,
+ ProcessFlow,
+ DragResizeBox,
},
- dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer', 'coil_quality_status', 'warehouse_sync', 'coil_business_purpose'],
+ dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer', 'coil_quality_status', 'wms_next_warehouse', 'coil_business_purpose'],
props: {
qrcode: {
type: Boolean,
@@ -615,6 +629,7 @@ export default {
return {
// 按钮loading
buttonLoading: false,
+ showProcessFlow: false,
// 遮罩层
loading: true,
// 追溯加载中
@@ -821,6 +836,10 @@ export default {
this.currentCoilId = row.coilId;
this.logOpen = true;
},
+ // 处理大小变化事件
+ resizeChart() {
+ this.$refs.processFlow.resizeChart();
+ },
// 获取用户列表
getUserList() {
listUser({ pageNum: 1, pageSize: 1000 }).then(res => {
diff --git a/klp-ui/src/views/wms/coil/where.vue b/klp-ui/src/views/wms/coil/where.vue
index 5ccea778..412cce9a 100644
--- a/klp-ui/src/views/wms/coil/where.vue
+++ b/klp-ui/src/views/wms/coil/where.vue
@@ -34,7 +34,7 @@ export default {
labelType: '2',
hideType: false,
showControl: false,
- showAbnormal: true,
+ showAbnormal: false,
}
}
}