From c045666cb9bdcacb2aeb2dba4d806db1cd6b3bed Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 20 三月 2026 11:14:18 +0800
Subject: [PATCH] 金鹰黄金 1.新增劳保台账选择岗位刷新人员列表接口修改 2.设备保养、巡检任务要设备可以多选
---
src/views/lavorissue/ledger/Modal.vue | 140 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 107 insertions(+), 33 deletions(-)
diff --git a/src/views/lavorissue/ledger/Modal.vue b/src/views/lavorissue/ledger/Modal.vue
index f5b0e3a..2c77e24 100644
--- a/src/views/lavorissue/ledger/Modal.vue
+++ b/src/views/lavorissue/ledger/Modal.vue
@@ -2,19 +2,26 @@
<el-dialog :title="modalOptions.title" v-model="visible" @close="close" width="60%">
<el-form :model="form" label-width="100px" :rules="formRules" ref="formRef">
<el-form-item label="宀椾綅鍚嶇О" prop="deptPositionId">
- <el-select v-model="form.deptPositionId" placeholder="璇烽�夋嫨" clearable @change="handlePositionChange">
- <el-option :label="item.name" :value="item.id" v-for="(item,index) in positionOptions" :key="item.id" />
- </el-select>
- </el-form-item>
- <el-form-item label="鍔充繚绫诲瀷" prop="dictType">
- <el-select v-model="form.dictType" placeholder="璇烽�夋嫨" clearable>
- <el-option :label="item.label" :value="item.value" v-for="(item,index) in sys_lavor_issue_type" :key="item.value" />
- </el-select>
- </el-form-item>
- <el-form-item label="鍔充繚鐢ㄥ搧" prop="dictId">
- <el-select v-model="form.dictId" placeholder="璇烽�夋嫨" clearable>
- <el-option :label="item.dictName" :value="item.dictId" v-for="(item,index) in laborSuppliesOptions" :key="item.dictId" />
- </el-select>
+ <el-tree-select
+ v-model="form.deptPositionId"
+ :data="deptPositionTree"
+ :props="{ value: 'id', label: 'label', children: 'children', disabled: checkDisabled }"
+ placeholder="璇烽�夋嫨宀椾綅"
+ clearable
+ check-strictly
+ :render-after-expand="false"
+ check-on-click-node
+ @change="handlePositionChange"
+ >
+ <template #default="{ data }">
+ <span>
+ <el-tag size="small" :type="data.type===1 ? 'success' : 'warning'" effect="plain" style="margin-right:4px;">
+ {{ data.type === 1 ? '閮ㄩ棬' : '宀椾綅' }}
+ </el-tag>
+ {{ data.label }}
+ </span>
+ </template>
+ </el-tree-select>
</el-form-item>
<el-form-item label="杩涘巶鏃ユ湡" prop="factoryDate">
<el-date-picker style="width: 100%" v-model="form.factoryDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD" type="date" placeholder="璇烽�夋嫨鏃ユ湡" clearable />
@@ -24,18 +31,14 @@
</el-form-item>
<el-form-item label="鍛樺伐涓庢暟閲�" required>
<div style="width:100%">
- <div style="margin-bottom:8px; text-align:right;">
- <el-button size="small" type="primary" @click="addItemRow">鏂板涓�琛�</el-button>
- </div>
- <el-table :data="form.laborIssueList" border size="small">
+ <el-table :data="form.laborIssueList" border size="small" :span-method="arraySpanMethod">
<el-table-column label="鍛樺伐鍚嶇О" width="220">
<template #default="scope">
- <el-select v-model="scope.row.staffId" placeholder="璇烽�夋嫨" filterable>
- <el-option :label="p.staffName" :value="p.id" v-for="p in personList" :key="p.id" />
- </el-select>
+ <span>{{ personList.find(p => p.id === scope.row.staffId)?.staffName }}</span>
</template>
</el-table-column>
- <el-table-column label="鍙戞斁鏁伴噺" align="center">
+ <el-table-column label="鍔充繚鐢ㄥ搧" prop="dictName" align="center" />
+ <el-table-column label="鍙戞斁鏁伴噺" align="center" width="150">
<template #default="scope">
<el-input-number v-model="scope.row.num" :min="0" :step="1" />
</template>
@@ -64,9 +67,10 @@
import useUserStore from "@/store/modules/user";
import {staffOnJobListPage} from "@/api/personnelManagement/employeeRecord.js";
import { getDept } from "@/api/collaborativeApproval/approvalProcess.js";
-import { deptPositionListPage, getDeptPositionByDeptIdLabor } from "@/api/lavorissce/issue";
+import { getDeptPositionTree, getDeptPositionByDeptIdLabor } from "@/api/lavorissce/issue";
import { deepCopySameProperties } from '@/utils/util'
import { ElMessage } from "element-plus";
+import {staffJoinListPage} from "@/api/personnelManagement/onboarding.js";
const { proxy } = getCurrentInstance()
@@ -80,13 +84,11 @@
const productOptions = ref([]);
const personList = ref([]);
-const positionOptions = ref([]);
+const deptPositionTree = ref([]);
const laborSuppliesOptions = ref([]);
const formRules = {
deptPositionId: [{ required: true, trigger: "blur", message: "璇疯緭鍏�" }],
- dictType: [{ required: true, trigger: "change", message: "璇烽�夋嫨" }],
- dictId: [{ required: true, trigger: "change", message: "璇烽�夋嫨" }],
adoptedDate: [{ required: true, trigger: "change", message: "璇烽�夋嫨" }],
factoryDate: [{ required: true, trigger: "change", message: "璇烽�夋嫨" }],
issueDate: [{ required: true, trigger: "change", message: "璇烽�夋嫨" }],
@@ -117,9 +119,6 @@
getPersonList()
}
-function addItemRow() {
- form.laborIssueList.push({ staffId: undefined, num: undefined })
-}
function removeItemRow(index) {
form.laborIssueList.splice(index, 1)
}
@@ -136,13 +135,13 @@
function sendForm() {
formRef.value?.validate(async valid => {
if (!valid) return
- // 棰濆鏍￠獙澶氫汉鏄庣粏
if (!Array.isArray(form.laborIssueList) || form.laborIssueList.length === 0) {
ElMessage.error('璇疯嚦灏戞坊鍔犱竴琛屽憳宸ヤ笌鏁伴噺')
return
}
for (const row of form.laborIssueList) {
if (!row.staffId) { ElMessage.error('璇烽�夋嫨鍛樺伐'); return }
+ if (!row.dictId) { ElMessage.error('璇烽�夋嫨鍔充繚鐢ㄥ搧'); return }
if (row.num == null || row.num === '' || Number(row.num) < 0) { ElMessage.error('璇疯緭鍏ユ暟閲�'); return }
}
const payload = { ...form }
@@ -167,23 +166,98 @@
await nextTick()
deepCopySameProperties(row, form)
}
-async function loadPositions() {
- const res = await deptPositionListPage({pageNum: -1, pageSize:-1})
- positionOptions.value = res?.data?.records || res?.data || []
+// 灏嗛儴闂ㄥ矖浣嶆暟鎹浆鎹负鏍戝舰缁撴瀯
+function mapDeptToTree(d) {
+ const node = {
+ id: d.id,
+ label: d.name,
+ type: d.type,
+ children: [],
+ }
+ const kids = Array.isArray(d.children) ? d.children : []
+ for (const c of kids) {
+ if (c.type === 1) {
+ node.children.push(mapDeptToTree(c))
+ } else if (c.type === 2) {
+ node.children.push({
+ id: c.id,
+ label: c.name,
+ type: c.type,
+ })
+ }
+ }
+ return node
+}
+
+async function loadDeptPositionTree() {
+ try {
+ const res = await getDeptPositionTree()
+ const data = res?.data || res || []
+ deptPositionTree.value = data.map(d => mapDeptToTree(d))
+ } catch (e) {
+ console.error('鍔犺浇閮ㄩ棬宀椾綅鏍戝け璐�:', e)
+ deptPositionTree.value = []
+ }
}
async function handlePositionChange(deptPositionId) {
+ console.log('閫夋嫨鐨勫矖浣岻D:', deptPositionId)
if (!deptPositionId) {
laborSuppliesOptions.value = []
form.dictId = undefined
+ form.laborIssueList = []
return
}
const res = await getDeptPositionByDeptIdLabor({ id: deptPositionId })
laborSuppliesOptions.value = res?.data || []
+
+ const staffRes = await staffJoinListPage({ current: -1, size: -1, staffState: 1, deptPositionId: deptPositionId })
+ const staffList = staffRes?.data?.records || []
+ personList.value = staffList
+ const suppliesList = laborSuppliesOptions.value || []
+
+ if (staffList.length > 0 && suppliesList.length > 0) {
+ form.laborIssueList = []
+ staffList.forEach(staff => {
+ suppliesList.forEach(supply => {
+ form.laborIssueList.push({
+ staffId: staff.id,
+ dictId: supply.dictId,
+ dictName: supply.dictName,
+ num: supply.num || 0
+ })
+ })
+ })
+ } else {
+ form.laborIssueList = []
+ }
+}
+
+function arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+ if (columnIndex === 0) {
+ const staffId = row.staffId
+ const sameStaffRows = form.laborIssueList.filter(item => item.staffId === staffId)
+ const firstIndex = form.laborIssueList.findIndex(item => item.staffId === staffId)
+ if (rowIndex === firstIndex) {
+ return {
+ rowspan: sameStaffRows.length,
+ colspan: 1
+ }
+ } else {
+ return {
+ rowspan: 0,
+ colspan: 0
+ }
+ }
+ }
+}
+
+function checkDisabled(data) {
+ return data.type === 1
}
onMounted(() => {
- loadPositions()
+ loadDeptPositionTree()
getPersonList()
})
--
Gitblit v1.9.3