From 853d1bc7603261cd91fb56739ae854423430c51e Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Sun, 28 Sep 2025 16:07:13 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=E7=A6=85=E9=81=93111?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wpm_bx/mlogbw_check_table.vue b/src/views/wpm_bx/mlogbw_check_table.vue
index e860a8a7..b894869c 100644
--- a/src/views/wpm_bx/mlogbw_check_table.vue
+++ b/src/views/wpm_bx/mlogbw_check_table.vue
@@ -98,7 +98,7 @@
 						</el-select>
 					</template>
 				</el-table-column>
-				<el-table-column prop="note" :label="item.defect_name" v-for="item in qct_defects" :key="item.id" width="120px">
+				<el-table-column prop="note" :label="item.defect_name" v-for="item in qct_defects" :key="item.id" :width="widthFun(item)">
 					<template #default="scope">
 						<el-switch 
 							:disabled="!scope.row.isEdit||!item.canEdit"
@@ -609,6 +609,13 @@ export default {
 				}
 			})
 		},
+		widthFun(item){
+			if(item.defect_name.indexOf('黑网')!=-1|| item.defect_name.indexOf('白网')!=-1||item.defect_name.indexOf('小网')!=-1){
+				return '54px';
+			}else{
+				return '';
+			}
+		},
         //添加
 		formTableSave(row) {
 			let that = this;

From 0e7260e6533123618534278aebf80d0ebe165d84 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Sun, 28 Sep 2025 16:46:22 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E8=BE=85=E6=96=99?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=BE=85=E6=9D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/utils/enum.js b/src/utils/enum.js
index 2aa1b961..c7acbd90 100644
--- a/src/utils/enum.js
+++ b/src/utils/enum.js
@@ -239,5 +239,5 @@ export const interveneTypeEnum = new EnumFactory({
 })
 
 export const mCateEnum = new EnumFactory({
-  'list': ['主要辅材','办公辅料','设备维护辅料','包装辅材','标识辅材','防护辅材','其他辅材','常规辅材','医护辅材','检测辅材','倒角辅材','减薄辅材','磨抛辅材','多线切辅材','精雕辅材','扫边辅材','黑化辅材']
+  'list': ['主要辅材','办公辅材','设备维护辅材','包装辅材','标识辅材','防护辅材','其他辅材','常规辅材','医护辅材','检测辅材','倒角辅材','减薄辅材','磨抛辅材','多线切辅材','精雕辅材','扫边辅材','黑化辅材']
 })
\ No newline at end of file

From d470bad81b78f5bbc0acb448f3f9a7740b5afef9 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Sun, 28 Sep 2025 16:47:16 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=97=B6=E9=9C=80=E8=A6=81=E5=BA=93=E5=AD=98=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=8E=A5=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inm/good_mio.vue      | 3 ++-
 src/views/wpm_gx/inm_record.vue | 9 ++++++++-
 src/views/wpm_gx/inmrecord.vue  | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/views/inm/good_mio.vue b/src/views/inm/good_mio.vue
index 61c79520..904fee4f 100644
--- a/src/views/inm/good_mio.vue
+++ b/src/views/inm/good_mio.vue
@@ -113,7 +113,8 @@
 							v-auth="'mio.submit'"
 							v-if="scope.row.state == 10"
 						>
-							提交
+							<span v-if="scope.row.type =='do_in'">接收</span>
+							<span v-else>提交</span>
 						</el-button>
 						<el-button
 							link
diff --git a/src/views/wpm_gx/inm_record.vue b/src/views/wpm_gx/inm_record.vue
index 79608dcc..ea6e606e 100644
--- a/src/views/wpm_gx/inm_record.vue
+++ b/src/views/wpm_gx/inm_record.vue
@@ -179,7 +179,8 @@
 			</el-main>
 			<el-footer v-if="active === 1" style="text-align: center">
 				<el-button @click="handleLastStep" style="margin-right: 4px">上一步</el-button>
-				<el-button @click="table_submit" type="warning">提交</el-button>
+				<el-button  v-if="cate=='do_in'" @click="table_submit_in" type="warning">确定</el-button>
+				<el-button  v-else @click="table_submit" type="warning">提交</el-button>
 			</el-footer>
 		</el-container>
 		<el-card v-else shadow="never" style="height: 100%;">
@@ -522,6 +523,12 @@ export default {
 				// that.$emit("closed");
 			});
 		},
+		table_submit_in(){
+			let that = this;
+			that.$emit('closed')
+			that.$message.success("保存成功");
+			that.visible = false;
+		},
 		submitOut() {},
 		//打印
 		handlePrint(){
diff --git a/src/views/wpm_gx/inmrecord.vue b/src/views/wpm_gx/inmrecord.vue
index 685b9820..31fde791 100644
--- a/src/views/wpm_gx/inmrecord.vue
+++ b/src/views/wpm_gx/inmrecord.vue
@@ -121,7 +121,7 @@
 							type="primary"
 							@click="table_submit(scope.row)"
 							v-auth="'mio.submit'"
-							v-if="scope.row.state == 10"
+							v-if="scope.row.state == 10&&scope.row.type!=='do_in'"
 						>
 							提交
 						</el-button>

From a722292c57f218a26b1d76847acaac5f7b74bca2 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Sun, 28 Sep 2025 16:47:56 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=E6=9B=B4=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
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 d59b0eb5..d669a5b7 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.2025082515",
+	APP_VER: "2.7.2025092816",
 
 	//内核版本号
 	CORE_VER: "1.6.9",