From 8b2293e7a0994519434f9d63f6c5cb814ac15046 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 19 三月 2026 14:38:09 +0800
Subject: [PATCH] 金鹰黄金 1.劳保防具新增编辑逻辑修改 2.添加劳保库存页面
---
src/views/lavorissue/ledger/EditModal.vue | 40 -----
src/views/lavorissue/dictData/index.vue | 256 ++++++++++++++++++++++++++++++++++++
src/views/lavorissue/ledger/index.vue | 8 -
src/views/lavorissue/ledger/Modal.vue | 77 +++++++---
4 files changed, 311 insertions(+), 70 deletions(-)
diff --git a/src/views/lavorissue/dictData/index.vue b/src/views/lavorissue/dictData/index.vue
new file mode 100644
index 0000000..c46fb02
--- /dev/null
+++ b/src/views/lavorissue/dictData/index.vue
@@ -0,0 +1,256 @@
+<template>
+ <div class="app-container">
+ <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+ <el-form-item label="鍔充繚闃插叿" prop="dictLabel">
+ <el-input
+ v-model="queryParams.dictLabel"
+ placeholder="璇疯緭鍏ュ姵淇濋槻鍏�"
+ clearable
+ style="width: 200px"
+ @keyup.enter="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="Plus"
+ @click="handleAdd"
+ >鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="success"
+ plain
+ icon="Edit"
+ :disabled="single"
+ @click="handleUpdate"
+ >淇敼</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="danger"
+ plain
+ icon="Delete"
+ :disabled="multiple"
+ @click="handleDelete"
+ >鍒犻櫎</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="Download"
+ @click="handleExport"
+ >瀵煎嚭</el-button>
+ </el-col>
+ <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
+
+ <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column label="闃插叿缂栫爜" align="center" prop="dictValue" />
+ <el-table-column label="鍔充繚闃插叿" align="center" prop="dictLabel" />
+ <el-table-column label="鏁伴噺" align="center" prop="num" />
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
+ <template #default="scope">
+ <span>{{ parseTime(scope.row.createTime) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" width="160" class-name="small-padding fixed-width">
+ <template #default="scope">
+ <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">淇敼</el-button>
+ <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ v-model:page="queryParams.pageNum"
+ v-model:limit="queryParams.pageSize"
+ @pagination="getList"
+ />
+
+ <!-- 娣诲姞鎴栦慨鏀瑰弬鏁伴厤缃璇濇 -->
+ <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+ <el-form ref="dataRef" :model="form" :rules="rules" label-width="80px">
+ <el-form-item label="鍔充繚闃插叿" prop="dictLabel">
+ <el-input v-model="form.dictLabel" placeholder="璇疯緭鍏ュ姵淇濋槻鍏�" />
+ </el-form-item>
+ <el-form-item label="闃插叿缂栫爜" prop="dictValue">
+ <el-input v-model="form.dictValue" placeholder="璇疯緭鍏ラ槻鍏风紪鐮�" />
+ </el-form-item>
+ <el-form-item label="鏁伴噺" prop="num">
+ <el-input-number v-model="form.num" controls-position="right" :min="0" />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ </div>
+</template>
+
+<script setup name="LavorIssueDictData">
+import useDictStore from '@/store/modules/dict'
+import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data"
+
+const { proxy } = getCurrentInstance()
+
+const dataList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref("")
+const fixedDictType = ref("sys_lavor_issue")
+
+const data = reactive({
+ form: {},
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ dictType: "sys_lavor_issue",
+ dictLabel: undefined
+ },
+ rules: {
+ dictLabel: [{ required: true, message: "鍔充繚闃插叿涓嶈兘涓虹┖", trigger: "blur" }],
+ dictValue: [{ required: true, message: "闃插叿缂栫爜涓嶈兘涓虹┖", trigger: "blur" }],
+ num: [{ required: true, message: "鏁伴噺涓嶈兘涓虹┖", trigger: "blur" }]
+ }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 鏌ヨ瀛楀吀鏁版嵁鍒楄〃 */
+function getList() {
+ loading.value = true
+ queryParams.value.dictType = fixedDictType.value
+ listData(queryParams.value).then(response => {
+ dataList.value = response.rows
+ total.value = response.total
+ loading.value = false
+ })
+}
+
+/** 鍙栨秷鎸夐挳 */
+function cancel() {
+ open.value = false
+ reset()
+}
+
+/** 琛ㄥ崟閲嶇疆 */
+function reset() {
+ form.value = {
+ dictCode: undefined,
+ dictLabel: undefined,
+ dictValue: undefined,
+ num: undefined,
+ dictType: fixedDictType.value,
+ dictSort: 0,
+ status: "0",
+ cssClass: undefined,
+ listClass: "default",
+ remark: undefined
+ }
+ proxy.resetForm("dataRef")
+}
+
+/** 鎼滅储鎸夐挳鎿嶄綔 */
+function handleQuery() {
+ queryParams.value.pageNum = 1
+ getList()
+}
+
+/** 閲嶇疆鎸夐挳鎿嶄綔 */
+function resetQuery() {
+ proxy.resetForm("queryRef")
+ queryParams.value.dictType = fixedDictType.value
+ handleQuery()
+}
+
+/** 鏂板鎸夐挳鎿嶄綔 */
+function handleAdd() {
+ reset()
+ open.value = true
+ title.value = "娣诲姞鍔充繚绫诲瀷鏁版嵁"
+ form.value.dictType = fixedDictType.value
+}
+
+/** 澶氶�夋閫変腑鏁版嵁 */
+function handleSelectionChange(selection) {
+ ids.value = selection.map(item => item.dictCode)
+ single.value = selection.length != 1
+ multiple.value = !selection.length
+}
+
+/** 淇敼鎸夐挳鎿嶄綔 */
+function handleUpdate(row) {
+ reset()
+ const dictCode = row.dictCode || ids.value
+ getData(dictCode).then(response => {
+ form.value = response.data
+ open.value = true
+ title.value = "淇敼鍔充繚绫诲瀷鏁版嵁"
+ })
+}
+
+/** 鎻愪氦鎸夐挳 */
+function submitForm() {
+ proxy.$refs["dataRef"].validate(valid => {
+ if (valid) {
+ if (form.value.dictCode != undefined) {
+ updateData(form.value).then(response => {
+ useDictStore().removeDict(fixedDictType.value)
+ proxy.$modal.msgSuccess("淇敼鎴愬姛")
+ open.value = false
+ getList()
+ })
+ } else {
+ addData(form.value).then(response => {
+ useDictStore().removeDict(fixedDictType.value)
+ proxy.$modal.msgSuccess("鏂板鎴愬姛")
+ open.value = false
+ getList()
+ })
+ }
+ }
+ })
+}
+
+/** 鍒犻櫎鎸夐挳鎿嶄綔 */
+function handleDelete(row) {
+ const dictCodes = row.dictCode || ids.value
+ proxy.$modal.confirm('鏄惁纭鍒犻櫎瀛楀吀缂栫爜涓�"' + dictCodes + '"鐨勬暟鎹」锛�').then(function() {
+ return delData(dictCodes)
+ }).then(() => {
+ getList()
+ proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+ useDictStore().removeDict(fixedDictType.value)
+ }).catch(() => {})
+}
+
+/** 瀵煎嚭鎸夐挳鎿嶄綔 */
+function handleExport() {
+ proxy.download("system/dict/data/export", {
+ ...queryParams.value
+ }, `lavor_issue_dict_data_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>
diff --git a/src/views/lavorissue/ledger/EditModal.vue b/src/views/lavorissue/ledger/EditModal.vue
index f75438f..2733fd1 100644
--- a/src/views/lavorissue/ledger/EditModal.vue
+++ b/src/views/lavorissue/ledger/EditModal.vue
@@ -6,20 +6,6 @@
<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="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-form-item>
<el-form-item label="杩涘巶鏃ユ湡" prop="factoryDate">
<el-date-picker
style="width: 100%"
@@ -43,13 +29,7 @@
/>
</el-form-item>
<el-form-item label="鍛樺伐鍚嶇О" prop="staffId">
- <el-select
- v-model="form.staffId"
- placeholder="璇烽�夋嫨"
- clearable
- >
- <el-option :label="item.staffName" :value="item.id" v-for="(item,index) in personList" :key="id" />
- </el-select>
+ <span>{{ personList.find(p => p.id === form.staffId)?.staffName }}</span>
</el-form-item>
<el-form-item label="鍙戞斁鏁伴噺" prop="num">
<el-input-number :step="1" :min="0" style="width: 100%"
@@ -73,7 +53,7 @@
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 { deptPositionListPage } from "@/api/lavorissce/issue";
import { deepCopySameProperties } from '@/utils/util'
import { ElMessage } from "element-plus";
@@ -85,17 +65,13 @@
const formRef = ref(null)
const userStore = useUserStore();
const { sys_lavor_issue } = proxy.useDict("sys_lavor_issue")
-const { sys_lavor_issue_type } = proxy.useDict("sys_lavor_issue_type")
const productOptions = ref([]);
const personList = ref([]);
const positionOptions = 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: "璇烽�夋嫨" }],
@@ -160,10 +136,6 @@
openModal(row.id)
await nextTick()
deepCopySameProperties(row, form)
- // 濡傛灉浼犲叆浜嗗矖浣岻D锛岃嚜鍔ㄦ煡璇㈠姵淇濈敤鍝佹暟鎹�
- if (form.deptPositionId) {
- await handlePositionChange(form.deptPositionId)
- }
}
async function loadPositions() {
const res = await deptPositionListPage({pageNum: -1, pageSize:-1})
@@ -171,13 +143,7 @@
}
async function handlePositionChange(deptPositionId) {
- if (!deptPositionId) {
- laborSuppliesOptions.value = []
- form.dictId = undefined
- return
- }
- const res = await getDeptPositionByDeptIdLabor({ id: deptPositionId })
- laborSuppliesOptions.value = res?.data || []
+ console.log('閫夋嫨鐨勫矖浣岻D:', deptPositionId)
}
onMounted(() => {
diff --git a/src/views/lavorissue/ledger/Modal.vue b/src/views/lavorissue/ledger/Modal.vue
index 1ed016f..3a0f95f 100644
--- a/src/views/lavorissue/ledger/Modal.vue
+++ b/src/views/lavorissue/ledger/Modal.vue
@@ -5,8 +5,8 @@
<el-tree-select
v-model="form.deptPositionId"
:data="deptPositionTree"
- :props="{ value: 'id', label: 'label', children: 'children' }"
- placeholder="璇烽�夋嫨閮ㄩ棬鎴栧矖浣�"
+ :props="{ value: 'id', label: 'label', children: 'children', disabled: checkDisabled }"
+ placeholder="璇烽�夋嫨宀椾綅"
clearable
check-strictly
:render-after-expand="false"
@@ -23,16 +23,6 @@
</template>
</el-tree-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-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 />
</el-form-item>
@@ -41,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>
@@ -102,8 +88,6 @@
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: "璇烽�夋嫨" }],
@@ -134,9 +118,6 @@
getPersonList()
}
-function addItemRow() {
- form.laborIssueList.push({ staffId: undefined, num: undefined })
-}
function removeItemRow(index) {
form.laborIssueList.splice(index, 1)
}
@@ -153,13 +134,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 }
@@ -223,10 +204,54 @@
if (!deptPositionId) {
laborSuppliesOptions.value = []
form.dictId = undefined
+ form.laborIssueList = []
return
}
const res = await getDeptPositionByDeptIdLabor({ id: deptPositionId })
laborSuppliesOptions.value = res?.data || []
+
+ const staffRes = await staffOnJobListPage({ current: -1, size: -1, staffState: 1, deptPositionId: deptPositionId })
+ const staffList = staffRes?.data?.records || []
+ 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(() => {
diff --git a/src/views/lavorissue/ledger/index.vue b/src/views/lavorissue/ledger/index.vue
index b6408c1..87fe34f 100644
--- a/src/views/lavorissue/ledger/index.vue
+++ b/src/views/lavorissue/ledger/index.vue
@@ -108,7 +108,7 @@
},
[
{
- label: "閮ㄩ棬/宀椾綅",
+ label: "宀椾綅",
align: "center",
prop: "deptName"
},
@@ -126,12 +126,6 @@
label: "鍛樺伐缂栧彿",
align: "center",
prop: "staffNo"
- },
- {
- label: "鍔充繚绫诲瀷",
- align: "center",
- prop: "dictTypeName",
-
},
{
label: "鍔充繚闃插叿",
--
Gitblit v1.9.3