diff --git a/README.md b/README.md index ccf2578..d97ac9f 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ │ │ ├── archivesConfig # 档案配置 │ │ ├── archivesManage # 档案管理 │ │ ├── category # 门类管理 +│ │ ├── environmentalScreen # 环境监测大屏 │ │ ├── components # views内页面组件 │ │ │ ├── field # 字段管理组件 │ │ │ ├── category # 门类管理 diff --git a/src/api/archivesManage/lendManage.js b/src/api/archivesManage/lendManage.js new file mode 100644 index 0000000..63b37c8 --- /dev/null +++ b/src/api/archivesManage/lendManage.js @@ -0,0 +1,68 @@ +import request from '@/utils/request' +// import qs from 'qs' + +// 判断档案是否可以借阅 +export function FetchIsExistBorrow(parameter) { + return request({ + url: 'api/borrow/isExistBorrow', + method: 'post', + data: parameter + }) +} + +// 添加档案到待借阅列表 +export function FetchAddArchivesWaitRegister(parameter) { + return request({ + url: 'api/borrow/addArchivesWaitRegister', + method: 'post', + data: parameter + }) +} + +// 待登记列表 +export function FetchInitWaitRegisterList(parameter) { + return request({ + url: 'api/borrow/initWaitRegisterList', + method: 'get', + params: parameter + }) +} + +// 登记借出 +export function FetchRegisterBorrow(parameter) { + return request({ + url: 'api/borrow/registerBorrow', + method: 'post', + data: parameter + }) +} + +// 移出待登记档案 +export function FetchDelWaitBorrow(parameter) { + return request({ + url: 'api/borrow/delWaitBorrow', + method: 'post', + data: parameter + }) +} + +// 根据单据查看详情 +export function FetchInitBillDetails(parameter) { + return request({ + url: 'api/borrow/initBillDetailsByOrderNo', + method: 'get', + params: parameter + }) +} + +// 借出确认列表 +export function FetchInitWaitBorrowList(parameter) { + return request({ + url: 'api/borrow/initWaitBorrowList', + method: 'get', + params: parameter + }) +} + +export default { } + diff --git a/src/assets/iconfonts/iconfont.css b/src/assets/iconfonts/iconfont.css index 5a0b2ca..4f2d2bf 100644 --- a/src/assets/iconfonts/iconfont.css +++ b/src/assets/iconfonts/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 3409379 */ - src: url('iconfont.woff2?t=1658129042026') format('woff2'), - url('iconfont.woff?t=1658129042026') format('woff'), - url('iconfont.ttf?t=1658129042026') format('truetype'); + src: url('iconfont.woff2?t=1658455952870') format('woff2'), + url('iconfont.woff?t=1658455952870') format('woff'), + url('iconfont.ttf?t=1658455952870') format('truetype'); } .iconfont { @@ -13,6 +13,18 @@ -moz-osx-font-smoothing: grayscale; } +.icon-fabu-fanbai:before { + content: "\e644"; +} + +.icon-biaojiyidu-fanbai:before { + content: "\e645"; +} + +.icon-shoudongchuli-fanbai:before { + content: "\e646"; +} + .icon-zhenglishi:before { content: "\e63c"; } diff --git a/src/assets/iconfonts/iconfont.js b/src/assets/iconfonts/iconfont.js index 053bc0d..512278c 100644 --- a/src/assets/iconfonts/iconfont.js +++ b/src/assets/iconfonts/iconfont.js @@ -1 +1 @@ -!function(c){var l,h,a,i,z,m='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),F=function(c,l){l.parentNode.insertBefore(c,l)};if(t&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function o(){z||(z=!0,a())}function v(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(v,50)}o()}l=function(){var c,l=document.createElement("div");l.innerHTML=m,m=null,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(c=document.body).firstChild?F(l,c.firstChild):c.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(h=function(){document.removeEventListener("DOMContentLoaded",h,!1),l()},document.addEventListener("DOMContentLoaded",h,!1)):document.attachEvent&&(a=l,i=c.document,z=!1,v(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,o())})}(window); \ No newline at end of file +!function(c){var l,h,a,i,z,m='',F=(F=document.getElementsByTagName("script"))[F.length-1].getAttribute("data-injectcss"),t=function(c,l){l.parentNode.insertBefore(c,l)};if(F&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function o(){z||(z=!0,a())}function v(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(v,50)}o()}l=function(){var c,l=document.createElement("div");l.innerHTML=m,m=null,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(c=document.body).firstChild?t(l,c.firstChild):c.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(h=function(){document.removeEventListener("DOMContentLoaded",h,!1),l()},document.addEventListener("DOMContentLoaded",h,!1)):document.attachEvent&&(a=l,i=c.document,z=!1,v(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,o())})}(window); \ No newline at end of file diff --git a/src/assets/iconfonts/iconfont.json b/src/assets/iconfonts/iconfont.json index dc34c33..d928c98 100644 --- a/src/assets/iconfonts/iconfont.json +++ b/src/assets/iconfonts/iconfont.json @@ -5,6 +5,27 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "30765497", + "name": "发布-反白", + "font_class": "fabu-fanbai", + "unicode": "e644", + "unicode_decimal": 58948 + }, + { + "icon_id": "30765498", + "name": "标记已读-反白", + "font_class": "biaojiyidu-fanbai", + "unicode": "e645", + "unicode_decimal": 58949 + }, + { + "icon_id": "30765499", + "name": "手动处理-反白", + "font_class": "shoudongchuli-fanbai", + "unicode": "e646", + "unicode_decimal": 58950 + }, { "icon_id": "30660167", "name": "整理室", diff --git a/src/assets/iconfonts/iconfont.ttf b/src/assets/iconfonts/iconfont.ttf index 0432d41..04cc679 100644 Binary files a/src/assets/iconfonts/iconfont.ttf and b/src/assets/iconfonts/iconfont.ttf differ diff --git a/src/assets/iconfonts/iconfont.woff b/src/assets/iconfonts/iconfont.woff index 026836b..da71de8 100644 Binary files a/src/assets/iconfonts/iconfont.woff and b/src/assets/iconfonts/iconfont.woff differ diff --git a/src/assets/iconfonts/iconfont.woff2 b/src/assets/iconfonts/iconfont.woff2 index 30e48b3..c34bac7 100644 Binary files a/src/assets/iconfonts/iconfont.woff2 and b/src/assets/iconfonts/iconfont.woff2 differ diff --git a/src/assets/styles/lend-manage.scss b/src/assets/styles/lend-manage.scss index 3dc268c..8da91e2 100644 --- a/src/assets/styles/lend-manage.scss +++ b/src/assets/styles/lend-manage.scss @@ -62,7 +62,6 @@ border: 1px solid #1AAE93; } - .clear { border-radius: 13px; width: 80px; diff --git a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue index e1e1a0c..1d79384 100644 --- a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue +++ b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue @@ -45,7 +45,7 @@ 分卷装盒 - 借阅 + 借阅 绑定标签 @@ -168,7 +168,7 @@

确定将当前档案加入借阅列表？

- 确定 + 确定
@@ -179,6 +179,7 @@ import { header, form } from '@crud/crud' import { mapGetters } from 'vuex' import { archivesCrud } from '../mixins/archives' +import { FetchIsExistBorrow, FetchAddArchivesWaitRegister } from '@/api/archivesManage/lendManage' import PreviewForm from '@/views/components/category/PreviewForm' import ArchivesInfo from '../module/archivesInfo/index' import Packing from '../module/packing/index' @@ -364,6 +365,31 @@ export default { this.$refs.packing.archivesTable = JSON.parse(JSON.stringify(this.recycleMain.$refs.file.junneiData)) } this.getTotalSumAll() + }, + // 借阅 + handleLending() { + const params = this.selections.map(item => { + return item.id + }) + FetchIsExistBorrow(params).then(data => { + if (data.length === 0) { + this.lengingVisible = true + } else { + this.$message.error('部分档案不可借阅') + } + }) + }, + // 确认借阅 + handleLendingConfirm() { + const params = this.selections.map(item => { + return item.id + }) + FetchAddArchivesWaitRegister(params).then(data => { + if (data.length !== 0) { + this.$message.success('借阅成功') + this.lengingVisible = false + } + }) } } } diff --git a/src/views/archivesManage/lendManage/lendConfirm/module/lendArchivesList.vue b/src/views/archivesManage/lendManage/components/lendArchivesList.vue similarity index 74% rename from src/views/archivesManage/lendManage/lendConfirm/module/lendArchivesList.vue rename to src/views/archivesManage/lendManage/components/lendArchivesList.vue index 8a8232c..453e70b 100644 --- a/src/views/archivesManage/lendManage/lendConfirm/module/lendArchivesList.vue +++ b/src/views/archivesManage/lendManage/components/lendArchivesList.vue @@ -1,5 +1,7 @@