From 44db345ae7731f6ee791301047e83496857859a2 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 5 Feb 2025 15:50:10 +0800
Subject: [PATCH 01/14] =?UTF-8?q?feat:=20=E8=AF=81=E4=B9=A6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/enum.js              |  6 ++++++
 src/views/hrm/certificate.vue  | 23 ++++++++++++++++++++++-
 src/views/hrm/certificates.vue | 15 +++++++++++++--
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/utils/enum.js b/src/utils/enum.js
index df6f5d13..acecc11a 100644
--- a/src/utils/enum.js
+++ b/src/utils/enum.js
@@ -206,4 +206,10 @@ export const wmState = new EnumFactory({
   30: { text: '返修', type: 'warning' },
   40: { text: '检验', type: 'primary' },
   50: { text: '报废', type: 'danger' },
+}, parseInt)
+
+export const certStateEnum = new EnumFactory({
+  10: { text: '正常', type: 'success' },
+  20: { text: '临期', type: 'warning' },
+  30: { text: '过期', type: 'danger' }
 }, parseInt)
\ No newline at end of file
diff --git a/src/views/hrm/certificate.vue b/src/views/hrm/certificate.vue
index 3c3be5e2..11bb3b10 100644
--- a/src/views/hrm/certificate.vue
+++ b/src/views/hrm/certificate.vue
@@ -35,6 +35,15 @@
           :label="item.label"
           :value="item.value"
         ></el-option>
+      </el-select>
+      <el-select
+        v-model="query.state"
+        placeholder="证书状态"
+        @change="handleQuery"
+        clearable
+        style="margin-left: 2px"
+      >
+
       </el-select>
       </div>
       <div class="right-panel">
@@ -79,6 +88,16 @@
         </el-table-column>
         <el-table-column label="证书编号" prop="number"> </el-table-column>
         <el-table-column label="证书类型" prop="type"><template #default="scope">{{type_[scope.row.type]}} </template></el-table-column>
+        <el-table-column label="状态" prop="state" width="80">
+							<template #default="scope">
+								<el-tag
+									:type="certStateEnum[scope.row.state]?.type"
+									>{{
+										certStateEnum[scope.row.state]?.text
+									}}</el-tag
+								>
+							</template>
+						</el-table-column>
         <el-table-column label="发证日期" prop="issue_date"></el-table-column>
          <el-table-column label="有效期" prop="expiration_date"> </el-table-column>
         <el-table-column label="下一次复审日期" prop="review_date"></el-table-column> 
@@ -185,7 +204,8 @@
     </template>
   </el-dialog>
 </template>
-    <script>
+  <script>
+    import { certStateEnum } from "@/utils/enum.js";
   const  defaultform=
   { id: "",
         name: "",
@@ -197,6 +217,7 @@ export default {
   components: {},
   data() {
     return {
+      certStateEnum,
       apiObj: this.$API.hrm.certificate.list,
       form:defaultform,
       typeoptions: [
diff --git a/src/views/hrm/certificates.vue b/src/views/hrm/certificates.vue
index 47678fbd..6dd16d0f 100644
--- a/src/views/hrm/certificates.vue
+++ b/src/views/hrm/certificates.vue
@@ -43,11 +43,20 @@
         <el-table-column label="证书名称" fixed="left" prop="name"></el-table-column>
         <el-table-column label="证书编号" prop="number"> </el-table-column>
         <el-table-column label="证书类型" prop="type"><template #default="scope">{{type_[scope.row.type]}} </template></el-table-column>
+        <el-table-column label="状态" prop="state">
+							<template #default="scope">
+								<el-tag
+									:type="certStateEnum[scope.row.state]?.type"
+									>{{
+										certStateEnum[scope.row.state]?.text
+									}}</el-tag
+								>
+							</template>
+						</el-table-column>
         <el-table-column label="发证日期" prop="issue_date"></el-table-column>
          <el-table-column label="有效期" prop="expiration_date"> </el-table-column>
         <el-table-column label="下一次复审日期" prop="review_date"></el-table-column> 
          <el-table-column label="证书文件" prop="file"></el-table-column> 
-        
       </scTable>
     </el-main>
   </el-container>
@@ -144,7 +153,8 @@
     </template>
   </sc-dialog>
 </template>
-    <script>
+<script>
+import { certStateEnum } from "@/utils/enum.js";
   const  defaultform=
   { id: "",
         name: "",
@@ -156,6 +166,7 @@ export default {
   components: {},
   data() {
     return {
+      certStateEnum,
       form:defaultform,
       typeoptions: [
         { id: 10, name: "特种作业证书" },

From 5788b746cda7e909565e1bb532481ea3b7b72b45 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 5 Feb 2025 16:55:40 +0800
Subject: [PATCH 02/14] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4route=E4=B8=AD?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E6=A0=A1=E9=AA=8C=E9=BB=98=E8=AE=A4false?=
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 ead4e9e3..ab9b74c7 100644
--- a/src/views/mtm/route_form.vue
+++ b/src/views/mtm/route_form.vue
@@ -231,7 +231,7 @@ const defaultForm = {
 	material_out:'',
 	hour_work:0,
 	div_number:1,
-	batch_bind: true,
+	batch_bind: false,
 	is_autotask: true,
 };
 export default {

From 423a390c4f74d68761967b96bbde6f1645a599f3 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 5 Feb 2025 16:57:47 +0800
Subject: [PATCH 03/14] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E4=BA=A4=E6=8E=A5?=
 =?UTF-8?q?=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/handover.vue      | 13 ++++++-------
 src/views/wpm_bx/handover_form.vue | 26 +++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/views/wpm_bx/handover.vue b/src/views/wpm_bx/handover.vue
index 775fce51..5580ba2e 100644
--- a/src/views/wpm_bx/handover.vue
+++ b/src/views/wpm_bx/handover.vue
@@ -19,16 +19,15 @@
 				>
 				<el-button
 					type="primary"
-					@click="printSetting"
-					>打印机</el-button
+					icon="el-icon-plus"
+					@click="table_add(50)"
+					v-auth="'handover.create'"
+					>改版</el-button
 				>
 				<el-button
 					type="primary"
-					icon="el-icon-plus"
-					@click="table_add(30)"
-					v-auth="'handover.create'"
-					v-if="mgroup_name=='一次超洗'||mgroup_name=='二次超洗'"
-					>检验</el-button
+					@click="printSetting"
+					>打印机</el-button
 				>
 			</div>
 			<div class="right-panel">
diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue
index 30be9fae..b6ce9d2d 100644
--- a/src/views/wpm_bx/handover_form.vue
+++ b/src/views/wpm_bx/handover_form.vue
@@ -123,6 +123,21 @@
 						<el-input v-model="form.new_batch" placeholder="新批次号"></el-input>
 					</el-form-item>
 				</el-col>
+				<el-col :md="12" :sm="24" v-if="type==50">
+					<el-form-item label="更改物料">	
+						<xtSelect
+							:apiObj="apiObj"
+							:params="paramsM"
+							v-model="form.material_changed"
+							v-model:label="material_changed_name"
+							style="width:100%"
+						>
+							<el-table-column label="名称" prop="name"></el-table-column>
+							<el-table-column label="工序" prop="process_name"></el-table-column>
+							<el-table-column label="规格" prop="specification"></el-table-column>
+						</xtSelect>
+					</el-form-item>
+				</el-col>
 				<el-col :md="12" :sm="24">
 					<el-form-item label="处理备注">	
 						<el-input v-model="form.note" placeholder="处理备注"></el-input>
@@ -322,6 +337,12 @@ export default {
 					},
 				],
 			},
+			apiObj:this.$API.mtm.material.list,
+			paramsM:{
+				type:20,
+				is_hidde:true,
+			},
+            materials:[],
 			totalCount: 0,
 			deptID:'',
 			bwIndex:0,
@@ -416,9 +437,12 @@ export default {
 			let that = this;
 			var req = {
 				page: 0,
-				state:10,
+				// state:10,
 				mgroupx:that.mgroupId
 			};
+			if(that.type!==50){
+				req.state = 10;
+			}
 			that.materialOptions = [];
 			this.$API.wpm.wmaterial.list.req(req).then((res) => {
 				that.materialOptions = res;

From 046d5448728d535faa3e4cf723ee5bc1c0f6d325 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 5 Feb 2025 17:54:21 +0800
Subject: [PATCH 04/14] =?UTF-8?q?feat:=20=E5=9C=A8=E7=BA=BF=E8=80=83?=
 =?UTF-8?q?=E8=AF=95=E8=AF=A6=E6=83=85=E9=A1=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/route.js          |  12 +---
 src/views/edu/exam.vue       |  29 ++++++----
 src/views/edu/examrecord.vue |  20 +++----
 src/views/edu/train.vue      | 106 +++++++++++++++++------------------
 4 files changed, 79 insertions(+), 88 deletions(-)

diff --git a/src/config/route.js b/src/config/route.js
index cfffea42..bd812678 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -2914,17 +2914,7 @@ const routes = [
 							perms: ["train"],
 						},
 						component: "edu/train",
-					},
-					{
-						name: "examrecord",
-						path: "/edu/examrecord",
-						meta: {
-							title: "考试记录",
-							// icon: "el-icon-notebook",
-							perms: ["examrecord"],
-						},
-						component: "edu/examrecord",
-					},
+					}
 				],
 			},
 			{
diff --git a/src/views/edu/exam.vue b/src/views/edu/exam.vue
index f23fdabe..f098fdf4 100644
--- a/src/views/edu/exam.vue
+++ b/src/views/edu/exam.vue
@@ -40,9 +40,7 @@
 					width="80"
 				>
 				<template #default="scope">
-						<el-icon v-if="scope.row.can_attend" color="green"
-							><CircleCheckFilled
-						/></el-icon>
+					<el-tag v-if="scope.row.can_attend" type="success">是</el-tag>
 					</template>
 			</el-table-column>
 				<el-table-column
@@ -67,16 +65,14 @@
 					width="80"
 				>
 				<template #default="scope">
-						<el-icon v-if="scope.row.is_public" color="green"
-							><CircleCheckFilled
-						/></el-icon>
+						<el-tag v-if="scope.row.is_public" type="success">是</el-tag>
 					</template>
 			</el-table-column>
 				<el-table-column
 					label="操作"
 					fixed="right"
 					align="center"
-					width="150"
+					width="160"
 				>
 					<template #default="scope">
 						<el-button
@@ -92,7 +88,7 @@
 							size="small"
 							@click="row_detail(scope.row)"
 							type="primary"
-							>详情</el-button
+							>答题详情</el-button
 						>
 						<el-popconfirm
 							title="确定删除吗？"
@@ -194,11 +190,16 @@
 				>
 			</template>
 		</el-dialog>
+		<el-drawer v-model="drawerVisible" title="考试记录" size="50%">
+			<ExamRecord :exam="examId" v-if="drawerVisible"></ExamRecord>
+		</el-drawer>
 	</el-container>
 </template>
 <script>
 const defaultExam = {chance: 1, is_public:false}
+import ExamRecord from './examrecord.vue';
 export default {
+	components: { ExamRecord },
 	data() {
 		return {
 			paperOptions:[],
@@ -208,6 +209,8 @@ export default {
 				search: "",
 			},
 			examForm: Object.assign({}, defaultExam),
+			drawerVisible: false,
+			examId: null
 		};
 	},
 	mounted() {
@@ -233,10 +236,12 @@ export default {
 			this.examDialog = true;
         },
 		row_detail(row) {
-			this.$router.push({
-				path: "/edu/examrecord/",
-				query: { id: row.id },
-			});
+			// this.$router.push({
+			// 	path: "/edu/examrecord/",
+			// 	query: { id: row.id },
+			// });
+			this.examId = row.id;
+			this.drawerVisible = true;
 		},
         table_del(row) {
             this.$API.edu.exam.delete.req(row.id).then(() => {
diff --git a/src/views/edu/examrecord.vue b/src/views/edu/examrecord.vue
index 117f8329..bbbe1372 100644
--- a/src/views/edu/examrecord.vue
+++ b/src/views/edu/examrecord.vue
@@ -3,9 +3,9 @@
 		<el-header>
 			<div class="right-panel">
 				<el-input
-					style="margin-right: 5px"
+					style="margin-right: 2px"
 					v-model="query.search"
-					placeholder="考试名称或用户"
+					placeholder="用户名"
 					clearable
 				></el-input>
 				<el-button
@@ -20,6 +20,7 @@
 				ref="table"
 				:apiObj="apiObj"
 				row-key="id"
+				:params="params"
 				:query="query"
 			>
 				<el-table-column
@@ -83,27 +84,22 @@
 </template>
 <script>
 export default {
+	props: {
+		exam: { type: String }
+	},
 	data() {
 		return {
-			paperOptions:[],
 			examDialog: false,
 			apiObj: this.$API.edu.examrecord.list,
+			params: { exam: this.exam },
 			query: {
-				search: "",
+				search: ""
 			},
 		};
 	},
 	mounted() {
-		this.getPaperOptions();
 	},
 	methods: {
-		getPaperOptions() {
-			this.$API.edu.paper.list.req({
-				page: 0
-			}).then(res => {
-				this.paperOptions = res;
-			});
-		},
 		formatBoolean(row) {
       		return row.isTrue ? '是' : '否';
     	},
diff --git a/src/views/edu/train.vue b/src/views/edu/train.vue
index d74910a9..119d965b 100644
--- a/src/views/edu/train.vue
+++ b/src/views/edu/train.vue
@@ -44,6 +44,7 @@
 				<el-table-column
 					label="时长(h)"
 					prop="duration"
+					width="80"
 				></el-table-column>
 				<el-table-column
 					label="开始时间"
@@ -57,18 +58,12 @@
 					label="地点"
 					prop="place"
 				></el-table-column>
-				<el-table-column
-					label="内容描述"
-					prop="description"
-				></el-table-column>
 				<el-table-column
 					label="是否公开"
 					width="80"
 				>
 				<template #default="scope">
-						<el-icon v-if="scope.row.is_public" color="green"
-							><CircleCheckFilled
-						/></el-icon>
+					<el-tag v-if="scope.row.is_public" type="success">是</el-tag>
 					</template>
 			</el-table-column>
 				<el-table-column
@@ -117,57 +112,16 @@
 				label-width="100px"
 				ref="questioncatForm"
 			>
+			<el-row>
+				<el-col :span="18">
 				<el-form-item label="培训名称" prop="name" required>
 					<el-input
 						v-model="trainForm.name"
-						style="width: 80%;"
+						style="width: 100%;"
 					></el-input>
 				</el-form-item>
-				<el-row>
-					<el-col :span="8">
-				<el-form-item label="开始时间"  prop="start_time" required>
-                <el-date-picker
-                  v-model="trainForm.start_time"
-                  type="datetime"
-				  style="width:100%"
-                />
-              </el-form-item>
 			</el-col>
-			<el-col :span="8">
-			  <el-form-item label="结束时间"  prop="end_time">
-                <el-date-picker
-                  v-model="trainForm.end_time"
-                  type="datetime"
-				  style="width:100%"
-                />
-              </el-form-item>
-			</el-col>
-			<el-form-item label="地点" prop="place" required>
-					<el-input
-						v-model="trainForm.place"
-						clearable
-					></el-input>
-				</el-form-item>
-			<el-form-item label="时长(h)" prop="duration" required>
-				<el-input-number
-                        v-model="trainForm.duration"
-                        controls-position="right"
-                        :step="0.5"
-                        step-strictly="true"
-                    />
-			</el-form-item>
-			<el-form-item label="内容描述" prop="description" required>
-					<el-input
-						v-model="trainForm.description"
-						clearable
-						autisize
-						type="textarea"
-						style="width: 240%;"
-					></el-input>
-				</el-form-item>
-			<el-col :span="8">
-						</el-col>
-								<el-col :span="16">
+			<el-col :span="6">
 			  <el-form-item label="级别"  prop="level" required>
                 <el-select
                   v-model="trainForm.level"
@@ -186,7 +140,43 @@
               </el-form-item>
 
 			</el-col>
-			<el-col :span="8">
+					<el-col :span="12">
+				<el-form-item label="开始时间"  prop="start_time" required>
+                <el-date-picker
+                  v-model="trainForm.start_time"
+                  type="datetime"
+				  style="width:100%"
+                />
+              </el-form-item>
+			</el-col>
+			<el-col :span="12">
+			  <el-form-item label="结束时间"  prop="end_time">
+                <el-date-picker
+                  v-model="trainForm.end_time"
+                  type="datetime"
+				  style="width:100%"
+                />
+              </el-form-item>
+			</el-col>
+			<el-col :span="12">
+			<el-form-item label="地点" prop="place" required>
+					<el-input
+						v-model="trainForm.place"
+						clearable
+					></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :span="6">
+			<el-form-item label="时长(h)" prop="duration" required>
+				<el-input-number
+                        v-model="trainForm.duration"
+                        controls-position="right"
+                        :step="0.5"
+                        step-strictly="true"
+                    />
+			</el-form-item>
+			</el-col>
+			<el-col :span="6">
 			<el-form-item
 								label="是否公开"
 								prop="is_public"
@@ -195,6 +185,16 @@
 								<el-switch v-model="trainForm.is_public"/>
 							</el-form-item>
 						</el-col>	
+			<el-col :span="24">
+			<el-form-item label="内容描述" prop="description" required>
+					<el-input
+						v-model="trainForm.description"
+						clearable
+						autisize
+						type="textarea"
+					></el-input>
+				</el-form-item>
+			</el-col>
 			<el-form-item label="附件" prop="files">
 				<sc-upload-file
 					:multiple="false"

From f550b1391dbf001491547c3d2a20c6458b7032fa Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 6 Feb 2025 09:03:57 +0800
Subject: [PATCH 05/14] =?UTF-8?q?feat:=20=E5=9C=A8=E7=BA=BF=E8=80=83?=
 =?UTF-8?q?=E8=AF=95=E8=AF=A6=E6=83=85=E9=A1=B5=E8=B0=83=E6=95=B42?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/edu/exam.vue       | 32 ++++++++++++++++++++------------
 src/views/edu/examrecord.vue |  6 ++++--
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/views/edu/exam.vue b/src/views/edu/exam.vue
index f098fdf4..983db148 100644
--- a/src/views/edu/exam.vue
+++ b/src/views/edu/exam.vue
@@ -154,8 +154,24 @@
 							</el-form-item>
 						</el-col>
 								<el-col :span="16">
-			  <el-form-item label="所用试卷"  prop="paper" required>
-                <el-select
+			  <el-form-item label="所用试卷"  prop="paper" required v-if="examDialog">
+				<xtSelect
+					 v-model="examForm.paper"
+					 v-model:label="examForm.paper_name"
+					 :apiObj = "apiPaper"
+					 style="width: 100%;"
+				>
+				<el-table-column label="名称" prop="name"></el-table-column>
+				<el-table-column
+					label="限时(分钟)"
+					prop="limit"
+				></el-table-column>
+				<el-table-column
+					label="满分"
+					prop="total_score"
+				></el-table-column>
+				</xtSelect>
+                <!-- <el-select
                   v-model="examForm.paper"
 				  filterable
                   reserve-keyword
@@ -167,7 +183,7 @@
                     :label="item.name"
                     :value="item.id"
                   />
-                </el-select>
+                </el-select> -->
               </el-form-item>
 			</el-col>
 			<el-col :span="8">
@@ -184,7 +200,6 @@
 			<template #footer>
 				<el-button
 					type="primary"
-					:loading="examSaving"
 					@click="examSubmit()"
 					>保 存</el-button
 				>
@@ -205,6 +220,7 @@ export default {
 			paperOptions:[],
 			examDialog: false,
 			apiObj: this.$API.edu.exam.list,
+			apiPaper: this.$API.edu.paper.list,
 			query: {
 				search: "",
 			},
@@ -214,16 +230,8 @@ export default {
 		};
 	},
 	mounted() {
-		this.getPaperOptions();
 	},
 	methods: {
-		getPaperOptions() {
-			this.$API.edu.paper.list.req({
-				page: 0
-			}).then(res => {
-				this.paperOptions = res;
-			});
-		},
 		handleQuery() {
 			this.$refs.table.queryData(this.query);
 		},
diff --git a/src/views/edu/examrecord.vue b/src/views/edu/examrecord.vue
index bbbe1372..b1a1eaef 100644
--- a/src/views/edu/examrecord.vue
+++ b/src/views/edu/examrecord.vue
@@ -22,11 +22,12 @@
 				row-key="id"
 				:params="params"
 				:query="query"
+				hidePagination
 			>
-				<el-table-column
+				<!-- <el-table-column
 					label="考试名称"
 					prop="exam_name"
-				></el-table-column>
+				></el-table-column> -->
 				<el-table-column
 					label="用户"
 					prop="create_by_name"
@@ -47,6 +48,7 @@
 				<el-table-column
 					label="答题时间"
 					prop="start_time"
+					width="160"
 				></el-table-column>
 				<el-table-column
 					label="是否通过"

From b53fd04088aa37e7ca8f62e7d0201870c23570a5 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 6 Feb 2025 11:54:04 +0800
Subject: [PATCH 06/14] =?UTF-8?q?feat:=20=E8=AF=81=E4=B9=A6=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hrm/certificate.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/hrm/certificate.vue b/src/views/hrm/certificate.vue
index 11bb3b10..26117d79 100644
--- a/src/views/hrm/certificate.vue
+++ b/src/views/hrm/certificate.vue
@@ -43,7 +43,8 @@
         clearable
         style="margin-left: 2px"
       >
-
+      <el-option v-for="e in certStateEnum.values" :key="e.key" :value="e.key"
+      :label="e.text"></el-option>
       </el-select>
       </div>
       <div class="right-panel">

From 9b0d63bcd66c1aeadf7866895a2d9d469ea183ea Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 7 Feb 2025 10:09:11 +0800
Subject: [PATCH 07/14] =?UTF-8?q?fix:routepack=E7=BC=96=E8=BE=91=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/mtm/routepack.vue b/src/views/mtm/routepack.vue
index a6a23a77..50035373 100644
--- a/src/views/mtm/routepack.vue
+++ b/src/views/mtm/routepack.vue
@@ -83,7 +83,7 @@
 							link
 							type="primary"
 							size="small"
-							v-if="scope.row.ticket == null"
+							v-if="scope.row.state == 10"
 							@click="table_edit(scope.row, scope.$index)"
 							>继续编辑
 						</el-button>

From e8449383c80b024b461edbe273f097128af588d0 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 7 Feb 2025 10:12:13 +0800
Subject: [PATCH 08/14] =?UTF-8?q?fix:bwcheck=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/mlog_detail.vue  | 55 +++++++++++++++----------------
 src/views/wpm_bx/mlogbw_check.vue | 14 ++++----
 2 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index 4ee14e9d..d9bd721d 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -356,7 +356,6 @@
 				ref="checkDialogSingle"
 				:mlogb="mlogb"
 				:wm = "wm"
-				:qct="qct"
 				:handle_user="handle_user"
 				:handle_date="handle_date"
 				@success="handlesCheckSuccess"
@@ -479,6 +478,7 @@ export default {
                 mlogb: "",
                 isEdit: true,
             },
+			qct:null,
 			defectlist:[],
 		};
 	},
@@ -545,25 +545,7 @@ export default {
 		table_in_edit(row) {
 			this.saveInForm = row;
 			this.saveInDialog = true;
-			// this.getdefects(row.qct);
 		},
-		// getdefects(qct){
-		// 	let that = this;
-		// 	that.$API.qm.qct.item.req(qct).then((res) => {
-		// 		that.defectOptions = [];
-		// 		that.defectOptions = res.qct_defects;
-		// 	})
-		// },
-		// formTableSave(row){
-		// 	let that = this;
-		// 	let obj = new Object();
-		// 	obj.count = row.count;
-		// 	obj.defect = row.defect;
-		// 	obj.mlogb = that.saveInForm.id;
-		// 	that.$API.wpm.mlogbdefect.create.req(obj).then((res) => {
-				
-		// 	})
-		// },
 		//提交自检
 		saveInSubmit() {
 			let that = this;
@@ -610,15 +592,32 @@ export default {
 			});
 		},
 		table_out_check_single(row,type){
-			this.mlogb = row.id;
-			this.wm = row.wm_in;
-			this.qct = row.qct;
-			this.handle_date=this.mlogItem.handle_date;
-			this.handle_user = this.mlogItem.handle_user;
-			this.dialog.check_single = true;
-			this.$nextTick(() => {
-				this.$refs.checkDialogSingle.open(type);
-			});
+			let that = this;
+			that.mlogb = row.id;
+			that.wm = row.wm_in;
+			that.handle_date=that.mlogItem.handle_date;
+			that.handle_user = that.mlogItem.handle_user;
+			that.dialog.check_single = true;
+			if(row.qct==null){
+				that.$API.qm.qct.list.req({qctmat__material:row.material_out,page:0}).then((res)=>{
+				    if(res.length>0){
+						that.qct = res[0].id;
+						console.log('that.qct',that.qct);
+						that.$nextTick(() => {
+							that.$refs.checkDialogSingle.open(type,that.qct);
+						});
+					}else{
+						that.$nextTick(() => {
+							that.$refs.checkDialogSingle.open(type);
+						});
+					}
+				})
+			}else{
+				that.qct = row.qct;
+				that.$nextTick(() => {
+					that.$refs.checkDialogSingle.open(type,that.qct);
+				});
+			}
 		},
 		//表单提交方法
 		mlogSubmit() {
diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue
index 1ca32c87..cf453a02 100644
--- a/src/views/wpm_bx/mlogbw_check.vue
+++ b/src/views/wpm_bx/mlogbw_check.vue
@@ -173,10 +173,6 @@ export default {
 			type: String,
 			default: "",
 		},
-		qct: {
-			type: String,
-			default: "",
-		},
 		handle_user:{
 			type: String,
 			default: "",
@@ -197,6 +193,7 @@ export default {
 			mode:'ins',
 			//表单数据
 			form: {},
+			qct:"",
 			mgroup: "",
 			params: {mlogb:'',page:0},
 			visible: false,
@@ -218,13 +215,14 @@ export default {
 	mounted() {
 		let that = this;
 		that.params.mlogb = that.addTemplate.mlogb = that.mlogb;
-		that.getOptions();
-		that.getdefects();
 	},
 	methods: {
-		open(mode = "ins") {
+		open(mode = "ins",qct = '') {
+			let that = this;
 			this.mode = mode;
-			console.log(this.mode);
+			this.qct = qct;
+			that.getOptions();
+			that.getdefects();
 			this.visible = true;
 			setTimeout(() => {
 				this.tableHeight = document.getElementById('mlogbwMain').clientHeight-20;

From 9a9be3857ed086dd6809e93a59d09028abeae266 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 7 Feb 2025 14:57:20 +0800
Subject: [PATCH 09/14] =?UTF-8?q?fix:wpm=E6=96=B0=E5=A2=9E=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=A3=B0=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/wpm.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/api/model/wpm.js b/src/api/model/wpm.js
index d0e95347..e646da5f 100644
--- a/src/api/model/wpm.js
+++ b/src/api/model/wpm.js
@@ -416,6 +416,14 @@ export default {
 				);
 			},
 		},
+		mgroups:{
+			name: "获取可交接的工段",
+			req: async function (data) {
+				return await http.post(
+					`${config.API_URL}/wpm/handover/mgroups/`,data
+				);
+			},
+		},
 	},
 	//车间库存
 	wmaterial: {

From 37eeb4524254243e3647074f93e8b81cef0ded73 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 7 Feb 2025 15:16:30 +0800
Subject: [PATCH 10/14] =?UTF-8?q?fix:=E6=A0=B9=E6=8D=AE=E4=BA=A4=E6=8E=A5?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E9=99=90=E5=88=B6=E4=BA=A4=E6=8E=A5=E5=B7=A5?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/handover_form.vue | 88 +++++++++++++++++++++++++++---
 1 file changed, 81 insertions(+), 7 deletions(-)

diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue
index b6ce9d2d..4edeba10 100644
--- a/src/views/wpm_bx/handover_form.vue
+++ b/src/views/wpm_bx/handover_form.vue
@@ -58,7 +58,7 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
-				<el-col :md="12" :sm="24" v-if="type==30">
+				<!-- <el-col :md="12" :sm="24" v-if="type==30">
 					<el-form-item label="接收部门" prop="recive_dept">
 						<el-select
 							v-model="form.recive_dept"
@@ -112,17 +112,12 @@
 							/>
 						</el-select>
 					</el-form-item>
-				</el-col>
+				</el-col> -->
 				<el-col :md="12" :sm="24">
 					<el-form-item label="更改批次">	
 						<el-switch v-model="change_batch"></el-switch>
 					</el-form-item>
 				</el-col>
-				<el-col :md="12" :sm="24" v-if="change_batch">
-					<el-form-item label="新批次号">	
-						<el-input v-model="form.new_batch" placeholder="新批次号"></el-input>
-					</el-form-item>
-				</el-col>
 				<el-col :md="12" :sm="24" v-if="type==50">
 					<el-form-item label="更改物料">	
 						<xtSelect
@@ -143,6 +138,11 @@
 						<el-input v-model="form.note" placeholder="处理备注"></el-input>
 					</el-form-item>
 				</el-col>
+				<el-col :md="12" :sm="24" v-if="change_batch">
+					<el-form-item label="新批次号">	
+						<el-input v-model="form.new_batch" placeholder="新批次号"></el-input>
+					</el-form-item>
+				</el-col>
 			</el-row>
 			<el-row>
 				<el-form-item label="交接物料">
@@ -238,6 +238,63 @@
 			<el-row>
 				<div class="total-count">总计：{{ totalCount }}</div>
 			</el-row>
+			<el-row>
+				<el-col :md="12" :sm="24" v-if="type==30">
+					<el-form-item label="接收部门" prop="recive_dept">
+						<el-select
+							v-model="form.recive_dept"
+							placeholder="接收部门"
+							clearable
+							style="width: 100%"
+							@change="getUserList3"
+						>
+							<el-option
+								v-for="item in deptOptions"
+								:key="item.id"
+								:label="item.name"
+								:value="item.id"
+							></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24" v-else>
+					<el-form-item label="接收工段" prop="recive_mgroup">
+						<el-select
+							v-model="form.recive_mgroup"
+							placeholder="接收工段"
+							clearable
+							style="width: 100%"
+							:disabled="type==40"
+							@change="getUserList2"
+						>
+							<el-option
+								v-for="item in mgroupOptions"
+								:key="item.id"
+								:label="item.name"
+								:value="item.id"
+							></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="接收人" prop="recive_user">
+						<el-select
+							v-model="form.recive_user"
+							placeholder="接收人"
+							clearable
+							filterable
+							style="width: 100%"
+						>
+							<el-option
+								v-for="item in userList2"
+								:key="item.id"
+								:label="item.name"
+								:value="item.id"
+							/>
+						</el-select>
+					</el-form-item>
+				</el-col>
+			</el-row>
 		</el-form>
 		<el-footer v-if="mode!=='show'">
 			<el-button type="primary" v-loading="isSaveing" @click="submit">确定</el-button>
@@ -536,6 +593,15 @@ export default {
 			let data = that.materialOptions.filter((item) => {
 				return that.selectItems.indexOf(item.id)>-1;
 			});
+			let materialId = data[0].material;
+			let params = {
+				material: materialId,
+				type: that.type,
+			};
+			console.log('params',params);
+			that.$API.wpm.handover.mgroups.req(params).then((res) => {
+			    that.mgroupOptions = res;
+			})
 			data.forEach((item,index)=>{
 			    item.wm = item.id;
 				item.count = item.count_cando;
@@ -679,6 +745,10 @@ export default {
 								// console.log('2',that.form);
 							}
 						}else{//handoverb里没有有这个物料批次
+							let params = {material: res.material,type: that.type,};
+							that.$API.wpm.handover.mgroups.req(params).then((res) => {
+								that.mgroupOptions = res;
+							})
 							that.materialOptions.forEach((item) => {
 								if(item.id == res.wm){
 									let obj2 = {};
@@ -706,6 +776,10 @@ export default {
 					if(arr.length>0){
 						that.$message.error("该批次已存在")
 					}else{
+						let params = {material: res.material,type: that.type,};
+						that.$API.wpm.handover.mgroups.req(params).then((res) => {
+							that.mgroupOptions = res;
+						})
 						that.materialOptions.forEach((item) => {
 							if(item.batch == res.batch){
 								let obj = {};

From 8c7b900af0cf8f8ab944a30ee1bed01fc8984654 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 7 Feb 2025 15:19:32 +0800
Subject: [PATCH 11/14] =?UTF-8?q?fix:=E9=A2=86=E6=96=99=E4=B8=8D=E5=90=88?=
 =?UTF-8?q?=E6=A0=BC=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wpm_bx/inm_record_form.vue b/src/views/wpm_bx/inm_record_form.vue
index cdac687e..33dde6c8 100644
--- a/src/views/wpm_bx/inm_record_form.vue
+++ b/src/views/wpm_bx/inm_record_form.vue
@@ -232,10 +232,13 @@ export default {
 			let that = this;
 			let obj = {};
 			obj.page = 0;
+			obj.state = 10;
 			obj.material = that.form.material;
 			this.$API.inm.warehouse.batch.req(obj).then((res) => {
-					this.batchOptions = res;
+				this.batchOptions = res.filter((item) => {
+					return item.state == 10;
 				});
+			});
 		},
 		scanClose(data){
 			let that = this;

From 0fbd17810df30070a5e86be748844821284b0df2 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 7 Feb 2025 16:11:03 +0800
Subject: [PATCH 12/14] =?UTF-8?q?fix:=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=97=B6=E9=BB=98=E8=AE=A4=E6=95=B0=E9=87=8F=E4=B8=BA1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inm/mioitem.vue      | 2 ++
 src/views/inm/mioitem_form.vue | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue
index 5a2d43e9..df029de0 100644
--- a/src/views/inm/mioitem.vue
+++ b/src/views/inm/mioitem.vue
@@ -135,6 +135,8 @@
 								</div>
 							</template>
 						</el-table-column>
+						<!-- <el-table-column label="合格数量" prop="count_ok">
+						</el-table-column> -->
 						<el-table-column label="不合格数量" prop="count_notok">
 						</el-table-column>
 						<el-table-column
diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue
index 56cbffc1..c4f18d6e 100644
--- a/src/views/inm/mioitem_form.vue
+++ b/src/views/inm/mioitem_form.vue
@@ -113,7 +113,7 @@
 			<el-form-item label="数量" v-if="cate == 'mainso'">
 				<el-input-number
 					v-model="form.count"
-					:min="0"
+					:min="1"
 					:precision="3"
 					style="width: 100%"
 				/>
@@ -180,6 +180,7 @@
 <script>
 const defaultForm = {
 	state: 10,
+	count: 1,
 	type: "do_in",
 };
 export default {
@@ -204,7 +205,7 @@ export default {
 				other_in: "其他入库",
 				other_out: "其他出库",
 			},
-			form: {},
+			form: {count: 1,},
 			rules: {
 				batch:[
 					{

From f3aea5bf88f27782480a9d210ba4b4af9febc8a9 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 7 Feb 2025 16:58:31 +0800
Subject: [PATCH 13/14] =?UTF-8?q?fix:=E6=89=AB=E7=A0=81=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=8E=A5=E6=94=B6=E7=AB=8B=E5=8D=B3=E5=85=B3=E9=97=AD=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/template/scan.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/template/scan.vue b/src/views/template/scan.vue
index 14b1fb8f..9aa416b4 100644
--- a/src/views/template/scan.vue
+++ b/src/views/template/scan.vue
@@ -22,7 +22,11 @@ export default {
         type:{
             type:String,
             default:''
-        }
+        },
+        closeNow:{
+            type:Boolean,
+            default:false
+        },
     },
 	data(){
         return{
@@ -40,13 +44,15 @@ export default {
             return this;
         },
         codeTextChange(){
-            console.log('this.codeText',this.codeText);
+            // console.log('this.codeText',this.codeText);
             this.$emit('closed',this.codeText);
-            this.closed();
+            this.codeText = '';
+            this.visible = !this.closeNow;
+            // this.closed();
         },
         closed(){
             this.codeText = '';
-            // this.visible = false;
+            this.visible = !this.closeNow;
         }
     }
 }

From f4ecb03144e3830538f0c4e1e14629979166e4eb Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 7 Feb 2025 16:59:09 +0800
Subject: [PATCH 14/14] =?UTF-8?q?fix:=E8=BD=A6=E9=97=B4=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E9=A2=86=E6=96=99=E6=97=B6=E6=89=AB=E7=A0=81=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/inm_record_form.vue | 35 ++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/views/wpm_bx/inm_record_form.vue b/src/views/wpm_bx/inm_record_form.vue
index 33dde6c8..feb81873 100644
--- a/src/views/wpm_bx/inm_record_form.vue
+++ b/src/views/wpm_bx/inm_record_form.vue
@@ -62,7 +62,7 @@
 						>
 					</el-option>
 				</el-select>
-				<scan-dialog ref="scanDialog" @closed="scanClose"> </scan-dialog>
+				<scan-dialog ref="scanDialog" :closeNow="closeNow" @closed="scanClose"> </scan-dialog>
 			</el-form-item>
 			<el-form-item label="批次" v-if="cate == 'do_out'">
 				<el-select
@@ -139,6 +139,7 @@ export default {
 		return {
 			type: "do_in",
 			loading: false,
+			closeNow:true,
 			mode: "add",
 			titleMap: {
 				do_out: "生产领料",
@@ -234,8 +235,8 @@ export default {
 			obj.page = 0;
 			obj.state = 10;
 			obj.material = that.form.material;
-			this.$API.inm.warehouse.batch.req(obj).then((res) => {
-				this.batchOptions = res.filter((item) => {
+			that.$API.inm.warehouse.batch.req(obj).then((res) => {
+				that.batchOptions = res.filter((item) => {
 					return item.state == 10;
 				});
 			});
@@ -244,7 +245,33 @@ export default {
 			let that = this;
 			let id = data.split('#')[1];
 			console.log('id',id);
-			that.form.batch = id;
+			// that.form.batch = id;
+			that.$API.cm.labelmat.item.req(id).then((res) => {
+				that.form.mb = res.id;
+			    that.form.batch = res.batch;
+			    that.form.warehouse = res.warehouse;
+
+				let arr = that.mioitemlist.filter((mioitem) => {
+					return mioitem.batch == res.batch;
+				});
+				if(arr.length > 0){
+					that.$message.error('该批次已存在');
+					that.selectBatchClear();
+				}else{
+					let arr2 = that.batchOptions.filter((batchitem) => {
+					    return batchitem.batch == res.batch;
+					})
+					if(arr2.length > 0){
+						that.selectBatch = arr2[0].batch;
+						that.form.batch = arr2[0].batch;
+						that.form.mb = arr2[0].id;
+						that.form.warehouse = arr2[0].warehouse;
+						that.$refs.scanDialog.visible = false;
+					}else{
+						that.$message.error('该批次不存在');
+					}
+				}	
+			})
 		},
 		selectMaterialChange() {
 			this.getBatchOptions();