From f7fee8929057bfc5110c699047b7b7cc57cbf8ff Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 22 Jul 2026 16:27:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=89=A9=E6=96=99=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=A5=E5=BA=93=E6=A3=80=E9=AA=8C=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F,=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86=E6=9C=AA?=
 =?UTF-8?q?=E6=A3=80=E5=85=8D=E6=A3=80=E7=89=A9=E6=96=99=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=85=8D=E6=A3=80=E6=A0=87=E8=AF=86;fix:=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5=E6=8F=90=E4=BA=A4=E6=9C=AA=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=E5=AF=BC=E8=87=B4=E4=BF=9D=E5=AD=98=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 src/views/inm/mioitem.vue           |  5 +++--
 src/views/mtm/materials_form.vue    | 14 +++++++++++++-
 src/views/mtm/materials_form_gx.vue | 15 ++++++++++++++-
 src/views/ops/settings/otherSet.vue | 13 +++++++++++--
 4 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue
index a7a7c71b..1b56d3a8 100644
--- a/src/views/inm/mioitem.vue
+++ b/src/views/inm/mioitem.vue
@@ -149,8 +149,9 @@
 						</el-table-column>
 						<el-table-column label="检验提交" prop="count_tested" v-if="cate=='mainso'&&(type == 'pur_in' ||type == 'do_in' ||type == 'other_in')">
 							<template #default="scope">
-								<el-tag v-if="scope.row.test_date == null" type="warning">否</el-tag>
-								<el-tag v-else type="success">是</el-tag>
+								<el-tag v-if="scope.row.test_date !== null" type="success">是</el-tag>
+								<el-tag v-else-if="scope.row.material_&&scope.row.material_.test_mode_in==10" type="info">免检</el-tag>
+								<el-tag v-else type="warning">否</el-tag>
 							</template>
 						</el-table-column>
 						<el-table-column label="不合格数量" prop="count_notok" v-if="cate!=='helpso'">
diff --git a/src/views/mtm/materials_form.vue b/src/views/mtm/materials_form.vue
index 1f379f34..aab53690 100644
--- a/src/views/mtm/materials_form.vue
+++ b/src/views/mtm/materials_form.vue
@@ -132,6 +132,18 @@
 								<el-switch v-model="form.is_hidden" />
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="入库检验方式" prop="test_mode_in">
+								<el-select
+									v-model="form.test_mode_in"
+									placeholder="入库检验方式"
+									style="width: 100%"
+								>
+									<el-option label="免检" :value="10"></el-option>
+									<el-option label="必检" :value="20"></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="安全库存下限" prop="count_safe">
 								<el-input-number
@@ -231,7 +243,7 @@ export default {
 				show: "查看物料",
 			},
 			brothers: [],
-			form: {},
+			form: { test_mode_in: 20 },
 			rules: {
 				name: [
 					{
diff --git a/src/views/mtm/materials_form_gx.vue b/src/views/mtm/materials_form_gx.vue
index d2aac6d5..bb203fa9 100644
--- a/src/views/mtm/materials_form_gx.vue
+++ b/src/views/mtm/materials_form_gx.vue
@@ -157,6 +157,18 @@
 								<el-switch v-model="form.is_hidden" />
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="入库检验方式" prop="test_mode_in">
+								<el-select
+									v-model="form.test_mode_in"
+									placeholder="入库检验方式"
+									style="width: 100%"
+								>
+									<el-option label="免检" :value="10"></el-option>
+									<el-option label="必检" :value="20"></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24" v-if="form.type == 40">
 							<el-form-item label="是否进入车间库存">
 								<el-switch v-model="form.into_wm" />
@@ -207,7 +219,7 @@ export default {
 				edit: "编辑物料",
 				show: "查看物料",
 			},
-			form: {},
+			form: { test_mode_in: 20 },
 			rules: {
 				name: [
 					{
@@ -353,6 +365,7 @@ export default {
 				that.form.unit = data.unit;
 				that.form.process = data.process;
 				that.form.tracking = data.tracking;
+				that.form.test_mode_in = data.test_mode_in;
 				that.form.count_safe = data.count_safe;
 				that.form.count_safe_upper = data.count_safe_upper;
 				that.form.is_hidden = data.is_hidden;
diff --git a/src/views/ops/settings/otherSet.vue b/src/views/ops/settings/otherSet.vue
index 1f2db610..3a203e63 100644
--- a/src/views/ops/settings/otherSet.vue
+++ b/src/views/ops/settings/otherSet.vue
@@ -6,7 +6,7 @@
             label-width="auto"
             style="margin-top: 20px"
             >
-            <el-form-item label="领料时校验是否检验">
+            <el-form-item label="领料时校验是否检验(总开关,物料可单独设为免检)">
                 <el-switch v-model="form.mes.check_test_when_do_out"></el-switch>
             </el-form-item>
             <el-divider />
@@ -51,7 +51,16 @@ export default {
             })
         },
         submitForm() {
-
+            this.saveLoading = true;
+            this.$API.system.config.updateInfo.req({
+                mes: this.form.mes,
+                sms: this.form.sms
+            }).then(() => {
+                this.$message.success("保存成功");
+                this.saveLoading = false;
+            }).catch(() => {
+                this.saveLoading = false;
+            })
         }
     }
 }