From f64e1a3b84233089d09b490a077e4abfbb7f0ac1 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 7 Aug 2024 09:07:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=89=98=E5=85=8B=E9=80=8A=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E8=AF=A6=E6=83=85=E7=9A=84=E6=B5=8B=E7=82=B9=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E6=B7=BB=E5=8A=A0=E6=B5=8B=E7=82=B9=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC=E6=94=B9=E4=B8=BA=E6=B5=8B=E7=82=B9=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enm_rm/logDetail.vue | 225 ++++++++++++++++-----------------
 1 file changed, 108 insertions(+), 117 deletions(-)

diff --git a/src/views/enm_rm/logDetail.vue b/src/views/enm_rm/logDetail.vue
index 6c93750a..194a0d47 100644
--- a/src/views/enm_rm/logDetail.vue
+++ b/src/views/enm_rm/logDetail.vue
@@ -30,6 +30,21 @@
 					"
 					>新增异常</el-button
 				>
+				<el-select
+				v-if="activeName == 'mpoint'"
+							v-model="querymplog.mpoint"
+							placeholder="请选择"
+							clearable
+							class="mpointChange"
+							@change="mpointChange"
+						>
+							<el-option
+								v-for="item in mpointOptions"
+								:key="item.id"
+								:label="item.name"
+								:value="item.id"
+							></el-option>
+						</el-select>
 				<el-tabs
 					ref="infoTabd"
 					v-model="activeName"
@@ -76,12 +91,12 @@
 										/>
 									</el-form-item>
 								</el-col>
-								<el-col
+								<!-- <el-col
 									:md="12"
 									:sm="24"
 									v-if="
 										form.shift_name == '白班' &&
-										mgroupId == '3347217246321065984'
+										form.mgroup_name == '电石渣'
 									"
 								>
 									<el-form-item label="煤粉热值">
@@ -92,7 +107,7 @@
 											style="width: 100%"
 										/>
 									</el-form-item>
-								</el-col>
+								</el-col> -->
 								<!-- 煤粉热值 -->
 								<el-col
 									:md="12"
@@ -121,68 +136,6 @@
 					</el-tab-pane>
 					<el-tab-pane label="测点录入" name="mpoint">
 						<el-row>
-							<el-col :md="12" :sm="24">
-								<scTable
-									ref="mpointStatTable"
-									:apiObj="apiObj"
-									:query="querymplogX"
-									:params="querymplogX"
-									row-key="id"
-									stripe
-									hideSetting
-									:height="heightTable"
-									highlightCurrentRow
-								>
-									<el-table-column type="index" width="50" />
-									<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">
-											<span
-												>{{ scope.row.year_s }}-{{
-													scope.row.month_s
-												}}-{{ scope.row.day_s }}</span
-											>
-										</template>
-									</el-table-column>
-									<el-table-column
-										label="录入时间"
-										prop="create_time"
-									>
-									</el-table-column>
-									<el-table-column
-										label="操作"
-										fixed="right"
-										align="center"
-										width="60"
-									>
-										<template #default="scope">
-											<el-button
-												link
-												size="small"
-												@click="
-													mpointStat_del(scope.row)
-												"
-												type="danger"
-												>删除</el-button
-											>
-										</template>
-									</el-table-column>
-								</scTable>
-							</el-col>
 							<el-col :md="12" :sm="24" :key="updateKey">
 								<el-form
 									:key="updateKey"
@@ -214,25 +167,69 @@
 												<el-button
 													type="primary"
 													:loading="isSaveing"
-													:disabled="
-														item.mpFormValAble
-													"
 													@click="submit5(item)"
-													style="float: right"
+													style="margin-left: 20px"
 													>保存</el-button
 												>
 											</el-col>
 										</el-row>
 									</template>
 								</el-form>
-								<!-- <el-footer style="text-align: center">
-									<el-button
-										type="primary"
-										:loading="isSaveing"
-										@click="submit5"
-										>保存</el-button
+							</el-col>
+							<el-col :md="12" :sm="24">
+								<scTable
+									ref="mpointStatTable"
+									:apiObj="apiObj"
+									:query="querymplog"
+									:params="querymplogX"
+									row-key="id"
+									stripe
+									hideSetting
+									:height="heightTable"
+									highlightCurrentRow
+								>
+									<el-table-column type="index" width="50" />
+									<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="录入值" prop="val">
+									</el-table-column>
+									<el-table-column label="班组时间">
+										<template #default="scope">
+											<span>
+												{{ scope.row.year_s }}-{{scope.row.month_s}}-{{ scope.row.day_s }}
+											</span>
+										</template>
+									</el-table-column>
+									<el-table-column
+										label="录入时间"
+										prop="create_time"
 									>
-								</el-footer> -->
+									</el-table-column>
+									<el-table-column
+										label="操作"
+										fixed="right"
+										align="center"
+										width="60"
+									>
+										<template #default="scope">
+											<el-button
+												link
+												size="small"
+												@click="mpointStat_del(scope.row)"
+												type="danger"
+												>删除</el-button
+											>
+										</template>
+									</el-table-column>
+								</scTable>
 							</el-col>
 						</el-row>
 					</el-tab-pane>
@@ -269,9 +266,9 @@
 								min-width="150"
 							>
 								<template #default="scope">
-									<span v-if="scope.row.id">{{
-										scope.row.material_name
-									}}</span>
+									<span v-if="scope.row.id">
+										{{scope.row.material_name}}
+									</span>
 								</template>
 							</el-table-column>
 							<el-table-column
@@ -280,9 +277,9 @@
 								min-width="150"
 							>
 								<template #default="scope">
-									<span v-if="scope.row.id">{{
-										scope.row.testitem_name
-									}}</span>
+									<span v-if="scope.row.id">
+										{{scope.row.testitem_name}}
+									</span>
 								</template>
 							</el-table-column>
 							<el-table-column
@@ -331,24 +328,15 @@
 							>
 						</el-footer>
 					</el-tab-pane>
-					<el-tab-pane label="其他成本" name="third">
-						<div
-							v-if="
-								mgroupId == '3346491835287007232' ||
-								mgroupId == '3347217651339837440' ||
-								mgroupId == '3347217246321065984'
-							"
-						>
+					<!-- <el-tab-pane label="其他成本" name="third">
+						<div>
 							<el-form
 								ref="thirdForms"
 								:model="thirdForm"
 								label-width="100px"
 								label-position="right"
 							>
-								<!-- 电石渣 -->
-								<el-row
-									v-if="mgroupId == '3346491835287007232'"
-								>
+								<el-row v-if="form.mgroup_name == '电石渣'">
 									<el-col :md="12" :sm="24">
 										<el-form-item label="湿电石渣">
 											<el-input-number
@@ -359,10 +347,7 @@
 										</el-form-item>
 									</el-col>
 								</el-row>
-								<!-- 回转窑 -->
-								<el-row
-									v-if="mgroupId == '3347217246321065984'"
-								>
+								<el-row v-if="form.mgroup_name == '回转窑'">
 									<el-col :md="12" :sm="24">
 										<el-form-item label="柴油">
 											<el-input-number
@@ -373,10 +358,7 @@
 										</el-form-item>
 									</el-col>
 								</el-row>
-								<!-- 水泥磨 -->
-								<el-row
-									v-if="mgroupId == '3347217651339837440'"
-								>
+								<el-row v-if="form.mgroup_name == '水泥磨'">
 									<el-col :md="12" :sm="24">
 										<el-form-item label="助剂">
 											<el-input-number
@@ -386,6 +368,8 @@
 											/>
 										</el-form-item>
 									</el-col>
+								</el-row>
+								<el-row v-if="form.mgroup_name == '水泥包装'">
 									<el-col :md="12" :sm="24">
 										<el-form-item label="包装">
 											<el-input-number
@@ -406,18 +390,7 @@
 								>
 							</el-footer>
 						</div>
-						<div
-							v-else
-							style="
-								width: 100%;
-								height: 200px;
-								line-height: 200px;
-								text-align: center;
-							"
-						>
-							无其他成本
-						</div>
-					</el-tab-pane>
+					</el-tab-pane> -->
 					<el-tab-pane label="异常" name="fourth">
 						<el-row :gutter="20">
 							<el-col :span="14">
@@ -676,6 +649,9 @@ export default {
 			sflogExpForm: {
 				note: "",
 			},
+			querymplog:{
+				mpoint:''
+			},
 			querymplogX: {
 				page: 0,
 				mpoint__type: 30,
@@ -745,6 +721,7 @@ export default {
 					that.mpointOptions = [];
 					res.forEach((item) => {
 						item.mpFormVal = "";
+						item.mpFormValAble = false;
 						that.mpointOptions.push(item);
 					});
 					that.getMpointStat();
@@ -765,14 +742,18 @@ export default {
 					let day_s = item.day_s > 9 ? item.day_s : "0" + item.day_s;
 					let work_date = item.year_s + "-" + month_s + "-" + day_s;
 					that.mpointOptions.forEach((item2) => {
-						if (item2.name == item.mpoint_name) {
+						let work_date =
+							item.year_s + "-" + month_s + "-" + day_s;
+						if (
+							item2.name == item.mpoint_name &&
+							work_date == this.form.work_date
+						) {
 							item2.mpFormValAble = true;
 							item2.mpFormVal = item.val;
 						}
 					});
-					console.log(that.mpointOptions);
+					// console.log(that.mpointOptions);
 					that.updateKey = !that.updateKey;
-					// that.$set(that.mpointOptions,"that.mpointOptions","新的值");
 					that.$forceUpdate();
 				});
 			});
@@ -828,6 +809,9 @@ export default {
 				}
 			});
 		},
+		mpointChange(){
+			this.$refs.mpointStatTable.queryData(this.querymplog);
+		},
 		//****** seconed 质量检验  ******* */
 		//检验
 		getsflogItem() {
@@ -1004,4 +988,11 @@ export default {
 .searchBtn {
 	margin-left: 5px;
 }
+.mpointChange{
+	width:150px;
+	position: absolute;
+	top: 6px;
+	right:10px;
+	z-index: 100;
+}
 </style>