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

This commit is contained in:
hanshaozhuang
2022-07-20 11:06:51 +08:00
66 changed files with 125 additions and 150 deletions
+1 -1
View File
@@ -472,7 +472,7 @@ export function afterConferenceProcess (data) {
})
}
// 外标准清单流程入库
// 外标准清单流程入库
export function foreignAccessProcess (data) {
return axios({
url: '/api/lawss/actSarItems/foreignAccessProcess',
+1 -1
View File
@@ -28,7 +28,7 @@ export const m = {
more: '更多',
dataCenter: '资料中心',
domesticStandardDatabase: '国内标准法规',
foreignStandardDatabase: '外标准法规',
foreignStandardDatabase: '外标准法规',
domesticRegulationsDatabase: '国内政策',
foreignRegulationsDatabase: '国外政策',
enterpriseStandardDatabase: '企业标准法规',
@@ -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'
@@ -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: '国内外政策'}
],
+5 -2
View File
@@ -89,9 +89,9 @@
</div>
</div>
<div id="roleFormButton" class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="subLoading" @click="saveUserInfo">确定</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleTreeDrawerCancel">取消</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" :loading="subLoading" @click="handleTreeDrawerCancel">取消</el-button>
</div>
<loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
</el-drawer>
@@ -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)
@@ -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 = '企业标准库'
}
@@ -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
},
@@ -82,7 +82,7 @@
>
<template slot-scope="scope">
<div v-if="scope.row.standType === 'INLAND_STAND'">国内标准法规</div>
<div v-if="scope.row.standType === 'FOREIGN_STAND'">外标准法规</div>
<div v-if="scope.row.standType === 'FOREIGN_STAND'">外标准法规</div>
<div v-if="scope.row.standType === 'INLAND_LAWS'">国内政策</div>
<div v-if="scope.row.standType === 'FOREIGN_LAWS'">国内外政策</div>
<div v-if="scope.row.standType === 'BUSINESS_STAND'">企业标准</div>
@@ -82,7 +82,7 @@
>
<template slot-scope="scope">
<div v-if="scope.row.standType === 'INLAND_STAND'">国内标准法规</div>
<div v-if="scope.row.standType === 'FOREIGN_STAND'">外标准法规</div>
<div v-if="scope.row.standType === 'FOREIGN_STAND'">外标准法规</div>
<div v-if="scope.row.standType === 'INLAND_LAWS'">国内政策</div>
<div v-if="scope.row.standType === 'FOREIGN_LAWS'">国内外政策</div>
<div v-if="scope.row.standType === 'BUSINESS_STAND'">企业标准</div>
@@ -82,7 +82,7 @@
>
<template slot-scope="scope">
<div v-if="scope.row.standType === 'INLAND_STAND'">国内标准法规</div>
<div v-if="scope.row.standType === 'FOREIGN_STAND'">外标准法规</div>
<div v-if="scope.row.standType === 'FOREIGN_STAND'">外标准法规</div>
<div v-if="scope.row.standType === 'INLAND_LAWS'">国内政策</div>
<div v-if="scope.row.standType === 'FOREIGN_LAWS'">国内外政策</div>
<div v-if="scope.row.standType === 'BUSINESS_STAND'">企业标准</div>
@@ -82,7 +82,7 @@
>
<template slot-scope="scope">
<div v-if="scope.row.standType === 'INLAND_STAND'">国内标准法规</div>
<div v-if="scope.row.standType === 'FOREIGN_STAND'">外标准法规</div>
<div v-if="scope.row.standType === 'FOREIGN_STAND'">外标准法规</div>
<div v-if="scope.row.standType === 'INLAND_LAWS'">国内政策</div>
<div v-if="scope.row.standType === 'FOREIGN_LAWS'">国内外政策</div>
<div v-if="scope.row.standType === 'BUSINESS_STAND'">企业标准</div>
+1 -1
View File
@@ -85,7 +85,7 @@ export default {
value: 'stand'
},
{
label: '外标准法规', // value没改
label: '外标准法规', // value没改
value: 'bussstand'
},
{
+2 -2
View File
@@ -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({
@@ -48,7 +48,7 @@ export default {
value: 'stand'
},
{
label: '外标准法规', // value没改
label: '外标准法规', // value没改
value: 'bussstand'
},
// {
+2 -2
View File
@@ -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(() => {
@@ -51,7 +51,7 @@ export default {
value: 'stand'
},
{
label: '外标准法规', // value没改
label: '外标准法规', // value没改
value: 'bussstand'
},
// {
+2 -2
View File
@@ -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(() => {
+3 -3
View File
@@ -204,7 +204,7 @@
align="center">
<template slot-scope="scope">
<div v-if="scope.row.sarType === 'INLAND'">国内标准法规</div>
<div v-else-if="scope.row.sarType === 'FOREIGN'">外标准法规</div>
<div v-else-if="scope.row.sarType === 'FOREIGN'">外标准法规</div>
</template>
</el-table-column>
<el-table-column
@@ -539,7 +539,7 @@
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="FOREIGN2" label="国内外政策"></el-option>
</el-select>
</el-form-item>
@@ -729,7 +729,7 @@ export default {
addFileConvertFormRules: {},
fileTypeOptions: [
{label: '国内标准法规', value: 'INLAND'},
{label: '外标准法规', value: 'FOREIGN'}
{label: '外标准法规', value: 'FOREIGN'}
],
standFileClassifyOptions: [],
drawerModal: false,
@@ -701,7 +701,7 @@
<!--<el-input v-model="sarMenu.menuName" placeholder="请输入名称"></el-input>-->
<el-select v-model="openSubmitAndExamineForm" placeholder="请选择">
<el-option label="国内标准法规FO" value="INLAND"></el-option>
<el-option label="外标准法规FO" value="FOREIGN"></el-option>
<el-option label="外标准法规FO" value="FOREIGN"></el-option>
<el-option label="政策法规FO" value="POLICY"></el-option>
</el-select>
</el-formItem>
@@ -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="请选择标准/政策来源">
<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>
@@ -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
+1 -1
View File
@@ -176,7 +176,7 @@
<el-table-column prop="standType" label="类型" width="100" align="center">
<template slot-scope="scope">
<div v-if="scope.row.sortName === 'BUSINESS_STAND'">企业标准</div>
<div v-if="scope.row.standType === 'FOREIGN'">外标准法规</div>
<div v-if="scope.row.standType === 'FOREIGN'">外标准法规</div>
<div v-if="scope.row.standType === 'INLAND'">国内标准法规</div>
<div v-if="scope.row.sortName === 'INLAND_LAWS'">国内政策</div>
<div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
@@ -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', '', {
@@ -50,7 +50,7 @@
<div>
<el-col :span="5" :offset="1" >
<i class="el-icon-collection-tag" style="position: relative; left: -15px" />
所属板块{{ item.collectType === 'INLAND_STAND' ? '国内标准法规' : (item.collectType === 'FOREIGN_STAND' ? '外标准法规' : '企业标准') }}
所属板块{{ item.collectType === 'INLAND_STAND' ? '国内标准法规' : (item.collectType === 'FOREIGN_STAND' ? '外标准法规' : '企业标准') }}
</el-col>
<el-col :span="6">
<el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top" v-if="item.collectTitle">
@@ -51,7 +51,7 @@
<span v-if="item.resType == 'RESOURCE_MSG'">所属板块资料中心</span>
<span v-if="item.resType == 'FOREIGN_LAWS'">所属板块国内外政策</span>
<span v-if="item.resType == 'INLAND_STAND'">所属板块国内标准法规</span>
<span v-if="item.resType == 'FOREIGN_STAND'">所属板块外标准法规</span>
<span v-if="item.resType == 'FOREIGN_STAND'">所属板块外标准法规</span>
<span v-if="item.resType == 'BUSINESS_STAND'">所属板块企业标准</span>
<span v-if="item.resType == 'STAND_SPLIT'">所属板块标准拆分</span>
<span v-if="item.resType == 'NOTICE_MSG'">所属板块动态信息</span>
@@ -243,7 +243,7 @@ export default {
/**
* 跳转到各个详情页
* INLAND_STAND 国内标准详情
* FOREIGN_STAND 外标准详情
* FOREIGN_STAND 外标准详情
* FOREIGN_LAWS 国内外政策
* BUSINESS_STAND 企业标准库
* RESOURCE_MSG 资料中心
+1 -1
View File
@@ -49,7 +49,7 @@
<span v-if="item.resType == 'RESOURCE_MSG'">所属板块资料中心</span>
<span v-if="item.resType == 'FOREIGN_LAWS'">所属板块国内外政策</span>
<span v-if="item.resType == 'INLAND_STAND'">所属板块国内标准法规</span>
<span v-if="item.resType == 'FOREIGN_STAND'">所属板块外标准法规</span>
<span v-if="item.resType == 'FOREIGN_STAND'">所属板块外标准法规</span>
<span v-if="item.resType == 'BUSINESS_STAND'">所属板块企业标准</span>
<span v-if="item.resType == 'NOTICE_MSG'">所属板块动态信息</span>
<span v-if="item.resType == 'STAND_SPLIT'">所属板块标准拆分</span>
+1 -1
View File
@@ -30,7 +30,7 @@
<div class="standContent">
<div class="standState">标准类别:
<span v-if="item.indexType === 'stand'">国内标准</span>
<span v-if="item.indexType === 'FOREIGN'">外标准</span>
<span v-if="item.indexType === 'FOREIGN'">外标准</span>
<span v-if="item.indexType === 'bussstand'">企业标准</span>
</div>
<div class="standSubTime">发布日期: {{item.issue_time}} </div>
+1 -1
View File
@@ -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);
//
+1 -1
View File
@@ -25,7 +25,7 @@
</div>
<div class="content-top" style="margin-top: 10px" @click="standChange('FOREIGN')">
<div class="content-box content-box2"></div>
<span class="content-span">外标准法规</span>
<span class="content-span">外标准法规</span>
</div>
<div class="content-top" @click="standChange('POLICY')">
<div class="content-box content-box3"></div>
@@ -563,7 +563,7 @@ export default {
},
{
value: "FOREIGN",
label: "外标准法规",
label: "外标准法规",
item: "FOREIGN"
}
],
@@ -860,7 +860,7 @@ export default {
},
{
value: "FOREIGN",
label: "外标准法规",
label: "外标准法规",
item: "FOREIGN"
}
],
@@ -380,7 +380,7 @@ export default {
},
{
value: "FOREIGN",
label: "外标准法规",
label: "外标准法规",
item: "FOREIGN"
}
],
@@ -829,7 +829,7 @@ export default {
},
{
value: "FOREIGN",
label: "外标准法规",
label: "外标准法规",
item: "FOREIGN"
}
],
@@ -451,7 +451,7 @@ export default {
},
{
value: "FOREIGN",
label: "外标准法规",
label: "外标准法规",
item: "FOREIGN"
}
],
@@ -27,7 +27,7 @@
<el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.standInData" @change="standInChange">
<el-radio :disabled="disabledXX" label="0">国内标准入库</el-radio>
<el-radio :disabled="disabledXX" label="1">外标准入库</el-radio>
<el-radio :disabled="disabledXX" label="1">外标准入库</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
@@ -1289,7 +1289,7 @@
v-model="standardSearchForm.standType"
placeholder="请选择标准来源">
<el-option value="INLAND" label="国内标准库"></el-option>
<el-option value="FOREIGN" label="外标准库"></el-option>
<el-option value="FOREIGN" label="外标准库"></el-option>
</el-select>
</el-formItem>
<el-form-item label="标准类别" prop="standSort" class="search-item">
@@ -27,7 +27,7 @@
<el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.standInData" disabled>
<el-radio label="0">国内标准入库</el-radio>
<el-radio label="1">外标准入库</el-radio>
<el-radio label="1">外标准入库</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
@@ -27,7 +27,7 @@
<el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.standInData" disabled>
<el-radio label="0">国内标准入库</el-radio>
<el-radio label="1">外标准入库</el-radio>
<el-radio label="1">外标准入库</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
@@ -28,7 +28,7 @@
<el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.standInData" @change="standInChange">
<el-radio label="0">国内标准入库</el-radio>
<el-radio label="1">外标准入库</el-radio>
<el-radio label="1">外标准入库</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
@@ -27,7 +27,7 @@
<el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.standInData" disabled>
<el-radio label="0">国内标准入库</el-radio>
<el-radio label="1">外标准入库</el-radio>
<el-radio label="1">外标准入库</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
@@ -242,7 +242,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">
@@ -241,7 +241,7 @@
<el-formItem label="标准来源" prop="standType" class="search-item">
<el-select :disabled="disabledXX" 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">
@@ -444,7 +444,7 @@ export default {
},
{
value: "FOREIGN",
label: "外标准法规",
label: "外标准法规",
item: "FOREIGN"
}
],
@@ -382,7 +382,7 @@ export default {
},
{
value: "FOREIGN",
label: "外标准法规",
label: "外标准法规",
item: "FOREIGN"
}
],
@@ -226,7 +226,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>
@@ -380,7 +380,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>
@@ -248,7 +248,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>
@@ -248,7 +248,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>
@@ -241,7 +241,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>
@@ -24,7 +24,7 @@
<el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.standInData" disabled>
<el-radio label="0">国内标准入库</el-radio>
<el-radio label="1">外标准入库</el-radio>
<el-radio label="1">外标准入库</el-radio>
</el-radio-group>
</el-form-item>
<van-field label="标准编号" v-model="form.standNumber" readonly />
@@ -40,7 +40,7 @@
</el-select>
</el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
<el-select v-model="form.standSort" placeholder="" disabled>
<el-option
v-for="item in standSortOptions"
placeholder="请选择"
@@ -59,7 +59,7 @@
v-else
disabled
v-model="form.standName"
placeholder="请输入标准中文名称"
placeholder=""
clearable
></el-input>
</el-form-item>
@@ -73,7 +73,7 @@
</el-radio-group>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
<el-select v-model="form.standNature" placeholder="" disabled>
<el-option
v-for="item in standNatureOptions"
placeholder="请选择"
@@ -89,7 +89,7 @@
disabled
v-model="form.issueTime"
type="date"
placeholder="请选择标准发布日期"
placeholder=""
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
@@ -106,7 +106,7 @@
<el-input
disabled
v-model="form.gxhbq"
placeholder="请输入标签"
placeholder=""
clearable
></el-input>
</el-form-item>
@@ -119,7 +119,7 @@
<el-input
v-model="form.treeListName"
clearable
placeholder="选择归档位置"
placeholder=""
readonly>
</el-input>
</el-tooltip>
@@ -396,7 +396,7 @@
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
placeholder=""
v-model="commentText">
</el-input>
</div>
@@ -801,7 +801,7 @@ export default {
})
}
break
// /
// /
case '18':
if (row.taskInfo === '会签审批') {
this.$router.push({
@@ -863,7 +863,7 @@ export default {
})
}
break
// /
// /
case '18':
if (row.taskInfo === '会签审批') {
this.$router.push({
@@ -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: "企业标准 " }
],
@@ -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: "企业标准 " }
],
@@ -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: "企业标准 " }
],
@@ -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>
@@ -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 = '标准号'
@@ -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 = '标准号'
@@ -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 = '标准号'
@@ -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({
@@ -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>
@@ -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)
}
@@ -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)
}
@@ -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">
@@ -716,7 +716,7 @@ export default {
},
{
value: "FOREIGN",
label: "外标准法规",
label: "外标准法规",
item: "FOREIGN"
}
],
@@ -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>
@@ -265,7 +265,7 @@
<template v-if="Allitems.length">
<div v-for="(item,key) in Allitems" :key="key" class="AllBox">
<div class="AllBoxTitle">
<span v-html="item.indexType === 'stand' ? '国内标准法规' : (item.indexType === 'FOREIGN' ? '外标准法规' : (item.indexType === 'laws' ? '国内外政策' : (item.indexType === 'bussstand' ? '企业标准' : (item.indexType === 'items' ? '数据化条目' : '动态&资料'))))" class="typetext"></span>
<span v-html="item.indexType === 'stand' ? '国内标准法规' : (item.indexType === 'FOREIGN' ? '外标准法规' : (item.indexType === 'laws' ? '国内外政策' : (item.indexType === 'bussstand' ? '企业标准' : (item.indexType === 'items' ? '数据化条目' : '动态&资料'))))" class="typetext"></span>
<span style="cursor:pointer;" class="AllBoxText" v-html="item.title" @click="toPage(item)"></span>
</div>
<span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 0;top: 13px;">详情</span>
@@ -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
+2 -2
View File
@@ -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'
}
},