diff --git a/src/api/process.js b/src/api/process.js
index ab709c7b6..75837c078 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 648cb25fc..b6d3f833c 100644
--- a/src/assets/languages/cn.js
+++ b/src/assets/languages/cn.js
@@ -28,7 +28,7 @@ export const m = {
more: '更多',
dataCenter: '资料中心',
domesticStandardDatabase: '国内标准法规',
- foreignStandardDatabase: '海外标准法规',
+ foreignStandardDatabase: '国外标准法规',
domesticRegulationsDatabase: '国内政策',
foreignRegulationsDatabase: '国外政策',
enterpriseStandardDatabase: '企业标准法规',
diff --git a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
index ef68b3685..343a535f9 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/InputForStandardsForLaws.vue b/src/components/CustomFormComponents/InputForStandardsForLaws.vue
index e29b58902..989ebce32 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/roleTree/index.vue b/src/components/roleTree/index.vue
index e6a1e0880..a90e71c3b 100644
--- a/src/components/roleTree/index.vue
+++ b/src/components/roleTree/index.vue
@@ -89,9 +89,9 @@
导入中...
@@ -150,6 +150,7 @@
treeData: [],
open1: true,
treeLoading: false,
+ subLoading: false,
roleRow: {}
}
},
@@ -307,6 +308,7 @@
ids = item
}
})
+ this.subLoading = true
this.$http.get('SarInstitution/institution/getNextById', {
ids: ids,
topNum: 3,
@@ -316,6 +318,7 @@
this.$emit('checkedRole', res)
this.nodeList2 = []
this.$emit('update:isVisible', false)
+ this.subLoading = false
})
} else {
this.$emit('checkedRole', this.roleList)
diff --git a/src/components/treeSelect/treeSelectNew.vue b/src/components/treeSelect/treeSelectNew.vue
index 2cb47f94e..090c6776e 100644
--- a/src/components/treeSelect/treeSelectNew.vue
+++ b/src/components/treeSelect/treeSelectNew.vue
@@ -321,7 +321,7 @@
// }
//}
.common-tree{
- height: 100%;
+ height: 87%;
overflow-y: auto;
}
diff --git a/src/components/treeSelect/treeSelectStand.vue b/src/components/treeSelect/treeSelectStand.vue
index 7e8d9068e..613e08de2 100644
--- a/src/components/treeSelect/treeSelectStand.vue
+++ b/src/components/treeSelect/treeSelectStand.vue
@@ -310,5 +310,8 @@ export default {
::v-deep .el-drawer{
outline: none!important;
}
-
+.common-tree{
+ height: 100%;
+ overflow-y: auto;
+}
diff --git a/src/pages/config/pages/attributeCustom/components/buss.vue b/src/pages/config/pages/attributeCustom/components/buss.vue
index 209b5128a..04f007d9b 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 13104f3fb..ab8a9f10c 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 7b5ea27ee..7321bbdf1 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 4ae4b8199..8194eadd0 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/pages/standInvolveProjectDetailTwo.vue b/src/pages/details/otherStandardExternalDetails/pages/standInvolveProjectDetailTwo.vue
index 7b5ea27ee..7321bbdf1 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 4ae4b8199..8194eadd0 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 26ce7d07a..3faa1b688 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 44065aabf..8b7a43e72 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 e093baabe..e32880a20 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 f8b5613b0..d3f6583f5 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 761069665..99ab3a6f3 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 0b507b8e3..8d6e0b874 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/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue
index 30782f2dd..989497922 100644
--- a/src/pages/localTool/standAutoSplit/index.vue
+++ b/src/pages/localTool/standAutoSplit/index.vue
@@ -204,7 +204,7 @@
align="center">
国内标准法规
- 海外标准法规
+ 国外标准法规
-
+
@@ -729,7 +729,7 @@ export default {
addFileConvertFormRules: {},
fileTypeOptions: [
{label: '国内标准法规', value: 'INLAND'},
- {label: '海外标准法规', value: 'FOREIGN'}
+ {label: '国外标准法规', value: 'FOREIGN'}
],
standFileClassifyOptions: [],
drawerModal: false,
@@ -1518,15 +1518,22 @@ export default {
})
},
getFileSel () {
- this.$http.get('lawss/sarStandAttrDetails/getFileFieldForSel1', {}, {
+ this.$http.get('sys/dictype/getDicTypeListCode', {}, {
_this: this
}, res => {
if (res.ok) {
const standFileClassifyOptions = []
- res.data.map(item => {
- if (item.label !== '相关资料') {
- standFileClassifyOptions.push(item)
- }
+ res.data.lawsTextState.map(item => {
+ item.label += '(政策)'
+ standFileClassifyOptions.push(item)
+ })
+ res.data.TEXTSTATUSBUSS.map(item => {
+ item.label += '(企标)'
+ standFileClassifyOptions.push(item)
+ })
+ res.data.WBZTCLASS.map(item => {
+ item.label += '(国内外)'
+ standFileClassifyOptions.push(item)
})
this.standFileClassifyOptions = standFileClassifyOptions
}
diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index 739ce7de3..f163ace9b 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -701,7 +701,7 @@
-
+
diff --git a/src/pages/localTool/standContrast/pages/comparisonClauses.vue b/src/pages/localTool/standContrast/pages/comparisonClauses.vue
index d43bfe37b..605f9eb58 100644
--- a/src/pages/localTool/standContrast/pages/comparisonClauses.vue
+++ b/src/pages/localTool/standContrast/pages/comparisonClauses.vue
@@ -57,7 +57,9 @@
-
+
+
+
@@ -110,7 +112,9 @@
-
+
+
+
@@ -206,6 +210,7 @@ export default {
})
}
this.spinShow = true
+
let itemsEoPage = {
oldItemId: this.saveItemId,
newItemId: this.saveItemIdRight,
@@ -215,8 +220,18 @@ export default {
_this: this
}, res => {
this.comparisonFlag = '2'
- this.leftString = res.data.leftString
- this.rightString = res.data.rightString
+ this.leftString = []
+ if((typeof res.data.leftString) === "string"){
+ this.leftString.push(res.data.leftString)
+ }else {
+ this.leftString = res.data.leftString
+ }
+ this.rightString = []
+ if((typeof res.data.rightString) === "string"){
+ this.rightString.push(res.data.rightString)
+ }else {
+ this.rightString = res.data.rightString
+ }
this.text = res.data.similarityDegree
if (parseFloat(res.data.similarityDegree) < parseFloat('75%')) {
this.textcontent = '不相似'
diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue
index d95d7769d..dc2090731 100644
--- a/src/pages/localTool/standardRecognition/index.vue
+++ b/src/pages/localTool/standardRecognition/index.vue
@@ -46,7 +46,7 @@
scope.row.fileType === "1"
? "国内标准法规"
: scope.row.fileType === "2"
- ? "海外标准法规"
+ ? "国外标准法规"
: scope.row.fileType === "3"
? "政策"
: scope.row.fileType === "4"
@@ -244,7 +244,7 @@
:popper-append-to-body="false"
placeholder="请选择标准/政策来源">
-
+
@@ -940,7 +940,7 @@ export default {
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
_this: this
},res=>{
- console.log('海外标准库数据',res)
+ console.log('国外标准库数据',res)
if (res.ok){
this.lawInfoTable = res.data.list
this.handleSelectForm.total = res.data.count
@@ -958,7 +958,7 @@ export default {
this.lawInfoTable = []
this.handleSelectForm.total = 0
})
- console.log('海外标准库')
+ console.log('国外标准库')
}else if(this.handleSelectForm.dataSource === 'FOREIGN_LAWS'){
this.$http.get('lawss/sarLawsInfo/page',this.handleSelectForm,{
_this: this
diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index 39414f851..c396b1056 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 343ddb717..e809aeedc 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 dab85f964..77be8883e 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 1c10d153f..3aa3bd38a 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 1691ced38..8a7d862ae 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/phone/databaseSearch.vue b/src/pages/phone/databaseSearch.vue
index 0938dbbd0..15ef45b55 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 8184ecc06..7deebf9bc 100644
--- a/src/pages/phone/domesticDetails.vue
+++ b/src/pages/phone/domesticDetails.vue
@@ -8,7 +8,7 @@
}} 《{{ sarStandardsInfoEO.standName }}》
{{ sarStandardsInfoEO.standSortShow || '' }} {{
sarStandardsInfoEO.standNumber
- }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》
+ }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName }}》
diff --git a/src/pages/phone/domesticStand.vue b/src/pages/phone/domesticStand.vue
index ea0c575bf..3efd248cb 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 97c0a4773..4d3f293fd 100644
--- a/src/pages/phone/phoneHome.vue
+++ b/src/pages/phone/phoneHome.vue
@@ -25,7 +25,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue
index 7d8694f6b..c7875e018 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue
@@ -42,10 +42,10 @@
-
+
{{ form.hzfileName }}
-
+
- -
@@ -61,7 +61,7 @@
>
-
+
- -
@@ -77,7 +77,7 @@
>
-
+
- -
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
index 4bf35d46c..e43f9e8ee 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
@@ -59,7 +59,7 @@
style="height: 32px; margin-left: 5px;"
>
-
+
- -
@@ -75,7 +75,7 @@
>
-
+
- -
@@ -91,7 +91,7 @@
>
-
+
- -
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
index 0178e6d4a..6a024ab71 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
@@ -563,7 +563,7 @@ export default {
},
{
value: "FOREIGN",
- label: "海外标准法规",
+ label: "国外标准法规",
item: "FOREIGN"
}
],
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
index 611527d74..1f87d7a97 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
@@ -860,7 +860,7 @@ export default {
},
{
value: "FOREIGN",
- label: "海外标准法规",
+ label: "国外标准法规",
item: "FOREIGN"
}
],
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
index d0b7b6d47..a74b5b721 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
@@ -380,7 +380,7 @@ export default {
},
{
value: "FOREIGN",
- label: "海外标准法规",
+ label: "国外标准法规",
item: "FOREIGN"
}
],
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index f5cd68038..013121caf 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -829,7 +829,7 @@ export default {
},
{
value: "FOREIGN",
- label: "海外标准法规",
+ label: "国外标准法规",
item: "FOREIGN"
}
],
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index 430df404d..fb71363f8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -451,7 +451,7 @@ export default {
},
{
value: "FOREIGN",
- label: "海外标准法规",
+ label: "国外标准法规",
item: "FOREIGN"
}
],
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index bafe63da6..d2a4d7fd6 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -27,7 +27,7 @@
国内标准入库
- 海外标准入库
+ 国外标准入库
@@ -507,6 +507,31 @@
+
+
+
+
-
+
@@ -1475,6 +1500,7 @@ export default {
fileList: [],
caFileList: [],
FBGBJBDFileList: [],
+ FBGYWBDFileList: [],
xgdFileList: [],
bpgFileList: [],
ssgFileList: [],
@@ -1629,7 +1655,8 @@ export default {
zccssrqgj: '', // 在产车实施日期(国际)
// 文本信息
ca: '', // 草案
- FBGBJBD: '', // 发布稿
+ FBGBJBD: '', // 发布稿 原文
+ FBGYWBD: '', // 发布稿 译文
xgd: '', // 修改单
bpg: '', // 报批稿
ssg: '', // 送审稿
@@ -1638,7 +1665,8 @@ export default {
zbjbd: '', // 增补件
kwj: '', // 勘 误件
caName: '', // 草案
- fbgbjbdName: '', // 发布稿
+ fbgbjbdName: '', // 发布稿 原文
+ fbgywbdName: '', // 发布稿 译文
xgdName: '', // 修改单
bpgName: '', // 报批稿
ssgName: '', // 送审稿
@@ -1715,7 +1743,7 @@ export default {
{min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur'}
],
standYear: [
- {required: true, message: '请输入标准年份'},
+ {required: true, message: '请输入标准年份'}
// { type: 'number', message: '年标准年份必须为数字值'}
],
standName: [
@@ -1808,6 +1836,21 @@ export default {
}
}
},
+ 'form.standSort' : {
+ handler: function() {
+ this.checkIsOnly()
+ }
+ },
+ 'form.standNumber' : {
+ handler: function() {
+ this.checkIsOnly()
+ }
+ },
+ 'form.standYear' : {
+ handler: function() {
+ this.checkIsOnly()
+ }
+ }
/* 'form.signFlag' : {
handler: function () {
if (this.form.signFlag === '1') {
@@ -1952,6 +1995,47 @@ export default {
// },
},
methods: {
+ checkIsOnly() {
+ let standType = ''
+ if(this.submitType !== 1){
+ return
+ }
+ if (this.form.standInData === '0') {
+ standType = 'INLAND'
+ if(this.form.standSort && this.form.standNumber && this.form.standYear){
+ this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', {
+ standType: standType,
+ standSort: this.form.standSort,
+ standNumber: this.form.standNumber,
+ standYear: this.form.standYear,
+ }, {
+ _this: this
+ }, res => {
+ if (!res.ok) {
+ this.$message.warning('标准号重复')
+ return
+ }
+ })
+ }
+ } else {
+ standType = 'FOREIGN'
+ if(this.form.standSort && this.form.standNumber){
+ this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', {
+ standType: standType,
+ standSort: this.form.standSort,
+ standNumber: this.form.standNumber,
+ standYear: this.form.standYear,
+ }, {
+ _this: this
+ }, res => {
+ if (!res.ok) {
+ this.$message.warning('标准号重复')
+ return
+ }
+ })
+ }
+ }
+ },
//限制上传文件个数
handleExceed (files, fileList) {
this.$message.warning(`当前限制选择 8 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`)
@@ -1998,7 +2082,8 @@ export default {
zccssrqgj: '', // 在产车实施日期(国际)
// 文本信息
ca: '', // 草案
- FBGBJBD: '', // 发布稿
+ FBGBJBD: '', // 发布稿 原文
+ FBGYWBD: '', // 发布稿 译文
xgd: '', // 修改单
bpg: '', // 报批稿
ssg: '', // 送审稿
@@ -2007,7 +2092,8 @@ export default {
zbjbd: '', // 增补件
kwj: '', // 勘 误件
caName: '', // 草案
- fbgbjbdName: '', // 发布稿
+ fbgbjbdName: '', // 发布稿 原文
+ fbgywbdName: '', // 发布稿 译文
xgdName: '', // 修改单
bpgName: '', // 报批稿
ssgName: '', // 送审稿
@@ -2204,7 +2290,8 @@ export default {
zccssrqgj: '', // 在产车实施日期(国际)
// 文本信息
ca: '', // 草案
- fbgbjbd: '', // 发布稿
+ fbgbjbd: '', // 发布稿 原文
+ fbgywbd: '', // 发布稿 译文
xgd: '', // 修改单
bpg: '', // 报批稿
ssg: '', // 送审稿
@@ -2213,7 +2300,8 @@ export default {
zbjbd: '', // 增补件
kwj: '', // 勘误件
caName: '', // 草案
- fbgbjbdName: '', // 发布稿
+ fbgbjbdName: '', // 发布稿 原文
+ fbgywbdName: '', // 发布稿 译文
xgdName: '', // 修改单
bpgName: '', // 报批稿
ssgName: '', // 送审稿
@@ -2353,6 +2441,9 @@ export default {
case 'fbgbjbd':
this.getFileList(value, this.FBGBJBDFileList);
break;
+ case 'fbgywbd':
+ this.getFileList(value, this.FBGYWBDFileList);
+ break;
case 'ssg':
this.getFileList(value, this.ssgFileList);
break;
@@ -2974,6 +3065,9 @@ export default {
this.FBGBJBDFileList = fileList;
console.log("FBGJBDFileList", this.FBGBJBDFileList);
break;
+ case 'fbgywbd':
+ this.FBGYWBDFileList = fileList;
+ break;
case 'xgd' :
this.xgdFileList = fileList;
break;
@@ -3046,6 +3140,9 @@ export default {
case 'fbgbjbd':
this.fileList = this.FBGBJBDFileList
break;
+ case 'fbgywbd':
+ this.fileList = this.FBGYWBDFileList
+ break;
case 'xgd' :
this.fileList = this.xgdFileList
break;
@@ -3088,6 +3185,9 @@ export default {
case 'fbgbjbd':
this.FBGBJBDFileList = fileList;
break;
+ case 'fbgywbd':
+ this.FBGYWBDFileList = fileList;
+ break;
case 'xgd' :
this.xgdFileList = fileList;
break;
@@ -3278,6 +3378,8 @@ export default {
//拼接文件名和id 提交到流程Activity
this.form.fbgbjbd = this.FBGBJBDFileList.map(item => item.response.data.id).join(",")
this.form.fbgbjbdName = this.FBGBJBDFileList.map(item => item.name).join(",")
+ this.form.fbgywbd = this.FBGYWBDFileList.map(item => item.response.data.id).join(",")
+ this.form.fbgywbdName = this.FBGYWBDFileList.map(item => item.name).join(",")
this.form.xgd = this.xgdFileList.map(item => item.response.data.id).join(",")
this.form.xgdName = this.xgdFileList.map(item => item.name).join(",")
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 8e74be6c2..949dc6de7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -27,7 +27,7 @@
国内标准入库
- 海外标准入库
+ 国外标准入库
@@ -366,6 +366,14 @@
- -
+
+
+ {{ value.name }}
+
+
+ - -
+
+
{{ value.name }}
@@ -831,6 +839,7 @@ export default {
return {
xgdFileMap: [],
fbgbjbdFileMap: [],
+ fbgywbdFileMap: [],
bpgFileMap: [],
ssgFileMap: [],
zqyjgFileMap: [],
@@ -912,6 +921,7 @@ export default {
// 文本信息
ca: '', // 草案
fbgbjbd: '', // 发布稿
+ fbgywbd: '', // 发布稿 译文
xgd: '', // 修改单
bpg: '', // 报批稿
ssg: '', // 送审稿
@@ -923,6 +933,7 @@ export default {
kwj: '', // 勘误件
caName: '', // 草案
fbgbjbdName: '', // 发布稿
+ fbgywbdName: '', // 发布稿 译文
xgdName: '', // 修改单
bpgName: '', // 报批稿
ssgName: '', // 送审稿
@@ -1171,6 +1182,7 @@ export default {
this.xgdFileMap = this.assemble(processForm.xgd, processForm.xgdName);
this.fbgbjbdFileMap = this.assemble(processForm.fbgbjbd, processForm.fbgbjbdName);
+ this.fbgywbdFileMap = this.assemble(processForm.fbgywbd, processForm.fbgywbdName);
// fbgbjbdFileMap: {},
this.bpgFileMap = this.assemble(processForm.bpg, processForm.bpgName);
// bpgFileMap: {},
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index cb819ea0b..20b7f46ab 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -27,7 +27,7 @@
国内标准入库
- 海外标准入库
+ 国外标准入库
@@ -268,7 +268,7 @@
-
+
{{ value.name }}
@@ -327,6 +327,14 @@
- -
+
+
+ {{ value.name }}
+
+
+ - -
+
+
{{ value.name }}
@@ -817,6 +825,7 @@ export default {
submitType: '',
xgdFileMap: [],
fbgbjbdFileMap: [],
+ fbgywbdFileMap: [],
bpgFileMap: [],
ssgFileMap: [],
zqyjgFileMap: [],
@@ -880,7 +889,8 @@ export default {
zccssrqgj: '', // 在产车实施日期(国际)
// 文本信息
ca: '', // 草案
- fbgbjbd: '', // 发布稿
+ fbgbjbd: '', // 发布稿 原文
+ fbgywbd: '', // 发布稿 译文
xgd: '', // 修改单
bpg: '', // 报批稿
ssg: '', // 送审稿
@@ -889,7 +899,8 @@ export default {
zbjbd: '', // 增补件
kwj: '', // 勘误件
caName: '', // 草案
- fbgbjbdName: '', // 发布稿
+ fbgbjbdName: '', // 发布稿 原文
+ fbgywbdName: '', // 发布稿 译文
xgdName: '', // 修改单
bpgName: '', // 报批稿
ssgName: '', // 送审稿
@@ -1131,8 +1142,8 @@ export default {
this.xgdFileMap=this.assemble(processForm.xgd,processForm.xgdName);
-
this.fbgbjbdFileMap=this.assemble(processForm.fbgbjbd,processForm.fbgbjbdName);
+ this.fbgywbdFileMap=this.assemble(processForm.fbgywbd,processForm.fbgywbdName);
// fbgbjbdFileMap: {},
this.bpgFileMap=this.assemble(processForm.bpg,processForm.bpgName);
// bpgFileMap: {},
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index e2ab398b5..a6c024068 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -28,7 +28,7 @@
国内标准入库
- 海外标准入库
+ 国外标准入库
@@ -726,6 +726,14 @@
+
+
+ {{ value.name }}
+
+
+ - -
+
+
国内标准入库
- 海外标准入库
+ 国外标准入库
@@ -366,6 +366,14 @@
- -
+
+
+ {{ value.name }}
+
+
+ - -
+
+
{{ value.name }}
@@ -883,7 +891,8 @@ export default {
zccssrqgj: '', // 在产车实施日期(国际)
// 文本信息
ca: '', // 草案
- fbgbjbd: '', // 发布稿
+ fbgbjbd: '', // 发布稿 原文
+ fbgywbd: '', // 发布稿 译文
xgd: '', // 修改单
bpg: '', // 报批稿
ssg: '', // 送审稿
@@ -894,7 +903,8 @@ export default {
bfdtbz: '',
kwj: '', // 勘误件
caName: '', // 草案
- fbgbjbdName: '', // 发布稿
+ fbgbjbdName: '', // 发布稿 原文
+ fbgywbdName: '', // 发布稿 译文
xgdName: '', // 修改单
bpgName: '', // 报批稿
ssgName: '', // 送审稿
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
index c00cdd9b2..646db6893 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 0fec3f7ef..d78178e42 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -241,7 +241,7 @@
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue
index 261920fa8..c7bf0b51f 100644
--- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue
@@ -444,7 +444,7 @@ export default {
},
{
value: "FOREIGN",
- label: "海外标准法规",
+ label: "国外标准法规",
item: "FOREIGN"
}
],
diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue
index 8fb118f5a..b726312b1 100644
--- a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue
@@ -382,7 +382,7 @@ export default {
},
{
value: "FOREIGN",
- label: "海外标准法规",
+ label: "国外标准法规",
item: "FOREIGN"
}
],
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
index 2a6d7edcf..edb287077 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
@@ -226,7 +226,7 @@
:popper-append-to-body="false"
placeholder="请选择标准来源">
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
index bf83d8f11..86fbe87da 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
@@ -380,7 +380,7 @@
:popper-append-to-body="false"
placeholder="请选择标准来源">
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index eaf8cca6e..8ef2bcf09 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 f8f41520f..207159694 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 72de88509..22d3b91d4 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/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue
index 01a5f0c7d..fbb9c77cc 100644
--- a/src/pages/processCenter/pages/phone/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue
@@ -24,7 +24,7 @@
国内标准入库
- 海外标准入库
+ 国外标准入库
@@ -40,7 +40,7 @@
-
+
@@ -73,7 +73,7 @@
-
+
@@ -106,7 +106,7 @@
@@ -119,7 +119,7 @@
@@ -242,7 +242,7 @@
-->
-
+
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -331,7 +331,7 @@
>
-->
-
+
diff --git a/src/pages/processCenter/pages/processAcceptDetail/index.vue b/src/pages/processCenter/pages/processAcceptDetail/index.vue
index b6d65e49f..31d9fa712 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 150e6d018..8324f0fda 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 30d9299cf..574669006 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 26a325bda..205eca1b1 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 f3cc934b5..e7e195de1 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 241173801..64db3a096 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 995f4cd54..b26e9ca01 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -889,7 +889,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: '标准法规清单 '}
@@ -1235,7 +1235,7 @@ export default {
if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND' || this.sarAccessInfo.dataSource === 'INLAND_STAND') {
formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null
formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null
- formData.issueTime = null
+ // formData.issueTime = null
} /*else if(this.sarAccessInfo.dataSource === 'BUSINESS') {
// formData.issueTime = formData.issueTime ? formData.issueTime[0] : null
// formData.issueTime = formData.issueTime ? formData.issueTime[1] : null
@@ -1388,7 +1388,7 @@ export default {
this.standLabelNum = '标准号'
this.standLabelName = '标准名称'
this.selectLawsStands()
- // 海外标准法规可查字段
+ // 国外标准法规可查字段
} else if (val === 'FOREIGN_STAND') {
this.sarAccessInfo.dataSource = 'FOREIGN_STAND'
this.standLabelNum = '标准号'
@@ -1761,7 +1761,6 @@ export default {
delete this.sarAccessInfo.lawsNumber
delete this.sarAccessInfo.standCode
}
- console.log('this.sarAccessInfo===' , this.sarAccessInfo)
StandardsInfoPage(type === 1 ? ({...this.sarAccessInfo, standNumber: this.sarAccessInfo.seniorStandNumber, lawsNumber: this.sarAccessInfo.seniorLawsNumber, standCode: this.sarAccessInfo.seniorStandCode}) : (this.sarAccessInfo)).then(res => {
// if (type === 1) {
// this.sarAccessInfo.standNumber = ''
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index f916950ae..4c85e46f1 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 c9b9b32dc..242f55d1d 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/dataCenter/dataCenterDetail.vue b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
index 9b194fdfa..49c55a62f 100644
--- a/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
+++ b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
@@ -252,7 +252,8 @@ export default {
padding: 0 10% 0 10%;
background: #ffffff;
font-size: 16px;
-
+ height: 84%;
+ overflow-y: auto;
.transition-box-p {
line-height: 50px;
border-bottom: 1px solid #E5E5E5;
@@ -266,6 +267,8 @@ export default {
display: inline-block;
color: #7e8083;
width: calc(~'100% - 100px');
+ overflow-y: auto;
+ overflow-y: auto;
word-break: break-all;
white-space: pre-wrap;
}
diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue
index a7fd987fc..23c2391d2 100644
--- a/src/pages/regulatoryRepository/dataCenter/index.vue
+++ b/src/pages/regulatoryRepository/dataCenter/index.vue
@@ -238,7 +238,7 @@
:styles="styles"
:close="cancelModel"
>
-
@@ -1041,7 +1042,7 @@ export default {
}
.upload-demo{
/deep/.el-upload-list{
- height: 60vh;
+ height: 42vh;
overflow-y: auto;
}
}
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index ffd993cd8..623c3b029 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -546,7 +546,7 @@
class="add-form-item"
>
标准体系
-
@@ -3777,43 +3777,6 @@ export default {
},
// 搜索
getDomesticStandardTableBtn(item) {
- // // 自定义属性字段高级搜索处理
- //advanceSearchVOStr
- const advanceSearchVOList = [];
- for (let key in this.advanceSearchMapping) {
- const value = this.advanceSearchMapping[key];
- if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX && item.CLLX.length > 0))) {
- advanceSearchVOList.push({
- connect: "and",
- field: key || '',
- type: 'regexp',
- value: value.join(',')
- });
- } else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) {
- advanceSearchVOList.push({
- connect: "and",
- field: key || '',
- type: 'between',
- value: value.join(',')
- });
- } else if (value !== null && value !== '' && (key === 'BARQ')) {
- advanceSearchVOList.push({
- connect: "and",
- field: key || '',
- type: 'between',
- value: value.join(',')
- });
- } else if (value !== null && value !== '' && (key === 'TXLBName')) {
- } else if (value !== null && value !== '') {
- advanceSearchVOList.push({
- connect: "and",
- field: key || '',
- type: 'like',
- value: value
- });
- }
- }
- item.advanceSearchVOStr = advanceSearchVOList
sessionStorage.setItem('tableFlag', JSON.stringify(item))
this.tableFlag = item
item.page = 1
@@ -3834,6 +3797,7 @@ export default {
this.sarStandardsSearch.standSort = ''
this.sarStandardsSearch.standNumber = ''
this.sarStandardsSearch.standName = ''
+ this.sarStandardsSearch.standEnName = ''
this.sarStandardsSearch.standState = ''
this.sarStandardsSearch.standNature = ''
this.sarStandardsSearch.issueTime = ''
@@ -3850,11 +3814,18 @@ export default {
// } else if (flag === 'standCommonlySearch') {
this.sarStandardsSearch.standName = ''
this.sarStandardsSearch.standNumber = ''
- this.pageChange(1)
- this.getDomesticStandardTable(this.sarStandardsSearch)
+ this.advanceSearchMapping = {}
+ this.standCommonlySearch = {}
+ this.sarStandardsSearch = {
+ page: 1,
+ pageSize: this.$store.getters.userInfo.configContent,
+ standType: 'INLAND',
+ validFlag: '0',
+ }
for (let key in this.advanceSearchMapping) {
this.advanceSearchMapping[key] = ''
}
+ this.pageChange(1)
} else if (flag === 2) {
// 标准条目搜索
this.standItemSearch.responsibleUnit = ''
@@ -4598,6 +4569,7 @@ export default {
},
// 分页查询国内标准
getDomesticStandardTable(item, type) {
+ console.log(item)
if (item !== '' && item !== null && item !== undefined) {
item.pageSize = this.$store.getters.userInfo.configContent
}
@@ -4642,12 +4614,12 @@ export default {
for (let key in this.advanceSearchMapping) {
const value = this.advanceSearchMapping[key];
- if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX && item.CLLX.length > 0))) {
+ if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (key === 'CLLX' && item.CLLX && item.CLLX.length > 0))) {
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'regexp',
- value: value.join(',')
+ value: list.join(',')
});
} else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) {
advanceSearchVOList.push({
diff --git a/src/pages/regulatoryRepository/dynamicInformation/pages/components/ImplementWarning.vue b/src/pages/regulatoryRepository/dynamicInformation/pages/components/ImplementWarning.vue
index 91c260f70..ce33fa4e9 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/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 8fc0aa784..272615362 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -1386,10 +1386,10 @@
placeholder="请输入模块结构单元名称(卡车)"
>
-
+
@@ -3529,7 +3529,7 @@ export default {
}
}
},
-
+
SearchTreeConfigDblClick(treeId, treeNode) {
this.sarConfigStandSearch.responsibleUnit = treeNode.id
this.sarConfigStandSearch.orgName = treeNode.name
diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
index a1407e00b..64996da28 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 727e5b383..6f0635a76 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -1,4 +1,4 @@
-
+
@@ -860,8 +860,8 @@
-
-
+
+
@@ -1030,7 +1030,7 @@
class="add-form-item"
>
标准体系
-
@@ -1272,7 +1272,7 @@
相似历史问题:
-
+
{{item.problemDescription}}
{{item.questionTime}}
@@ -159,7 +159,7 @@
:popper-append-to-body="false"
placeholder="请选择标准来源">
-
+
diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue
index 155569c5b..91b7df1ee 100644
--- a/src/pages/searchCenter/pages/advancedSearch.vue
+++ b/src/pages/searchCenter/pages/advancedSearch.vue
@@ -2733,8 +2733,7 @@
#advancedSearch {
background: #fff;
@borderColor: #BFBFBF;
- height: auto !important;
- min-height: 100%;
+ height: 100%;
font-size: 14px;
overflow-y: auto;
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index bb66642d9..68795762a 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -265,7 +265,7 @@
-
+
详情
@@ -419,7 +419,7 @@
value: 'stand'
},
{
- label: '海外标准法规', // value没改
+ label: '国外标准法规', // value没改
value: 'bussstand'
},
{
@@ -451,7 +451,7 @@
value: 'stand'
},
{
- label: '海外标准法规', // value没改
+ label: '国外标准法规', // value没改
value: 'bussstand'
},
{
@@ -824,7 +824,7 @@
value: 'stand'
},
{
- label: '海外标准法规',
+ label: '国外标准法规',
value: 'bussstand'
},
// {
@@ -1270,7 +1270,7 @@
filterOptions.CYSDLAWS.title = '我司是否参与'
filterOptions.CYSDLAWS.index = 3
break
- // 海外标准法规
+ // 国外标准法规
case 'bussstand':
// 标准类别
filterOptions.standSort = originOptions.standSort
diff --git a/src/router/index.js b/src/router/index.js
index 3d9ee3cac..2749aed67 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3391,7 +3391,7 @@ const routes = [
menuId: 'WW7YDHQ9Z679TGMDZMUS'
}
},
- // 海外标准法规
+ // 国外标准法规
{
path: '/foreignStandardsAndRegulations',
name: 'foreignStandardsAndRegulations',
@@ -3399,7 +3399,7 @@ const routes = [
import('@/pages/regulatoryRepository/foreignStandardsAndRegulations/index'),
meta: {
requireAuth: true,
- title: '海外标准法规',
+ title: '国外标准法规',
menuId: '6K8A2RZYRE'
}
},