From 48be57422a4513fc3091c1f8f45c911b0c17d88f Mon Sep 17 00:00:00 2001
From: TianyangZhang <zty18395607196@163.com>
Date: Wed, 11 Mar 2026 13:31:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20hrm-empcontract=20=E5=8A=B3?=
 =?UTF-8?q?=E5=8A=A8=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hrm/empcontract.vue      |  47 ++++++
 src/views/hrm/empcontract_form.vue | 255 +++++++++++++++++++++++++++++
 2 files changed, 302 insertions(+)
 create mode 100644 src/views/hrm/empcontract.vue
 create mode 100644 src/views/hrm/empcontract_form.vue

diff --git a/src/views/hrm/empcontract.vue b/src/views/hrm/empcontract.vue
new file mode 100644
index 00000000..76b4c1e1
--- /dev/null
+++ b/src/views/hrm/empcontract.vue
@@ -0,0 +1,47 @@
+<template>
+    <el-container>
+        <el-header>
+            <div class="left-panel">
+                <el-button type="primary" @click="handleAdd">新增</el-button>
+            </div>
+        </el-header>
+        <el-main class="nopadding">
+            <scTable
+            ref="table"
+            :apiObj="API.hrm.empcontract.list"
+            row-key="id"
+            stripe
+            :query="query"
+            @row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}"
+            >
+            <el-table-column label="部门" prop="dept_need_name" width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column label="审批状态" width="200" show-overflow-tooltip>
+                <template #default="scope">
+                                <el-tag :type="actStateEnum[scope.row.ticket_?.act_state]?.type">
+                        {{ actStateEnum[scope.row.ticket_?.act_state]?.text }}
+                    </el-tag>
+            <el-tag type="info" effect="plain">{{ scope.row.ticket_?.state_.name }}</el-tag>
+
+                </template>
+            </el-table-column>
+            </scTable>
+        </el-main>
+    </el-container>
+    <el-drawer title="劳动合同变更" v-model="drawerVisible" :size="'80%'" destroy-on-close>
+        <empcontract_form :mode="mode" :t_id="t_id"></empcontract_form>
+    </el-drawer>
+</template>
+<script setup>
+import { ref } from 'vue'
+import API from '@/api'
+import empcontract_form from './empcontract_form.vue'
+import { actStateEnum, interveneTypeEnum } from "@/utils/enum.js";
+const query = ref({});
+const drawerVisible = ref(false);
+const mode = ref('add');
+const t_id = ref(null);
+const handleAdd = () => {
+    mode.value = 'add';
+    drawerVisible.value = true;
+}
+</script>
\ No newline at end of file
diff --git a/src/views/hrm/empcontract_form.vue b/src/views/hrm/empcontract_form.vue
new file mode 100644
index 00000000..40caf777
--- /dev/null
+++ b/src/views/hrm/empcontract_form.vue
@@ -0,0 +1,255 @@
+<template>
+    <el-container>
+        <el-main class="nopadding">
+            <el-form label-width="100px" :model="formData" style="padding: 20px;" :disabled="localMode === 'show'">
+                <el-form-item label="申请部门" required>
+                    <el-cascader
+                        v-model="formData.dept_need"
+                        :options="group"
+                        :props="groupsProps"
+                        :show-all-levels="false"
+                        clearable
+                        style="width: 220px"
+                    ></el-cascader>
+                </el-form-item>
+                <el-form-item label="员工信息" required>
+                    <xtSelect
+                        v-model="formData.employee"
+                        :apiObj="$API.hrm.employee.list"
+                        v-model:label="formData.employee_name"
+                        @change="handleChange"
+                        style="width: 230px"
+                    >
+                        <el-table-column prop="name" label="姓名"></el-table-column>
+                        <el-table-column prop="belong_dept_name" label="部门"></el-table-column>
+                        <el-table-column prop="post_name" label="岗位"></el-table-column>
+                    </xtSelect>
+                </el-form-item>
+                <el-form-item label="性别">
+                    <el-input v-model="formData.gender" disabled style="width: 230px"></el-input>
+                </el-form-item>
+                <el-form-item label="身份证号">
+                    <el-input v-model="formData.id_number" disabled style="width: 230px"></el-input>
+                </el-form-item>
+                <el-form-item label="手机号">
+                    <el-input v-model="formData.phone" disabled style="width: 230px"></el-input>
+                </el-form-item>
+                <el-form-item label="岗位">
+                    <el-input v-model="formData.post_name" disabled style="width: 230px"></el-input>
+                </el-form-item>
+                <el-form-item label="部门">
+                    <el-input v-model="formData.dept_name" disabled style="width: 230px"></el-input>
+                </el-form-item>
+                <el-form-item label="入职日期">
+                    <el-input v-model="formData.join_date" disabled style="width: 230px"></el-input>
+                </el-form-item>
+                <el-form-item label="合同结束日期">
+                    <el-input v-model="formData.end_contract" disabled style="width: 230px"></el-input>
+                </el-form-item>
+                <el-form-item label="合同变更次数">
+                    <el-input-number
+                        v-model="formData.counts"
+                        :min="0"
+                        controls-position="right"
+                        style="width: 160px"
+                    ></el-input-number>
+                </el-form-item>
+                <el-form-item label="应续签">
+                    <el-date-picker
+                        v-model="formData.plan_renewal"
+                        type="date"
+                        placeholder="选择日期"
+                        value-format="YYYY-MM-DD"
+                        style="width: 230px"
+                    ></el-date-picker>
+                </el-form-item>
+                <el-form-item label="正常续签">
+                    <el-date-picker
+                        v-model="formData.normal_renewal"
+                        type="date"
+                        placeholder="选择日期"
+                        value-format="YYYY-MM-DD"
+                        style="width: 230px"
+                    ></el-date-picker>
+                </el-form-item>
+                <el-form-item label="续签/变更(年)">
+                    <el-input-number
+                        v-model="formData.change_date"
+                        controls-position="right"
+                        style="width: 160px"
+                    ></el-input-number>
+                </el-form-item>
+                <el-form-item label="变更原因">
+                    <el-input
+                        v-model="formData.change_reason"
+                        type="textarea"
+                        rows="2"
+                        placeholder="缩短续签/变更年限原因"
+                        style="width: 400px"
+                    ></el-input>
+                </el-form-item>
+            </el-form>
+            <el-footer>
+                <el-button type="danger"
+                v-if="localMode=='edit'"
+                style="margin-right: 4px;"
+                @click="handleDel"
+                :loading="saveLoading"
+                >删除</el-button>
+                <ticketd_b
+                        v-if = "formData.ticket_ && localMode=='show'"
+                        :t_id="formData.id"
+                        :ticket_="formData.ticket_"
+                        :ticket_data="ticket_data"
+                        @success="$emit('success', localMode)"
+                        ref="ticketd_b"
+                    ></ticketd_b>
+                     <el-button
+                        v-if="localMode!='show'"
+                        type="primary"
+                        style="margin-right: 4px;"
+                        @click="handleSave"
+                        :loading="saveLoading"
+                        >提交审批</el-button>
+            </el-footer>
+        </el-main>
+        <el-aside width="20%" v-if="formData.ticket_">
+            <ticketd :ticket_="formData.ticket_" @success="$emit('success')"></ticketd>
+        </el-aside>
+    </el-container>
+</template>
+
+<script>
+import ticketd_b from "@/views/wf/ticketd_b.vue";
+import ticketd from '@/views/wf/ticketd.vue';
+import { genTree } from "@/utils/verificate";
+
+export default {
+    name: 'EnpContractForm',
+    components: {
+        ticketd_b,
+        ticketd
+    },
+    props: {
+        mode: {
+            type: String,
+            default: 'show'
+        },
+        t_id: {
+            type: String,
+            default: ""
+        }
+    },
+    data() {
+        return {
+            formData: {
+                dept_need: "",
+                employee: "",
+                employee_name: "",
+                gender: "",
+                id_number: "",
+                phone: "",
+                post_name: "",
+                dept_name: "",
+                join_date: "",
+                end_contract: "",
+                counts: 0,
+                plan_renewal: "",
+                normal_renewal: "",
+                change_date: null,
+                change_reason: "",
+            },
+            ticket_data: {},
+            localMode: this.mode,
+            saveLoading: false,
+            group:[],
+            groupsProps: {
+                multiple: false,
+                emitPath: false,
+                checkStrictly: true,
+            },
+        }
+    },
+    watch: {
+        formData: {
+            handler(val) {
+                Object.assign(this.ticket_data, val);
+            },
+            deep: true,
+            immediate: true
+        }
+    },
+    mounted() {
+        this.getGroup();
+        if (this.t_id) {
+            this.getTid();
+        } else {
+            this.localMode = "add";
+        }
+    },
+    methods: {
+        async getTid() {
+            try {
+                let res = await this.$API.hrm.empcontract.item.req(this.t_id);
+                this.formData = res;
+                if (res.ticket_ && res.ticket_.state_.type == 1 && res.create_by == this.$TOOL.data.get("USER_INFO").id) {
+                    this.localMode = "edit";
+                }
+            } catch (error) {
+                console.error('获取数据失败:', error);
+            }
+        },
+        async getGroup() {
+            let res = await this.$API.system.dept.list.req({ page: 0 });
+            this.group = genTree(res);
+        },
+        handleDel() {
+            this.$confirm(`确定删除吗？`, "提示", {
+				type: "warning",
+			})
+				.then(()=>{
+                    this.$API.hrm.empcontract.delete.req(this.formData.id).then(res=>{
+                        this.$message.success("删除成功");
+                        this.$emit('success');
+                    })
+                })
+        },
+        async handleSave() {
+            if (this.localMode == "add") {
+                try {
+                    console.log('formData', this.formData);
+                    let res = await this.$API.hrm.empcontract.create.req(this.formData);
+                    this.$message.success("提交成功");
+                    this.$emit('success', this.localMode);
+                } catch (error) {
+                    console.error('提交申请失败:', error);
+                    throw error;
+                }
+            } else if (this.localMode == "edit") {
+                this.$message.error("不支持编辑");
+            }
+        },
+        handleChange(obj) {
+            if (obj) {
+                this.formData.employee_name = obj.name;
+                this.formData.gender = obj.gender;
+                this.formData.id_number = obj.id_number;
+                this.formData.phone = obj.phone;
+                this.formData.post_name = obj.post_name;
+                this.formData.dept_name = obj.belong_dept_name;
+                this.formData.join_date = obj.start_date;
+                this.formData.end_contract = obj.contract_end_date;
+            } else {
+                this.formData.employee_name = "";
+                this.formData.gender = "";
+                this.formData.id_number = "";
+                this.formData.phone = "";
+                this.formData.post_name = "";
+                this.formData.dept_name = "";
+                this.formData.join_date = "";
+                this.formData.end_contract = "";
+            }
+        },
+    }
+}
+</script>

From a80f3b69acaf1596668a1126de704072e04046a2 Mon Sep 17 00:00:00 2001
From: TianyangZhang <zty18395607196@163.com>
Date: Thu, 12 Mar 2026 08:58:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:hrm-=E5=A2=9E=E5=8A=A0=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/hrm.js | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/api/model/hrm.js b/src/api/model/hrm.js
index 04617bae..d8a2da12 100644
--- a/src/api/model/hrm.js
+++ b/src/api/model/hrm.js
@@ -413,4 +413,39 @@ export default {
 			}
 		},
 	},
+	empcontract: {
+	    list: {
+			name: "人员合同",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/hrm/contract/`,
+					data
+				);
+			}
+		},
+	  item: {
+			name: "人员合同到期续签申请",
+			req: async function(id){
+				return await http.get(
+					`${config.API_URL}/hrm/contract/${id}/`,
+				);
+			}
+		},
+	  create: {
+			name: "人员合同新增",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/hrm/contract/`,
+					data);
+			}
+		},
+		delete: {
+			name: "人员合同删除",
+			req: async function(id){
+				return await http.delete(
+					`${config.API_URL}/hrm/contract/${id}/`
+				);
+			}
+		},
+	},
 }