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

duhe

2026-01-16 70a0ddfff13ca0cf225a636d21164714bff5f0af

 src/views/basic/gyCar/gyCarList.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) {
@@ -920,7 +920,7 @@
        this.sWhere += " and CONVERT(varchar(100),建立时间, 23) <= '" + this.eTime + "'";
      }
      try {
        let res = await axios.get(this.baseURL + "/Gy_Car/list_byPage", {
        let res = await axios.get(this.$baseUrl + "/Gy_Car/list_byPage", {
          params: {
            sWhere: this.sWhere,
            user: sessionStorage["HUserName"],
@@ -1025,7 +1025,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,
@@ -1321,7 +1321,7 @@
    getOrgIDByUser() {
      var res = "";
      axios
        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
        .get(this.$baseUrl + "/Xt_User/getOrgIDListByUser", {
          params: {
            HModName: this.HModName,
            user: sessionStorage["HUserName"],
@@ -1406,7 +1406,7 @@
        .then(() => {
          if (!this.rowForm.审核人) {
            axios
              .get(this.baseURL + "Xs_SeOrderBill/DropXs_SeOrderBill", {
              .get(this.$baseUrl + "Xs_SeOrderBill/DropXs_SeOrderBill", {
                params: {
                  HInterID: this.rowForm.hmainid.toString(),
                  user: sessionStorage["HUserName"],
@@ -1434,7 +1434,7 @@
      var InterID = form.HItemID || form.HInterID || form.hmainid;
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Cg_POInStockBill/AuditCg_POInStockBill", {
        .get(this.$baseUrl + "/Cg_POInStockBill/AuditCg_POInStockBill", {
          params: {
            HInterID: InterID,
            IsAudit: num,
@@ -1459,7 +1459,7 @@
      let HInterID = form.HItemID || form.HInterID || form.hmainid;
      try {
        let res = await axios.get(
          `${this.baseURL}/Cg_POInStockBill/CloseCg_POInStockBill`,
          `${this.$baseUrl}/Cg_POInStockBill/CloseCg_POInStockBill`,
          {
            params: {
              HInterID: HInterID,
@@ -1486,7 +1486,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,
@@ -1513,7 +1513,7 @@
      let HInterID = form.HItemID || form.HInterID || form.hmainid;
      try {
        let res = await axios.get(
          `${this.baseURL}/Cg_POInStockBill/DropCg_POInStockBill`,
          `${this.$baseUrl}/Cg_POInStockBill/DropCg_POInStockBill`,
          {
            params: {
              HInterID: HInterID,
@@ -1539,7 +1539,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,
@@ -1613,7 +1613,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,
        },