diff --git a/package-lock.json b/package-lock.json index 7b1d0134d..b81c194e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3619,6 +3619,23 @@ "upath": "^1.1.1" } }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz", + "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz", + "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", + "dev": true, + "optional": true + }, "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -4564,6 +4581,94 @@ } } }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.3.0", + "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.3.0.tgz", + "integrity": "sha1-LxleS6D7DiY1ltaDDfF9Gjbok2w=", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995651629&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz", + "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "big.js": { + "version": "5.2.2", + "resolved": "https://registry.nlark.com/big.js/download/big.js-5.2.2.tgz", + "integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg=", + "dev": true, + "optional": true + }, + "chalk": { + "version": "4.1.1", + "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz", + "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz", + "integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang=", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz", + "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=", + "dev": true, + "optional": true + }, + "json5": { + "version": "2.2.0", + "resolved": "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz", + "integrity": "sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM=", + "dev": true, + "optional": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz", + "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1622293630895&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz", + "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "vue-style-loader": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", @@ -13517,94 +13622,6 @@ "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.22.4.tgz", "integrity": "sha512-XLI5s0AdqMP2Lf4I4CmdmOq8kjb5DDFGR77wAuxCfpEuYSfhTRyyx6MetgZMiL6Lxa0DasjBOiOcciU3NkL3/Q==" }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.2.0", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz", - "integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "hash-sum": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz", - "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-router": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.0.tgz", diff --git a/src/pages/config/pages/standLawsAttrManage/index.vue b/src/pages/config/pages/standLawsAttrManage/index.vue index 70bf0b03e..609f9bc4f 100644 --- a/src/pages/config/pages/standLawsAttrManage/index.vue +++ b/src/pages/config/pages/standLawsAttrManage/index.vue @@ -381,16 +381,25 @@ export default { }, goNuwPage (item) { this.$store.commit('setDetailMap', this.$route.path) - this.$router.push({ - name: 'StandLawsAttrDetails', - params: { - id: item.id, - dictionaryName: item.dictionaryName, - dictionType: item.dictionType, - isRelate: item.isRelate, - relateDicId: item.relateDicId - } - }) + const params = { + id: item.id, + dictionaryName: item.dictionaryName, + dictionType: item.dictionType, + isRelate: item.isRelate, + relateDicId: item.relateDicId + } + if(item.dictionType && item.dictionType === 'TREE'){ + this.$router.push({ + name: 'standLawsAttrTreeDetails', + params: params + }) + }else { + this.$router.push({ + name: 'StandLawsAttrDetails', + params: params + }) + } + }, handleSelectone (data) { this.selectedList = [] diff --git a/src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrTreeDetails.vue b/src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrTreeDetails.vue new file mode 100644 index 000000000..bd935548b --- /dev/null +++ b/src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrTreeDetails.vue @@ -0,0 +1,1249 @@ + + + + + + diff --git a/src/pages/home1/components/todoList/index.vue b/src/pages/home1/components/todoList/index.vue index 0eb3a868b..fbe177ea9 100644 --- a/src/pages/home1/components/todoList/index.vue +++ b/src/pages/home1/components/todoList/index.vue @@ -3,11 +3,11 @@
待办任务 - MORE +
MORE
@@ -20,26 +20,36 @@ export default { mixins: [], data() { return { - toDoTaskList: [ - { - id: 1, - title: '标准制定流程1', - }, - { - id: 2, - title: '标准制定流程2', - }, - { - id: 3, - title: '标准制定流程3', - }, - ], + toDoTaskList: [],// 代办数据 + total: 0, + pageNo: 1, } }, computed: {}, watch: {}, - mounted() {}, - methods: {}, + mounted() {this.queryProcess()}, + methods: { + togo () { + this.$router.push('/processCenter') + }, + queryProcess () { // 查询待办流程 + this.$http.postData('lawss/activiti/todoTaskList', { + current: this.pageNo, + size: parseInt(this.$store.getters.userInfo.configContent), + userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId, + }, + { + loading: 'loading', + _this: this + }, res => { + this.toDoTaskList = res.list + }, e => { + }) + }, + toPage() { + this.$router.push(this.path) + } + }, } diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index daadb9bce..018032f77 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -14,12 +14,12 @@ size="mini" type="primary" class="common-button-primary" - v-btn-permission="'bcf0d05723689ced8f49fae7794ff0db'" + v-btn-permission="''" @click="searchStandList">查询 清空 @@ -28,10 +28,10 @@
- 拆分 - 上传 - 导入拆分结果 - 删除 + 拆分 + 上传 + 导入拆分结果 + 删除
@@ -109,24 +109,24 @@ - 查看 + 查看 收藏 取消收藏 - 分享 + 分享 - 删除 + 删除 @@ -852,7 +852,7 @@ export default { } }) } else { - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', { page: this.conditionForm.page, pageSize: this.conditionForm.pageSize, standNumber: this.conditionForm.numberName, @@ -1166,7 +1166,7 @@ export default { splitEo.fileType = this.selectedSplitStandList[0].standFileClassify splitEo.attId = this.selectedSplitStandList[0].attId splitEo.fileName = this.selectedSplitStandList[0].fileName - this.$http.get('lawss/sarFileSplitInfo/fileSplit', splitEo, { + this.$http.postData('lawss/sarFileSplitInfo/fileSplit', splitEo, { _this: this }, res => { if (res.ok) { @@ -1312,7 +1312,7 @@ export default { this.percent = 0 this.speedModal = true this.speedProgress() - this.$http.get('lawss/sarFileSplitInfo/fileSplit', this.uploadFilesplitEo, { + this.$http.postData('lawss/sarFileSplitInfo/fileSplit', this.uploadFilesplitEo, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue index e10c7dce3..628d45181 100644 --- a/src/pages/localTool/standardRecognition/index.vue +++ b/src/pages/localTool/standardRecognition/index.vue @@ -4,10 +4,10 @@
- 上传 - 删除
@@ -106,16 +106,16 @@ - 获取文件 - 编辑 - 删除 - 在线编辑 @@ -508,7 +508,7 @@ export default { if (res.data.standName != null && res.data.standName !== "") { this.uploadFilesdfEo.standName = res.data.standName; } - // this.uploadFilesdfEo.fileName = res.data.name + this.uploadFilesdfEo.fileName = res.data.name // this.getTableData() this.defaultFileList.push(file); this.$message({ diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 48aee8786..0b4e6b7a6 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -198,7 +198,7 @@ export default { this.getMenu().then((menuList) => { let hasHomeMenu = false menuList.map((menuItem) => { - if (menuItem.id === 'G72J4WNFM8') { + if (menuItem.id === 'asdfadf') { hasHomeMenu = true } }) diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 97ef475e7..7afe67ada 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -50,7 +50,7 @@ - -
- {{ form.model }} + + +
+ {{ form.modelName }}
+ type="primary" + class="common-button-primary" + @click="fileUpload" + size="mini"> 点击上传
@@ -56,6 +63,19 @@
+ + +
+ + +
+
+
@@ -160,6 +180,24 @@ 取消
+ + +
+ +

点击或拖拽上传文件

+
+
+
@@ -172,6 +210,7 @@ export default { name: "bzdyStep1", data() { return { + commentText: '', roleRow: {}, nodeList: [], type: '', @@ -192,6 +231,7 @@ export default { title: '', // 调研标题 date: '', // 完成时间 model: '', // 上传模板 + modelName: '' }, formRules: { title: [ @@ -199,6 +239,9 @@ export default { ], date: [ { type: 'date', required: true, message: '请选择完成时间', trigger: 'change' } + ], + modelName: [ + { required: true, message: '请上传调研结果', trigger: 'change' }, ] }, roleForm: { @@ -228,7 +271,9 @@ export default { presidentUserName: [ { required: true, message: '请输入调研标题', trigger: 'change' }, ] - } + }, + fileUrl: 'api/att/attFile/upload', + fileMadel: false, } }, components: { @@ -237,6 +282,47 @@ export default { ProcessTitle }, methods: { + // 导入按钮 上传之前的钩子 + beginImportFile (file) { + var filename = file.name + var index1 = filename.lastIndexOf('.') + var index2 = filename.length + var fileSuffix = filename.substring(index1, index2) + // const fileSuffix = file.name.split('.')[1] // 后缀名 + // 判断上传文件格式 + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + return true + } else { + this.spinShow = false + this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX或XLS文件') + return false + } + // 判断文件上传大小 + // eslint-disable-next-line no-unreachable + if (file.size / 1024 / 1024 <= 200) { + return true + } else { + this.$message.error('文件' + file.name + '大小不超过200M') + return false + } + return true + }, + // 导入标准数据成功后执行 + importFileSuccess (response, file) { + if (response.ok) { + this.fileMadel = false + this.form.model = response.data.id + this.form.modelName = response.data.name + this.$message({ + showClose: true, + message: response.message, + type: 'success' + }) + } + }, + fileUpload () { + this.fileMadel = true + }, saveUserInfo () { if (this.type === 'dockUser') { this.roleForm.dockUser = this.roleRow.id @@ -291,6 +377,7 @@ export default { }, {}, res => { if (res.ok) { var json = Object.assign(this.form, this.roleForm) + json.commentText = this.commentText this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: res.data, @@ -332,6 +419,12 @@ export default { } position: relative; height: 100%; + .fileClass { + cursor: pointer; + } + .fileClass:hover{ + color: #0c91e5; + } .headerTabs { height: 52px; display: flex; diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index 74895baf8..fa3455caa 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -40,16 +40,11 @@ -
- {{ form.model }} +
+ {{ form.modelName }}
- - 点击上传 - + - -
@@ -65,6 +60,19 @@
+ + +
+ + +
+
+
{ if (valid) { var json = this.json + json.commentText = this.commentText json.responUserList = this.form.responUserList json.responUserListName = this.form.responUserListName this.$http.post('lawss/activiti/completeTask', { @@ -216,6 +229,8 @@ this.form.title = data.title this.form.date = data.date this.json = data + this.form.model = data.model + this.form.modelName = data.modelName }).catch(e => { }) }) @@ -237,6 +252,12 @@ padding: 0 20px 0; } } + .fileClass { + cursor: pointer; + } + .fileClass:hover{ + color: #0c91e5; + } position: relative; height: 100%; .headerTabs { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index 9f155917c..d438ee1c6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -40,16 +40,11 @@ -
- {{ form.model }} +
+ {{ form.modelName }}
- - 点击上传 - + - -
@@ -77,6 +72,19 @@
+ + +
+ + +
+
+
{ if (valid) { var json = this.json + json.commentText = this.commentText json.fileId = this.form.fileId + json.fileName = this.form.fileName this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -223,6 +238,8 @@ this.form.title = data.title this.form.date = data.date this.json = data + this.form.model = data.model + this.form.modelName = data.modelName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue new file mode 100644 index 000000000..2059a9309 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -0,0 +1,267 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue new file mode 100644 index 000000000..baaf52bdd --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -0,0 +1,335 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue new file mode 100644 index 000000000..e9b958273 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -0,0 +1,347 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue new file mode 100644 index 000000000..e009bbe74 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -0,0 +1,347 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue new file mode 100644 index 000000000..344fd3282 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -0,0 +1,347 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue new file mode 100644 index 000000000..9af0cf7ab --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -0,0 +1,347 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 4e6def083..73fc02eaa 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -553,21 +553,19 @@ - - - -
- - -
-
-
- + + +
+ + +
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue new file mode 100644 index 000000000..224777749 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -0,0 +1,451 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue new file mode 100644 index 000000000..6258074e3 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue new file mode 100644 index 000000000..d4122495f --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue new file mode 100644 index 000000000..848d27d8d --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue new file mode 100644 index 000000000..e7e508d86 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue new file mode 100644 index 000000000..1f8c0c162 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -0,0 +1,525 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue new file mode 100644 index 000000000..de7d8b846 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -0,0 +1,531 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue new file mode 100644 index 000000000..ea7b9bd79 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -0,0 +1,452 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue new file mode 100644 index 000000000..c95f7e89c --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -0,0 +1,452 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue new file mode 100644 index 000000000..6b4411df1 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -0,0 +1,454 @@ + + + + + + diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 1d695f7e8..b9d8407a2 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -11,6 +11,7 @@
标准发放申请流程
标准清单发布/更新流程
项目合规评估流程
+
未符合项整改流程
@@ -63,7 +64,7 @@ export default { case '3': // 标准征求意见流程 this.$router.push({ - name:'zqyjStep1' + name:'bzzqyjStep1' }) break case '4': @@ -91,6 +92,10 @@ export default { }) break case '8': + //未符合项整改流程 + this.$router.push({ + name:'wfhxzgStep1' + }) break case '9': break diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 827f9db53..fe474ca29 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -275,6 +275,72 @@ export default { prcType: row.prcType } }) + } else if (row.taskInfo === '责任对接人审批') { + this.$router.push({ + name: 'bzdyStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '标准法规工程师调研汇总'){ + this.$router.push({ + name: 'bzdyStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '责任人会签'){ + this.$router.push({ + name: 'bzdyStep6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '部长+对接人审核') { + this.$router.push({ + name: 'bzdyStep7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo.indexOf('工程研究总院院长') == 0 ) { + this.$router.push({ + name: 'bzdyStep9', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else { + this.$router.push({ + name: 'bzdyStep8', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break; //标准清单更新/发布流程 diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 5dca0201d..5f6b2bc7a 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -76,12 +76,12 @@
- 新增 + + + + + + import('@/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue'), + meta: { + requireAuth: true, + title: '未符合项整改流程' + } + }, { path: '/xmpgStep1', name: 'xmpgStep1', @@ -285,6 +294,42 @@ const routes = [ title: '项目合规评估流程' } }, + { + path: '/wfhxzgStep2', + name: 'wfhxzgStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue'), + meta: { + requireAuth: true, + title: '未符合项整改发布/更新流程' + } + }, + { + path: '/wfhxzgStep3', + name: 'wfhxzgStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue'), + meta: { + requireAuth: true, + title: '未符合项整改/更新流程' + } + }, + { + path: '/wfhxzgStep4', + name: 'wfhxzgStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue'), + meta: { + requireAuth: true, + title: '未符合项整改/更新流程' + } + }, + { + path: '/wfhxzgStep5', + name: 'wfhxzgStep5', + component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue'), + meta: { + requireAuth: true, + title: '未符合项整改/更新流程' + } + }, { path: '/bzrkStep1', name: 'bzrkStep1', @@ -357,6 +402,105 @@ const routes = [ title: '标准调研流程' } }, + { + path: '/bzzqyjStep1', + name: 'bzzqyjStep1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue'), + meta: { + requireAuth: true, + title: '标准征求意见流程' + } + }, + { + path: '/bzzqyjStep2', + name: 'bzzqyjStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue'), + meta: { + requireAuth: true, + title: '标准征求意见流程' + } + }, + { + path: '/bzzqyjStep3', + name: 'bzzqyjStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue'), + meta: { + requireAuth: true, + title: '标准征求意见流程' + } + }, + { + path: '/bzzqyjStep4', + name: 'bzzqyjStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue'), + meta: { + requireAuth: true, + title: '标准征求意见流程' + } + }, + { + path: '/bzzqyjStep5', + name: 'bzzqyjStep5', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, + { + path: '/bzdyStep4', + name: 'bzdyStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step4.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, + { + path: '/bzdyStep5', + name: 'bzdyStep5', + component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step5.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, + { + path: '/bzdyStep6', + name: 'bzdyStep6', + component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step6.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, + { + path: '/bzdyStep7', + name: 'bzdyStep7', + component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step7.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, + { + path: '/bzdyStep8', + name: 'bzdyStep8', + component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step8.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, + { + path: '/bzdyStep9', + name: 'bzdyStep9', + component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step9.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, { path: '/zqyjStep1', name: 'zqyjStep1', @@ -991,6 +1135,17 @@ const routes = [ title: '标准法规属性管理详情页' } }, + { + path: '/standLawsAttrTreeDetails/:id?/:dictionaryName?/:dictionType?/:isRelate?/:relateDicId?', + name: 'standLawsAttrTreeDetails', + component: () => + import('@/pages/config/pages/standLawsAttrManage/pages/standLawsAttrTreeDetails'), + meta: { + requireAuth: true, + parentPath: '/standLawsAttrManage', + title: '标准法规属性管理详情页' + } + }, { path: '/attributeCustom', name: 'AttributeCustom', diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 1b190f484..ee961b101 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -22,11 +22,11 @@ const theme = 'theme-one' // 主题(theme-one浅蓝色,theme-two深蓝色) const processPort = '17210' /***************************************************************** -<<<<<<<<< 主题修改 >>>>>>>>> + <<<<<<<<< 主题修改 >>>>>>>>> -1. 主题分为theme-one,theme-two两种 -2. 修改assets/styles/style.less文件,注释theme-one/theme-two -3. 将上方theme改为theme-one/theme-two + 1. 主题分为theme-one,theme-two两种 + 2. 修改assets/styles/style.less文件,注释theme-one/theme-two + 3. 将上方theme改为theme-one/theme-two *****************************************************************/ // 生产环境配置 @@ -51,4 +51,4 @@ module.exports = { enterprise: enterprise, // GQ广汽 SJZX数据中心 theme: theme, // 主题 processInterfaceURL: `http://${serverIP}:${processPort}/bat-wkflow` -} +} \ No newline at end of file