diff --git a/src/assets/styles/newStyle.less b/src/assets/styles/newStyle.less index ef8706955..34d3fea50 100644 --- a/src/assets/styles/newStyle.less +++ b/src/assets/styles/newStyle.less @@ -906,3 +906,6 @@ tr.el-table__row{ margin: 10px; width: calc(~'100% - 20px'); } +.button-list { + padding: 5px 0px; +} diff --git a/src/common/axios/index.js b/src/common/axios/index.js index 9034bc7c2..c53e52bc9 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -282,6 +282,47 @@ export default { exeFun.call(this, err) }) }, + downloadFile (url, param, fileName) { + _axios({ + method: 'post', + url, + data: param, + responseType: 'blob' + }).then( + res => { + const data = res.data + const r = new FileReader() + r.onload = function () { + try { + const resData = JSON.parse(this.result) + } catch (err) { + // 下载正常处理 + // 兼容ie11 + if (window.navigator.msSaveOrOpenBlob) { + try { + const blobObject = new Blob([data]) + window.navigator.msSaveOrOpenBlob(blobObject, fileName) + } catch (e) { + console.log(e) + } + return + } + // a标签实现下载 + let url = window.URL.createObjectURL(new Blob([data])) + let link = document.createElement('a') + link.style.display = 'none' + link.href = url + link.setAttribute('download', fileName) + document.body.appendChild(link) + link.click() + resolve(fileName) + } + } + r.readAsText(data) // FileReader的API + }).catch(res => { + console.log(res) + }) + }, /** * @description: delete方法 * @author: chenxiaoxi diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index 5b17d5bd9..b6d7808e3 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -107,6 +107,7 @@ ref="tree2" node-key="id" class="filter-tree" + style="height: 100%; overflow: auto;" v-if="modalPost" :props="props" :data="postList" diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue index 36915c846..0f19d2965 100644 --- a/src/pages/config/pages/postManage/index.vue +++ b/src/pages/config/pages/postManage/index.vue @@ -102,6 +102,7 @@ ref="tree" node-key="id" class="filter-tree" + style="height: 100%; overflow: auto;" v-if="modalRole" :props="props" :data="roleList" diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index 19718aa73..fb7287909 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -206,6 +206,7 @@ class="filter-tree1" :data="treeData" :props="defaultProps" + style="height: 100%; overflow: auto;" default-expand-all check-strictly node-key="id" diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 0b4e6b7a6..c15f9b668 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -90,6 +90,7 @@ export default { let userInfoStr = Base64.decode(res.data) let userInfo2 = decodeURIComponent(userInfoStr) let userInfoObj = JSON.parse(userInfo2) + userInfoObj.userId = userInfoObj.usid this.setToken(userInfoObj.usid) // vuex存储token this.getByUserInfoCode(userInfoObj.usid).then((userInfo) => { if (userInfo !== '' && userInfo !== null) { @@ -114,7 +115,8 @@ export default { // 获取用户菜单 this.getMenu().then((menuList) => { let hasHomeMenu = menuList.some((menuItem) => { - return menuItem.id === 'G72J4WNFM8' + // return menuItem.id === 'G72J4WNFM8' + return menuItem.id === 'asdfadf' }) if (hasHomeMenu) { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 2059a9309..89b5009a2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -55,13 +55,6 @@ - - - - - - - - - @@ -84,13 +77,13 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index aaf834d54..94e7d8975 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -563,7 +563,7 @@ size="800px"> - +
+ + + + + +
+
基础信息
+
+
+
+ + + + +
+ + + + + + + + + + + + + + +
+
+ + + +
+ 新增 + 删除 +
+ + + + + + + + + + + + + + + +
+ + +
+ + +
+
+
+
+ + +
- diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 848d27d8d..78655e47e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -1,13 +1,293 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index e7e508d86..a2bb22b44 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -1,13 +1,346 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue new file mode 100644 index 000000000..0fe14f99c --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -0,0 +1,364 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue new file mode 100644 index 000000000..c6c16671a --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -0,0 +1,367 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue new file mode 100644 index 000000000..5a0415f34 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -0,0 +1,367 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue new file mode 100644 index 000000000..02a8a2e72 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -0,0 +1,367 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 6007a1d32..d2787d24f 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -230,7 +230,7 @@ size="800px"> + + + + + + @@ -70,19 +86,17 @@ label="产品线"> + -