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

duhe

7 天以前 70a0ddfff13ca0cf225a636d21164714bff5f0af

 src/views/component/HSourceReportHtml/index.vue

@@ -266,7 +266,7 @@
            this.getList();
        },
        getDeptList() {
            axios.get(this.baseURL + "/Sc_ICMOBill/GetHDeptList", {
            axios.get(this.$baseUrl + "/Sc_ICMOBill/GetHDeptList", {
                params: {
                    HOrgID: this.HOrgID
                },
@@ -297,7 +297,7 @@
                }
            }
            // 列表
            axios.get(this.baseURL + "/Sc_BarCode/ReportFromBillList_New", {
            axios.get(this.$baseUrl + "/Sc_BarCode/ReportFromBillList_New", {
                params: {
                    sWhere: this.sWhere,
                    HSouceBillType: this.HSouceBillType,
@@ -423,7 +423,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,
@@ -759,7 +759,7 @@
        /** 删除按钮操作 */
        handleDelete() {
            this.$modal.confirm("确认要删除吗，删除后不能恢复").then(() => {
                axios.get(this.baseURL + "/Kf_StockOutRequestBill/DeltetKf_StockOutRequestBill", {
                axios.get(this.$baseUrl + "/Kf_StockOutRequestBill/DeltetKf_StockOutRequestBill", {
                    params: {
                        HInterID: this.rowForm.HSubID.toString(),
                        user: sessionStorage["HUserName"],