From 4da40604690325917d208e386e3add022f181147 Mon Sep 17 00:00:00 2001
From: 周宾 <2802492122@qq.com>
Date: 星期一, 08 十二月 2025 15:35:47 +0800
Subject: [PATCH] 修改设备管理选择设备时可搜索
---
src/views/lavorissue/ledger/Modal.vue | 250 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 209 insertions(+), 41 deletions(-)
diff --git a/src/views/lavorissue/ledger/Modal.vue b/src/views/lavorissue/ledger/Modal.vue
index 5d63236..1ed016f 100644
--- a/src/views/lavorissue/ledger/Modal.vue
+++ b/src/views/lavorissue/ledger/Modal.vue
@@ -1,70 +1,238 @@
<template>
- <el-dialog :title="modalOptions.title" v-model="visible" @close="close" width="30%">
- <Form ref="formRef"></Form>
+ <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-tree-select
+ v-model="form.deptPositionId"
+ :data="deptPositionTree"
+ :props="{ value: 'id', label: 'label', children: 'children' }"
+ 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="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>
+ <el-form-item label="鍙戞斁鏃ユ湡" prop="issueDate">
+ <el-date-picker style="width: 100%" v-model="form.issueDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD" type="date" placeholder="璇烽�夋嫨鏃ユ湡" clearable />
+ </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-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>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍙戞斁鏁伴噺" align="center">
+ <template #default="scope">
+ <el-input-number v-model="scope.row.num" :min="0" :step="1" />
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="120" align="center">
+ <template #default="scope">
+ <el-button link type="danger" size="small" @click="removeItemRow(scope.$index)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-form-item>
+ </el-form>
<template #footer>
- <el-button type="primary" @click="sendForm" :loading="loading">
- {{ modalOptions.confirmText }}
- </el-button>
+ <el-button type="primary" @click="sendForm" :loading="loading">{{ modalOptions.confirmText }}</el-button>
<el-button @click="closeModal">{{ modalOptions.cancelText }}</el-button>
</template>
</el-dialog>
</template>
<script setup>
+import { ref, getCurrentInstance, onMounted, nextTick } from 'vue'
import { useModal } from "@/hooks/useModal";
import { add, update } from "@/api/lavorissce/ledger";
-import Form from "./Form.vue";
+import useFormData from "@/hooks/useFormData";
+import useUserStore from "@/store/modules/user";
+import {staffOnJobListPage} from "@/api/personnelManagement/employeeRecord.js";
+import { getDept } from "@/api/collaborativeApproval/approvalProcess.js";
+import { getDeptPositionTree, getDeptPositionByDeptIdLabor } from "@/api/lavorissce/issue";
+import { deepCopySameProperties } from '@/utils/util'
import { ElMessage } from "element-plus";
+
const { proxy } = getCurrentInstance()
-defineOptions({
- name: "鏀跺叆鏂板缂栬緫",
-});
-
+defineOptions({ name: "鏀跺叆鏂板缂栬緫" });
const emits = defineEmits(["success"]);
-const formRef = ref();
+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 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: "璇烽�夋嫨" }],
+}
+
+const { form, resetForm } = useFormData({
+ deptPositionId: undefined,
+ dictType: undefined,
+ dictId: undefined,
+ adoptedDate: undefined,
+ factoryDate: undefined,
+ issueDate: undefined,
+ laborIssueList: [ { staffId: undefined, num: undefined } ],
+});
+
+function getPersonList() {
+ staffOnJobListPage({current: -1, size:-1, staffState: 1}).then(res => { personList.value = res.data.records })
+}
+function getProductOptions() {
+ getDept().then(res => { productOptions.value = res.data })
+}
+
+function clearValidate() { formRef.value?.clearValidate() }
+function resetFormAndValidate() {
+ resetForm()
+ clearValidate()
+ getProductOptions()
+ getPersonList()
+}
+
+function addItemRow() {
+ form.laborIssueList.push({ staffId: undefined, num: undefined })
+}
+function removeItemRow(index) {
+ form.laborIssueList.splice(index, 1)
+}
+
const {
id,
visible,
loading,
openModal,
modalOptions,
- handleConfirm,
closeModal,
} = useModal({ title: "鍔充繚鍙拌处" });
-const sendForm = () => {
- proxy.$refs.formRef.$refs.formRef.validate(async valid => {
- if (valid) {
- const {code} = id.value
- ? await update({id: id.value, ...formRef.value.form})
- : await add(formRef.value.form);
- if (code == 200) {
- emits("success");
- ElMessage({message: "鎿嶄綔鎴愬姛", type: "success"});
- close();
- } else {
- loading.value = false;
- }
- }
- })
-};
+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.num == null || row.num === '' || Number(row.num) < 0) { ElMessage.error('璇疯緭鍏ユ暟閲�'); return }
+ }
+ const payload = { ...form }
+ const { code } = id.value ? await update({ id: id.value, ...payload }) : await add(payload)
+ if (code == 200) {
+ emits("success")
+ ElMessage({ message: "鎿嶄綔鎴愬姛", type: "success" })
+ close()
+ } else {
+ loading.value = false
+ }
+ })
+}
-const close = () => {
- formRef.value.resetFormAndValidate();
- closeModal();
-};
+function close() {
+ resetFormAndValidate()
+ closeModal()
+}
-const loadForm = async (row) => {
- openModal(row.id);
- await nextTick();
- formRef.value.loadForm(row);
+async function loadForm(row) {
+ openModal(row.id)
+ await nextTick()
+ deepCopySameProperties(row, form)
+}
+// 灏嗛儴闂ㄥ矖浣嶆暟鎹浆鎹负鏍戝舰缁撴瀯
+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 = []
+ }
+}
-defineExpose({
- openModal,
- loadForm,
-});
+async function handlePositionChange(deptPositionId) {
+ console.log('閫夋嫨鐨勫矖浣岻D:', deptPositionId)
+ if (!deptPositionId) {
+ laborSuppliesOptions.value = []
+ form.dictId = undefined
+ return
+ }
+ const res = await getDeptPositionByDeptIdLabor({ id: deptPositionId })
+ laborSuppliesOptions.value = res?.data || []
+}
+
+onMounted(() => {
+ loadDeptPositionTree()
+ getPersonList()
+})
+
+defineExpose({ openModal, loadForm })
</script>
--
Gitblit v1.9.3