From 591392aea7dfdaa526fc50c46cd88245688ee78b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 20 十一月 2025 15:31:08 +0800
Subject: [PATCH] 1.金鹰黄金-劳保管理部门管理修改 2.金鹰黄金-劳保台账新增逻辑修改
---
src/views/lavorissue/ledger/EditModal.vue | 189 +++++++++++++++++++++
src/views/personnelManagement/onboarding/components/formDia.vue | 2
src/views/lavorissue/ledger/Form.vue | 66 -------
src/api/lavorissce/issue.js | 8
src/views/lavorissue/ledger/index.vue | 5
src/views/lavorissue/issue/index.vue | 38 ++-
src/views/lavorissue/ledger/Modal.vue | 203 ++++++++++++++++++----
7 files changed, 389 insertions(+), 122 deletions(-)
diff --git a/src/api/lavorissce/issue.js b/src/api/lavorissce/issue.js
index 64b4b82..b4d24d8 100644
--- a/src/api/lavorissce/issue.js
+++ b/src/api/lavorissce/issue.js
@@ -80,4 +80,12 @@
method: 'delete',
data: query
})
+}
+// 鍒犻櫎鍔充繚鐢ㄥ搧
+export function getDeptPositionByDeptIdLabor(query) {
+ return request({
+ url: '/deptPosition/getDeptPositionByDeptIdLabor',
+ method: 'get',
+ params: query
+ })
}
\ No newline at end of file
diff --git a/src/views/lavorissue/issue/index.vue b/src/views/lavorissue/issue/index.vue
index 6222ea0..78ead42 100644
--- a/src/views/lavorissue/issue/index.vue
+++ b/src/views/lavorissue/issue/index.vue
@@ -35,9 +35,10 @@
</el-tree>
</div>
<div class="right">
- <div v-if="currentPosition" class="position-config">
+ <div v-if="currentDept || currentPosition" class="position-config">
<div class="title">
- <span>宀椾綅閰嶇疆锛歿{ currentPosition.label }}</span>
+ <span v-if="currentPosition">宀椾綅閰嶇疆锛歿{ currentPosition.label }}</span>
+ <span v-else-if="currentDept">閮ㄩ棬閰嶇疆锛歿{ currentDept.label }}</span>
</div>
<div class="q-toolbar">
<el-button size="small" type="primary" @click="openAddItemDialog">鏂板鐢ㄥ搧</el-button>
@@ -58,7 +59,7 @@
</el-table-column>
</el-table>
</div>
- <div v-else class="empty">璇烽�夋嫨宸︿晶宀椾綅杩涜閰嶇疆</div>
+ <div v-else class="empty">璇烽�夋嫨宸︿晶閮ㄩ棬鎴栧矖浣嶈繘琛岄厤缃�</div>
</div>
</div>
<!-- 鏂板閮ㄩ棬/宀椾綅寮圭獥 -->
@@ -224,7 +225,7 @@
const addItemForm = reactive({ id: undefined, dictId: undefined, quantity: 0, quarter: 1 })
function openAddItemDialog() {
- if (!currentPosition.value) return
+ if (!currentDept.value && !currentPosition.value) return
addItemDialogTitle.value = '鏂板鐢ㄥ搧'
addItemForm.id = undefined
addItemForm.dictId = undefined
@@ -234,7 +235,7 @@
}
function openEditItemDialog(row) {
- if (!currentPosition.value || !row) return
+ if ((!currentDept.value && !currentPosition.value) || !row) return
addItemDialogTitle.value = '缂栬緫鐢ㄥ搧'
addItemForm.id = row.id
addItemForm.dictId = row.dictId
@@ -248,12 +249,13 @@
}
async function onConfirmAddItem() {
- if (!currentPosition.value) return
+ if (!currentDept.value && !currentPosition.value) return
addItemSaving.value = true
try {
const qNum = Number(addItemForm.quarter) || 1
- const deptPositionId = currentPosition.value.id ?? currentPosition.value.raw?.id ?? currentPosition.value?.id
+
if (addItemForm.id) {
+ // 缂栬緫鐢ㄥ搧
await updateLaborConf({
id: addItemForm.id,
dictId: addItemForm.dictId,
@@ -261,15 +263,20 @@
quarter: qNum,
})
} else {
+ // 鏂板鐢ㄥ搧
+ const currentId = currentPosition.value?.id ?? currentPosition.value?.raw?.id ?? currentDept.value?.id ?? currentDept.value?.raw?.id
await addLaborConf({
- deptPositionId,
+ deptPositionId: currentId,
dictId: addItemForm.dictId,
num: Number(addItemForm.quantity) || 0,
quarter: qNum,
})
}
- const posId = currentPosition.value.raw?.id ?? currentPosition.value.id
- await loadLaborConf(posId)
+
+ // 閲嶆柊鍔犺浇鐢ㄥ搧閰嶇疆鍒楄〃
+ const currentId = currentPosition.value?.id ?? currentPosition.value?.raw?.id ?? currentDept.value?.id ?? currentDept.value?.raw?.id
+ await loadLaborConf(currentId)
+
addItemDialogVisible.value = false
ElMessage.success('淇濆瓨鎴愬姛')
} catch (e) {
@@ -280,7 +287,7 @@
}
async function onDeleteItem(row) {
- if (!currentPosition.value || !row) return
+ if ((!currentDept.value && !currentPosition.value) || !row) return
try {
await ElMessageBox.confirm('纭畾鍒犻櫎璇ョ敤鍝侀厤缃悧锛�', '鎻愮ず', { type: 'warning' })
} catch {
@@ -288,8 +295,9 @@
}
try {
await deleteLaborConf([row.id])
- const posId = currentPosition.value.raw?.id ?? currentPosition.value.id
- await loadLaborConf(posId)
+ // 閲嶆柊鍔犺浇鐢ㄥ搧閰嶇疆鍒楄〃
+ const currentId = currentPosition.value?.id ?? currentPosition.value?.raw?.id ?? currentDept.value?.id ?? currentDept.value?.raw?.id
+ await loadLaborConf(currentId)
ElMessage.success('鍒犻櫎鎴愬姛')
} catch (e) {
ElMessage.error((e && (e.msg || e.message)) || '鍒犻櫎澶辫触')
@@ -367,11 +375,13 @@
if (node.type === 1) {
currentDept.value = node
currentPosition.value = null
+ // 閫夋嫨閮ㄩ棬鏃讹紝鍔犺浇閮ㄩ棬绾у埆鐨勭敤鍝侀厤缃�
+ loadLaborConf(node.raw.id)
} else if (node.type === 2) {
const dept = findDeptById(departments, node.parentDeptId)
if (dept) currentDept.value = mapDeptToTree(dept)
currentPosition.value = node.raw
- // 閫夋嫨宀椾綅鏃讹紝鎸夎姹傛煡璇㈢敤鍝侀厤缃垪琛�
+ // 閫夋嫨宀椾綅鏃讹紝鏌ヨ鐢ㄥ搧閰嶇疆鍒楄〃
loadLaborConf(node.raw.id)
}
}
diff --git a/src/views/lavorissue/ledger/EditModal.vue b/src/views/lavorissue/ledger/EditModal.vue
new file mode 100644
index 0000000..f75438f
--- /dev/null
+++ b/src/views/lavorissue/ledger/EditModal.vue
@@ -0,0 +1,189 @@
+<template>
+ <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="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="鍛樺伐鍚嶇О" 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>
+ </el-form-item>
+ <el-form-item label="鍙戞斁鏁伴噺" prop="num">
+ <el-input-number :step="1" :min="0" style="width: 100%"
+ v-model="form.num"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <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 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 { deptPositionListPage, getDeptPositionByDeptIdLabor } from "@/api/lavorissce/issue";
+import { deepCopySameProperties } from '@/utils/util'
+import { ElMessage } from "element-plus";
+
+const { proxy } = getCurrentInstance()
+
+defineOptions({ name: "鏀跺叆鏂板缂栬緫" });
+const emits = defineEmits(["success"]);
+
+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: "璇烽�夋嫨" }],
+}
+
+const { form, resetForm } = useFormData({
+ deptPositionId: undefined,
+ dictType: undefined,
+ dictId: undefined,
+ adoptedDate: undefined,
+ factoryDate: undefined,
+ issueDate: undefined,
+ 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()
+}
+
+const {
+ id,
+ visible,
+ loading,
+ openModal,
+ modalOptions,
+ closeModal,
+} = useModal({ title: "鍔充繚鍙拌处" });
+
+function sendForm() {
+ formRef.value?.validate(async valid => {
+ if (!valid) 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
+ }
+ })
+}
+
+function close() {
+ resetFormAndValidate()
+ closeModal()
+}
+
+async function loadForm(row) {
+ 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})
+ positionOptions.value = res?.data?.records || res?.data || []
+}
+
+async function handlePositionChange(deptPositionId) {
+ if (!deptPositionId) {
+ laborSuppliesOptions.value = []
+ form.dictId = undefined
+ return
+ }
+ const res = await getDeptPositionByDeptIdLabor({ id: deptPositionId })
+ laborSuppliesOptions.value = res?.data || []
+}
+
+onMounted(() => {
+ loadPositions()
+ getPersonList()
+})
+
+defineExpose({ openModal, loadForm })
+</script>
diff --git a/src/views/lavorissue/ledger/Form.vue b/src/views/lavorissue/ledger/Form.vue
index 7031957..144f5df 100644
--- a/src/views/lavorissue/ledger/Form.vue
+++ b/src/views/lavorissue/ledger/Form.vue
@@ -1,70 +1,6 @@
<template>
<el-form :model="form" label-width="100px" :rules="formRules" ref="formRef">
- <el-form-item label="閮ㄩ棬鍚嶇О" prop="deptId">
- <el-select
- v-model="form.deptId"
- placeholder="璇烽�夋嫨"
- clearable
- disabled
- >
- <el-option :label="item.deptName" :value="item.deptId" v-for="(item,index) in productOptions" :key="deptId" />
- </el-select>
- </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>
- </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.label" :value="item.value" v-for="(item,index) in sys_lavor_issue" :key="value" />
- </el-select>
- </el-form-item>
- <el-form-item label="鍙戞斁鏁伴噺" prop="num">
- <el-input-number :step="1" :min="0" style="width: 100%"
- v-model="form.num"
- placeholder="璇疯緭鍏�"
- />
- </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>
</template>
diff --git a/src/views/lavorissue/ledger/Modal.vue b/src/views/lavorissue/ledger/Modal.vue
index 5d63236..f5b0e3a 100644
--- a/src/views/lavorissue/ledger/Modal.vue
+++ b/src/views/lavorissue/ledger/Modal.vue
@@ -1,70 +1,191 @@
<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-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-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 { deptPositionListPage, 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 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: "璇烽�夋嫨" }],
+}
+
+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)
+}
+async function loadPositions() {
+ const res = await deptPositionListPage({pageNum: -1, pageSize:-1})
+ positionOptions.value = res?.data?.records || res?.data || []
+}
-};
+async function handlePositionChange(deptPositionId) {
+ if (!deptPositionId) {
+ laborSuppliesOptions.value = []
+ form.dictId = undefined
+ return
+ }
+ const res = await getDeptPositionByDeptIdLabor({ id: deptPositionId })
+ laborSuppliesOptions.value = res?.data || []
+}
-defineExpose({
- openModal,
- loadForm,
-});
+onMounted(() => {
+ loadPositions()
+ getPersonList()
+})
+
+defineExpose({ openModal, loadForm })
</script>
diff --git a/src/views/lavorissue/ledger/index.vue b/src/views/lavorissue/ledger/index.vue
index 385dfe3..6ba7553 100644
--- a/src/views/lavorissue/ledger/index.vue
+++ b/src/views/lavorissue/ledger/index.vue
@@ -67,6 +67,7 @@
</PIMTable>
</div>
<Modal ref="modalRef" @success="getTableData"></Modal>
+ <EditModal ref="editModalRef" @success="getTableData"></EditModal>
<files-dia ref="filesDia"></files-dia>
</div>
</template>
@@ -76,6 +77,7 @@
import { listPage,deleteLedger,update } from "@/api/lavorissce/ledger";
import { onMounted, getCurrentInstance } from "vue";
import Modal from "./Modal.vue";
+import EditModal from "./EditModal.vue";
import { ElMessageBox, ElMessage } from "element-plus";
import dayjs from "dayjs";
import FilesDia from "./filesDia.vue";
@@ -85,6 +87,7 @@
const multipleList = ref([]);
const { proxy } = getCurrentInstance();
const modalRef = ref();
+const editModalRef = ref();
const { payment_methods } = proxy.useDict("payment_methods");
const { income_types } = proxy.useDict("income_types");
const filesDia = ref()
@@ -216,7 +219,7 @@
modalRef.value.openModal();
};
const edit = (row) => {
- modalRef.value.loadForm(row);
+ editModalRef.value.loadForm(row);
};
/** 鎼滅储鎸夐挳鎿嶄綔 */
diff --git a/src/views/personnelManagement/onboarding/components/formDia.vue b/src/views/personnelManagement/onboarding/components/formDia.vue
index cfd26b4..b49e668 100644
--- a/src/views/personnelManagement/onboarding/components/formDia.vue
+++ b/src/views/personnelManagement/onboarding/components/formDia.vue
@@ -187,7 +187,7 @@
async function loadPositions() {
try {
positionLoading.value = true
- const res = await deptPositionListPage({pageNum: 1, pageSize: 9999})
+ const res = await deptPositionListPage({pageNum: -1, pageSize:-1})
positionOptions.value = res?.data?.records || res?.data || []
} finally {
positionLoading.value = false
--
Gitblit v1.9.3