From e548bd52af90b32bd94d631a8aa966516e0093b3 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 23 Nov 2023 17:27:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B0=E5=B2=97=E5=8D=95=E5=8A=A0=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hrm/attendance_form.vue | 72 ++++++++++++++++++++++++++-----
 src/views/wpm/worktask_form.vue   |  7 ++-
 2 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/src/views/hrm/attendance_form.vue b/src/views/hrm/attendance_form.vue
index 0565e8e7..72e3044d 100644
--- a/src/views/hrm/attendance_form.vue
+++ b/src/views/hrm/attendance_form.vue
@@ -5,8 +5,8 @@
 				<el-form ref="dialogForm" :model="form" :rules="rules" :disabled="mode === 'show'" label-width="120px">
 					<el-row>
 						<el-col :md="12" :sm="24">
-							<el-form-item label="所属部门">
-								<el-select v-model="belongDept" clearable style="width:100%" @change="getTeam">
+							<el-form-item label="所属部门" prop="belong_dept">
+								<el-select v-model="form.belong_dept" clearable style="width:100%" @change="getTeam">
 									<el-option v-for="item in deptOptions" :key="item.id" :label="item.name"
 										:value="item.id">
 									</el-option>
@@ -14,7 +14,7 @@
 							</el-form-item>
 						</el-col>
 						<el-col :md="12" :sm="24">
-							<el-form-item label="班次">
+							<el-form-item label="班次" prop="shift">
 								<el-select v-model="form.shift" placeholder="班次" clearable style="width:100%">
 									<el-option v-for="item in shiftOptions" :key="item.id" :label="item.name"
 										:value="item.id"></el-option>
@@ -22,7 +22,7 @@
 							</el-form-item>
 						</el-col>
 						<el-col :md="12" :sm="24">
-							<el-form-item label="班组">
+							<el-form-item label="班组" prop="team">
 								<el-select v-model="form.team" placeholder="班组" clearable style="width:100%"
 									@change="getuser">
 									<el-option v-for="item in teamOptions" :key="item.id" :label="item.name"
@@ -31,7 +31,7 @@
 							</el-form-item>
 						</el-col>
 						<el-col :md="12" :sm="24">
-							<el-form-item label="工作日期">
+							<el-form-item label="工作日期" prop="work_date">
 								<el-date-picker v-model="form.work_date" type="date" placeholder="工作日期" format="YYYY-MM-DD"
 									value-format="YYYY-MM-DD" style="width:100%" />
 							</el-form-item>
@@ -44,8 +44,42 @@
 					</el-row>
 				</el-form>
 				<sc-form-table v-model="userList" :addTemplate="addTemplate" placeholder="暂无数据">
-					<el-table-column prop="user_name" label="姓名"></el-table-column>
-					<el-table-column prop="mgroup_name" label="工段"></el-table-column>
+					<el-table-column prop="user_name" label="姓名">
+						<template #default="scope">
+							<span v-if="scope.row.user_name">{{ scope.row.user_name}}</span>
+							<el-select
+								v-else
+								v-model="scope.row.user"
+								filterable
+								placeholder="人员"
+							>
+								<el-option
+								v-for="item in userOptions"
+								:key="item.id"
+								:label="item.name"
+								:value="item.id"
+								></el-option>
+							</el-select>
+						</template>
+					</el-table-column>
+					<el-table-column prop="mgroup_name" label="工段">
+						<template #default="scope">
+							<span v-if="scope.row.mgroup_name">{{ scope.row.mgroup_name}}</span>
+							<el-select
+								v-else
+								v-model="scope.row.mgroup"
+								filterable
+								placeholder="工段"
+							>
+								<el-option
+								v-for="item in mgroupOptions"
+								:key="item.id"
+								:label="item.name"
+								:value="item.id"
+								></el-option>
+							</el-select>
+						</template>
+					</el-table-column>
 					<el-table-column prop="post_name" label="岗位"></el-table-column>
 					<el-table-column prop="type" label="到岗状态">
 						<template #default="scope">
@@ -88,7 +122,12 @@ export default {
 	emits: ["success", "closed"],
 	data() {
 		return {
-			belongDept: '',
+			addTemplate: {
+				user:'',
+				state:'normal',
+				note:'',
+				post:'',
+			},
 			loading: false,
 			mode: "add",
 			titleMap: {
@@ -112,8 +151,16 @@ export default {
 			teamOptions: [],
 			deptOptions: ['6车间', '7车间', '8车间', '10车间'],
 			shiftOptions: [],
+			userOptions:[],
+			mgroupOptions:[],
 			selectionFilters: [],
 			setFiltersVisible: false,
+			rules: {
+				belong_dept: [{required: true, message: "请选择部门", trigger: "blur"}],
+				shift: [{required: true, message: "请选择班次", trigger: "blur"}],
+				team: [{required: true, message: "请选择班组", trigger: "blur"}],
+				work_date: [{required: true, message: "请选择工作日期", trigger: "blur"}]
+			},
 		};
 	},
 	mounted() {
@@ -136,10 +183,15 @@ export default {
 		},
 		getTeam() {
 			//获取team
-			this.$API.mtm.team.list.req({ page: 0, belong_dept: this.belongDept }).then(res => {
+			this.$API.mtm.team.list.req({ page: 0, belong_dept: this.form.belong_dept }).then(res => {
 				this.teamOptions = res;
 			})
-
+			this.$API.system.user.list.req({ belong_dept: this.form.belong_dept, page: 0 }).then(res => {
+				this.userOptions = res;
+			})
+			this.$API.mtm.mgroup.list.req({ page:0,belong_dept:this.form.belong_dept}).then(res=>{
+				this.mgroupOptions = res;
+			});
 		},
 		getuser() {
 			this.$API.mtm.teammember.list.req({ team: this.form.team, page: 0 }).then(res => {
diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue
index c5e021cb..2f68b375 100644
--- a/src/views/wpm/worktask_form.vue
+++ b/src/views/wpm/worktask_form.vue
@@ -196,9 +196,12 @@
                 </el-col>
                 <el-col :md="12" :sm="24">
                     <el-form-item label="第几锅">
-                        <el-select v-model="form.index" placeholder="第几锅" clearable style="width:100%">
+                        <el-input-number v-model="form.index" controls-position="right" :min="1" step="1"
+                            :step-strictly="true" style="width:100%" placeholder="第几锅">
+                        </el-input-number>
+                        <!-- <el-select v-model="form.index" placeholder="第几锅" clearable style="width:100%">
                             <el-option v-for="item in 8" :key="item" :label="item" :value="item"></el-option>
-                        </el-select>
+                        </el-select> -->
                     </el-form-item>
                 </el-col>
                 <el-col :md="12" :sm="24">