diff --git a/src/components/CustomFormComponents/InputForAllStandards.vue b/src/components/CustomFormComponents/InputForAllStandards.vue index 9e3ef0db1..1d550b370 100644 --- a/src/components/CustomFormComponents/InputForAllStandards.vue +++ b/src/components/CustomFormComponents/InputForAllStandards.vue @@ -283,7 +283,7 @@ export default { } if (this.selectedListRep.length + textArr.length > 20) { return this.$message({ - message: '代替标准号最多选择20项', + message: '标准号最多选择20项', type: 'warning' }) } diff --git a/src/components/mechanismTree/index.vue b/src/components/mechanismTree/index.vue index 30cbb6b07..fe409a18e 100644 --- a/src/components/mechanismTree/index.vue +++ b/src/components/mechanismTree/index.vue @@ -8,6 +8,7 @@ @close="handleTreeDrawerCancel" size="400px">
- 新增 + 新增 展示区域管理
数据处理中 @@ -76,8 +76,8 @@ - 编辑 - 删除 + 编辑 + 删除
@@ -205,7 +205,7 @@ width="400px" >
- 新增 + 新增
- 修改 - 删除 + 修改 + 删除 diff --git a/src/pages/config/pages/attributeCustom/components/laws.vue b/src/pages/config/pages/attributeCustom/components/laws.vue index 96729b19f..e9a0af035 100644 --- a/src/pages/config/pages/attributeCustom/components/laws.vue +++ b/src/pages/config/pages/attributeCustom/components/laws.vue @@ -2,8 +2,8 @@

{{ sarStandardsInfoEO.standName || '-' }}

-

{{ sarStandardsInfoEO.standEnName || '-' }}

+

{{ sarStandardsInfoEO.standEnName || '-' }}

{{ sarStandardsInfoEO.textStatusBussShow || '-' }} + >文本状态{{ sarStandardsInfoEO.textStatusBussShow || '-' }}

{{ sarStandardsInfoEO.issueTime || '-' }}

-

{{ sarStandardsInfoEO.putTime || '-' }}

+

{{ sarStandardsInfoEO.putTime || '-' }}

@@ -206,7 +206,7 @@ type="primary" size="mini" class="common-button-primary" - @click="QYBZget">查询 + @click="QYBZgetBtn">查询 @@ -550,9 +550,9 @@ export default { }, mounted(){ this.getWorkData() - if(this.qbfsForm.passFlag){ - this.qbfsForm = {} - } + // if(this.qbfsForm.passFlag){ + // this.qbfsForm = {} + // } //查询下拉框数据 this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this @@ -753,6 +753,10 @@ export default { this.QYBZform.pageSize = pageSize this.QYBZget() }, + QYBZgetBtn(){ + this.QYBZform.page = 1 + this.QYBZget() + }, QYBZget () { this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, { _this: this, loading: 'QYBZShow' @@ -958,5 +962,9 @@ export default { } } } + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index f41b18984..fb599e5ac 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -70,6 +70,19 @@ + + + + + + @@ -101,7 +114,7 @@ :enterpriseStandard="true" :placeholderText="'包括已有、应有的关联标准,如企业标准、行业标准、国家标准'" :config="{attrName: '引用标准'}" - :labelWidth="'180px'" + :labelWidth="'150px'" v-model="qbfsForm.esMatingRelations" > @@ -215,19 +228,6 @@ - - - - - - 查询 + @click="QYBZgetBtn">查询 @@ -712,9 +712,9 @@ export default { } }, mounted() { - if(this.qbfsForm.passFlag){ - this.qbfsForm = {} - } + // if(this.qbfsForm.passFlag){ + // this.qbfsForm = {} + // } //查询下拉框数据 this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this @@ -801,6 +801,13 @@ export default { }, TXJGenterDrawer () { let list = this.$refs.TXJGTree.getCheckedNodes() + if(list.length > 0){ + let parenList = list.filter ( item => item.parentId === null || item.parentId === ''); + if (parenList.length > 0) { + this.$message.error('请选择二级及以下目录') + return + } + } let id = '' let name = '' list.map(item => { @@ -838,7 +845,7 @@ export default { }, QYBZenterDrawer () { if (this.QYBZformSelect.length > 1) { - this.$message.warning('请选择一条标准') + this.$message.warning('您只能选择一条标准进行带入') } else if (this.QYBZformSelect.length < 1){ this.$message.warning('请选择要带入的标准') } else { @@ -859,6 +866,11 @@ export default { this.QYBZform.pageSize = pageSize this.QYBZget() }, + //企业标准查询 + QYBZgetBtn(){ + this.QYBZform.page = 1 + this.QYBZget() + }, QYBZget () { this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, { _this: this, loading: 'QYBZShow' @@ -1150,5 +1162,9 @@ export default { } } } + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 66cb24c1f..44c9314c1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -46,6 +46,19 @@ + + + + + + @@ -210,13 +223,6 @@ - - - { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 372939517..aaebf35d6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -529,6 +529,7 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; + qbzxdFrom.commentText = this.commentText; var json = Object.assign(qbzxdFrom, this.roleForm); this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 0d0a4635a..5a4484d35 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -104,6 +104,7 @@ @@ -123,7 +124,8 @@

责任工程师

- +
@@ -227,6 +229,7 @@ title="选择工作组组长" :visible.sync="workModel" size="900px" + @close="closeWorkDrawer" custom-class="demo-drawer" >
@@ -259,14 +262,14 @@
+ 数据加载中... @@ -298,7 +301,7 @@ @@ -349,7 +352,7 @@ :before-upload="beforeUpload" :action="importExcelUrl" :file-list="defaultFileList" - accept=".xlsx" + accept=".xls" name="file" ref="importFileAboutStand">
@@ -378,6 +381,7 @@ export default { name: "qbzxdlxStep1", data() { return { + tableLoading: false, importModalshowflag: false, //导入弹窗 showUploadlist: true, // 导入过程中新增数据时,如果数据错误,不出现导入列表 importExcelUrl: 'api/att/attFile/upload', // 导入EXCEL文档 @@ -419,6 +423,11 @@ export default { dockUser: '', dockUserName: '', }, + roleFormRules:{ + dockUserName: [ + {required: true, message: '请选择责任工程师', trigger: 'change'}, + ], + }, // 上传路径 uploadPath: 'api/att/attFile/upload', acceptShow: false, @@ -583,6 +592,13 @@ export default { workChange(data) { this.workChangeList = data }, + //工作组取消按钮 + closeWorkDrawer(){ + this.workModel = false + this.workSearch.workGroupName = '' + this.getWorkData() + this.$refs.workGroup.clearSelection() + }, OkWork(){ if(this.workChangeList.length > 1 ){ this.$message.warning('您只能选择一条数据进行带入') @@ -595,6 +611,7 @@ export default { this.$refs.qblx_pageData.validateField('wgLeaderName') } this.workModel = false + this.workSearch.workGroupName = '' this.$refs.workGroup.clearSelection() } }, @@ -608,10 +625,12 @@ export default { }, res => { this.workData = res.data.records; this.total = res.data.total; + this.tableLoading = false }, e => { }); }, choiceLeader(){ + this.getWorkData() this.workModel = true }, choiceZRBM(type, title, id) { @@ -819,6 +838,8 @@ export default { if (this.btnType === 'edit') { let Items = JSON.parse(localStorage.getItem('obj')) this.addQblxData.esName = Items.esName + this.addQblxData.unit = Items.unit + this.addQblxData.unitName = Items.unitName this.addQblxData.dutyUnit = Items.dutyUnit this.addQblxData.dutyPeopleId = Items.dutyPeopleId this.addQblxData.dutyPeople = Items.dutyPeople @@ -977,7 +998,7 @@ export default { } if (finishCount === jsonData.length) { this.isSubmit = false - this.$router.push("/processCenter"); + this.$router.push('/processCenter') } this.isSubmit = false } else { @@ -1006,7 +1027,7 @@ export default { height: 100%; /deep/ .el-upload-list__item-name { - margin-left: 48px; + //margin-left: 48px; } /deep/ .el-upload-list { @@ -1098,6 +1119,10 @@ export default { border: 0; } } + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 6300cfc6c..a5acf3841 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -25,6 +25,7 @@

{{ item.name }} @@ -194,7 +195,7 @@ :enterpriseStandard="true" :placeholderText="'包括已有、应有的关联标准,如企业标准、行业标准、国家标准'" :config="{attrName: '引用标准'}" - :labelWidth="'180px'" + :labelWidth="'150px'" v-model="qbfsForm.esMatingRelations" > @@ -675,8 +676,20 @@ 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" } + ], + engineerName:[ + {required: true, message:'请选择相关单位、工程研究总院标准法规部', trigger: "change" } + ], }, roleForm: { prcCreateUserName: this.$store.getters.userInfo.userName, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index fabdcae36..1e3af279e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -46,6 +46,7 @@ - - - + + + + diff --git a/src/pages/processCenter/pages/processList/index.vue b/src/pages/processCenter/pages/processList/index.vue index 652cdc47f..56d9f6fd0 100644 --- a/src/pages/processCenter/pages/processList/index.vue +++ b/src/pages/processCenter/pages/processList/index.vue @@ -1,111 +1,117 @@ - - - - - - + + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue index e272a696b..fdc50378b 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue @@ -187,7 +187,7 @@ export default { size: this.$store.getters.userInfo.configContent, userId: this.$store.getters.userInfo.userId, prcName: this.searchForm.prcName, - prcType: parseInt(this.searchForm.prcType) || '', + prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType || '', prcNum: this.searchForm.prcNum }, { loading: 'loading', diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue index 978382242..9755777a1 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue @@ -216,7 +216,7 @@ export default { size: this.$store.getters.userInfo.configContent, userId: this.$store.getters.userInfo.userId, prcName: this.searchForm.prcName, - prcType: parseInt(this.searchForm.prcType) || '', + prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType ||'', prcNum: this.searchForm.prcNum }, { diff --git a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue index 77490902d..b96fcecab 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue @@ -1,7 +1,7 @@ @@ -587,7 +592,7 @@ class="add-form-item" > - + @@ -642,7 +647,7 @@ + @click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', sarBussionessStandEO.KCVPPSBMBUSS,true)"> @@ -1078,11 +1083,6 @@ > - - - - - - - + + v-model="sarBussionessSearch.CYCVPPSBMBUSS" + placeholder="请输入关联模块--乘用车VPPS编码" + > + + + + + + + + + @@ -1244,18 +1258,6 @@ @click.native="choiceQCR('QCRBUSS', '查询起草人', sarBussionessSearch['QCRBUSS'])"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + +

@@ -1398,17 +1398,11 @@ border :height="300" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', - fontWeight: 'bold', height: '48px'}" - @selection-change="selectReplaceStandNumRowChange"> - - + fontWeight: 'bold', height: '48px'}"> 0) { - if (this.drawerTitle2 === 'VPPS编码') { - this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",") - this.sarBussionessSearch.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") + if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') { + this.sarBussionessSearch.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",") + this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") } else { this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",") this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") } } else { - if (this.drawerTitle2 === 'VPPS编码') { - this.sarBussionessSearch.VPPSBMBUSS = checkedData.code - this.sarBussionessSearch.VPPSCNBUSS = checkedData.chineseName + if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') { + this.sarBussionessSearch.CYCVPPSBMBUSS = checkedData.code + this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.chineseName } else { this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.code this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.chineseName @@ -3368,7 +3362,7 @@ export default { }) }, // 点击查看 - handlePreview(item) { + handlePreview(item,fs) { // const mj = item.attrInfoMap.QBMJ // if (mj === 'GXNX7D6H59') { // // C1所有人都可查看 @@ -3446,10 +3440,11 @@ export default { let routeUrl = this.$router.resolve({ name: 'OtherBussStandardDetails', params: { - id: item.id, + id: fs ? (fs === 'fs' ? item.standId:item.id) : item.id, pageType: 'BUSINESS_STAND' } }) + console.log(routeUrl) window.open(routeUrl.href, '_blank') }, // 编辑 @@ -3539,9 +3534,20 @@ export default { // $('#deptBtn').click() $('#deptBtn2').click() }, - choiceQCR(type, title, id) { - this.nodeList = [] - this.nodeList.push(id) + choiceQCR(type, title, nameId) { + this.nodeList2 = [] + if (nameId) { + let nameId1 = nameId.split(',') + let idList = [] + nameId1.forEach(item => { + let a, b + a = item.substring(item.indexOf('(') +1) + b = a.substring(0, a.lastIndexOf(')')) + idList.push(b) + }) + idList = idList.join(',') + this.nodeList2.push(idList) + } this.userType = type this.drawerTitle = title this.modalShowRoleFlag = true @@ -3572,7 +3578,9 @@ export default { }, choiceQCDW(type, title, id) { this.nodeListZRBM = [] - this.nodeListZRBM.push(id) + if(this.sarBussionessStandEO.QCDWID && this.sarBussionessStandEO.QCDWID.length > 0){ + this.nodeListZRBM = this.sarBussionessStandEO.QCDWID.split(',') + } this.drawerTitle = title this.modalshowflagZRBM = true }, @@ -3593,7 +3601,16 @@ export default { this.sarBussionessSearch.QCDW = nameList } this.$set(this.sarBussionessStandEO, 'QCDWId', idList) - this.$set(this.sarBussionessStandEO, 'QCDW', nameList) + let tNameList = (this.sarBussionessStandEO.QCDW === null || this.sarBussionessStandEO.QCDW === '') ? nameList : this.sarBussionessStandEO.QCDW+','+nameList + const arr=new Set() + let permission = tNameList.split(","); + permission.forEach((item, index) => { + arr.add(item) + }) + + let nameNew=Array.from(arr).join(',') + this.$set(this.sarBussionessStandEO, 'QCDW', nameNew) + if (this.sarBussionessStandEO.QCRBUSS) { this.$refs.sarBussionessStandForm.validateField('QCDW') } @@ -3624,8 +3641,8 @@ export default { nowstandinfo.putTime = this.$dateFormat(this.sarBussionessStandEO.putTime, 'yyyy-MM-dd hh:mm:ss') } // 代替标准号 - if (nowstandinfo.replaceStandNum != null) { - nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/,/ig, ',') + if (this.sarBussionessStandEO["DTQBBHBUSS"] != null) { + nowstandinfo.replaceStandNum = this.sarBussionessStandEO["DTQBBHBUSS"].replace(/,/ig, ',') } if (nowstandinfo.replaceStandNum != null && nowstandinfo.replaceStandNum !== '') { nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/\r\n/g, '
') @@ -4323,37 +4340,29 @@ export default { formFieldList.forEach((item) => { const value = this.sarBussionessSearch[item.attrField] // 时间格式处理 - if (value !== undefined && value !== null && value !== "" && item.attrField === 'VPPSBMBUSS') { - advanceSearchVOList.push({ - connect: "and", - field: 'CYCVPPSBM', - type: 'like', - value: value - }); - }else if (value !== undefined && value !== null && value !== "" && item.attrField === 'VPPSCNBUSS') { - advanceSearchVOList.push({ - connect: "and", - field: 'CYCVPPSCN', - type: 'like', - value: value - }); - }else if (value !== undefined && value !== null && value !== "" && item.attrField !== 'BARQ') { + if (value !== undefined && value !== null && value !== "" && item.attrField === 'BARQ') { + advanceSearchVOList.push({ + connect: "and", + field: item.attrField || "", + type: 'EQUALS', + value: value + }); + }else if (value !== undefined && value !== null && value !== "" && (item.attrField === 'FZRQBUSS' || item.attrField === 'FSRQBUSS')) { advanceSearchVOList.push({ connect: advanceSearchVOList.length > 0 ? "and" : "", field: item.attrField || "", type: "between", + value: (value ? value[0]+','+value[1] : "") || "", + }); + }else if (value !== undefined && value !== null && value !== "") { + advanceSearchVOList.push({ + connect: "and", + field: item.attrField || "", + type: 'like', value: value }); } }) - if (formData.BARQ !== undefined && formData.BARQ !== null && formData.BARQ !== '') { - advanceSearchVOList.push({ - connect: "and", - field: 'BARQ', - type: 'EQUALS', - value: formData.BARQ - }); - } } formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList); this.SarExportSearchEo = formData; @@ -4744,6 +4753,8 @@ export default { } if (item.attrLen && item.attrType === 'INPUT_STR' && item.attrField === 'DTQBBHBUSS') { rule.push({type: 'string', max: 500, message: '代替企标编号不能超过500个字符', trigger: 'change'}) + }else if(item.attrLen && item.attrType === 'INPUT_STR'){ + rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'change'}) } if (item.attrLen && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'INPUT_STR') { rule.push({ diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 5f42f4f0c..fa068aab2 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -34,6 +34,7 @@
@@ -56,6 +58,7 @@ 新增 @@ -71,6 +74,7 @@ 删除
@@ -171,13 +175,13 @@ - + 查看 - + 编辑 - + 删除 diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue index 4f84584d3..b430fa953 100644 --- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue +++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue @@ -1419,13 +1419,13 @@ }, productModelAdd: { id : "", - sorDivide : "INLAND_STAND", + sorDivide : "FOREIGN_LAWS", menuName : "", parentId : null, parentIds : null, parentIdsName : "", displaySeq : "", - validFlag : "", + validFlag : "0", creationTime : "", modifyTime : "", remarks : "", @@ -2257,6 +2257,8 @@ saveProduct (name) { this.$refs[name].validate((valid) => { if (valid) { + this.productModelAdd.sorDivide = 'FOREIGN_LAWS' + this.productModelAdd.validFlag = '0' if (this.modalType === 1) { this.$http.postData('sarResource/ts-resource/add', this.productModelAdd, { _this: this @@ -2337,11 +2339,11 @@ if(row.parentIds.indexOf(res.data.id) != -1){ this.productModelAdd.parentIds = row.parentIds }else { - this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id + this.productModelAdd.parentIds = row.parentIds + res.data.id+',' idsName = row.parentIdsName + ',' + res.data.menuName } }else { - this.productModelAdd.parentIds = res.data.id + this.productModelAdd.parentIds = +','+res.data.id+',' idsName = res.data.menuName; } this.productModelAdd.parentId = res.data.id diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index dde83d670..93057dd81 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -160,7 +160,7 @@
编辑 + v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">编辑 - 管理主体: {{ localProEO.managementHostName || '-' }} - 开发主体: {{ localProEO.developmentHostName || '-' }} - 项目细分类:{{ localProEO.categoryName || '-' }} - 项目群: {{ localProEO.projectGroup }} - - - 项目编号: {{ localProEO.projectNumber }} - - -
- {{ localProEO.projectName }} -
-
-
- 项目名称: {{ - localProEO.projectName && localProEO.projectName.substring(0, 15) + "..." - }}
-
项目名称: {{ localProEO.projectName }} -
-
-
- 项目状态: {{ localProEO.projectStatus }} - - 当前节点: {{ localProEO.currentNode }} -
- - - 项目经理: {{ localProEO.uname }} - 项目计划开始时间: {{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }} - 项目计划完成时间: {{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} - - - -
- - - 清单版本: {{ detailedListVersion ? $moment(detailedListVersion).format('YYYY-MM-DD HH:mm:ss') : '-' }} - - - 导出 - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- 数据获取中 - - - -
-
-
- - -
-
- - - - - - - - - - - 查询 - - - - 清空 - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - -
- -
-
- -
- - -
-
-
- - -
-
- - - - - - - {{ opt.label }} - - - - - - - - - - - 查询 - - 清空 - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - -
- -
-
- -
- - - -
- 导出 - - 取消 -
-
- - - - - + + + + diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index b14655ab7..35056b440 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -83,7 +83,7 @@ width="80" align="center">
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 5f6d59b5e..35d6483b3 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -104,7 +104,7 @@ width="100" align="center"> diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue b/src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue index ea9994723..67ee31d0c 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue @@ -1,65 +1,65 @@ - - - - - - + + + + + + diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index c3dd3003f..fe5e79f2a 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -1,747 +1,747 @@ - - - - - - + + + + + + diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue index 20ed38df5..82c3903a4 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue @@ -7,6 +7,7 @@
@@ -26,6 +28,7 @@ size="mini" class="common-button-primary" v-if="editButton" + v-btn-permission="'a3803aae3f65134dee97c6b03680d4f9'" @click="editItem"> 编辑 @@ -33,6 +36,7 @@ type="primary" size="mini" class="common-button-primary" + v-btn-permission="'db4ab168afb99c61d4f986c9746a7c65'" v-if="seeButton" @click="seeItem"> 查看 @@ -42,6 +46,7 @@ size="mini" class="common-button-primary" v-if="seeItemButton" + v-btn-permission="'e99a7847d5d9d04d4423e8f69e77f080'" @click="handlePreview(standId)"> 查看标准 @@ -50,6 +55,7 @@ size="mini" class="common-button-default" v-if="delectButton" + v-btn-permission="'b1391e768988c363b177419e2ae16633'" @click="delItem"> 删除 diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue index 30b5ee558..a63af522a 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue @@ -10,6 +10,7 @@ size="mini" class="common-button-primary" v-if="addButton" + v-btn-permission="'9b99ffc92c0100dab08b9fd0037e2b06'" @click="addItem"> 新增 @@ -18,6 +19,7 @@ size="mini" class="common-button-primary" v-if="addItemButton" + v-btn-permission="'fc429d36f2d117f13f079aab59c28338'" @click="addItem2"> 新增政策 @@ -26,6 +28,7 @@ size="mini" class="common-button-primary" v-if="editButton" + v-btn-permission="'8088f3612c206cb5ca5040091a08ac86'" @click="editItem"> 编辑 @@ -34,6 +37,7 @@ size="mini" class="common-button-primary" v-if="seeButton" + v-btn-permission="'4abd63ca838a6845bdf6a9e8cbc8ad5b'" @click="seeItem"> 查看 @@ -42,6 +46,7 @@ size="mini" class="common-button-primary" v-if="seeItemButton" + v-btn-permission="'acc9bf3585de7dbf7282cc3cf4fb6337'" @click="handlePreview(standId)"> 查看政策 @@ -50,6 +55,7 @@ size="mini" class="common-button-default" v-if="delectButton" + v-btn-permission="'19e9ff56a1d5dcde2710036d5cc53ebb'" @click="delItem"> 删除 diff --git a/src/pages/regulatoryRepository/workingGroup/index.vue b/src/pages/regulatoryRepository/workingGroup/index.vue index d171a7858..f3c350c94 100644 --- a/src/pages/regulatoryRepository/workingGroup/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/index.vue @@ -14,7 +14,7 @@ - 工作组统计 + 工作组统计