diff --git a/.env.development b/.env.development index 37992fd..a7217da 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,10 @@ # 页面标题 VITE_APP_TITLE = 华东计量综合系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州 +VITE_APP_API_BASEURL = http://222.187.140.114:8896 + #房可鑫测试 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 diff --git a/.env.development b/.env.development index 37992fd..a7217da 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,10 @@ # 页面标题 VITE_APP_TITLE = 华东计量综合系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州 +VITE_APP_API_BASEURL = http://222.187.140.114:8896 + #房可鑫测试 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 diff --git a/.env.production b/.env.production index 47df65d..69cf472 100644 --- a/.env.production +++ b/.env.production @@ -4,14 +4,15 @@ VITE_APP_TITLE = 计量业务系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 #// 测试环境 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://139.198.29.133:8080 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 -# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 生产环境 +# VITE_APP_API_BASEURL = http://192.168.2.96:8085 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # ------------------ 内网 -------------------------- # VITE_APP_API_BASEURL = http://192.168.2.96:8088 # ------------------ 外网 -------------------------- -# VITE_APP_API_BASEURL = http://222.187.140.114:8896 +VITE_APP_API_BASEURL = http://222.187.140.114:8896 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.development b/.env.development index 37992fd..a7217da 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,10 @@ # 页面标题 VITE_APP_TITLE = 华东计量综合系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州 +VITE_APP_API_BASEURL = http://222.187.140.114:8896 + #房可鑫测试 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 diff --git a/.env.production b/.env.production index 47df65d..69cf472 100644 --- a/.env.production +++ b/.env.production @@ -4,14 +4,15 @@ VITE_APP_TITLE = 计量业务系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 #// 测试环境 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://139.198.29.133:8080 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 -# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 生产环境 +# VITE_APP_API_BASEURL = http://192.168.2.96:8085 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # ------------------ 内网 -------------------------- # VITE_APP_API_BASEURL = http://192.168.2.96:8088 # ------------------ 外网 -------------------------- -# VITE_APP_API_BASEURL = http://222.187.140.114:8896 +VITE_APP_API_BASEURL = http://222.187.140.114:8896 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/package.json b/package.json index c80b841..6886df1 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", + "jsbarcode": "^3.11.6", "jsencrypt": "^3.3.1", "lodash-es": "^4.17.21", "mitt": "^3.0.0", diff --git a/.env.development b/.env.development index 37992fd..a7217da 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,10 @@ # 页面标题 VITE_APP_TITLE = 华东计量综合系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州 +VITE_APP_API_BASEURL = http://222.187.140.114:8896 + #房可鑫测试 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 diff --git a/.env.production b/.env.production index 47df65d..69cf472 100644 --- a/.env.production +++ b/.env.production @@ -4,14 +4,15 @@ VITE_APP_TITLE = 计量业务系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 #// 测试环境 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://139.198.29.133:8080 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 -# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 生产环境 +# VITE_APP_API_BASEURL = http://192.168.2.96:8085 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # ------------------ 内网 -------------------------- # VITE_APP_API_BASEURL = http://192.168.2.96:8088 # ------------------ 外网 -------------------------- -# VITE_APP_API_BASEURL = http://222.187.140.114:8896 +VITE_APP_API_BASEURL = http://222.187.140.114:8896 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/package.json b/package.json index c80b841..6886df1 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", + "jsbarcode": "^3.11.6", "jsencrypt": "^3.3.1", "lodash-es": "^4.17.21", "mitt": "^3.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 85fc58c..61edfb4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -31,6 +31,7 @@ hotkeys-js: ^3.10.0 html2canvas: ^1.4.1 http-server: ^14.1.1 + jsbarcode: ^3.11.6 jsencrypt: ^3.3.1 lint-staged: ^13.0.3 lodash-es: ^4.17.21 @@ -91,6 +92,7 @@ file-saver: 2.0.5 hotkeys-js: 3.10.0 html2canvas: registry.npmmirror.com/html2canvas/1.4.1 + jsbarcode: 3.11.6 jsencrypt: registry.npmmirror.com/jsencrypt/3.3.1 lodash-es: 4.17.21 mitt: 3.0.0 @@ -4977,6 +4979,10 @@ argparse: 2.0.1 dev: true + /jsbarcode/3.11.6: + resolution: {integrity: sha512-G5TKGyKY1zJo0ZQKFM1IIMfy0nF2rs92BLlCz+cU4/TazIc4ZH+X1GYeDRt7TKjrYqmPfTjwTBkU/QnQlsYiuA==} + dev: false + /jsbn/0.1.1: resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==} dev: true diff --git a/.env.development b/.env.development index 37992fd..a7217da 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,10 @@ # 页面标题 VITE_APP_TITLE = 华东计量综合系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州 +VITE_APP_API_BASEURL = http://222.187.140.114:8896 + #房可鑫测试 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 diff --git a/.env.production b/.env.production index 47df65d..69cf472 100644 --- a/.env.production +++ b/.env.production @@ -4,14 +4,15 @@ VITE_APP_TITLE = 计量业务系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 #// 测试环境 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://139.198.29.133:8080 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 -# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 生产环境 +# VITE_APP_API_BASEURL = http://192.168.2.96:8085 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # ------------------ 内网 -------------------------- # VITE_APP_API_BASEURL = http://192.168.2.96:8088 # ------------------ 外网 -------------------------- -# VITE_APP_API_BASEURL = http://222.187.140.114:8896 +VITE_APP_API_BASEURL = http://222.187.140.114:8896 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/package.json b/package.json index c80b841..6886df1 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", + "jsbarcode": "^3.11.6", "jsencrypt": "^3.3.1", "lodash-es": "^4.17.21", "mitt": "^3.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 85fc58c..61edfb4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -31,6 +31,7 @@ hotkeys-js: ^3.10.0 html2canvas: ^1.4.1 http-server: ^14.1.1 + jsbarcode: ^3.11.6 jsencrypt: ^3.3.1 lint-staged: ^13.0.3 lodash-es: ^4.17.21 @@ -91,6 +92,7 @@ file-saver: 2.0.5 hotkeys-js: 3.10.0 html2canvas: registry.npmmirror.com/html2canvas/1.4.1 + jsbarcode: 3.11.6 jsencrypt: registry.npmmirror.com/jsencrypt/3.3.1 lodash-es: 4.17.21 mitt: 3.0.0 @@ -4977,6 +4979,10 @@ argparse: 2.0.1 dev: true + /jsbarcode/3.11.6: + resolution: {integrity: sha512-G5TKGyKY1zJo0ZQKFM1IIMfy0nF2rs92BLlCz+cU4/TazIc4ZH+X1GYeDRt7TKjrYqmPfTjwTBkU/QnQlsYiuA==} + dev: false + /jsbn/0.1.1: resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==} dev: true diff --git a/src/assets/icons/icon-deviceBlue.svg b/src/assets/icons/icon-deviceBlue.svg new file mode 100644 index 0000000..ec30675 --- /dev/null +++ b/src/assets/icons/icon-deviceBlue.svg @@ -0,0 +1 @@ + diff --git a/.env.development b/.env.development index 37992fd..a7217da 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,10 @@ # 页面标题 VITE_APP_TITLE = 华东计量综合系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州 +VITE_APP_API_BASEURL = http://222.187.140.114:8896 + #房可鑫测试 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 diff --git a/.env.production b/.env.production index 47df65d..69cf472 100644 --- a/.env.production +++ b/.env.production @@ -4,14 +4,15 @@ VITE_APP_TITLE = 计量业务系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 #// 测试环境 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://139.198.29.133:8080 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 -# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 生产环境 +# VITE_APP_API_BASEURL = http://192.168.2.96:8085 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # ------------------ 内网 -------------------------- # VITE_APP_API_BASEURL = http://192.168.2.96:8088 # ------------------ 外网 -------------------------- -# VITE_APP_API_BASEURL = http://222.187.140.114:8896 +VITE_APP_API_BASEURL = http://222.187.140.114:8896 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/package.json b/package.json index c80b841..6886df1 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", + "jsbarcode": "^3.11.6", "jsencrypt": "^3.3.1", "lodash-es": "^4.17.21", "mitt": "^3.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 85fc58c..61edfb4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -31,6 +31,7 @@ hotkeys-js: ^3.10.0 html2canvas: ^1.4.1 http-server: ^14.1.1 + jsbarcode: ^3.11.6 jsencrypt: ^3.3.1 lint-staged: ^13.0.3 lodash-es: ^4.17.21 @@ -91,6 +92,7 @@ file-saver: 2.0.5 hotkeys-js: 3.10.0 html2canvas: registry.npmmirror.com/html2canvas/1.4.1 + jsbarcode: 3.11.6 jsencrypt: registry.npmmirror.com/jsencrypt/3.3.1 lodash-es: 4.17.21 mitt: 3.0.0 @@ -4977,6 +4979,10 @@ argparse: 2.0.1 dev: true + /jsbarcode/3.11.6: + resolution: {integrity: sha512-G5TKGyKY1zJo0ZQKFM1IIMfy0nF2rs92BLlCz+cU4/TazIc4ZH+X1GYeDRt7TKjrYqmPfTjwTBkU/QnQlsYiuA==} + dev: false + /jsbn/0.1.1: resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==} dev: true diff --git a/src/assets/icons/icon-deviceBlue.svg b/src/assets/icons/icon-deviceBlue.svg new file mode 100644 index 0000000..ec30675 --- /dev/null +++ b/src/assets/icons/icon-deviceBlue.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-label-print.svg b/src/assets/icons/icon-label-print.svg new file mode 100644 index 0000000..5dc18b4 --- /dev/null +++ b/src/assets/icons/icon-label-print.svg @@ -0,0 +1 @@ + diff --git a/.env.development b/.env.development index 37992fd..a7217da 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,10 @@ # 页面标题 VITE_APP_TITLE = 华东计量综合系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州 +VITE_APP_API_BASEURL = http://222.187.140.114:8896 + #房可鑫测试 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 diff --git a/.env.production b/.env.production index 47df65d..69cf472 100644 --- a/.env.production +++ b/.env.production @@ -4,14 +4,15 @@ VITE_APP_TITLE = 计量业务系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 #// 测试环境 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://139.198.29.133:8080 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 -# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 生产环境 +# VITE_APP_API_BASEURL = http://192.168.2.96:8085 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # ------------------ 内网 -------------------------- # VITE_APP_API_BASEURL = http://192.168.2.96:8088 # ------------------ 外网 -------------------------- -# VITE_APP_API_BASEURL = http://222.187.140.114:8896 +VITE_APP_API_BASEURL = http://222.187.140.114:8896 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/package.json b/package.json index c80b841..6886df1 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", + "jsbarcode": "^3.11.6", "jsencrypt": "^3.3.1", "lodash-es": "^4.17.21", "mitt": "^3.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 85fc58c..61edfb4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -31,6 +31,7 @@ hotkeys-js: ^3.10.0 html2canvas: ^1.4.1 http-server: ^14.1.1 + jsbarcode: ^3.11.6 jsencrypt: ^3.3.1 lint-staged: ^13.0.3 lodash-es: ^4.17.21 @@ -91,6 +92,7 @@ file-saver: 2.0.5 hotkeys-js: 3.10.0 html2canvas: registry.npmmirror.com/html2canvas/1.4.1 + jsbarcode: 3.11.6 jsencrypt: registry.npmmirror.com/jsencrypt/3.3.1 lodash-es: 4.17.21 mitt: 3.0.0 @@ -4977,6 +4979,10 @@ argparse: 2.0.1 dev: true + /jsbarcode/3.11.6: + resolution: {integrity: sha512-G5TKGyKY1zJo0ZQKFM1IIMfy0nF2rs92BLlCz+cU4/TazIc4ZH+X1GYeDRt7TKjrYqmPfTjwTBkU/QnQlsYiuA==} + dev: false + /jsbn/0.1.1: resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==} dev: true diff --git a/src/assets/icons/icon-deviceBlue.svg b/src/assets/icons/icon-deviceBlue.svg new file mode 100644 index 0000000..ec30675 --- /dev/null +++ b/src/assets/icons/icon-deviceBlue.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-label-print.svg b/src/assets/icons/icon-label-print.svg new file mode 100644 index 0000000..5dc18b4 --- /dev/null +++ b/src/assets/icons/icon-label-print.svg @@ -0,0 +1 @@ + diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue new file mode 100644 index 0000000..aade131 --- /dev/null +++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue @@ -0,0 +1,111 @@ + + + + diff --git a/.env.development b/.env.development index 37992fd..a7217da 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,10 @@ # 页面标题 VITE_APP_TITLE = 华东计量综合系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州 +VITE_APP_API_BASEURL = http://222.187.140.114:8896 + #房可鑫测试 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 diff --git a/.env.production b/.env.production index 47df65d..69cf472 100644 --- a/.env.production +++ b/.env.production @@ -4,14 +4,15 @@ VITE_APP_TITLE = 计量业务系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 #// 测试环境 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://139.198.29.133:8080 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 -# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 生产环境 +# VITE_APP_API_BASEURL = http://192.168.2.96:8085 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # ------------------ 内网 -------------------------- # VITE_APP_API_BASEURL = http://192.168.2.96:8088 # ------------------ 外网 -------------------------- -# VITE_APP_API_BASEURL = http://222.187.140.114:8896 +VITE_APP_API_BASEURL = http://222.187.140.114:8896 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/package.json b/package.json index c80b841..6886df1 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "file-saver": "^2.0.5", "hotkeys-js": "^3.10.0", "html2canvas": "^1.4.1", + "jsbarcode": "^3.11.6", "jsencrypt": "^3.3.1", "lodash-es": "^4.17.21", "mitt": "^3.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 85fc58c..61edfb4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -31,6 +31,7 @@ hotkeys-js: ^3.10.0 html2canvas: ^1.4.1 http-server: ^14.1.1 + jsbarcode: ^3.11.6 jsencrypt: ^3.3.1 lint-staged: ^13.0.3 lodash-es: ^4.17.21 @@ -91,6 +92,7 @@ file-saver: 2.0.5 hotkeys-js: 3.10.0 html2canvas: registry.npmmirror.com/html2canvas/1.4.1 + jsbarcode: 3.11.6 jsencrypt: registry.npmmirror.com/jsencrypt/3.3.1 lodash-es: 4.17.21 mitt: 3.0.0 @@ -4977,6 +4979,10 @@ argparse: 2.0.1 dev: true + /jsbarcode/3.11.6: + resolution: {integrity: sha512-G5TKGyKY1zJo0ZQKFM1IIMfy0nF2rs92BLlCz+cU4/TazIc4ZH+X1GYeDRt7TKjrYqmPfTjwTBkU/QnQlsYiuA==} + dev: false + /jsbn/0.1.1: resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==} dev: true diff --git a/src/assets/icons/icon-deviceBlue.svg b/src/assets/icons/icon-deviceBlue.svg new file mode 100644 index 0000000..ec30675 --- /dev/null +++ b/src/assets/icons/icon-deviceBlue.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-label-print.svg b/src/assets/icons/icon-label-print.svg new file mode 100644 index 0000000..5dc18b4 --- /dev/null +++ b/src/assets/icons/icon-label-print.svg @@ -0,0 +1 @@ + diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue new file mode 100644 index 0000000..aade131 --- /dev/null +++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue @@ -0,0 +1,111 @@ + + + + diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue index 32ceb5a..8ff7808 100644 --- a/src/views/business/schedule/interchange/interchangeList.vue +++ b/src/views/business/schedule/interchange/interchangeList.vue @@ -6,6 +6,7 @@ import { ElLoading, ElMessage, ElMessageBox } from 'element-plus' import teminateDialog from '../components/terminateDialog.vue' import type { IListQuery, IinterchangeList, dictType } from './interchange_interface' +import LabelPrint from './dialog/labelPrint.vue' import type { TableColumn } from '@/components/NormalTable/table_interface' import scanSampleDialog from '@/components/ScanSampleDialog/index.vue' import { @@ -33,6 +34,7 @@ const selectRow = ref() // 标签绑定选择的行数据 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还 const dialogTitle = ref('标签绑定') // 扫描对话框标题 +const labelPrintRef = ref() // 标签打印弹窗 // 查询条件 const listQuery: Ref = ref({ sampleNo: '', // 样品编号 @@ -84,8 +86,8 @@ const total = ref(0) // 表格加载状态 const loadingTable = ref(false) -// 选中的内容 -const checkoutList = ref([]) +const checkoutIdList = ref([]) // 选中的内容id集合 +const checkoutList = ref([]) // 选中的内容 const isUrgentMap = ref([]) // 是否加急 const sampleAttrMap = ref([]) // 样品属性 const sampleStatusMap = ref([]) // 样品状态 @@ -193,7 +195,8 @@ // 多选发生改变时 function handleSelectionChange(e: any) { - checkoutList.value = e.map((item: { id: string }) => item.id) + checkoutIdList.value = e.map((item: { id: string }) => item.id) + checkoutList.value = e } // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写 @@ -239,7 +242,7 @@ isUrgent: listQuery.value.isUrgent, // 是否加急 sampleBelong: listQuery.value.sampleBelong, // 样品属性 sampleStatus: active.value, // 样品状态 - ids: checkoutList.value, + ids: checkoutIdList.value, } exportInterchangeList(params).then((res) => { const blob = new Blob([res.data]) @@ -442,11 +445,11 @@ displayName: item.text, } }) - if (checkoutList.value.length <= 0 && list.value.length > 0) { + if (checkoutIdList.value.length <= 0 && list.value.length > 0) { printJSON(list.value, properties, '设备收发列表') } - else if (checkoutList.value.length > 0) { - const printList = list.value.filter((item: IinterchangeList) => checkoutList.value.includes(item.id)) + else if (checkoutIdList.value.length > 0) { + const printList = list.value.filter((item: IinterchangeList) => checkoutIdList.value.includes(item.id)) printJSON(printList, properties, '设备收发列表') } else { @@ -464,6 +467,15 @@ $router.push('/schedule/receipt/add') } +// 点击标签打印 +const handleClickLabelPrint = () => { + if (!checkoutList.value.length) { + ElMessage.warning('请先选择设备') + return false + } + labelPrintRef.value.initDialog(checkoutList.value) +} + onMounted(async () => { await getDict() // 字典 if (window.sessionStorage.getItem('interchangeActive')) { @@ -550,8 +562,9 @@