From cc33c00a94f0c74c769abf052f32709f56f222cd Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 27 十一月 2025 08:38:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

---
 src/views/component/printList/hBarPlanPrint.vue |   80 ++++++++++++++++++++++++++--------------
 1 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/src/views/component/printList/hBarPlanPrint.vue b/src/views/component/printList/hBarPlanPrint.vue
index 56c81cf..a50b1a4 100644
--- a/src/views/component/printList/hBarPlanPrint.vue
+++ b/src/views/component/printList/hBarPlanPrint.vue
@@ -37,35 +37,59 @@
             return datajson;
         },
         ws_both_from_object() {
-            let OpenTmp=decodeURIComponent(this.$route.query.OpenTmp)
-            let apIUrl=''
-            if(this.$route.query.Type=='Kf_SellOutBillList'){
-                apIUrl='/Kf_SellOutBill/cx'
+            let OpenTmp = decodeURIComponent(this.$route.query.OpenTmp)
+            let apIUrl = ''
+            if (this.$route.query.Type == 'Kf_SellOutBillList') {
+                apIUrl = '/Kf_SellOutBill/cx'
+                axios.get(this.baseURL + apIUrl, {
+                    params: {
+                        "HInterID": this.handleMessage.linterid
+                        // , "HSubID": data[i].hsubid
+                    },
+                }).then(response => {
+                    let result = response.data
+                    this.json_data.recordset = result.data
+                    //鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗d腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
+                    var args = {
+                        type: "preview", //璁剧疆涓嶅悓鐨勫睘鎬у彲浠ユ墽琛屼笉鍚岀殑浠诲姟锛屽锛歱review print pdf xls csv txt rtf img grd
+                        // report: this.json_report, //report: JSON.stringify(json_report),
+                        report: urlAddRandomNo('./static/grf/' + OpenTmp + '.grf'),
+                        data: this.json_data //data: JSON.stringify(json_data)
+                    };
+                    webapp_ws_ajax_run(args);
+                    // var reportViewer = rubylong.grhtml5.insertReportViewer("report_holder", "./static/grf/閿�鍞嚭搴撳崟.grf", this.json_data);
+                    // reportViewer.start();
+                }).catch(error => {
+                    this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+                });
+            } else if (this.$route.query.Type == 'HGy_BarCodeBill') {
+                apIUrl = '/CommonModel/searchMethod'
+                axios.get(this.baseURL + apIUrl, {
+                    params: {
+                        "sql": "select * from h_v_IF_BarCodeBillList where hmainid in(" + this.handleMessage.linterid.toString() + ") order by hmainid desc",
+                        "user": sessionStorage["HUserName"],
+                        "ModRightNameCheck": ''
+                        // , "HSubID": data[i].hsubid
+                    },
+                }).then(response => {
+                    let result = response.data
+                    this.json_data.recordset = result.data
+                    //鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗d腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
+                    var args = {
+                        type: "preview", //璁剧疆涓嶅悓鐨勫睘鎬у彲浠ユ墽琛屼笉鍚岀殑浠诲姟锛屽锛歱review print pdf xls csv txt rtf img grd
+                        // report: this.json_report, //report: JSON.stringify(json_report),
+                        report: urlAddRandomNo('./static/grf/' + OpenTmp + '.grf'),
+                        data: this.json_data //data: JSON.stringify(json_data)
+                    };
+                    console.log(args,this.json_data)
+                    webapp_ws_ajax_run(args);
+                    // var reportViewer = rubylong.grhtml5.insertReportViewer("report_holder", "./static/grf/閿�鍞嚭搴撳崟.grf", this.json_data);
+                    // reportViewer.start();
+                }).catch(error => {
+                    console.log(22222, error)
+                    this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+                });
             }
-            axios.get(this.baseURL + apIUrl, {
-                params: {
-                    "HInterID": this.handleMessage.linterid
-                    // , "HSubID": data[i].hsubid
-                },
-            }).then(response => {
-                let result = response.data
-                this.json_data.recordset = result.data
-                //鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗d腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
-                var args = {
-                    type: "preview", //璁剧疆涓嶅悓鐨勫睘鎬у彲浠ユ墽琛屼笉鍚岀殑浠诲姟锛屽锛歱review print pdf xls csv txt rtf img grd
-                    // report: this.json_report, //report: JSON.stringify(json_report),
-                    report: urlAddRandomNo('./static/grf/'+OpenTmp+'.grf'),
-                    data: this.json_data //data: JSON.stringify(json_data)
-                };
-                webapp_ws_ajax_run(args);
-                // var reportViewer = rubylong.grhtml5.insertReportViewer("report_holder", "./static/grf/閿�鍞嚭搴撳崟.grf", this.json_data);
-                // reportViewer.start();
-            }).catch(error => {
-                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-            });
-
-
-
 
         }
     },

--
Gitblit v1.9.1