diff --git a/src/pages/home2/components/solicitopinions/index.vue b/src/pages/home2/components/solicitopinions/index.vue index 1b36284bd..c01a2fe4e 100644 --- a/src/pages/home2/components/solicitopinions/index.vue +++ b/src/pages/home2/components/solicitopinions/index.vue @@ -25,6 +25,7 @@ @@ -343,11 +348,12 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, inboundLiaisonDetail } from "@/api/process.js"; +import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, inboundLiaisonDetail,taskDel } from "@/api/process.js"; export default { name: "wbsmStep1", data() { return { + bpnId: '', commentText: '', // 意见 active: '1', // 默认显示 isSubmit: false, @@ -357,9 +363,11 @@ export default { deleteDataList: [], drawerTitle: "", //drawer标题 modalshowflag: false, // 选择人员drawer开关 + modalshowflag2: false, standModel: false, //添加标准抽屉 zrIndex: "", nodeList: [], //存放人员信息数组 + nodeList2: [], standOptions: [], //标准类别 standardData:[], pageNo: 1, @@ -519,18 +527,27 @@ export default { this.$set(this.textStatusMap, item.value, item.label); }); }, - // 点击查看 - handlePreview (item) { + // // 点击查看 + // handlePreview (item) { + // let routeUrl = this.$router.resolve({ + // name: 'OtherStandardDetails', + // params: { + // id: item.standId, + // pageType: item.standType + '_STAND' + // } + // }) + // window.open(routeUrl.href, '_blank') + // }, + handlePreview(item) { let routeUrl = this.$router.resolve({ - name: 'OtherStandardDetails', + name: "OtherStandardDetails", params: { - id: item.standId, - pageType: item.standType + '_STAND' + id: item.id, + pageType: "INLAND_STAND" } - }) - window.open(routeUrl.href, '_blank') + }); + window.open(routeUrl.href, "_blank"); }, - handleTabs(name) { this.active = name }, @@ -539,11 +556,14 @@ export default { this.standList = data; }, choiceZRRS(row, index) { - this.drawerTitle = "选择责任人"; - this.nodeList = []; + this.nodeList2 = []; this.zrIndex = index; - this.nodeList.push(row); - this.modalshowflag = true; + if(row.workPeopleId){ + this.nodeList2 = row.workPeopleId.split(","); + }else{ + this.nodeList2.push(row); + } + this.modalshowflag2 = true; }, typeChange(type) { this.standardSearch.standType = type; @@ -603,7 +623,7 @@ export default { }, //查询项目下的标准 getStandData() { - this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", { + this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", { standType: this.standardSearch.standType, standNumber: this.standardSearch.standNumber, page: this.pageNo, @@ -613,13 +633,8 @@ export default { }, res => { this.standardData = res.data.list; this.standardData.forEach(item => { - if (item.attrInfoMap === null) { - this.$set(item, "ZCCSSRQ", ''); - this.$set(item, "XCXSSRQ", ''); - } else { - this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); - this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); - } + this.$set(item, "ZCCSSRQ", item.zccssrq); + this.$set(item, "XCXSSRQ", item.xcxssrq); }) this.totalNo = res.data.count; }, e => { @@ -678,6 +693,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false @@ -748,14 +771,25 @@ export default { }else if(this.type === 'president'){ this.roleForm.president = data[0].id; this.roleForm.presidentName = data[0].name; - }else{ - const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex])); - newRow.workPeopleId = data[0].id; - newRow.workPeople = data[0].name + '(' + data[0].institutionName + ')'; - this.$set(this.dataList, this.zrIndex, newRow); } this.modalshowflag = false; }, + checkedRole2(data){ + let idList = ""; + let nameList = ""; + data.forEach(item => { + if (nameList.length) { + nameList += ","; + idList += ","; + } + idList += item.id; + nameList += item.name + '(' + item.institutionName + ')'; + }); + const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex])); + newRow.workPeopleId = idList + newRow.workPeople = nameList + this.$set(this.dataList, this.zrIndex, newRow); + }, } } diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue index 10b839be8..33508b21e 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue @@ -60,7 +60,7 @@ - +
{ - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + let son = { + signFlag: '2', + commentText: this.commentText, + dataList: this.dataList, + roleForm: this.roleForm } - }, e => { - }); + var json = JSON.stringify(son) + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); + } }, //转办按钮 handleTransfer(){ diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue index 74b15c08e..5da498bb2 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue @@ -60,7 +60,7 @@
- +
{ - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + let son = { + signFlag: '2', + commentText: this.commentText, + dataList: this.dataList, + roleForm: this.roleForm } - }, e => { - }); + var json = JSON.stringify(son) + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); + } }, //转办按钮 handleTransfer(){ diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue index ec5ac6e64..7a3433f1b 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue @@ -60,7 +60,7 @@
- +
{ - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + let son = { + signFlag: '2', + commentText: this.commentText, + dataList: this.dataList, + roleForm: this.roleForm } - }, e => { - }); + var json = JSON.stringify(son) + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); + } }, //转办按钮 handleTransfer(){ diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue index 5a6de76a0..fde49c6a6 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue @@ -388,26 +388,30 @@ export default { }, //驳回按钮 beforeBack(){ - let son = { - yzFlag: '2', - commentText: this.commentText, - dataList: this.dataList, - roleForm: this.roleForm - } - var json = JSON.stringify(son) - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + let son = { + yzFlag: '2', + commentText: this.commentText, + dataList: this.dataList, + roleForm: this.roleForm } - }, e => { - }); + var json = JSON.stringify(son) + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); + } }, //转办按钮 handleTransfer(){ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index eb446c480..99c1f4b43 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -507,7 +507,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { saveTaskFirst, queryTaskFirst } from "api/process"; +import { saveTaskFirst, queryTaskFirst, taskDel } from "api/process"; export default { name: "xmpgStep1-1", @@ -518,6 +518,7 @@ export default { }, data() { return { + bpnId: '', //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, //用来判断提交事件条件是否满足 @@ -886,6 +887,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false; @@ -1062,6 +1071,7 @@ export default { // } }, mounted() { + this.bpnId = this.$route.query.bpnId //从数据库中查询下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 9c784772c..6d1a5e859 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -565,6 +565,9 @@ export default { }, //驳回事件 beforeBack () { + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ this.listForm.applyUpdUserId = this.dataList[0].distributePersonId this.listForm.commentText = this.commentText; this.listForm.dataList = this.dataList @@ -583,6 +586,7 @@ export default { } }, e => { }); + } }, //提交事件 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index 2fea7067f..752ac32a1 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -561,7 +561,8 @@ export default { }) }, //驳回事件 - beforeBack () { if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + beforeBack () { + if(!this.commentText){ this.$message.warning('请填写审批意见') } else { this.listForm.fenFlag = '2' diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 8c069a740..8e1ec4a7b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -560,7 +560,7 @@ export default { //驳回事件 beforeBack () { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + if(!this.commentText){ this.$message.warning('请填写审批意见') } else { this.listForm.fenFlag = '2' diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index 5ed40df6e..ab5bfa4d4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -336,7 +336,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { saveTaskFirst, queryTaskFirst } from "api/process"; +import { saveTaskFirst, queryTaskFirst,taskDel } from "api/process"; export default { name: "xmpg2Step1-1", @@ -625,6 +625,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false; @@ -663,6 +671,7 @@ export default { } }, mounted() { + this.bpnId = this.$route.query.bpnId //查找分解单来源数据 this.$http.get('lawss/sarStandAttrDetails/getListData',{},{ _this: this diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index 9101f2de9..9c2083c7c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -444,10 +444,9 @@ export default { }, //提交事件 handleSubmit() { + this.peopleFlag = true; this.listForm.dataList.forEach(item => { - if (item.liablePeople !== undefined) { - this.peopleFlag = true; - } else { + if (!item.liablePeople) { this.peopleFlag = false; } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index bbf9fc527..0cf0dad19 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -380,7 +380,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { queryTaskFirst, saveTaskFirst} from "api/process"; +import { queryTaskFirst, saveTaskFirst,taskDel} from "api/process"; export default { name: "xmqdqrStep1-1", @@ -391,6 +391,7 @@ export default { }, data() { return { + bpnId: '', active: "1", //默认显示 commentText: "", modalshowflag: false, @@ -667,6 +668,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false; @@ -706,6 +715,7 @@ export default { } }, mounted() { + this.bpnId = this.$route.query.bpnId this.getData(); // 查询各下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", "", { diff --git a/src/pages/processCenter/pages/phone/wbsm/step4.vue b/src/pages/processCenter/pages/phone/wbsm/step4.vue new file mode 100644 index 000000000..e966bff51 --- /dev/null +++ b/src/pages/processCenter/pages/phone/wbsm/step4.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/wbsm/step5.vue b/src/pages/processCenter/pages/phone/wbsm/step5.vue new file mode 100644 index 000000000..60a5fa44d --- /dev/null +++ b/src/pages/processCenter/pages/phone/wbsm/step5.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 8914299d4..249a08612 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -264,7 +264,10 @@ export default { }else if(prcType === '10'){ //项目清单确认 this.toProcessDetail('xmqdqrStep1-3',row) - } else if(prcType === '20') { + } else if(prcType === '16'){ + //外部署名 + this.toProcessDetail('wbsmStep1-5',row) + }else if(prcType === '20') { // 入会流程 this.toProcessDetail('bzrhStep6-1',row) } else if(prcType === '21') { diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 00fe29240..2bdb5bb4c 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -669,7 +669,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo.indexOf('技术委员会相关专委会主任') == 0 ) { + } else if (row.taskInfo === '技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定' ) { this.$router.push({ name: 'bzzqyjStep8', query: { @@ -680,7 +680,7 @@ export default { prcType: row.prcType } }) - } else { + } else if (row.taskInfo === '工程研究总院院长批准') { this.$router.push({ name: 'bzzqyjStep9', query: { diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 884424ec9..76eb6ce52 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -90,6 +90,9 @@ align="center" label="修改前" > + @@ -155,10 +158,16 @@
- + + + - +
@@ -177,6 +186,15 @@
数据加载中…… + +
+
+ 关闭 +
+
@@ -185,6 +203,9 @@ export default { name: 'consultationDetails', data() { return { + itermsConditionsFlag: false, + itermsConditionsTitle: '', + options: [], fileInfoList: [], itemData: this.$route.query.item, id: '', // 选中id @@ -228,6 +249,20 @@ export default { } }, methods: { + itermsConditionsClose () { + this.itermsConditionsFlag = false + }, + itermsConditionsOpen (row) { + this.itermsConditionsFlag = true + this.itermsConditionsTitle = row + }, + optionsChange (data) { + for (let a = 0; a < this.options.length; a++) { + if (data === this.options[a].itemsNum) { + this.opinionContent.oldText = this.options[a].termsConditions + } + } + }, downloadFile (attId) { window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId }, @@ -396,6 +431,18 @@ export default { } }, mounted() { + let json = JSON.parse(this.$route.query.item.files)[0] + this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', { + standId: json.standId, + fileType: json.standFileClassify, + pageSize: 9999, + page: 1 + }, {}, res => { + if (res.ok) { + this.options = res.data.list + } + }, e => { + }) this.getList() this.getIdeaKey() this.getFileInfo() @@ -535,7 +582,8 @@ export default { .add-demo { .search-area { - height: 100%; + height: calc(~'100% - 55px'); + overflow: auto; } ::v-deep .el-textarea__inner { diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue index 3d2e79b8e..69b40fafe 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue @@ -1047,7 +1047,7 @@ if (this.pType === '选择联络人') { this.addForm.wgNetInfos[this.pIndex].name = data[0].name this.addForm.wgNetInfos[this.pIndex].netId = data[0].id - this.addForm.wgNetInfos[this.pIndex].unit = data[0].positionName + this.addForm.wgNetInfos[this.pIndex].unit = data[0].unit this.addForm.wgNetInfos[this.pIndex].phone = data[0].phone this.addForm.wgNetInfos[this.pIndex].email = data[0].email } else if (this.pType === '选择我司人员') { @@ -1057,7 +1057,7 @@ this.addForm.wgDepts[this.pIndex].email = data[0].email this.addForm.wgDepts[this.pIndex].deptId = data[0].institutionId this.addForm.wgDepts[this.pIndex].deptName = data[0].institutionName - this.addForm.wgDepts[this.pIndex].unit = data[0].positionId + this.addForm.wgDepts[this.pIndex].unit = data[0].unit this.addForm.wgDepts[this.pIndex].unitName = data[0].positionName } }, diff --git a/src/router/index.js b/src/router/index.js index 535f26f7c..81a29c1ec 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1511,6 +1511,15 @@ const routes = [ title: '外部署名推荐审批流程' } }, + { + path: '/wbsmStep1-5', + name: 'wbsmStep1-5', + component: () => import('@/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue'), + meta: { + requireAuth: true, + title: '外部署名推荐审批流程' + } + }, { path: '/cywbbzzxdStep1', name: 'cywbbzzxdStep1', @@ -2122,6 +2131,36 @@ const routes = [ title: '加入标准化协会信息提报流程' } }, + { + path: '/phoneWbsmStep3', + name: 'phoneWbsmStep3', + component: () => import('@/pages/processCenter/pages/phone/wbsm/step3.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '外部署名推荐审批流程' + } + }, + { + path: '/phoneWbsmStep4', + name: 'phoneWbsmStep4', + component: () => import('@/pages/processCenter/pages/phone/wbsm/step4.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '外部署名推荐审批流程' + } + }, + { + path: '/phoneWbsmStep5', + name: 'phoneWbsmStep5', + component: () => import('@/pages/processCenter/pages/phone/wbsm/step5.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '外部署名推荐审批流程' + } + }, { path: '/phoneWfhxStep5', name: 'phoneWfhxStep5',