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

dytyqx

2026-03-31 9620ca5caed59bd206dce701a04a5a4e4cfb9dc5

 src/views/component/printList/hBarPlanPrint.vue

@@ -39,6 +39,7 @@
      return datajson;
    },
    ws_both_from_object() {
      console.log(this.$route.query.Type)
      let OpenTmp = decodeURIComponent(this.$route.query.OpenTmp);
      let sql = "";
      if (this.$route.query.Type == "Kf_SellOutBillList") {
@@ -71,12 +72,14 @@
              ) AS t
              GROUP BY CEILING(CAST(t.row_num AS FLOAT) / 2)
              ORDER BY orderid;`;
      } else if (this.$route.query.Type == "Cg_ContractTransportBillMainList") {
        sql = "exec h_p_Cg_ContractTransportBillMainList " +
          this.handleMessage.linterid.toString();
      } else if (this.$route.query.Type == "WL_YayBill") {

        sql = "select * from h_v_WL_YayBilllist where hmainid in(" +
          this.handleMessage.linterid.toString() +
          ") order by hmainid desc";
      }
      axios
        .get(this.$baseUrl + "/CommonModel/searchMethod", {
      this.$nextTick(() => {
        axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
          params: {
            sql: sql,
            user: sessionStorage["HUserName"],
@@ -85,6 +88,7 @@
          },
        })
        .then((response) => {
            console.log(111, OpenTmp, response)
          let result = response.data;
          this.json_data.recordset = result.data;
          //参数具体说明请参考帮助文档中的“WEB报表(B/S报表)->WEB报表客户端->启动参数说明”部分
@@ -103,6 +107,8 @@
          console.log(22222, error);
          this.$modal.msgError("接口请求失败!");
        });
      })

    },
  },
};