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

陈婷婷

2026-01-21 573d43ef42259db9581e54d7cddd4f290b4f379d

 src/views/basic/gyProperty/gyPropertyList.vue

@@ -632,7 +632,7 @@
    // 仓库同步
    async handleSync() {
      try {
        let res = await axios.get(this.baseURL + "/Gy_Warehouse/Gy_WarehouseViewApi", {
        let res = await axios.get(this.$baseUrl + "/Gy_Warehouse/Gy_WarehouseViewApi", {
          params: {
            Number: this.queryParams.HSyncNumber,
            Type: "CK",
@@ -682,7 +682,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) {
@@ -771,7 +771,7 @@
      this.sWhere += "";
      //生产资料列表
      axios
        .get(this.baseURL + "/Gy_Property/listPage", {
        .get(this.$baseUrl + "/Gy_Property/listPage", {
          params: {
            sWhere: `${this.sWhere}`,
            user: sessionStorage["HUserName"],
@@ -878,7 +878,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,
@@ -1187,7 +1187,7 @@
    getOrgIDByUser() {
      var res = "";
      axios
        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
        .get(this.$baseUrl + "/Xt_User/getOrgIDListByUser", {
          params: {
            HModName: this.HModName,
            user: sessionStorage["HUserName"],
@@ -1273,7 +1273,7 @@
        .then(() => {
          if (!this.rowForm.审核人) {
            axios
              .get(this.baseURL + "/DeltetGy_Warehouse", {
              .get(this.$baseUrl + "/DeltetGy_Warehouse", {
                params: {
                  HItemID: this.rowForm.HItemID.toString(),
                  user: sessionStorage["HUserName"],
@@ -1301,7 +1301,7 @@
      var InterID = form.HItemID || form.HInterID;
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Gy_Warehouse/AuditGy_Warehouse", {
        .get(this.$baseUrl + "/Gy_Warehouse/AuditGy_Warehouse", {
          params: {
            HInterID: InterID,
            IsAudit: num,
@@ -1326,7 +1326,7 @@
      var InterID = form.HItemID || form.HInterID;
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Gy_Warehouse/StopGy_Warehouse", {
        .get(this.$baseUrl + "/Gy_Warehouse/StopGy_Warehouse", {
          params: {
            HInterID: InterID,
            IsStop: num,
@@ -1400,7 +1400,7 @@
      var sMainSub = sSubStr + "&和" + sessionStorage["HUserName"];
      axios({
        method: "post",
        url: this.baseURL + "/Gy_Warehouse/Gy_Process_Excel",
        url: this.$baseUrl + "/Gy_Warehouse/Gy_Process_Excel",
        data: {
          sMainSub: sMainSub,
        },