fix:异常录入问题改正

src/views/enm_rm/logDetail.vue

@@ -574,10 +574,8 @@
 								</scTable>
 							</el-col>
 						</el-row>
-						<!-- <el-row :gutter="20" v-if="sflogExpVisiable"> -->
 						<el-dialog :title="stlogTitle" v-model="visible">
 							<el-form
-								v-if="sflogExpVisiable"
 								ref="sflogExpForm"
 								label-width="100px"
 								:model="sflogExpForm"
@@ -598,118 +596,8 @@
 									</el-col>
 								</el-row>
 							</el-form>
-							<el-form
-								v-else
-								ref="stlogForms"
-								:rules="rules"
-								label-width="100px"
-								:model="stlogForm"
-							>
-								<el-row>
-									<el-col :md="12" :sm="24">
-										<el-form-item label="异常类别">
-											<el-tag
-												v-if="stlogForm.is_shutdown"
-												type="danger"
-												>停机</el-tag
-											>
-											<el-tag v-else type="danger"
-												>其他</el-tag
-											>
-										</el-form-item>
-									</el-col>
-									<el-col :md="12" :sm="24">
-										<el-form-item label="异常名称">
-											<el-input
-												:disabled="
-													stlogForm.is_shutdown
-												"
-												v-model="stlogForm.title"
-												placeholder="异常名称"
-											/>
-										</el-form-item>
-									</el-col>
-									<el-col :md="12" :sm="24">
-										<el-form-item
-											label="发生时间"
-											prop="start_time"
-										>
-											<el-date-picker
-												:disabled="
-													stlogForm.is_shutdown
-												"
-												v-model="stlogForm.start_time"
-												type="datetime"
-												placeholder="发生时间"
-												value-format="YYYY-MM-DD HH:mm:ss"
-												style="width: 100%"
-											>
-											</el-date-picker>
-										</el-form-item>
-									</el-col>
-									<el-col :md="12" :sm="24">
-										<el-form-item label="结束时间">
-											<el-date-picker
-												:disabled="
-													stlogForm.is_shutdown
-												"
-												v-model="stlogForm.end_time"
-												type="datetime"
-												placeholder="结束时间"
-												value-format="YYYY-MM-DD HH:mm:ss"
-												style="width: 100%"
-											>
-											</el-date-picker>
-										</el-form-item>
-									</el-col>
-									<el-col :md="12" :sm="24">
-										<el-form-item
-											label="原因类别"
-											prop="cate"
-										>
-											<el-input
-												v-model="stlogForm.cate"
-												placeholder="原因类别"
-											/>
-										</el-form-item>
-									</el-col>
-									<el-col :md="12" :sm="24">
-										<el-form-item label="处置措施">
-											<el-input
-												v-model="stlogForm.measure"
-												placeholder="处置措施"
-											/>
-										</el-form-item>
-									</el-col>
-									<el-divider></el-divider>
-									<el-col>
-										<p>本班处理情况</p>
-									</el-col>
-									<el-col :md="12" :sm="24">
-										<el-form-item
-											label="处理备注"
-											prop="current_note"
-										>
-											<el-input
-												type="textarea"
-												:rows="2"
-												v-model="stlogForm.current_note"
-												placeholder="处理备注"
-											/>
-										</el-form-item>
-									</el-col>
-								</el-row>
-							</el-form>
 							<el-footer>
 								<el-button
-									v-if="sflogExpVisiable"
-									type="primary"
-									:loading="isSaveing"
-									@click="submit42"
-									>保存</el-button
-								>
-								<el-button
-									v-else
 									type="primary"
 									:loading="isSaveing"
 									@click="submit4"
@@ -720,6 +608,14 @@
 								>
 							</el-footer>
 						</el-dialog>
+						<stlog-dialog
+							v-if="stlogVisiable"
+							ref="stlogDialog"
+							:current_sflog="current_sflog"
+							:mgroupId="mgroupId"
+							@success="sflogExpSuccess"
+							@closed="stlogVisiable = false"
+						></stlog-dialog>
 					</el-tab-pane>
 				</el-tabs>
 			</el-card>
@@ -727,6 +623,7 @@
 	</el-container>
 </template>
 <script>
+import stlogDialog from "./stlog_form.vue";
 import saveDialog from "./handover_form.vue";
 import quastatDialog from "./quastat_form.vue";
 import otherDialog from "./other_form.vue";
@@ -736,6 +633,7 @@ export default {
 		saveDialog,
 		otherDialog,
 		quastatDialog,
+		stlogDialog,
 	},
 	data() {
 		return {
@@ -784,7 +682,8 @@ export default {
 				has_create_by: 1,
 			},
 			querystlog: { mgroup: "" },
-			sflogExpVisiable: false,
+			stlogVisiable: false,
+			cateOptions: ["工艺", "机械", "电气", "其他"],
 			checkList: [],
 			stlogList: [],
 			mpointStat: [],
@@ -968,84 +867,37 @@ export default {
 
 		//异常添加
 		addStlog() {
-			console.log("USER_INFO", this.$TOOL.data.get("USER_INFO"));
+			this.current_sflog = this.form.id;
-			this.stlogForm.current_sflog = this.form.id;
+			this.stlogVisiable = true;
-			this.stlogForm.current_note = "";
+			this.$nextTick(() => {
-			this.stlogForm.cate = "1";
+				this.$refs.stlogDialog.open("add");
-			this.stlogForm.title = "";
+			});
-			this.stlogForm.reason = "";
-			this.stlogForm.measure = "";
-			this.stlogForm.start_time = "";
-			this.stlogForm.end_time = "";
-			this.stlogForm.handler = this.$TOOL.data.get("USER_INFO").id;
-			this.stlogForm.mgroup = this.mgroupId;
-			this.stlogTitle = "新增异常";
-			this.sflogExpVisiable = false;
-			this.visible = true;
 		},
 		//异常编辑
 		editStlog(row) {
-			this.stlogTitle = "编辑异常";
+			this.current_sflog = this.form.id;
-			this.stlogForm = row;
+			this.stlogVisiable = true;
-			this.stlogForm.current_sflog = row.sflog;
+			this.$nextTick(() => {
-			this.sflogExpVisiable = false;
+				this.$refs.stlogDialog.open("edit").setData(row);
-			this.visible = true;
+			});
 		},
 		handleStlog() {
 			this.stlogTitle = "异常处理";
 			this.stlogForm = row;
 			this.visible = true;
-			this.sflogExpVisiable = true;
 		},
-		//新增异常提交
+		//异常处理
 		submit4() {
-			let that = this;
-			that.$refs.stlogForms.validate(async (valid) => {
-				if (valid) {
-					that.isSaveing = true;
-					if (that.stlogTitle == "新增异常") {
-						that.$API.wpm.stlog.create
-							.req(that.stlogForm)
-							.then((res) => {
-								that.isSaveing = false;
-								that.visible = false;
-								that.$message.success("操作成功");
-								this.getStlog();
-							})
-							.catch((res) => {
-								that.isSaveing = false;
-							});
-					} else if (that.stlogTitle == "编辑异常") {
-						console.log("that.stlogForm", that.stlogForm);
-						console.log("that.stlogForm.id", that.stlogForm.id);
-						that.$API.wpm.stlog.update
-							.req(that.stlogForm.id, that.stlogForm)
-							.then((res) => {
-								that.isSaveing = false;
-								that.visible = false;
-								that.$message.success("操作成功");
-								this.getStlog();
-							})
-							.catch((res) => {
-								that.isSaveing = false;
-							});
-					}
-				}
-			});
-		},
-		submit42() {
 			let that = this;
 			that.$API.wpm.sflogexp.update
 				.req(that.sflogExpForm.id, that.sflogExpForm)
 				.then((res) => {
-					this.sflogExpVisiable = false;
 					that.isSaveing = false;
 					that.visible = false;
 					that.$message.success("操作成功");
 					that.getSflogexp(that.clickItem.id);
 				})
 				.catch((res) => {
-					this.sflogExpVisiable = false;
 					that.isSaveing = false;
 				});
 		},
@@ -1084,7 +936,6 @@ export default {
 			this.stlogTitle = "本班处理情况";
 			this.sflogExpForm.id = row.id;
 			this.sflogExpForm.note = row.note;
-			this.sflogExpVisiable = true;
 			this.visible = true;
 		},
 		//异常处理
@@ -1093,7 +944,6 @@ export default {
 			this.stlogTitle = "异常处理";
 			this.stlogForm.handler = this.$TOOL.data.get("USER_INFO").id;
 			this.visible = true;
-			this.sflogExpVisiable = false;
 		},
 		//测点录入提交
 		submit5(item) {

src/views/enm_rm/stlog_form.vue

@@ -0,0 +1,226 @@
+<template>
+	<el-dialog
+		:title="titleMap[mode]"
+		v-model="visible"
+		:size="1000"
+		destroy-on-close
+		@closed="$emit('closed')"
+	>
+		<el-container v-loading="loading">
+			<el-main style="padding: 0 20px 20px 20px">
+				<el-form
+					ref="form"
+					:rules="rules"
+					label-width="100px"
+					:model="form"
+				>
+					<el-row>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="异常类别">
+								<el-tag v-if="form.is_shutdown" type="danger"
+									>停机</el-tag
+								>
+								<el-tag v-else type="danger">其他</el-tag>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="异常名称">
+								<el-input
+									:disabled="form.is_shutdown"
+									v-model="form.title"
+									placeholder="异常名称"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="发生时间" prop="start_time">
+								<el-date-picker
+									:disabled="form.is_shutdown"
+									v-model="form.start_time"
+									type="datetime"
+									placeholder="发生时间"
+									value-format="YYYY-MM-DD HH:mm:ss"
+									style="width: 100%"
+								>
+								</el-date-picker>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="结束时间">
+								<el-date-picker
+									:disabled="form.is_shutdown"
+									v-model="form.end_time"
+									type="datetime"
+									placeholder="结束时间"
+									value-format="YYYY-MM-DD HH:mm:ss"
+									style="width: 100%"
+								>
+								</el-date-picker>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="异常原因">
+								<el-input
+									:disabled="form.is_shutdown"
+									v-model="form.reason"
+									placeholder="异常原因"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="原因类别" prop="cate">
+								<el-select
+									v-model="form.cate"
+									placeholder="原因类别"
+									clearable
+									style="width: 100%"
+								>
+									<el-option
+										v-for="item in cateOptions"
+										:key="item"
+										:label="item"
+										:value="item"
+									>
+									</el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="处置措施">
+								<el-input
+									v-model="form.measure"
+									placeholder="处置措施"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-divider></el-divider>
+						<el-col>
+							<p>本班处理情况</p>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="处理备注" prop="current_note">
+								<el-input
+									type="textarea"
+									:rows="2"
+									v-model="form.current_note"
+									placeholder="处理备注"
+								/>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+			</el-main>
+			<el-footer>
+				<el-button type="primary" :loading="isSaveing" @click="submit"
+					>保存</el-button
+				>
+				<el-button @click="visible = false">取消</el-button>
+			</el-footer>
+		</el-container>
+	</el-dialog>
+</template>
+<script>
+export default {
+	emits: ["success", "closed"],
+	props: {
+		current_sflog: {
+			type: [String],
+			default: "",
+		},
+		mgroupId: {
+			type: [String],
+			default: "",
+		},
+	},
+	data() {
+		return {
+			loading: false,
+			mode: "add",
+			titleMap: {
+				add: "新增异常",
+				edit: "编辑异常",
+				show: "查看异常",
+			},
+			form: {
+				current_sflog: "",
+				current_note: "",
+				title: "",
+				start_time: "",
+				end_time: "",
+				cate: "",
+				reason: "",
+				measure: "",
+				handler: "",
+				mgroup: "",
+				is_shutdown: false,
+			},
+			rules: {
+				title: [{ required: true, message: "请输入", trigger: "blur" }],
+				start_time: [{ required: true, message: "请选择发生时间" }],
+				current_note: [
+					{ required: true, message: "请填写值班异常处理备注" },
+				],
+			},
+			visible: false,
+			isSaveing: false,
+			cateOptions: ["工艺", "机械", "电气", "其他"],
+			setFiltersVisible: false,
+		};
+	},
+	mounted() {},
+	methods: {
+		//显示
+		open(mode = "add") {
+			this.mode = mode;
+			this.visible = true;
+			return this;
+		},
+		//表单提交方法
+		submit() {
+			this.$refs.dialogForm.validate(async (valid) => {
+				if (valid) {
+					this.isSaveing = true;
+					if (mode == "add") {
+						this.form.mgroup = this.mgroupId;
+						this.form.current_sflog = this.current_sflog;
+						this.form.handler = this.$TOOL.data.get("USER_INFO").id;
+						that.$API.wpm.stlog.create
+							.req(this.form)
+							.then((res) => {
+								this.isSaveing = false;
+								this.$emit("success", this.form, this.mode);
+								this.visible = false;
+								this.$message.success("操作成功");
+							})
+							.catch((err) => {
+								this.isSaveing = false;
+							});
+					} else {
+						that.$API.wpm.stlog.update
+							.req(this.form.id, this.form)
+							.then((res) => {
+								this.isSaveing = false;
+								this.$emit("success", this.form, this.mode);
+								this.visible = false;
+								this.$message.success("操作成功");
+							})
+							.catch((err) => {
+								this.isSaveing = false;
+							});
+					}
+				}
+			});
+		},
+		//表单注入数据
+		setData(data) {
+			Object.assign(this.form, data);
+		},
+		//设置过滤项
+		setFilters(filters) {
+			this.selectionFilters = filters;
+			this.setFiltersVisible = true;
+		},
+	},
+};
+</script>
+<style></style>