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

qq_41295110

2026-01-16 cbc2fe74fb54aad814695982c2987e064696f540

 src/views/basic/gyEmployee/gyEmployee.vue

@@ -353,7 +353,7 @@
                }}</span>
                <el-button
                  type="text"
                  @click="handleEdit(row, (OperationType = 3))"
                  @click.stop="handleEdit(row, (OperationType = 3))"
                  v-else-if="column.property == '职员代码'"
                  >{{ row.职员代码 }}</el-button
                >
@@ -685,7 +685,7 @@
    defaintOperationByCompanyName() {
      var result = false;
      axios
        .get(this.baseURL + "/Xt_getInfo/getCompanyName")
        .get(this.$baseUrl + "/Xt_getInfo/getCompanyName")
        .then((response) => {
          var data1 = response.data;
          if (data1.count == 1) {
@@ -782,7 +782,7 @@
        this.organizationList.find((e) => e.ID == this.queryParams.HOrgID)?.Name || "";
      //生产资料列表
      axios
        .get(this.baseURL + "/Gy_Employee/listPage", {
        .get(this.$baseUrl + "/Gy_Employee/listPage", {
          params: {
            sWhere: this.sWhere,
            user: sessionStorage["HUserName"],
@@ -891,7 +891,7 @@
    DisPlay_HideColumn(HModName, user, option, dataOption) {
      this.totalNameList = [];
      axios
        .get(this.baseURL + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
        .get(this.$baseUrl + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
          params: {
            HModName: HModName,
            user: user,
@@ -1055,7 +1055,7 @@
      if (this.openPage) {
        this.$emit("deptEmitDb", row, 4);
      } else {
        this.handleEdit();
        this.handleEdit(row);
      }
    },
    // 多选框选中数据
@@ -1186,7 +1186,7 @@
    getOrgIDByUser() {
      var res = "";
      axios
        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
        .get(this.$baseUrl + "/Xt_User/getOrgIDListByUser", {
          params: {
            HModName: this.HModName,
            user: sessionStorage["HUserName"],
@@ -1250,7 +1250,8 @@
      });
    },
    //打开修改组件弹窗
    handleEdit() {
    handleEdit(row) {
      this.rowForm = row
      this.$nextTick(() => {
        this.openEdit = true;
        this.editShow = true;
@@ -1269,7 +1270,7 @@
        .then(() => {
          if (!this.rowForm.审核人) {
            axios
              .get(this.baseURL + "DeltetGy_Employee", {
              .get(this.$baseUrl + "DeltetGy_Employee", {
                params: {
                  HItemID: this.rowForm.HItemID.toString(),
                  user: sessionStorage["HUserName"],
@@ -1297,7 +1298,7 @@
      var InterID = form.HItemID || form.HInterID;
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Gy_Employee/AuditGy_Employee", {
        .get(this.$baseUrl + "/Gy_Employee/AuditGy_Employee", {
          params: {
            HInterID: InterID,
            IsAudit: num,
@@ -1322,7 +1323,7 @@
      var InterID = form.HItemID || form.HInterID;
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
        .get(this.$baseUrl + "/Gy_Employee/StopGy_Employee", {
          params: {
            HInterID: InterID,
            IsStop: num,
@@ -1396,7 +1397,7 @@
      var sMainSub = sSubStr + "&和" + sessionStorage["HUserName"];
      axios({
        method: "post",
        url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
        url: this.$baseUrl + "/Gy_Source/Gy_Source_btnSave",
        data: {
          sMainSub: sMainSub,
        },