FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
396572590@qq.com
2022-07-20 14:20:39 +08:00
parent 3ded56d4be 39d909d619
commit 75ab7373aa
64 changed files with 212 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+1 -1
View File
@@ -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: "企业标准 " }
],
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+1 -1
View File
@@ -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: "企业标准 " }
],
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+1 -1
View File
@@ -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: "企业标准 " }
],
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+1 -1
View File
@@ -281,7 +281,7 @@
:popper-append-to-body="false"
placeholder="请选择标准/政策来源">
<el-option value="INLAND" label="国内标准库"></el-option>
<el-option value="FOREIGN" label="海外标准库"></el-option>
<el-option value="FOREIGN" label="国外标准库"></el-option>
<el-option value="FOREIGN_LAWS" label="国内外政策库"></el-option>
<el-option value="BUSINESS_STAND" label="企业标准库"></el-option>
</el-select>
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+2 -2
View File
@@ -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: '标准法规清单 '}
@@ -1388,7 +1388,7 @@ export default {
this.standLabelNum = '标准号'
this.standLabelName = '标准名称'
this.selectLawsStands()
// 海外标准法规可查字段
// 国外标准法规可查字段
} else if (val === 'FOREIGN_STAND') {
this.sarAccessInfo.dataSource = 'FOREIGN_STAND'
this.standLabelNum = '标准号'
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+2 -2
View File
@@ -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 = '标准号'
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+2 -2
View File
@@ -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 = '标准号'
src/pages/regulatoryRepository/dynamicInformation/pages/components/ImplementWarning.vue
+2 -2
View File
@@ -28,7 +28,7 @@
>
<template slot-scope="scope">
<div v-if="scope.row.sortName === 'BUSINESS_STAND'">企业标准</div>
<div v-if="scope.row.sortName === 'FOREIGN_STAND'">海外标准法规</div>
<div v-if="scope.row.sortName === 'FOREIGN_STAND'">国外标准法规</div>
<div v-if="scope.row.sortName === 'INLAND_STAND'">国内标准法规</div>
<div v-if="scope.row.sortName === 'INLAND_LAWS'">国内政策</div>
<div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
@@ -81,7 +81,7 @@
>
<template slot-scope="scope">
<div v-if="scope.row.sortName === 'BUSINESS_STAND'">企业标准</div>
<div v-if="scope.row.sortName === 'FOREIGN_STAND'">海外标准法规</div>
<div v-if="scope.row.sortName === 'FOREIGN_STAND'">国外标准法规</div>
<div v-if="scope.row.sortName === 'INLAND_STAND'">国内标准法规</div>
<div v-if="scope.row.sortName === 'INLAND_LAWS'">国内政策</div>
<div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+1 -1
View File
@@ -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)
}
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+9 -9
View File
@@ -1,4 +1,4 @@
<!--标准法规--海外标准法规-->
<!--标准法规--国外标准法规-->
<template>
<div id="foreignStandardsAndRegulations" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class">
<div id="left" class="tree-content" :class="{ 'tree-closed': sideClose }">
@@ -860,8 +860,8 @@
</el-button>
</div>
</el-drawer>
<!-- 新增海外标准 -->
<!-- 编辑海外标准-->
<!-- 新增国外标准 -->
<!-- 编辑国外标准-->
<el-drawer
:title="modalshowtitle"
:visible.sync="modalshowflag"
@@ -998,7 +998,7 @@
clearable>
<el-option
v-for="opt in standStateOptions"
:disabled="opt.value !== 'ZTXXYX' && opt.value !== standState && modalshowtitle !== '编辑海外标准'"
:disabled="opt.value !== 'ZTXXYX' && opt.value !== standState && modalshowtitle !== '编辑国外标准'"
:key="opt.value"
:value="opt.value === undefined ? '' :opt.value" :label="opt.label"
>
@@ -1272,7 +1272,7 @@
</div>
<!-- 提交/取消-->
<div class="demo-drawer-footer">
<el-button v-show="modalshowtitle === '新增海外标准'" type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="saveBt">
<el-button v-show="modalshowtitle === '新增国外标准'" type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="saveBt">
保存
</el-button>
<el-button size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveOrUpdateStands" :loading="isSubmit">
@@ -2366,7 +2366,7 @@ export default {
}, // 二级菜单对象，主要用于新增和修改
testItemsModel: false,
formdisableflag: false, // 查看标准不可编辑
modalshowtitle: '新增海外标准',
modalshowtitle: '新增国外标准',
addOrUPdateFlag: 1, // 新增：1， 修改：2
itemAddOrUPdateFlag: 1, // 新增：1， 修改：2
menuAddOrUpdateFlag: 1, // 新增：1， 修改：2
@@ -3035,7 +3035,7 @@ export default {
}, res => {
const item = res.data || {}
this.addOrUPdateFlag = 2
this.modalshowtitle = '编辑海外标准'
this.modalshowtitle = '编辑国外标准'
this.modalshowflag = true
this.resolveFormFieldList(item.isRelateAccess)
this.$nextTick(() => {
@@ -3572,7 +3572,7 @@ export default {
this.sarStandardsInfoEO.isRelateAccess = '1'
this.modalshowflag = true
this.formdisableflag = false
this.modalshowtitle = '新增海外标准'
this.modalshowtitle = '新增国外标准'
this.addOrUPdateFlag = 1
this.standNumFlag = 1
this.$nextTick(() => {
@@ -4636,7 +4636,7 @@ export default {
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)
}
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+1 -1
View File
@@ -330,7 +330,7 @@
<el-formItem label="标准来源" prop="standType" class="search-item">
<el-select v-model="standCommonlySearch.standType" placeholder="根据标准来源查找" clearable>
<el-option value="INLAND" key="1" label="国内标准"></el-option>
<el-option value="FOREIGN" key="2" label="海外标准"></el-option>
<el-option value="FOREIGN" key="2" label="国外标准"></el-option>
</el-select>
</el-formItem>
<el-formItem class="search-item btn-box">
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+1 -1
View File
@@ -716,7 +716,7 @@ export default {
},
{
value: "FOREIGN",
label: "海外标准法规",
label: "国外标准法规",
item: "FOREIGN"
}
],
src/pages/regulatoryRepository/standQA/index.vue
+2 -2
View File
@@ -85,7 +85,7 @@
<el-form-item label-width="30px" >
<el-radio-group v-model="standType" @change="standTypeChange">
<el-radio label="INLAND">国内标准</el-radio>
<el-radio label="FOREIGN">海外标准</el-radio>
<el-radio label="FOREIGN">国外标准</el-radio>
<el-radio label="BUSINESS_STAND">企业标准</el-radio>
<el-radio label="OTHER">公共</el-radio>
</el-radio-group>
@@ -159,7 +159,7 @@
:popper-append-to-body="false"
placeholder="请选择标准来源">
<el-option value="INLAND" label="国内标准库"></el-option>
<el-option value="FOREIGN" label="海外标准库"></el-option>
<el-option value="FOREIGN" label="国外标准库"></el-option>
<el-option value="BUSINESS_STAND" label="企业标准库"></el-option>
</el-select>
</el-form-item>