diff --git a/src/common/verify/index.js b/src/common/verify/index.js index eb3e8843a..270334e1b 100644 --- a/src/common/verify/index.js +++ b/src/common/verify/index.js @@ -35,9 +35,9 @@ export default { validateStandardItem2 (rule, value, callback) { // return callback() let testval = /^[A-Za-z0-9/]+$/ - let testval1 = /[.-;;]+/ + let testval1 = /[.-;;()()]+/ if (value && !value.match(testval) && !value.match(testval1)) { - return callback(new Error('只能为(字母、数字、.、-、;、;)')) + return callback(new Error('只能为(字母数字()().-;;)')) } else { callback() } diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue index e63c43932..ef1c4eb7e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue @@ -591,12 +591,12 @@ - + -

各事业部标准化员(时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符青萍、雷萨-杨卫利),项目组各PMT/PAT

+

各事业部标准化员(时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-杨卫利),项目组各PMT/PAT

- +
@@ -1413,7 +1413,7 @@ export default { { required: true, message: '选择标准法规工程师/事业部标准化员', trigger: 'blur' }, ], bussUser5Name: [ - { required: true, message: '选择各事业部标准化员(时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符青萍、雷萨-杨卫利),项目组各PMT/PAT', trigger: 'blur' }, + { required: true, message: '选择各事业部标准化员(时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-杨卫利),项目组各PMT/PAT', trigger: 'blur' }, ], bussUser7Name: [ { required: true, message: '选择标准法规工程师', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue index 67ef94502..d0825ad35 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue @@ -596,12 +596,12 @@
- + -

张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师

+

张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师

- +
@@ -1578,7 +1578,7 @@ export default { { required: true, message: '选择总院各中心兼职标准化员/各事业部标准化员', trigger: 'change' }, ], hqUserName: [ - { required: true, message: '选择张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', trigger: 'change' }, + { required: true, message: '选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', trigger: 'change' }, ], fggcsUserName: [ { required: true, message: '选择标准法规工程师', trigger: 'change' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 235b4547f..04e4e8183 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -591,12 +591,12 @@
- + -

各事业部标准化员(时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符青萍、雷萨-杨卫利),项目组各PMT/PAT

+

各事业部标准化员(时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-杨卫利),项目组各PMT/PAT

- +
@@ -1414,7 +1414,7 @@ { required: true, message: '选择标准法规工程师/事业部标准化员', trigger: 'blur' }, ], bussUser5Name: [ - { required: true, message: '选择各事业部标准化员(时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符青萍、雷萨-杨卫利),项目组各PMT/PAT', trigger: 'blur' }, + { required: true, message: '选择各事业部标准化员(时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-杨卫利),项目组各PMT/PAT', trigger: 'blur' }, ], bussUser7Name: [ { required: true, message: '选择标准法规工程师', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 571895dc4..f467a3072 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -670,16 +670,16 @@
-

张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师

+

张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师

+ @click.native="choiceZRRList('hqUserId', '选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', roleForm.hqUserId)">
@@ -1705,7 +1705,7 @@ hqUserName: [ { required: true, - message: '选择张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', + message: '选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', trigger: 'blur' }, ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 3502d8d41..540c8b20c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -666,16 +666,16 @@
-

张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师

+

张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师

+ @click.native="choiceZRRList('hqUserId', '选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', roleForm.hqUserId)">
@@ -1685,7 +1685,7 @@ hqUserName: [ { required: true, - message: '选择张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', + message: '选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', trigger: 'blur' }, ], @@ -2250,7 +2250,6 @@ this.form.SYCXCLASS = res.data.attrInfoMap.SYCXCLASS ? res.data.attrInfoMap.SYCXCLASS.split(',') : [] this.form.CYCVPPSBMBUSS = res.data.attrInfoMap.CYCVPPSBMBUSS this.form.KCVPPSBMBUSS = res.data.attrInfoMap.KCVPPSBMBUSS - this.LSBBBUSSFileList = this.assemble(res.data.attrInfoMap.LSBBBUSS, res.data.attrInfoMap.LSBBBUSSName); this.form.SYCPXCLASS = res.data.attrInfoMap.SYCPXCLASS ? res.data.attrInfoMap.SYCPXCLASS.split(',') : [] this.form.CYCD = res.data.attrInfoMap.CYCD ? res.data.attrInfoMap.CYCD.split(',') : [] this.form.TXLBBUSS = res.data.attrInfoMap.TXLBBUSS @@ -2261,17 +2260,58 @@ this.form.CYBZ = res.data.attrInfoMap.CYBZ this.form.YYBZ = res.data.attrInfoMap.YYBZ this.form.XCSJBUSS = res.data.attrInfoMap.XCSJBUSS - let FBGBUSSLast = res.data.attrInfoMap.FBGBUSS.substring(0, res.data.attrInfoMap.FBGBUSS.lastIndexOf(',')) if (this.form.standName) { this.fileName = this.form.standName } - let FBGBUSS = this.fileId + ',' + FBGBUSSLast - let FBGBUSSName = this.fileName + ',' + res.data.attrInfoMap.FBGBUSSName - this.BZSMBUSSFileList = this.assemble(res.data.attrInfoMap.BZSMBUSS.substring(0, res.data.attrInfoMap.BZSMBUSS.lastIndexOf(',')), res.data.attrInfoMap.BZSMBUSSName); - this.FBGBUSSFileList = this.assemble(FBGBUSS, FBGBUSSName); - this.LSBBBUSSFileList = this.assemble(res.data.attrInfoMap.LSBBBUSS.substring(0, res.data.attrInfoMap.LSBBBUSS.lastIndexOf(',')), res.data.attrInfoMap.LSBBBUSSName); - this.QTWJBUSSFileList = this.assemble(res.data.attrInfoMap.QTWJBUSS.substring(0, res.data.attrInfoMap.QTWJBUSS.lastIndexOf(',')), res.data.attrInfoMap.QTWJBUSSName); - this.GLWJBUSSFileList = this.assemble(res.data.attrInfoMap.GLWJBUSS.substring(0, res.data.attrInfoMap.GLWJBUSS.lastIndexOf(',')), res.data.attrInfoMap.GLWJBUSSName); + let FBGBUSS = this.fileId + let FBGBUSSName = this.fileName + try { + this.FBGBUSSFileList = [] + this.BZSMBUSSFileList = [] + this.QTWJBUSSFileList = [] + this.GLWJBUSSFileList = [] + + if(res.data.attrInfoMap.BZSMBUSS && res.data.attrInfoMap.BZSMBUSS !== ''){ + this.BZSMBUSSFileList = this.assemble(this.subComma(res.data.attrInfoMap.BZSMBUSS), this.subComma(res.data.attrInfoMap.BZSMBUSSName)); + } + this.FBGBUSSFileList = this.assemble(FBGBUSS, FBGBUSSName); + // this.LSBBBUSSFileList = this.assemble(res.data.attrInfoMap.LSBBBUSS.substring(0, res.data.attrInfoMap.LSBBBUSS.lastIndexOf(',')), res.data.attrInfoMap.LSBBBUSSName); + + let FBGBUSSLast = '' + if(res.data.attrInfoMap.FBGBUSS && res.data.attrInfoMap.FBGBUSS !== ''){ + FBGBUSSLast = this.subComma(res.data.attrInfoMap.FBGBUSS) + } + + let LSBBBUSS = FBGBUSSLast + if(res.data.attrInfoMap.LSBBBUSS && res.data.attrInfoMap.LSBBBUSS !== ''){ + if(FBGBUSSLast === ''){ + LSBBBUSS = this.subComma(res.data.attrInfoMap.LSBBBUSS) + }else{ + LSBBBUSS = FBGBUSSLast + ',' + this.subComma(res.data.attrInfoMap.LSBBBUSS) + } + } + + let LSBBBUSSName = this.subComma(res.data.attrInfoMap.FBGBUSSName) + ',' + this.subComma(res.data.attrInfoMap.LSBBBUSSName) + // 发布稿空 只取历史版本 + if(res.data.attrInfoMap.FBGBUSSName === null || res.data.attrInfoMap.FBGBUSSName === ''){ + LSBBBUSSName = this.subComma(res.data.attrInfoMap.LSBBBUSSName) + } + // 历史版本空 只取发布稿 + if(res.data.attrInfoMap.LSBBBUSSName === null || res.data.attrInfoMap.LSBBBUSSName === ''){ + LSBBBUSSName = this.subComma(res.data.attrInfoMap.FBGBUSSName) + } + + // 存放带入的历史版本文件名、文件id + this.LSBBBUSS = LSBBBUSS + this.LSBBBUSSName = LSBBBUSSName + this.LSBBBUSSFileList = this.assemble(LSBBBUSS, LSBBBUSSName); + if(res.data.attrInfoMap.QTWJBUSS) + this.QTWJBUSSFileList = this.assemble(this.subComma(res.data.attrInfoMap.QTWJBUSS), this.subComma(res.data.attrInfoMap.QTWJBUSSName)); + if(res.data.attrInfoMap.GLWJBUSS) + this.GLWJBUSSFileList = this.assemble(this.subComma(res.data.attrInfoMap.GLWJBUSS), this.subComma(res.data.attrInfoMap.GLWJBUSSName)); + }catch (e) { + console.log(e) + } }) // 起草部门带入 this.form.QCDW = this.filterStringDate(this.standardCheckedList[0].unitName) @@ -2298,6 +2338,20 @@ break } }, + // 截取字符前后的逗号 + subComma(str){ + if(str && str!== ''){ + if(str.indexOf(',') === 0){ + str = str.slice(1) + } + if(str.lastIndexOf(',') === str.length - 1){ + str = str.slice(0, -1) + } + return str + }else{ + return '' + } + }, initializeFileList(property, value) { switch (property) { case 'xgd': @@ -2746,8 +2800,9 @@ // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') // 解决 标准入库流程--圈住的字段,先手动输入,然后再手动查找,点提交就会把手动输入的标准号覆盖 if (this.replaceLawType === 'DTQBBHBUSS') { - let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',') - this.form.DTQBBHBUSS = this.filterSetData(arr1) + // let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',') + // this.form.DTQBBHBUSS = this.filterSetData(arr1) + this.form.DTQBBHBUSS = textArr.join(',') this.form.standNum = this.filterSetData(textArr2.join(',')) } else if (this.replaceLawType === 'CYBZ') { let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' + textArr.join(',') : textArr.join(',') @@ -2761,8 +2816,59 @@ this.form.byybj = this.form.byybj ? this.form.byybj + ',' + textArr.join(',') : textArr.join(',') } // this.$emit('input', textArr.join(',')) + + // 修订、修改 时 手动查找代替企标编号 发布稿放到历史版本 + if(this.replaceLawType === 'DTQBBHBUSS' && (this.form.reviseStatus === '2' || this.form.reviseStatus === '3') && this.selectedListRep.length){ + let ids = this.selectedListRep.reduce((init,item,index,arr)=>{ + let result + if(index === arr.length - 1){ + result = init + item.id + }else{ + result = init + item.id + ',' + } + return result + },'') + this.selectByIdAtt(ids).then(res =>{ + if (res && res.data && res.data.fbgbuss !== '') { + this.form.LSBBBUSSName = res.data.reduce((init,item,index,arr)=>{ + if(index === 0){ + init = item.fbgbussNmae + }else{ + init = init + ',' + item.fbgbussNmae + } + return init + },'') + this.form.LSBBBUSS = res.data.reduce((init,item,index,arr)=>{ + if(index === 0){ + init = item.fbgbuss + }else{ + init = init + ',' + item.fbgbuss + } + return init + },'') + // 带入的历史版本即选择的代替企标编号中的历史版本合并 + if(this.LSBBBUSS !== ''){ + this.form.LSBBBUSS = this.LSBBBUSS + ',' + this.form.LSBBBUSS + this.form.LSBBBUSSName = this.LSBBBUSSName + ',' + this.form.LSBBBUSSName + } + this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName); + } + }) + } + this.$refs.selections.clearSelection() }, + selectByIdAtt(id){ + return new Promise((resolve,reject)=>{ + this.$http.get('/lawss/sarBussionessStand/selectByIdAtt', { + id + }, { + _this: this + }, res => { + resolve(res) + }) + }) + }, filterSetData(data) { const arr = new Set() let permission = data.split(","); diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue index 8d830bdde..5b1c46a6c 100644 --- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue @@ -52,13 +52,13 @@ - - - - - - - + + + + + + +