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

qq_41295110

2026-01-16 cbc2fe74fb54aad814695982c2987e064696f540

 src/views/ICMO/ScICMOBillList.vue

@@ -902,7 +902,7 @@
  },
  created() {
    // set upload URL from configured baseURL
    this.upload.url = this.baseURL + "Gy_Source/Gy_Source_Excel";
    this.upload.url = this.$baseUrl + "Gy_Source/Gy_Source_Excel";
    this.riqiChange();
    this.get_HProjectList();
    this.get_HDeptNameList();
@@ -914,7 +914,7 @@
  },
  methods: {
    syncBill() {
      axios.get(`${this.baseURL}/Sc_ICMOBill/Sc_ICMOBillViewApi`, {
      axios.get(`${this.$baseUrl}/Sc_ICMOBill/Sc_ICMOBillViewApi`, {
        params: {
          BillNo: this.HBillNo2,
          BillType: "3710",
@@ -922,7 +922,7 @@
      });
    },
    async get_HDeptNameList() {
      let res = await axios.get(`${this.baseURL}/Sc_ICMOBill/GetHDeptList`, {
      let res = await axios.get(`${this.$baseUrl}/Sc_ICMOBill/GetHDeptList`, {
        params: { HOrgID: sessionStorage["OrganizationID"] },
      });
      this.HDeptNameList = [
@@ -933,7 +933,7 @@
      ];
    },
    async get_HProjectList() {
      let res = await axios.get(`${this.baseURL}/Gy_Material/Get_HProject`);
      let res = await axios.get(`${this.$baseUrl}/Gy_Material/Get_HProject`);
      this.HProjectList = res.data.data.map((e) => {
        return { label: e.HName, value: e.HItemID };
      });
@@ -981,7 +981,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) {
@@ -1089,7 +1089,7 @@

      try {
        let res = await axios.get(
          this.baseURL + "/LEMS/MES_IF_ICMOBillList_Json_byPage",
          this.$baseUrl + "/LEMS/MES_IF_ICMOBillList_Json_byPage",
          {
            params: {
              sWhere: this.sWhere,
@@ -1197,7 +1197,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,
@@ -1491,7 +1491,7 @@
    getOrgIDByUser() {
      var res = "";
      axios
        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
        .get(this.$baseUrl + "/Xt_User/getOrgIDListByUser", {
          params: {
            HModName: this.HModName,
            user: sessionStorage["HUserName"],
@@ -1577,7 +1577,7 @@
        .then(() => {
          if (!this.rowForm.审核人) {
            axios
              .get(this.baseURL + "/Xs_SeOutStockBill/DeltetSeOutStockBill", {
              .get(this.$baseUrl + "/Xs_SeOutStockBill/DeltetSeOutStockBill", {
                params: {
                  HInter: this.rowForm.hmainid.toString(),
                  HsupId: this.rowForm.HsupId,
@@ -1609,7 +1609,7 @@
      var InterID = form.HItemID || form.HInterID || form.hmainid;
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
        .get(this.$baseUrl + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
          params: {
            HInterID: InterID,
            TypeError: num,
@@ -1634,7 +1634,7 @@
      let HInterID = form.HItemID || form.HInterID || form.hmainid;
      try {
        let res = await axios.get(
          `${this.baseURL}/Xs_SeOutStockBill/CloseXs_SeOutStockBill`,
          `${this.$baseUrl}/Xs_SeOutStockBill/CloseXs_SeOutStockBill`,
          {
            params: {
              HInterID: HInterID,
@@ -1661,7 +1661,7 @@
      let HEntryID = form.HEntryID || form.hsubid;
      try {
        let res = await axios.get(
          `${this.baseURL}/Xs_SeOutStockBill/CloseRowXs_SeOutStockBill`,
          `${this.$baseUrl}/Xs_SeOutStockBill/CloseRowXs_SeOutStockBill`,
          {
            params: {
              HInterID: HInterID,
@@ -1688,7 +1688,7 @@
      let HInterID = form.HItemID || form.HInterID || form.hmainid;
      try {
        let res = await axios.get(
          `${this.baseURL}/Xs_SeOutStockBill/CancellXs_SeOutStockBill`,
          `${this.$baseUrl}/Xs_SeOutStockBill/CancellXs_SeOutStockBill`,
          {
            params: {
              HInterID: HInterID,
@@ -1714,7 +1714,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,
@@ -1788,7 +1788,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,
        },