diff --git a/src/api/process.js b/src/api/process.js index 75837c078..ab709c7b6 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -472,7 +472,7 @@ export function afterConferenceProcess (data) { }) } -// 国外标准清单流程入库 +// 海外标准清单流程入库 export function foreignAccessProcess (data) { return axios({ url: '/api/lawss/actSarItems/foreignAccessProcess', diff --git a/src/assets/languages/cn.js b/src/assets/languages/cn.js index b6d3f833c..b1d4e6388 100644 --- a/src/assets/languages/cn.js +++ b/src/assets/languages/cn.js @@ -28,9 +28,9 @@ export const m = { more: '更多', dataCenter: '资料中心', domesticStandardDatabase: '国内标准法规', - foreignStandardDatabase: '国外标准法规', + foreignStandardDatabase: '海外标准法规', domesticRegulationsDatabase: '国内政策', - foreignRegulationsDatabase: '国外政策', + foreignRegulationsDatabase: '海外政策', enterpriseStandardDatabase: '企业标准法规', accessStandardsAndRegulations: '标准法规清单', testItemDatabase: '试验项目库', diff --git a/src/components/CustomFormComponents/InputForRecord.vue b/src/components/CustomFormComponents/InputForRecord.vue index d596d83e4..6c516aaae 100644 --- a/src/components/CustomFormComponents/InputForRecord.vue +++ b/src/components/CustomFormComponents/InputForRecord.vue @@ -49,7 +49,7 @@ v-model="replaceLawsNumForm.standType" placeholder="请选择标准来源"> - + diff --git a/src/components/CustomFormComponents/InputForStandAndForeign.vue b/src/components/CustomFormComponents/InputForStandAndForeign.vue index 50545c954..b2b096e46 100644 --- a/src/components/CustomFormComponents/InputForStandAndForeign.vue +++ b/src/components/CustomFormComponents/InputForStandAndForeign.vue @@ -45,7 +45,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue index 551ab711e..6c602c3d2 100644 --- a/src/components/CustomFormComponents/InputForStandards.vue +++ b/src/components/CustomFormComponents/InputForStandards.vue @@ -57,7 +57,7 @@ v-model="replaceLawsNumForm.standType" placeholder="请选择标准来源"> - + diff --git a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue index 343a535f9..ef68b3685 100644 --- a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue +++ b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue @@ -220,7 +220,7 @@ export default { // 数据搜索 数据来源list dataSourceOptions: [ {value: 'INLAND_STAND', label: '国内标准法规'}, - {value: 'FOREIGN_STAND', label: '国外标准法规'}, + {value: 'FOREIGN_STAND', label: '海外标准法规'}, {value: 'BUSINESS', label: '企业标准 '} ], dataSource: 'BUSINESS' diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue index 97e82af5c..23b43b317 100644 --- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue +++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue @@ -47,7 +47,7 @@ placeholder="请选择标准来源"> - + diff --git a/src/components/CustomFormComponents/InputForStandardsForLaws.vue b/src/components/CustomFormComponents/InputForStandardsForLaws.vue index 989ebce32..e29b58902 100644 --- a/src/components/CustomFormComponents/InputForStandardsForLaws.vue +++ b/src/components/CustomFormComponents/InputForStandardsForLaws.vue @@ -207,7 +207,7 @@ export default { // 数据搜索 数据来源list dataSourceOptions: [ {value: 'INLAND_STAND', label: '国内标准法规'}, - {value: 'FOREIGN_STAND', label: '国外标准法规'}, + {value: 'FOREIGN_STAND', label: '海外标准法规'}, {value: 'BUSINESS', label: '企业标准 '}, {value: 'LAWS_STAND', label: '国内外政策'} ], diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index a7a5ef697..8ec8655e0 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -112,7 +112,7 @@ menuId: '3e3657498664beaa0dc1de1ecb3ae0da' }, { - title: '国外标准', + title: '海外标准', path: '/foreignStandardsAndRegulations', menuId: '18c1e5134ea0cf865e8960b26b81fd8c' }, diff --git a/src/pages/config/pages/attributeCustom/components/buss.vue b/src/pages/config/pages/attributeCustom/components/buss.vue index 04f007d9b..209b5128a 100644 --- a/src/pages/config/pages/attributeCustom/components/buss.vue +++ b/src/pages/config/pages/attributeCustom/components/buss.vue @@ -377,12 +377,12 @@ export default { ], sarTypeOptions: [ { label: '国内标准法规', value: 'INLAND_STAND' }, - { label: '国外标准法规', value: 'FOREIGN_STAND' }, - { label: '国内及国外标准法规', value: 'STAND' } + { label: '海外标准法规', value: 'FOREIGN_STAND' }, + { label: '国内及海外标准法规', value: 'STAND' } ], sarTypeLocationOptions: [ { label: '国内标准法规', value: 'INLAND_STAND' }, - { label: '国外标准法规', value: 'FOREIGN_STAND' } + { label: '海外标准法规', value: 'FOREIGN_STAND' } ], isMustOptions: [ { label: '是', value: '0' }, @@ -727,9 +727,9 @@ export default { if (type === 'INLAND_STAND') { texts = '国内标准法规' } else if (type === 'FOREIGN_STAND') { - texts = '国外标准法规' + texts = '海外标准法规' } else if (type === 'STAND') { - texts = '国内及国外标准法规' + texts = '国内及海外标准法规' } else if (type === 'BUSS') { texts = '企业标准库' } diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue index ab8a9f10c..13104f3fb 100644 --- a/src/pages/config/pages/attributeCustom/components/stand.vue +++ b/src/pages/config/pages/attributeCustom/components/stand.vue @@ -366,12 +366,12 @@ export default { ], sarTypeOptions: [ { label: '国内标准法规', value: 'INLAND_STAND' }, - { label: '国外标准法规', value: 'FOREIGN_STAND' }, - { label: '国内及国外标准法规', value: 'STAND' } + { label: '海外标准法规', value: 'FOREIGN_STAND' }, + { label: '国内及海外标准法规', value: 'STAND' } ], sarTypeLocationOptions: [ { label: '国内标准法规', value: 'INLAND_STAND' }, - { label: '国外标准法规', value: 'FOREIGN_STAND' } + { label: '海外标准法规', value: 'FOREIGN_STAND' } ], isMustOptions: [ { label: '是', value: '0' }, @@ -710,9 +710,9 @@ export default { if (type === 'INLAND_STAND') { texts = '国内标准法规' } else if (type === 'FOREIGN_STAND') { - texts = '国外标准法规' + texts = '海外标准法规' } else if (type === 'STAND') { - texts = '国内及国外标准法规' + texts = '国内及海外标准法规' } return texts }, diff --git a/src/pages/details/otherStandardDetails/pages/standInvolveProjectDetailTwo.vue b/src/pages/details/otherStandardDetails/pages/standInvolveProjectDetailTwo.vue index 7321bbdf1..7b5ea27ee 100644 --- a/src/pages/details/otherStandardDetails/pages/standInvolveProjectDetailTwo.vue +++ b/src/pages/details/otherStandardDetails/pages/standInvolveProjectDetailTwo.vue @@ -82,7 +82,7 @@ > 国内标准法规 - 国外标准法规 + 海外标准法规 国内政策 国内外政策 企业标准 diff --git a/src/pages/details/otherStandardDetails/pages/technologyInvolveProjectTwo.vue b/src/pages/details/otherStandardDetails/pages/technologyInvolveProjectTwo.vue index 8194eadd0..4ae4b8199 100644 --- a/src/pages/details/otherStandardDetails/pages/technologyInvolveProjectTwo.vue +++ b/src/pages/details/otherStandardDetails/pages/technologyInvolveProjectTwo.vue @@ -82,7 +82,7 @@ > 国内标准法规 - 国外标准法规 + 海外标准法规 国内政策 国内外政策 企业标准 diff --git a/src/pages/details/otherStandardExternalDetails/index.vue b/src/pages/details/otherStandardExternalDetails/index.vue index f90cb050d..414ddd4db 100644 --- a/src/pages/details/otherStandardExternalDetails/index.vue +++ b/src/pages/details/otherStandardExternalDetails/index.vue @@ -3067,7 +3067,7 @@ export default { this.$message.error('没有在线预览文档权限!') } } else { - // 国外在线预览权限 + // 海外在线预览权限 if (this.$hasPermission('ee684b4a9975f5d8a6dfe898c0332f98')) { // if (this.$hasPermission('02fd6eff0537c283dd071683de10689f')) { diff --git a/src/pages/details/otherStandardExternalDetails/pages/standInvolveProjectDetailTwo.vue b/src/pages/details/otherStandardExternalDetails/pages/standInvolveProjectDetailTwo.vue index 7321bbdf1..7b5ea27ee 100644 --- a/src/pages/details/otherStandardExternalDetails/pages/standInvolveProjectDetailTwo.vue +++ b/src/pages/details/otherStandardExternalDetails/pages/standInvolveProjectDetailTwo.vue @@ -82,7 +82,7 @@ > 国内标准法规 - 国外标准法规 + 海外标准法规 国内政策 国内外政策 企业标准 diff --git a/src/pages/details/otherStandardExternalDetails/pages/technologyInvolveProjectTwo.vue b/src/pages/details/otherStandardExternalDetails/pages/technologyInvolveProjectTwo.vue index 8194eadd0..4ae4b8199 100644 --- a/src/pages/details/otherStandardExternalDetails/pages/technologyInvolveProjectTwo.vue +++ b/src/pages/details/otherStandardExternalDetails/pages/technologyInvolveProjectTwo.vue @@ -82,7 +82,7 @@ > 国内标准法规 - 国外标准法规 + 海外标准法规 国内政策 国内外政策 企业标准 diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue index 3faa1b688..26ce7d07a 100644 --- a/src/pages/home/index.vue +++ b/src/pages/home/index.vue @@ -85,7 +85,7 @@ export default { value: 'stand' }, { - label: '国外标准法规', // value没改 + label: '海外标准法规', // value没改 value: 'bussstand' }, { diff --git a/src/pages/home/information.vue b/src/pages/home/information.vue index 8b7a43e72..44065aabf 100644 --- a/src/pages/home/information.vue +++ b/src/pages/home/information.vue @@ -192,7 +192,7 @@ export default { value: 'stand' }, { - label: '国外标准法规', // value没改 + label: '海外标准法规', // value没改 value: 'bussstand' }, { @@ -1043,7 +1043,7 @@ export default { }) } break - // 国外标准法规清单发布/更新流程 + // 海外标准法规清单发布/更新流程 case '18': if (row.taskInfo === '会签人审批') { this.$router.push({ diff --git a/src/pages/home1/components/searchGroup/index.vue b/src/pages/home1/components/searchGroup/index.vue index e32880a20..e093baabe 100644 --- a/src/pages/home1/components/searchGroup/index.vue +++ b/src/pages/home1/components/searchGroup/index.vue @@ -48,7 +48,7 @@ export default { value: 'stand' }, { - label: '国外标准法规', // value没改 + label: '海外标准法规', // value没改 value: 'bussstand' }, // { diff --git a/src/pages/home1/index.vue b/src/pages/home1/index.vue index d3f6583f5..f8b5613b0 100644 --- a/src/pages/home1/index.vue +++ b/src/pages/home1/index.vue @@ -115,9 +115,9 @@ export default { this.$router.push({name: 'standardForComments'}) break case 'release': - this.$confirm('请选择国内/国外标准', { + this.$confirm('请选择国内/海外标准', { confirmButtonText: '国内标准', - cancelButtonText: '国外标准', + cancelButtonText: '海外标准', type: 'warning', center: true }).then(() => { diff --git a/src/pages/home2/components/searchGroup/index.vue b/src/pages/home2/components/searchGroup/index.vue index 99ab3a6f3..761069665 100644 --- a/src/pages/home2/components/searchGroup/index.vue +++ b/src/pages/home2/components/searchGroup/index.vue @@ -51,7 +51,7 @@ export default { value: 'stand' }, { - label: '国外标准法规', // value没改 + label: '海外标准法规', // value没改 value: 'bussstand' }, // { diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue index 8d6e0b874..0b507b8e3 100644 --- a/src/pages/home2/index.vue +++ b/src/pages/home2/index.vue @@ -101,9 +101,9 @@ export default { this.$router.push({name: 'standardForComments'}) break case 'release': - this.$confirm('请选择国内/国外标准', { + this.$confirm('请选择国内/海外标准', { confirmButtonText: '国内标准', - cancelButtonText: '国外标准', + cancelButtonText: '海外标准', type: 'warning', center: true }).then(() => { diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index c396b1056..39414f851 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -176,7 +176,7 @@ 企业标准 - 国外标准法规 + 海外标准法规 国内标准法规 国内政策 国外政策 diff --git a/src/pages/personal/pages/my-collection/collectionDetail/CollectionStandardDetail.vue b/src/pages/personal/pages/my-collection/collectionDetail/CollectionStandardDetail.vue index e809aeedc..343ddb717 100644 --- a/src/pages/personal/pages/my-collection/collectionDetail/CollectionStandardDetail.vue +++ b/src/pages/personal/pages/my-collection/collectionDetail/CollectionStandardDetail.vue @@ -1008,7 +1008,7 @@ export default { if (this.$route.params.pageType === 'INLAND_STAND') { this.showModalTitle = '国内标准法规条目' } else { - this.showModalTitle = '国外标准法规条目' + this.showModalTitle = '海外标准法规条目' } // 从数据库中查询各下拉框数据 this.$http.get('sys/dictype/getDicTypeListCode', '', { diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue index 77be8883e..dab85f964 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue @@ -50,7 +50,7 @@ - 所属板块:{{ item.collectType === 'INLAND_STAND' ? '国内标准法规' : (item.collectType === 'FOREIGN_STAND' ? '国外标准法规' : '企业标准') }} + 所属板块:{{ item.collectType === 'INLAND_STAND' ? '国内标准法规' : (item.collectType === 'FOREIGN_STAND' ? '海外标准法规' : '企业标准') }} diff --git a/src/pages/personal/pages/my-forward/index.vue b/src/pages/personal/pages/my-forward/index.vue index 3aa3bd38a..1c10d153f 100644 --- a/src/pages/personal/pages/my-forward/index.vue +++ b/src/pages/personal/pages/my-forward/index.vue @@ -51,7 +51,7 @@ 所属板块:资料中心 所属板块:国内外政策 所属板块:国内标准法规 - 所属板块:国外标准法规 + 所属板块:海外标准法规 所属板块:企业标准 所属板块:标准拆分 所属板块:动态信息 @@ -243,7 +243,7 @@ export default { /** * 跳转到各个详情页 * INLAND_STAND 国内标准详情 - * FOREIGN_STAND 国外标准详情 + * FOREIGN_STAND 海外标准详情 * FOREIGN_LAWS 国内外政策 * BUSINESS_STAND 企业标准库 * RESOURCE_MSG 资料中心 diff --git a/src/pages/personal/pages/my-push/index.vue b/src/pages/personal/pages/my-push/index.vue index 8a7d862ae..1691ced38 100644 --- a/src/pages/personal/pages/my-push/index.vue +++ b/src/pages/personal/pages/my-push/index.vue @@ -49,7 +49,7 @@ 所属板块:资料中心 所属板块:国内外政策 所属板块:国内标准法规 - 所属板块:国外标准法规 + 所属板块:海外标准法规 所属板块:企业标准 所属板块:动态信息 所属板块:标准拆分 diff --git a/src/pages/personal/pages/my-questions/components/questionDetail.vue b/src/pages/personal/pages/my-questions/components/questionDetail.vue index 973f33b00..f284d082f 100644 --- a/src/pages/personal/pages/my-questions/components/questionDetail.vue +++ b/src/pages/personal/pages/my-questions/components/questionDetail.vue @@ -40,7 +40,7 @@ export default { }, methods:{ back() { - this.$router.push({path: "/questions"}); + this.$router.go(-1) }, getDetail(){ this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{ diff --git a/src/pages/personal/pages/questionsAndAnswers/components/QuestionItemInfo.vue b/src/pages/personal/pages/questionsAndAnswers/components/QuestionItemInfo.vue index 4bf70d3e8..0bf952646 100644 --- a/src/pages/personal/pages/questionsAndAnswers/components/QuestionItemInfo.vue +++ b/src/pages/personal/pages/questionsAndAnswers/components/QuestionItemInfo.vue @@ -42,7 +42,7 @@ export default { resType() { const matcher = { INLAND_STAND: '国内标准', - FOREIGN_STAND: '国外标准', + FOREIGN_STAND: '海外标准', FOREIGN_LAWS: '国内外政策', BUSINESS: '企业标准' } diff --git a/src/pages/personal/pages/questionsAndAnswers/components/QuestionItemTitle.vue b/src/pages/personal/pages/questionsAndAnswers/components/QuestionItemTitle.vue index d2266545c..54025868a 100644 --- a/src/pages/personal/pages/questionsAndAnswers/components/QuestionItemTitle.vue +++ b/src/pages/personal/pages/questionsAndAnswers/components/QuestionItemTitle.vue @@ -39,7 +39,7 @@ export default { resType() { const matcher = { INLAND_STAND: '国内标准', - FOREIGN_STAND: '国外标准', + FOREIGN_STAND: '海外标准', FOREIGN_LAWS: '国内外政策', BUSINESS: '企业标准' } diff --git a/src/pages/personal/pages/questionsAndAnswers_old2/components/CollapseItemInfo.vue b/src/pages/personal/pages/questionsAndAnswers_old2/components/CollapseItemInfo.vue index 70f743850..c1d5179e8 100644 --- a/src/pages/personal/pages/questionsAndAnswers_old2/components/CollapseItemInfo.vue +++ b/src/pages/personal/pages/questionsAndAnswers_old2/components/CollapseItemInfo.vue @@ -43,7 +43,7 @@ export default { resType() { const matcher = { INLAND_STAND: '国内标准', - FOREIGN_STAND: '国外标准', + FOREIGN_STAND: '海外标准', FOREIGN_LAWS: '国内外政策', BUSINESS: '企业标准' } diff --git a/src/pages/personal/pages/questionsAndAnswers_old2/components/CollapseItemTitle.vue b/src/pages/personal/pages/questionsAndAnswers_old2/components/CollapseItemTitle.vue index 67febbfa1..d41cbf2f1 100644 --- a/src/pages/personal/pages/questionsAndAnswers_old2/components/CollapseItemTitle.vue +++ b/src/pages/personal/pages/questionsAndAnswers_old2/components/CollapseItemTitle.vue @@ -29,7 +29,7 @@ export default { resType() { const matcher = { INLAND_STAND: '国内标准', - FOREIGN_STAND: '国外标准', + FOREIGN_STAND: '海外标准', FOREIGN_LAWS: '国内外政策', BUSINESS: '企业标准' } diff --git a/src/pages/phone/databaseSearch.vue b/src/pages/phone/databaseSearch.vue index 15ef45b55..0938dbbd0 100644 --- a/src/pages/phone/databaseSearch.vue +++ b/src/pages/phone/databaseSearch.vue @@ -30,7 +30,7 @@ 标准类别: 国内标准 - 国外标准 + 海外标准 企业标准 发布日期: {{item.issue_time}} diff --git a/src/pages/phone/domesticDetails.vue b/src/pages/phone/domesticDetails.vue index 7deebf9bc..f722b06e7 100644 --- a/src/pages/phone/domesticDetails.vue +++ b/src/pages/phone/domesticDetails.vue @@ -74,6 +74,46 @@ - + + + + {{ child.attrName }} + + + + + {{ file.oldFileName | ellipsis50}} + + + + + + + {{ file.oldFileName | ellipsis50}} + + + + + + 标准分解单 + + + + - + + + - @@ -300,7 +340,7 @@ @@ -1805,6 +1845,14 @@ } return child5 }, + child6Func(child6) { + const list = [] + if (child6 && child6.length > 1) { + list.push(child6[0]) + return list + } + return child6 + }, handleChange(val) { }, handleChange1(val) { @@ -3355,6 +3403,14 @@ location['child5'] = childList } + //修订本 + if (!list[0].child) { + location['child6'] = [] + } else { + const childList = list[0].child.filter(item => item.attrField === 'FBGYWBD'); + location['child6'] = childList + + } } // 动态属性字段-SYRZ 单独添加至基础信息 const list2 = displayLocation.filter(item => item.label === '适用范围'); diff --git a/src/pages/phone/domesticStand.vue b/src/pages/phone/domesticStand.vue index 3efd248cb..ea0c575bf 100644 --- a/src/pages/phone/domesticStand.vue +++ b/src/pages/phone/domesticStand.vue @@ -502,7 +502,7 @@ export default { }, mounted() { this.titleType = this.$route.query.standType - this.titleName = this.titleType === 'INLAND' ? '国内标准法规库' : (this.titleType === 'FOREIGN' ? '国外标准法规库' : this.titleType === 'POLICY' ? '国内外政策库' : '标准化动态库' ) + this.titleName = this.titleType === 'INLAND' ? '国内标准法规库' : (this.titleType === 'FOREIGN' ? '海外标准法规库' : this.titleType === 'POLICY' ? '国内外政策库' : '标准化动态库' ) this.standSearch() this.$refs.cardBox.addEventListener('scroll', this.scrool); //从数据库中查询下拉框数据 diff --git a/src/pages/phone/phoneHome.vue b/src/pages/phone/phoneHome.vue index 4d3f293fd..97c0a4773 100644 --- a/src/pages/phone/phoneHome.vue +++ b/src/pages/phone/phoneHome.vue @@ -25,7 +25,7 @@ - 国外标准法规 + 海外标准法规 diff --git a/src/pages/processCenter/pages/components/ProcessSearchAllStandard.vue b/src/pages/processCenter/pages/components/ProcessSearchAllStandard.vue index 994c0098d..782278776 100644 --- a/src/pages/processCenter/pages/components/ProcessSearchAllStandard.vue +++ b/src/pages/processCenter/pages/components/ProcessSearchAllStandard.vue @@ -43,7 +43,7 @@ placeholder="请选择" > - + diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index d84ba991e..f75b66c3b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -205,13 +205,13 @@ @submit="handleSubmit" > - - - - - - - { - let mes = JSON.parse(res.mes) + debugger + let obj = JSON.parse(res.mes) + let mes = {} + if(obj.json !== undefined){ + mes = obj.json + }else { + mes = obj + } this.rh_pageData = mes.rh_pageData this.commentInfo = mes.commentInfo this.roleForm = mes.roleForm diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue index 8f138f33e..e2463f636 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue @@ -184,7 +184,7 @@ @submit="handleSubmit" > - - - - - - - - - - - - - - 国内标准入库 - 国外标准入库 + 海外标准入库 @@ -700,9 +700,14 @@ - + + 维护 @@ -1132,6 +1137,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -1250,19 +1307,19 @@ - - - - - + @@ -1490,8 +1547,46 @@ export default { } callback() } + /** + * 验证不为0的正整数正则 + * */ + const validStandNumInCompile2 = (rule, value, callback) => { + // let pattern = /^\d+$/ + let pattern = /^[1-9]\d*$/ + setTimeout(() => { + if (!pattern.test(value)) { + return callback(new Error('仅能输入正整数')) + } else { + callback() + } + }) + } return { disabledXX:!!this.$route.query.disabledXX, + productTitle: '', // 模态框标题 + productModelAdd: { + // 模态框信息 + dicTypeName: '', + showIndex: '', + // 描述 + describes: '', + // 唯一辨识 + dicId: '4upkjyo34koluwmld5us' // 写死 数据字段ID + }, + productRules: { + dicTypeName: [ + {required: true, message: '选项不能为空', trigger: 'blur'}, + {type: 'string', max: 100, message: '最多输入100位', trigger: 'blur'} + ], + showIndex: [ + {type: 'number', required: true, message: '排序号不能为空且为正整数', trigger: 'blur'}, + {type: 'string', validator: validStandNumInCompile2, trigger: 'blur'} + ], + describes: [ + {type: 'string', max: 500, message: '最多输入500位', trigger: 'blur'} + ] + }, + productModal: false, // 模态框是否打开 textList: [], gdType: '', //归档位置的赋值 standTypeModel: 'INLAND', @@ -1865,7 +1960,7 @@ export default { this.verifySarStandard = false this.standardSearchForm.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' - // 国内英文名称不必填 国外必填 + // 国内英文名称不必填 海外必填 if (this.form.standInData === '1') { this.rules.standEnName[0].required = true; } else { @@ -1995,6 +2090,12 @@ export default { // }, }, methods: { + // 新增 + productAdd () { + this.productModal = true + this.productTitle = '维护起草单位' + this.productModelAdd.dicTypeCode = '' + }, checkIsOnly() { let standType = '' if(this.submitType !== 1){ @@ -2043,8 +2144,8 @@ export default { // 标准来源改变事件 standInChange(val) { this.verifySarStandard = false - /** val === '1' (国外) val === '0'( 国内 )*/ - // 国内英文名称不必填 国外必填 ,标准性质国内不体现 + /** val === '1' (海外) val === '0'( 国内 )*/ + // 国内英文名称不必填 海外必填 ,标准性质国内不体现 if(this.rules){ if (val === '1') { this.rules.standName[0].required = false @@ -3320,6 +3421,51 @@ export default { popoverHideModelCancel2() { this.modalShowFlag5 = false }, + closeModal () { + this.productModal = false + this.closeDrawerProductModelAdd() + }, + saveProduct (name) { + this.$refs[name].validate((valid) => { + if (valid) { + this.$http.postData('sys/dictype/create', this.productModelAdd, { + _this: this + }, res => { + if (res.ok) { + this.getDataAsync() + this.productModal = false + this.productModelAdd = { + // 模态框信息 + dicTypeName: '', + showIndex: '', + // 描述 + describes: '', + // 唯一辨识 + dicId: '4upkjyo34koluwmld5us' + } + } else { + this.productModal = true + } + }, e => {}) + } else { + } + }) + }, + closeDrawerProductModelAdd () { + this.$nextTick(() => { + this.$refs['productModelAdd'].resetFields() + this.productModelAdd = { + // 模态框信息 + dicTypeName: '', + showIndex: '', + // 描述 + describes: '', + // 唯一辨识 + dicId: '4upkjyo34koluwmld5us' + } + }) + this.productModal = false + }, closeDrawer() { this.ListModel = false }, @@ -3581,6 +3727,49 @@ export default { this.modelOptions = res.data }) }, + getDicTypeListCode(res,json) { + return new Promise((resolve, reject) => { + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + const history = res; + resolve(history) + }) + }) + }, + async getDataAsync(){ + let res = await this.getDicTypeListCode() + if(res && res.data){ + this.countryOptions = res.data.COUNTRY//国家地区 + this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 + this.standNatureOptions = res.data.SARPROPERTY // 标准性质 + const standOptions = [] + res.data.WBZTCLASS.forEach(item=>{ + if( item.label === '草案' || item.label === '征求意见' || item.label === '送审' || item.label === '报批' || item.label === '发布'){ + standOptions.push(item) + } + }) + this.standStateOptions0 = standOptions // 文本状态 + this.standStateOptions1 = res.data.WBZTCLASS + this.standSystemOptions = res.data.BZTXCLASS // 标准体系 + this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型 + this.categoryOptions.options = res.data.NYLXCLASS // 能源类型 + this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证 + this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名 + this.wssmrOptions = res.data.WSSMR // 我司署名人 + this.sycpxOptions.options = res.data.SYCPXCLASS // 适用产品线 + this.zrbmOptions.options = res.data.ZRBMCLASS // 责任部门 + this.zrgcsOptions.options = res.data.ZRGCSCLASS // 责任工程师 + this.qcdwOption = res.data.QCDW // 体系类别 + this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 + this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 + this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.setMap(this.standStateOptions0) + this.setMap(this.standStateOptions1) + + } + }, }, mounted() { this.getTree() diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 20b7f46ab..fe544e0a5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -27,7 +27,7 @@ 国内标准入库 - 国外标准入库 + 海外标准入库 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index a6c024068..bc50dc65c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -28,7 +28,7 @@ 国内标准入库 - 国外标准入库 + 海外标准入库 @@ -1446,7 +1446,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + @@ -1891,8 +1891,8 @@ export default { standInChange(val) { this.verifySarStandard = false - /** val === '1' (国外) val === '0'( 国内 )*/ - // 国内英文名称不必填 国外必填 ,标准性质国内不体现 + /** val === '1' (海外) val === '0'( 国内 )*/ + // 国内英文名称不必填 海外必填 ,标准性质国内不体现 if (val === '1') { this.rules.standName[0].required = false this.rules.standEnName[0].required = true; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 646db6893..c00cdd9b2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -242,7 +242,7 @@ - + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index d78178e42..5ed90732c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -215,7 +215,7 @@ @submit="handleSubmit" > - - + @@ -300,20 +300,20 @@ - - - - + - - - - - - - - - - + @@ -828,20 +828,20 @@ 提交 - - - + @@ -874,7 +874,7 @@ - 取消 - - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue index 86d69ab8c..f104e041d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue @@ -251,7 +251,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index abdc33c9a..f72cdae74 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -270,7 +270,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue index f7a3c1280..a938f80b2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue @@ -253,7 +253,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue index a54f42072..2d774e709 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue @@ -259,7 +259,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 3d682fa2b..4bb710972 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -313,7 +313,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue index b84aa7033..e99c1b176 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue @@ -249,7 +249,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue index 3c6f436df..9f812fcdf 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -404,7 +404,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 363686aa1..4ac222f41 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -382,7 +382,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue index 9e5d5c392..d5f8bfdce 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue @@ -252,7 +252,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue index 804afa0c7..7d5840ea7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue @@ -251,7 +251,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue index 4d02cc700..44705d8e6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue @@ -251,7 +251,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index a70759985..7c32800ba 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -313,7 +313,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 6075d172d..be7310122 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -382,7 +382,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue index aba96da48..3ea685039 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue @@ -255,7 +255,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 542bc93cc..90998c885 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -729,7 +729,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + @@ -811,20 +811,20 @@ 提交 - - - + @@ -857,7 +857,7 @@ - 取消 - - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue index 0280d5f20..04d392e7c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue @@ -259,7 +259,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 4a015240c..cd94b7a5b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -272,7 +272,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index 474b850b6..dacadf1d2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -384,7 +384,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue index 834f8b8f2..6c4bb9194 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue @@ -257,7 +257,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index 337ad0e7f..a5c66ef99 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -578,7 +578,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index 1ee332ea4..d3f938922 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -357,7 +357,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue index 8d682a1a2..d54e207e9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue @@ -178,7 +178,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index c38ee1501..64b50e824 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -316,7 +316,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index 8eaef631c..629b29244 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -519,7 +519,7 @@ placeholder="请选择标准来源" @change="dataSourceChange"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index b051e7a47..7e61bc13f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -193,7 +193,7 @@ - - - - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 数据获取中 - - - - - + diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 86fbe87da..6b41912b7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -208,7 +208,7 @@ - - - - + diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index 8ef2bcf09..eaf8cca6e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -248,7 +248,7 @@ :popper-append-to-body="false" placeholder="请选择标准来源"> - + diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index 207159694..f8f41520f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -248,7 +248,7 @@ :popper-append-to-body="false" placeholder="请选择标准来源"> - + diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue index 22d3b91d4..72de88509 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue @@ -241,7 +241,7 @@ :popper-append-to-body="false" placeholder="请选择标准来源"> - + diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step1.vue b/src/pages/processCenter/pages/creatProcess/zcch/step1.vue index b4a9eecd0..7422973cb 100644 --- a/src/pages/processCenter/pages/creatProcess/zcch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zcch/step1.vue @@ -378,7 +378,7 @@ - - - - + @@ -724,20 +724,20 @@ 提交 - - - + @@ -770,7 +770,7 @@ - - + diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue index 5c5a6e7c0..e23977757 100644 --- a/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue @@ -170,7 +170,7 @@ - - - - + + + {{ value.name }} + + + - - + + {{ value.name }} @@ -455,6 +463,7 @@ export default { textStatusMap: {}, // 文本状态id与name对应 xgdFileMap: [], fbgbjbdFileMap: [], + fbgywbdFileMap: [], bpgFileMap: [], ssgFileMap: [], zqyjgFileMap: [], @@ -531,6 +540,7 @@ export default { // 文本信息 ca: '', // 草案 fbgbjbd: '', // 发布稿 + fbgywbd: '', // 发布稿 译文 xgd: '', // 修改单 bpg: '', // 报批稿 ssg: '', // 送审稿 @@ -541,6 +551,7 @@ export default { kwj: '', // 勘误件 caName: '', // 草案 fbgbjbdName: '', // 发布稿 + fbgywbdName: '', // 发布稿 译文 xgdName: '', // 修改单 bpgName: '', // 报批稿 ssgName: '', // 送审稿 diff --git a/src/pages/processCenter/pages/processAcceptDetail/index.vue b/src/pages/processCenter/pages/processAcceptDetail/index.vue index 31d9fa712..b6d65e49f 100644 --- a/src/pages/processCenter/pages/processAcceptDetail/index.vue +++ b/src/pages/processCenter/pages/processAcceptDetail/index.vue @@ -801,7 +801,7 @@ export default { }) } break - // 国外标准法规清单发布/更新流程 + // 海外标准法规清单发布/更新流程 case '18': if (row.taskInfo === '会签审批') { this.$router.push({ diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 8324f0fda..150e6d018 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -863,7 +863,7 @@ export default { }) } break - // 国外标准法规清单发布/更新流程 + // 海外标准法规清单发布/更新流程 case '18': if (row.taskInfo === '会签审批') { this.$router.push({ diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index 574669006..30d9299cf 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -226,7 +226,7 @@ export default { }, dataSourceOptions: [ { value: "INLAND_STAND", label: "国内标准法规" }, - { value: "FOREIGN_STAND", label: "国外标准法规" }, + { value: "FOREIGN_STAND", label: "海外标准法规" }, { value: "FOREIGN_LAWS", label: "国内外政策" }, { value: "BUSINESS", label: "企业标准 " } ], diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue index 205eca1b1..26a325bda 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue @@ -235,7 +235,7 @@ export default { }, dataSourceOptions: [ { value: "INLAND_STAND", label: "国内标准法规" }, - { value: "FOREIGN_STAND", label: "国外标准法规" }, + { value: "FOREIGN_STAND", label: "海外标准法规" }, { value: "FOREIGN_LAWS", label: "国内外政策" }, { value: "BUSINESS", label: "企业标准 " } ], diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue index e7e195de1..f3cc934b5 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue @@ -239,7 +239,7 @@ export default { }, dataSourceOptions: [ { value: "INLAND_STAND", label: "国内标准法规" }, - { value: "FOREIGN_STAND", label: "国外标准法规" }, + { value: "FOREIGN_STAND", label: "海外标准法规" }, { value: "FOREIGN_LAWS", label: "国内外政策" }, { value: "BUSINESS", label: "企业标准 " } ], diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue index 64db3a096..241173801 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue @@ -281,7 +281,7 @@ :popper-append-to-body="false" placeholder="请选择标准/政策来源"> - + diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index b26e9ca01..45ddb69bb 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -889,9 +889,9 @@ export default { // 数据搜索 数据来源list dataSourceOptions: [ {value: 'INLAND_STAND', label: '国内标准法规'}, - {value: 'FOREIGN_STAND', label: '国外标准法规'}, - {value: 'FOREIGN_LAWS', label: '国内外政策'}, - {value: 'BUSINESS', label: '企业标准 '}, + {value: 'FOREIGN_STAND', label: '海外标准法规'}, + // {value: 'FOREIGN_LAWS', label: '国内外政策'}, + // {value: 'BUSINESS', label: '企业标准 '}, // {value: 'TEMP', label: '标准法规清单 '} ], // 新增、编辑 数据搜索字段 @@ -1388,7 +1388,7 @@ export default { this.standLabelNum = '标准号' this.standLabelName = '标准名称' this.selectLawsStands() - // 国外标准法规可查字段 + // 海外标准法规可查字段 } else if (val === 'FOREIGN_STAND') { this.sarAccessInfo.dataSource = 'FOREIGN_STAND' this.standLabelNum = '标准号' diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 4c85e46f1..f916950ae 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -729,7 +729,7 @@ export default { // 数据搜索 数据来源list dataSourceOptions: [ {value: 'INLAND_STAND', label: '国内标准法规'}, - {value: 'FOREIGN_STAND', label: '国外标准法规'}, + {value: 'FOREIGN_STAND', label: '海外标准法规'}, {value: 'FOREIGN_LAWS', label: '国内外政策'}, {value: 'BUSINESS', label: '企业标准 '}, // {value: 'TEMP', label: '标准法规清单 '} @@ -1177,7 +1177,7 @@ export default { this.standLabelNum = '标准号' this.standLabelName = '标准名称' this.selectLawsStands() - // 国外标准法规可查字段 + // 海外标准法规可查字段 } else if (val === 'FOREIGN_STAND') { this.sarAccessInfo.dataSource = 'FOREIGN_STAND' this.standLabelNum = '标准号' diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 242f55d1d..c9b9b32dc 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -743,7 +743,7 @@ export default { // 数据搜索 数据来源list dataSourceOptions: [ {value: 'INLAND_STAND', label: '国内标准法规'}, - {value: 'FOREIGN_STAND', label: '国外标准法规'}, + {value: 'FOREIGN_STAND', label: '海外标准法规'}, {value: 'FOREIGN_LAWS', label: '国内外政策'}, {value: 'BUSINESS', label: '企业标准 '}, // {value: 'TEMP', label: '标准法规清单 '} @@ -1108,7 +1108,7 @@ export default { this.standLabelNum = '标准号' this.standLabelName = '标准名称' this.selectLawsStands() - // 国外标准法规可查字段 + // 海外标准法规可查字段 } else if (val === 'FOREIGN_STAND') { this.sarAccessInfo.dataSource = 'FOREIGN_STAND' this.standLabelNum = '标准号' diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 623c3b029..946dd1e0c 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1665,6 +1665,7 @@ { if (res.ok) { - this.configStandFlag = false + this.cancelConfigStand() + // this.configStandFlag = false // this.$message({ // showClose: true, // message: '配置标准成功!', diff --git a/src/pages/regulatoryRepository/dynamicInformation/pages/components/ImplementWarning.vue b/src/pages/regulatoryRepository/dynamicInformation/pages/components/ImplementWarning.vue index ce33fa4e9..91c260f70 100644 --- a/src/pages/regulatoryRepository/dynamicInformation/pages/components/ImplementWarning.vue +++ b/src/pages/regulatoryRepository/dynamicInformation/pages/components/ImplementWarning.vue @@ -28,7 +28,7 @@ > 企业标准 - 国外标准法规 + 海外标准法规 国内标准法规 国内政策 国外政策 @@ -81,7 +81,7 @@ > 企业标准 - 国外标准法规 + 海外标准法规 国内标准法规 国内政策 国外政策 diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue index 64996da28..a1407e00b 100644 --- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue +++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue @@ -3363,7 +3363,7 @@ return new Promise((resolve, reject) => { let menu = this.selectSarMenu if (menu.id === 'gxhbq' || menu.pId === 'gxhbq' || menu.id === 'wdsc' || menu.pId === 'wdsc') { - this.$message.warning('请选择国外标准法规及以下节点') + this.$message.warning('请选择海外标准法规及以下节点') } else { resolve(true) } diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 6f0635a76..bf5f47252 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -1,4 +1,4 @@ - + @@ -860,8 +860,8 @@ - - + + @@ -1272,7 +1272,7 @@
+ {{ child.attrName }} + + + + + {{ file.oldFileName | ellipsis50}} + + + + + + + {{ file.oldFileName | ellipsis50}} + + + + + + 标准分解单 + + + + - +
@@ -300,7 +340,7 @@ @@ -1805,6 +1845,14 @@ } return child5 }, + child6Func(child6) { + const list = [] + if (child6 && child6.length > 1) { + list.push(child6[0]) + return list + } + return child6 + }, handleChange(val) { }, handleChange1(val) { @@ -3355,6 +3403,14 @@ location['child5'] = childList } + //修订本 + if (!list[0].child) { + location['child6'] = [] + } else { + const childList = list[0].child.filter(item => item.attrField === 'FBGYWBD'); + location['child6'] = childList + + } } // 动态属性字段-SYRZ 单独添加至基础信息 const list2 = displayLocation.filter(item => item.label === '适用范围'); diff --git a/src/pages/phone/domesticStand.vue b/src/pages/phone/domesticStand.vue index 3efd248cb..ea0c575bf 100644 --- a/src/pages/phone/domesticStand.vue +++ b/src/pages/phone/domesticStand.vue @@ -502,7 +502,7 @@ export default { }, mounted() { this.titleType = this.$route.query.standType - this.titleName = this.titleType === 'INLAND' ? '国内标准法规库' : (this.titleType === 'FOREIGN' ? '国外标准法规库' : this.titleType === 'POLICY' ? '国内外政策库' : '标准化动态库' ) + this.titleName = this.titleType === 'INLAND' ? '国内标准法规库' : (this.titleType === 'FOREIGN' ? '海外标准法规库' : this.titleType === 'POLICY' ? '国内外政策库' : '标准化动态库' ) this.standSearch() this.$refs.cardBox.addEventListener('scroll', this.scrool); //从数据库中查询下拉框数据 diff --git a/src/pages/phone/phoneHome.vue b/src/pages/phone/phoneHome.vue index 4d3f293fd..97c0a4773 100644 --- a/src/pages/phone/phoneHome.vue +++ b/src/pages/phone/phoneHome.vue @@ -25,7 +25,7 @@ - 国外标准法规 + 海外标准法规 diff --git a/src/pages/processCenter/pages/components/ProcessSearchAllStandard.vue b/src/pages/processCenter/pages/components/ProcessSearchAllStandard.vue index 994c0098d..782278776 100644 --- a/src/pages/processCenter/pages/components/ProcessSearchAllStandard.vue +++ b/src/pages/processCenter/pages/components/ProcessSearchAllStandard.vue @@ -43,7 +43,7 @@ placeholder="请选择" > - + diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index d84ba991e..f75b66c3b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -205,13 +205,13 @@ @submit="handleSubmit" > - - -