Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

qq_41295110

2025-11-19 5fa77e254003aea6060e3f70d64e5fd1bcdb4748

 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,8 +1193,9 @@
            if (result.code == 1) {
              // 说明验证成功了，
              var data = result.data.h_v_Edit_IF_EmployeeList[0];

              Object.assign(this.form, {
              console.log(data);
              this.form = {
                ...{
                HNumber: data.职员代码,
                HItemID: this.OperationType == 2 ? 0 : data.HItemID,
                HName: data.职员名称,
@@ -1202,11 +1203,11 @@
                HGroupID: data.HGroupID,
                HGroupName: data.班组名称,
                HGroupNumber: data.班组代码,
                HEndFlag: data.明细标记,
                HNoBrushFlag: data.是否打卡,
                HOverType: data.是否调休,
                HShiftFlag: data.是否轮班调休,
                HStopwagesFlag: 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.部门名称,
@@ -1280,7 +1281,10 @@
                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.班组代码,
        });