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/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index c7cc78e25..7d46e0a5d 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -63,7 +63,7 @@ export default { case '3': // 标准征求意见流程 this.$router.push({ - name:'zqyjStep1' + name:'bzzqyjStep1' }) break case '4': 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/router/index.js b/src/router/index.js index 5c0a65d68..d45c8e7cb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -393,6 +393,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',