diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index a3b45c74..c846ea59 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -14,8 +14,8 @@
取消(ESC)
- 三联打印新版预览
- 三联打印预览
+ 三联打印-新版
+ 三联打印
普通打印
普通打印
@@ -1952,25 +1952,25 @@
return ''
}
},
- //三联打印新版预览
+ //三联打印新版
handlePrintPro() {
getPlatformConfigByKey({"platformKey": "bill_print_pro_url"}).then((res)=> {
if (res && res.code === 200) {
- let billPrintUrl = res.data.platformValue + '?no=' + this.model.number
+ let billPrintUrl = res.data.platformValue + '&no=' + this.model.number
let billPrintHeight = document.documentElement.clientHeight - 260
this.$refs.modalProDetail.show(this.model, billPrintUrl, billPrintHeight)
- this.$refs.modalProDetail.title = this.billType + "-三联打印新版预览"
+ this.$refs.modalProDetail.title = this.billType + "-三联打印-新版"
}
})
},
- //三联打印预览
+ //三联打印
handlePrint() {
getPlatformConfigByKey({"platformKey": "bill_print_url"}).then((res)=> {
if (res && res.code === 200) {
- let billPrintUrl = res.data.platformValue + '?no=' + this.model.number
+ let billPrintUrl = res.data.platformValue + '&no=' + this.model.number
let billPrintHeight = this.dataSource.length*50 + 600
this.$refs.modalDetail.show(this.model, billPrintUrl, billPrintHeight)
- this.$refs.modalDetail.title = this.billType + "-三联打印预览"
+ this.$refs.modalDetail.title = this.billType + "-三联打印"
}
})
},
diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index cd56cc66..b9278d15 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -1072,30 +1072,30 @@ export const BillModalMixin = {
this.$message.warning('请先保存单据后再提交流程!');
}
},
- //三联打印新版预览
+ //三联打印新版
handlePrintPro(billType) {
if(this.model.id) {
getPlatformConfigByKey({"platformKey": "bill_print_pro_url"}).then((res)=> {
if (res && res.code === 200) {
- let billPrintUrl = res.data.platformValue + '?no=' + this.model.number
+ let billPrintUrl = res.data.platformValue + '&no=' + this.model.number
let billPrintHeight = document.documentElement.clientHeight - 260
this.$refs.modalPrintPro.show(this.model, billPrintUrl, billPrintHeight)
- this.$refs.modalPrintPro.title = billType + "-三联打印新版预览"
+ this.$refs.modalPrintPro.title = billType + "-三联打印-新版"
}
})
} else {
this.$message.warning('请先保存单据后再打印!');
}
},
- //三联打印预览
+ //三联打印
handlePrint(billType) {
if(this.model.id) {
getPlatformConfigByKey({"platformKey": "bill_print_url"}).then((res)=> {
if (res && res.code === 200) {
- let billPrintUrl = res.data.platformValue + '?no=' + this.model.number
+ let billPrintUrl = res.data.platformValue + '&no=' + this.model.number
let billPrintHeight = this.materialTable.dataSource.length*50 + 600
this.$refs.modalPrint.show(this.model, billPrintUrl, billPrintHeight)
- this.$refs.modalPrint.title = billType + "-三联打印预览"
+ this.$refs.modalPrint.title = billType + "-三联打印"
}
})
} else {
diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
index 46b49783..5d8d8f62 100644
--- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
@@ -14,8 +14,8 @@
style="top:20px;height: 95%;">
取消
- 三联打印新版预览
- 三联打印预览
+ 三联打印-新版
+ 三联打印
保存并审核
保存(Ctrl+S)
diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue
index 487ca4c6..5b19c5fb 100644
--- a/jshERP-web/src/views/bill/modules/AssembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue
@@ -14,8 +14,8 @@
style="top:20px;height: 95%;">
取消
- 三联打印新版预览
- 三联打印预览
+ 三联打印-新版
+ 三联打印
保存并审核
保存(Ctrl+S)
diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
index 971bcc5c..fd19baac 100644
--- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
@@ -14,8 +14,8 @@
style="top:20px;height: 95%;">
取消
- 三联打印新版预览
- 三联打印预览
+ 三联打印-新版
+ 三联打印
保存并审核
保存(Ctrl+S)
diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue
index c99ba11b..83bcc906 100644
--- a/jshERP-web/src/views/bill/modules/OtherInModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue
@@ -14,8 +14,8 @@
style="top:20px;height: 95%;">
取消
- 三联打印新版预览
- 三联打印预览
+ 三联打印-新版
+ 三联打印
保存并审核
保存(Ctrl+S)
diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
index 5dd6ea1b..b99f1d44 100644
--- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
@@ -14,8 +14,8 @@
style="top:20px;height: 95%;">
取消
- 三联打印新版预览
- 三联打印预览
+ 三联打印-新版
+ 三联打印
保存并审核
保存(Ctrl+S)
diff --git a/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue b/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue
index 9e478c80..970b2b2f 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue
@@ -15,8 +15,8 @@
style="top:20px;height: 95%;">
取消
- 三联打印新版预览
- 三联打印预览
+ 三联打印-新版
+ 三联打印
保存并审核
保存(Ctrl+S)
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index aebe9b3a..fb6e8dfe 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -14,8 +14,8 @@
style="top:20px;height: 95%;">
取消
- 三联打印新版预览
- 三联打印预览
+ 三联打印-新版
+ 三联打印
保存并审核
保存(Ctrl+S)
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 37b31621..e71e3dda 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -15,8 +15,8 @@
style="top:20px;height: 95%;">
取消
- 三联打印新版预览
- 三联打印预览
+ 三联打印-新版
+ 三联打印
保存并审核
保存(Ctrl+S)
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index bb5aa250..605c20ae 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -15,8 +15,8 @@
style="top:20px;height: 95%;">
取消
- 三联打印新版预览
- 三联打印预览
+ 三联打印-新版
+ 三联打印
保存并审核
保存(Ctrl+S)
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
index ec1a9fa7..ee8cb88a 100644
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -14,8 +14,8 @@
style="top:20px;height: 95%;">
取消
- 三联打印新版预览
- 三联打印预览
+ 三联打印-新版
+ 三联打印
保存并审核
保存(Ctrl+S)
diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
index 9f41cbfd..7426d912 100644
--- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
@@ -15,8 +15,8 @@
style="top:20px;height: 95%;">
取消
- 三联打印新版预览
- 三联打印预览
+ 三联打印-新版
+ 三联打印
保存并审核
保存(Ctrl+S)
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index 7d34a036..2122e35b 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -14,8 +14,8 @@
style="top:20px;height: 95%;">
取消
- 三联打印新版预览
- 三联打印预览
+ 三联打印-新版
+ 三联打印
保存并审核
保存(Ctrl+S)
diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
index 95256d3d..6dd689e1 100644
--- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
@@ -15,8 +15,8 @@
style="top:20px;height: 95%;">
取消
- 三联打印新版预览
- 三联打印预览
+ 三联打印-新版
+ 三联打印
保存并审核
保存(Ctrl+S)
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index 66118165..2b02692e 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -15,8 +15,8 @@
style="top:20px;height: 95%;">
取消
- 三联打印新版预览
- 三联打印预览
+ 三联打印-新版
+ 三联打印
保存并审核
保存(Ctrl+S)