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

chenhaozhe

2025-11-14 7570f18ad0164dcb9bb71808f68e89053aaa2bbf

 src/views/basic/gyEmployee/gyEmployeeEdit.vue

@@ -869,17 +869,6 @@
    copyType: { type: Number },
    HOrgID: { type: Number },
  },
  computed: {
    CheckBillDisabled: {
      get() {
        if (!this.form["HCheckEmp"]) {
          return false;
        }

        return true;
      },
    },
  },
  data() {
    return {
      formShow: false,
@@ -912,6 +901,7 @@
      zuzhiId: 0,
      organizationList: [], //组织列表
      subDisabled: false, //编辑页面保存按钮是否禁用(true禁用，false可用)
      CheckBillDisabled: true,
      // OperationType: this.$route.query.OperationType,//保存类型（新增1修改3）
      HInterID: null,
      baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
@@ -1112,15 +1102,26 @@
      console.log(selection);
    },
    fetchData() {
      this.zuzhiId = sessionStorage["OrganizationID"]; //根据登录用户获取默认的组织ID
      this.user = sessionStorage["HUserName"];
      //登录用户信息
      axios
        .get(this.baseURL + "/Web/GetOrganizations", {})
        .get(
          "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
        )
        .then((response) => {
          if (response.data.count == 1) {
            this.organizationList = response.data.data; //组织列表
            this.getdata();
          }
          let data = response.data.data[0];
          this.zuzhiId = data.HUSEORGID; //根据登录用户获取默认的组织ID
          this.user = data.Czymc;
          axios
            .get(this.baseURL + "/Web/GetOrganizations", {})
            .then((response) => {
              if (response.data.count == 1) {
                this.organizationList = response.data.data; //组织列表
                this.getdata();
              }
            })
            .catch((error) => {
              this.$modal.msgError("接口请求失败!");
            });
        })
        .catch((error) => {
          this.$modal.msgError("接口请求失败!");
@@ -1280,10 +1281,7 @@
                HOverPayRate: data.超额比率,
                HStopflag: data.禁用标记,
                HRemark: data.备注,
                HCheckEmp: data["审核人"],
              });

              console.log(this.form.HCheckEmp);

              if (this.OperationType == 3) {
                // 编辑时获取文件列表
@@ -1520,6 +1518,7 @@
      this.formShow = false;
      this.subDisabled = false;
      this.formLoading = true;
      this.CheckBillDisabled = true;
      this.activeName = "first";
      this.resetForm("form");
    },
@@ -1554,9 +1553,11 @@
                  console.log(response);
                  if (response.data.count == 1) {
                    this.subDisabled = true; //设置保存按钮不可用
                    this.CheckBillDisabled = false;
                    this.$modal.msgSuccess(response.data.Message);
                  } else {
                    this.$modal.msgError(response.data.Message);
                    this.CheckBillDisabled = false;
                    this.subDisabled = false; //设置保存按钮可用
                  }
                })
@@ -1600,15 +1601,14 @@
      var InterID = form.HItemID || form.HInterID;
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Gy_Employee/AuditGy_Employee", {
        .get(this.baseURL + "/Gy_Source/AuditGy_Source", {
          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
        })
        .then((response) => {
          let result = response.data;
          if (result.code == 1) {
            this.$modal.msgSuccess("操作成功");
            // this.CheckBillDisabled = true;
            this.getdata();
            this.CheckBillDisabled = true;
          } else {
            this.$modal.msgError("错误:" + result.code + result.Message);
          }
@@ -1628,7 +1628,7 @@
      this.classTimePrjShow = false;
      this.dutyShow = false;
      this.groupShow = false;
      this.dormShow = false;
      this.dormShow = false
    },
    //  打开数据列表弹窗
    openDataDialog(num, row) {