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

Merge branch 'develop' into 'test'

Browse Source 
Develop

See merge request !95
This commit is contained in:
王夏晖
2021-08-24 01:04:31 +00:00
parent f98386a366 4e3dff9ece
commit 29ffc482e7
19 changed files with 1435 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
+1 -1
View File
@@ -138,7 +138,7 @@
@pageChange="pageChangeReplace"
@pageSizeChange="pageSizeChangeReplace"></pagination>
<div slot="footer" class="demo-drawer-footer">
<el-button class="common-button-default" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
<el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
<el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
</div>
</el-dialog>
src/components/navMenu/index.vue
+3 -3
View File
@@ -135,11 +135,11 @@ export default {
// // // title: '本地产品/项目库',
// // // path: '/localProductsOrProjectLibrary'
// // // },
/*{
{
title: '企业标准库',
path: '/enterpriseStandardDatabase',
menuId: '01ed8f752748227777b3572d56ee9ab5'
},*/
menuId: '7feeb73929c25a6f1fd67952704ec02b'
},
// {
// title: '企标制修订计划',
// path: '/enterBSysRevPlanManaLib',
src/pages/details/otherBussStandardDetails/index.vue
+37 -51
View File
@@ -3,52 +3,11 @@
<div class="other-standard-details v-class" :class="{'hidden': !isMoreAwayBtn}">
<!--title 标题-->
<div class="details-header">
<span>{{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 标准详情</span>
<span>{{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 企标详情</span>
</div>
<!--主体内容-->
<div class="details-content">
<div class="details-content-modular basic-information">
<div class="modular-header">
<div class="modular-header-title"><i class="icon-modular-title" /><span>企标信息</span>
</div>
<div class="modular-header-btn">
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
</div>
</div>
<div class="basic-information-content">
<p style="color: #C42626;"><label>企标编号：</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
<p><label>中文名称：</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
<p><label>英文名称：</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
<p>
<label
title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
>标准状态<i class="el-icon-warning-outline"></i>：</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
</p>
<p><label>发布日期：</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
<p><label>标准实施日期：</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
<p><label>代替企标编号：</label>
<span v-if="sarStandardsInfoEO.replaceStandNum != null && sarStandardsInfoEO.replaceStandNum !== '' && sarStandardsInfoEO.replaceStandNum.split(',').length > 0">
<span v-for="(item, index) in sarStandardsInfoEO.replaceStandNum.split(',')" :key="index">
<a @click="showReplaceLawsInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
</span>
</span>
<span v-else>
{{'-' }}
</span>
</p>
<p><label>被代替企标编号：</label>
<span v-if="sarStandardsInfoEO.replacedStandNum != null && sarStandardsInfoEO.replacedStandNum !== '' && sarStandardsInfoEO.replacedStandNum.split(',').length > 0">
<span v-for="(item, index) in sarStandardsInfoEO.replacedStandNum.split(',')" :key="index">
<a @click="showReplaceLawsInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
</span>
</span>
<span v-else>
{{'-' }}
</span>
</p>
</div>
</div>
<div
class="details-content-modular clearfix"
@@ -56,10 +15,36 @@
:key="index"
v-if="item.isShowImp === '0'"
>
<div class="modular-header">
<div class="modular-header-title"><i class="icon-modular-title" /><span>{{ item.label }}</span></div>
<div class="modular-header" v-if="item.label !== '基础信息'">
<div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
</div>
<div class="modular-header" v-if="item.label === '基础信息'">
<div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
<!-- <div class="modular-header-title"><i class="icon-modular-title" /><span>企标信息</span>-->
<!-- </div>-->
<div class="modular-header-btn">
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
</div>
</div>
<div class="modular-content">
<template v-if = "item.label === '基础信息'">
<div class="details-content-modular basic-information" style="margin-bottom: 0">
<div class="basic-information-content">
<p style="color: #C42626;"><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
<p><label style=" margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
<p><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
<p>
<label style=" margin-right: 139px;"
title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
>文本状态<i class="el-icon-warning-outline"></i></label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
</p>
<p><label style=" margin-right: 157px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
<p><label style=" margin-right: 122px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
</div>
</div>
</template>
<template
v-for="(child, childIndex) in item.child"
v-if="child.isShowImp === '0'"
@@ -1453,7 +1438,7 @@ export default {
return true
}
// 缺少文件
if (this.$hasPermission('Lgfdg6839L')) {
if (this.$hasPermission('43ae63abc1b64e6bd5cf3bb75b423bc2')) {
this.$http.get('lawss/sarBussStandFile/queryConvertAtt', {
attId: attId
}, {
@@ -2032,8 +2017,8 @@ export default {
})
Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then(async(values) => {
const [displayLocation, {attrInfoMap: dynamicFormField}, formFieldList] = values
const relatedPlansRes = await this.queryRelatedPlans()
const relatedPlans = relatedPlansRes.list
// const relatedPlansRes = await this.queryRelatedPlans()
// const relatedPlans = relatedPlansRes.list
formFieldList.forEach((field) => {
displayLocation.forEach((location) => {
location.isShowImp = '0'
@@ -2114,7 +2099,7 @@ export default {
/deep/.details-content{
/*padding: 0 67px;*/
.details-content-modular{
margin-bottom: 20px;
/*margin-bottom: 20px;*/
.modular-header{
display: flex;
align-items: center;
@@ -2186,8 +2171,8 @@ export default {
}
.basic-information-content{
color: #333333;
font-size: 18px;
font-weight: 400;
font-size: 16px;
/*font-weight: 400;*/
.standard-text{
height: 50px;
line-height: 50px;
@@ -2281,7 +2266,7 @@ export default {
}
}
.basic-information{
border-top: 2px dashed #D1D1D1;
/*border-top: 2px dashed #D1D1D1;*/
border-bottom: 2px dashed #D1D1D1;
.modular-header{
height: 60px;
@@ -2291,6 +2276,7 @@ export default {
& > p{
min-height: 55px;
line-height: 55px;
border-bottom: 1px solid #E5E5E5;
}
}
}
src/pages/details/otherStandardDetails/index.vue
+34 -27
View File
@@ -44,7 +44,7 @@
<div class="basic-information-content">
<!-- <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
<p style="color: #C42626;">
<label style=" margin-right: 150px;">标准号</label>
<label style=" margin-right: 164px;">标准号</label>
<span v-if="sarStandardsInfoEO.standYear">{{
sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear
}}</span>
@@ -70,7 +70,7 @@
sarStandardsInfoEO.issueTime || '-'
}}</span></p>
<p>
<label style=" margin-right: 76px;">是否纳入认证清单</label><span>{{
<label style=" margin-right: 84px;">是否纳入认证清单</label><span>{{
sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'
}}</span>
</p>
@@ -287,6 +287,8 @@
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/>
<el-button v-if="file.fileSuffix='pdf'" type="primary" round>OCR</el-button>
<span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
</template>
<template v-else>
@@ -306,12 +308,12 @@
<span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
</template>
</p>
<!-- <el-button-->
<!-- v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
<!-- @click="showItemsModel(child.attrField)"-->
<!-- class="decomposition-btn"-->
<!-- icon="icon-separate"-->
<!-- >标准分解单</el-button>-->
<!-- <el-button-->
<!-- v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
<!-- @click="showItemsModel(child.attrField)"-->
<!-- class="decomposition-btn"-->
<!-- icon="icon-separate"-->
<!-- >标准分解单</el-button>-->
</div>
</div>
@@ -383,6 +385,11 @@
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- OCR按钮,根据文件名取后缀判断是否出现-->
<el-button v-if="judgeSuffix(file.fileName)" type="primary" size="mini" style="margin: 5px" @click="ocrFunction(file)" plain>OCR</el-button>
<span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
</template>
<template v-else>
@@ -1513,6 +1520,14 @@ export default {
props: {},
watch: {},
methods: {
judgeSuffix(fileName){
if ('pdf'===fileName.substring(fileName.lastIndexOf('.') + 1)){
return true;
}else return false;
},
ocrFunction(file){
return "ocr"
},
FormatDate(date) {
return moment(date).format('YYYY-MM-DD');
},
@@ -2089,16 +2104,11 @@ export default {
},
// 分页点击后方法
pageChange(page) {
console.log("page");
console.log(page);
this.standItemSearch.page = page
this.selectSarStandItems()
},
// 分页每页显示数改变后方法
pageSizeChange(pageSize) {
console.log("pageSize");
console.log(pageSize);
// this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent
this.standItemSearch.pageSize = pageSize;
this.selectSarStandItems()
@@ -2124,7 +2134,7 @@ export default {
if (this.sarStandardsInfoEO.replaceStandNum != null && this.sarStandardsInfoEO.replaceStandNum !== '') {
this.replaceNumList = this.sarStandardsInfoEO.replaceStandNum.split(',')
}
// eslint-disable-next-line no-mixed-operators
// // eslint-disable-next-line no-mixed-operators
Object.keys((this.sarStandardsInfoEO && this.sarStandardsInfoEO.attrInfoMap) || {}).forEach((key) => {
if (this.sarStandardsInfoEO.attrInfoMap[key]) {
this.sarStandardsInfoEO[key] = this.sarStandardsInfoEO.attrInfoMap[key]
@@ -2502,9 +2512,7 @@ export default {
},
// 分解单-查看
handlePreview(item) {
console.log(item);
this.standShowItemEO = item
console.log(this.standShowItemEO);
this.showItemInfoModal = true
let fileList = []
item.defaultFileList = []
@@ -2608,8 +2616,6 @@ export default {
// const { data: { STAND: data } } = res
const {data = {}} = res
this.formFieldListData = data[this.$route.params.pageType]
console.log('this.formFieldListData')
console.log(this.formFieldListData);
// this.resolveFormFieldList()
resolve(data[this.$route.params.pageType])
} else {
@@ -2836,14 +2842,14 @@ export default {
this.setMap(res.data.SARPROPERTY) // 标准性质
}, e => {
})
Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then((values) => {
Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then ((values) => {
const [displayLocation, standEO, formFieldList] = values
const dynamicFormField = standEO ? standEO.attrInfoMap : {}
formFieldList.forEach((field) => {
// 相关流程权限
// if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
// return
// }
if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
return
}
displayLocation.forEach((location) => {
location.isShowImp = '0'
if (dynamicFormField) {
@@ -2893,6 +2899,8 @@ export default {
location.half = half
location.showAll = false
})
console.log(standEO);
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', {
id: this.$route.params.id
}, {
@@ -2911,7 +2919,6 @@ export default {
}
})
this.dynamicFormField = displayLocation
console.log(this.dynamicFormField)
})
sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
this.loading = false
@@ -3023,8 +3030,8 @@ export default {
.basic-information-content {
color: #333333;
font-size: 18px;
font-weight: 400;
font-size: 16px;
/*font-weight: 400;*/
.standard-text {
height: 50px;
@@ -3147,8 +3154,8 @@ export default {
.basic-information-content {
color: #333333;
font-size: 18px;
font-weight: 400;
font-size: 16px;
/*font-weight: 400;*/
.standard-text {
height: 50px;
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+1
View File
@@ -1224,6 +1224,7 @@ export default {
},
//添加标准确定事件
okStand() {
this.getStandData();
if (this.standList.length < 1) {
this.$message.warning("请选择需要添加进清单的数据");
} else {
src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+1
View File
@@ -236,6 +236,7 @@
json.commentText = this.commentText
json.responUserList = this.form.responUserList
json.responUserListName = this.form.responUserListName
json.introduce = false
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+12 -1
View File
@@ -357,6 +357,7 @@
json.commentText = this.commentText
json.info = this.data
json.department = this.$store.getters.userInfo.orgName
json.introduce = true
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -382,7 +383,17 @@
this.form.endTime = data.endTime
this.form.cname = data.cname
this.json = data
this.data = data.info || []
if (data.introduce) {
this.data = data.info || []
} else {
this.$http.get('slrs/sar-public-idea-all/getPublicIdea', {
unique: data.uniques
}, {}, res => {
res.data.forEach(item => {
this.data.push(item)
})
})
}
}).catch(e => {
})
})
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+88 -79
View File
@@ -6,42 +6,42 @@
<el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form">
<el-form-item label="国家/地区" class="search-item search-item-last">
<el-select
v-model="sarSarAccessEOSearch.countryArea"
placeholder="请选择"
filterable
v-model="sarSarAccessEOSearch.countryArea"
placeholder="请选择"
filterable
>
<el-option
v-for="item in countryOptions"
:value="item.value"
:key="item.value"
:label="item.label"
v-for="item in countryOptions"
:value="item.value"
:key="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="清单名称" class="search-item search-item-last">
<el-input
v-model="sarSarAccessEOSearch.detailedListName"
placeholder="请输入清单名称"
v-model="sarSarAccessEOSearch.detailedListName"
placeholder="请输入清单名称"
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
:loading="searching"
type="primary"
class="common-button-primary"
size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="searchSarAccess">
:loading="searching"
type="primary"
class="common-button-primary"
size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="searchSarAccess">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
size="small"
v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
@click="clearSearch">清空
class="common-button-default"
size="small"
v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
@click="clearSearch">清空
</el-button>
</el-form-item>
</el-form>
@@ -49,59 +49,59 @@
</div>
<div class="action-bar">
<el-button
type="primary"
class="common-button-primary add-button"
size="mini"
@click="openModal(null,'addOpt')"
v-btn-permission="'7aaf236bdf6b1657c615380f7f34b8a8'"
type="primary"
class="common-button-primary add-button"
size="mini"
@click="openModal(null,'addOpt')"
v-btn-permission="'7aaf236bdf6b1657c615380f7f34b8a8'"
><i class="iconfont">&#xe84e;</i>新增
</el-button>
<el-button
class="common-button-default delete-button"
:loading="delLoading"
size="mini"
@click="deleteSarAccess('demore',null)"
v-btn-permission="'562e58cc3a960096cf3321e631293dc9'"
class="common-button-default delete-button"
:loading="delLoading"
size="mini"
@click="deleteSarAccess('demore',null)"
v-btn-permission="'562e58cc3a960096cf3321e631293dc9'"
><i class="iconfont">&#xe61b;</i>批量删除
</el-button>
</div>
<div class="container">
<loading :loading="tableLoading">数据获取中</loading>
<el-table
:data="sarAccessListDatas"
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
:data="sarAccessListDatas"
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectOne"
ref="selection"
@selection-change="selectOne"
ref="selection"
>
<el-table-column
type="selection"
width="55"
align="center">
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="countryArea"
label="国家/地区"
align="center">
prop="countryAreaShow"
label="国家/地区"
align="center">
</el-table-column>
<el-table-column
prop="detailedListName"
label="清单名称"
align="center"
width="260px"
prop="detailedListName"
label="清单名称"
align="center"
width="260px"
>
<template slot-scope="scope">
<a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
</template>
</el-table-column>
<el-table-column
prop="detailedListState"
label="清单状态"
align="center">
prop="detailedListState"
label="清单状态"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.detailedListState === '0'">未发布</span>
<span v-if="scope.row.detailedListState === '1'">已发布</span>
@@ -109,27 +109,31 @@
</template>
</el-table-column>
<el-table-column
prop="detailedListVision"
label="清单版本"
align="center">
prop="detailedListVision"
label="清单版本"
align="center">
<template slot-scope="scope">
<span
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
scope.row.detailedListVision
}}</span>
</template>
</el-table-column>
<el-table-column
prop="updateTime"
label="更新时间"
align="center">
prop="updateTime"
label="更新时间"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime }}</div>
<div>{{
scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime
}}
</div>
</template>
</el-table-column>
<el-table-column
prop="updatePeople"
label="更新人"
align="center">
prop="updatePeople"
label="更新人"
align="center">
</el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right">
<template slot-scope="scope">
@@ -137,11 +141,14 @@
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b736f2469d49b3214cc8087419a24b60'">查看
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b736f2469d49b3214cc8087419a24b60'">
查看
</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'4733577057bf2470fc5c1f88d81eaf1d'">编辑
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'4733577057bf2470fc5c1f88d81eaf1d'">
编辑
</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'ff411226afb759fd2f4a2798ceac322a'">删除
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'ff411226afb759fd2f4a2798ceac322a'">
删除
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@@ -190,14 +197,14 @@ export default {
drawerTotal: 0, // 抽屉分页的总条数
sarAccessEORules: {
region: [
{ required: true, message: "区域不能为空", trigger: "change" }
{required: true, message: "区域不能为空", trigger: "change"}
],
country: [
{ required: true, message: "国家不能为空", trigger: "change" }
{required: true, message: "国家不能为空", trigger: "change"}
],
detailedListName: [
{ required: true, message: "清单名称不能为空", trigger: "blur" },
{ type: "string", max: 100, message: "清单名称不能超过100个字符", trigger: "blur" }
{required: true, message: "清单名称不能为空", trigger: "blur"},
{type: "string", max: 100, message: "清单名称不能超过100个字符", trigger: "blur"}
]
},
countryOptions: [],
@@ -216,10 +223,10 @@ export default {
applyAuth: "" // 认证类型
},
dataSourceOptions: [
{ value: "INLAND_STAND", label: "国内标准法规" },
{ value: "FOREIGN_STAND", label: "海外标准法规" },
{ value: "FOREIGN_LAWS", label: "国内外政策" },
{ value: "BUSINESS", label: "企业标准 " }
{value: "INLAND_STAND", label: "国内标准法规"},
{value: "FOREIGN_STAND", label: "海外标准法规"},
{value: "FOREIGN_LAWS", label: "国内外政策"},
{value: "BUSINESS", label: "企业标准 "}
],
tableLoading: true,
sarAccessInfoSearchList: [],
@@ -260,24 +267,25 @@ export default {
}, {
_this: this
}, res => {
this.sarAccessListDatas = res.data.records
this.sarAccessListDatas.forEach(item => {
let arr = res.data.records;
arr.forEach(item => {
// 国家地区转换
if (item.countryArea !== null || item.countryArea !== "") {
let k = (item.countryArea || "").split(',')
for (let i in this.countryOptions) {
for (let m = 0; m< k.length; m++) {
for (let m = 0; m < k.length; m++) {
if (this.countryOptions[i].value === k[m]) {
k[m] = this.countryOptions[i].label
k[m] = this.countryOptions[i].label
}
item.countryArea = k.join(',')
item.countryAreaShow = k.join(',')
}
}
}
})
this.sarAccessListDatas = arr
this.tableLoading = false
this.sarSarAccessEOSearch.page = 1
this.sarAccessListTotal = res.data.total
this.tableLoading = false
}, e => {
});
@@ -360,7 +368,7 @@ export default {
});
},
// 将文本状态的id与name对应
setMap(data){
setMap(data) {
data.forEach(item => {
this.$set(this.countryAreaMap, item.value, item.label)
})
@@ -400,6 +408,7 @@ export default {
flex: auto;
width: 100%;
height: calc(100% - 110px) !important;
.pagination {
position: static;
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+9 -7
View File
@@ -85,7 +85,7 @@
align="center">
</el-table-column>
<el-table-column
prop="carType"
prop="carTypeShow"
label="车型类别"
align="center">
</el-table-column>
@@ -279,8 +279,8 @@ export default {
}, {
_this: this
}, res => {
this.sarAccessListDatas = res.data.records
this.sarAccessListDatas.forEach(item =>{
let arr = res.data.records;
arr.forEach(item =>{
// 适用车型转换
if (item.carType !== null) {
let k = (item.carType || "").split(',')
@@ -289,11 +289,12 @@ export default {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label
}
item.carType = k.join(',')
item.carTypeShow = k.join(',')
}
}
}
})
this.sarAccessListDatas = arr
this.tableLoading = false
this.sarSarAccessEOSearch.page = 1
this.sarAccessListTotal = res.data.total
@@ -393,8 +394,8 @@ export default {
}, {
_this: this
}, res => {
this.sarAccessListDatas = res.data.records
this.sarAccessListDatas.forEach(item =>{
let arr = res.data.records
arr.forEach(item =>{
// 适用车型转换
if (item.carType !== null) {
let k = (item.carType || "").split(',')
@@ -403,11 +404,12 @@ export default {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label
}
item.carType = k.join(',')
item.carTypeShow = k.join(',')
}
}
}
})
this.sarAccessListDatas = arr
this.tableLoading = false
this.sarSarAccessEOSearch.page = 1
this.sarAccessListTotal = res.data.total
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+3 -2
View File
@@ -1360,11 +1360,12 @@ export default {
loading: 'loadData'
}, res => {
if (res.ok) {
//this.$message.success('编辑成功')
this.isNext = true
this.$message.success('修改成功')
this.$router.push({
name: 'AccessStandardsAndRegulations'
})
} else {
this.$message.error('已存在此国家/地区清单，修改失败')
}
}, e => {
})
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+1
View File
@@ -1304,6 +1304,7 @@ export default {
}, res => {
if (res.ok) {
this.isNext = true
this.$message.success('修改成功')
this.$router.push({
name: 'AccessStandardsAndRegulations'
})
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+452 -413
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+699 -261
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+28
View File
@@ -3126,6 +3126,7 @@ export default {
// 处理动态表单的时间和下拉框格式
const formFieldList = this.formFieldList
const sarStandAttrObj = {}
formFieldList.forEach((item) => {
const value = nowstandinfo[item.attrField]
// 时间格式处理
@@ -3140,6 +3141,8 @@ export default {
}
sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
})
nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
console.log("nowstandinfo");
console.log(nowstandinfo);
@@ -3153,10 +3156,35 @@ export default {
if (this.addOrUPdateFlag === 1) {
sessionStorage.removeItem('STAND_INLAND')
}
console.log("hello")
console.log(formFieldList);
let standardToLawsInfo={'countryArea':'','standId':'','ssrq':'','zccssrqgj':'','xcxssrqgj':''}
standardToLawsInfo.countryArea=nowstandinfo.country;
standardToLawsInfo.standId=nowstandinfo.id;
standardToLawsInfo.ssrq=nowstandinfo.SSRQ;
standardToLawsInfo.zccssrqgj=nowstandinfo.ZCCSSRQ;
standardToLawsInfo.xcxssrqgj=nowstandinfo.XCXSSRQ;
console.log("country")
console.log(standardToLawsInfo);
this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/standardToLaws',
standardToLawsInfo,
{_this:this}
)
}
}, e => {
this.isSubmit = false
})
} else {
this.isSubmit = false
}
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+45 -61
View File
@@ -699,68 +699,52 @@ export default {
cancelStand() {
this.standModel = false;
},
//添加标准确定事件
okStand(){
if(this.standList.length > 0){
this.standList.forEach(item => {
let addIndex
addIndex = this.dataList.findIndex(items => {
return items.standId === item.id
})
if(addIndex > -1){
this.$message.warning('请勿重复添加数据')
}else{
this.dataList.push(item)
}
})
}else{
this.$message.warning('请至少选择一条数据进行添加')
}
okStand() {
let _this = this;
if (this.standList.length < 1) {
_this.$message.warning("请选择标准");
} else {
for (let i = 0; i < this.dataList.length; i++) {
let newStand = false;
for (let j = 0; j < this.standList.length; j++) {
if (this.standList[j].id == this.dataList[i].standId) {
newStand = true;
this.standList.splice(j, 1)
j--
}
}
if (newStand) {
_this.$message.warning("请勿重复添加数据");
} else {
// _this.dataList.push(item);
}
}
this.standardData = []
_this.standModel = false;
for (var i = 0; i < this.standList.length; i++) {
this.standList1.push({
standId: this.standList[i].id,
projectId: this.localProEO.id
})
}
if (this.standList1 != '') {
this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
_this: this
}, res => {
if (res.ok) {
// this.$message.success(res.message)
this.getDataList()
}
}, e => {
});
}
this.standList = []
this.standList1 = []
_this.detailedListModel = false;
_this.standModel = false;
}
},
// okStand() {
// let _this = this;
// if (this.standList.length < 1) {
// _this.$message.warning("请选择标准");
// } else {
// for (let i = 0; i < this.dataList.length; i++) {
// let newStand = false;
// for (let j = 0; j < this.standList.length; j++) {
// if (this.standList[j].id == this.dataList[i].standId) {
// newStand = true;
// this.standList.splice(j, 1)
// j--
// }
// }
// if (newStand) {
// _this.$message.warning("请勿重复添加数据");
// } else {
// // _this.dataList.push(item);
// }
// }
// this.standardData = []
// _this.standModel = false;
// for (var i = 0; i < this.standList.length; i++) {
// this.standList1.push({
// standId: this.standList[i].id,
// projectId: this.localProEO.id
// })
// }
// if (this.standList1 != '') {
// this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
// _this: this
// }, res => {
// if (res.ok) {
// // this.$message.success(res.message)
// this.getDataList()
// }
// }, e => {
// });
// }
// this.standList = []
// this.standList1 = []
// _this.standModel = false;
// }
// },
//获取标准
getStandrd(data){
this.detailedId = data.id
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+15 -13
View File
@@ -109,6 +109,13 @@
<div class="search-area">
<div class="left">
<el-form :inline="true" :model="sarProStateEO" class="label-input-form">
<el-form-item label="项目编号" class="search-item search-item-last">
<el-input
v-model="sarProStateEO.productId"
placeholder="根据项目编号查找"
:maxlength="100"
clearable></el-input>
</el-form-item>
<el-form-item label="项目名称" class="search-item search-item-last">
<el-input
v-model="sarProStateEO.productName"
@@ -116,13 +123,6 @@
:maxlength="100"
clearable></el-input>
</el-form-item>
<el-form-item label="项目编号" class="search-item search-item-last">
<el-input
v-model="sarProStateEO.standId"
placeholder="根据项目编号查找"
:maxlength="100"
clearable></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
@@ -327,7 +327,7 @@ export default {
pageSize: this.$store.getters.userInfo.configContent,
sarProStateEO: {
productName: "",
standId: "",
productId: "",
type: ""
},
sarProStateTotal: 0,
@@ -335,7 +335,7 @@ export default {
sarProStatePageSize: this.$store.getters.userInfo.configContent,
sarProStateListDatas: [], // 符合性项目列表数据
sarProStateTableHeight: null, // 符合性项目列表高度
standId: "" // 符合性项目Id
productId: "" // 符合性项目Id
};
},
methods: {
@@ -384,16 +384,18 @@ export default {
}, // 外层清空条件查询
handleProjectCompliance(row) {
this.sarProStateEO.type = row.type
this.standId = row.standId;
this.productId = row.productId;
this.querySarProStateZero();
}, // 查看项目符合性
querySarProStateZero(page) {
console.log(page)
if (page) {
this.sarProStateTotalPage = page
} else {
this.sarProStateTotalPage = 1;
}
var form = this.sarProStateEO;
console.log('395',form)
// form.standId = this.standId
form.current = this.sarProStateTotalPage;
form.size = this.sarProStatePageSize;
@@ -416,15 +418,15 @@ export default {
}, // 查询项目数据
clearSearchProState() {
this.sarProStateEO.productName = "";
this.sarProStateEO.standId = "";
this.sarProStateEO.productId = "";
this.sarProStateTotalPage = 1;
this.querySarProStateZero();
}, // 清空条件查询
clearSearchPro() {
this.sarProStateEO.productName = "";
this.sarProStateEO.standId = "";
this.sarProStateEO.productId = "";
this.showSarProStateModal = false;
this.standId = "";
this.productId = "";
}, // 关闭查看事件
pageProStateChange(page) {
this.sarProStateTotalPage = page;
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+2
View File
@@ -183,6 +183,7 @@
},
standinfoList: [], // 详情列表
form: {
ideaId: this.$route.query.item.id,
cid: this.$route.query.item.cid,
page: 1,
size: this.$store.getters.userInfo.configContent,
@@ -309,6 +310,7 @@
if (valid) {
var url = ''
var form = {
ideaId: this.$route.query.item.id,
cid: this.$route.query.item.cid,
content: this.opinionContent.content,
oldText: this.opinionContent.oldText,
src/router/index.js
+1 -1
View File
@@ -1288,7 +1288,7 @@ const routes = [
meta: {
requireAuth: true,
title: '企业标准库',
menuId: '3YVZP8R4TC',
menuId: '7feeb73929c25a6f1fd67952704ec02b',
parentPath: '/enterpriseStandardDatabase'
}
},
src/sysConfig/index.js
+3 -3
View File
@@ -4,10 +4,10 @@
* @date: 2018-09-04 17:47:46
*/
// 服务器地址
// const devIp = '10.96.10.171'
// const devInterfacePORT = '9999'
const devIp = '10.96.170.156'
const devIp = '10.96.10.171'
const devInterfacePORT = '9999'
// const devIp = '10.5.103.101'
// const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
const simpleFilePath = 'att/attFile/upload'