From 2a17ea5e65de68d5e3eee19a5490ab91e61537be Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Thu, 21 Apr 2022 15:07:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=20=E4=BB=93=E5=BA=932022?=
=?UTF-8?q?=E5=B9=B44=E6=9C=8819=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/index.js | 2 +-
src/views/modules/common/file-list-view.vue | 2 +-
src/views/modules/common/file-list.vue | 2 +-
.../expirationTimeModification.vue | 2 +-
.../rawMaterials/expirationTimeList.vue | 2 +-
.../modules/report/user_customer_report.vue | 12 ++++++++---
.../modules/shopOrder/shopOrder/shopOrder.vue | 20 +++++++++++++++++++
7 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 2c8666e..19aa3e6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -38,7 +38,7 @@ const mainRoutes = {
{ path: '/theme', component: _import('common/theme'), name: 'theme', meta: { title: '主题' } },
{ path: '/demo-echarts', component: _import('demo/echarts'), name: 'demo-echarts', meta: { title: 'demo-echarts', isTab: true } },
// { path: '/demo-ueditor', component: _import('demo/ueditor'), name: 'demo-ueditor', meta: { title: 'demo-ueditor', isTab: true } }
- { path: '/customer_report_show', component: _import('modules/report/customer_report_show'), name: 'report', meta: { title: '自定义报表展示', isTab: true } },//2022-04-20 自定义报表路径
+ { path: '/customer_report_show', component: _import('modules/report/customer_report_show'), name: 'report', meta: { title: '自定义报表展示' } },//2022-04-20 自定义报表路径
],
beforeEnter (to, from, next) {
let token =Vue.cookie.get('token')
diff --git a/src/views/modules/common/file-list-view.vue b/src/views/modules/common/file-list-view.vue
index 3d826cf..4228c8a 100644
--- a/src/views/modules/common/file-list-view.vue
+++ b/src/views/modules/common/file-list-view.vue
@@ -99,7 +99,7 @@ export default {
},
mounted() {
this.$nextTick(() => {
- this.height = (window.innerHeight - 260)+"px";
+ this.height = (window.innerHeight*0.82);
})
},
activated() {
diff --git a/src/views/modules/common/file-list.vue b/src/views/modules/common/file-list.vue
index 61e3e1e..51ffe9e 100644
--- a/src/views/modules/common/file-list.vue
+++ b/src/views/modules/common/file-list.vue
@@ -112,7 +112,7 @@ export default {
},
mounted() {
this.$nextTick(() => {
- this.height = (window.innerHeight - 180);
+ this.height = (window.innerHeight*0.82);
})
},
activated() {
diff --git a/src/views/modules/finishedProductWarehouse/expirationTimeModification.vue b/src/views/modules/finishedProductWarehouse/expirationTimeModification.vue
index e7581d7..e946c12 100644
--- a/src/views/modules/finishedProductWarehouse/expirationTimeModification.vue
+++ b/src/views/modules/finishedProductWarehouse/expirationTimeModification.vue
@@ -144,7 +144,7 @@ export default {
functionId: this.$route.meta.menuId,
tableId: "105002002ETM",
languageCode: this.$i18n.locale,
- showDefault: true,
+ showDefault: false,
queryData: {
day: '',
rollno: '',
diff --git a/src/views/modules/rawMaterials/expirationTimeList.vue b/src/views/modules/rawMaterials/expirationTimeList.vue
index f88458a..2f0ba6a 100644
--- a/src/views/modules/rawMaterials/expirationTimeList.vue
+++ b/src/views/modules/rawMaterials/expirationTimeList.vue
@@ -118,7 +118,7 @@ export default {
functionId: this.$route.meta.menuId,
tableId: "105001003ETM",
languageCode: this.$i18n.locale,
- showDefault: true,
+ showDefault: false,
queryData: {
day: '',
rollno: '',
diff --git a/src/views/modules/report/user_customer_report.vue b/src/views/modules/report/user_customer_report.vue
index e93cfa1..01841e6 100644
--- a/src/views/modules/report/user_customer_report.vue
+++ b/src/views/modules/report/user_customer_report.vue
@@ -223,13 +223,19 @@ export default {
});
},
+
/*打开新的查询页面*/
openCustomerReportPage(currentRow){
//定义
let customerReport= this.$refs.customerReport;
- debugger;
- //设置路径
- customerReport.setAttribute('href', window.location.origin+'/#/customer_report_show'+"?reportId="+currentRow.reportId);
+ // this.$router.push({
+ // path: 'report-customer_report_show',
+ // query: {
+ // reportId: currentRow.reportId,
+ // }
+ // })
+ // //设置路径
+ customerReport.setAttribute('href', window.location.origin+'/#/customer-report-show?reportId='+currentRow.reportId);
//跳转页面
customerReport.click();
},
diff --git a/src/views/modules/shopOrder/shopOrder/shopOrder.vue b/src/views/modules/shopOrder/shopOrder/shopOrder.vue
index 361513c..14b4674 100644
--- a/src/views/modules/shopOrder/shopOrder/shopOrder.vue
+++ b/src/views/modules/shopOrder/shopOrder/shopOrder.vue
@@ -34,6 +34,7 @@
{{'编辑'}}
{{'删除'}}
+ {{'打印'}}
@@ -1670,6 +1671,25 @@
})
},
methods: {
+ // 打印
+ printOrder(){
+ const LODOP = this.getLodop()
+ if (LODOP) {
+ LODOP.SET_LICENSES("", "13F0BE83846277CB60918577C6281375", "", "");
+ LODOP.PRINT_INIT("ToolInstanceID");
+ LODOP.SET_PRINT_PAGESIZE(0, 80, 40, "");
+ LODOP.SET_PRINT_STYLE("FontSize", 12);
+ LODOP.NewPage();
+
+ LODOP.PRINT_INIT('') //初始化
+ LODOP.SET_PRINT_PAGESIZE(0, 2400, 1400, "");
+
+ LODOP.PRINT_DESIGN();
+ //LODOP.PREVIEW();
+ // LODOP.PRINT();
+ console.log("操作成功！")
+ }
+ },
getBaseData(val){
if (this.tagNo === 16){
this.updateData.orderType = val.OrderType