From 7d7c5f2dcc43dac9381a38659691d169eeb9c942 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 24 Jul 2024 16:41:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF-=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=A2=9E=E5=8A=A0=E5=A4=96=E5=8D=8F=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/mlog_form.vue | 197 +++++++++++++++++++++------------
 1 file changed, 125 insertions(+), 72 deletions(-)

diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue
index 18dcb787..33b831b4 100644
--- a/src/views/wpm_gx/mlog_form.vue
+++ b/src/views/wpm_gx/mlog_form.vue
@@ -13,64 +13,52 @@
 					:model="form"
 					:rules="rules"
 					label-position="right"
-					label-width="80px"
+					label-width="100px"
 					style="padding: 0 10px"
 				>
 					<el-row>
 						<el-col :md="12" :sm="24">
-							<el-form-item
-								label="开始时间"
-								prop="work_start_time"
-							>
-								<el-date-picker
+							<el-form-item label="生产类型" prop="mtype">
+								<el-select
+									v-model="form.mtype"
+									placeholder="生产类型"
+									clearable
 									:disabled="mode == 'edit'"
-									v-model="form.work_start_time"
-									type="datetime"
-									value-format="YYYY-MM-DD HH:mm:ss"
-								/>
+									style="width: 100%"
+								>
+									<el-option
+										v-for="item in typeOptions"
+										: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="work_end_time">
-								<el-date-picker
-									v-model="form.work_end_time"
-									type="datetime"
-									value-format="YYYY-MM-DD HH:mm:ss"
-								/>
-							</el-form-item>
-						</el-col>
-						<el-col :span="24">
-							<el-form-item label="间隔提醒">
-								<el-input-number
-									v-model="form.reminder_interval_list[0]"
-									:min="1"
-									:disabled="mode == 'edit'"
-									style="width: 25%"
-									controls-position="right"
-								/>
-								<el-input-number
-									v-model="form.reminder_interval_list[1]"
-									:min="1"
-									:disabled="mode == 'edit'"
-									style="width: 25%"
-									controls-position="right"
-								/>
-								<el-input-number
-									v-model="form.reminder_interval_list[2]"
-									:min="1"
-									:disabled="mode == 'edit'"
-									style="width: 25%"
-									controls-position="right"
-								/>
-								<el-input-number
-									v-model="form.reminder_interval_list[3]"
-									:min="1"
-									:disabled="mode == 'edit'"
-									style="width: 25%"
-									controls-position="right"
-								/>
+							<el-form-item
+								label="外协单位"
+								prop="supplier"
+								v-if="form.mtype == 20"
+							>
+								<el-select
+									v-model="form.supplier"
+									placeholder="外协单位"
+									clearable
+									:disabled="mode == 'edit'"
+									style="width: 100%"
+								>
+									<el-option
+										v-for="item in supplierOptions"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									></el-option>
+								</el-select>
 							</el-form-item>
 						</el-col>
+					</el-row>
+					<el-row>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="生产路线" prop="route">
 								<el-select
@@ -113,6 +101,31 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item
+								label="开始时间"
+								prop="work_start_time"
+							>
+								<el-date-picker
+									:disabled="mode == 'edit'"
+									v-model="form.work_start_time"
+									type="datetime"
+									value-format="YYYY-MM-DD HH:mm:ss"
+									style="width: 100%"
+								/>
+							</el-form-item>
+						</el-col>
+
+						<el-col :md="12" :sm="24">
+							<el-form-item label="结束时间" prop="work_end_time">
+								<el-date-picker
+									v-model="form.work_end_time"
+									type="datetime"
+									value-format="YYYY-MM-DD HH:mm:ss"
+									style="width: 100%"
+								/>
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="操作人">
 								<el-select
@@ -130,26 +143,6 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
-							<el-form-item label="生产类型" prop="mtype">
-								<el-select
-									v-model="form.mtype"
-									placeholder="生产类型"
-									clearable
-									:disabled="mode == 'edit'"
-									style="width: 100%"
-								>
-									<el-option
-										label="自产"
-										value="10"
-									></el-option>
-									<el-option
-										label="外协"
-										value="20"
-									></el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="备注">
 								<el-input
@@ -158,6 +151,39 @@
 								></el-input>
 							</el-form-item>
 						</el-col>
+						<el-col :span="24">
+							<el-form-item label="间隔提醒">
+								<el-input-number
+									v-model="form.reminder_interval_list[0]"
+									:min="1"
+									:disabled="mode == 'edit'"
+									style="width: 25%"
+									controls-position="right"
+								/>
+								<el-input-number
+									v-model="form.reminder_interval_list[1]"
+									:min="1"
+									:disabled="mode == 'edit'"
+									style="width: 25%"
+									controls-position="right"
+								/>
+								<el-input-number
+									v-model="form.reminder_interval_list[2]"
+									:min="1"
+									:disabled="mode == 'edit'"
+									style="width: 25%"
+									controls-position="right"
+								/>
+								<el-input-number
+									v-model="form.reminder_interval_list[3]"
+									:min="1"
+									:disabled="mode == 'edit'"
+									style="width: 25%"
+									controls-position="right"
+								/>
+								<div class="form_unit">(h)</div>
+							</el-form-item>
+						</el-col>
 					</el-row>
 				</el-form>
 			</el-main>
@@ -198,14 +224,21 @@ export default {
 			loading: false,
 			mode: "add",
 			titleMap: {
-				add: "新增",
-				edit: "编辑",
-				show: "查看",
+				add: "新增日志",
+				edit: "编辑日志",
+				show: "查看日志",
 			},
 			//表单数据
 			form: defaultForm,
 			//验证规则
 			rules: {
+				supplier: [
+					{
+						required: true,
+						message: "请选择供应商",
+						trigger: "blur",
+					},
+				],
 				work_start_time: [
 					{
 						required: true,
@@ -228,17 +261,23 @@ export default {
 					},
 				],
 			},
+			typeOptions: [
+				{ id: 10, name: "自产" },
+				{ id: 20, name: "外协" },
+			],
 			visible: false,
 			isSaveing: false,
 			options: [],
 			routeOptions: [],
 			userOptions: [],
+			supplierOptions: [],
 			setFiltersVisible: false,
 		};
 	},
 	mounted() {
 		this.getRoute();
 		this.getUser();
+		this.getSupplier();
 		this.getEquipment();
 	},
 	methods: {
@@ -255,6 +294,15 @@ export default {
 					this.options = res;
 				});
 		},
+		getSupplier() {
+			let that = this;
+			let obj = {};
+			obj.page = 0;
+			obj.can_outsource = true;
+			that.$API.pum.supplier.list.req(obj).then((res) => {
+				that.supplierOptions = res;
+			});
+		},
 		getRoute(id) {
 			let that = this;
 			that.$API.mtm.route.list
@@ -319,4 +367,9 @@ export default {
 };
 </script>
 
-<style></style>
+<style>
+.form_unit {
+	position: absolute;
+	right: -25px;
+}
+</style>