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:
super_liu
2021-08-20 17:37:53 +08:00
parent 61cd8f71cc 05fc5466f2
commit 832e3a7738
14 changed files with 1400 additions and 909 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+54 -51
View File
@@ -425,7 +425,7 @@
<div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png"> <div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png">
</div> </div>
<!-- <div v-show="isMoreAwayBtn" class="put-away" @click="putAwayClick">收起<img src="@/assets/images/shangqi/img/more.png"></div>--> <!-- <div v-show="isMoreAwayBtn" class="put-away" @click="putAwayClick">收起<img src="@/assets/images/shangqi/img/more.png"></div>-->
<!--查看标准条款列表--> <!--查看分解单-->
<el-drawer <el-drawer
title="查看分解单" title="查看分解单"
:wrapperClosable="false" :wrapperClosable="false"
@@ -559,11 +559,11 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrq" prop="xccssrq"
label="新车型实施日期(文本)" label="新车型实施日期(文本)"
width="180"> width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.xccssrq ? $moment(scope.row.xccssrq).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -628,18 +628,18 @@
@pageSizeChange="pageSizeChange7"></pagination> @pageSizeChange="pageSizeChange7"></pagination>
<!-- <el-pagination--> <!-- <el-pagination-->
<!-- @size-change="pageSizeChange"--> <!-- @size-change="pageSizeChange"-->
<!-- @current-change="pageChange"--> <!-- @current-change="pageChange"-->
<!-- :current-page="1"--> <!-- :current-page="1"-->
<!-- :page-sizes="[10, 20, 30, 50]"--> <!-- :page-sizes="[10, 20, 30, 50]"-->
<!-- :page-size="100"--> <!-- :page-size="100"-->
<!-- layout="sizes, prev, pager, next, jumper"--> <!-- layout="sizes, prev, pager, next, jumper"-->
<!-- :total="standitemTotal">--> <!-- :total="standitemTotal">-->
<!-- </el-pagination>--> <!-- </el-pagination>-->
<!-- <pagination :total="standitemTotal" @pageChange="pageChange"--> <!-- <pagination :total="standitemTotal" @pageChange="pageChange"-->
<!-- @pageSizeChange="pageSizeChange"></pagination>--> <!-- @pageSizeChange="pageSizeChange"></pagination>-->
</el-drawer> </el-drawer>
<!--新增标准条款--> <!--新增标准条款-->
@@ -819,9 +819,9 @@
<div class="see-drawer-div"> <div class="see-drawer-div">
<label class="see-drawer-name" title="解读内容">解读内容</label> <label class="see-drawer-name" title="解读内容">解读内容</label>
<span class="see-drawer-val" <span class="see-drawer-val"
:title="standShowItemEO.interpretationContent ? standShowItemEO.interpretationContent.replace(/<.*?>/ig, ' ') : ''"> :title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''">
{{ {{
standShowItemEO.interpretationContent ? standShowItemEO.interpretationContent.replace(/<.*?>/ig, ' ') : '' standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''
}}</span> }}</span>
</div> </div>
@@ -852,51 +852,51 @@
<div class="see-drawer-div"> <div class="see-drawer-div">
<label class="see-drawer-name" title="责任工程师">责任工程师</label> <label class="see-drawer-name" title="责任工程师">责任工程师</label>
<span class="see-drawer-val" :title="standShowItemEO.dutyEngineer"> <span class="see-drawer-val" :title="standShowItemEO.dutyEngineer">
{{standShowItemEO.dutyEngineer }}</span> {{ standShowItemEO.dutyEngineer }}</span>
</div> </div>
<div class="see-drawer-div"> <div class="see-drawer-div">
<label class="see-drawer-name" title="基于上一版本差异">基于上一版本差异</label> <label class="see-drawer-name" title="基于上一版本差异">基于上一版本差异</label>
<span class="see-drawer-val" :title="standShowItemEO.comparedWithPrevious"> <span class="see-drawer-val" :title="standShowItemEO.comparedWithPrevious">
{{standShowItemEO.comparedWithPrevious }}</span> {{ standShowItemEO.comparedWithPrevious }}</span>
</div> </div>
<div class="see-drawer-div"> <div class="see-drawer-div">
<label class="see-drawer-name" title="符合性状态">符合性状态</label> <label class="see-drawer-name" title="符合性状态">符合性状态</label>
<span class="see-drawer-val" :title="standShowItemEO.complianceRequire"> <span class="see-drawer-val" :title="standShowItemEO.complianceRequire">
{{standShowItemEO.complianceRequire }}</span> {{ standShowItemEO.complianceRequire }}</span>
</div> </div>
<div class="see-drawer-div"> <div class="see-drawer-div">
<label class="see-drawer-name" title="合规性分析">合规性分析</label> <label class="see-drawer-name" title="合规性分析">合规性分析</label>
<span class="see-drawer-val" :title="standShowItemEO.complianceState"> <span class="see-drawer-val" :title="standShowItemEO.complianceState">
{{standShowItemEO.complianceState }}</span> {{ standShowItemEO.complianceState }}</span>
</div> </div>
<!-- <div class="see-drawer-div">--> <!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="FO">FO</label>--> <!-- <label class="see-drawer-name" title="FO">FO</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.foShow">{{ standShowItemEO.foShow }}</span>--> <!-- <span class="see-drawer-val" :title="standShowItemEO.foShow">{{ standShowItemEO.foShow }}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="see-drawer-div">--> <!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="责任工程师">责任工程师</label>--> <!-- <label class="see-drawer-name" title="责任工程师">责任工程师</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{--> <!-- <span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{-->
<!-- standShowItemEO.dutyEngineerShow--> <!-- standShowItemEO.dutyEngineerShow-->
<!-- }}</span>--> <!-- }}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="see-drawer-div">--> <!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="svpps">svpps</label>--> <!-- <label class="see-drawer-name" title="svpps">svpps</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>--> <!-- <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="see-drawer-div">--> <!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="要求类型">要求类型</label>--> <!-- <label class="see-drawer-name" title="要求类型">要求类型</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>--> <!-- <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="see-drawer-div">--> <!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>--> <!-- <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>-->
<!-- <span class="see-drawer-val"--> <!-- <span class="see-drawer-val"-->
<!-- :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{--> <!-- :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{-->
<!-- standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)--> <!-- standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)-->
<!-- }}</span>--> <!-- }}</span>-->
<!-- </div>--> <!-- </div>-->
</div> </div>
</el-drawer> </el-drawer>
<!-- 更新LOG --> <!-- 更新LOG -->
@@ -1251,6 +1251,7 @@ export default {
knowIdList: '', knowIdList: '',
total7: 0, total7: 0,
page7: 1, page7: 1,
pageSize7: this.$store.getters.userInfo.configContent,
addForm: { addForm: {
title: '', title: '',
content: '', content: '',
@@ -1772,7 +1773,7 @@ export default {
this.page7 = page this.page7 = page
this.selectSarStandItems() this.selectSarStandItems()
}, },
pageSizeChange7(pageSize){ pageSizeChange7(pageSize) {
this.pageSize7 = pageSize this.pageSize7 = pageSize
this.selectSarStandItems() this.selectSarStandItems()
}, },
@@ -2099,7 +2100,7 @@ export default {
console.log("pageSize"); console.log("pageSize");
console.log(pageSize); console.log(pageSize);
// this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent // this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent
this.standItemSearch.pageSize =pageSize; this.standItemSearch.pageSize = pageSize;
this.selectSarStandItems() this.selectSarStandItems()
// 此处需要调用接口，修改个人配置 // 此处需要调用接口，修改个人配置
}, },
@@ -2331,12 +2332,14 @@ export default {
selectSarStandItems(id, flag) { selectSarStandItems(id, flag) {
this.standItemSearch.standId = this.sarStandardsInfoEO.id this.standItemSearch.standId = this.sarStandardsInfoEO.id
this.standItemSearch.fileType = this.fileType this.standItemSearch.fileType = this.fileType
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => { this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
...this.standItemSearch,
pageSize: this.pageSize7, page: this.page7,
}, {}, res => {
this.selectedItemList = [] this.selectedItemList = []
if (res.ok) { if (res.ok) {
this.standItemList = res.data; this.standItemList = res.data.list;
console.log(res.data); this.total7 = res.data.count // 分页需要
this.total7 = res.data.length // 分页需要
} }
}, e => { }, e => {
}) })
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+1
View File
@@ -1224,6 +1224,7 @@ export default {
}, },
//添加标准确定事件 //添加标准确定事件
okStand() { okStand() {
this.getStandData();
if (this.standList.length < 1) { if (this.standList.length < 1) {
this.$message.warning("请选择需要添加进清单的数据"); this.$message.warning("请选择需要添加进清单的数据");
} else { } else {
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
-1
View File
@@ -354,7 +354,6 @@
this.form.cid = data.cid this.form.cid = data.cid
this.form.endTime = data.endTime this.form.endTime = data.endTime
this.form.cname = data.cname this.form.cname = data.cname
console.log(data);
this.oldData = JSON.parse(JSON.stringify(data.summaryList)) this.oldData = JSON.parse(JSON.stringify(data.summaryList))
data.summaryList.forEach( item => { data.summaryList.forEach( item => {
if (item.state) { if (item.state) {
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+1
View File
@@ -366,6 +366,7 @@
}) })
this.json = data this.json = data
this.data = arr this.data = arr
this.oldData = data.oldinfo this.oldData = data.oldinfo
}).catch(e => { }).catch(e => {
}) })
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+105 -74
View File
@@ -6,42 +6,42 @@
<el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form"> <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form">
<el-form-item label="国家/地区" class="search-item search-item-last"> <el-form-item label="国家/地区" class="search-item search-item-last">
<el-select <el-select
v-model="sarSarAccessEOSearch.countryArea" v-model="sarSarAccessEOSearch.countryArea"
placeholder="请选择" placeholder="请选择"
filterable filterable
> >
<el-option <el-option
v-for="item in countryOptions" v-for="item in countryOptions"
:value="item.value" :value="item.value"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="清单名称" class="search-item search-item-last"> <el-form-item label="清单名称" class="search-item search-item-last">
<el-input <el-input
v-model="sarSarAccessEOSearch.detailedListName" v-model="sarSarAccessEOSearch.detailedListName"
placeholder="请输入清单名称" placeholder="请输入清单名称"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
:loading="searching" :loading="searching"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="small" size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'" v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="searchSarAccess"> @click="searchSarAccess">
查询 查询
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
class="common-button-default" class="common-button-default"
size="small" size="small"
v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'" v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
@click="clearSearch">清空 @click="clearSearch">清空
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -49,58 +49,59 @@
</div> </div>
<div class="action-bar"> <div class="action-bar">
<el-button <el-button
type="primary" type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
size="mini" size="mini"
@click="openModal(null,'addOpt')" @click="openModal(null,'addOpt')"
v-btn-permission="'7aaf236bdf6b1657c615380f7f34b8a8'" v-btn-permission="'7aaf236bdf6b1657c615380f7f34b8a8'"
><i class="iconfont">&#xe84e;</i>新增 ><i class="iconfont">&#xe84e;</i>新增
</el-button> </el-button>
<el-button <el-button
class="common-button-default delete-button" class="common-button-default delete-button"
:loading="delLoading" :loading="delLoading"
size="mini" size="mini"
@click="deleteSarAccess('demore',null)" @click="deleteSarAccess('demore',null)"
v-btn-permission="'562e58cc3a960096cf3321e631293dc9'" v-btn-permission="'562e58cc3a960096cf3321e631293dc9'"
><i class="iconfont">&#xe61b;</i>批量删除 ><i class="iconfont">&#xe61b;</i>批量删除
</el-button> </el-button>
</div> </div>
<div class="container"> <div class="container">
<loading :loading="tableLoading">数据获取中</loading>
<el-table <el-table
:data="sarAccessListDatas" :data="sarAccessListDatas"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
border border
height="100%" height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@selection-change="selectOne" @selection-change="selectOne"
ref="selection" ref="selection"
> >
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="countryArea" prop="countryAreaShow"
label="国家/地区" label="国家/地区"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="detailedListName" prop="detailedListName"
label="清单名称" label="清单名称"
align="center" align="center"
width="260px" width="260px"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a> <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="detailedListState" prop="detailedListState"
label="清单状态" label="清单状态"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.detailedListState === '0'">未发布</span> <span v-if="scope.row.detailedListState === '0'">未发布</span>
<span v-if="scope.row.detailedListState === '1'">已发布</span> <span v-if="scope.row.detailedListState === '1'">已发布</span>
@@ -108,27 +109,31 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="detailedListVision" prop="detailedListVision"
label="清单版本" label="清单版本"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span <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> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="updateTime" prop="updateTime"
label="更新时间" label="更新时间"
align="center"> align="center">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="updatePeople" prop="updatePeople"
label="更新人" label="更新人"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right"> <el-table-column label="操作" align="center" width="50" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -136,11 +141,14 @@
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <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>
<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>
<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-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
@@ -189,14 +197,14 @@ export default {
drawerTotal: 0, // 抽屉分页的总条数 drawerTotal: 0, // 抽屉分页的总条数
sarAccessEORules: { sarAccessEORules: {
region: [ region: [
{ required: true, message: "区域不能为空", trigger: "change" } {required: true, message: "区域不能为空", trigger: "change"}
], ],
country: [ country: [
{ required: true, message: "国家不能为空", trigger: "change" } {required: true, message: "国家不能为空", trigger: "change"}
], ],
detailedListName: [ detailedListName: [
{ required: true, message: "清单名称不能为空", trigger: "blur" }, {required: true, message: "清单名称不能为空", trigger: "blur"},
{ type: "string", max: 100, message: "清单名称不能超过100个字符", trigger: "blur" } {type: "string", max: 100, message: "清单名称不能超过100个字符", trigger: "blur"}
] ]
}, },
countryOptions: [], countryOptions: [],
@@ -215,11 +223,12 @@ export default {
applyAuth: "" // 认证类型 applyAuth: "" // 认证类型
}, },
dataSourceOptions: [ dataSourceOptions: [
{ value: "INLAND_STAND", label: "国内标准法规" }, {value: "INLAND_STAND", label: "国内标准法规"},
{ value: "FOREIGN_STAND", label: "海外标准法规" }, {value: "FOREIGN_STAND", label: "海外标准法规"},
{ value: "FOREIGN_LAWS", label: "国内外政策" }, {value: "FOREIGN_LAWS", label: "国内外政策"},
{ value: "BUSINESS", label: "企业标准 " } {value: "BUSINESS", label: "企业标准 "}
], ],
tableLoading: true,
sarAccessInfoSearchList: [], sarAccessInfoSearchList: [],
selectedAccInfoSearchList: [], selectedAccInfoSearchList: [],
sarAccessInfoListArry: [], sarAccessInfoListArry: [],
@@ -258,7 +267,25 @@ export default {
}, { }, {
_this: this _this: this
}, res => { }, res => {
this.sarAccessListDatas = res.data.records let arr = res.data.records;
console.log('271', arr)
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++) {
if (this.countryOptions[i].value === k[m]) {
k[m] = this.countryOptions[i].label
}
item.countryAreaShow = k.join(',')
}
}
}
})
console.log('286',arr)
this.sarAccessListDatas = arr
this.tableLoading = false
this.sarSarAccessEOSearch.page = 1 this.sarSarAccessEOSearch.page = 1
this.sarAccessListTotal = res.data.total this.sarAccessListTotal = res.data.total
}, e => { }, e => {
@@ -343,12 +370,15 @@ export default {
}); });
}, },
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data){ setMap(data) {
data.forEach(item => { data.forEach(item => {
this.$set(this.countryAreaMap, item.value, item.label) this.$set(this.countryAreaMap, item.value, item.label)
}) })
} }
}, },
created() {
this.searchSarAccess();
},
mounted() { mounted() {
// 分页查询数据 // 分页查询数据
this.searchSarAccess(); this.searchSarAccess();
@@ -380,6 +410,7 @@ export default {
flex: auto; flex: auto;
width: 100%; width: 100%;
height: calc(100% - 110px) !important; height: calc(100% - 110px) !important;
.pagination { .pagination {
position: static; position: static;
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+3
View File
@@ -57,6 +57,7 @@
</el-button> </el-button>
</div> </div>
<div class="container"> <div class="container">
<loading :loading="tableLoading">数据获取中</loading>
<el-table <el-table
:data="sarAccessListDatas" :data="sarAccessListDatas"
tooltip-effect="dark" tooltip-effect="dark"
@@ -174,6 +175,7 @@ export default {
sarAccessListDatas: [], sarAccessListDatas: [],
sarAccessListTotal: 0, sarAccessListTotal: 0,
loading: false, loading: false,
tableLoading: true,
selectedList: [], selectedList: [],
// 新增、编辑 准入信息字段 // 新增、编辑 准入信息字段
sarAccessEO: { sarAccessEO: {
@@ -277,6 +279,7 @@ export default {
this.sarAccessListDatas = res.data.records; this.sarAccessListDatas = res.data.records;
this.sarSarAccessEOSearch.page = 1 this.sarSarAccessEOSearch.page = 1
this.sarAccessListTotal = res.data.total; this.sarAccessListTotal = res.data.total;
this.tableLoading = false
}, e => { }, e => {
}); });
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+4
View File
@@ -67,6 +67,7 @@
</el-button> </el-button>
</div> </div>
<div class="container"> <div class="container">
<loading :loading="tableLoading">数据获取中</loading>
<el-table <el-table
:data="sarAccessListDatas" :data="sarAccessListDatas"
tooltip-effect="dark" tooltip-effect="dark"
@@ -177,6 +178,7 @@ export default {
sarAccessListDatas: [], sarAccessListDatas: [],
sarAccessListTotal: 0, sarAccessListTotal: 0,
loading: false, loading: false,
tableLoading: true,
selectedList: [], selectedList: [],
// 新增、编辑 准入信息字段 // 新增、编辑 准入信息字段
sarAccessEO: { sarAccessEO: {
@@ -292,6 +294,7 @@ export default {
} }
} }
}) })
this.tableLoading = false
this.sarSarAccessEOSearch.page = 1 this.sarSarAccessEOSearch.page = 1
this.sarAccessListTotal = res.data.total this.sarAccessListTotal = res.data.total
}, e => { }, e => {
@@ -405,6 +408,7 @@ export default {
} }
} }
}) })
this.tableLoading = false
this.sarSarAccessEOSearch.page = 1 this.sarSarAccessEOSearch.page = 1
this.sarAccessListTotal = res.data.total this.sarAccessListTotal = res.data.total
}, e => { }, e => {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+493 -323
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+113 -15
View File
@@ -1264,27 +1264,38 @@ export default {
}) })
sarAccessEO.fileIds = relateFile.join(',') sarAccessEO.fileIds = relateFile.join(',')
} }
if (!sarAccessEO.id) { if (!sarAccessEO.id) {
// 新增 // 新增
sarAccessEO.state = '1' sarAccessEO.state = '1'
sarAccessEO.version = 0 sarAccessEO.version = 0
this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, { if (this.sarAccessInfoList.length !== 0) {
_this: this, this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
loading: 'loadData' _this: this,
}, res => { loading: 'loadData'
if (this.sarAccessInfoList.length !== 0) { }, res => {
if (res.ok) { if (res.ok) {
this.$message.success('新增成功') if (res.data === "数据库为空，添加成功") {
this.isNext = true this.$message.success('新增成功')
this.$router.push({ this.isNext = true
name: 'AccessStandardsAndRegulations' this.$router.push({
}) name: 'AccessStandardsAndRegulations'
})
} else if (res.data === "其他清单添加成功") {
this.$message.success('新增成功')
this.isNext = true
this.$router.push({
name: 'AccessStandardsAndRegulations'
})
}
} }
}else { }, e => {
this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)') console.log(e)
} })
}, e => { } else {
}) this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
}
} else { } else {
// 编辑 // 编辑
this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, { this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
@@ -1293,6 +1304,7 @@ export default {
}, res => { }, res => {
if (res.ok) { if (res.ok) {
this.isNext = true this.isNext = true
this.$message.success('修改成功')
this.$router.push({ this.$router.push({
name: 'AccessStandardsAndRegulations' name: 'AccessStandardsAndRegulations'
}) })
@@ -1305,6 +1317,92 @@ export default {
} }
}) })
}, },
// 提交按钮 事件
// saveSarAccess () {
// this.$refs['sarAccessForm'].validate((valid) => {
// if (valid) {
// let rowlist = []
// let rowlist1 = []
// let rowlist2 = []
// let rowlist3 = []
// for (let i = 0; i < this.sarAccessInfoList.length; i++) {
// rowlist.push(this.sarAccessInfoList[i].id)
// if (this.sarAccessInfoList[i].ssrq === null) {
// rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
// }else {
// rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
// }
// if (this.sarAccessInfoList[i].xcxssrqgj === null) {
// rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
// }else {
// rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
// }
// if (this.sarAccessInfoList[i].zccssrqgj === null) {
// rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
// }else {
// rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
// }
// }
// rowlist = rowlist.join(',')
// rowlist1 = rowlist1.join(',')
// rowlist2 = rowlist2.join(',')
// rowlist3 = rowlist3.join(',')
// let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
// sarAccessEO.inforlist = rowlist
// sarAccessEO.inforlist1 = rowlist1
// sarAccessEO.inforlist2 = rowlist2
// sarAccessEO.inforlist3 = rowlist3
// // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
// // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
// // 判断是否有附件
// if (this.fileInfoList.length > 0) {
// let relateFile = []
// this.fileInfoList.map(item => {
// relateFile.push(item.id)
// })
// sarAccessEO.fileIds = relateFile.join(',')
// }
// if (!sarAccessEO.id) {
// // 新增
// sarAccessEO.state = '1'
// sarAccessEO.version = 0
// this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
// _this: this,
// loading: 'loadData'
// }, res => {
// if (this.sarAccessInfoList.length !== 0) {
// if (res.ok) {
// this.$message.success('新增成功')
// this.isNext = true
// this.$router.push({
// name: 'AccessStandardsAndRegulations'
// })
// }
// }else {
// this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
// }
// }, e => {
// })
// } else {
// // 编辑
// this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
// _this: this,
// loading: 'loadData'
// }, res => {
// if (res.ok) {
// this.isNext = true
// this.$router.push({
// name: 'AccessStandardsAndRegulations'
// })
// }
// }, e => {
// })
// }
// }else {
// this.$message.error('请检查表单是否填写正确')
// }
// })
// },
pageInfo() { pageInfo() {
StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{ StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList = res.data.list
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+572 -428
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+2
View File
@@ -713,6 +713,8 @@ export default {
this.dataList.push(item) this.dataList.push(item)
} }
}) })
this.detailedListModel = false
this.standModel = false
}else{ }else{
this.$message.warning('请至少选择一条数据进行添加') this.$message.warning('请至少选择一条数据进行添加')
} }
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+1 -5
View File
@@ -214,11 +214,7 @@
</div> </div>
</div> </div>
<div class="footer"> <div class="footer">
<pagination <pagination :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
:page="pageNo"
:total="total"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"></pagination>
<el-drawer <el-drawer
title='查看' title='查看'
:visible.sync="historySee" :visible.sync="historySee"
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+48 -9
View File
@@ -60,6 +60,24 @@
align="center" align="center"
label="修改意见内容(包括理由或依据)" label="修改意见内容(包括理由或依据)"
> >
<el-table-column
prop="oldText"
align="center"
label="修改前"
>
</el-table-column>
<el-table-column
prop="newText"
align="center"
label="修改后"
>
</el-table-column>
<el-table-column
prop="reason"
align="center"
label="修改理由"
>
</el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="deptName" prop="deptName"
@@ -104,12 +122,18 @@
> >
<div class="demo-drawer-content add-demo"> <div class="demo-drawer-content add-demo">
<div class="search-area"> <div class="search-area">
<el-form :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form"> <el-form style="width: 100%;" :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form">
<el-form-item label="章节编号" label-width="80px" prop="partCode" class="add-form-item"> <el-form-item label="章节编号" label-width="" prop="partCode" class="add-form-item">
<el-input v-model="opinionContent.partCode" autocomplete="off" placeholder="请输入章节编号"></el-input> <el-input v-model="opinionContent.partCode" autocomplete="off" placeholder="请输入章节编号"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="修改意见内容(包括理由或依据)" prop="content" label-width="" class="add-form-item"> <el-form-item label="修改前" prop="oldText" label-width="" class="add-form-item">
<el-input :autosize="{ minRows: 2, maxRows: 8}" type="textarea" v-model="opinionContent.content" autocomplete="off" placeholder="请输入修改意见内容"></el-input> <el-input v-model="opinionContent.oldText" autocomplete="off" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="修改后" prop="newText" label-width="" class="add-form-item">
<el-input v-model="opinionContent.newText" autocomplete="off" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item">
<el-input v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@@ -139,14 +163,22 @@
isSubmit: false, isSubmit: false,
opinionContent: { // 抽屉数据 opinionContent: { // 抽屉数据
partCode: '', partCode: '',
content: '', oldText: '',
newText: '',
reason: ''
}, },
opinionContentRules: { opinionContentRules: {
partCode: [ partCode: [
{ required: true, message: '请输入章节编号', trigger: 'blur' }, { required: true, message: '请输入章节编号', trigger: 'blur' },
], ],
content: [ oldText: [
{ required: true, message: '请输入修改意见内容(包括理由或依据)', trigger: 'blur' } { required: true, message: '请输入修改前内容', trigger: 'blur' }
],
newText: [
{ required: true, message: '请输入修改后内容', trigger: 'blur' }
],
reason: [
{ required: true, message: '请输入修改理由', trigger: 'blur' }
], ],
}, },
standinfoList: [], // 详情列表 standinfoList: [], // 详情列表
@@ -231,12 +263,16 @@
this.id = row.id this.id = row.id
this.opiniontitle = '编辑意见内容' this.opiniontitle = '编辑意见内容'
this.opinionContent.partCode = row.partCode this.opinionContent.partCode = row.partCode
this.opinionContent.content = row.content this.opinionContent.reason = row.reason
this.opinionContent.oldText = row.oldText
this.opinionContent.newText = row.newText
} else { } else {
this.id = '' this.id = ''
this.opiniontitle = '新增意见' this.opiniontitle = '新增意见'
this.opinionContent.partCode = '' this.opinionContent.partCode = ''
this.opinionContent.content = '' this.opinionContent.reason = ''
this.opinionContent.oldText = ''
this.opinionContent.newText = ''
} }
this.isDialog = true this.isDialog = true
}, },
@@ -275,6 +311,9 @@
var form = { var form = {
cid: this.$route.query.item.cid, cid: this.$route.query.item.cid,
content: this.opinionContent.content, content: this.opinionContent.content,
oldText: this.opinionContent.oldText,
newText: this.opinionContent.newText,
reason: this.opinionContent.reason,
partCode: this.opinionContent.partCode, partCode: this.opinionContent.partCode,
userId: this.$store.getters.userInfo.userId || '', userId: this.$store.getters.userInfo.userId || '',
userName: this.$store.getters.userInfo.userName || '', userName: this.$store.getters.userInfo.userName || '',
src/sysConfig/index.js
+3 -3
View File
@@ -4,10 +4,10 @@
* @date: 2018-09-04 17:47:46 * @date: 2018-09-04 17:47:46
*/ */
// 服务器地址 // 服务器地址
// const devIp = '10.96.10.171' const devIp = '10.96.10.171'
// const devInterfacePORT = '9999'
const devIp = '10.96.170.156'
const devInterfacePORT = '9999' const devInterfacePORT = '9999'
// const devIp = '10.5.103.101'
// const devInterfacePORT = '9999'
// 云端端口号 // 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
const simpleFilePath = 'att/attFile/upload' const simpleFilePath = 'att/attFile/upload'