From ed4cc663036499fbfc33d25bffe77db4fac9d64d Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 1 Aug 2024 15:25:14 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=E4=BA=A4=E6=8E=A5=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=98=BE=E7=A4=BAbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index c5011dce..407631a6 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -325,6 +325,7 @@ export default {
 		//表单注入数据
 		setData(data) {
 			Object.assign(this.form, data);
+			this.this.getUserList2();
 		},
 		//设置过滤项
 		setFilters(filters) {

From 896cba6bc950e96257f0ddd912726cc642d1895c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 1 Aug 2024 15:25:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=E8=BF=94=E5=B7=A5=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=A0=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ehsSelect/select.vue | 166 ++++++++++++++++++----------
 src/views/wpm_gx/handover.vue       |  14 +--
 src/views/wpm_gx/inm.vue            |  11 +-
 src/views/wpm_gx/mlog_form.vue      |  11 +-
 src/views/wpm_gx/mlogs.vue          |  47 +++++---
 5 files changed, 164 insertions(+), 85 deletions(-)

diff --git a/src/components/ehsSelect/select.vue b/src/components/ehsSelect/select.vue
index 9e20ca9f..db73d4b3 100644
--- a/src/components/ehsSelect/select.vue
+++ b/src/components/ehsSelect/select.vue
@@ -3,8 +3,18 @@
 		<div v-if="initloading" class="sc-select-loading">
 			<el-icon class="is-loading"><el-icon-loading /></el-icon>
 		</div>
-		<el-select v-bind="$attrs" :loading="loading" @visible-change="visibleChange" :value-on-clear="null">
-			<el-option v-for="item in options" :key="item[id]" :label="item[name]" :value="objValueType ? item : item[id]">
+		<el-select
+			v-bind="$attrs"
+			:loading="loading"
+			@visible-change="visibleChange"
+			:value-on-clear="null"
+		>
+			<el-option
+				v-for="item in options"
+				:key="item[id]"
+				:label="item[name]"
+				:value="objValueType ? item : item[id]"
+			>
 				<slot name="option" :data="item"></slot>
 			</el-option>
 		</el-select>
@@ -12,67 +22,103 @@
 </template>
 
 <script>
-	export default {
-		props: {
-			apiObj: { type: Object, default: () => {} },
-			objValueType: { type: Boolean, default: false },
-			params: { type: Object, default: () => ({}) },
-            id: {type: String, default: 'id'},
-            name: {type: String, default: 'name'},
-            showName: {type: String, default: null},
-		},
-		data() {
-			return {
-				loading: false,
-				options: [],
-				initloading: false
-			}
-		},
-		created() {
-			//如果有默认值就去请求接口获取options
-			if(this.hasValue()){
-				this.initloading = true
-				this.getRemoteData()
-			}
-		},
-		methods: {
-			//选项显示隐藏事件
-			visibleChange(ispoen){
-				if(ispoen && this.options.length==0 && this.apiObj){
-					this.getRemoteData()
-				}
-			},
-			//获取数据
-			async getRemoteData(){
-				this.loading = true
-                var query = Object.assign({page:0}, this.params)
-                var res = await this.apiObj.req(query)
-				this.loading = false
-				this.initloading = false
-                if (this.$attrs.modelValue !== null && !res.some(option => option[this.id] === this.$attrs.modelValue)) {
-                    this.options = [{ [this.id]: this.$attrs.modelValue, [this.name]: this.showName }, ...res];
-                }else{
-                    this.options = res
-                }
-			},
-			//判断是否有回显默认值
-			hasValue(){
-				if(Array.isArray(this.$attrs.modelValue) && this.$attrs.modelValue.length <= 0){
-					return false
-				}else if(this.$attrs.modelValue){
-					return true
-				}else{
-					return false
-				}
-			}
+export default {
+	props: {
+		apiObj: { type: Object, default: () => {} },
+		objValueType: { type: Boolean, default: false },
+		params: { type: Object, default: () => ({}) },
+		id: { type: String, default: "id" },
+		name: { type: String, default: "name" },
+		showName: { type: String, default: null },
+	},
+	data() {
+		return {
+			loading: false,
+			options: [],
+			initloading: false,
+		};
+	},
+	created() {
+		//如果有默认值就去请求接口获取options
+		if (this.hasValue()) {
+			this.initloading = true;
+			this.getRemoteData();
 		}
-	}
+	},
+	methods: {
+		//选项显示隐藏事件
+		visibleChange(ispoen) {
+			if (ispoen && this.options.length == 0 && this.apiObj) {
+				this.getRemoteData();
+			}
+		},
+		//获取数据
+		async getRemoteData() {
+			this.loading = true;
+			var query = Object.assign({ page: 0 }, this.params);
+			var res = await this.apiObj.req(query);
+			this.loading = false;
+			this.initloading = false;
+			if (
+				this.$attrs.modelValue !== null &&
+				!res.some(
+					(option) => option[this.id] === this.$attrs.modelValue
+				)
+			) {
+				this.options = [
+					{
+						[this.id]: this.$attrs.modelValue,
+						[this.name]: this.showName,
+					},
+					...res,
+				];
+			} else {
+				this.options = res;
+			}
+		},
+		//判断是否有回显默认值
+		hasValue() {
+			if (
+				Array.isArray(this.$attrs.modelValue) &&
+				this.$attrs.modelValue.length <= 0
+			) {
+				return false;
+			} else if (this.$attrs.modelValue) {
+				return true;
+			} else {
+				return false;
+			}
+		},
+	},
+};
 </script>
 
 <style scoped>
-	.sc-select {display: inline-block;position: relative;min-width: 120px;}
-	.sc-select-loading {position: absolute;top:0;left:0;right:0;bottom:0;background: #fff;z-index: 100;border-radius: 5px;border: 1px solid #EBEEF5;display: flex;align-items: center;padding-left:10px;}
-	.sc-select-loading i {font-size: 14px;}
+.sc-select {
+	display: inline-block;
+	position: relative;
+	min-width: 120px;
+}
+.sc-select-loading {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background: #fff;
+	z-index: 100;
+	border-radius: 5px;
+	border: 1px solid #ebeef5;
+	display: flex;
+	align-items: center;
+	padding-left: 10px;
+}
+.sc-select-loading i {
+	font-size: 14px;
+}
 
-	.dark .sc-select-loading {background: var(--el-bg-color-overlay);border-color: var(--el-border-color-light);}
+.dark .sc-select-loading {
+	background: var(--el-bg-color-overlay);
+	border-color: var(--el-border-color-light);
+}
 </style>
diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index 394c5631..f9b2624d 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -13,14 +13,14 @@
 					type="primary"
 					icon="el-icon-plus"
 					@click="table_add(10)"
-					v-auth="'mgroup.create'"
+					v-auth="'mllog.create'"
 					>新增</el-button
 				>
 				<el-button
 					type="primary"
 					icon="el-icon-plus"
 					@click="table_add(20)"
-					v-auth="'mgroup.create'"
+					v-auth="'mlog.submit'"
 					>返工</el-button
 				>
 			</div>
@@ -76,9 +76,9 @@
 				<el-table-column label="数量" prop="count"></el-table-column>
 				<el-table-column label="类型" prop="type">
 					<template #default="scope">
-						<el-tag v-if="scope.row.type == 10">交送</el-tag>
-						<el-tag v-if="scope.row.type == 20" type="success"
-							>接收</el-tag
+						<el-tag v-if="scope.row.type == 10">正常</el-tag>
+						<el-tag v-if="scope.row.type == 20" type="danger"
+							>返工</el-tag
 						>
 					</template>
 				</el-table-column>
@@ -125,7 +125,7 @@
 							link
 							size="small"
 							@click="table_edit(scope.row)"
-							v-auth="'mgroup.update'"
+							v-auth="'mlog.update'"
 							type="primary"
 							v-if="
 								scope.row.send_mgroup == mgroupId &&
@@ -145,7 +145,7 @@
 								<el-button
 									link
 									size="small"
-									v-auth="'mgroup.delete'"
+									v-auth="'mlog.delete'"
 									type="danger"
 									>删除</el-button
 								>
diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue
index 6d38e655..d6b98c91 100644
--- a/src/views/wpm_gx/inm.vue
+++ b/src/views/wpm_gx/inm.vue
@@ -42,8 +42,15 @@
 				<el-table-column
 					label="物料名称"
 					prop="material_name"
-					min-width="120"
-				></el-table-column>
+					min-width="150"
+				>
+					<template #default="scope">
+						{{ scope.row.material_name }}
+						<span v-if="scope.row.material_origin != null"
+							>（{{ scope.row.material_origin_name }}）</span
+						>
+					</template>
+				</el-table-column>
 				<el-table-column
 					label="批次号"
 					prop="batch"
diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue
index 625d2591..0cd87712 100644
--- a/src/views/wpm_gx/mlog_form.vue
+++ b/src/views/wpm_gx/mlog_form.vue
@@ -112,7 +112,6 @@
 									type="datetime"
 									value-format="YYYY-MM-DD HH:mm:ss"
 									style="width: 100%"
-									:disabledDate="disabledDateFn"
 								/>
 							</el-form-item>
 						</el-col>
@@ -130,7 +129,13 @@
 						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="操作人">
-								<el-select
+								<ehsSelect
+									v-model="form.handle_user"
+									:showName="form.handle_user_name"
+									:apiObj="this.$API.system.user.list"
+									:params="{ depts: dept }"
+								></ehsSelect>
+								<!-- <el-select
 									v-model="form.handle_user"
 									placeholder="操作人"
 									clearable
@@ -142,7 +147,7 @@
 										:label="item.name"
 										:value="item.id"
 									></el-option>
-								</el-select>
+								</el-select> -->
 							</el-form-item>
 						</el-col>
 						<el-col :md="12" :sm="24">
diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue
index ffa4c472..6971b96a 100644
--- a/src/views/wpm_gx/mlogs.vue
+++ b/src/views/wpm_gx/mlogs.vue
@@ -6,7 +6,7 @@
 					type="primary"
 					icon="el-icon-plus"
 					@click="table_add"
-					v-auth="'mgroup.create'"
+					v-auth="'mlog.create'"
 					>新增</el-button
 				>
 			</div>
@@ -82,7 +82,7 @@
 					label="操作"
 					fixed="right"
 					align="center"
-					width="180"
+					width="150"
 				>
 					<template #default="scope">
 						<el-button
@@ -94,10 +94,6 @@
 							@click.stop="table_edit(scope.row)"
 							>编辑</el-button
 						>
-						<el-divider
-							direction="vertical"
-							v-if="scope.row.submit_time == null"
-						></el-divider>
 						<el-button
 							link
 							size="small"
@@ -105,16 +101,23 @@
 							type="primary"
 							>详情</el-button
 						>
-						<el-divider direction="vertical"></el-divider>
-
 						<el-button
 							link
 							size="small"
-							v-auth="'mgroup.delete'"
+							v-auth="'mlog.delete'"
 							type="danger"
+							v-if="scope.row.submit_time == null"
 							@click.stop="table_del(scope.row, scope.$index)"
 							>删除</el-button
 						>
+						<!-- <el-button
+							link
+							v-else
+							size="small"
+							type="danger"
+							@click.stop="mlogRevert(scope.row)"
+							>撤回</el-button
+						> -->
 					</template>
 				</el-table-column>
 			</scTable>
@@ -178,7 +181,7 @@ export default {
 		that.$API.mtm.mgroup.list
 			.req({ page: 0, search: that.mgroupName })
 			.then((res) => {
-				if(res.length != 1){
+				if (res.length != 1) {
 					that.$message.error("获取工段错误");
 					return;
 				}
@@ -191,20 +194,21 @@ export default {
 			});
 	},
 	methods: {
-		//添加
+		//添加日志
 		table_add() {
 			this.dialog.save = true;
 			this.$nextTick(() => {
 				this.$refs.saveDialog.open("add");
 			});
 		},
-		//编辑
+		//编辑日志
 		table_edit(row) {
 			this.dialog.save = true;
 			this.$nextTick(() => {
 				this.$refs.saveDialog.open("edit").setData(row);
 			});
 		},
+		//日志详情
 		table_detail(row) {
 			this.mlogId = row.id;
 			this.dialog.detail = true;
@@ -212,7 +216,7 @@ export default {
 				this.$refs.detailDialog.open();
 			});
 		},
-		//删除
+		//日志删除
 		table_del(row) {
 			this.$confirm(`确定删除吗？`, "提示", {
 				type: "warning",
@@ -228,6 +232,23 @@ export default {
 				});
 			});
 		},
+		//日志撤回
+		mlogRevert(row) {
+			this.$confirm(`确定撤回该日志吗？`, "提示", {
+				type: "warning",
+			}).then(() => {
+				var id = row.id;
+				this.$API.wpm.mlog.revert.req(id).then((res) => {
+					if (res.err_msg) {
+						this.$message.error(res.err_msg);
+					} else {
+						this.$refs.table.refresh();
+						this.$message.success("撤回成功");
+					}
+				});
+			});
+		},
+
 		//表格选择后回调事件
 		selectionChange(selection) {
 			this.selection = selection;

From fa0cfddc3c3d65a4f9f5756e92106267659ed9d5 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 1 Aug 2024 15:28:49 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=92=A4=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/mlogs.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue
index 6971b96a..6484c9f4 100644
--- a/src/views/wpm_gx/mlogs.vue
+++ b/src/views/wpm_gx/mlogs.vue
@@ -110,14 +110,14 @@
 							@click.stop="table_del(scope.row, scope.$index)"
 							>删除</el-button
 						>
-						<!-- <el-button
+						<el-button
 							link
 							v-else
 							size="small"
 							type="danger"
 							@click.stop="mlogRevert(scope.row)"
 							>撤回</el-button
-						> -->
+						>
 					</template>
 				</el-table-column>
 			</scTable>