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

qq_41295110

2026-01-16 cbc2fe74fb54aad814695982c2987e064696f540

 src/views/system/user/GyDriver.vue

@@ -824,7 +824,7 @@
    async initData() {
      try {
        const userRes = await axios.get(
          `${this.baseURL}/Web/GetUser?UserName=${
          `${this.$baseUrl}/Web/GetUser?UserName=${
            sessionStorage.getItem("UserName") || "001"
          }&PassWord=123456&HOrgName=100038`
        );
@@ -835,7 +835,7 @@
          this.queryParams.HUSEORGID = userData.HUSEORGID;
        }

        const orgRes = await axios.get(`${this.baseURL}/Web/GetOrganizations`);
        const orgRes = await axios.get(`${this.$baseUrl}/Web/GetOrganizations`);
        if (orgRes.data.count == 1) {
          this.organizationList = orgRes.data.data;
        }
@@ -863,7 +863,7 @@
          size: this.pageSize,
        };

        const res = await axios.get(`${this.baseURL}/Gy_DriverController/list`, {
        const res = await axios.get(`${this.$baseUrl}/Gy_DriverController/list`, {
          params,
        });

@@ -930,7 +930,7 @@
    async DisPlay_HideColumn() {
      try {
        const res = await axios.get(
          `${this.baseURL}/Xt_grdAlignment_WMES/grdAlignmentWMESList`,
          `${this.$baseUrl}/Xt_grdAlignment_WMES/grdAlignmentWMESList`,
          {
            params: {
              HModName: this.HModName,
@@ -1126,7 +1126,7 @@
      }

      try {
        const res = await axios.get(`${this.baseURL}/Gy_Driver/Gy_DriverViewApi`, {
        const res = await axios.get(`${this.$baseUrl}/Gy_Driver/Gy_DriverViewApi`, {
          params: {
            Number: this.queryParams.HSyncNumber,
            Type: "JSY", // 驾驶员类型
@@ -1257,7 +1257,7 @@
      try {
        await this.$modal.confirm("确认要删除吗，删除后不能恢复");

        const res = await axios.get(`${this.baseURL}/DeltetGy_Driver`, {
        const res = await axios.get(`${this.$baseUrl}/DeltetGy_Driver`, {
          params: {
            HItemID: this.rowForm.HItemID.toString(),
            user: this.user,
@@ -1288,7 +1288,7 @@
        const action = isAudit ? "反审核" : "审核";
        await this.$modal.confirm(`确认要${action}吗？`);

        const res = await axios.get(`${this.baseURL}/Gy_Driver/AuditGy_Driver`, {
        const res = await axios.get(`${this.$baseUrl}/Gy_Driver/AuditGy_Driver`, {
          params: {
            HInterID: this.rowForm.HItemID.toString(),
            IsAudit: isAudit,
@@ -1320,7 +1320,7 @@
        const action = isStop ? "反禁用" : "禁用";
        await this.$modal.confirm(`确认要${action}吗？`);

        const res = await axios.get(`${this.baseURL}/Gy_Driver/StopGy_Driver`, {
        const res = await axios.get(`${this.$baseUrl}/Gy_Driver/StopGy_Driver`, {
          params: {
            HInterID: this.rowForm.HItemID.toString(),
            IsStop: isStop,
@@ -1457,7 +1457,7 @@
        const sSubStr = JSON.stringify(validData);
        const sMainSub = sSubStr + "&和" + this.user;

        const res = await axios.post(`${this.baseURL}/Gy_Driver/Gy_Process_Excel`, {
        const res = await axios.post(`${this.$baseUrl}/Gy_Driver/Gy_Process_Excel`, {
          sMainSub: sMainSub,
        });

@@ -1537,7 +1537,7 @@
    // 加载过滤方案
    async loadFilterSchemes() {
      try {
        const res = await axios.get(`${this.baseURL}/Xt_FastICScheme/list`, {
        const res = await axios.get(`${this.$baseUrl}/Xt_FastICScheme/list`, {
          params: {
            HModuleName: this.HModuleName,
            user: this.user,
@@ -1573,7 +1573,7 @@
      try {
        await this.$modal.confirm(`确认要删除方案"${row.方案名称}"吗？`);
        
        const res = await axios.post(`${this.baseURL}/Xt_FastICScheme/delete`, {
        const res = await axios.post(`${this.$baseUrl}/Xt_FastICScheme/delete`, {
          HInterID: row.hmainid,
        });