MES-WEB-VUEUI.git

			@@ -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.班组代码,
			});