From e6b945b15229587f4695f8f0d2047e2ea82f76b8 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 1 Aug 2024 10:41:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BA=A4=E6=8E=A5=E5=8D=95=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=AD=A3=EF=BC=8C=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enm_rm/logDetail.vue | 119 ++++++++++++++++++++-------------
 src/views/wpm_gx/handover.vue  |  16 ++++-
 src/views/wpm_gx/inm.vue       |  14 ++--
 3 files changed, 94 insertions(+), 55 deletions(-)

diff --git a/src/views/enm_rm/logDetail.vue b/src/views/enm_rm/logDetail.vue
index 070ee9f7..04bffc8d 100644
--- a/src/views/enm_rm/logDetail.vue
+++ b/src/views/enm_rm/logDetail.vue
@@ -134,10 +134,20 @@
 									highlightCurrentRow
 								>
 									<el-table-column type="index" width="50" />
-									<el-table-column
-										label="名称"
-										prop="mpoint_nickname"
-									>
+									<el-table-column label="名称">
+										<template #default="scope">
+											<span
+												v-if="
+													scope.row.mpoint_nickname !=
+													null
+												"
+											>
+												{{ scope.row.mpoint_nickname }}
+											</span>
+											<span v-else>
+												{{ scope.row.mpoint_name }}
+											</span>
+										</template>
 									</el-table-column>
 									<el-table-column label="班组时间">
 										<template #default="scope">
@@ -173,38 +183,56 @@
 									</el-table-column>
 								</scTable>
 							</el-col>
-							<el-col :md="12" :sm="24" v-if="!mpFormVal">
+							<el-col :md="12" :sm="24" :key="updateKey">
 								<el-form
+									:key="updateKey"
 									ref="mpointForm"
-									:model="mpForm"
 									:rules="rules"
-									label-width="120px"
+									label-width="150px"
 									label-position="right"
-									v-if="form.mgroup_name == '石灰石破碎'"
+									v-if="mpointOptions.length > 0"
 								>
 									<template
 										v-for="item in mpointOptions"
 										:key="item.id"
 									>
-										<!-- 石灰石破碎 -->
-										<el-form-item :label="item.name">
-											<el-input-number
-												v-model="mpForm.val"
-												controls-position="right"
-												placeholder="请输入"
-												style="width: 100%"
-											/>
-										</el-form-item>
+										<el-row>
+											<el-col :span="20">
+												<el-form-item
+													:label="item.name"
+													required="1"
+												>
+													<el-input-number
+														v-model="item.mpFormVal"
+														controls-position="right"
+														placeholder="请输入"
+														style="width: 100%"
+													/>
+												</el-form-item>
+											</el-col>
+											<el-col :span="4">
+												<el-button
+													type="primary"
+													:loading="isSaveing"
+													:disabled="
+														item.mpFormValAble
+													"
+													@click="submit5(item)"
+													style="float: right"
+													>保存</el-button
+												>
+											</el-col>
+										</el-row>
 									</template>
 								</el-form>
-								<el-footer style="text-align: center">
+								<!-- <el-footer style="text-align: center">
 									<el-button
 										type="primary"
 										:loading="isSaveing"
 										@click="submit5"
 										>保存</el-button
 									>
-								</el-footer>
+								</el-footer> -->
 							</el-col>
 						</el-row>
 					</el-tab-pane>
@@ -717,15 +745,11 @@ export default {
 			visible: false,
 			hideDelete: true,
 			isSaveing: false,
-			mpFormVal: false,
 			activeName: "first",
 			stlogTitle: "新增异常",
 			clickItem: {},
 			sflogItem: {},
 			form: {},
-			mpForm: {
-				val: null,
-			},
 			thirdForm: {
 				num: "",
 			},
@@ -770,6 +794,7 @@ export default {
 			apiObj: null,
 			apiObjStlog: null,
 			heightTable: null,
+			updateKey: false,
 		};
 	},
 	mounted() {
@@ -781,10 +806,7 @@ export default {
 		this.apiObjStlog = this.$API.wpm.stlog.list;
 		let form = this.$TOOL.data.get("sflogItem");
 		this.form = JSON.parse(form);
-		if (this.form.mgroup_name == "石灰石破碎") {
-			this.getMpoint();
-			this.getMpointStat();
-		}
+		this.getMpoint();
 		this.getTeam();
 		this.getStlog();
 		let height = document.getElementById("elMain").clientHeight;
@@ -820,7 +842,14 @@ export default {
 			form.enabled = 1;
 			form.mgroup = that.mgroupId;
 			that.$API.enm.mpoint.list.req(form).then((res) => {
-				that.mpointOptions = res;
+				if (res.length > 0) {
+					that.mpointOptions = [];
+					res.forEach((item) => {
+						item.mpFormVal = "";
+						that.mpointOptions.push(item);
+					});
+					that.getMpointStat();
+				}
 			});
 		},
 		getMpointStat() {
@@ -830,22 +859,22 @@ export default {
 			form.has_create_by = 1;
 			form.mgroup = that.mgroupId;
 			that.$API.enm.mpoint.stat.req(form).then((res) => {
-				console.log("res", res);
 				that.mpointStat = res.results;
-
-				// this.$refs.mpointStatTable.queryData(form);
 				res.results.forEach((item) => {
 					let month_s =
 						item.month_s > 9 ? item.month_s : "0" + item.month_s;
 					let day_s = item.day_s > 9 ? item.day_s : "0" + item.day_s;
 					let work_date = item.year_s + "-" + month_s + "-" + day_s;
-					// debugger;
-					// console.log("work_date", work_date);
-					// console.log("that.form.work_date", that.form.work_date);
-					if (work_date == that.form.work_date) {
-						that.mpForm.val = item.val;
-						this.mpFormVal = true;
-					}
+					that.mpointOptions.forEach((item2) => {
+						if (item2.name == item.mpoint_name) {
+							item2.mpFormValAble = true;
+							item2.mpFormVal = item.val;
+						}
+					});
+					console.log(that.mpointOptions);
+					that.updateKey = !that.updateKey;
+					// that.$set(that.mpointOptions,"that.mpointOptions","新的值");
+					that.$forceUpdate();
 				});
 			});
 		},
@@ -857,10 +886,9 @@ export default {
 				that.$API.enm.mpoint.statDelete
 					.req(row.id)
 					.then((res) => {
-						that.$message.success("删除成功");
-						that.mpFormVal = false;
 						that.getMpointStat();
 						that.$refs.mpointStatTable.refresh();
+						that.$message.success("删除成功");
 					})
 					.catch((err) => {
 						this.$message.success(err);
@@ -1067,20 +1095,21 @@ export default {
 			this.visible = true;
 			this.sflogExpVisiable = false;
 		},
-		submit5() {
+		//测点录入提交
+		submit5(item) {
 			let that = this;
 			that.isSaveing = true;
 			let obj = {};
-			obj.val = that.mpForm.val;
+			obj.val = item.mpFormVal;
 			obj.sflog = that.form.id;
 			obj.mgroup = that.mgroupId;
-			obj.mpoint = that.mpointOptions[0].id;
+			obj.mpoint = item.id;
 			that.$API.enm.mpoint.statCreate
 				.req(obj)
 				.then((res) => {
 					that.isSaveing = false;
-					that.$message.success("操作成功");
-					that.mpFormVal = true;
+					that.$message.success("保存成功");
+					that.getMpointStat();
 					that.$refs.mpointStatTable.refresh();
 				})
 				.catch((res) => {
diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index 875d8ea0..394c5631 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -74,6 +74,14 @@
 				<el-table-column label="批次" prop="batch" min-width="100">
 				</el-table-column>
 				<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
+						>
+					</template>
+				</el-table-column>
 				<el-table-column
 					label="交送人"
 					prop="send_user_name"
@@ -127,6 +135,10 @@
 						>
 						<el-popconfirm
 							title="确定删除吗？"
+							v-if="
+								scope.row.send_mgroup == mgroupId &&
+								scope.row.submit_time == null
+							"
 							@confirm="table_del(scope.row, scope.$index)"
 						>
 							<template #reference>
@@ -216,7 +228,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;
 				}
@@ -281,7 +293,7 @@ export default {
 		//删除
 		async table_del(row) {
 			var id = row.id;
-			var res = await this.$API.mtm.mgroup.delete.req(id);
+			var res = await this.$API.wpm.handover.delete.req(id);
 			if (res.err_msg) {
 				this.$message.error(res.err_msg);
 			} else {
diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue
index 6c132b3b..6d38e655 100644
--- a/src/views/wpm_gx/inm.vue
+++ b/src/views/wpm_gx/inm.vue
@@ -42,17 +42,16 @@
 				<el-table-column
 					label="物料名称"
 					prop="material_name"
-					min-width="100"
+					min-width="120"
 				></el-table-column>
 				<el-table-column
 					label="批次号"
 					prop="batch"
-					min-width="100"
+					min-width="120"
 				></el-table-column>
 				<el-table-column
 					label="所属部门"
 					prop="belong_dept_name"
-					min-width="150"
 				></el-table-column>
 				<el-table-column
 					label="数量"
@@ -62,14 +61,13 @@
 				<el-table-column
 					label="不合格标记"
 					prop="notok_sign_name"
-					min-width="80"
 				></el-table-column>
 				<el-table-column
 					label="创建时间"
 					prop="create_time"
-					min-width="150"
+					width="150"
 				></el-table-column>
-				<el-table-column
+				<!-- <el-table-column
 					label="操作"
 					fixed="right"
 					align="center"
@@ -100,7 +98,7 @@
 							</template>
 						</el-popconfirm>
 					</template>
-				</el-table-column>
+				</el-table-column> -->
 			</scTable>
 		</el-main>
 		<el-dialog title="选择物料" v-model="materialsVisible" width="90%">
@@ -152,7 +150,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;
 				}