From ad791023208b674f1800d8a2dd2a375118cee8ce Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 10 Apr 2026 13:41:32 +0800 Subject: [PATCH 01/11] =?UTF-8?q?fix:=E7=A6=85=E9=81=93=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/bxerp/workHoursJJ.vue | 397 ++++++++++++++++++ src/views/statistics/bxerp/workHoursNZ.vue | 30 +- src/views/statistics/bxerp/workHoursRY_NZ.vue | 2 + 3 files changed, 403 insertions(+), 26 deletions(-) create mode 100644 src/views/statistics/bxerp/workHoursJJ.vue diff --git a/src/views/statistics/bxerp/workHoursJJ.vue b/src/views/statistics/bxerp/workHoursJJ.vue new file mode 100644 index 00000000..1ad69b03 --- /dev/null +++ b/src/views/statistics/bxerp/workHoursJJ.vue @@ -0,0 +1,397 @@ + + + diff --git a/src/views/statistics/bxerp/workHoursNZ.vue b/src/views/statistics/bxerp/workHoursNZ.vue index 8ee7b4f1..7830fec7 100644 --- a/src/views/statistics/bxerp/workHoursNZ.vue +++ b/src/views/statistics/bxerp/workHoursNZ.vue @@ -3,20 +3,6 @@
- - - - @@ -146,7 +132,7 @@ @@ -229,27 +215,18 @@ export default { showTable:false, userName:'', activeName: 'product', - query1:{ - number_contains:'', - time_gte:'', - time_lte:'', - }, - query2:{ - process_name:'压板出炉', - }, query:{ end_date:'', start_date:'', select_cols: "", mgroup_name: "扭转", - testmgroup_name: "扭后检测", + testmgroup_name: "毛坯检测", }, end_date:'', start_date:'', mgruops:[], tableData:[], detailRow:[], - processList:['装模','装炉','压板出炉','脱膜测量'], params:{cate:'热压'}, }; }, @@ -293,6 +270,7 @@ export default { } }) that.$nextTick(() => { + console.log('data',data); that.tableData = data; that.showTable=true; }) diff --git a/src/views/statistics/bxerp/workHoursRY_NZ.vue b/src/views/statistics/bxerp/workHoursRY_NZ.vue index 84c94341..c0f9e75d 100644 --- a/src/views/statistics/bxerp/workHoursRY_NZ.vue +++ b/src/views/statistics/bxerp/workHoursRY_NZ.vue @@ -269,6 +269,8 @@ stripe > + + From ae943f6b152b01e78a01fdb6587a05e187db111d Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 10 Apr 2026 16:02:40 +0800 Subject: [PATCH 02/11] =?UTF-8?q?fix:=E7=83=AD=E5=8E=8B=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=EF=BC=88=E6=89=AD=E8=BD=AC=EF=BC=89=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/bxerp/workHoursRY_NZ.vue | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/views/statistics/bxerp/workHoursRY_NZ.vue b/src/views/statistics/bxerp/workHoursRY_NZ.vue index c0f9e75d..45343b3a 100644 --- a/src/views/statistics/bxerp/workHoursRY_NZ.vue +++ b/src/views/statistics/bxerp/workHoursRY_NZ.vue @@ -88,13 +88,13 @@ @@ -161,13 +161,13 @@ @@ -230,13 +230,13 @@ @@ -299,13 +299,13 @@ @@ -346,11 +346,6 @@ export default { showTable:false, userName:'', activeName: 'luhao', - query1:{ - number_contains:'', - time_gte:'', - time_lte:'', - }, query2:{ process_name:'压板出炉', }, @@ -377,7 +372,8 @@ export default { methods: { getData(){ let that = this; - let params = {},query ={testmgroup_name:'扭转'},biStr = ''; + // let params = {},query ={testmgroup_name:'扭转'},biStr = ''; + let params = {},query ={},biStr = ''; if(that.query.start_date==''||that.query.start_date==null){ that.query.start_date = query.start_date = that.start_date; }else{ @@ -390,6 +386,8 @@ export default { } if(that.activeName=='luhao'){ query.select_cols = that.query.select_cols; + query.mgroup_name = '装炉压板出炉'; + query.testmgroup_name = '扭后检测'; params.query = query; biStr = 'product_defect_equip_mpjc'; }else if(that.activeName=='muju'){ From d423cee74cdba8471d1eb98c1ef9fe398c813e64 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 13 Apr 2026 09:10:40 +0800 Subject: [PATCH 03/11] =?UTF-8?q?fix:=E7=A6=85=E9=81=93339?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/bxerp/fenjian.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/statistics/bxerp/fenjian.vue b/src/views/statistics/bxerp/fenjian.vue index c4de338f..b30df3f0 100644 --- a/src/views/statistics/bxerp/fenjian.vue +++ b/src/views/statistics/bxerp/fenjian.vue @@ -110,7 +110,13 @@ {{scope.row.data.分检_缺陷项_扭转角不合格?scope.row.data.分检_缺陷项_扭转角不合格:0}} - + + + + From f3ff8c5942b881adf49456cea83cc19956868aa5 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 13 Apr 2026 15:37:16 +0800 Subject: [PATCH 04/11] =?UTF-8?q?fix:=E7=A6=85=E9=81=93357=20=E6=B4=81?= =?UTF-8?q?=E5=87=80=E8=BD=A6=E9=97=B4=EF=BC=88=E6=B4=97=EF=BC=89=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/bxerp/jiejingdept.vue | 591 +++++++++++++++++----- 1 file changed, 457 insertions(+), 134 deletions(-) diff --git a/src/views/bigScreen/bxerp/jiejingdept.vue b/src/views/bigScreen/bxerp/jiejingdept.vue index 4e6ceca1..a0aea3f0 100644 --- a/src/views/bigScreen/bxerp/jiejingdept.vue +++ b/src/views/bigScreen/bxerp/jiejingdept.vue @@ -5,80 +5,16 @@
{{ currentDay }} {{ currentTime }}
- - - -
本月产量
-
123
- - - - -
今日产量
-
123
- - - - -
今日工序报工量
-
123
- - - - -
在产产品数
-
123
- - - - -
本月完工工单
-
123
- - - - -
本月计划产量
-
123
- - - - -
本月产量
-
123
- - - - -
本月产量
-
123
- - -
- - - -
在制工序数
-
123
- - - - -
今日完成工序
-
123
- - - -
+
车间各工段生产产品数
-
+
产品占比
@@ -87,6 +23,32 @@
+ + + +
今日工序报工量
+
123
+ + + + +
在产产品数
+
123
+ + + + +
本月完工工单
+
123
+ + + + +
本月计划产量
+
123
+ + +
@@ -94,38 +56,80 @@
-
+
-
设备列表
- +
+
+
+ + ⚡ + 拉丝设备集群 · 实时状态 +
+
在线 {{ onlineCount }}/{{ equipmentList.length }}
+
+
+
+
{{ item.name }}
+
+ + + {{ item.running_state_text }} + +
+
{{ item.isRunning ? item.number : '待机中' }}
+
+
+
+ + 运行中 · {{ onlineCount }}台 + + + 停机/维护 · {{ equipmentList.length - onlineCount }}台 + + ⏱ last update: {{ lastUpdateText }} +
+
- - - -
在制工单数
-
123
- - - - -
本月交付数
-
123
- - - -
+
-
每个人日产量
- - +
+
+
+ + 👥 + 人员日产量 TOP5 +
+
单位: 件
+
+
+
+
{{ item.操作人 ? item.操作人.charAt(0) : '?' }}
+
{{ item.操作人 }}
+
+ {{ item.生产数 }} + 件 +
+
+
+
+ 平均效率 {{ avgEfficiency }}% + ⚡ + 标兵: {{ topPerson }} +
+
-
+
车间整体产品统计
@@ -414,22 +418,12 @@ export default { header: ['任务编号', '产出产品', '任务量', '合格数'], data: [] }, - config_middle_bottom:{ - rowNum:10, - headerBGC: 'rgba(0,0,0,0)', - oddRowBGC: 'rgba(0,0,0,0)', - evenRowBGC: 'rgba(0,0,0,0)', - header: ['设备名称','设备位号','设备状态','运行状态','所在工段'], - data: [] - }, - config_right_top:{ - rowNum:10, - headerBGC: 'rgba(47,102,107,.34)', - oddRowBGC: 'rgba(0,0,0,0)', - evenRowBGC: 'rgba(0,0,0,0)', - header: ['工段','姓名','生产数','合格数','不合格数'], - data: [] - }, + equipmentList: [], + lastUpdateSeconds: 0, + lastUpdateInterval: null, + scrollTimer: null, + performanceList: [], + perfScrollTimer: null, currentTime: "", currentDay: "", today: "", @@ -439,6 +433,43 @@ export default { mgroups:['洗棒','捆棒','拉单丝','捆一次棒','一次复丝','捆二次棒','二次复丝'], }; }, + computed: { + onlineCount() { + return this.equipmentList.filter(e => e.isRunning).length; + }, + lastUpdateText() { + return this.lastUpdateSeconds > 0 ? `${this.lastUpdateSeconds}s前` : '刚刚'; + }, + // 渲染两份，用于无缝滚动 + scrollItems() { + if (this.equipmentList.length === 0) return []; + return [...this.equipmentList, ...this.equipmentList]; + }, + // 全员按生产数降序排列 + sortedPerfList() { + return [...this.performanceList] + .sort((a, b) => Number(b.生产数) - Number(a.生产数)); + }, + // 渲染两份，用于无缝滚动 + scrollPerfItems() { + if (!this.sortedPerfList.length) return []; + return [...this.sortedPerfList, ...this.sortedPerfList]; + }, + // 平均效率 = 合格数之和 / 生产数之和 + avgEfficiency() { + if (!this.performanceList.length) return 0; + const totalProd = this.performanceList.reduce((s, i) => s + Number(i.生产数 || 0), 0); + const totalOk = this.performanceList.reduce((s, i) => s + Number(i.合格数 || 0), 0); + if (!totalProd) return 0; + return Math.round(totalOk / totalProd * 100); + }, + // 标兵 = 生产数最多的人 + topPerson() { + if (!this.performanceList.length) return '-'; + return [...this.performanceList] + .sort((a, b) => Number(b.生产数) - Number(a.生产数))[0]?.操作人 || '-'; + }, + }, mounted() { let that = this; //洗棒、捆棒、拉丝 ：洗棒、捆棒、拉单丝、捆一次棒、一次复丝、捆二次棒、二次复丝 @@ -447,6 +478,7 @@ export default { this.showTime(); }, 1000); that.mgroupsforEach(); + that.getEquipment(); that.getMgroups(); //每个人日生产量：个人绩效 that.getEveryoneCount(); @@ -505,7 +537,6 @@ export default { mgroupsforEach(){ let that = this; that.mgroups.forEach((item)=>{ - that.getEquipment(item); that.getMtask1(item); }) }, @@ -546,46 +577,78 @@ export default { //车间设备列表 getEquipment() { let that = this; - let params = {page: 0, belong_dept__name:'拉丝排板班组', - // query: " { id, name, number, model, state ,mgroup_name }" - }; - that.config_middle_bottom.data = []; + let params = { page: 0, belong_dept__name: '拉丝排板班组' }; + that.equipmentList = []; + clearInterval(that.lastUpdateInterval); + that.lastUpdateSeconds = 0; that.$API.em.equipment.list.req(params).then((res) => { - if(res.length>0){ + if (res.length > 0) { res.forEach((item) => { - let arr = []; - let state_ = that.state_[item.state]; - let running_state_ = runningStateEnum[item.running_state]?.text; - arr[0] = item.name; - arr[1] = item.number; - arr[2] = state_; - arr[3] = running_state_; - arr[4] = item.mgroup_name; - that.config_middle_bottom.data.push(arr); - }) + that.equipmentList.push({ + id: item.id, + name: item.name, + number: item.number, + running_state_text: runningStateEnum[item.running_state]?.text || '未知', + mgroup_name: item.mgroup_name, + isRunning: item.running_state == 10, + }); + }); } - }) + that.lastUpdateSeconds = 0; + that.lastUpdateInterval = setInterval(() => { + that.lastUpdateSeconds++; + }, 1000); + that.$nextTick(() => { that.startAutoScroll(); }); + }); + }, + startPerfScroll() { + const that = this; + clearInterval(this.perfScrollTimer); + this.$nextTick(() => { + const el = that.$refs.perfList; + if (!el) return; + const halfHeight = el.scrollHeight / 2; + if (halfHeight <= el.clientHeight + 1) return; + that.perfScrollTimer = setInterval(() => { + el.scrollTop += 1; + if (el.scrollTop >= halfHeight) { + el.scrollTop = 0; + } + }, 40); + }); + }, + startAutoScroll() { + const that = this; + clearInterval(this.scrollTimer); + this.$nextTick(() => { + const el = that.$refs.eqGrid; + if (!el) return; + // scrollItems 已是两倍，halfHeight 即一份的高度 + const halfHeight = el.scrollHeight / 2; + // 一份内容就能装下，无需滚动 + if (halfHeight <= el.clientHeight + 1) return; + that.scrollTimer = setInterval(() => { + el.scrollTop += 1; + // 滚完第一份时瞬间归零，视觉无缝 + if (el.scrollTop >= halfHeight) { + el.scrollTop = 0; + } + }, 40); + }); }, //每个人日产量 getEveryoneCount(){ let that = this; - that.config_right_top.data = []; + that.performanceList = []; let date = that.$TOOL.dateFormat(new Date(), "yyyy-MM-dd"); let params = { query: {start_date:date,end_date:date,dept_name:that.deptName}, }; this.$API.bi.dataset.exec.req("performance", params).then((res) => { - if(res.data2.ds0.length>0){ - res.data2.ds0.forEach((item)=>{ - let arr = []; - arr[0] = item.工段; - arr[1] = item.操作人; - arr[2] = item.生产数; - arr[3] = item.合格数; - arr[4] = item.不合格数; - that.config_right_top.data.push(arr); - }) + if(res.data2.ds0.length > 0){ + that.performanceList = res.data2.ds0; } + that.$nextTick(() => { that.startPerfScroll(); }); }); }, //车间整体产品统计 @@ -692,14 +755,14 @@ export default { } .leftChartBlock1{ width: 90%; - height: 28vh; + height: 43vh; z-index: 999; left: 5%; border-radius: 3vh; } .leftChartBlock2{ width:100%; - height: 28vh; + height: 35vh; } .middleTableBlock1{ width:94%; @@ -725,4 +788,264 @@ export default { font-weight: 600; border-bottom: 1px solid rgb(83 198 243); } + +/* ===== 设备卡片面板 ===== */ +.eq-panel { position: relative; } + +/* dv-border-box-1 内层弹性布局，严格撑满边框内部 */ +.eq-inner { + position: absolute; + inset: 2.5%; + display: flex; + flex-direction: column; + overflow: hidden; +} + +.eq-header { + flex-shrink: 0; + display: flex; + justify-content: space-between; + align-items: center; + padding: 0 1.2vh; + height: 4vh; + border-bottom: 1px solid rgba(83, 198, 243, 0.25); +} +.eq-title { + display: flex; + align-items: center; + gap: 0.4vh; + font-size: 1.5vh; + font-weight: 600; + color: #e0f4ff; +} +.eq-title-bar { + display: inline-block; + width: 3px; + height: 1.6vh; + background: #00b4ff; + border-radius: 2px; + margin-right: 2px; +} +.eq-title-icon { font-style: normal; color: #ff9d3e; font-size: 1.4vh; } +.eq-online-badge { font-size: 1.2vh; color: rgba(180, 230, 255, 0.7); } + +/* 卡片网格 — flex:1 填充剩余空间，overflow hidden 由 JS 控制滚动 */ +.eq-grid { + flex: 1; + display: grid; + grid-template-columns: repeat(3, 1fr); + align-content: start; + gap: 0.5vh; + padding: 0.5vh 0.8vh; + overflow: hidden; /* JS 滚动，隐藏滚动条 */ + overflow-y: hidden; +} + +.eq-card { + background: rgba(8, 25, 45, 0.85); + border-radius: 0.8vh; + border: 1px solid rgba(40, 80, 120, 0.5); + padding: 0.4vh 0.3vh; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + gap: 0.3vh; +} +.eq-card--run { + border-color: rgba(0, 200, 100, 0.35); + box-shadow: inset 0 0 8px rgba(0, 200, 100, 0.06); +} +.eq-card--stop { + border-color: rgba(80, 90, 110, 0.45); +} + +.eq-card-name { + font-size: 1.05vh; + color: rgba(180, 220, 255, 0.9); + background: rgba(0, 55, 100, 0.55); + padding: 0.1vh 0.6vh; + border-radius: 0.4vh; + border: 1px solid rgba(80, 160, 220, 0.3); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: 95%; +} +.eq-card-center { + display: flex; + align-items: center; + gap: 0.5vh; +} +.eq-card-state { + font-size: 1.5vh; + font-weight: bold; +} +.state-run { color: #00e676; } +.state-stop { color: #ff5252; } + +.eq-card-sub { + font-size: 0.9vh; + color: rgba(140, 195, 225, 0.55); +} + +/* 指示点 */ +.eq-dot { + display: inline-block; + border-radius: 50%; + flex-shrink: 0; + width: 1.1vh; + height: 1.1vh; +} +.eq-dot--green { + background: #00e676; + box-shadow: 0 0 5px #00e676, 0 0 12px rgba(0, 230, 118, 0.5); + animation: pulse-green 2s ease-in-out infinite; +} +.eq-dot--red { + background: #ff5252; + box-shadow: 0 0 5px #ff5252, 0 0 10px rgba(255, 82, 82, 0.45); +} +.eq-dot--sm { width: 0.8vh; height: 0.8vh; } + +@keyframes pulse-green { + 0%, 100% { box-shadow: 0 0 4px #00e676, 0 0 10px rgba(0,230,118,0.4); } + 50% { box-shadow: 0 0 8px #00e676, 0 0 18px rgba(0,230,118,0.75); } +} + +/* 底栏 */ +.eq-footer { + flex-shrink: 0; + display: flex; + align-items: center; + padding: 0 1.2vh; + height: 3.5vh; + border-top: 1px solid rgba(83, 198, 243, 0.2); + gap: 2vh; +} +.eq-foot-item { + display: flex; + align-items: center; + gap: 0.5vh; + font-size: 1.1vh; + color: rgba(180, 220, 255, 0.8); +} +.eq-foot-update { + margin-left: auto; + font-size: 1.05vh; + color: rgba(120, 175, 215, 0.55); +} + +/* ===== 人员日产量 TOP5 ===== */ +.perf-panel { position: relative; } + +.perf-inner { + position: absolute; + inset: 2.5%; + display: flex; + flex-direction: column; + overflow: hidden; +} + +.perf-header { + flex-shrink: 0; + display: flex; + justify-content: space-between; + align-items: center; + height: 4vh; + padding: 0 1vh; + border-bottom: 1px solid rgba(83, 198, 243, 0.2); +} +.perf-title { + display: flex; + align-items: center; + gap: 0.5vh; + font-size: 1.5vh; + font-weight: 600; + color: #e0f4ff; +} +.perf-title-bar { + display: inline-block; + width: 3px; + height: 1.8vh; + background: #00b4ff; + border-radius: 2px; +} +.perf-title-icon { font-style: normal; font-size: 1.4vh; } +.perf-unit { font-size: 1.2vh; color: rgba(180, 220, 255, 0.55); } + +/* 列表区 */ +.perf-list { + flex: 1; + overflow: hidden; /* JS 控制滚动，隐藏滚动条 */ + padding: 0 1vh; +} +.perf-row { + display: flex; + align-items: center; + gap: 1.2vh; + height: 5.2vh; /* 固定行高，保证无缝滚动节奏一致 */ + border-bottom: 1px solid rgba(83, 198, 243, 0.12); + flex-shrink: 0; +} + +/* 头像圆圈 */ +.perf-avatar { + flex-shrink: 0; + width: 3.6vh; + height: 3.6vh; + border-radius: 50%; + background: linear-gradient(135deg, #1a6fa8 0%, #0d4a7a 100%); + border: 1.5px solid rgba(100, 180, 255, 0.5); + display: flex; + align-items: center; + justify-content: center; + font-size: 1.5vh; + font-weight: 600; + color: #b8e0ff; +} + +.perf-name { + flex: 1; + font-size: 1.6vh; + color: rgba(210, 235, 255, 0.9); +} + +.perf-count { + display: flex; + align-items: baseline; + gap: 0.3vh; +} +.perf-num { + font-size: 2.4vh; + font-weight: 700; + color: #c8ff50; + font-family: "myfont", "Microsoft Yahei"; + letter-spacing: 1px; +} +.perf-unit-sm { + font-size: 1.1vh; + color: rgba(180, 220, 160, 0.7); +} + +/* 底部标兵栏 */ +.perf-footer { + flex-shrink: 0; + height: 4vh; + display: flex; + align-items: center; + justify-content: center; + gap: 0.6vh; + background: rgba(15, 40, 65, 0.8); + border-radius: 2vh; + font-size: 1.35vh; + color: rgba(200, 230, 255, 0.85); + border: 1px solid rgba(60, 120, 180, 0.3); + margin-top: 0.5vh; +} +.perf-lightning { + font-style: normal; + color: #ff9d3e; + font-size: 1.4vh; +} From b307103ba85b2644ba7b1a71d249348d1627390f Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 14 Apr 2026 16:59:31 +0800 Subject: [PATCH 05/11] =?UTF-8?q?fix:=E7=A6=85=E9=81=93338=E5=BE=85?= =?UTF-8?q?=E6=94=B9=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statistics/bxerp/zhongjian1Total.vue | 70 ++++++++++++++++++- 1 file changed, 68 insertions(+), 2 deletions(-) diff --git a/src/views/statistics/bxerp/zhongjian1Total.vue b/src/views/statistics/bxerp/zhongjian1Total.vue index 75c717a9..086adb24 100644 --- a/src/views/statistics/bxerp/zhongjian1Total.vue +++ b/src/views/statistics/bxerp/zhongjian1Total.vue @@ -41,6 +41,8 @@ :query="params" id="exportDiv" row-key="id" + :summary-method="getSummaries" + show-summary stripe > @@ -60,6 +62,11 @@ {{ scope.row.data.中检一_count_use }} + + + @@ -176,8 +172,10 @@ export default { paramsWm: { count__gte: 1, material__type: 10 }, nodes:[], edges:[], + tableData:[], queryWm: {}, wmtype:0, + totalCount:0, print_m:false, limitedWatch:false, materialsVisible:false, @@ -240,9 +238,32 @@ export default { }, mounted() { this.getWarehouse(); - // this.getProcessOptions() + this.getProductCount(); }, methods: { + getProductCount(){ + let that = this; + let query ={ + select_dept: "", + groupby_dept: "", + material_types: "10", + select_material: "material.name as material_name", + groupby_material: "material.name", + select_material_name: "", + groupby_material_name: "" + }; + that.$API.bi.dataset.exec.req("materialCount", {query:query }).then((res) => { + let data = that.tableData = res.data2.ds0; + let totalCount = 0; + data.forEach(item => { + totalCount += item.count; + }); + that.totalCount = totalCount; + if (res.echart_options) { + that.echartsOptions = JSON.parse(res.echart_options); + } + }) + }, getWarehouse() { this.$API.inm.warehouse.list.req({ page: 0 }).then((res) => { this.warehouseOptions = res; @@ -262,16 +283,8 @@ export default { resetQuery() { this.query = {}; }, - handleWatch(row) { - let that = this; - that.$API.wpm.batchlog.dag.req({batch:row.batch}).then((res) => { - that.nodes = res.nodes; - that.edges = res.edges; - that.limitedWatch = true; - that.$nextTick(() => { - that.$refs.degraDialogs.open(); - }); - }) + handleWatch() { + this.limitedWatch = true; }, //打签 printMaterial(row,type){ From 4c6a7fc2bcc4e5fed4e241bc06718e9df6c8ff18 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 15 Apr 2026 11:14:45 +0800 Subject: [PATCH 08/11] =?UTF-8?q?feat:=E7=A6=85=E9=81=93367?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/good.vue | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/views/inm/good.vue b/src/views/inm/good.vue index afecaaa6..bff04082 100644 --- a/src/views/inm/good.vue +++ b/src/views/inm/good.vue @@ -244,15 +244,11 @@ export default { getProductCount(){ let that = this; let query ={ - select_dept: "", - groupby_dept: "", material_types: "10", select_material: "material.name as material_name", - groupby_material: "material.name", - select_material_name: "", - groupby_material_name: "" + groupby_material: "material.name" }; - that.$API.bi.dataset.exec.req("materialCount", {query:query }).then((res) => { + that.$API.bi.dataset.exec.req("materialCount2", {query:query }).then((res) => { let data = that.tableData = res.data2.ds0; let totalCount = 0; data.forEach(item => { From 19f8accc8c684e3148f42c25e655bc5c140c661e Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 15 Apr 2026 13:50:32 +0800 Subject: [PATCH 09/11] =?UTF-8?q?fix:=E5=B7=A5=E8=89=BA=E6=AD=A5=E9=AA=A4?= =?UTF-8?q?=E4=B8=AD=E8=BE=93=E5=87=BA=E7=89=A9=E6=96=99=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=8E=9F=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mtm/route_form.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/mtm/route_form.vue b/src/views/mtm/route_form.vue index 370d7c6e..01279c9d 100644 --- a/src/views/mtm/route_form.vue +++ b/src/views/mtm/route_form.vue @@ -357,7 +357,7 @@ export default { }, apiObjM: this.$API.mtm.material.list, paramsMIn: { type__in: '10,20,30',ordering: '-create_time',query:'{full_name,id,is_hidden}'}, - paramsMOut: { type__in: '10,20',ordering: '-create_time',query:'{full_name,id,is_hidden}'}, + paramsMOut: { type__in: '10,20,30',ordering: '-create_time',query:'{full_name,id,is_hidden}'}, }; }, mounted() { From 685985561ba8d24571dce817b56f3bf5cb7d66bc Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 16 Apr 2026 09:48:30 +0800 Subject: [PATCH 10/11] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=89=A9=E6=96=99=E8=A1=A8=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=89=B9=E6=AC=A1=E5=90=8E=EF=BC=8C=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=B7=B2=E9=80=89=E6=89=B9=E6=AC=A1=E7=89=A9=E6=96=99?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=9B=B8=E5=BA=94=E7=9A=84=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/mlogb_form.vue | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/views/wpm_gx/mlogb_form.vue b/src/views/wpm_gx/mlogb_form.vue index ae02faea..62fb3959 100644 --- a/src/views/wpm_gx/mlogb_form.vue +++ b/src/views/wpm_gx/mlogb_form.vue @@ -337,16 +337,18 @@ export default { this.cellsList = data.count_json_from; } }, - getRoute() { + getRoute(material) { let that = this; - that.$API.mtm.route.list - .req({ process: that.process, page: 0, routepack__state: 30 }) - .then((res) => { - that.routeOptions = res; - if(res.length==1){ - that.form.route = res[0].id; - } - }); + let obj = { process:that.process,page: 0, routepack__state: 30}; + if(material){ + obj.material_in__in = material; + } + that.$API.mtm.route.list.req(obj).then((res) => { + that.routeOptions = res; + if(res.length==1){ + that.form.route = res[0].id; + } + }); }, getMtask() { let that = this; @@ -418,6 +420,7 @@ export default { }, materialBatchChange(){ let that = this; + that.getRoute(that.selectObj.material); that.form.batch = that.selectObj.batch; that.form.count_use = that.selectObj.count_cando; that.batch_count = that.selectObj.count; From 1f10186c10067c2f248a9edfac5816dfaed3e938 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 16 Apr 2026 10:50:41 +0800 Subject: [PATCH 11/11] =?UTF-8?q?fix:=E7=A6=85=E9=81=93364=E5=AE=8C?= =?UTF-8?q?=E5=96=84=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=8E=92=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E6=A3=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/bxerp/workHoursJJ.vue | 317 +++++---------------- 1 file changed, 71 insertions(+), 246 deletions(-) diff --git a/src/views/statistics/bxerp/workHoursJJ.vue b/src/views/statistics/bxerp/workHoursJJ.vue index 1ad69b03..4b5c5a7f 100644 --- a/src/views/statistics/bxerp/workHoursJJ.vue +++ b/src/views/statistics/bxerp/workHoursJJ.vue @@ -25,12 +25,18 @@
- - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +