From 7b2ea113d189f9bfc35f6e2ec6adbbfe8f54f7bc Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 1 Jul 2024 11:35:03 +0800 Subject: [PATCH] md --- .env.development | 4 +- .env.production | 2 + .env.staging | 2 + src/api/system/notice.js | 13 +- src/components/DictTag/index.vue | 2 +- src/components/XdTable/index.vue | 78 ++++- src/layout/components/Navbar.vue | 4 - src/layout/components/TopNotice/index.vue | 125 ++++++++ src/main.js | 12 +- src/store/getters.js | 1 + src/store/modules/user.js | 2 + src/utils/custom.js | 10 + .../emis/emisWaybill/sendWaybillList.vue | 279 +++++++++--------- .../emis/emisWaybill/sendWaybillListNew.vue | 170 +++++++---- 14 files changed, 496 insertions(+), 208 deletions(-) diff --git a/.env.development b/.env.development index 7f3f05e0..88c49ae0 100644 --- a/.env.development +++ b/.env.development @@ -9,14 +9,12 @@ VUE_APP_VERSION = '20240516' #VUE_APP_BASE_API = '/dev-api' VUE_APP_PDOMAIN = 'tanex56' VUE_APP_DATA_FROM = 'pc' -# VUE_APP_BASE_API = 'http://api.emis.tanex56.com/api/bizsvr' VUE_APP_BASE_API = 'http://47.102.220.189:58089/api/bizsvr' -# VUE_APP_BASE_API = 'http://47.96.189.20:58089/api/bizsvr' +VUE_APP_WS_HOST = '47.102.220.189:58089/api/bizsvr' VUE_APP_PRINTER_HOST = '192.168.88.100:17080' - # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.production b/.env.production index 8945de09..142acea7 100644 --- a/.env.production +++ b/.env.production @@ -11,4 +11,6 @@ VUE_APP_PDOMAIN = 'tanex56' VUE_APP_DATA_FROM = 'pc' VUE_APP_BASE_API = 'https://api.emis.tanex56.com/api/bizsvr' +VUE_APP_WS_HOST = 'api.emis.tanex56.com/api/bizsvr' + VUE_APP_PRINTER_HOST = '127.0.0.1:17080' diff --git a/.env.staging b/.env.staging index f0c03348..beff556d 100644 --- a/.env.staging +++ b/.env.staging @@ -14,4 +14,6 @@ VUE_APP_PDOMAIN = 'tanex56' VUE_APP_DATA_FROM = 'pc' VUE_APP_BASE_API = 'http://api.emis.tanex56.com/api/bizsvr' +VUE_APP_WS_HOST = 'api.emis.tanex56.com/api/bizsvr' + VUE_APP_PRINTER_HOST = '127.0.0.1:17080' diff --git a/src/api/system/notice.js b/src/api/system/notice.js index c274ea5b..42ba53a1 100644 --- a/src/api/system/notice.js +++ b/src/api/system/notice.js @@ -9,6 +9,17 @@ export function listNotice(query) { }) } + + +// 查询用户公告列表 +export function getTopNoticeListByUserId(query) { + return request({ + url: '/system/notice/getTopNoticeListByUserId', + method: 'get', + params: query + }) +} + // 查询公告详细 export function getNotice(noticeId) { return request({ @@ -41,4 +52,4 @@ export function delNotice(noticeId) { url: '/system/notice/' + noticeId, method: 'delete' }) -} \ No newline at end of file +} diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue index 135c260f..52fd164a 100644 --- a/src/components/DictTag/index.vue +++ b/src/components/DictTag/index.vue @@ -17,7 +17,7 @@ :type="item.raw.listClass == 'primary' ? '' : item.raw.listClass" :class="item.raw.cssClass" > - {{ item.label }}, + {{ item.label }}   diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue index bd3ea02f..95993eff 100644 --- a/src/components/XdTable/index.vue +++ b/src/components/XdTable/index.vue @@ -39,12 +39,14 @@ 恢复当前表格设置 -->
",vnode.context.tableId); + // console.log("xdTableObj===>",xdTableObj); + var tbBody1=xdTableObj.getElementsByClassName("el-table__body-wrapper")[0]; var selDiv = document.createElement("div"); selDiv.style.cssText = "position:absolute;width:0px;height:0px;font-size:0px;margin:0px;padding:0px;border:2px solid #409eff;background-color:#d9ecff;z-index:1000;filter:alpha(opacity:60);opacity:0.6;display:none;"; @@ -501,7 +509,7 @@ export default { }, data() { return { - tableId:"XdTable"+Math.random().toString(36).substring(3,10), + tableId:this.id?this.id:"XdTable"+Math.random().toString(36).substring(3,10), // 弹出层标题 title: "显示/隐藏", // 是否显示弹出层 @@ -588,9 +596,19 @@ export default { this.tableDom=this.getTableDom(); }, methods: { + getUUID() { return Math.random().toString(36).substring(3,10); }, + onTplSelectInputBlur(e) { + if (e.target.value.trim()!== '') { + //e.target.value就是录入的内容 + this.curentTbShowTpl = e.target.value; + this.form.tplName = e.target.value; + // 如果是对象，要使用this.$set方法 + // this.$set('typeObj', 'name', e.target.value) + } + }, setTbShowTpl(){ this.openTbShowTplDlg=true; }, @@ -621,6 +639,7 @@ export default { if(val){ if(this.storeTplList&&this.storeTplList.length>0){ const tplItem = this.storeTplList.find(d => d.tplCode === val) + // console.log("===>tplItem==>",tplItem); this.form=Object.assign({},tplItem); if(this.form.tplData){ this.storageList=JSON.parse(this.form.tplData); @@ -642,19 +661,24 @@ export default { } }, getTbShowlList() { - if(!this.isNeedDbSaveTpl){ return; } - let queryParams = { tagId:this.saveStorageName }; this.storeTplList=[]; - listSysCustomizeTpl(queryParams).then(response => { if(response.rows&&response.rows.length>0){ this.storeTplList=response.rows; + // 获取默认模版 + const selTplItem=this.storeTplList.find(item=>item.blDefault == '1' ); + if(selTplItem){ + // console.log("selTplItem==>",selTplItem); + // this.form.tplCode=selTplItem.tplCode; + this.changeTbShowTpl(selTplItem.tplCode); + } + } }); }, @@ -664,6 +688,13 @@ export default { return; } + // 判断模版是否存在，若存在则覆盖 + const tmpTplItem=this.storeTplList.find(item=>item.tplName == this.form.tplName ); + // console.log("tmpTplItem==>",tmpTplItem); + if(tmpTplItem){ + this.form=tmpTplItem; + } + if (this.form.id != null) { this.curentTbShowTpl=this.form.tplCode; this.form.tagId=this.saveStorageName; @@ -698,6 +729,25 @@ export default { this.$modal.msgSuccess("删除成功"); }).catch(() => {}); }, + // 获取导出参数 + getExportParam(){ + // header:[],filter:[] + var header = []; + var filter = []; + this.storageList.forEach(item => { + if (item.show) { + + header.push(item.label); + filter.push(item.prop) + } + }) + + let params={ + header: header, + filter: filter + } + return params; + }, // 鼠标框选---------- //当批量选中结束调用 handleBatchSelect(){ @@ -717,23 +767,39 @@ export default { let currentRow=-1; this.multipleSelection.forEach(item=>{ if(currentRow!=-1 && currentRow!=item.row){ + // 去除末尾的\t + selStr=this.trimTabChar(selStr,'\t',''); selStr=selStr+"\n"; } let str=item.text; if(!str || str==''){ - str=' '; + str=''; } selStr = selStr+str+"\t"; currentRow=item.row; }); + selStr=this.trimTabChar(selStr,'\t',''); + // console.log("=selStr==>",selStr); + this.currentSelectStr=selStr; } // this.$emit('handleSelect',this.multipleSelection) }, + trimTabChar(str,char, type) { + if (char) { + if (type == 'left') { + return str.replace(new RegExp('^\\'+char+'+', 'g'), ''); + } else if (type == 'right') { + return str.replace(new RegExp('\\'+char+'+$', 'g'), ''); + } + return str.replace(new RegExp('^\\'+char+'+|\\'+char+'+$', 'g'), ''); + } + return str.replace(/^\s+|\s+$/g, ''); + }, // --------------- //清除默认事件 clearEventBubble(evt) { diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 8031bdd4..fd5c5d97 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -24,10 +24,6 @@
- - - -
diff --git a/src/layout/components/TopNotice/index.vue b/src/layout/components/TopNotice/index.vue index b7ffe596..41dfada4 100644 --- a/src/layout/components/TopNotice/index.vue +++ b/src/layout/components/TopNotice/index.vue @@ -39,6 +39,9 @@