From 31df2e12a87800c67458c205ae25511548325cdf Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 12 Mar 2026 09:05:54 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E8=BF=94=E5=B7=A5?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E8=A1=A8=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/f_mlogs_form.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue
index 8c0fd849..83d2f716 100644
--- a/src/views/wpm_gx/f_mlogs_form.vue
+++ b/src/views/wpm_gx/f_mlogs_form.vue
@@ -513,7 +513,7 @@ export default {
 		getdefects(route,material_in,material_out){
 			let that = this;
 			if(that.is_fix&&that.materialFix!==null&&that.materialFix!==''){
-				that.$API.qm.qct.getQct.req({material: that.materialFix,tag:'process'}).then((res) => {
+				that.$API.qm.qct.getQct.req({material: that.materialFix,tag:'process',type:'out'}).then((res) => {
 					res.qct_defects.forEach((item) => {
 						that.defectform[item.defect_name] = 0;
 					})

From 122e73fee2241ccbfdcab02790ace9c8935cb24c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 12 Mar 2026 09:07:26 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix=EF=BC=9A=E7=8E=BB=E7=BA=A4=E6=8E=92?=
 =?UTF-8?q?=E6=9D=BF=E7=BB=9F=E8=AE=A12=E6=B7=BB=E5=8A=A0=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/bxerp/workHoursPB.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/statistics/bxerp/workHoursPB.vue b/src/views/statistics/bxerp/workHoursPB.vue
index b6445730..c1d2676c 100644
--- a/src/views/statistics/bxerp/workHoursPB.vue
+++ b/src/views/statistics/bxerp/workHoursPB.vue
@@ -110,6 +110,8 @@
 								<el-table-column type="index" width="50"  fixed="left"/>
 								<el-table-column label="员工" prop="员工">
 								</el-table-column>
+								<el-table-column label="物料名" prop="物料名">
+								</el-table-column>
 								<el-table-column label="总数">
 									<template #default="scope">
 										<span v-if="scope.row.总切片数" @click="handleClick(scope.row)" style="color:#0052d9;">{{ scope.row.总切片数 }}</span>
@@ -391,7 +393,8 @@ export default {
             let that = this;
             let params = {};
             params.query = that.query;
-			that.$API.bi.dataset.exec.req('prodect_defect_pb1', params).then((res) => {
+            params.query.select_cols = '';
+			that.$API.bi.dataset.exec.req('product_defect_pb_user_mname', params).then((res) => {
 				let data = res.data2.ds0;
 				data.forEach(item=>{
 					if(item.缺陷分布!==null){

From d2befea6598e943fbf1bee7dffdd33f766f8fa7f Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 12 Mar 2026 09:08:16 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=A1=A8=E6=A0=BC=E8=A1=A8=E5=A4=B4=E6=96=87?=
 =?UTF-8?q?=E6=A1=88=E9=9D=A0=E5=B7=A6=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/mlogbw_check_table.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/wpm_bx/mlogbw_check_table.vue b/src/views/wpm_bx/mlogbw_check_table.vue
index da5c555e..e3ae7b3a 100644
--- a/src/views/wpm_bx/mlogbw_check_table.vue
+++ b/src/views/wpm_bx/mlogbw_check_table.vue
@@ -1142,6 +1142,9 @@ tbody tr:nth-child(odd) {
 	background-color: #f5f7fa;
 
 }
+th{
+	text-align: left;
+}
 tr{
 	min-height: 40px;
 }
@@ -1154,7 +1157,7 @@ td {
 	border-bottom: 1px solid #ebeef5;
 }
 th{
-	padding: 12px 0;
+	padding: 12px 5px;
 	min-height: 40px;
 	font-size: 12px;
 	color: #909399;

From 0a27aa67ffc567216cd10a471ea5b5fd845937c0 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 18 Mar 2026 14:43:37 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=E7=89=88=E6=9C=AC=E5=8F=B7=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/index.js b/src/config/index.js
index d669a5b7..cb121a62 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -6,7 +6,7 @@ const DEFAULT_CONFIG = {
 	DASHBOARD_URL: "/dashboard",
 
 	//版本号
-	APP_VER: "2.7.2025092816",
+	APP_VER: "3.1.2026031316",
 
 	//内核版本号
 	CORE_VER: "1.6.9",