diff --git a/package.json b/package.json index 17237e0..e6dc434 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "html2canvas": "^1.4.1", "js-beautify": "^1.10.2", "js-cookie": "2.2.0", + "jsbarcode": "^3.11.6", "jsencrypt": "^3.0.0-rc.1", "jszip": "^3.7.1", "mavon-editor": "^2.9.1", @@ -61,6 +62,7 @@ "vue-echarts": "^5.0.0-beta.0", "vue-highlightjs": "^1.3.3", "vue-image-crop-upload": "^2.5.0", + "vue-print-nb-element": "^1.8.0", "vue-router": "3.0.2", "vue-splitpane": "1.0.4", "vuedraggable": "2.20.0", diff --git a/src/api/archivesManage/archivesList.js b/src/api/archivesManage/archivesList.js index 9115879..23211a7 100644 --- a/src/api/archivesManage/archivesList.js +++ b/src/api/archivesManage/archivesList.js @@ -160,5 +160,14 @@ export function FetchTransferMainLibrary(parameter) { }) } -export default { add, edit, del, FetchInitArchivesView, FetchTableDisplayFields, FetchFormDisplayFields, FetchDoeditIsRepeat, queryVagueArchives, querySeniorArchives } +// 打印条形码 +export function FetchPrintArchivesBarcode(parameter) { + return request({ + url: 'api/archives/printArchivesBarcode', + method: 'post', + data: parameter + }) +} + +export default { add, edit, del, FetchInitArchivesView, FetchTableDisplayFields, FetchFormDisplayFields, FetchDoeditIsRepeat, queryVagueArchives, querySeniorArchives, FetchPrintArchivesBarcode } diff --git a/src/api/archivesManage/caseManage.js b/src/api/archivesManage/caseManage.js index d655e6f..33c6f20 100644 --- a/src/api/archivesManage/caseManage.js +++ b/src/api/archivesManage/caseManage.js @@ -1,82 +1,91 @@ -import request from '@/utils/request' -import qs from 'qs' - -export function add(form) { - return edit(form) -} - -export function edit(parameter) { - return request({ - url: 'api/case/edit', - method: 'post', - data: parameter - }) -} -// 删除档案盒 -export function del(data) { - return request({ - url: 'api/case/del', - method: 'post', - data: data - }) -} - -// 判断盒名称是否重复 -export function caseNameIsRepeat(parameter) { - return request({ - url: 'api/case/caseNameIsRepeat', - method: 'get', - params: parameter - }) -} -// 判断条形码值是否重复 -export function barcodeIsRepeat(parameter) { - return request({ - url: 'api/case/barcodeIsRepeat', - method: 'get', - params: parameter - }) -} - -// 档案盒列表 -export function FetchInitCaseList(parameter) { - return request({ - url: 'api/case/initCaseList', - method: 'get', - params: parameter - }) -} - -// 档案盒装盒列表 -export function FetchInitCartoningList(parameter) { - return request({ - url: 'api/case/initCartoningList', - method: 'get', - params: parameter - }) -} - -// 装盒 -export function FetchCartoning(data) { - return request({ - url: 'api/case/cartoning', - method: 'post', - data: data - }) -} -// 拆盒 -export function unpacking(data) { - return request({ - url: 'api/case/unpacking', - method: 'post', - data: data - }) -} -// 盒详情 -export function findInCase(params) { - return request({ - url: 'api/case/findInCase' + '?' + qs.stringify(params, { indices: false }), - method: 'get' - }) -} -export default { add, edit, del, unpacking, findInCase } +import request from '@/utils/request' +import qs from 'qs' + +export function add(form) { + return edit(form) +} + +export function edit(parameter) { + return request({ + url: 'api/case/edit', + method: 'post', + data: parameter + }) +} +// 删除档案盒 +export function del(data) { + return request({ + url: 'api/case/del', + method: 'post', + data: data + }) +} + +// 判断盒名称是否重复 +export function caseNameIsRepeat(parameter) { + return request({ + url: 'api/case/caseNameIsRepeat', + method: 'get', + params: parameter + }) +} +// 判断条形码值是否重复 +export function barcodeIsRepeat(parameter) { + return request({ + url: 'api/case/barcodeIsRepeat', + method: 'get', + params: parameter + }) +} + +// 档案盒列表 +export function FetchInitCaseList(parameter) { + return request({ + url: 'api/case/initCaseList', + method: 'get', + params: parameter + }) +} + +// 档案盒装盒列表 +export function FetchInitCartoningList(parameter) { + return request({ + url: 'api/case/initCartoningList', + method: 'get', + params: parameter + }) +} + +// 装盒 +export function FetchCartoning(data) { + return request({ + url: 'api/case/cartoning', + method: 'post', + data: data + }) +} +// 拆盒 +export function unpacking(data) { + return request({ + url: 'api/case/unpacking', + method: 'post', + data: data + }) +} +// 盒详情 +export function findInCase(params) { + return request({ + url: 'api/case/findInCase' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +// 批量打印盒数据 +export function printCaseBarcode(data) { + return request({ + url: 'api/case/printCaseBarcode', + method: 'post', + data: data + }) +} +export default { add, edit, del, unpacking, findInCase, printCaseBarcode } diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index 699e030..08bb3bc 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -9,6 +9,7 @@ $arcCyan: #0FBED9; .head-archives{ padding: 0 0 20px 0; .archives-crud{ + position: relative; float: left; } .archives-recycle{ diff --git a/src/main.js b/src/main.js index 30f914a..22d0fe4 100644 --- a/src/main.js +++ b/src/main.js @@ -28,6 +28,8 @@ import App from './App' import store from './store' import router from './router/routers' +import Print from 'vue-print-nb-element' + import './assets/icons' // icon import './router/index' // permission control import 'echarts-gl' @@ -37,6 +39,7 @@ import { parseTime } from '@/utils/index.js' Vue.filter('parseTime', function(time, cFormat) { return parseTime(time, cFormat) }) +Vue.use(Print) Vue.use(checkPer) Vue.use(VueHighlightJS) Vue.use(mavonEditor) diff --git a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue index 6ed397c..c4c7eff 100644 --- a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue +++ b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue @@ -2,6 +2,9 @@
+
+ 批量打印条形码 +
新增 @@ -48,6 +51,15 @@ 绑定标签
+ +
+
+
+ +
+
+
+