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

qq_41295110

2026-01-16 cbc2fe74fb54aad814695982c2987e064696f540

 src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue

@@ -787,7 +787,7 @@
      }, 300);
    },
    BillSync() {
      axios.get(`${this.baseURL}/Kf_ICStockBillMain/GetCStockBillList`, {
      axios.get(`${this.$baseUrl}/Kf_ICStockBillMain/GetCStockBillList`, {
        params: { BillNo: this.form.HBillno2, BillType: 1403 },
      });
    },
@@ -831,7 +831,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) {
@@ -937,7 +937,7 @@
      }

      try {
        let res = await axios.get(this.baseURL + "/Kf_ICStockBackBill/GetKf_ICStockBackBillList", {
        let res = await axios.get(this.$baseUrl + "/Kf_ICStockBackBill/GetKf_ICStockBackBillList", {
          params: {
            sWhere: this.sWhere,
            user: this.user,
@@ -1038,7 +1038,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,
@@ -1318,7 +1318,7 @@
    getOrgIDByUser() {
      var res = "";
      axios
        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
        .get(this.$baseUrl + "/Xt_User/getOrgIDListByUser", {
          params: {
            HModName: this.HModName,
            user: this.user,
@@ -1425,7 +1425,7 @@
        .then(() => {
          if (!this.rowForm.审核人) {
            axios
              .get(this.baseURL + "Kf_ICStockBackBill/DropKf_ICStockBackBill", {
              .get(this.$baseUrl + "Kf_ICStockBackBill/DropKf_ICStockBackBill", {
                params: {
                  HInterID: form.hmainid.toString(),
                  HsupId: form.hsubid,
@@ -1457,7 +1457,7 @@
      var InterID = form.HItemID || form.HInterID || form.hmainid;
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Kf_ICStockBackBill/AuditKf_ICStockBackBill", {
        .get(this.$baseUrl + "/Kf_ICStockBackBill/AuditKf_ICStockBackBill", {
          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
        })
        .then((res) => {
@@ -1478,7 +1478,7 @@
      let HInterID = form.HItemID || form.HInterID || form.hmainid;
      try {
        let res = await axios.get(
          this.baseURL+"/Kf_ICStockBackBill/CloseKf_ICStockBackBill",
          this.$baseUrl+"/Kf_ICStockBackBill/CloseKf_ICStockBackBill",
          {
            params: {
              HInterID: HInterID, IsAudit: num, CurUserName: this.user
@@ -1503,7 +1503,7 @@
      let HInterID = form.HItemID || form.HInterID || form.hmainid;
      try {
        let res = await axios.get(
          this.baseURL+"Kf_ICStockBackBill/DeleteKf_ICStockBackBill",
          this.$baseUrl+"Kf_ICStockBackBill/DeleteKf_ICStockBackBill",
          {
            params: {
              HInterID: HInterID, IsAudit: num, CurUserName: this.user
@@ -1527,7 +1527,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, IsAudit: num, CurUserName: this.user },
        })
        .then((res) => {
@@ -1609,7 +1609,7 @@
      var sMainSub = sSubStr + "&和" + this.user;
      axios({
        method: "post",
        url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
        url: this.$baseUrl + "/Gy_Source/Gy_Source_btnSave",
        data: {
          sMainSub: sMainSub,
        },