|
@@ -669,7 +669,7 @@
|
|
|
groupCode:this.form.groupCode,
|
|
|
})
|
|
|
// 获取的数据赋值
|
|
|
- let data = res.data.data
|
|
|
+ let data = res.data.data.data
|
|
|
|
|
|
var dataSet = new Stimulsoft.System.Data.DataSet(
|
|
|
'reportData'
|
|
@@ -734,10 +734,24 @@
|
|
|
report.load(url)
|
|
|
|
|
|
|
|
|
+ // 获取报表数据
|
|
|
+ // const res = await reportsGetReportData({
|
|
|
+ // billId:this.id,
|
|
|
+ // reportCode:this.form.code,
|
|
|
+ // groupCode:this.form.groupCode,
|
|
|
+ // })
|
|
|
+ // // 获取的数据赋值
|
|
|
+ // let data = res.data.data.data
|
|
|
+
|
|
|
// 加载数据
|
|
|
if (this.id) {
|
|
|
- billsDetail(this.id).then(res => {
|
|
|
- var data = res.data.data
|
|
|
+ // billsDetail(this.id).then(res => {
|
|
|
+ reportsGetReportData({
|
|
|
+ billId:this.id,
|
|
|
+ reportCode:this.form.code,
|
|
|
+ groupCode:this.form.groupCode,
|
|
|
+ }).then(res => {
|
|
|
+ var data = res.data.data.data
|
|
|
|
|
|
// console.log('hshipperDetails')
|
|
|
// console.log(data.hshipperDetails, 'hshipperDetails')
|