diff --git a/src/assets/iconfonts/light/iconfont.css b/src/assets/iconfonts/light/iconfont.css index 6d6578b..d841114 100644 --- a/src/assets/iconfonts/light/iconfont.css +++ b/src/assets/iconfonts/light/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 3966148 */ - src: url('iconfont.woff2?t=1697608535383') format('woff2'), - url('iconfont.woff?t=1697608535383') format('woff'), - url('iconfont.ttf?t=1697608535383') format('truetype'); + src: url('iconfont.woff2?t=1702973796227') format('woff2'), + url('iconfont.woff?t=1702973796227') format('woff'), + url('iconfont.ttf?t=1702973796227') format('truetype'); } .iconfont { @@ -13,6 +13,150 @@ -moz-osx-font-smoothing: grayscale; } +.icon-jiarujieyueche:before { + content: "\e67d"; +} + +.icon-liuchengfaqi:before { + content: "\e67e"; +} + +.icon-cuowu1:before { + content: "\e67f"; +} + +.icon-danganliyong:before { + content: "\e680"; +} + +.icon-fou:before { + content: "\e681"; +} + +.icon-shi:before { + content: "\e682"; +} + +.icon-dengdai:before { + content: "\e683"; +} + +.icon-jieyueche-ding:before { + content: "\e684"; +} + +.icon-shengchengpandiandan:before { + content: "\e67c"; +} + +.icon-jiesuan:before { + content: "\e67b"; +} + +.icon-rengongqueren:before { + content: "\e66f"; +} + +.icon-sulan:before { + content: "\e670"; +} + +.icon-ruku:before { + content: "\e671"; +} + +.icon-yulan:before { + content: "\e672"; +} + +.icon-chuku:before { + content: "\e673"; +} + +.icon-huoqu:before { + content: "\e674"; +} + +.icon-mijijia:before { + content: "\e675"; +} + +.icon-shuaxin:before { + content: "\e676"; +} + +.icon-bangding:before { + content: "\e677"; +} + +.icon-quyu:before { + content: "\e678"; +} + +.icon-shebei:before { + content: "\e679"; +} + +.icon-danganbaoguan-fanbai:before { + content: "\e67a"; +} + +.icon-kufang:before { + content: "\e667"; +} + +.icon-chaihe:before { + content: "\e668"; +} + +.icon-shanchu1:before { + content: "\e669"; +} + +.icon-zishebeiguanli:before { + content: "\e66a"; +} + +.icon-zidonggengxin:before { + content: "\e66b"; +} + +.icon-jiebang:before { + content: "\e66c"; +} + +.icon-you-fanbai:before { + content: "\e66d"; +} + +.icon-zuo-fanbai:before { + content: "\e66e"; +} + +.icon-duqu:before { + content: "\e664"; +} + +.icon-chexiao:before { + content: "\e665"; +} + +.icon-zhuanghe:before { + content: "\e666"; +} + +.icon-danganguanli-fanbai:before { + content: "\e662"; +} + +.icon-yijiao:before { + content: "\e663"; +} + +.icon-gengduo2:before { + content: "\e661"; +} + .icon-gengduo1:before { content: "\e660"; } diff --git a/src/assets/iconfonts/light/iconfont.js b/src/assets/iconfonts/light/iconfont.js index 96d0262..b904a3f 100644 --- a/src/assets/iconfonts/light/iconfont.js +++ b/src/assets/iconfonts/light/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_3966148='',function(c){var a=(a=document.getElementsByTagName("script"))[a.length-1],l=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,i,o,t,s,v=function(a,l){l.parentNode.insertBefore(a,l)};if(l&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_3966148,(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,(a=document.body).firstChild?v(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,t=c.document,s=!1,p(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,z())})}function z(){s||(s=!0,o())}function p(){try{t.documentElement.doScroll("left")}catch(a){return void setTimeout(p,50)}z()}}(window); \ No newline at end of file +window._iconfont_svg_string_3966148='',function(l){var a=(a=document.getElementsByTagName("script"))[a.length-1],c=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,i,o,t,s,z=function(a,c){c.parentNode.insertBefore(a,c)};if(c&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_3966148,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(a=document.body).firstChild?z(c,a.firstChild):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,t=l.document,s=!1,p(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,v())})}function v(){s||(s=!0,o())}function p(){try{t.documentElement.doScroll("left")}catch(a){return void setTimeout(p,50)}v()}}(window); \ No newline at end of file diff --git a/src/assets/iconfonts/light/iconfont.json b/src/assets/iconfonts/light/iconfont.json index cca534c..1734dba 100644 --- a/src/assets/iconfonts/light/iconfont.json +++ b/src/assets/iconfonts/light/iconfont.json @@ -5,6 +5,258 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "38402334", + "name": "加入借阅车", + "font_class": "jiarujieyueche", + "unicode": "e67d", + "unicode_decimal": 59005 + }, + { + "icon_id": "38402333", + "name": "流程发起", + "font_class": "liuchengfaqi", + "unicode": "e67e", + "unicode_decimal": 59006 + }, + { + "icon_id": "38402329", + "name": "错误", + "font_class": "cuowu1", + "unicode": "e67f", + "unicode_decimal": 59007 + }, + { + "icon_id": "38402332", + "name": "档案利用", + "font_class": "danganliyong", + "unicode": "e680", + "unicode_decimal": 59008 + }, + { + "icon_id": "38402331", + "name": "否", + "font_class": "fou", + "unicode": "e681", + "unicode_decimal": 59009 + }, + { + "icon_id": "38402327", + "name": "是", + "font_class": "shi", + "unicode": "e682", + "unicode_decimal": 59010 + }, + { + "icon_id": "38402328", + "name": "等待", + "font_class": "dengdai", + "unicode": "e683", + "unicode_decimal": 59011 + }, + { + "icon_id": "38402330", + "name": "借阅车-顶", + "font_class": "jieyueche-ding", + "unicode": "e684", + "unicode_decimal": 59012 + }, + { + "icon_id": "38402325", + "name": "生成盘点单", + "font_class": "shengchengpandiandan", + "unicode": "e67c", + "unicode_decimal": 59004 + }, + { + "icon_id": "38402326", + "name": "结算", + "font_class": "jiesuan", + "unicode": "e67b", + "unicode_decimal": 59003 + }, + { + "icon_id": "37827794", + "name": "人工确认", + "font_class": "rengongqueren", + "unicode": "e66f", + "unicode_decimal": 58991 + }, + { + "icon_id": "37827796", + "name": "速览", + "font_class": "sulan", + "unicode": "e670", + "unicode_decimal": 58992 + }, + { + "icon_id": "37827791", + "name": "入库", + "font_class": "ruku", + "unicode": "e671", + "unicode_decimal": 58993 + }, + { + "icon_id": "37827792", + "name": "预览", + "font_class": "yulan", + "unicode": "e672", + "unicode_decimal": 58994 + }, + { + "icon_id": "37827785", + "name": "出库", + "font_class": "chuku", + "unicode": "e673", + "unicode_decimal": 58995 + }, + { + "icon_id": "37827789", + "name": "获取", + "font_class": "huoqu", + "unicode": "e674", + "unicode_decimal": 58996 + }, + { + "icon_id": "37827788", + "name": "密集架", + "font_class": "mijijia", + "unicode": "e675", + "unicode_decimal": 58997 + }, + { + "icon_id": "37827787", + "name": "刷新", + "font_class": "shuaxin", + "unicode": "e676", + "unicode_decimal": 58998 + }, + { + "icon_id": "37827786", + "name": "绑定", + "font_class": "bangding", + "unicode": "e677", + "unicode_decimal": 58999 + }, + { + "icon_id": "37827783", + "name": "区域", + "font_class": "quyu", + "unicode": "e678", + "unicode_decimal": 59000 + }, + { + "icon_id": "37827784", + "name": "设备", + "font_class": "shebei", + "unicode": "e679", + "unicode_decimal": 59001 + }, + { + "icon_id": "37827782", + "name": "档案保管-反白", + "font_class": "danganbaoguan-fanbai", + "unicode": "e67a", + "unicode_decimal": 59002 + }, + { + "icon_id": "37827801", + "name": "库房", + "font_class": "kufang", + "unicode": "e667", + "unicode_decimal": 58983 + }, + { + "icon_id": "37827795", + "name": "拆盒", + "font_class": "chaihe", + "unicode": "e668", + "unicode_decimal": 58984 + }, + { + "icon_id": "37827799", + "name": "删除", + "font_class": "shanchu1", + "unicode": "e669", + "unicode_decimal": 58985 + }, + { + "icon_id": "37827800", + "name": "子设备管理", + "font_class": "zishebeiguanli", + "unicode": "e66a", + "unicode_decimal": 58986 + }, + { + "icon_id": "37827797", + "name": "自动更新", + "font_class": "zidonggengxin", + "unicode": "e66b", + "unicode_decimal": 58987 + }, + { + "icon_id": "37827798", + "name": "解绑", + "font_class": "jiebang", + "unicode": "e66c", + "unicode_decimal": 58988 + }, + { + "icon_id": "37827790", + "name": "右-反白", + "font_class": "you-fanbai", + "unicode": "e66d", + "unicode_decimal": 58989 + }, + { + "icon_id": "37827793", + "name": "左-反白", + "font_class": "zuo-fanbai", + "unicode": "e66e", + "unicode_decimal": 58990 + }, + { + "icon_id": "37827672", + "name": "读取", + "font_class": "duqu", + "unicode": "e664", + "unicode_decimal": 58980 + }, + { + "icon_id": "37827670", + "name": "撤销", + "font_class": "chexiao", + "unicode": "e665", + "unicode_decimal": 58981 + }, + { + "icon_id": "37827669", + "name": "装盒", + "font_class": "zhuanghe", + "unicode": "e666", + "unicode_decimal": 58982 + }, + { + "icon_id": "37827673", + "name": "档案管理-反白", + "font_class": "danganguanli-fanbai", + "unicode": "e662", + "unicode_decimal": 58978 + }, + { + "icon_id": "37827671", + "name": "移交", + "font_class": "yijiao", + "unicode": "e663", + "unicode_decimal": 58979 + }, + { + "icon_id": "37728696", + "name": "更多", + "font_class": "gengduo2", + "unicode": "e661", + "unicode_decimal": 58977 + }, { "icon_id": "37728681", "name": "更多", diff --git a/src/assets/iconfonts/light/iconfont.ttf b/src/assets/iconfonts/light/iconfont.ttf index 6a747f6..22b1527 100644 Binary files a/src/assets/iconfonts/light/iconfont.ttf and b/src/assets/iconfonts/light/iconfont.ttf differ diff --git a/src/assets/iconfonts/light/iconfont.woff b/src/assets/iconfonts/light/iconfont.woff index fd0f91c..dee1279 100644 Binary files a/src/assets/iconfonts/light/iconfont.woff and b/src/assets/iconfonts/light/iconfont.woff differ diff --git a/src/assets/iconfonts/light/iconfont.woff2 b/src/assets/iconfonts/light/iconfont.woff2 index 101603f..b3b385e 100644 Binary files a/src/assets/iconfonts/light/iconfont.woff2 and b/src/assets/iconfonts/light/iconfont.woff2 differ diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index 17c99ec..dba8e2f 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -1,7 +1,8 @@ @import 'variables'; @import 'mixin'; -.filter-search{ +.filter-search, +.filter-rfid{ @include btn_blue_style; &:hover{ @include btn_blue_hover; @@ -44,8 +45,10 @@ .packing-head{ display: flex; justify-content: space-between; + align-items: center; .el-input__inner { - padding-left: 90px; + padding-left: 100px; + border-radius: 3px; } } .container-main{ @@ -258,11 +261,11 @@ .packing-handle-btn, .packing-recall-btn{ display: block; - width: 66px; + width: 64px; height: 28px; line-height: 26px; padding: 0; - color: #fff; + color: #41A4FF !important; border-radius: 3px; margin: 0 auto; &::before{ @@ -280,18 +283,14 @@ } } .packing-handle-btn{ - background-color: $arcPurple; - border-color: $arcPurple; + background-color: transparent !important; + border-color: #41A4FF !important; } .packing-recall-btn{ background-color: $arcRed; border-color: $arcRed; } -.selct-data-head{ - color: #fff; - line-height: 30px; -} // 绑定标签 .bindingDialog{ @@ -473,20 +472,31 @@ transform: translate(-50%, -50%); margin-top: 2vh !important; } - .el-dialog__body{ - padding: 0; - } + // .el-dialog__body{ + // padding: 0; + // } .dialog-footer{ margin: 20px auto 0 auto; padding-bottom: 20px; } .packing-head{ - border-bottom: 1px solid $mainColor; + margin-bottom: 20px; .head-search{ margin-bottom: 0; } } } + +.selct-data-head{ + color: #545B65; + line-height: 30px; + span{ + display: inline-block; + padding: 0 2px; + color: #0C0E1E; + } +} + .part-packing-cont{ display: flex; flex-direction: row; @@ -496,20 +506,31 @@ .part-packing-item{ width: calc(100%/2 - 10px); .part-packing-title{ - padding: 0 30px; + position: relative; + padding: 0 12px; height: 40px; line-height: 40px; font-size: 16px; font-weight: normal; - color: #fff; + color: #0C0E1E; + &::before{ + content: ""; + position: absolute; + left: 0; + top: 50%; + width: 3px; + height: 14px; + margin-top: -7px; + background-color: #0348F3; + } } .el-table{ overflow-x: hidden; overflow-y: auto; - border: 2px solid #02255f; + // border: 5px solid #DDE8FB; border-top: none; .el-table__body-wrapper{ - background-color: $boxBg; + // background-color: $boxBg; } } } diff --git a/src/assets/styles/mixin.scss b/src/assets/styles/mixin.scss index e378bf0..d9e93c3 100644 --- a/src/assets/styles/mixin.scss +++ b/src/assets/styles/mixin.scss @@ -910,11 +910,11 @@ @mixin prepend-input{ [data-theme="dark"] & { - border: 1px solid $mainColor; + border-right: 1px solid $mainColor; color: #339cff !important; } [data-theme="light"] & { - border: 1px solid #E3E7EE; + border-right: 1px solid #E3E7EE; color: #545B65 !important; } } diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index 29220ab..e3c1f97 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -1705,6 +1705,7 @@ input[type ='number'] { .input-prepend{ position: relative; z-index: 99; + overflow: hidden; .el-input__inner { padding-left: 80px; background-color: transparent; @@ -1716,8 +1717,8 @@ input[type ='number'] { color: #fff; background-color: transparent; border: none !important; - height: 30px; - line-height: 30px; + height: 32px; + line-height: 32px; .el-input__inner { padding: 0 10px !important; border-radius: 3px 0 0 3px; diff --git a/src/views/archivesManage/managementLibrary/anjuan/content.vue b/src/views/archivesManage/managementLibrary/anjuan/content.vue index aba0d86..148c1a7 100644 --- a/src/views/archivesManage/managementLibrary/anjuan/content.vue +++ b/src/views/archivesManage/managementLibrary/anjuan/content.vue @@ -1,12 +1,5 @@ diff --git a/src/views/archivesManage/managementLibrary/anjuan/data.json b/src/views/archivesManage/managementLibrary/anjuan/data.json deleted file mode 100644 index 0cba9a8..0000000 --- a/src/views/archivesManage/managementLibrary/anjuan/data.json +++ /dev/null @@ -1,196 +0,0 @@ -{ - "code": 200, - "message": "操作成功", - "data": { - "list": { - "content": [ - { - "case_no": "55C4C594AC879230EA4BF2", - "responsibleby": "外事处", - "children_num": 1, - "record_type": "", - "tid": "", - "medium_qty": "15", - "maintitle": "王晓红出国任务事", - "document_no": "外(2009)156号", - "security_class": "绝密", - "archive_year": 2009, - "archive_no": "EP02-Y-WS.W-2009-003-001", - "created_date": "20090506", - "id": "A3EA6038270136221FE7CE", - "is_storage": 2, - "medium_type": "纸张", - "is_borrow": "" - }, - { - "case_no": "89EB11A4CC84ED10323373", - "responsibleby": "二炮党委", - "children_num": 0, - "record_type": "会议纪要", - "tid": "", - "medium_qty": "4", - "maintitle": "党委会议纪要", - "document_no": "党(2009)14号", - "security_class": "秘密", - "archive_year": 2009, - "archive_no": "EP02-Y-WS.W-2009-001-003", - "created_date": "20090825", - "id": "ADD6482FEAB400A1888FF7", - "is_storage": 2, - "medium_type": "纸张", - "is_borrow": "" - }, - { - "case_no": "89EB11A4CC84ED10323373", - "responsibleby": "二炮党委", - "children_num": 0, - "record_type": "命令", - "tid": "", - "medium_qty": "2", - "maintitle": "刘晓庆任职", - "document_no": "党(2009)1号", - "security_class": "机密", - "archive_year": 2009, - "archive_no": "EP02-Y-WS.W-2009-001-001", - "created_date": "20090121", - "id": "32E6B39205296DCBCF92CE", - "is_storage": 2, - "medium_type": "纸张", - "is_borrow": "" - }, - { - "case_no": "2E759415CCD4ABF7B436DB", - "responsibleby": "厨师学院", - "children_num": 0, - "record_type": "报告", - "tid": "", - "medium_qty": "23", - "maintitle": "烘焙教学计划(附定稿)", - "document_no": "教(2009)44号", - "security_class": "机密", - "archive_year": 2009, - "archive_no": "EP02-D-WS.W-2009-002-001", - "created_date": "20090606", - "id": "A7160DA93F5BA8A45BE012", - "is_storage": 2, - "medium_type": "纸张", - "is_borrow": "" - }, - { - "case_no": "80F874F102575D1AB813F1", - "responsibleby": "二炮办公室", - "children_num": 0, - "record_type": "报告", - "tid": "", - "medium_qty": "18", - "maintitle": "活动立项报告", - "document_no": "办(2009)6号", - "security_class": "机密", - "archive_year": 2009, - "archive_no": "EP02-Y-WS.W-2009-002-002", - "created_date": "20090409", - "id": "7DACF26D8746C23B6E93B4", - "is_storage": 2, - "medium_type": "纸张", - "is_borrow": "" - }, - { - "case_no": "4C4EC2D8AA76E915D405C1", - "responsibleby": "舞蹈中心", - "children_num": 0, - "record_type": "请示", - "tid": "", - "medium_qty": "13", - "maintitle": "关于举办街舞比赛的请示", - "document_no": "乙(2009)156号", - "security_class": "秘密", - "archive_year": 2009, - "archive_no": "EP02-D-WS.W-2009-001-002", - "created_date": "20090928", - "id": "F4CA22C9B0F16F3A7E376B", - "is_storage": 2, - "medium_type": "纸张", - "is_borrow": 3 - }, - { - "case_no": "4C4EC2D8AA76E915D405C1", - "responsibleby": "活动中心", - "children_num": 0, - "record_type": "通知", - "tid": "", - "medium_qty": "3", - "maintitle": "关于游泳教学的安排", - "document_no": "甲(2009)88号", - "security_class": "秘密", - "archive_year": 2009, - "archive_no": "EP02-D-WS.W-2009-001-001", - "created_date": "20090423", - "id": "823D1CA835944822DE13DC", - "is_storage": 2, - "medium_type": "纸张", - "is_borrow": 3 - }, - { - "case_no": "89EB11A4CC84ED10323373", - "responsibleby": "二炮党委", - "children_num": 0, - "record_type": "通知", - "tid": "", - "medium_qty": "4", - "maintitle": "党委小组成员的通知", - "document_no": "党(2009)2号", - "security_class": "绝密", - "archive_year": 2009, - "archive_no": "EP02-Y-WS.W-2009-001-002", - "created_date": "20090730", - "id": "EEC3B0051F8323D2E1E995", - "is_storage": 2, - "medium_type": "纸张", - "is_borrow": "" - }, - { - "case_no": "80F874F102575D1AB813F1", - "responsibleby": "二炮办公室", - "children_num": 0, - "record_type": "通知", - "tid": "", - "medium_qty": "6", - "maintitle": "关于举办研讨会的通知", - "document_no": "办(2009)3号", - "security_class": "机密", - "archive_year": 2009, - "archive_no": "EP02-Y-WS.W-2009-002-001", - "created_date": "20090217", - "id": "82D732D81CD0AEDA38B901", - "is_storage": 2, - "medium_type": "纸张", - "is_borrow": "" - }, - { - "case_no": "793B68E6BBE52FE32C819A", - "responsibleby": "安定诊所", - "children_num": 0, - "record_type": "决定", - "tid": "E28011C1200013C2C41E0317", - "medium_qty": "55", - "maintitle": "关于心理健康测试", - "document_no": "心(2023)1号", - "security_class": "机密", - "archive_year": 2023, - "archive_no": "JJ0001-Y-WS.W-2023-002-001", - "created_date": "20230912", - "id": "6A27E658D2A454E5BD7BC9", - "is_storage": 2, - "medium_type": "纸张", - "is_borrow": "" - } - ], - "totalElements": 19 - }, - "yearGroup": [ - 2009, - 2023 - ] - }, - "timestamp": 1699508523265 -} \ No newline at end of file diff --git a/src/views/archivesManage/managementLibrary/anjuan/index.vue b/src/views/archivesManage/managementLibrary/anjuan/index.vue index cf92d14..5682a6b 100644 --- a/src/views/archivesManage/managementLibrary/anjuan/index.vue +++ b/src/views/archivesManage/managementLibrary/anjuan/index.vue @@ -1,6 +1,6 @@ @@ -58,9 +64,6 @@ import { header, form } from '@crud/crud' import CollectHeader from '../module/collectHeader.vue' import ArchivesInfo from '../module/archivesInfo/index' -import tableData from '../anjuan/table.json' -import jsonData from '../anjuan/data.json' - export default { name: 'Project', components: { CollectHeader, ArchivesInfo }, @@ -83,40 +86,62 @@ export default { isRecycle: { type: Boolean, default: false + }, + smartQuery: { + type: Object, + default: function() { + return {} + } } }, + inject: ['parentsData'], data() { return { isTitleType: 2, - categoryId: 'B073E8430B85B4821E7360', - arcId: '2946C34412182B73FBC287', - activeIndex: '1' + categoryId: '', + arcId: '', + activeIndex: '1', + selections: [], + yearData: [], + parentId: null } }, watch: { selectedCategory: function(newValue, oldValue) { }, tableDisplayFields(val) { - this.doLayout() + // this.doLayout() } }, created() { - this.tableDisplayFields = tableData.data - this.projectData = jsonData.data.list.content }, mounted() { }, methods: { - getCommonData(type) { - this.getViewTable(type) + getCommonData(categoryLevel, parentId, type) { + this.getViewTable(categoryLevel, parentId, type) + }, + sendYearDataToParent() { + this.$emit('myYearEvent', this.yearData) }, - openAnjuan(data) { + openAnjuan(data, parentId) { // this.$emit('openAnjuan', '传值') - this.$emit('openAnjuan', data) + this.$emit('openAnjuan', data, parentId) }, rowKey(row) { return row.id }, + // table选中加上选中状态 + tableRowClassName({ row, rowIndex }) { + // console.log('添加类名', row, rowIndex) + let color = '' + this.selections.forEach(item => { + if (item.id === row.id) { + color = 'rowStyle' + } + }) + return color + }, // table - 全选 selectAll(val) { this.selections = val @@ -126,27 +151,35 @@ export default { if (this.timer) { clearTimeout(this.timer) } - console.log('tableDoubleClick', row) this.arcId = row.id - this.$refs.archivesInfo.detailTitle = '项目详情' - this.$refs.archivesInfo.archivesInfoVisible = true - this.$refs.archivesInfo.archivesTabIndex = 0 - // this.$refs.archivesInfo.getDetial(row.id) + this.$nextTick(() => { + this.$refs.archivesInfo.detailTitle = '项目详情' + this.$refs.archivesInfo.archivesInfoVisible = true + this.$refs.archivesInfo.archivesTabIndex = 0 + this.$refs.archivesInfo.getDetial(1, row.id) + }) }, // table - 当前选中得row clickRowHandler(row) { - console.log('clickRowHandler', row) + this.parentsData.smartQuery = { + 'retention': null, + 'security_class': null, + 'doc_type': null, + 'medium_type': null, + 'archive_year': null, + 'fonds_no': null + } if (this.timer) { clearTimeout(this.timer) } this.timer = setTimeout(() => { - this.openAnjuan('所属项目：' + row.archive_no) + this.parentId = row.id + this.openAnjuan('所属项目：' + row.project_no, this.parentId) }, 300) this.selections = this.crud.selections }, // 触发单选 handleCurrentChange(selection, row) { - console.log('触发单选', row) this.selections = selection }, handleSizeChange(size) {