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

qq_41295110

2026-01-16 cbc2fe74fb54aad814695982c2987e064696f540

 src/views/ICMO/ScICMOReportBill/ScICMOReportBillList.vue

@@ -819,7 +819,7 @@
    defaintOperationByCompanyName() {
      var result = false;
      axios
        .get(this.baseURL + "/Xt_getInfo/getCompanyName")
        .get(this.$baseUrl + "/Xt_getInfo/getCompanyName")
        .then((res) => {
          var data1 = res.data;
          if (data1.count == 1) {
@@ -918,7 +918,7 @@
        this.sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + this.eTime + "'";
      }
      try {
        let res = await axios.get(this.baseURL + "Sc_ICMOReportBill/list", {
        let res = await axios.get(this.$baseUrl + "Sc_ICMOReportBill/list", {
          params: {
            sWhere: this.sWhere,
            user: sessionStorage["HUserName"],
@@ -1022,7 +1022,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,
@@ -1297,7 +1297,7 @@
    getOrgIDByUser() {
      var res = "";
      axios
        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
        .get(this.$baseUrl + "/Xt_User/getOrgIDListByUser", {
          params: {
            HModName: this.HModName,
            user: sessionStorage["HUserName"],
@@ -1403,7 +1403,7 @@
        .then(() => {
          if (!this.rowForm.审核人) {
            axios
              .get(this.baseURL + "Sc_ICMOReportBill/DeltetICMOReportBill", {
              .get(this.$baseUrl + "Sc_ICMOReportBill/DeltetICMOReportBill", {
                params: {
                  HInter: this.rowForm.hmainid.toString(),
                  user: sessionStorage["HUserName"],
@@ -1431,7 +1431,7 @@
      var InterID = form.HItemID || form.HInterID || form.hmainid;
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Sc_ICMOReportBill/AuditProcessReportList", {
        .get(this.$baseUrl + "/Sc_ICMOReportBill/AuditProcessReportList", {
          params: {
            HInterID: InterID,
            IsAudit: num,
@@ -1456,7 +1456,7 @@
      let HInterID = form.HItemID || form.HInterID || form.hmainid;
      try {
        let res = await axios.get(
          `${this.baseURL}/Sc_ICMOReportBill/CloseSc_ICMOReportBill`,
          `${this.$baseUrl}/Sc_ICMOReportBill/CloseSc_ICMOReportBill`,
          {
            params: {
              HInterID: HInterID,
@@ -1483,7 +1483,7 @@
      let HEntryID = form.HEntryID || form.hsubid;
      try {
        let res = await axios.get(
          `${this.baseURL}/Cg_POInStockBill/CloseRowCg_POInStockBill`,
          `${this.$baseUrl}/Cg_POInStockBill/CloseRowCg_POInStockBill`,
          {
            params: {
              HInterID: HInterID,
@@ -1511,7 +1511,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,
@@ -1585,7 +1585,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,
        },