diff --git a/src/components/generationNumber/index.vue b/src/components/generationNumber/index.vue index 16e933212..e27d2080e 100644 --- a/src/components/generationNumber/index.vue +++ b/src/components/generationNumber/index.vue @@ -166,9 +166,22 @@ export default { // 拼接企标编号 let verNum = generationNumberForm.versionNumber.replace(/[^0-9]/ig,""); let verEn= generationNumberForm.versionNumber.replace(/[^A-Z]+/ig,""); - let standCode = generationNumberForm.standCode + ' ' + generationNumberForm.standAttribute + ' ' + - generationNumberForm.classificationNumber + ' ' + generationNumberForm.sequenceNumber + '-' + - this.$moment(generationNumberForm.year).format('YYYY') + '（' + generationNumberForm.versionNumber + '）' + // 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + let standCode = '' + if(judgeFn.test(generationNumberForm.standSort)){ + standCode = generationNumberForm.standCode + ' ' + generationNumberForm.standAttribute + ' ' + + generationNumberForm.classificationNumber + ' ' + generationNumberForm.sequenceNumber + '-' + + this.$moment(generationNumberForm.year).format('YYYY') + '（' + generationNumberForm.versionNumber + '）' + }else if(generationNumberForm.standSort === 'Q/QCBFC'){ + standCode = generationNumberForm.standCode + '' + generationNumberForm.standAttribute + ' ' + + generationNumberForm.classificationNumber + ' ' + generationNumberForm.sequenceNumber + '-' + + this.$moment(generationNumberForm.year).format('YYYY') + '（' + generationNumberForm.versionNumber + '）' + }else { + standCode = generationNumberForm.standCode + ' ' + generationNumberForm.standAttribute + ' ' + + generationNumberForm.classificationNumber + ' ' + generationNumberForm.sequenceNumber + '-' + + this.$moment(generationNumberForm.year).format('YYYY') + '（' + generationNumberForm.versionNumber + '）' + } this.$emit('isOk', standCode, { standCode: standCode, qbCode: this.generationNumberForm.standAttribute, // 标准属性 diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index d686e6026..8f5179a77 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -406,6 +406,7 @@ export default { type: '', // 新增/编辑状态 addRoleTitle: '', SuperiorRoleData: {}, + selectype:[], nodeList3: [], SuperiorRoleModel: false, addFormRules: { @@ -440,7 +441,9 @@ export default { treeData4: [], defaultProps3: { children: 'children', - label: 'menuName' + label: function (a,b){ + return a.label = a.name || a.menuName + } }, nodeList2: [], btnLoading: false, @@ -641,9 +644,11 @@ export default { async getTreeAsync(){ let tsResource = await this.getTree3() let sarMenuStandard = await this.getTree4() + let zlStandard = await this.getTree5() let list1 = [] let list2 = [] + let list3 = [] if(tsResource && tsResource.ok && tsResource.data){ list1 = tsResource.data } @@ -652,8 +657,12 @@ export default { list2 = sarMenuStandard.data } - if(list2.length > 0){ - list1 = list1.concat(list2) + if(zlStandard && zlStandard.ok && zlStandard.data){ + list3 = zlStandard.data + } + + if(list2.length > 0 && list3.length > 0){ + list1 = list1.concat(list2,list3) } if(list1.length > 0){ @@ -693,6 +702,16 @@ export default { }) }) }, + getTree5(res,json) { + return new Promise((resolve, reject) => { + this.$http.get('fileMaterialCenter/zlTree/permissConfig', {}, { + _this: this + }, res => { + const history = res; + resolve(history) + }) + }) + }, confirmDialogData() { this.btnLoading = true this.$http.postData('sarRole/role/resource', { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 9bfe22583..d064e8acb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -2115,7 +2115,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = this.regDate(year) - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } this.getStandInfoByReviseStatus() }else { this.form.standStatus = "3" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 2fd742551..450bc0f85 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -620,7 +620,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = year // 待带入立项标准 - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + // 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + var judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(nowstandinfo.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } }else { callback(new Error('企标顺序号已存在或已锁定')) } @@ -2711,7 +2719,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = year - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" @@ -2729,7 +2745,15 @@ this.form.standNum = standSn this.form.standNumber = standSn this.form.standYear = year // 待带入立项标准 - this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } if(type === '1'){ this.isSubmit = false this.saveLoading = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 4bb710972..78dac3cdf 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -1141,7 +1141,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = year - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + var judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 4ac222f41..b0f74796c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -1219,7 +1219,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = year - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + var judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 7c32800ba..24d3e29a5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -1141,7 +1141,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = year - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + var judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index be7310122..26a3ce56d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -1229,7 +1229,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = year - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + var judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue index dd4b28c67..1377682b5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -968,7 +968,6 @@ export default { this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度 - this.$emit('emitDataLoading',false) } }, @@ -986,15 +985,15 @@ export default { mounted () { if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){ this.getDataAsync() - this.form = this.formSub + this.form = JSON.parse(JSON.stringify(this.formSub)) console.log(this.QTWJBUSSFileListSub) - this.FBGBUSSFileList= this.FBGBUSSFileListSub - this.BZSMBUSSFileList= this.BZSMBUSSFileListSub - this.LSBBBUSSFileList= this.LSBBBUSSFileListSub - this.QTWJBUSSFileList= this.QTWJBUSSFileListSub - this.GLWJBUSSFileList= this.GLWJBUSSFileListSub - this.summaryFileList= this.summaryFileListSub - this.madelSubList= this.madelSubListSub + this.FBGBUSSFileList= this.FBGBUSSFileListSub?JSON.parse(JSON.stringify(this.FBGBUSSFileListSub)):[] + this.LSBBBUSSFileList= this.LSBBBUSSFileListSub?JSON.parse(JSON.stringify(this.LSBBBUSSFileListSub)):[] + this.BZSMBUSSFileList=this.BZSMBUSSFileListSub?JSON.parse(JSON.stringify(this.BZSMBUSSFileListSub)):[] + this.QTWJBUSSFileList= this.QTWJBUSSFileListSub?JSON.parse(JSON.stringify(this.QTWJBUSSFileListSub)):[] + this.GLWJBUSSFileList= this.GLWJBUSSFileListSub?JSON.parse(JSON.stringify(this.GLWJBUSSFileListSub)):[] + this.summaryFileList= this.summaryFileListSub?JSON.parse(JSON.stringify(this.summaryFileListSub)):[] + this.madelSubList= this.madelSubListSub?JSON.parse(JSON.stringify(this.madelSubListSub)):[] } }, watch: { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue index a160f0d0b..a72a9caed 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue @@ -300,6 +300,9 @@ +
+ 导出 +
import { mapGetters } from 'vuex' import ProcessTitle from '../../../components/ProcessTitle' +import axios from "axios"; export default { @@ -602,6 +606,37 @@ export default { this.$set(this.textStatusMap, item.value, item.label) }) + }, + exportAll() { + const arr = JSON.stringify(this.form.infoList) + axios({ + method: 'post', + url: 'api/lawss/actSarItemsBuss/exportAllBZZXDJSBZ', + data: { + json: arr + }, + dataType: 'json', + responseType: 'blob', + }).then(res => { + const blob = new Blob([res.data]); + const fileName = '意见信息.xlsx'; + if ('download' in document.createElement('a')) { // 非IE下载 + const elink = document.createElement('a'); + elink.download = fileName; + elink.style.display = 'none'; + elink.href = URL.createObjectURL(blob); + document.body.appendChild(elink); + elink.click(); + URL.revokeObjectURL(elink.href);// 释放URL 对象 + document.body.removeChild(elink); + this.loading = false; + } else { // IE10+下载 + navigator.msSaveBlob(blob, fileName); + this.loading = false; + } + }).catch(error => { + }) + }, busVsFunc(){ this.$http.get('sarVppsTree/list', '', { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index 1c27298d1..afa81e31e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -2678,7 +2678,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = this.regDate(year) - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + // 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } }else { this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus}, { _this: this @@ -2688,7 +2696,15 @@ this.form.standSn = standSn this.form.standNumber = standSn this.form.standYear = year // 待带入立项标准 - this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + // 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } }, e => { }) } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 1f7099b5c..78080358a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -665,7 +665,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = this.regDate(year) // 待带入立项标准 - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + "" + this.form.standNumber + (this.form.standYear === '' ? '' : '-' + this.form.standYear) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + "" + this.form.standNumber + (this.form.standYear === '' ? '' : '-' + this.form.standYear) + }else { + this.form.standCode = this.form.standSort + " " + this.form.standNumber + (this.form.standYear === '' ? '' : '-' + this.form.standYear) + } }else { callback(new Error('企标顺序号已存在或已锁定')) } @@ -2632,6 +2640,7 @@ planForm.planStatus = '4' planForm.reviseStatus = this.form.reviseStatus planForm.standCode = this.form.DTQBBHBUSS + planForm.standId = res.data planForm.processType = "buss1"; this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { _this: this @@ -2782,7 +2791,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = this.regDate(year) - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + // 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } this.formKey++ }else { this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort,taskId: this.taskIds}, { @@ -2794,7 +2811,15 @@ this.form.standNumber = standSn this.form.standNum = standSn this.form.standYear = this.regDate(year) // 待带入立项标准 - this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } this.formKey++ }, e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index dacadf1d2..14b75db94 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -5,9 +5,9 @@
-
历史评分
基础信息
基础信息
+
历史评分
审批历史
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index a5c66ef99..ff08ad740 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -5,9 +5,9 @@
-
会签评分
基础信息
会签意见
+
会签评分
审批历史
@@ -911,9 +911,9 @@ }, data () { const numberCodeNot = (rule, value, callback) => { - let pattern = /^[1]*$/ + let pattern = /^[1,0]*$/ if (!pattern.test(value) || value > 1) { - return callback(new Error('评分分值只可为1分')) + return callback(new Error('评分分值只可为0分或1分')) } else { callback() } @@ -1458,7 +1458,7 @@ }else { const nowTime = new Date().getTime() // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) - this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)); + this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))+'&office.preview.type=pdf'; } this.iframeLoading = false this.$forceUpdate() diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index 1ac758a7a..0a9e910ad 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -5,8 +5,8 @@
-
评审评分
基础信息
+
评审评分
审批历史
@@ -907,9 +907,9 @@ }, data () { const numberCodeNot = (rule, value, callback) => { - let pattern = /^[1]*$/ + let pattern = /^[1,0]*$/ if (!pattern.test(value) || value > 1) { - return callback(new Error('评分分值只可为1分')) + return callback(new Error('评分分值只可为0分或1分')) } else { callback() } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index 5ffbb93b8..3d95b44bd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -5,8 +5,8 @@
-
复审评分
基础信息
+
复审评分
审批历史
@@ -691,9 +691,9 @@ }, data () { const numberCodeNot = (rule, value, callback) => { - let pattern = /^[1]*$/ + let pattern = /^[1,0]*$/ if (!pattern.test(value) || value > 1) { - return callback(new Error('评分分值只可为1分')) + return callback(new Error('评分分值只可为0分或1分')) } else { callback() } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue index d54e207e9..8114ec4eb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue @@ -510,9 +510,9 @@ }, data () { const numberCodeNot = (rule, value, callback) => { - let pattern = /^[1]*$/ + let pattern = /^[1,0]*$/ if (!pattern.test(value)) { - return callback(new Error('评分分值只可为1分')) + return callback(new Error('评分分值只可为0分或1分')) } else { callback() } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index 69e207330..0978416e6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -5,8 +5,8 @@
-
审核评分
基础信息
+
审核评分
审批历史
@@ -702,9 +702,9 @@ }, data () { const numberCodeNot = (rule, value, callback) => { - let pattern = /^[1]*$/ + let pattern = /^[1，0]*$/ if (!pattern.test(value) || value > 1) { - return callback(new Error('评分分值只可为1分')) + return callback(new Error('评分分值只可为0分或1分')) } else { callback() } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index e378edc5a..46422b11e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -5,8 +5,8 @@
-
历史评分
基础信息
+
历史评分
审批历史
@@ -1171,9 +1171,9 @@ QCRBUSS: [ { required: true, message: '请选择起草人', trigger: 'change' } ], - DTQBBHBUSS: [ - { required: true, message: '请选择代替企标编号', trigger: 'change' } - ], + // DTQBBHBUSS: [ + // { required: true, message: '请选择代替企标编号', trigger: 'change' } + // ], }, zrUserIds: [], // 选择多个会签责任人 userType:'', // 选择用户ID判断 @@ -2944,7 +2944,15 @@ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum this.form.standYear = this.regDate(year) - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } }else { this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus}, { _this: this @@ -2954,7 +2962,15 @@ this.form.standSn = standSn this.form.standNumber = standSn this.form.standYear = year // 待带入立项标准 - this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } }, e => { }) } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index 64b50e824..b1c0b5e45 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -50,8 +50,7 @@ ref="selection" tooltip-effect="dark" style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;" - :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', - fontWeight: 'bold', height: '48px'}" + :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',fontWeight: 'bold', height: '48px'}" :data="form.fileModelList" border default-expand-all> @@ -802,7 +801,7 @@ // 任务分解单数据 taskTableData: [] }, - tablePHeight:'', + tablePHeight:'auto', tableHeight: { standardTableHeight: null }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index 7925669ed..a92b1f78c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -5,8 +5,8 @@
-
评审评分
基础信息
+
评审评分
审批历史
@@ -907,9 +907,9 @@ }, data () { const numberCodeNot = (rule, value, callback) => { - let pattern = /^[1]*$/ + let pattern = /^[1,0]*$/ if (!pattern.test(value) || value > 1) { - return callback(new Error('评分分值只可为1分')) + return callback(new Error('评分分值只可为0分或1分')) } else { callback() } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 2abddd12b..cff29ec7b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -139,7 +139,7 @@ @@ -166,19 +166,19 @@ v-model="qbfsForm.esMatingRelations" > - - - + + + + + + +
{{ item.name }} - - - + + + @@ -522,6 +522,12 @@ export default { esName: [ { required: true, message:"请输入企标名称", trigger: "blur" } ], + rqbName: [ + { required: true, message: "请选择代替企标编号", trigger: "blur" } + ], + area: [ + { required: true, message: "请选择适用车型", trigger: "change" } + ], reviseStatus: [ { required: true, message: "请选择制修订类型", trigger: "blur" } ], @@ -543,6 +549,21 @@ export default { drafterName: [ {required: true, message: '请选择起草人', trigger: 'change'}, ], + tsJson: [ + {required: true, message: '请选择体系结构', trigger: 'change'}, + ], + isRelate: [ + {required: true, message: '请选择采用国内外标准情况', trigger: 'change'}, + ], + technologic: [ + {required: true, message: '请输入指标依据', trigger: 'blur'}, + ], + esStandRelations: [ + {required: true, message: '请输入采用标准', trigger: 'blur'}, + ], + useLevel: [ + {required: true, message: '请选择采标程度', trigger: 'change'}, + ], newReason: [ {required: true, message: '请输入立项原因', trigger: 'blur'}, ], @@ -552,11 +573,16 @@ export default { }, watch:{ 'qbfsForm.esName': { + handler: function(val) { if(val && val !== ''){ this.qbfsForm.LXDName = val+'-立项单' this.LXDList = [] this.LXDList=this.assemble(this.qbfsForm.LXD,val+'-立项单'); + }else{ + this.qbfsForm.LXDName = '立项单' + this.LXDList = [] + this.LXDList=this.assemble(this.qbfsForm.LXD,'立项单'); } } }, @@ -609,6 +635,25 @@ export default { } }, methods: { + saveEditFile(){ + if(this.$route.query.bpnId === undefined && this.$route.query.taskIds === undefined){ + this.$http.get('/lawss/activiti/saveEditFile', { + model: 'model_lx' + },{ + _this: this + }, res => { + console.log(res) + if(res){ + this.qbfsForm.LXD = res.id + this.qbfsForm.LXDName = '立项单' + this.LXDList=this.assemble(res.id,'立项单'); + } + + }) + }else { + this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName); + } + }, getDataByNameAndSort() { return new Promise((resolve, reject) => { this.$http.get('esRevisePlan/es-revise-plan/getDataByNameAndSort', { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 9e3a627a2..ae0f7f488 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -8,7 +8,6 @@
基础信息
审批历史
人员信息
-
@@ -258,6 +257,7 @@ import rename from "process/creatProcess/qbzxdjhgk/component/rename"; import establish from "process/creatProcess/qbzxdjhgk/component/establish"; import delay from "process/creatProcess/qbzxdjhgk/component/delay"; import cancel from "process/creatProcess/qbzxdjhgk/component/cancel"; +import axios from "axios"; import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel, saveTaskForPub } from "api/process"; export default { @@ -457,6 +457,7 @@ export default { this.toggleType = '4' }else if(this.comName === 'establish'){ this.toggleType = '5' + this.$refs.childForm.saveEditFile() } }, //流程保存 @@ -508,6 +509,15 @@ export default { }) } }, + addLog(qbzxdFrom){ + let json = Object.assign(qbzxdFrom); + this.$http.post("esRevisePlanLog/log/addLog", { + json: JSON.stringify(json) + }, { + _this: this + }, res => { + }); + }, //流程提交 handleSubmit() { if(!this.$refs["childForm"].qbfsForm.type){ @@ -547,7 +557,8 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); - if (this.bpnId !== '') { + this.addLog(qbzxdFrom) + if (this.bpnId !== '' && this.bpnId !== undefined) { let taskId = { id: this.bpnId } @@ -555,6 +566,7 @@ export default { return res }) } + this.isSubmit = false; this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); } @@ -587,6 +599,7 @@ export default { if (res.success) { this.$message.success(res.message); this.isSubmit = false; + this.addLog(qbzxdFrom) this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue index 3bb7c1053..d14241367 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue @@ -145,14 +145,14 @@ placeholder="请输入引用标准" :maxlength="500"/> - - - + + + + + + + +
{{ item.name }} diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue index 85d9118bb..e72bb6a88 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue @@ -145,14 +145,14 @@ placeholder="请输入引用标准" :maxlength="500"/> - - - + + + + + + + +
{{ item.name }} diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue index b858d4d9d..e8b8a1e4e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue @@ -145,14 +145,14 @@ placeholder="请输入引用标准" :maxlength="500"/> - - - + + + + + + + +
{{ item.name }} diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index 84553673d..4f87ae865 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -145,14 +145,14 @@ placeholder="请输入引用标准" :maxlength="500"/> - - - + + + + + + + +
{{ item.name }} diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index ae6d37c89..69bfc8067 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -167,7 +167,7 @@ - - - + + + + + + +
{{ item.name }} - - - + + + @@ -717,8 +717,11 @@ export default { examineName: "" }, qbfsFormRules: { - // unit: [ - // { required: true, message: "请选择起草单位", trigger: "change" } + projectTarget: [ + { required: true, message: "请输入项目目标", trigger: "blur" } + ], + // fileName: [ + // { required: true, message: "请上传附件", trigger: "blur" } // ], bussSort: [ { required: true, message: "请选择企标类别", trigger: "blur" } @@ -726,30 +729,54 @@ export default { esName: [ { required: true, validator: standNameVerify, trigger: "blur" } ], + rqbName: [ + { required: true, message: "请输入代替企标编号", trigger: "blur" } + ], reviseStatus: [ { required: true, message: "请选择制修订类型", trigger: "blur" } ], - // resPersonName: [ - // { required: true, message: "请输入评审责任人", trigger: "blur" } - // ], - // wgLeaderName: [ - // { required: true, message: "请输入工作组组长", trigger: "blur" } - // ], - // unitName: [ - // { required: true, message: "请选择起草责任单位", trigger: "blur" } - // ], - // draftTime: [ - // { required: true, message: "请输入计划标准初稿完成时间", trigger: "blur" } - // ], - // releaseTime: [ - // {required: true, message: '请输入计划标准发布时间', trigger: 'blur'}, - // ], + unitName: [ + { required: true, message: "请选择起草单位", trigger: "change" } + ], drafterName: [ - {required: true, message: '请选择起草人', trigger: 'change'}, + { required: true, message: "请选择起草人", trigger: "change" } + ], + resPersonName: [ + { required: true, message: "请输入评审责任人", trigger: "blur" } + ], + wgLeaderName: [ + { required: true, message: "请输入工作组组长", trigger: "blur" } + ], + draftTime: [ + { required: true, message: "请选择计划标准初稿完成时间", trigger: "change" } + ], + releaseTime: [ + { required: true, message: "请选择计划标准发布时间", trigger: "change" } + ], + endTime: [ + { required: true, message: "请选择立项完成时间", trigger: "change" } + ], + tsJson: [ + { required: true, message: "请选择体系结构", trigger: "change" } + ], + area: [ + { required: true, message: "请选择适用车型", trigger: "change" } + ], + isRelate: [ + { required: true, message: "请选择是否采用标准", trigger: "change" } + ], + technologic: [ + { required: true, message: "请输入指标依据", trigger: "blur" } + ], + useLevel: [ + { required: true, message: "请选择采标程度", trigger: "change" } + ], + newReason: [ + {required: true, message: '请输入立项原因', trigger: 'blur'}, + ], + esStandRelations: [ + {required: true, message: '请输入采用标准', trigger: 'blur'}, ], - // newReason: [ - // {required: true, message: '请输入立项原因', trigger: 'blur'}, - // ], }, } @@ -801,6 +828,7 @@ export default { if (valid) { this.isSubmit = true this.qbfsForm.commentText = this.commentText + this.qbfsForm.LXD = this.qbfsForm.LXD let jsons = JSON.stringify(this.qbfsForm); this.$http.post('lawss/activiti/completeTask', { taskIds: this.$route.query.taskIds, @@ -1080,6 +1108,8 @@ export default { }else { this.$onlineEdit(id,fileNam2,this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName) } + this.qbfsForm.LXD = id + this.qbfsForm.LXDName = '立项单' }, //体系结构单选 handleClick(data,checked, node){ @@ -1313,8 +1343,11 @@ export default { idList += item.id; nameList += item.name; }); + console.log(nameList) this.roleForm.countersigner = idList; this.roleForm.countersignerName = nameList; + this.qbfsForm.resPerson = idList; + this.qbfsForm.resPersonName = nameList; } }, }; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 1b036b1b6..ff9c46b06 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -880,6 +880,7 @@ export default { dataListChildren.splice(index, 1) } this.dataList = dataListChildren; + console.log(this.dataList) this.total = this.dataList.length; } diff --git a/src/pages/processCenter/pages/phone/qbrk/common/formList.vue b/src/pages/processCenter/pages/phone/qbrk/common/formList.vue index a7831eaa9..d31fa4f4a 100644 --- a/src/pages/processCenter/pages/phone/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/phone/qbrk/common/formList.vue @@ -314,6 +314,7 @@