From 2b8c32366a2916dfbeac269eea94b2e6ef65f556 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期二, 20 一月 2026 14:40:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/views/lavorissue/ledger/Form.vue | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/src/views/lavorissue/ledger/Form.vue b/src/views/lavorissue/ledger/Form.vue
index 071bc66..785ef7a 100644
--- a/src/views/lavorissue/ledger/Form.vue
+++ b/src/views/lavorissue/ledger/Form.vue
@@ -19,6 +19,15 @@
<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"
@@ -28,16 +37,16 @@
<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-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="adoptedDate">
+ <el-form-item label="杩涘巶鏃ユ湡" prop="factoryDate">
<el-date-picker
style="width: 100%"
- v-model="form.adoptedDate"
+ v-model="form.factoryDate"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
type="date"
@@ -45,6 +54,17 @@
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>
@@ -53,12 +73,12 @@
import useFormData from "@/hooks/useFormData";
import {ref,onMounted} from "vue";
import useUserStore from "@/store/modules/user";
-import {getStaffOnJob} from "@/api/personnelManagement/onboarding.js";
import {deepCopySameProperties} from '@/utils/util'
const userStore = useUserStore();
import {
getDept
} from "@/api/collaborativeApproval/approvalProcess.js";
+import {staffOnJobListPage} from "@/api/personnelManagement/staffOnJob.js";
const { proxy } = getCurrentInstance();
@@ -66,27 +86,38 @@
name: "鏂板鏀跺叆",
});
const { sys_lavor_issue } = proxy.useDict("sys_lavor_issue")
+const { sys_lavor_issue_type } = proxy.useDict("sys_lavor_issue_type")
const formRef = ref(null);
const productOptions = ref([]);
const personList = ref([]);
const formRules = {
deptId: [{ required: true, trigger: "blur", message: "璇疯緭鍏�" }],
+ dictType: [{ required: true, trigger: "change", message: "璇烽�夋嫨" }],
staffId: [{ required: true, trigger: "blur", message: "璇疯緭鍏�" }],
dictId: [{ required: true, trigger: "change", message: "璇烽�夋嫨" }],
num: [{ 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({
deptId: undefined, //
+ dictType: undefined,
staffId: undefined, //
dictId: undefined, //
num: undefined, //
adoptedDate: undefined,
+ factoryDate: undefined,
+ issueDate: undefined,
});
const getPersonList = () => {
- getStaffOnJob().then(res => {
- personList.value = res.data
+ staffOnJobListPage({
+ current: -1,
+ size: -1,
+ staffState: 1
+ }).then(res => {
+ personList.value = res.data.records
})
};
const loadForm = (data) => {
@@ -112,7 +143,6 @@
getPersonList();
};
onMounted(() => {
- console.log(sys_lavor_issue)
form.deptId = userStore.currentDeptId
getProductOptions();
getPersonList();
--
Gitblit v1.9.3