cloud-web-corejs 1.0.54-dev.549 → 1.0.54-dev.550
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cloud-web-corejs",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "1.0.54-dev.
|
|
4
|
+
"version": "1.0.54-dev.550",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"dev": "vue-cli-service serve",
|
|
7
7
|
"lint": "eslint --ext .js,.vue src",
|
|
@@ -81,7 +81,6 @@
|
|
|
81
81
|
"html-webpack-plugin": "~5.0.0",
|
|
82
82
|
"husky": "1.3.1",
|
|
83
83
|
"jquery": "3.6.0",
|
|
84
|
-
"jquery-mousewheel": "^3.2.2",
|
|
85
84
|
"jsbarcode": "3.11.5",
|
|
86
85
|
"lint-staged": "8.1.5",
|
|
87
86
|
"nzh": "1.0.8",
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
<el-dropdown-menu slot="dropdown">
|
|
8
8
|
<template v-for="(item, index) in exportTemplates">
|
|
9
9
|
<el-dropdown-item
|
|
10
|
-
v-if="
|
|
10
|
+
v-if="exportTypes.includes(item.etType)"
|
|
11
11
|
icon="el-icon-upload2"
|
|
12
12
|
:command="item"
|
|
13
13
|
:key="index"
|
|
@@ -24,6 +24,7 @@ modules = {
|
|
|
24
24
|
timer: null,
|
|
25
25
|
exportTemplates: [],
|
|
26
26
|
printTypes: [2, 3, 6, 7, 8, 9],
|
|
27
|
+
exportTypes: [0, 1, 5],
|
|
27
28
|
};
|
|
28
29
|
},
|
|
29
30
|
computed: {
|
|
@@ -225,6 +226,7 @@ modules = {
|
|
|
225
226
|
return;
|
|
226
227
|
}
|
|
227
228
|
}
|
|
229
|
+
let etType = exportTemplate.etType;
|
|
228
230
|
if (exportTemplate.etType == 2) {
|
|
229
231
|
//菜鸟打印
|
|
230
232
|
let condition = this.tableDefalutHandle(exportTemplate);
|
|
@@ -233,7 +235,7 @@ modules = {
|
|
|
233
235
|
condition: condition,
|
|
234
236
|
};
|
|
235
237
|
this.cnPrinter(param, exportTemplate);
|
|
236
|
-
} else if (
|
|
238
|
+
} else if (this.exportTypes.includes(etType)) {
|
|
237
239
|
//导出excel
|
|
238
240
|
let conditions = this.tableDefalutHandle(exportTemplate) || [];
|
|
239
241
|
this.$baseConfirm(this.$t2("您确定要导出吗？", "components.baseInputExport.exportTip")).then(() => {
|