From 5fa77e254003aea6060e3f70d64e5fd1bcdb4748 Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期三, 19 十一月 2025 14:43:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/basic/gyEmployee/gyEmployeeEdit.vue | 190 ++++++++++++++++++++++++-----------------------
1 files changed, 97 insertions(+), 93 deletions(-)
diff --git a/src/views/basic/gyEmployee/gyEmployeeEdit.vue b/src/views/basic/gyEmployee/gyEmployeeEdit.vue
index 39d9e23..5c0ca2c 100644
--- a/src/views/basic/gyEmployee/gyEmployeeEdit.vue
+++ b/src/views/basic/gyEmployee/gyEmployeeEdit.vue
@@ -225,24 +225,24 @@
<el-row>
<el-col :span="8">
<el-form-item label="妗ｆ缂栧彿" prop="HArchivesNo">
- <el-input type="text" :v-model="form.HArchivesNo"></el-input>
+ <el-input type="text" v-model="form.HArchivesNo"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="鑱岀О" prop="HProTitleID">
- <el-input type="text" :v-model="form.HProTitleID"></el-input>
+ <el-input type="text" v-model="form.HProTitleID"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="钖祫绛夌骇" prop="HSalaryLev">
- <el-input type="text" :v-model="form.HSalaryLev"></el-input>
+ <el-input type="text" v-model="form.HSalaryLev"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="姣曚笟瀛︽牎" prop="HGradSchool">
- <el-input type="text" :v-model="form.HGradSchool"></el-input>
+ <el-input type="text" v-model="form.HGradSchool"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -1193,94 +1193,98 @@
if (result.code == 1) {
// 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data.h_v_Edit_IF_EmployeeList[0];
-
- Object.assign(this.form, {
- HNumber: data.鑱屽憳浠ｇ爜,
- HItemID: this.OperationType == 2 ? 0 : data.HItemID,
- HName: data.鑱屽憳鍚嶇О,
- HHelpCode: data.鍔╄浠ｇ爜,
- HGroupID: data.HGroupID,
- HGroupName: data.鐝粍鍚嶇О,
- HGroupNumber: data.鐝粍浠ｇ爜,
- HEndFlag: data.鏄庣粏鏍囪,
- HNoBrushFlag: data.鏄惁鎵撳崱,
- HOverType: data.鏄惁璋冧紤,
- HShiftFlag: data.鏄惁杞彮璋冧紤,
- HStopwagesFlag: data.鏄惁鍋滃彂,
- HInsuranceStatus: data.鏄惁鍙備繚,
- HDeptID: data.閮ㄩ棬ID,
- HDeptName: data.閮ㄩ棬鍚嶇О,
- HDutyID: data.鑱屽姟ID,
- HDutyName: data.鑱屽姟鍚嶇О,
- HDutyNumber: data.鑱屽姟浠ｇ爜,
- HDormID: data.瀹胯垗ID,
- HDormName: data.瀹胯垗鍚嶇О,
- HDormNumber: data.瀹胯垗浠ｇ爜,
- HWorkTypeID: data.宸ョID,
- HWorkTypeName: data.宸ョ鍚嶇О,
- HWorkTypeNumber: data.宸ョ浠ｇ爜,
- HCTPrjID: data.鏍哥畻鏂瑰紡ID,
- HCTPrjName: data.鏍哥畻鏂瑰紡鍚嶇О,
- HCTPrjNumber: data.鏍哥畻鏂瑰紡浠ｇ爜,
- HPostID: data.宀椾綅ID,
- HPostName: data.宀椾綅鍚嶇О,
- HPostNumber: data.宀椾綅浠ｇ爜,
- HSex: data.鎬у埆,
- HBirthDay: dayjs(data.鍑虹敓骞存湀).format("YYYY-MM-DD"),
- HAge: data.骞撮緞,
- HBlighty: data.绫嶈疮,
- HNation: data.姘戞棌,
- HBlightyType: data.鎴风睄绫诲埆,
- HGovStatus: data.鏀挎不闈㈣矊,
- HKnowLev: data.瀛﹀巻,
- HMarr: data.濠氬Щ鐘跺喌,
- HArchivesNo: data.妗ｆ缂栧彿,
- HProTitleID: data.鑱岀О,
- HSalaryLev: data.钖祫绛夌骇,
- HGradSchool: data.姣曚笟瀛︽牎,
- HGradDate: dayjs(data.姣曚笟鏃堕棿).format("YYYY-MM-DD"),
- HEngLev: data.澶栬姘村钩,
- HCompLev: data.璁＄畻鏈烘按骞�,
- HSpec: data.涓撲笟,
- HNowAdd: data.鐜颁綇鍦板潃,
- HEmail: data.鐢靛瓙閭,
- HHomeAdd: data.瀹跺涵鍦板潃,
- HPostalCode: data.閭斂缂栫爜,
- HOldCompany: data.鍘熷叕鍙�,
- HLinkPhone: data.鑱旂郴鐢佃瘽,
- HMobilePhone: data.鎵嬫満鍙�,
- HWorkType: data.鐢ㄥ伐绫诲瀷,
- HInComDate: dayjs(data.杩涘巶鏃ユ湡).format("YYYY-MM-DD"),
- HRelDate: dayjs(data.杞鏃ユ湡).format("YYYY-MM-DD"),
- HInsuranceNo: data.淇濋櫓璇佺紪鍙�,
- HContractBDate: dayjs(data.鍚堝悓寮�濮嬫棩鏈�).format("YYYY-MM-DD"),
- HContractEDate: dayjs(data.鍚堝悓鍒版湡鏃ユ湡).format("YYYY-MM-DD"),
- HContractYear: data.鍚堝悓鏈熼檺,
- HInsuranceDate: dayjs(data.鍙備繚鏃ユ湡).format("YYYY-MM-DD"),
- HDimissionDate: dayjs(data.绂昏亴鏃ユ湡).format("YYYY-MM-DD"),
- HStayCardEDate: dayjs(data.鏆備綇璇佸埌鏈熸棩).format("YYYY-MM-DD"),
- HEmpRate: data.鑱屽憳绯绘暟,
- HBSTDeptID: data.璐濆＋杈鹃儴闂�,
- HRemark: data.澶囨敞,
- HDimissionReason: data.绂昏亴鍘熷洜,
- linteridCard: data.韬唤璇�,
- HEmpType: data.宸ヨ祫绫诲瀷,
- HBankAccount: data.閾惰璐︽埛,
- HInsuranceSubsidy: data.淇濋櫓琛ヨ创,
- HOtherDeduct3: data.鍏朵粬鎵ｆ3,
- HMedicare: data.鍖荤枟淇濋櫓,
- HInsurance: data.鍏昏�佷繚闄�,
- HDrydock: data.澶变笟淇濋櫓,
- HBasePay: data.鍩烘湰宸ヨ祫,
- HExamLevPostMoney: data.鑱屽姟鑰冩牳宸ヨ祫,
- HExamRate: data.鑰冩牳绯绘暟,
- HPayType: data.鏀粯绫诲瀷,
- HLeftMoneyRate: data.鍓╀綑宸ヨ祫,
- HHighestPay: data.鏈�楂樺伐璧�,
- HOverPayRate: data.瓒呴姣旂巼,
- HStopflag: data.绂佺敤鏍囪,
- HRemark: data.澶囨敞,
- });
+ console.log(data);
+ this.form = {
+ ...{
+ HNumber: data.鑱屽憳浠ｇ爜,
+ HItemID: this.OperationType == 2 ? 0 : data.HItemID,
+ HName: data.鑱屽憳鍚嶇О,
+ HHelpCode: data.鍔╄浠ｇ爜,
+ HGroupID: data.HGroupID,
+ HGroupName: data.鐝粍鍚嶇О,
+ HGroupNumber: data.鐝粍浠ｇ爜,
+ HEndFlag: data.鏄庣粏鏍囪 == "true" ? true : false,
+ HNoBrushFlag: data.鏄惁鎵撳崱 == "true" ? true : false,
+ HOverType: data.鏄惁璋冧紤 == "true" ? true : false,
+ HShiftFlag: data.鏄惁杞彮璋冧紤 == "true" ? true : false,
+ HStopwagesFlag: data.鏄惁鍋滃彂 == "true" ? true : false,
+ HInsuranceStatus: data.鏄惁鍙備繚,
+ HDeptID: data.閮ㄩ棬ID,
+ HDeptName: data.閮ㄩ棬鍚嶇О,
+ HDutyID: data.鑱屽姟ID,
+ HDutyName: data.鑱屽姟鍚嶇О,
+ HDutyNumber: data.鑱屽姟浠ｇ爜,
+ HDormID: data.瀹胯垗ID,
+ HDormName: data.瀹胯垗鍚嶇О,
+ HDormNumber: data.瀹胯垗浠ｇ爜,
+ HWorkTypeID: data.宸ョID,
+ HWorkTypeName: data.宸ョ鍚嶇О,
+ HWorkTypeNumber: data.宸ョ浠ｇ爜,
+ HCTPrjID: data.鏍哥畻鏂瑰紡ID,
+ HCTPrjName: data.鏍哥畻鏂瑰紡鍚嶇О,
+ HCTPrjNumber: data.鏍哥畻鏂瑰紡浠ｇ爜,
+ HPostID: data.宀椾綅ID,
+ HPostName: data.宀椾綅鍚嶇О,
+ HPostNumber: data.宀椾綅浠ｇ爜,
+ HSex: data.鎬у埆,
+ HBirthDay: dayjs(data.鍑虹敓骞存湀).format("YYYY-MM-DD"),
+ HAge: data.骞撮緞,
+ HBlighty: data.绫嶈疮,
+ HNation: data.姘戞棌,
+ HBlightyType: data.鎴风睄绫诲埆,
+ HGovStatus: data.鏀挎不闈㈣矊,
+ HKnowLev: data.瀛﹀巻,
+ HMarr: data.濠氬Щ鐘跺喌,
+ HArchivesNo: data.妗ｆ缂栧彿,
+ HProTitleID: data.鑱岀О,
+ HSalaryLev: data.钖祫绛夌骇,
+ HGradSchool: data.姣曚笟瀛︽牎,
+ HGradDate: dayjs(data.姣曚笟鏃堕棿).format("YYYY-MM-DD"),
+ HEngLev: data.澶栬姘村钩,
+ HCompLev: data.璁＄畻鏈烘按骞�,
+ HSpec: data.涓撲笟,
+ HNowAdd: data.鐜颁綇鍦板潃,
+ HEmail: data.鐢靛瓙閭,
+ HHomeAdd: data.瀹跺涵鍦板潃,
+ HPostalCode: data.閭斂缂栫爜,
+ HOldCompany: data.鍘熷叕鍙�,
+ HLinkPhone: data.鑱旂郴鐢佃瘽,
+ HMobilePhone: data.鎵嬫満鍙�,
+ HWorkType: data.鐢ㄥ伐绫诲瀷,
+ HInComDate: dayjs(data.杩涘巶鏃ユ湡).format("YYYY-MM-DD"),
+ HRelDate: dayjs(data.杞鏃ユ湡).format("YYYY-MM-DD"),
+ HInsuranceNo: data.淇濋櫓璇佺紪鍙�,
+ HContractBDate: dayjs(data.鍚堝悓寮�濮嬫棩鏈�).format("YYYY-MM-DD"),
+ HContractEDate: dayjs(data.鍚堝悓鍒版湡鏃ユ湡).format("YYYY-MM-DD"),
+ HContractYear: data.鍚堝悓鏈熼檺,
+ HInsuranceDate: dayjs(data.鍙備繚鏃ユ湡).format("YYYY-MM-DD"),
+ HDimissionDate: dayjs(data.绂昏亴鏃ユ湡).format("YYYY-MM-DD"),
+ HStayCardEDate: dayjs(data.鏆備綇璇佸埌鏈熸棩).format("YYYY-MM-DD"),
+ HEmpRate: data.鑱屽憳绯绘暟,
+ HBSTDeptID: data.璐濆＋杈鹃儴闂�,
+ HRemark: data.澶囨敞,
+ HDimissionReason: data.绂昏亴鍘熷洜,
+ linteridCard: data.韬唤璇�,
+ HEmpType: data.宸ヨ祫绫诲瀷,
+ HBankAccount: data.閾惰璐︽埛,
+ HInsuranceSubsidy: data.淇濋櫓琛ヨ创,
+ HOtherDeduct3: data.鍏朵粬鎵ｆ3,
+ HMedicare: data.鍖荤枟淇濋櫓,
+ HInsurance: data.鍏昏�佷繚闄�,
+ HDrydock: data.澶变笟淇濋櫓,
+ HBasePay: data.鍩烘湰宸ヨ祫,
+ HExamLevPostMoney: data.鑱屽姟鑰冩牳宸ヨ祫,
+ HExamRate: data.鑰冩牳绯绘暟,
+ HPayType: data.鏀粯绫诲瀷,
+ HLeftMoneyRate: data.鍓╀綑宸ヨ祫,
+ HHighestPay: data.鏈�楂樺伐璧�,
+ HOverPayRate: data.瓒呴姣旂巼,
+ HStopflag: data.绂佺敤鏍囪,
+ HRemark: data.澶囨敞,
+ HIDCard: data.韬唤璇� || "",
+ HFax: data.浼犵湡鍙风爜 || "",
+ },
+ };
if (this.OperationType == 3) {
// 缂栬緫鏃惰幏鍙栨枃浠跺垪琛�
@@ -1374,7 +1378,7 @@
} else if (num == "Group") {
// 鐝粍
Object.assign(this.form, {
- HGroupItem: deptRow.HItemID,
+ HGroupID: deptRow.HItemID,
HGroupName: deptRow.鐝粍鍚嶇О,
HGroupNumber: deptRow.鐝粍浠ｇ爜,
});
--
Gitblit v1.9.1