diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php index d9edd9ef3..ae21a526e 100644 --- a/crmeb/app/services/system/SystemCrudServices.php +++ b/crmeb/app/services/system/SystemCrudServices.php @@ -560,6 +560,7 @@ class SystemCrudServices extends BaseServices 'menu_path' => '/' . $routeName, 'auth_type' => 1, 'is_show' => 1, + 'is_show_path' => 1, 'is_del' => 0, 'unique_auth' => $uniqueAuth, 'is_header' => $data['pid'] ? 0 : 1, diff --git a/crmeb/public/install/crmeb.sql b/crmeb/public/install/crmeb.sql index 9f74955cc..3af5862f5 100755 --- a/crmeb/public/install/crmeb.sql +++ b/crmeb/public/install/crmeb.sql @@ -47274,7 +47274,6 @@ INSERT INTO `eb_system_menus` (`id`, `pid`, `icon`, `menu_name`, `module`, `cont (1069, 1067, '', '语言详情', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/setting/lang/info', '12/1067', 1, '', 0, 'admin-lang-info', 0), (1070, 1067, '', '地区列表', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/setting/lang/country', '25/1067', 1, '', 0, 'admin-lang-country', 0), (1071, 1695, '', '文件管理', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/system/maintain/system_file/opendir', '25/1695', 1, '', 0, 'system-maintain-system-file', 0), -(1072, 1064, '', '接口文档', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/setting/system_out_interface/index', '56/1064', 1, '', 0, 'setting-system-out-interface-index', 0), (1073, 25, '', '数据维护', 'admin', '', '', '', '', '[]', 7, 1, 1, 1, 'system/database/index', '25', 1, '', 0, 'system-database-index', 0), (1075, 731, '', '会员配置', 'admin', '', '', '', '', '[]', 6, 1, 1, 1, '/marketing/member/system_config/3/67', '27/731', 1, '', 0, 'marketing-member-system_config', 0), (1076, 56, '', '定时任务', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/system/crontab', '25/56', 1, '', 0, 'system-crontab-index', 0), diff --git a/template/admin/package-lock.json b/template/admin/package-lock.json index 1af86ccc8..5f651f4a2 100644 --- a/template/admin/package-lock.json +++ b/template/admin/package-lock.json @@ -19377,6 +19377,11 @@ } } }, + "print-js": { + "version": "1.6.0", + "resolved": "https://registry.npmmirror.com/print-js/-/print-js-1.6.0.tgz", + "integrity": "sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg==" + }, "printj": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz", diff --git a/template/admin/package.json b/template/admin/package.json index 6bf1853e9..db7647fa3 100644 --- a/template/admin/package.json +++ b/template/admin/package.json @@ -43,6 +43,7 @@ "monaco-editor": "^0.28.1", "monaco-editor-webpack-plugin": "^4.2.0", "oss": "0.0.1", + "print-js": "^1.6.0", "qiniu-js": "^2.5.5", "qrcodejs2": "0.0.2", "qs": "^6.6.0", diff --git a/template/admin/src/pages/order/orderList/components/tableList.vue b/template/admin/src/pages/order/orderList/components/tableList.vue index b8068ad56..0bdd191e4 100644 --- a/template/admin/src/pages/order/orderList/components/tableList.vue +++ b/template/admin/src/pages/order/orderList/components/tableList.vue @@ -147,6 +147,7 @@ 已收货 删除订单 + 快递面单打印 @@ -190,6 +191,7 @@