diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index dd9c0b8d1..da8f196f2 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3713,7 +3713,7 @@ export default { & > p { min-height: 42px; line-height: 43px; - border-bottom: 1px solid #E5E5E5; + /*border-bottom: 1px solid #E5E5E5;*/ } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index 63c49a6c2..af7588ed4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -106,6 +106,7 @@ { this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData + this.rh_pageData.fillDept = this.$store.getters.userInfo.institutionName + this.rh_pageData.fillUnit = this.$store.getters.userInfo.upDeptName + this.rh_pageData.fillTel = this.$store.getters.userInfo.phone this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName if (this.rh_pageData.fillFile !== undefined) { this.fillFileList = this.rh_pageData.fillFile diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue index 45db1b442..c369e42d1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue @@ -105,6 +105,7 @@ { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData this.uploadFileLength = this.ch_pageData.fileTextList.length + this.rh_pageData.fillDept = this.$store.getters.userInfo.institutionName + this.rh_pageData.fillUnit = this.$store.getters.userInfo.upDeptName + this.rh_pageData.fillTel = this.$store.getters.userInfo.phone this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue index 736bfb5b7..02dd19eee 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue @@ -110,7 +110,7 @@

{{ item.name }} + :key="item.id"> {{ item.oldFileName }} { this.qbfsForm = JSON.parse(JSON.stringify(item)); + this.fileList = item.fileList let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : ""; res = res.split(","); this.dataList = []; diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index 952d7543c..21a407305 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -101,7 +101,7 @@

{{ item.name }} + :key="item.id"> {{ item.oldFileName }} { + let fileIds = res.data.attrInfoCaseMap.fbgbuss + this.$http.get('att/attFile/getMultiFileInfos',{fileIds: fileIds}, { + _this: this + }, res => { + this.fileList = res.data + }) + }) this.qbfsForm.entNumber = this.selectList[0].standCode || '--' this.qbfsForm.cnName = this.selectList[0].standName || '--' this.qbfsForm.enName = this.selectList[0].standEnName || '--' @@ -515,7 +525,6 @@ export default { this.qbfsForm.releaseDate = this.selectList[0].issueTime || '--' this.qbfsForm.implementDate = this.selectList[0].putTime || '--' this.qbfsForm.reviewDate = '--' //复审日期字段未确定 - this.fileList = this.selectList[0].standFileList this.ListModel = false } }, @@ -525,7 +534,6 @@ export default { }, //企业标准选中项改变 selectListChange(data){ - console.log(data); this.selectList = data }, // 点击查看 @@ -568,6 +576,7 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true + this.qbfsForm.fileList = this.fileList this.qbfsForm.commentText = this.commentText var json = Object.assign(this.qbfsForm, this.roleForm) this.$http.get('lawss/activiti/startProcess', {type: '23'}, { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue index 20f6a0243..9f94f9e6c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue @@ -97,7 +97,7 @@

{{ item.name }} + :key="item.id"> {{ item.oldFileName }} { this.qbfsForm = JSON.parse(JSON.stringify(item)) + this.fileList = item.fileList }) }, handleTabs(name) { @@ -406,18 +407,21 @@ export default { this.modalshowflag = true; }, checkedRole(data) { - var idList = ""; - var nameList = ""; + let idList = ""; + let nameList = ""; data.forEach(item => { - if (nameList.length > 0) { + if (nameList.length) { nameList += ","; idList += ","; } idList += item.id; nameList += item.name; }); - this.qbfsForm.jgUserId = idList; - this.qbfsForm.jgUser = nameList; + this.$set(this.qbfsForm, 'jgUser', nameList) + this.$set(this.qbfsForm, 'jgUserId', idList) + if(this.qbfsForm.jgUser){ + this.$refs.qbfsForm.validateField('jgUser') + } }, /** * @Description: 点击下载 diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue index 5e132ed8a..52c17fcbb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue @@ -97,7 +97,7 @@

{{ item.name }} + :key="item.id"> {{ item.oldFileName }} { this.qbfsForm = JSON.parse(JSON.stringify(item)) + this.fileList = item.fileList }) }, //流程提交 diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue index 4678b8f00..5559f5f43 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue @@ -107,10 +107,10 @@ clearable > - +

{{ item.name }} + :key="item.id"> {{ item.oldFileName }} { this.qbfsForm = JSON.parse(JSON.stringify(item)); + this.fileList = item.fileList let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : ""; res = res.split(","); this.dataList = []; diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index dc828cc1e..fce97e9d6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -42,7 +42,7 @@ readonly > - + - + - + - + - + - +

- + @@ -408,7 +408,6 @@ export default { modalshowflag: false, modalshowflag2: false, nodeList2: [], - standShow: false, standardSearch: { standCode: "", standName: "", @@ -421,6 +420,10 @@ export default { reviewDate: '', abolishCause:'', }, + standardSearchs:{ + standCode: "", + standName: "", + }, roleForm: { prcCreateUserName: this.$store.getters.userInfo.userName, prcCreateUser: this.$store.getters.userInfo.userId, @@ -436,8 +439,17 @@ export default { //必填人员校验规则 roleFormRules: { dockUserName: [ - {required: true, message: "请选择工作组组长", trigger: "change"} + {required: true, message: "请选择标准法规部部长", trigger: "change"} ], + countersignerName: [ + {required: true, message: '请选择会签人员', trigger: 'change'} + ], + examineName: [ + {required: true, message: '请选择审定责任人', trigger: 'change'} + ], + approverName: [ + {required: true, message: '请选择批准负责人', trigger: 'change'} + ] }, formRules: { standCode: [ @@ -465,7 +477,6 @@ export default { let mes = JSON.parse(res.mes) this.roleForm = mes.roleForm this.standardSearch = mes.qbfsForm - this.standShow = true this.commentText = mes.commentText }); }, @@ -502,8 +513,8 @@ export default { }, getStandDataBtns(){ this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{ - standCode: this.standardSearch.standCode, - standName: this.standardSearch.standName, + standCode: this.standardSearchs.standCode, + standName: this.standardSearchs.standName, page: 1, pageSize: this.pageSize, }, { @@ -517,8 +528,8 @@ export default { //企业标准查询 getStandDataBtn(){ this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{ - standCode: this.standardSearch.standCode, - standName: this.standardSearch.standName, + standCode: this.standardSearchs.standCode, + standName: this.standardSearchs.standName, page: this.page, pageSize: this.pageSize, }, { @@ -532,7 +543,7 @@ export default { //企业标准清空 clearSearch(){ this.page = 1 - this.standardSearch = { + this.standardSearchs = { standCode: '', standName: '' } @@ -555,7 +566,6 @@ export default { this.standardSearch.implementDate = this.selectList[0].putTime || '--' this.standardSearch.reviewDate = '--' //复审日期字段未确定 this.fileList = this.selectList[0].standFileList - this.standShow = true this.ListModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue index e4355ac77..9a1ffe0a0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue @@ -100,7 +100,7 @@
- +
{ - if (res.success) { - this.$message.success(res.message) - this.$router.push('/processCenter') - } - this.isSubmit = false - }, e => { - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.isSubmit = true + this.qbfsForm.passFlag = '1' + this.qbfsForm.commentText = this.commentText + let json = JSON.stringify(this.qbfsForm); + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: json, + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); + } }, //流程提交 handleSubmit(){ diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue index a69e73a26..8da1aebcf 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue @@ -116,7 +116,7 @@ @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }} - + + label="会签意见"> + label="会签人">
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue index ef0fe56a1..a225a466e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue @@ -116,7 +116,7 @@ @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }} - + + label="会签意见"> + label="会签人">
- +
{ - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }, e => { - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.isSubmit = true; + this.qbfsForm.commentText = this.commentText; + this.qbfsForm.bzFlag = '1' + this.qbfsForm.dataList = this.dataList; + let json = JSON.stringify(this.qbfsForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }, e => { + }); + } }, //流程提交 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue index c9a238d51..cf8da71f2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue @@ -116,7 +116,7 @@ @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }} - + + label="会签意见"> + label="会签人">
- +
{ - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }, e => { - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.isSubmit = true; + this.qbfsForm.commentText = this.commentText; + this.qbfsForm.sdFlag = '1' + this.qbfsForm.dataList = this.dataList; + let json = JSON.stringify(this.qbfsForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }, e => { + }); + } }, //流程提交 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue index 791ce3969..3fbd3b60f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue @@ -116,7 +116,7 @@ @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }} - + + label="会签意见"> + label="会签人">
@@ -358,25 +358,29 @@ export default { }, //流程驳回 beforeBack(){ - this.isSubmit = true; - this.qbfsForm.commentText = this.commentText; - this.qbfsForm.bafzFlag = '1' - this.qbfsForm.dataList = this.dataList; - let json = JSON.stringify(this.qbfsForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.$route.query.taskIds, - userId: this.$store.getters.userInfo.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }, e => { - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.isSubmit = true; + this.qbfsForm.commentText = this.commentText; + this.qbfsForm.bafzFlag = '1' + this.qbfsForm.dataList = this.dataList; + let json = JSON.stringify(this.qbfsForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }, e => { + }); + } }, //流程提交 handleSubmit() { diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue index c15538763..71dc62f2f 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue @@ -107,7 +107,14 @@ - + + + diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue index fef41fc86..c86900e53 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue @@ -111,7 +111,14 @@ - + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 4169ed788..8914299d4 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -272,7 +272,7 @@ export default { this.toProcessDetail('bzchStep6-1',row) } else if(prcType === '23'){ //企标复审 - this.toProcessDetail('qbzxdjhgkStep1-5',row) + this.toProcessDetail('qbfsStep1-4',row) }else if(prcType === '24'){ //企标废止 this.toProcessDetail('qbfzStep1-7',row) diff --git a/src/pages/regulatoryRepository/nonConfomity/index.vue b/src/pages/regulatoryRepository/nonConfomity/index.vue index 75ce33ef9..2b3dfc28d 100644 --- a/src/pages/regulatoryRepository/nonConfomity/index.vue +++ b/src/pages/regulatoryRepository/nonConfomity/index.vue @@ -50,7 +50,7 @@