From 7fbea78a8a8b5b3c63b6b41de6b8a52b319ec3b5 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 13 Jul 2021 17:54:39 +0800 Subject: [PATCH 1/8] 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: '标准解读流程' + } + }, ] }, // 本地工具 From c70d436e0f570487216f15ab759a40bf896be8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 14 Jul 2021 13:48:06 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1.vue | 126 ++-- .../pages/creatProcess/xmpg/step2.vue | 11 +- .../pages/creatProcess/xmpg/step3.vue | 24 +- .../pages/creatProcess/xmpg/step4.vue | 180 +++++- .../pages/creatProcess/xmpg/step5.vue | 554 +++++++++++++++++- .../tabComponents/processCenter/index.vue | 22 + 6 files changed, 823 insertions(+), 94 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index d0a06cde7..2fcc2a5ed 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -17,6 +17,7 @@ @@ -39,18 +40,17 @@ clearable > - + - - + - +

标准法规部领导

- - + +
@@ -354,26 +354,35 @@ export default { startUser: this.$store.getters.userInfo.id, qualityEngineer: "", certifiedEngineer:"", + qualityEngineerName: "", + certifiedEngineerName:"", distributePerson: "", + dockUser:'', + ministerUser:"", + dockUserName:'', + ministerUserName:"", }, formRules: { - listType: [ - { required: true, message: "请选择清单类型", trigger: "blur" } + standName: [ + { required: true, message: "请填写标准名称", trigger: "change" } + ], + standNumber: [ + { required: true, message: "请填写标准编号", trigger: "change" } + ], + qualityEngineer: [ + { required: true, message: "请选择质量工程师", trigger: "change" } + ], + certifiedEngineer: [ + { required: true, message: "请选择认证工程师", trigger: "change" } ], - listName: [ - { required: true, message: "请填写清单名称", trigger: "change" } - ] }, roleFormRules: { - // dockUserName: [ - // { required: true, message: "请选择会签责任人", trigger: "blur" } - // ], + dockUserName: [ + { required: true, message: "请选择业务经理", trigger: "change" } + ], ministerUserName: [ - { required: true, message: "请选择修订责任人", trigger: "blur" } + { required: true, message: "请选择标准法规部领导", trigger: "change" } ], - directorUserName: [ - { required: true, message: "请选择审批责任人", trigger: "blur" } - ] }, ListModel: false, //选择拆分标准抽屉状态 treeData: [], // 人员数据 @@ -440,16 +449,16 @@ export default { } else if (this.type === "ministerUser") { this.roleForm.ministerUser = this.roleRow.id; this.roleForm.ministerUserName = this.roleRow.name; - } else if (this.type === "directorUser") { - this.roleForm.directorUser = this.roleRow.id; - this.roleForm.directorUserName = this.roleRow.name; - } else if (this.type === "presidentUser") { - this.roleForm.presidentUser = this.roleRow.id; - this.roleForm.presidentUserName = this.roleRow.name; } else if (this.type === "qualityEngineer") { - this.listForm.qualityEngineer = this.roleRow.name; + this.roleForm.qualityEngineer = this.roleRow.id; + this.roleForm.qualityEngineerName = this.roleRow.name; + this.listForm.qualityEngineer = this.roleForm.qualityEngineer; + this.listForm.qualityEngineerName = this.roleForm.qualityEngineerName; } else if (this.type === "certifiedEngineer") { - this.listForm.certifiedEngineer = this.roleRow.name; + this.roleForm.certifiedEngineer = this.roleRow.id; + this.roleForm.certifiedEngineerName = this.roleRow.name; + this.listForm.certifiedEngineer = this.roleForm.certifiedEngineer; + this.listForm.certifiedEngineerName = this.roleForm.certifiedEngineerName; } else if (this.type === "distributePerson") { this.listForm.distributePerson = this.roleRow.name; this.listForm.dataList[this.dsadadadsada].distributePersonId=this.roleRow.id @@ -527,32 +536,41 @@ export default { }, //提交事件 handleSubmit() { - let json = this.listForm; - json.zrUserId = this.$store.getters.userInfo.userId; - json.jlUserId = this.$store.getters.userInfo.userId; - json.applyUpdUserId = this.$store.getters.userInfo.userId; - json.approvalOpinion = ""; - json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.account; + console.log(this.roleForm) + console.log(this.listForm); + // var json = this.listForm + var json = Object.assign(this.listForm, this.roleForm) json.prcCreateUser = this.$store.getters.userInfo.userId; json.prcCreateUserName = this.$store.getters.userInfo.account; json.standId = this.listForm.standId; - this.$http.get("lawss/activiti/startProcess", { type: "5" }, { - _this: this - }, res => { - if (res.ok) { - this.$http.post("lawss/activiti/completeTask", { - taskIds: res.data, - userId: this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); + this.$refs["xmpgForm"].validate((valid) => { + if (valid) { + this.$refs["Form"].validate((valid) => { + if (valid) { + this.$http.get("lawss/activiti/startProcess", { type: "5" }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }); + } + }); + } else { + return this.$message.warning("请完善人员信息"); } }); + } else { + return this.$message.warning("请完善基础信息"); } }); }, @@ -600,7 +618,9 @@ export default { this.standList = data; }, choiceZRR(scope,type, title, id) { - if(scope!=null)this.dsadadadsada=scope.$index; + if(scope!=null){ + this.dsadadadsada = scope.$index; + } this.nodeList = []; this.nodeList.push(id); this.type = type; @@ -632,8 +652,8 @@ export default { }, { _this: this }, res => { - console.log(res.data.records); - this.productData = res.data.records; + console.log(res.data); + this.productData = res.data; this.totalNo = res.data.total; }, e => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 5802df6c1..cc668d048 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -35,16 +35,16 @@ clearable > - + - + @@ -234,6 +234,8 @@ export default { standName: "",//标准名称 certifiedEngineer: "", //认证工程师 qualityEngineer: "", //质量工程师 + certifiedEngineerName: "", //认证工程师 + qualityEngineerName: "", //质量工程师 breakdownList: [{ applyArctic: "", busStandCover: "", @@ -302,6 +304,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { + console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg) this.getFormFieldList(processForm) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 1f5b0c1a7..fc188ebc6 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -35,16 +35,16 @@ clearable > - + - + @@ -97,6 +97,16 @@ align="center" label="条款名称"> + + + + - +
基础信息
@@ -75,90 +75,166 @@ + + + + - - + + + + - - + + + + + + @@ -285,6 +361,7 @@ export default { }, data() { return { + detailData: [], sarProStateTableHeight: null, // 项目列表高度 // 当前流程类型(1待办/2已办) @@ -307,24 +384,62 @@ export default { total: 0, pageSize: this.$store.getters.userInfo.configContent, listForm: { - listType: "", //区分是哪个清单 - listName: "", //清单名称 - applyRegion: "", //适用区域 - descriptionList: "", //清单说明 - enclosure: "", //附件 - inforlist: "",//用来存放标准的id + standNumber: "", //标准编号 + standName: "",//标准名称 + certifiedEngineer: "", //认证工程师 + qualityEngineer: "", //质量工程师 dataList: [{ - standNumber: "", //标准号 - cnName: "", //中文名称 - enName: "", //英文名称 - isSubTime: "", //发布日期 - newCarTime: "", //新车型实施日期 - oldCarTime: "", //在产车实施日期 - applyCar: "", //适用车型 - textState: "", //文本状态 - id: "" + projectManager: '', + itemsName: '', + uname: '', + projectNumber: '', + implementer: '', + implementerId: '', + productLine: '', + itemNum:'', + distributePerson:'', + projectName:'', + distributePersonId:'', + complianceReasons:'', //在研合规原因 + noCompliance:'', //在研不合规项目 + countermeasures:'', //在研应对措施 + completionTime:'', //在研完成时间 + zcComplianceReasons: '', //在产的合规原因 + zcNoCompliance:'', //在产不合规项目 + zcCountermeasures:'', //在产的应对措施 + zcCompletionTime:'', //在产的完成时间 }] }, + // listForm: { + // standNumber: "", //标准编号 + // standName: "",//标准名称 + // certifiedEngineer: "", //认证工程师 + // qualityEngineer: "", //质量工程师 + // dataList: [{ + // certifiedEngineer: '', + // projectManager: '', + // standNumber: '', + // itemsName: '', + // uname: '', + // projectNumber: '', + // implementer: '', + // implementerId: '', + // productLine: '', + // itemNum:'', + // qualityEngineer: '', + // distributePerson:'', + // projectName:'', + // standName:'', + // distributePersonId:'', + // complianceReasons:'', //在研合规原因 + // noCompliance:'', //在研不合规项目 + // countermeasures:'', //在研应对措施 + // completionTime:'', //在研完成时间 + // zcComplianceReasons: '', //在产的合规原因 + // zcCountermeasures:'', //在产的应对措施 + // zcCompletionTime:'', //在产的完成时间 + // }] + // }, choiceForm: {}, //选择标准清单列表 countryOptions: [], //适用区域下拉框数据 user1: "", @@ -358,6 +473,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { + console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg) this.getFormFieldList(processForm) @@ -375,8 +491,11 @@ export default { this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName this.listForm['id'] = item.id - this.listForm.dataList = item.dataList - this.dataList = item.dataList + this.dataList = item.step3DTOS + this.listForm.standName = item.step3DTOS[0].standName + this.listForm.standNumber = item.step3DTOS[0].standNumber + this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer + this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer }) }, @@ -394,6 +513,7 @@ export default { this.listForm.approvalOpinion = ""; this.listForm.standId = this.listForm.standId; this.listForm.signFlag = ""; + this.listForm.dataList = this.dataList const json = JSON.stringify(this.listForm); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index d657db275..e73024ac3 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -1,13 +1,563 @@ + - + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 6ba2be88c..81adb0245 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -498,6 +498,28 @@ export default { prcType: row.prcType } }) + }else if(row.taskInfo === '合规性评估'){ + this.$router.push({ + name: 'xmpgStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '分发责任人审核'){ + this.$router.push({ + name: 'xmpgStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break From 7ec73c26e91f0870aa17599488b406262cb8f203 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 14 Jul 2021 14:19:48 +0800 Subject: [PATCH 3/8] commit --- .../personal/pages/individual-plate/index.vue | 2 +- .../pages/creatProcess/bzjd/step1.vue | 3 + .../pages/creatProcess/bzjd/step2.vue | 55 ++-- .../pages/creatProcess/bzjd/step3.vue | 297 ++++++++++++++++++ .../tabComponents/processCenter/index.vue | 13 +- src/router/index.js | 9 + 6 files changed, 348 insertions(+), 31 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzjd/step3.vue diff --git a/src/pages/personal/pages/individual-plate/index.vue b/src/pages/personal/pages/individual-plate/index.vue index 5cfbe5636..ff7c46b70 100644 --- a/src/pages/personal/pages/individual-plate/index.vue +++ b/src/pages/personal/pages/individual-plate/index.vue @@ -192,7 +192,7 @@ export default { height:100% !important; } .el-transfer-panel__list.is-filterable { - height: 360px; + height: calc(~'100% - 100px'); padding-top: 0; overflow-y: auto; } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index de83172fa..fe16bf313 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -265,6 +265,7 @@ name: "bzjdStep1", data() { return { + standId: '', commentText: '', textarea: '', // 意见 title: '', // 新增抽屉标题 @@ -416,6 +417,7 @@ this.form.name = bringData[0].standName } this.form.id = bringData[0].id + this.standId = bringData[0].standId this.listModel = false; this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { infoId: this.form.id, @@ -508,6 +510,7 @@ if (res.ok) { var json = Object.assign(this.form, this.roleForm) json.commentText = this.commentText + json.standInData = this.standId json.itemList = this.itemList this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 8f931edfe..e7904ad72 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -26,7 +26,7 @@ @@ -34,26 +34,18 @@ - - - - - + - + @@ -140,15 +132,14 @@ isSubmit: false, saveLoading: false, form: { - cid: '', // 编号 - endTime: '', // 结束日期 - cname: '', // 名称 - responUserList: '', - responUserListName: '' + number: '', // 编号 + name: '', // 结束日期 + zxUserId: '', + zxUserIdName: '' }, formRules: { - responUserList: [ - { required: true, message: '请选择责任人', trigger: 'change' }, + zxUserId: [ + { required: true, message: '请选择执行人', trigger: 'change' }, ] }, json: {} @@ -171,8 +162,8 @@ idList += item.id nameList += item.name }) - this.form.responUserList = idList - this.form.responUserListName = nameList + this.form.zxUserId = idList + this.form.zxUserIdName = nameList this.modalshowflag = false }, cancleUserInfo () { @@ -180,8 +171,8 @@ }, choiceZRR () { this.nodeList = [] - if (this.form.responUserList.length > 0) { - this.nodeList = this.form.responUserList.split(',') + if (this.form.zxUserId.length > 0) { + this.nodeList = this.form.zxUserId.split(',') } this.modalshowflag = true }, @@ -199,8 +190,15 @@ if (valid) { var json = this.json json.commentText = this.commentText - json.responUserList = this.form.responUserList - json.responUserListName = this.form.responUserListName + var arr = this.form.zxUserId.split(',') + var newArr = [] + arr.forEach(item => { + var json1 = {} + json1.id = item + newArr.push(json1) + }) + json.zxUserId = newArr + json.zxUserIdName = this.form.zxUserIdName this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -223,9 +221,8 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.cid = data.cid - this.form.endTime = data.endTime - this.form.cname = data.cname + this.form.number = data.number + this.form.name = data.name this.json = data }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue new file mode 100644 index 000000000..d0da3fac1 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -0,0 +1,297 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 18d4bb768..16fe988bb 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -547,7 +547,7 @@ export default { } break case '9': - if (row.taskInfo === '') { + if (row.taskInfo === '选择执行人') { this.$router.push({ name: 'bzjdStep2', query: { @@ -558,6 +558,17 @@ export default { prcType: row.prcType } }) + } else if (row.taskInfo === '填写解读分析') { + this.$router.push({ + name: 'bzjdStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } } }, diff --git a/src/router/index.js b/src/router/index.js index 9aef11b99..4fdfc96b2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -609,6 +609,15 @@ const routes = [ title: '标准解读流程' } }, + { + path: '/bzjdStep3', + name: 'bzjdStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step3.vue'), + meta: { + requireAuth: true, + title: '标准解读流程' + } + }, ] }, // 本地工具 From 1391041a2c7c8328e6b39b5e4137d7ec88613471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 14 Jul 2021 14:31:04 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home1/components/searchGroup/index.vue | 61 ++++++++++++------- .../components/solicitopinions/index.vue | 13 ++-- .../searchCenter/pages/standardSearch.vue | 4 ++ 3 files changed, 49 insertions(+), 29 deletions(-) diff --git a/src/pages/home1/components/searchGroup/index.vue b/src/pages/home1/components/searchGroup/index.vue index ee628b2be..72691d218 100644 --- a/src/pages/home1/components/searchGroup/index.vue +++ b/src/pages/home1/components/searchGroup/index.vue @@ -2,26 +2,27 @@ @@ -33,36 +34,50 @@ export default { mixins: [], data() { return { - selectKey: '', - keywords: '', + // 当前查询状态 + checkState: 'All', + // 查询内容 + checkContent: '', jumpPage: [ { - selectKey: '选项1', - label: '国内外标准法规', + label: '全部', + value: 'All' }, { - selectKey: '选项2', - label: '研究报告', + label: '国内标准法规', + value: 'stand' + }, + { + label: '海外标准法规', // value没改 + value: 'bussstand' + }, + { + label: '国内外政策', + value: 'laws' }, { - selectKey: '选项3', label: '企业标准', - }, - { - selectKey: '选项4', - label: '动态&通知', - }, - { - selectKey: '选项5', - label: '流程中心', - }, + value: 'enterprise' + } ], } }, computed: {}, watch: {}, - mounted() {}, - methods: {}, + methods: { + search() { + this.$router.push({ + name: 'StandardSearch', + params: { + selectKey: this.checkState, + searchValue: this.checkContent || undefined + } + }) + }, + }, + mounted(){ + + }, } diff --git a/src/pages/home1/components/solicitopinions/index.vue b/src/pages/home1/components/solicitopinions/index.vue index 2da7e6647..e6279110f 100644 --- a/src/pages/home1/components/solicitopinions/index.vue +++ b/src/pages/home1/components/solicitopinions/index.vue @@ -43,12 +43,13 @@ export default { } ) }, standForComments (item) { - this.$router.push({ - name:'standardForComments', - params: { - id: item.id - } - },) + this.$store.commit('setDetailMap',this.$router.path) + this.$router.push({ + name: 'consultationDetails', + query: { + item: item + } + }) }, }, } diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 62876a7b3..04ef5ace5 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -363,6 +363,10 @@ export default { mounted() { //查询所有选项 this.queryOptions(); + let globalInputSearch = this.$route.params.searchValue + if (globalInputSearch !== 'allvalue') { + this.keywords = globalInputSearch + } }, unmounted() { From b2e04ae8ca1dc1d21cebd95b47efb85be8932ad9 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Wed, 14 Jul 2021 16:14:57 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E6=B5=81=E7=A8=8B=E7=AC=AC=E4=BA=8C=E6=AD=A5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step2.vue | 119 +++++++++--------- 1 file changed, 59 insertions(+), 60 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 687f3930a..ea9bab914 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -12,23 +12,23 @@ - + - - - + + @click="getTableByPage(nonSearch)"> 查询 @@ -105,15 +105,15 @@ @@ -187,7 +187,7 @@ export default { ListModel: false, // 新增编辑抽屉开关 taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, - nonConformitySearch: { + nonSearch: { standId: '', // 标准号/名称 productName: '', // 项目名称 responsibleUnit: '' // 责任部门 @@ -206,15 +206,6 @@ export default { myLoading: false, // 责任部门 zNodesSItem: [], - unqualidiedData: [{ - standId: '', - productName: '', - itemsNum: '', - itemsName: '', - planCloseTime: '', - responsibleUnit: '', - dutyEngineer: '' - }], clearSelection: false, nodeList: [], drawerTitle: '', //drawer标题 @@ -244,11 +235,19 @@ export default { this.getData() this.getTree() }, - methods: { + watch: { + nonSearch(val) { + this.nonSearch = val + } + }, + methods: { getData() { const params = { taskIds: this.taskIds, pId: this.pId, + standId: '', // 标准号/名称 + productName: '', // 项目名称 + responsibleUnit: '' // 责任部门 } inboundLiaisonDetail(params).then(res => { const processForm = JSON.parse(res.mesg) @@ -261,30 +260,19 @@ export default { }) }, // 批量选择分发责任人 - dutyEngineerList() { + dutyEngineerList(id) { if (this.multipleSelection.length === 0) { this.$message.warning("请选择至少一条数据进行分发责任人"); } else { - this.multipleSelection.map((i, index)=> { - i.show = true - this.$set(this.dataList, i, index) - }) + this.nodeList = [] + this.nodeList.push(id) + this.modalshowflag = true } }, // 选择勾选项的集合 handleSelectionChange(value) { this.multipleSelection = value - }, - // 选择分发责任人时 - choiceDuty(type, title, id) { - this.nodeList = [] - this.nodeList.push(id) - this.type = type - this.drawerTitle = title - this.modalshowflag = true - }, - selectPeople(row) { - this.modalshowflag = true + console.log(value) }, handleTabs(name) { this.active = name @@ -313,10 +301,7 @@ export default { } let json = { dockUserList: list, - // engineer: this.$store.getters.userInfo.userId, - // standardInfoList: list[0].standardInfoList, } - console.log(json) let flag=false this.dataList.forEach(item => { if (item.dutyPeopleInfo === '') { @@ -364,19 +349,13 @@ export default { // 流程节点负责人抽屉保存按钮 saveUserInfo () { // 选取负责人时的操作 - for (let i = 0; i < this.multipleSelection.length; i++ ) { - this.multipleSelection[i].dutyPeopleInfo = this.roleRow[0].name - this.multipleSelection[i].dutyPeopleInfoId = this.roleRow[0].id - for (let b = 0; b < this.multipleSelection.length; b++) { - this.dataList[b].dutyPeopleInfo = this.multipleSelection[i].dutyPeopleInfo - this.dataList[b].dutyPeopleInfoId = this.multipleSelection[i].dutyPeopleInfoId - this.dataList.forEach(val=> { - val.show = false - }) - } - this.lastDataList = this.dataList - this.$refs.multipleTable.clearSelection(); - } + this.multipleSelection.forEach(item => { + item.dutyPeopleInfo = this.roleRow[0].name + item.dutyPeopleInfoId = this.roleRow[0].id + }) + this.lastDataList = this.dataList + this.$refs.multipleTable.clearSelection(); + // 选取流程信息完成 this.roleForm.dutyUserInfoName = this.roleRow.name this.modalshowflag = false }, @@ -385,17 +364,37 @@ export default { this.modalshowflag = false }, //查询按钮 - getTableByPage() { - this.getData() - }, + getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询 + this.realList = this.dataList.filter(item => { + let matchId = true; // 标准号 筛选 + let matchName = true; // 项目名称 筛选 + let matchUnit = true; // 部门 筛选 + + if (standId) { + const keysId = standId + .toUpperCase() // 转大写 + .replace(' ', '') // 删掉空格 + .split('') // 切割成 单个字 + matchId = keysId.every(key => item.standId.toUpperCase().includes(key)); + } + if (productName) { + matchName = item.productName === productName; + } + if (responsibleUnit) { + matchUnit = item.responsibleUnit === responsibleUnit; + } + return matchId && matchName && matchUnit; + }) + this.dataList = this.realList + }, // 清空 查询条件 - clearAllSearch (search = true) { - this.nonConformitySearch = { + clearAllSearch () { + this.nonSearch = { standId: '', productName: '', responsibleUnit: '' } - this.getTableByPage() + this.getData() }, // 分页事件 pageChange (page) { From 8b4e61300d30c99b8ecc7f9903a96e5f93ecd4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 14 Jul 2021 17:15:50 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1.vue | 2 +- .../pages/creatProcess/xmpg/step1.vue | 16 ++++++-------- .../pages/creatProcess/xmpg/step2.vue | 4 ++-- .../pages/creatProcess/xmpg/step3.vue | 10 +++++---- .../pages/creatProcess/xmpg/step4.vue | 16 +++++++------- .../pages/creatProcess/xmpg/step5.vue | 16 ++++++++++++-- .../page/listOfCountries.vue | 20 ++++++++--------- .../page/listOther.vue | 22 +++++++++---------- .../page/listProject.vue | 3 +-- 9 files changed, 60 insertions(+), 49 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 94e7d8975..c077f5604 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -9,7 +9,7 @@
基础信息
人员信息
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 2fcc2a5ed..b89020428 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -9,7 +9,7 @@
基础信息
人员信息
-
+
@@ -17,7 +17,7 @@ @@ -109,7 +109,7 @@
@@ -536,16 +536,15 @@ export default { }, //提交事件 handleSubmit() { - console.log(this.roleForm) - console.log(this.listForm); - // var json = this.listForm var json = Object.assign(this.listForm, this.roleForm) json.prcCreateUser = this.$store.getters.userInfo.userId; json.prcCreateUserName = this.$store.getters.userInfo.account; json.standId = this.listForm.standId; - this.$refs["xmpgForm"].validate((valid) => { + json.XCXSSRQ = this.sarAccessListDatas[0].attrInfoMap.XCXSSRQ + json.ZCCSSRQ = this.sarAccessListDatas[0].attrInfoMap.ZCCSSRQ + this.$refs['listForm'].validate((valid) => { if (valid) { - this.$refs["Form"].validate((valid) => { + this.$refs['roleForm'].validate((valid) => { if (valid) { this.$http.get("lawss/activiti/startProcess", { type: "5" }, { _this: this @@ -652,7 +651,6 @@ export default { }, { _this: this }, res => { - console.log(res.data); this.productData = res.data; this.totalNo = res.data.total; }, e => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index cc668d048..d9e41a3e0 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -9,7 +9,7 @@
基础信息
审批历史
-
+
@@ -110,7 +110,7 @@
-
+
基础信息
审批历史
-
+
@@ -98,12 +98,12 @@ label="条款名称"> @@ -155,7 +155,7 @@
-
+
基础信息
审批历史
-
+
@@ -103,13 +103,13 @@ label="条款名称"> @@ -264,7 +264,7 @@
-
+
基础信息
审批历史
-
+
@@ -102,6 +102,18 @@ align="center" label="条款名称"> + + + +
-
+
{ const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(',')}` this.$http.postDelete(URL, {}, res => { @@ -317,7 +316,8 @@ export default { }, e => { }); }).catch(() => { - }); + + }) } }, // 表格选择框 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue index 9ab5e43c8..2bcab6947 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue @@ -300,31 +300,31 @@ export default { name: "OtherAddEit" }); }, - // 删除 + //批量删除 deleteSarAccess(flag, id) { - if (flag === "delOne") { + if (flag === 'delOne') { this.selectedList = []; this.selectedList[0] = id; } if (this.selectedList.length === 0) { - this.$message.warning("请选择要删除的数据"); + this.$message.warning('请选择要删除的数据') } else { - this.$confirm("确认删除这些数据？", "提示", { - confirmButtonText: "确认", - confirmButtonClass: "common-button-primary", - cancelButtonText: "取消", - type: "warning" + this.$confirm('确定删除这些数据？', '提示', { + confirmButtonText: '确定', + confirmButtonClass: 'common-button-primary', + cancelButtonText: '取消', + type: 'warning', }).then(() => { - const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(",")}`; + const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(',')}` this.$http.postDelete(URL, {}, res => { this.searchSarAccess(); this.selectedList = []; - this.$message.success("删除成功"); + this.$message.success('删除成功') }, e => { }); }).catch(() => { - }); + }) } }, // 表格选择框 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue index bc2abd6a1..34ac7c354 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue @@ -309,7 +309,7 @@ export default { this.selectedList = []; this.selectedList[0] = id; } - if (this.selectedList === 0) { + if (this.selectedList.length === 0) { this.$message.warning('请选择要删除的数据') } else { this.$confirm('确定删除这些数据？', '提示', { @@ -329,7 +329,6 @@ export default { }) } - }, // 表格选择框 selectOne(data) { From 61f7f1342b4a607a668b2e3d4b79c8c25b88e44c Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 14 Jul 2021 18:00:35 +0800 Subject: [PATCH 7/8] commit --- .../config/pages/mechanismManage/index.vue | 5 +- .../pages/creatProcess/bzdy/step1.vue | 63 +++++++++++++++++-- .../pages/creatProcess/bzdy/step2.vue | 2 + .../pages/creatProcess/bzdy/step3.vue | 2 + .../pages/creatProcess/bzdy/step4.vue | 4 ++ .../pages/creatProcess/bzdy/step5.vue | 2 + .../pages/creatProcess/bzdy/step6.vue | 4 ++ .../pages/creatProcess/bzdy/step7.vue | 4 ++ .../pages/creatProcess/bzdy/step8.vue | 4 ++ .../pages/creatProcess/bzdy/step9.vue | 4 ++ .../pages/creatProcess/bzzqyj/step1.vue | 2 + .../pages/creatProcess/bzzqyj/step2.vue | 2 + .../pages/creatProcess/bzzqyj/step3.vue | 2 + .../pages/creatProcess/bzzqyj/step4.vue | 2 + .../pages/creatProcess/bzzqyj/step5.vue | 2 + .../pages/creatProcess/bzzqyj/step6.vue | 4 ++ .../pages/creatProcess/bzzqyj/step7.vue | 4 ++ .../pages/creatProcess/bzzqyj/step8.vue | 4 ++ .../pages/creatProcess/bzzqyj/step9.vue | 4 ++ 19 files changed, 115 insertions(+), 5 deletions(-) diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index b6d7808e3..a5be0b950 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -70,9 +70,12 @@ label="所属岗位"> + 流程发起人
- +
@@ -101,8 +101,8 @@

责任部门对接人

- - + +
@@ -154,6 +154,31 @@ @submit="handleSubmit" > + + + + + 0) { + this.nodeList2 = this.roleForm.dockUserList.split(',') + } + this.modalshowflag2 = true + }, + saveUserInfo2 () { + var idList = '' + var nameList = '' + this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + }) + this.roleForm.dockUserList = idList + this.roleForm.dockUserName = nameList + this.modalshowflag2 = false + }, + cancleUserInfo2 () { + this.modalshowflag2 = false + }, // 导入按钮 上传之前的钩子 beginImportFile (file) { var filename = file.name @@ -372,6 +425,7 @@ export default { if (valid) { this.$refs['Form'].validate((valid) => { if (valid) { + this.isSubmit = true this.$http.get('lawss/activiti/startProcess', { type: '2' }, {}, res => { @@ -391,6 +445,7 @@ export default { } else { this.$message.warning('流程启动失败') } + this.isSubmit = false }) } else { return this.$message.warning('请完善人员信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index fa3455caa..13e9b5058 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -200,6 +200,7 @@ handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { + this.isSubmit = true var json = this.json json.commentText = this.commentText json.responUserList = this.form.responUserList @@ -213,6 +214,7 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { return this.$message.warning('请完善基础信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index d438ee1c6..14af91974 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -209,6 +209,7 @@ handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { + this.isSubmit = true var json = this.json json.commentText = this.commentText json.fileId = this.form.fileId @@ -222,6 +223,7 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { return this.$message.warning('请完善基础信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 89b5009a2..11c25dc64 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -141,6 +141,7 @@ }, handleSave() {}, handleSubmit() { // 同意 + this.isSubmit = true var json = this.json json.actionFlag = 0 json.commentText = this.commentText @@ -153,10 +154,12 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) }, handleSubmitNo() { if (this.commentText) { + this.isSubmit = true var json = this.json json.actionFlag = 1 json.commentText = this.commentText @@ -169,6 +172,7 @@ this.$message.success('驳回成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index baaf52bdd..00b5d764b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -233,6 +233,7 @@ handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { + this.isSubmit = true var json = this.json json.commentText = this.commentText json.hzfileId = this.form.hzfileId @@ -246,6 +247,7 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index e9b958273..13cb22e11 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -229,6 +229,7 @@ }, handleSave() {}, handleSubmit() { + this.isSubmit = true var json = this.json json.actionFlag = 0 json.commentText = this.commentText @@ -241,10 +242,12 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) }, handleSubmitNo() { if (this.commentText) { + this.isSubmit = true var json = this.json json.actionFlag = 1 json.commentText = this.commentText @@ -257,6 +260,7 @@ this.$message.success('驳回成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index e009bbe74..e8cf6fc3e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -229,6 +229,7 @@ }, handleSave() {}, handleSubmit() { + this.isSubmit = true var json = this.json json.actionFlag = 0 json.commentText = this.commentText @@ -241,10 +242,12 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) }, handleSubmitNo() { if (this.commentText) { + this.isSubmit = true var json = this.json json.commentText = this.commentText json.actionFlag = 1 @@ -257,6 +260,7 @@ this.$message.success('驳回成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index 344fd3282..d58302118 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -229,6 +229,7 @@ }, handleSave() {}, handleSubmit() { + this.isSubmit = true var json = this.json json.actionFlag = 0 json.commentText = this.commentText @@ -241,10 +242,12 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) }, handleSubmitNo() { if (this.commentText) { + this.isSubmit = true var json = this.json json.commentText = this.commentText json.actionFlag = 1 @@ -257,6 +260,7 @@ this.$message.success('驳回成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 9af0cf7ab..4d56b7895 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -229,6 +229,7 @@ }, handleSave() {}, handleSubmit() { + this.isSubmit = true var json = this.json json.actionFlag = 0 json.commentText = this.commentText @@ -241,10 +242,12 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) }, handleSubmitNo() { if (this.commentText) { + this.isSubmit = true var json = this.json json.commentText = this.commentText json.actionFlag = 1 @@ -257,6 +260,7 @@ this.$message.success('驳回成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index b62928f2d..de3c10b13 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -557,6 +557,7 @@ export default { if (valid) { this.$refs['Form'].validate((valid) => { if (valid) { + this.isSubmit = true this.$http.get('lawss/activiti/startProcess', { type: '3' }, {}, res => { @@ -576,6 +577,7 @@ export default { } else { this.$message.warning('流程启动失败') } + this.isSubmit = false }) } else { return this.$message.warning('请完善人员信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index b3580f59a..6c33b73fb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -197,6 +197,7 @@ handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { + this.isSubmit = true var json = this.json json.commentText = this.commentText json.responUserList = this.form.responUserList @@ -210,6 +211,7 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { return this.$message.warning('请完善基础信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index e44dbca0f..137f08c2b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -257,6 +257,7 @@ } else if (c > 0) { this.$message.warning('请输入意见内容') } else { + this.isSubmit = true var json = this.json json.commentText = this.commentText json.info = this.data @@ -270,6 +271,7 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 78655e47e..270c67bb6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -175,6 +175,7 @@ }, handleSave() {}, handleSubmit() { + this.isSubmit = true var json = this.json json.actionFlag = 0 json.commentText = this.commentText @@ -187,6 +188,7 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) }, handleSubmitNo () { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index a2bb22b44..242bb8b39 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -241,6 +241,7 @@ } else if (c > 0) { this.$message.warning('请输入意见内容') } else { + this.isSubmit = true var json = this.json json.oldinfo = this.oldData json.commentText = this.commentText @@ -253,6 +254,7 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 0fe14f99c..a04ced37a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -238,6 +238,7 @@ } else if (c > 0) { this.$message.warning('请输入意见内容') } else { + this.isSubmit = true var json = this.json json.actionFlag = 0 json.commentText = this.commentText @@ -250,12 +251,14 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } } }, handleSubmitNo() { if (this.commentText) { + this.isSubmit = true var json = this.json json.actionFlag = 1 json.commentText = this.commentText @@ -268,6 +271,7 @@ this.$message.success('驳回成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index c6c16671a..5b85f6e87 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -241,6 +241,7 @@ } else if (c > 0) { this.$message.warning('请输入意见内容') } else { + this.isSubmit = true var json = this.json json.actionFlag = 0 json.commentText = this.commentText @@ -253,12 +254,14 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } } }, handleSubmitNo() { if (this.commentText) { + this.isSubmit = true var json = this.json json.actionFlag = 1 json.commentText = this.commentText @@ -271,6 +274,7 @@ this.$message.success('驳回成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 5a0415f34..755e59d0b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -241,6 +241,7 @@ } else if (c > 0) { this.$message.warning('请输入意见内容') } else { + this.isSubmit = true var json = this.json json.actionFlag = 0 json.commentText = this.commentText @@ -253,12 +254,14 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } } }, handleSubmitNo() { if (this.commentText) { + this.isSubmit = true var json = this.json json.actionFlag = 1 json.commentText = this.commentText @@ -271,6 +274,7 @@ this.$message.success('驳回成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 02a8a2e72..c1af9cd25 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -241,6 +241,7 @@ } else if (c > 0) { this.$message.warning('请输入意见内容') } else { + this.isSubmit = true var json = this.json json.actionFlag = 0 json.commentText = this.commentText @@ -253,12 +254,14 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } } }, handleSubmitNo() { if (this.commentText) { + this.isSubmit = true var json = this.json json.actionFlag = 1 json.commentText = this.commentText @@ -271,6 +274,7 @@ this.$message.success('驳回成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') From 9be9f1664d899b714c87cfd93dbbc2c1bf57d5fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 14 Jul 2021 21:02:11 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step4.vue | 8 +- .../pages/creatProcess/xmpg/step5.vue | 18 +- .../pages/creatProcess/xmpg/step6.vue | 572 +++++++++++++++++- .../pages/creatProcess/xmpg/step7.vue | 572 +++++++++++++++++- .../tabComponents/processCenter/index.vue | 22 + 5 files changed, 1177 insertions(+), 15 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 1ce002bf2..ac5dba73c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -492,10 +492,10 @@ export default { this.listForm.prcName = this.prcName this.listForm['id'] = item.id this.dataList = item.step3DTOS - // this.listForm.standName = item.step3DTOS[0].standName - // this.listForm.standNumber = item.step3DTOS[0].standNumber - // this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer - // this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer + this.listForm.standName = item.step3DTOS[0].standName + this.listForm.standNumber = item.step3DTOS[0].standNumber + this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer + this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer }) }, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 26afeda56..d9b691b9c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -3,7 +3,7 @@
- +
基础信息
@@ -103,13 +103,13 @@ label="条款名称"> @@ -146,6 +146,9 @@ align="center" width="160" label="完成时间"> + @@ -179,6 +182,9 @@ align="center" width="160" label="完成时间"> + @@ -440,15 +446,13 @@ export default { }, //提交事件 handleSubmit() { - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; - this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; - this.listForm.zrUserId = this.$store.getters.userInfo.userId ; + this.listForm.applyUpdUserId = this.dataList[0].distributePersonId this.listForm.commentText = this.commentText; this.listForm.standId = this.listForm.standId; this.listForm.fenFlag = "1"; this.listForm.dataList = this.dataList const json = JSON.stringify(this.listForm); + console.log(json); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index 5055d7ae2..8d126d1f9 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -1,13 +1,581 @@ + - + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 54c131391..58902008e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -1,13 +1,581 @@ + - + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 0ac07ba53..5d55a3700 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -518,6 +518,28 @@ export default { prcType: row.prcType } }) + // }else if(row.taskInfo === '标准法规部领导审核'){ + // this.$router.push({ + // name: 'xmpgStep6', + // query: { + // taskIds: row.taskIds, + // prcId: row.prcId, + // prcNum: row.prcNum, + // prcName: row.prcName, + // prcType: row.prcType + // } + // }) + }else if(row.taskInfo === '标准法规部领导审核'){ + this.$router.push({ + name: 'xmpgStep7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break //未符合项整改流程