diff --git a/src/views/biz/DrugTraceQuery.vue b/src/views/biz/DrugTraceQuery.vue index e5bec711..5ef143d4 100644 --- a/src/views/biz/DrugTraceQuery.vue +++ b/src/views/biz/DrugTraceQuery.vue @@ -55,7 +55,7 @@ 追溯记录 + style="width: 100%" @row-click="handleRowClick"> @@ -78,11 +78,14 @@
流通流程
- - - - + + + + + + + + @@ -196,7 +199,12 @@ export default { billNo: "", busTypeName:"", createTime:"" - } + }, + stepData:{ + oneCreateTime: "", + createTime: "", + finishTime:"", + }, } }, beforeCreate() { @@ -270,6 +278,12 @@ export default { response.data.list.forEach(item => { this.orderRecords.push(item.order); }) + if (this.orderRecords.length > 0){ + this.stepData.oneCreateTime = "单据创建时间:" + this.orderRecords[0].billTime + this.stepData.createTime = "单据处理时间:" + this.orderRecords[0].createTime + this.stepData.finishTime = "单据完成时间:" + this.orderRecords[0].updateTime + } + // orderRecords // this.currentOrder } else { @@ -310,7 +324,11 @@ export default { this.orderDetails = [] }) }, - + handleRowClick(row, column, event){ + this.stepData.oneCreateTime = "单据创建时间:" + row.billTime + this.stepData.createTime = "单据处理时间:" + row.createTime + this.stepData.finishTime = "单据完成时间:" + row.updateTime + }, // 重置表单 resetForm() { this.filterQuery = { @@ -715,6 +733,10 @@ export default { .pulse-icon { animation: pulse 2s infinite; } +/* 去掉步骤条的中间线条 */ +.custom-steps .el-step__line { + display: none; /* 隐藏线条 */ +} @keyframes pulse { 0% { @@ -812,6 +834,7 @@ export default { padding: 40px 0; } + /* 响应式调整 */ @media screen and (max-width: 768px) { .app-container { diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue index f55bf0a5..97fcb577 100644 --- a/src/views/collect/CollectOrderTabs.vue +++ b/src/views/collect/CollectOrderTabs.vue @@ -1162,7 +1162,7 @@ export default { width: 80px; height: 40px; vertical-align: middle; - margin-left: 25px; + margin-left: 20px; } .context-menu { diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue index ba7a4632..9c7b811a 100644 --- a/src/views/collect/IoCreateOrder.vue +++ b/src/views/collect/IoCreateOrder.vue @@ -2625,14 +2625,16 @@ export default { window.removeEventListener('keydown', this.handleKeyboardShortcut); }, handleKeyboardShortcut(event) { - if (event.key === 'F9' || event.keyCode === 120) { // keyCode 120 是 F9 的键码 - event.preventDefault(); // 阻止默认行为 - this.submit() - } - if (event.key === 'F10' || event.keyCode === 121) { - event.preventDefault(); // 阻止默认行为（如果有的话） - // this.push(); - this.fastDelOrder() + if (this.orderFormData.billNo != null){ + if (event.key === 'F9' || event.keyCode === 120) { // keyCode 120 是 F9 的键码 + event.preventDefault(); // 阻止默认行为 + this.submit() + } + if (event.key === 'F10' || event.keyCode === 121) { + event.preventDefault(); // 阻止默认行为（如果有的话） + // this.push(); + this.fastDelOrder() + } } } }, diff --git a/src/views/collect/IosplitFifoStock.vue b/src/views/collect/IosplitFifoStock.vue index 8f0d4525..db07c11c 100644 --- a/src/views/collect/IosplitFifoStock.vue +++ b/src/views/collect/IosplitFifoStock.vue @@ -16,65 +16,54 @@ - -
-
- - - -
-

{{ item.productName }}

-
- {{ item.prepnSpec }} - {{ item.ggxh }} -
+ + + +
+ + + +
+

{{ item.productName }}

+
+ {{ item.prepnSpec }} + {{ item.ggxh }}
-
-
-
- 工位存量 - {{ item.workplaceStock }}/{{ item.workplaceTotal }} -
- +
+
+
+
+ 工位存量 + {{ item.workplaceStock }}/{{ item.workplaceTotal }}
-
-
- 拆零存量 - {{ item.splitStock }}/{{ item.splitTotal }} -
- + +
+
+
+ 拆零存量 + {{ item.splitStock }}/{{ item.splitTotal }}
+
- - - -
- - -
- - +
+ + + +
加载中...
+
没有更多数据了
-
+ +
@@ -87,25 +76,84 @@ export default { return { filterQuery: { page: 1, - limit: 10, + limit: 1000, cpmctymc:"" }, total: 0, + limit: 6, + loadLimit:3, + page: 1, // 当前页码 displayData: [], + displayedData:[], loading: false, + dataLoading: false, colorRanges: [ { min: 0, max: 20, color: '#F56C6C' }, // 红色 - 危险 { min: 20, max: 50, color: '#E6A23C' }, // 橙色 - 警告 { min: 50, max: 80, color: '#409EFF' }, // 蓝色 - 正常 { min: 80, max: 101, color: '#67C23A' } // 绿色 - 良好 - ] + ], + delay:1500, + timer: null, + fast: false, } }, + mounted() { + // this.loadInitialData(); + const scrollContainer = this.$refs.scrollContainer; + + scrollContainer.addEventListener("scroll", this.handleScroll); + this.startTimer() + }, + beforeDestroy(){ + const scrollContainer = this.$refs.scrollContainer; + + scrollContainer.removeEventListener("scroll", this.handleScroll); + this.clearTimer() + }, methods: { + loadInitialData() { + this.displayedData = this.displayData.slice(0, this.limit); + }, + handleScroll() { + // alert("jajajjaja") + const { scrollTop, clientHeight, scrollHeight } = this.$refs.scrollContainer; + const threshold = 10; // 阈值（距离底部10px时触发） + if (scrollTop + clientHeight >= scrollHeight - threshold) { + this.loadMoreData(); + } + // 检测是否滚动到底部 + // if ( + // window.innerHeight + document.documentElement.scrollTop >= + // document.documentElement.offsetHeight - 10 + // ) { + // this.loadMoreData(); + // } + }, + loadMoreData() { + if (this.dataLoading) return; // 如果正在加载，直接返回 + this.dataLoading = true; + setTimeout(() => { + // 计算下一页的数据范围 + const start = this.displayedData.length; + const end = start + this.loadLimit; // 每次加载3条数据 + + + // 加载更多数据 + const moreData = this.displayData.slice(start, end); + + if (moreData.length > 0) { + this.displayedData = [...this.displayedData, ...moreData]; + } + + this.dataLoading = false; // 关闭加载状态 + }, this.delay); // 延迟3秒后加载数据 + + }, onReset() { this.filterQuery = { page: 1, - limit: 10, + limit: 1000, cpmctymc:"" } this.getList(); @@ -124,7 +172,7 @@ export default { }, getList() { this.loading = true; - // 调用API获取数据 + // // 调用API获取数据 getStockList(this.filterQuery) .then(response => { if (response.code === 20000) { @@ -142,6 +190,7 @@ export default { splitTotal: item.maxDrugCount || 100 }; }); + this.loadInitialData() } else { this.$message.error(response.message || '获取数据失败'); this.displayData = []; @@ -177,6 +226,61 @@ export default { } return this.colorRanges[0].color; + }, + timeGetList() { + this.loading = true; + // // 调用API获取数据 + getStockList(this.filterQuery) + .then(response => { + if (response.code === 20000) { + // 处理返回的数据 + this.total = response.data.total || 0; + // 转换数据格式以适应展示需求 + this.displayData = (response.data.list || []).map(item => { + return { + productName: item.cpmctymc || '未知产品', + prepnSpec: item.prepnSpec , + ggxh: item.ggxh , + workplaceStock: item.remCount || 0, + workplaceTotal: item.maxDrugCount || 100, + splitStock: item.splitRemCount || 0, + splitTotal: item.maxDrugCount || 100 + }; + }); + } else { + this.$message.error(response.message || '获取数据失败'); + this.displayData = []; + this.total = 0; + } + this.loading = false; + }) + .catch(error => { + console.error('获取数据失败:', error); + this.$message.error('获取数据失败，请稍后重试'); + this.displayData = []; + this.total = 0; + this.loading = false; + }); + }, + startTimer() { + // 使用箭头函数保持正确的 this 指向 + this.timer = setInterval(() => { + this.timeGetList() + }, 5000) // 2分钟 = 120秒 * 1000毫秒 + }, + clearTimer() { + if (this.timer) { + clearInterval(this.timer) + this.timer = null + } + }, + }, + computed: { + noMore () { + return this.count >= 21 + }, + disabled () { + return this.loading || this.noMore } }, created() { @@ -187,7 +291,7 @@ export default {