diff --git a/.gitignore b/.gitignore index 8261e9b7..89c50de4 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ back/dist-西海岸-后台管理-v0.8.2.4.d.zip *.zip front/public/static/config/basicConfig.js front/public/static/config/basicConfig.js +front/public/static/config/basicConfig.js diff --git a/back/src/assets/img/biaoti.png b/back/src/assets/img/biaoti.png new file mode 100644 index 00000000..cae79049 Binary files /dev/null and b/back/src/assets/img/biaoti.png differ diff --git a/back/src/assets/img/gongnengjieshao.png b/back/src/assets/img/gongnengjieshao.png new file mode 100644 index 00000000..e70d7f66 Binary files /dev/null and b/back/src/assets/img/gongnengjieshao.png differ diff --git a/back/src/components/ren-process-detail/src/ren-process-detail.vue b/back/src/components/ren-process-detail/src/ren-process-detail.vue index e7a04977..6215354e 100644 --- a/back/src/components/ren-process-detail/src/ren-process-detail.vue +++ b/back/src/components/ren-process-detail/src/ren-process-detail.vue @@ -11,7 +11,7 @@ -

{{ $t('process.circulation') }}

+
{{ $t('process.circulation') }}
+ diff --git a/back/src/mixins/view-module-css.scss b/back/src/mixins/view-module-css.scss new file mode 100644 index 00000000..71e4e256 --- /dev/null +++ b/back/src/mixins/view-module-css.scss @@ -0,0 +1,55 @@ +.agreeButton{ + display: inline-block; + line-height: 8px; + width:80px; + height: 32px; + white-space: nowrap; + cursor: pointer; + color: #ffffff; + -webkit-appearance: none; + text-align: center; + -webkit-box-sizing: border-box; + box-sizing: border-box; + outline: 0; + margin-left: 10px; + -webkit-transition: .1s; + transition: .1s; + font-weight: 500; + //padding: 12px 20px; + font-size: 14px; + border-radius: 4px; + background-color: #0058e1; +} +.agreeButton:hover{ + background: #65a5f9; + border-color: #65a5f9; + color: #FFF; +} +.rejectButton{ + display: inline-block; + line-height: 8px; + width:80px; + height: 32px; + white-space: nowrap; + cursor: pointer; + color: #F56C6C; + -webkit-appearance: none; + text-align: center; + -webkit-box-sizing: border-box; + box-sizing: border-box; + outline: 0; + margin: 0; + -webkit-transition: .1s; + transition: .1s; + font-weight: 500; + //padding: 12px 20px; + font-size: 14px; + border-radius: 4px; + border-color: #F56C6C; + margin-left: 12px; +} +.rejectButton:hover{ + background-color: #F56C6C; + border-color: #F56C6C; + color: #ffffff; +} \ No newline at end of file diff --git a/back/src/mixins/view-module.js b/back/src/mixins/view-module.js index a6a4c534..c2385585 100644 --- a/back/src/mixins/view-module.js +++ b/back/src/mixins/view-module.js @@ -71,26 +71,29 @@ export default { return this.$message.error(res.msg) } this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data - this.dataList.map((item, index) => { - if (this.dataList[index].type != null) { - switch (item.type) { - case 1: this.dataList[index].type = '省'; break - case 2: this.dataList[index].type = '市'; break - case 3: this.dataList[index].type = '区'; break - case 4: this.dataList[index].type = '企业'; break - } - } - if (item.children != null) { - item.children.map((item2, index2) => { - switch (item2.type) { - case 1: this.dataList[index].children[index2].type = '省'; break - case 2: this.dataList[index].children[index2].type = '市'; break - case 3: this.dataList[index].children[index2].type = '区'; break - case 4: this.dataList[index].children[index2].type = '企业'; break + if (!['/sys/notice/page', '/sys/notice/mynotice/page'].includes(this.mixinViewModuleOptions.getDataListURL)) { // 我得通知、通知管理不需要特殊处理 + this.dataList.map((item, index) => { + if (this.dataList[index].type != null) { + switch (item.type) { + case 1: this.dataList[index].type = '省'; break + case 2: this.dataList[index].type = '市'; break + case 3: this.dataList[index].type = '区'; break + case 4: this.dataList[index].type = '企业'; break } - }) - } - }) + } + if (item.children != null) { + item.children.map((item2, index2) => { + switch (item2.type) { + case 1: this.dataList[index].children[index2].type = '省'; break + case 2: this.dataList[index].children[index2].type = '市'; break + case 3: this.dataList[index].children[index2].type = '区'; break + case 4: this.dataList[index].children[index2].type = '企业'; break + } + }) + } + }) + } + // 我的代办特殊处理 if (this.mixinViewModuleOptions.getDataListURL === '/act/task/myToDoTaskPage') { this.$http.get('/sys/user/info').then(userRes => { @@ -162,6 +165,68 @@ export default { dataListSelectionChangeHandle (val) { this.dataListSelections = val }, + // 批量审批 + showApproval () { + if (this.dataListSelections.length === 0) { + this.$message({ + type: 'warning', + message: '请先选择需要审批的信息！' + }) + return + } + this.dialogVisible = true + }, + handleClose () { + this.input = '' + this.dialogVisible = false + }, + approval (str) { + console.log('批量审批', this.dataListSelections, this.$store) + if (this.input.length < 1) { + this.$message({ + type: 'warning', + message: '请输入审批意见！' + }) + return + } + const arr = [] + this.dataListSelections.map(val => { + arr.push(val.taskId) + }) + if (str === '同意') { + this.$http.post('/act/task/batchComplete', { comment: this.input, taskIds: arr }).then(res => { + if (res.data.msg !== 'success') { + this.$message({ + type: 'warning', + message: '审批失败！' + }) + return + } + this.handleClose() + this.query() + this.$message({ + type: 'success', + message: '审批成功！' + }) + }) + } else if (str === '驳回') { + this.$http.post('/act/task/batchBackToFirst', { comment: this.input, taskIds: arr }).then(res => { + if (res.data.msg !== 'success') { + this.$message({ + type: 'warning', + message: '审批失败！' + }) + return + } + this.handleClose() + this.query() + this.$message({ + type: 'success', + message: '审批成功！' + }) + }) + } + }, // 排序 dataListSortChangeHandle (data) { if (!data.order || !data.prop) { diff --git a/back/src/views/main.vue b/back/src/views/main.vue index 60bcff29..4a4c390d 100644 --- a/back/src/views/main.vue +++ b/back/src/views/main.vue @@ -115,6 +115,14 @@ export default { this.$store.state.user.id = res.data.id this.$store.state.user.name = res.data.realName this.$store.state.user.superAdmin = res.data.superAdmin + this.$store.state.user.roleIdList = [] + if (res.data.roleIdList) { + res.data.roleIdList.map(val => { + this.$http.get('/sys/role/' + val).then(res1 => { + this.$store.state.user.roleIdList.push(res1.data.data.name) + }) + }) + } }) .catch(() => {}) }, diff --git a/back/src/views/modules/abilityStatistics/components/abilityDetails.vue b/back/src/views/modules/abilityStatistics/components/abilityDetails.vue index 64eccc20..79db6530 100644 --- a/back/src/views/modules/abilityStatistics/components/abilityDetails.vue +++ b/back/src/views/modules/abilityStatistics/components/abilityDetails.vue @@ -281,6 +281,14 @@ export default { } diff --git a/back/src/views/modules/activiti/RoomExamineAdmin.vue b/back/src/views/modules/activiti/RoomExamineAdmin.vue index 94c5f967..214018a1 100644 --- a/back/src/views/modules/activiti/RoomExamineAdmin.vue +++ b/back/src/views/modules/activiti/RoomExamineAdmin.vue @@ -6,7 +6,7 @@ style="width: 160px" placeholder="请输入会客厅名称" > - - + --> 查询
@@ -50,13 +50,13 @@ header-align="center" align="center" > - + > --> import Cookies from 'js-cookie' export default { - data() { + data () { return { options: [ { value: '1', - label: '待审核', + label: '待审核' }, { value: '0', - label: '审核完成', - }, + label: '审核完成' + } ], - value: '', + value: '1', limit: 10, page: 1, total: 0, @@ -245,14 +245,14 @@ export default { file: '', name: '', creator: '', - roomNameA: '', + roomNameA: '' } }, - mounted() { + mounted () { this.getSerach() }, methods: { - getSerach() { + getSerach () { this.$http .get( `/bookMeeting/auditPage?page=${this.page}&limit=${this.limit}&roomName=${this.roomNameA}&state=${this.value}` @@ -262,22 +262,22 @@ export default { this.total = res.data.total }) }, - downloadTemplate(file) { + downloadTemplate (file) { // window.SITE_CONFIG.apiURL + window.open(`${file}?token=` + Cookies.get('ucsToken')) }, - handleSizeChange(val) { + handleSizeChange (val) { this.limit = val this.getSerach() }, - handleCurrentChange(val) { + handleCurrentChange (val) { this.page = val this.getSerach() }, - searchData() { + searchData () { this.getSerach() }, - taskDetails(item, num) { + taskDetails (item, num) { if (num == '1') { this.dialogVisibleChuli = true this.id = item.id @@ -293,14 +293,14 @@ export default { this.lookData = item }, - ok() { - let query = { + ok () { + const query = { auditViem: this.desc, state: this.radio, id: this.id, name: this.name, roomName: this.roomName, - creator: this.creator, + creator: this.creator } this.$http.put('/bookMeeting', query).then(({ data: res }) => { this.dialogVisibleChuli = false @@ -309,15 +309,15 @@ export default { this.getSerach() }) }, - No() { + No () { this.radio = '2' this.desc = '' this.dialogVisibleChuli = false }, - formatter(row, column) { + formatter (row, column) { return row.state == '1' ? '待审核' : '审核完成' - }, - }, + } + } } diff --git a/back/src/views/modules/activiti/demo/abilitydemandapply.vue b/back/src/views/modules/activiti/demo/abilitydemandapply.vue index e5037ae2..b725343e 100644 --- a/back/src/views/modules/activiti/demo/abilitydemandapply.vue +++ b/back/src/views/modules/activiti/demo/abilitydemandapply.vue @@ -245,10 +245,8 @@ export default { // 同意与退回 agreeOrNot: debounce( function (data, type) { - this.dataForm.taskId = this.$route.params.taskId if (type === '同意') { - debugger // if (this.input !== '') { console.log('this.dataForm', this.dataForm) const params = qs.stringify({ @@ -267,6 +265,7 @@ export default { return } bus.$emit('applicationforRequirementsInit') + bus.$emit('workInit') this.$message({ message: this.$t('prompt.success'), type: 'success', @@ -302,6 +301,7 @@ export default { return } bus.$emit('applicationforRequirementsInit') + bus.$emit('workInit') this.$message({ message: this.$t('prompt.success'), type: 'success', @@ -338,15 +338,26 @@ export default { } // 当前选中tab被删除 if (tabName === this.$store.state.contentTabsActiveName) { - const tab = + // 判断是否有列表页 + const tab1 = this.$store.state.contentTabs.filter(val => val.name === tabName.substring(0, tabName.indexOf('__')))[0] + // 如果没列表页打开最后一个tab + const tab2 = this.$store.state.contentTabs[ this.$store.state.contentTabs.length - 1 ] - this.$router.push({ - name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name, - params: { ...tab.params }, - query: { ...tab.query } - }) + if (tab1) { + this.$router.push({ + name: /^iframe_.+/.test(tab1.name) ? 'iframe' : tab1.name, + params: { ...tab1.params }, + query: { ...tab1.query } + }) + } else { + this.$router.push({ + name: /^iframe_.+/.test(tab2.name) ? 'iframe' : tab2.name, + params: { ...tab2.params }, + query: { ...tab2.query } + }) + } } }, // 启动流程出错回调 diff --git a/back/src/views/modules/activiti/demo/comments.vue b/back/src/views/modules/activiti/demo/comments.vue index 6c539f0e..ad6922c2 100644 --- a/back/src/views/modules/activiti/demo/comments.vue +++ b/back/src/views/modules/activiti/demo/comments.vue @@ -174,7 +174,8 @@ export default { } return } - bus.$emit('AbilityResourcesRemovedInit') + bus.$emit('commentInit') + bus.$emit('workInit') this.$message({ message: this.$t('prompt.success'), type: 'success', @@ -209,7 +210,8 @@ export default { } return } - bus.$emit('AbilityResourcesRemovedInit') + bus.$emit('commentInit') + bus.$emit('workInit') this.$message({ message: this.$t('prompt.success'), type: 'success', @@ -246,33 +248,31 @@ export default { } // 当前选中tab被删除 if (tabName === this.$store.state.contentTabsActiveName) { - const tab = + // 判断是否有列表页 + const tab1 = this.$store.state.contentTabs.filter(val => val.name === tabName.substring(0, tabName.indexOf('__')))[0] + // 如果没列表页打开最后一个tab + const tab2 = this.$store.state.contentTabs[ this.$store.state.contentTabs.length - 1 ] - this.$router.push({ - name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name, - params: { ...tab.params }, - query: { ...tab.query } - }) + if (tab1) { + this.$router.push({ + name: /^iframe_.+/.test(tab1.name) ? 'iframe' : tab1.name, + params: { ...tab1.params }, + query: { ...tab1.query } + }) + } else { + this.$router.push({ + name: /^iframe_.+/.test(tab2.name) ? 'iframe' : tab2.name, + params: { ...tab2.params }, + query: { ...tab2.query } + }) + } } } }, created () { - // this.dataForm = this.$router.currentRoute.params.id this.init() - console.log('fromList', this.$router.currentRoute.params.businessKey) - // this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO - var callbacks = { - startProcessSuccessCallback: this.closeCurrentTab, - startProcessErrorCallback: this.startProcessErrorCallback, - taskHandleSuccessCallback: this.closeCurrentTab, - taskHandleErrorCallback: this.taskHandleErrorCallback, - formSaveSuccessCallback: null, - formSaveErrorCallback: null - } - // 初始化综合组件 - this.initProcessMultiple(callbacks) this.taskId = this.$route.params.taskId this.dataForm.taskId = this.$route.params.taskId }, diff --git a/back/src/views/modules/activiti/demo/putaway-process3.vue b/back/src/views/modules/activiti/demo/putaway-process3.vue index 97829af5..a4b8bf35 100644 --- a/back/src/views/modules/activiti/demo/putaway-process3.vue +++ b/back/src/views/modules/activiti/demo/putaway-process3.vue @@ -252,6 +252,7 @@ export default { return } bus.$emit('AbilityResourcesRemovedInit') + bus.$emit('workInit') this.$message({ message: this.$t('prompt.success'), type: 'success', @@ -287,6 +288,7 @@ export default { return } bus.$emit('AbilityResourcesRemovedInit') + bus.$emit('workInit') this.$message({ message: this.$t('prompt.success'), type: 'success', @@ -323,15 +325,26 @@ export default { } // 当前选中tab被删除 if (tabName === this.$store.state.contentTabsActiveName) { - const tab = + // 判断是否有列表页 + const tab1 = this.$store.state.contentTabs.filter(val => val.name === tabName.substring(0, tabName.indexOf('__')))[0] + // 如果没列表页打开最后一个tab + const tab2 = this.$store.state.contentTabs[ this.$store.state.contentTabs.length - 1 ] - this.$router.push({ - name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name, - params: { ...tab.params }, - query: { ...tab.query } - }) + if (tab1) { + this.$router.push({ + name: /^iframe_.+/.test(tab1.name) ? 'iframe' : tab1.name, + params: { ...tab1.params }, + query: { ...tab1.query } + }) + } else { + this.$router.push({ + name: /^iframe_.+/.test(tab2.name) ? 'iframe' : tab2.name, + params: { ...tab2.params }, + query: { ...tab2.query } + }) + } } }, // 启动流程出错回调 diff --git a/back/src/views/modules/bscatalogue/bscatalogue.vue b/back/src/views/modules/bscatalogue/bscatalogue.vue index a26999b1..9040892e 100644 --- a/back/src/views/modules/bscatalogue/bscatalogue.vue +++ b/back/src/views/modules/bscatalogue/bscatalogue.vue @@ -1,8 +1,8 @@ -
+
- {{ + {{ isRemoveCard ? '完成' : '编辑' }}
@@ -393,7 +393,7 @@ export default { this.oldId = item.id } }) - this.$message.success('删除企业成功！') + this.$message.success('删除编目成功！') // 删除完退出编辑模式 this.initTopicCardList() this.isRemoveCard = !this.isRemoveCard @@ -401,8 +401,8 @@ export default { this.topicCoverZIndex = this.isEditGroupName ? -999 : 1000 }) .catch((e) => { - console.log('删除企业失败！%o', e) - this.$message.error('删除企业失败！') + console.log('删除编目失败！%o', e) + this.$message.error('删除编目失败！') }) }) }, diff --git a/back/src/views/modules/myAgent/AbilityResourceShelf.vue b/back/src/views/modules/myAgent/AbilityResourceShelf.vue index 876c2562..07baf92b 100644 --- a/back/src/views/modules/myAgent/AbilityResourceShelf.vue +++ b/back/src/views/modules/myAgent/AbilityResourceShelf.vue @@ -1,8 +1,8 @@