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

qq_41295110

2026-01-16 cbc2fe74fb54aad814695982c2987e064696f540

 src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue

@@ -831,7 +831,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) {
@@ -931,7 +931,7 @@
      // this.sWhere += ` and CONVERT(varchar(100),日期, 23) >= '2020-01-01' and CONVERT(varchar(100),日期, 23) <= '2030-01-01'`;
      //生产资料列表
      axios
        .get(this.baseURL + "/Cg_POOrderBill/page", {
        .get(this.$baseUrl + "/Cg_POOrderBill/page", {
          params: {
            sWhere: this.sWhere,
            user: sessionStorage["HUserName"],
@@ -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,
@@ -1327,7 +1327,7 @@
    getOrgIDByUser() {
      var res = "";
      axios
        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
        .get(this.$baseUrl + "/Xt_User/getOrgIDListByUser", {
          params: {
            HModName: this.HModName,
            user: sessionStorage["HUserName"],
@@ -1412,7 +1412,7 @@
        .then(() => {
          if (!this.rowForm.审核人) {
            axios
              .get(this.baseURL + "Cg_POOrderBill/DeltetCg_POOrderBill", {
              .get(this.$baseUrl + "Cg_POOrderBill/DeltetCg_POOrderBill", {
                params: {
                  HInter: this.rowForm.HInterID.toString(),
                  user: sessionStorage["HUserName"],
@@ -1440,7 +1440,7 @@
      var InterID = form.HItemID || form.HInterID || form.hmainid;
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Cg_POOrderBill/AuditCg_POOrderBill", {
        .get(this.$baseUrl + "/Cg_POOrderBill/AuditCg_POOrderBill", {
          params: {
            HInterID: InterID,
            IsAudit: num,
@@ -1464,7 +1464,7 @@
    async set_CloseBill(num, form) {
      let HInterID = form.HItemID || form.HInterID || form.hmainid;
      try {
        let res = await axios.get(`${this.baseURL}/Cg_POOrderBill/CloseCg_POOrderBill`, {
        let res = await axios.get(`${this.$baseUrl}/Cg_POOrderBill/CloseCg_POOrderBill`, {
          params: {
            HInterID: HInterID,
            Type: num,
@@ -1489,7 +1489,7 @@
      let HEntryID = form.HEntryID || form.hsubid;
      try {
        let res = await axios.get(
          `${this.baseURL}Cg_POOrderBill/CloseRowCg_POOrderBill`,
          `${this.$baseUrl}Cg_POOrderBill/CloseRowCg_POOrderBill`,
          {
            params: {
              HInterID: HInterID,
@@ -1515,7 +1515,7 @@
    async set_DropBill(num, form) {
      let HInterID = form.HItemID || form.HInterID || form.hmainid;
      try {
        let res = await axios.get(`${this.baseURL}/Cg_POOrderBill/DropCg_POOrderBil`, {
        let res = await axios.get(`${this.$baseUrl}/Cg_POOrderBill/DropCg_POOrderBil`, {
          params: {
            HInterID: HInterID,
            Type: num,
@@ -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,
        },