From ca1cbb4d2ffb48095d5b2625788efd4e08a5eff8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 一月 2026 14:07:24 +0800
Subject: [PATCH] 湟水峡 1.采购模块不要项目名称 2.加一个有待回款登记的提示 3.回款登记、付款登记改成和销售订单价格关联，并且可以多个一起回款或付款 4.合同管理不要下载合同了，跟合同相关的字段可以去掉了
---
src/views/personnelManagement/employeeRecord/components/formDia.vue | 85 +++++++++++++++++++++---------------------
1 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/src/views/personnelManagement/employeeRecord/components/formDia.vue b/src/views/personnelManagement/employeeRecord/components/formDia.vue
index 6f66f9b..c20877d 100644
--- a/src/views/personnelManagement/employeeRecord/components/formDia.vue
+++ b/src/views/personnelManagement/employeeRecord/components/formDia.vue
@@ -6,52 +6,53 @@
width="70%"
@close="closeDia"
>
+ <!-- 鎸夌収鍏ヨ亴鏂板寮圭獥瀛楁灞曠ず鍩虹淇℃伅鍜屽悎鍚屼俊鎭� -->
<el-descriptions class="detail-descriptions" :column="2" border size="small">
- <el-descriptions-item label="鍛樺伐缂栧彿">{{ formData.staffNo || '-' }}</el-descriptions-item>
- <el-descriptions-item label="濮撳悕">{{ formData.staffName || '-' }}</el-descriptions-item>
- <el-descriptions-item label="鎬у埆">{{ formData.sex || '-' }}</el-descriptions-item>
- <el-descriptions-item label="骞撮緞">{{ formData.age || '-' }}</el-descriptions-item>
- <el-descriptions-item label="韬唤璇佸彿">{{ formData.identityCard || '-' }}</el-descriptions-item>
- <el-descriptions-item label="鎴风睄浣忓潃" :span="2">{{ formData.nativePlace || '-' }}</el-descriptions-item>
- <el-descriptions-item label="鐜颁綇鍧�" :span="2">{{ formData.adress || '-' }}</el-descriptions-item>
- <el-descriptions-item label="宀椾綅">{{ formData.postJob || '-' }}</el-descriptions-item>
- <el-descriptions-item label="绗竴瀛﹀巻">{{ formData.firstStudy || '-' }}</el-descriptions-item>
- <el-descriptions-item label="涓撲笟">{{ formData.profession || '-' }}</el-descriptions-item>
- <el-descriptions-item label="鑱旂郴鐢佃瘽">{{ formData.phone || '-' }}</el-descriptions-item>
- <el-descriptions-item label="绱ф�ヨ仈绯讳汉">{{ formData.emergencyContact || '-' }}</el-descriptions-item>
- <el-descriptions-item label="绱ф�ヨ仈绯讳汉鐢佃瘽">{{ formData.emergencyContactPhone || '-' }}</el-descriptions-item>
- <el-descriptions-item label="鍚堝悓绛捐鏃ユ湡">{{ formData.signDate || '-' }}</el-descriptions-item>
- <el-descriptions-item label="鍔冲姩鍚堝悓鏈熼檺閫夋嫨">
- <span v-if="formData.dateSelect === 'A'">A銆佹湁鍥哄畾鏈熼檺</span>
- <span v-else-if="formData.dateSelect === 'B'">B銆佹棤鍥哄畾鏈熼檺</span>
- <span v-else-if="formData.dateSelect === 'C'">C銆佷互瀹屾垚涓�瀹氬伐浣滀换鍔′负鏈熼檺</span>
- <span v-else>-</span>
+ <el-descriptions-item label="鍛樺伐缂栧彿">
+ {{ formData.staffNo || '-' }}
</el-descriptions-item>
- <el-descriptions-item label="鍚堝悓骞撮檺">{{ formattedContractTerm }}</el-descriptions-item>
- <el-descriptions-item label="璇曠敤鏈熷紑濮嬫棩鏈�" v-if="formData.dateSelect === 'A' || formData.dateSelect === 'B'">
- {{ formData.trialStartDate || '-' }}
+ <el-descriptions-item label="濮撳悕">
+ {{ formData.staffName || '-' }}
</el-descriptions-item>
- <el-descriptions-item label="璇曠敤鏈熺粨鏉熸棩鏈�" v-if="formData.dateSelect === 'A' || formData.dateSelect === 'B'">
- {{ formData.trialEndDate || '-' }}
+ <el-descriptions-item label="鎬у埆">
+ {{ formData.sex || '-' }}
</el-descriptions-item>
- <el-descriptions-item label="璇曠敤鏈熷伐璧�" v-if="formData.dateSelect === 'A' || formData.dateSelect === 'B'">
- {{ formData.proSalary ? formData.proSalary.toFixed(2) : '-' }}
+ <el-descriptions-item label="骞撮緞">
+ {{ formData.age || '-' }}
</el-descriptions-item>
- <el-descriptions-item label="鍚堝悓寮�濮嬫棩鏈�">{{ calculatedContractStart }}</el-descriptions-item>
- <el-descriptions-item label="鍚堝悓缁撴潫鏃ユ湡">{{ formData.contractEndTime || '-' }}</el-descriptions-item>
- <el-descriptions-item label="宸ヨ祫鎶ラ叕" :span="2">
- <span v-if="formData.salarySelect === 'A'">
- A銆佷箼鏂圭殑宸ヨ祫鎶ラ叕鎸夌収鐢叉柟渚濇硶鍒跺畾鐨勮绔犲埗搴︿腑鐨勫唴閮ㄥ伐璧勫垎閰嶅姙娉曠‘瀹氾紝鏍规嵁涔欐柟鐨勫伐浣滃矖浣嶇‘瀹氬叾姣忔湀宸ヨ祫銆�
- </span>
- <span v-else-if="formData.salarySelect === 'B'">
- B銆佺敳鏂瑰涔欐柟瀹炶鍩烘湰宸ヨ祫鍜岀哗鏁堝伐璧勭浉缁撳悎鐨勫唴閮ㄥ伐璧勫垎閰嶅姙娉曪紝涔欐柟鐨勬敹鍏ュ寘鎷熀鏈伐璧勩�佽椁愩�佷氦閫氥�佺敓娲讳綇瀹跨瓑鍚勯」琛ュ姪锛屽鏈夊彉鍔ㄦ牴鎹唴閮ㄥ伐璧勫垎閰嶅姙娉曡皟鏁村叾宸ヨ祫锛涚哗鏁堝伐璧勬牴鎹箼鏂圭殑宸ヤ綔涓氱哗銆佸姵鍔ㄦ垚鏋滃拰瀹為檯璐＄尞鎸夌収鍐呴儴鍒嗛厤鍔炴硶鑰冩牳纭畾銆�
- </span>
- <span v-else-if="formData.salarySelect === 'C'">
- C銆佺敳鏂瑰疄琛岃浠跺伐璧勫埗锛屼互鐢叉柟鎺ュ埌璁㈠崟鍙婂叕鍙哥敓浜ц鍒掞紝鎸夌収瀹氶鍜岃浠跺崟浠凤紝鏍规嵁涔欐柟瀹屾垚鐨勪笟缁╋紝鎸夋椂瓒抽鏀粯涔欐柟鐨勫伐璧勬姤閰��
- </span>
- <span v-else>-</span>
+ <el-descriptions-item label="鎴风睄浣忓潃" :span="2">
+ {{ formData.nativePlace || '-' }}
</el-descriptions-item>
- <el-descriptions-item label="绂忓埄寰呴亣" :span="2">{{ formData.remark || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="鐜颁綇鍧�" :span="2">
+ {{ formData.adress || '-' }}
+ </el-descriptions-item>
+ <el-descriptions-item label="宀椾綅">
+ {{ formData.postJob || '-' }}
+ </el-descriptions-item>
+ <el-descriptions-item label="绗竴瀛﹀巻">
+ {{ formData.firstStudy || '-' }}
+ </el-descriptions-item>
+ <el-descriptions-item label="涓撲笟">
+ {{ formData.profession || '-' }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鑱旂郴鐢佃瘽">
+ {{ formData.phone || '-' }}
+ </el-descriptions-item>
+ <el-descriptions-item label="绱ф�ヨ仈绯讳汉">
+ {{ formData.emergencyContact || '-' }}
+ </el-descriptions-item>
+ <el-descriptions-item label="绱ф�ヨ仈绯讳汉鐢佃瘽">
+ {{ formData.emergencyContactPhone || '-' }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍚堝悓寮�濮嬫棩鏈�">
+ {{ formData.contractStartTime || '-' }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍚堝悓缁撴潫鏃ユ湡">
+ {{ formData.contractExpireTime || '-' }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍚堝悓骞撮檺">
+ {{ formattedContractTerm }}
+ </el-descriptions-item>
</el-descriptions>
<template #footer>
<div class="dialog-footer">
@@ -90,7 +91,7 @@
signDate: "",
salarySelect: "",
contractStartTime: "",
- contractEndTime: "",
+ contractExpireTime: "",
contractTerm: null,
remark: "",
});
@@ -108,7 +109,7 @@
});
const calculatedContractStart = computed(() => {
- const endDate = formData.contractEndTime;
+ const endDate = formData.contractExpireTime;
const termValue = formData.contractTerm;
const numberValue = Number(termValue);
if (!endDate || isNaN(numberValue)) {
--
Gitblit v1.9.3