From 3164d7dc49f30e498734ffd9177dd03a4ebd564e Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 13 Jul 2021 14:22:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=BA=93=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../otherBussStandardDetails/index.vue | 2 +- .../details/otherStandardDetails/index.vue | 24 +++++++++---------- src/pages/details/process/ruku/index.vue | 2 +- .../pages/creatProcess/bzrk/step1.vue | 12 +++++++++- .../domesticStandardsAndRegulations/index.vue | 4 ++-- 5 files changed, 27 insertions(+), 17 deletions(-) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index c8a7f1d18..202a871fd 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -1564,7 +1564,7 @@ export default { // 请求标准id和类型 showReplaceStandInfo (item) { // this.replaceStandInfoEO.standType = this.sarStandardsInfoEO.standType - this.$http.get('lawss/sarStandardsInfo/queryInfoByStandNum', { + this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', { standNumber: item }, { _this: this diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 347e22d9a..43f10be3d 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -38,25 +38,25 @@ @@ -149,9 +168,10 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import {interfaceUrl} from "@/sysConfig"; +import {inboundLiaisonDetail, completeTask} from "@/api/process" export default { - name: "step4", + name: "wfhxzgStep4", data() { return { textarea: '', // 意见 @@ -165,34 +185,17 @@ export default { active: '1', // 默认显示 isSubmit: false, saveLoading: false, - dataList: [ - { - standId: '1', - productName: '1', - itemsNum: '1', - itemsName: '1', - planCloseTime: '1', - responsibleUnit: '1', - dutyEngineer: '1', - dutyPeople: '13123' - },{ - standId: '', - productName: '', - itemsNum: '', - itemsName: '', - planCloseTime: '', - responsibleUnit: '', - dutyEngineer: '', - dutyPeople: '13123' - }], + dataList: [], + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId, // 当前页数 pageNo: 1, total: 0, myLoading: false, // 上传路径 uploadPath: 'api/att/attFile/upload', - // 上传文件所储存的数组 - uploadFileList: [], + fileMadel: false, + newDataList: [], // 责任部门 zNodesSItem: [], } @@ -203,25 +206,84 @@ export default { ProcessTitle }, created() { + this.getData() }, methods: { + getData() { + const params = { + taskIds: this.taskIds, + pId: this.pId, + } + inboundLiaisonDetail(params).then(res => { + const processForm = JSON.parse(res.mesg) + this.getFormFieldList(processForm) + }) + }, + getFormFieldList (item) { + this.$nextTick(() => { + console.log(item) + this.dataList = [JSON.parse(JSON.stringify(item.responUserInfo.info))] + console.log(this.dataList) + /*for (let i = 0; i { + if (item.fileText === '') { + this.$message.warning('请选择佐证材料进行上传') + flag=true + } + }) + if(flag)return; + let fileDataList = this.dataList + let json = { + info: { fileDataList }, + username: this.$store.getters.userInfo.userName + } + console.log(json) + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskIds', this.taskIds) + completeTask(params).then(res => { + if(res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + }) + }, //未整改项抽屉中的查询按钮 getTableByPage() { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index c157cb998..a8b85cad1 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -106,19 +106,21 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="textarea"> + v-model="commentText"> @@ -129,13 +131,15 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import {interfaceUrl} from "@/sysConfig"; +import {inboundLiaisonDetail} from "@/api/process"; export default { - name: "step5", + name: "wfhxzgStep5", data() { return { - textarea: '', // 意见 + commentText: '', title: '', // 新增编辑抽屉标题 + saveLoading: false, ListModel: false, // 新增编辑抽屉开关 nonConformitySearch: { standId: '', // 标准号/名称 @@ -145,24 +149,10 @@ export default { active: '1', // 默认显示 isSubmit: false, backLoading: false, - dataList: [ - { - standId: '1', - productName: '1', - itemsNum: '1', - itemsName: '1', - planCloseTime: '1', - responsibleUnit: '1', - dutyEngineer: '1' - },{ - standId: '', - productName: '', - itemsNum: '', - itemsName: '', - planCloseTime: '', - responsibleUnit: '', - dutyEngineer: '' - }], + dataList: [], + json: {}, + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId, // 当前页数 pageNo: 1, total: 0, @@ -180,15 +170,66 @@ export default { ProcessTitle }, created() { + this.getData() }, methods: { + getData() { + const params = { + taskIds: this.taskIds, + pId: this.pId, + } + inboundLiaisonDetail(params).then(res => { + const processForm = JSON.parse(res.mesg) + this.getFormFieldList(processForm) + }) + }, + getFormFieldList (item) { + this.$nextTick(() => { + console.log(item) + this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList + console.log(this.dataList) + }) + }, handleTabs(name) { this.active = name }, // 提交按钮 - handleSubmit() {}, + handleSubmit() { + var json = this.json + json.actionFlag = 0 + json.commentText = this.commentText + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('提交成功') + this.$router.push('/processCenter') + } + }) + }, + handleSubmitNo() { + if (this.commentText) { + var json = this.json + json.actionFlag = 1 + json.commentText = this.commentText + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('驳回成功') + this.$router.push('/processCenter') + } + }) + } else { + this.$message.warning('请输入反馈意见') + } + }, //未整改项抽屉中的查询按钮 getTableByPage() { }, diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 6ba2be88c..a8aecdb8a 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -472,7 +472,6 @@ export default { } }) } - break; break //项目合规评估流程 case '5' : @@ -500,7 +499,54 @@ export default { }) } break - + //未符合项整改流程 + case '8' : + if(row.taskInfo === '下发至标准法规工程师'){ + this.$router.push({ + name: 'wfhxzgStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '确认+选择责任人') { + this.$router.push({ + name: 'wfhxzgStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '上传佐证材料填写信息') { + this.$router.push({ + name: 'wfhxzgStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else { + this.$router.push({ + name: 'wfhxzgStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/router/index.js b/src/router/index.js index a61dcc0e4..8939581cf 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -341,7 +341,7 @@ const routes = [ }, { path: '/wfhxzgStep1', - name: 'wfhxzgStep2', + name: 'wfhxzgStep1', component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue'), meta: { requireAuth: true, @@ -1699,7 +1699,7 @@ router.beforeEach((to, from, next) => { // if (processCenter) { // if (to.meta.process) { // if (store.getters.getHandleInfo.prcType === to.meta.process.prcType && - // (store.getters.getHandleInfo.taskInfo === to.meta.process.taskInfo || + // (store.getters.getHandleInfo. === to.meta.process.taskInfo || // (to.meta.process.taskInfo.__proto__.constructor === Array && to.meta.process.taskInfo.includes(store.getters.getHandleInfo.taskInfo)))) { // next() // } else { From f2f643a5884d0b0cb4a9467e8b230f8c072eb9ab Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 13 Jul 2021 16:13:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=20=E6=96=87=E4=BB=B6=E4=BF=A1=E6=81=AF=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 316 +++++++++++++-- .../pages/creatProcess/bzrk/step2.vue | 70 ++-- .../pages/creatProcess/bzrk/step3.vue | 70 ++-- .../pages/creatProcess/bzrk/step4.vue | 374 ++++++++++++++++-- 4 files changed, 689 insertions(+), 141 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 1b41ace11..30b380397 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -195,73 +195,141 @@ - -
- {{ form.xgd }} + +
+ {{ form.xgdName }} + + 重新上传 +
+ size="mini" + @click="fileUpload('xgd')"> 点击上传
-
- {{ form.fbgbjbd }} + +
+ {{ form.fbgbjbdName }} + + 重新上传 +
+ size="mini" + @click="fileUpload('fbgbjbd')"> 点击上传
-
- {{ form.zbjbd }} + +
+ {{ form.zbjbdName }} + + 重新上传 +
+ size="mini" + @click="fileUpload('zbjbd')"> 点击上传
-
- {{ form.bpg }} + +
+ {{ form.bpgName }} + + 重新上传 +
+ size="mini" + @click="fileUpload('bpg')"> 点击上传
-
- {{ form.ssg }} + +
+ {{ form.ssgName }} + + 重新上传 +
+ size="mini" + @click="fileUpload('ssg')"> 点击上传
@@ -269,53 +337,113 @@ -
- {{ form.kwj }} + +
+ {{ form.kwjName }} + + 重新上传 +
+ size="mini" + @click="fileUpload('kwj')"> 点击上传
-
- {{ form.zqyjg }} + +
+ {{ form.zqyjgName }} + + 重新上传 +
+ size="mini" + @click="fileUpload('zqyjg')"> 点击上传
-
- {{ form.ca }} + +
+ {{ form.caName }} + + 重新上传 +
+ size="mini" + @click="fileUpload('ca')"> 点击上传
-
- {{ form.jdwj }} + +
+ {{ form.jdwjName }} + + 重新上传 +
+ size="mini" + @click="fileUpload('jdwj')"> 点击上传
@@ -508,14 +636,21 @@ > -
- {{ form.glwj }} + +
+ {{ form.glwjName }}
+ size="mini" + @click="fileUpload('glwj')"> 点击上传
@@ -624,6 +759,24 @@ @submit="handleSubmit" > + + +
+ +

点击或拖拽上传文件

+
+ +
@@ -633,8 +786,6 @@ import ProcessTitle from '../../components/ProcessTitle' import {saveTaskFirst} from "api/process"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; - import CustomFile from '@/components/CustomFormComponents/File' - export default { name: "bzrkStep1", @@ -652,6 +803,9 @@ }, nodeKey: 'id', defaultCheckedKeys: [], + fileUrl: 'api/att/attFile/upload', + fileMadel: false, + fileType: '', form: { // 基础信息 textStatus: '', // 文本状态 @@ -685,6 +839,16 @@ jdwj: '', // 解读文件 zbjbd: '', // 增补件 kwj: '', // 勘误件 + caName: '', // 草案 + fbgbjbdName: '', // 发布稿 + xgdName: '', // 修改单 + bpgName: '', // 报批稿 + ssgName: '', // 送审稿 + zqyjgName: '', // 征求意见稿 + jdwjName: '', // 解读文件 + zbjbdName: '', // 增补件 + kwjName: '', // 勘误件 + glwjName: '', // 关联文件 // 适用范围 txlb: '', // 体系类别 gkdw: '', // 归口管理部门 @@ -738,10 +902,80 @@ ProcessHeader, ProcessFooter, ProcessTitle, - TreeSelect, - CustomFile + TreeSelect }, 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 === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + return true + } else { + this.spinShow = false + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOC/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 + if(this.fileType === 'fbgbjbd'){ + this.form.fbgbjbd = response.data.id; + this.form.fbgbjbdName = response.data.name; + }else if(this.fileType === 'xgd'){ + this.form.xgd = response.data.id; + this.form.xgdName = response.data.name; + }else if(this.fileType === 'bpg'){ + this.form.bpg = response.data.id; + this.form.bpgName = response.data.name; + }else if(this.fileType === 'ssg'){ + this.form.ssg = response.data.id; + this.form.ssgName = response.data.name; + }else if(this.fileType === 'zqyjg'){ + this.form.zqyjg = response.data.id; + this.form.zqyjgName = response.data.name; + }else if(this.fileType === 'jdwj'){ + this.form.jdwj = response.data.id; + this.form.jdwjName = response.data.name; + }else if(this.fileType === 'kwj'){ + this.form.kwj = response.data.id; + this.form.kwjName = response.data.name; + }else if(this.fileType === 'xgd'){ + this.form.xgd = response.data.id; + this.form.xgdName = response.data.name; + }else if(this.fileType === 'glwj'){ + this.form.glwj = response.data.id; + this.form.glwjName = response.data.name; + }else if(this.fileType === 'ca'){ + this.form.ca = response.data.id; + this.form.caName = response.data.name; + } + this.$message({ + showClose: true, + message: response.message, + type: 'success' + }) + } + }, + fileUpload (type) { + this.fileType = ''; + this.fileMadel = true + this.fileType = type; + }, popoverHide (checkedIds, checkedData) { console.log(checkedIds); console.log(checkedData); diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 49023f76b..06544ba2a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -208,41 +208,41 @@
- -
- {{ form.xgd }} + +
+ {{ form.xgdName }}
- -
- -
- {{ form.fbgbjbd }} + +
+ {{ form.fbgbjbdName }}
- -
- -
- {{ form.zbjbd }} + +
+ {{ form.zbjbdName }}
- -
- -
- {{ form.bpg }} + +
+ {{ form.bpgName }}
- -
- -
- {{ form.ssg }} + +
+ {{ form.ssgName }}
- - @@ -250,33 +250,33 @@ - -
- {{ form.kwj }} + +
+ {{ form.kwjName }}
- -
- -
- {{ form.zqyjg }} + +
+ {{ form.zqyjgName }}
- -
- -
- {{ form.ca }} + +
+ {{ form.caName }}
- -
- -
- {{ form.jdwj }} + +
+ {{ form.jdwjName }}
- - @@ -473,9 +473,9 @@ clearable > - -
- {{ form.glwj }} + +
+ {{ form.glwjName }}
- - @@ -730,6 +730,16 @@ jdwj: '', // 解读文件 zbjbd: '', // 增补件 kwj: '', // 勘误件 + caName: '', // 草案 + fbgbjbdName: '', // 发布稿 + xgdName: '', // 修改单 + bpgName: '', // 报批稿 + ssgName: '', // 送审稿 + zqyjgName: '', // 征求意见稿 + jdwjName: '', // 解读文件 + zbjbdName: '', // 增补件 + kwjName: '', // 勘误件 + glwjName: '', // 关联文件 // 适用范围 txlb: '', // 体系类别 gkdw: '', // 归口管理部门 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index b60c5d0f9..652ca5446 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -201,41 +201,41 @@
- -
- {{ form.xgd }} + +
+ {{ form.xgdName }}
- -
- -
- {{ form.fbgbjbd }} + +
+ {{ form.fbgbjbdName }}
- -
- -
- {{ form.zbjbd }} + +
+ {{ form.zbjbdName }}
- -
- -
- {{ form.bpg }} + +
+ {{ form.bpgName }}
- -
- -
- {{ form.ssg }} + +
+ {{ form.ssgName }}
- - @@ -243,33 +243,33 @@ - -
- {{ form.kwj }} + +
+ {{ form.kwjName }}
- -
- -
- {{ form.zqyjg }} + +
+ {{ form.zqyjgName }}
- -
- -
- {{ form.ca }} + +
+ {{ form.caName }}
- -
- -
- {{ form.jdwj }} + +
+ {{ form.jdwjName }}
- - @@ -466,9 +466,9 @@ clearable > - -
- {{ form.glwj }} + +
+ {{ form.glwjName }}
- - @@ -722,6 +722,16 @@ export default { jdwj: '', // 解读文件 zbjbd: '', // 增补件 kwj: '', // 勘误件 + caName: '', // 草案 + fbgbjbdName: '', // 发布稿 + xgdName: '', // 修改单 + bpgName: '', // 报批稿 + ssgName: '', // 送审稿 + zqyjgName: '', // 征求意见稿 + jdwjName: '', // 解读文件 + zbjbdName: '', // 增补件 + kwjName: '', // 勘误件 + glwjName: '', // 关联文件 // 适用范围 txlb: '', // 体系类别 gkdw: '', // 归口管理部门 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 4be4dffe5..ed2fbb46f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -188,78 +188,258 @@
- -
- {{ form.xgd }} + + +
+ {{ form.xgdName }} + + 重新上传 +
- - - + + 点击上传 +
- -
- {{ form.fbgbjbd }} + + +
+ {{ form.fbgbjbdName }} + + 重新上传 +
- - - + + 点击上传 +
- -
- {{ form.zbjbd }} + + +
+ {{ form.zbjbdName }} + + 重新上传 +
- - - + + 点击上传 +
- -
- {{ form.bpg }} + + +
+ {{ form.bpgName }} + + 重新上传 +
- - - + + 点击上传 +
- -
- {{ form.ssg }} + + +
+ {{ form.ssgName }} + + 重新上传 +
- - - + + 点击上传 +
- -
- {{ form.kwj }} + + +
+ {{ form.kwjName }} + + 重新上传 +
- - - + + 点击上传 +
- -
- {{ form.zqyjg }} + + +
+ {{ form.zqyjgName }} + + 重新上传 +
- - - + + 点击上传 +
- -
- {{ form.ca }} + + +
+ {{ form.caName }} + + 重新上传 +
- - - + + 点击上传 +
- -
- {{ form.jdwj }} + + +
+ {{ form.jdwjName }} + + 重新上传 +
- - - + + 点击上传 +
@@ -446,12 +626,24 @@ clearable > - -
- {{ form.glwj }} + + +
+ {{ form.glwjName }}
- - - + + 点击上传 +
@@ -633,6 +825,24 @@ @submit="handleSubmit" > + + +
+ +

点击或拖拽上传文件

+
+ +
@@ -667,6 +877,9 @@ export default { nodeKey: 'id', defaultCheckedKeys: [], treeStatus:false, + fileUrl: 'api/att/attFile/upload', + fileMadel: false, + fileType: '', form: { // 基础信息 textStatus: '', // 文本状态 @@ -700,6 +913,16 @@ export default { jdwj: '', // 解读文件 zbjbd: '', // 增补件 kwj: '', // 勘误件 + caName: '', // 草案 + fbgbjbdName: '', // 发布稿 + xgdName: '', // 修改单 + bpgName: '', // 报批稿 + ssgName: '', // 送审稿 + zqyjgName: '', // 征求意见稿 + jdwjName: '', // 解读文件 + zbjbdName: '', // 增补件 + kwjName: '', // 勘误件 + glwjName: '', // 关联文件 // 适用范围 txlb: '', // 体系类别 gkdw: '', // 归口管理部门 @@ -769,6 +992,77 @@ export default { }, }, 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 === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + return true + } else { + this.spinShow = false + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOC/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 + if(this.fileType === 'fbgbjbd'){ + this.form.fbgbjbd = response.data.id; + this.form.fbgbjbdName = response.data.name; + }else if(this.fileType === 'xgd'){ + this.form.xgd = response.data.id; + this.form.xgdName = response.data.name; + }else if(this.fileType === 'bpg'){ + this.form.bpg = response.data.id; + this.form.bpgName = response.data.name; + }else if(this.fileType === 'ssg'){ + this.form.ssg = response.data.id; + this.form.ssgName = response.data.name; + }else if(this.fileType === 'zqyjg'){ + this.form.zqyjg = response.data.id; + this.form.zqyjgName = response.data.name; + }else if(this.fileType === 'jdwj'){ + this.form.jdwj = response.data.id; + this.form.jdwjName = response.data.name; + }else if(this.fileType === 'kwj'){ + this.form.kwj = response.data.id; + this.form.kwjName = response.data.name; + }else if(this.fileType === 'xgd'){ + this.form.xgd = response.data.id; + this.form.xgdName = response.data.name; + }else if(this.fileType === 'glwj'){ + this.form.glwj = response.data.id; + this.form.glwjName = response.data.name; + }else if(this.fileType === 'ca'){ + this.form.ca = response.data.id; + this.form.caName = response.data.name; + } + this.$message({ + showClose: true, + message: response.message, + type: 'success' + }) + } + }, + fileUpload (type) { + this.fileType = ''; + this.fileMadel = true + this.fileType = type; + }, popoverHide (checkedIds, checkedData) { console.log(checkedIds); console.log(checkedData); From 7fbea78a8a8b5b3c63b6b41de6b8a52b319ec3b5 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 13 Jul 2021 17:54:39 +0800 Subject: [PATCH 4/4] commit --- src/pages/localTool/standAutoSplit/index.vue | 34 +- .../pages/creatProcess/bzjd/step1.vue | 612 ++++++++++++++++++ .../pages/creatProcess/bzjd/step2.vue | 300 +++++++++ .../pages/creatProcess/bzzqyj/step1.vue | 115 ++-- .../processCenter/pages/newProcess/index.vue | 5 + .../tabComponents/processCenter/index.vue | 15 +- src/router/index.js | 18 + 7 files changed, 1031 insertions(+), 68 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzjd/step1.vue create mode 100644 src/pages/processCenter/pages/creatProcess/bzjd/step2.vue diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 018032f77..17566a64b 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -29,8 +29,8 @@
拆分 - 上传 - 导入拆分结果 + + 删除
@@ -110,21 +110,21 @@ 查看 - - 收藏 - - - 取消收藏 - - 分享 + + + + + + + + + + + + + + + 删除 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue new file mode 100644 index 000000000..de83172fa --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -0,0 +1,612 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue new file mode 100644 index 000000000..8f931edfe --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -0,0 +1,300 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index f94edf853..b62928f2d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -29,7 +29,7 @@ 选择征求意见
- + @@ -177,34 +176,34 @@
- - - - - - - - - - - - - - - --> + + + + + + + + + + + + + + + + + + + - @click="sarStandCompareHisInfo">查询 - 清空 - - + + + + + + +
@@ -220,10 +219,17 @@ @selection-change="handleSelection" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"> - - - - + + + + + +
@@ -326,12 +332,12 @@ export default { }, // 标准征求意见数据可库 standCommonlySearch: { - categorg: '', - cname: '', - start: '', - end: '', + // categorg: '', + // cname: '', + // start: '', + // end: '', page: 1, - size: this.$store.getters.userInfo.configContent + pageSize: this.$store.getters.userInfo.configContent }, spinShow: false, standInfoList: [], @@ -394,7 +400,7 @@ export default { }, methods: { addZqyjList() { - this.title = '标准征求意见库' + this.title = '国内外标准库' this.listModel = true }, /** 标准征求意见库方法* @@ -416,15 +422,23 @@ export default { // 查询表格 sarStandCompareHis () { this.spinShow = true - var form = this.standCommonlySearch - this.$http.get('slrs/sar-public-idea/SelectAllPage', form, { - _this: this - }, res => { - this.standInfoList = res.data.records - this.total = res.data.total + var formData = this.standCommonlySearch + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { + _this: this + }, res => { + this.standInfoList = res.data.list + this.total = res.data.count this.spinShow = false - }, e => { }) + // var form = this.standCommonlySearch + // this.$http.get('slrs/sar-public-idea/SelectAllPage', form, { + // _this: this + // }, res => { + // this.standInfoList = res.data.records + // this.total = res.data.total + // this.spinShow = false + // }, e => { + // }) }, pageChange (page) { this.standCommonlySearch.page = page @@ -457,9 +471,12 @@ export default { for (let i = 0; i < this.selectedList.length; i++) { bringData.push(deposit.get(this.selectedList[i])); } - this.form.cid = bringData[0].cid - this.form.cname = bringData[0].cname; - this.form.endTime = bringData[0].endTime; + if (bringData[0].standYear) { + this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + } else { + this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + } + this.form.cname = bringData[0].standName; this.listModel = false; } else if (this.selectedList.length > 1) { this.$message.warning("只能选择一条数据进行带入"); diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index b8dc2838e..e67bc49f0 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -12,6 +12,7 @@
标准清单发布/更新流程
项目合规评估流程
未符合项整改流程
+
标准解读流程
@@ -98,6 +99,10 @@ export default { }) break case '9': + // 标准解读流程 + this.$router.push({ + name:'bzjdStep1' + }) break case '10': break diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index f4560e1ba..0227134b8 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -344,7 +344,6 @@ export default { }) } break; - break case '3': if (row.taskInfo === '责任对接人选择责任人') { this.$router.push({ @@ -489,7 +488,19 @@ export default { }) } break - + case '9': + if (row.taskInfo === '') { + this.$router.push({ + name: 'bzjdStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/router/index.js b/src/router/index.js index a61dcc0e4..5ffdff44e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -591,6 +591,24 @@ const routes = [ title: '标准调研流程' } }, + { + path: '/bzjdStep1', + name: 'bzjdStep1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step1.vue'), + meta: { + requireAuth: true, + title: '标准解读流程' + } + }, + { + path: '/bzjdStep2', + name: 'bzjdStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step2.vue'), + meta: { + requireAuth: true, + title: '标准解读流程' + } + }, ] }, // 本地工具