liuyanpeng 3 лет назад
Родитель
Сommit
58e3ab3ab1
3 измененных файлов с 10 добавлено и 6 удалено
  1. 4 5
      package.json
  2. 5 1
      src/routes/route-base-v4.js
  3. 1 0
      webpack.base.js

+ 4 - 5
package.json

@@ -1,7 +1,7 @@
 {
   "name": "prodog-pc-client",
   "description": "Leanwo Prodog Client",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",
@@ -14,12 +14,11 @@
   "dependencies": {
     "@leanwo/lowcode-utils": "^1.6.0-beta.7",
     "@leanwo/lowcode-vue-renderer": "^1.6.0-beta.7",
-    "amis": "^1.9.0",
     "animate.css": "^4.1.0",
     "ant-design-vue": "^3.2.15",
     "axios": "^0.19.2",
     "click-outside-vue3": "^4.0.1",
-    "client-base-v4": "3.0.25",
+    "client-base-v4": "3.0.29",
     "client-dic-v3": "^3.0.6",
     "client-dictionary-v3": "^3.0.3",
     "client-eam-v3": "^3.0.15",
@@ -32,14 +31,14 @@
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "pc-component-v3": "1.0.49",
+    "qrcode": "^1.5.3",
     "select2": "^4.0.13",
     "select2-bootstrap-theme": "^0.1.0-beta.10",
     "uuid": "^8.3.2",
     "v-tooltip": "^4.0.0-beta.17",
     "vue-request": "^1.2.4",
     "vue-select": "^4.0.0-beta.3",
-    "vuedraggable": "^4.1.0",
-    "qrcode": "^1.5.3"
+    "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
     "@babel/core": "^7.17.5",

+ 5 - 1
src/routes/route-base-v4.js

@@ -51,6 +51,8 @@ import {
     ExcelReport,
     DateExcelReport,
     DelegationReport,
+    PrintTemp,
+    PrintCard
 } from 'client-base-v4/dist/client-base-v4.js';
 
 
@@ -221,7 +223,7 @@ const router = [
             },
             // 条码编辑
             {
-                path: 'barCode-edit', component: BarCodeEdit,
+                path: 'barCode-edit', component: PrintTemp,
                 meta: {
                     'loginRequired': true,
                     'functionAccessArray': [
@@ -232,6 +234,8 @@ const router = [
                     ],
                 },
             },
+            // 标签打印
+            { path: '/desktop/PrintCard', component: PrintCard },
             // 归档
             { path: 'archive', component: Archive },
 

+ 1 - 0
webpack.base.js

@@ -90,6 +90,7 @@ module.exports = {
     'vue-router': 'VueRouter',
     'vuex': 'Vuex',
     '@antv/x6': 'X6',
+    'X6': 'X6',
     'axios': 'axios',
     'sortablejs': 'Sortable',
     'gantt': 'gantt'