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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-07-26 10:15:57 +08:00
parent b529a40fca b805b85c75
commit 2202ec4ce5
14 changed files with 90 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/verify/index.js
+5 -4
View File
@@ -24,8 +24,9 @@ export default {
* */
validateStandardItem (rule, value, callback) {
// return callback()
let testval = /^[A-Za-z0-9/ ,.-\\-（）()]+$/
if (value && !value.match(testval)) {
let testval = /^[A-Za-z0-9/]+$/
let testval1 = /[.-]+/
if (value && !value.match(testval) && !value.match(testval1)) {
return callback(new Error('只能为（字母、数字、.、-）'))
} else {
callback()
@@ -457,9 +458,9 @@ export default {
callback()
}
},
// 验证输入数字和英文
// 验证输入数字
testNumberCode (rule, value, callback) {
let reg = /[0-9\-]/
let reg = /^[0-9]*$/
if (value !== '' && !value.match(reg)) {
return callback(new Error('只能输入数字'))
} else {
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+1
View File
@@ -355,6 +355,7 @@
this.form.endTime = data.endTime
this.form.cname = data.cname
this.json = data
this.data = data.info
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+4 -17
View File
@@ -74,26 +74,10 @@
prop="chapterNumber"
label="章条编号"
width="170px">
<template slot-scope="scope">
<div v-if="scope.row.state == '2'">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterNumber" @change="changeInput(scope.$index)"></el-input>
</div>
<div v-else>
{{ scope.row.chapterNumber }}
</div>
</template>
</el-table-column>
<el-table-column
prop="chapterName"
label="章节名称">
<template slot-scope="scope">
<div v-if="scope.row.state == '2'">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
</div>
<div v-else>
{{ scope.row.chapterName }}
</div>
</template>
</el-table-column>
<el-table-column
prop="commentText"
@@ -339,7 +323,10 @@
this.form.cname = data.cname
this.oldData = JSON.parse(JSON.stringify(data.summaryList))
data.summaryList.forEach( item => {
item.state = '1'
if (item.state) {
} else {
item.state = '1'
}
item.type = false
})
this.json = data
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<!-- 标准调研流程-->
<ProcessHeader toggle>
<template slot="proName">标准征求意见流程</template>
<template slot="proNode">标准法规部部长审核</template>
<template slot="proNode">审核</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+2 -4
View File
@@ -289,10 +289,8 @@ export default {
this.searchSarAccess();
},
clearSearch() {
this.sarSarAccessEOSearch = {
countryArea: "",
detailedListName: ""
};
this.sarSarAccessEOSearch.countryArea = ''
this.sarSarAccessEOSearch.detailedListName = ''
this.searchSarAccess();
},
// 新增相关
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+5 -8
View File
@@ -165,12 +165,11 @@ export default {
total: 0,
page: 1,
rows: 10,
pageSize: this.$store.getters.userInfo.configContent,
// 查询相关参数
sarSarAccessEOSearch: {
detailedList: "",
detailedListName: "",
page: 1,
pageSize: this.$store.getters.userInfo.configContent
},
sarAccessListDatas: [],
sarAccessListTotal: 0,
@@ -267,9 +266,9 @@ export default {
//分页查询
searchSarAccess() {
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
...this.sarSarAccessEOSearch,
page: 1,
pageSize: 10,
pageSize: this.pageSize,
...this.sarSarAccessEOSearch,
sortKey: 3
}, {
_this: this
@@ -289,10 +288,8 @@ export default {
this.searchSarAccess();
},
clearSearch() {
this.sarSarAccessEOSearch = {
detailedList: "",
detailedListName: ""
};
this.sarSarAccessEOSearch.detailedList = ''
this.sarSarAccessEOSearch.detailedListName = ''
this.searchSarAccess();
},
// 新增相关
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+5 -8
View File
@@ -165,13 +165,12 @@ export default {
searching: false,
total: 0,
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
rows: 10,
// 查询相关参数
sarSarAccessEOSearch: {
projectName: "",
detailedListName: "",
page: 1,
pageSize: this.$store.getters.userInfo.configContent
},
sarAccessListDatas: [],
sarAccessListTotal: 0,
@@ -268,9 +267,9 @@ export default {
//分页查询
searchSarAccess() {
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
page: this.page,
pageSize: this.pageSize,
...this.sarSarAccessEOSearch,
page: 1,
pageSize: 10,
sortKey: 2
}, {
_this: this
@@ -291,10 +290,8 @@ export default {
},
//清空
clearSearch() {
this.sarSarAccessEOSearch = {
projectName: "",
detailedListName: "",
};
this.sarSarAccessEOSearch.projectName = ''
this.sarSarAccessEOSearch.detailedListName = ''
this.searchSarAccess()
},
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+3 -3
View File
@@ -1376,9 +1376,9 @@ export default {
// 清单条目 table select事件
sarAccessInfoSelect (selectData) {
this.sarAccessInfoListArry = selectData
let sarAccessInfoListArryId = []
/* let sarAccessInfoListArryId = []
for(let i=0; i<this.selectData.length; i++){
}
}*/
},
// 点击取消按钮 返回事件
backCancal () {
@@ -1580,7 +1580,7 @@ export default {
for (var accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo].id)
}
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
window.open(exportURL)
this.$message.success('导出信息成功')
}
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+36 -8
View File
@@ -57,7 +57,21 @@
clearable></el-input>
</el-form-item>
<el-form-item label="责任部门" class="search-item" prop="responseUnit">
<el-input v-model="standardForm.responseUnit" v-show="false"></el-input>
<el-select
class="showBox"
v-model="standardForm.zrbm"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in zrbmOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
<!-- <el-input v-model="standardForm.responseUnit" v-show="false"></el-input>
<el-popover placement="bottom" popper-class="user-dept-popper" trigger="click">
<el-input
v-model="standardForm.responseUnit"
@@ -76,7 +90,7 @@
class="ztree" style="height: 300px;overflow: auto">
</laws-tree>
</div>
</el-popover>
</el-popover>-->
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary" type="primary" size="small" @click="selectProductBtn">查询
@@ -106,7 +120,7 @@
<el-form :model="standardForm" class="label-input-form" label-width="108px" inline>
<el-form-item label="英文名称" class="search-item">
<el-input
v-model="standardForm.standEnName"
v-model="standardForm.standName"
placeholder="请输入"
:maxlength="100"
size="small"
@@ -144,6 +158,22 @@
/>
</el-select>
</el-form-item>
<el-form-item label="责任部门" >
<el-select
class="showBox"
v-model="standardForm.zrbm"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in zrbmOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="适用产品线" >
<el-select
class="showBox"
@@ -490,11 +520,9 @@ export default {
},
// 重置搜索
resetSelect() {
this.standardForm = {
standName: "",
responseUnit: ""
};
this.selectInfobyAccid();
this.standardForm.standName = ''
this.standardForm.responseUnit = ''
this.selectInfobyAccid()
},
exportStandard() {
if (this.selectedList.length > 0) {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+1 -1
View File
@@ -1392,7 +1392,7 @@ export default {
for (var accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo].id)
}
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
window.open(exportURL)
// window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
this.$message.success('导出信息成功')
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+1 -1
View File
@@ -1390,7 +1390,7 @@ export default {
for (var accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo].id)
}
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
window.open(exportURL)
// window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
this.$message.success('导出信息成功')
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+17 -16
View File
@@ -188,7 +188,7 @@
round
@click="clearAllSearch('sarBussionessSearch')"
></el-button>
<el-button type="primary" class="common-button-primary" round @click="selectMoreBtn"><i class="iconfont">&#xe7a5;</i>高级检索</el-button>
<!-- <el-button type="primary" class="common-button-primary" round @click="selectMoreBtn"><i class="iconfont">&#xe7a5;</i>高级检索</el-button>-->
</el-form-item>
</el-form>
</div>
@@ -218,7 +218,7 @@
round
@click="exportStandard"
title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
v-btn-permission="'UFIZU4O3AH'"
v-btn-permission="'784d26f527a659eefe84d5e5a53deb96'"
><i class="iconfont">&#xe6e9;</i>导出</el-button>
<!-- <el-button-->
<!-- class="common-button-default"-->
@@ -227,23 +227,23 @@
<!-- @click="uploadImportModal(1)"-->
<!-- v-btn-permission="'afX1p2gh3c'"-->
<!-- ><i class="iconfont">&#xe825;</i>模板下载</el-button>-->
<!-- <el-button-->
<!-- class="common-button-default delete-button"-->
<!-- round-->
<!-- @click="deleteStand(2)"-->
<!-- v-btn-permission="'EKTB87NTEE'"-->
<!-- ><i class="iconfont">&#xe61b;</i>批量删除</el-button>-->
<el-button
class="common-button-default delete-button"
round
@click="deleteStand(2)"
v-btn-permission="'374205ce36a859a158ca4db196d151b7'"
><i class="iconfont">&#xe61b;</i>批量删除</el-button>
<el-button
class="common-button-default"
round
@click="configurationStandard"
v-btn-permission="'PF56TFSV7C'"
v-btn-permission="'381d34443196ca840118ae577ff30d5e'"
><i class="iconfont">&#xe669;</i>配置标准</el-button>
<el-button
class="common-button-default"
round
@click="deleteEnterStandFromKind(2)"
v-btn-permission="'UQCAPM93Q0'"
v-btn-permission="'2d41ebdb6150ba1af52fd753086d77dc'"
><i class="iconfont">&#xe611;</i>移除标准</el-button>
</div>
<!--表格-->
@@ -382,20 +382,20 @@
<el-dropdown-item
v-if="scope.row.collectBtn"
:command="[scope.row, '收藏']"
v-btn-permission="'H6J6YAB9FQ'"
v-btn-permission="'d9730d984627af948053df56a2db7997'"
>
收藏
</el-dropdown-item>
<el-dropdown-item
v-else
:command="[scope.row, '取消收藏']"
v-btn-permission="'H6J6YAB9FQ'"
v-btn-permission="'d96e086ce3dfa75201bdf8e67cd9fe6d'"
>
取消收藏
</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'VL3HVS74DU'">编辑</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ESPMBSD4ZP'">分享</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '授权']" v-btn-permission="'CWBPST294ZH7HSKD4452'" v-if="scope.row.attrInfoMap && scope.row.attrInfoMap.QBMJ === 'ACF675Z88W'">授权</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑</el-dropdown-item>
<!-- <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ESPMBSD4ZP'">分享</el-dropdown-item>-->
<!-- <el-dropdown-item :command="[scope.row, '授权']" v-btn-permission="'CWBPST294ZH7HSKD4452'" v-if="scope.row.attrInfoMap && scope.row.attrInfoMap.QBMJ === 'ACF675Z88W'">授权</el-dropdown-item>-->
<!-- <el-dropdown-item :command="[scope.row, '删除']">删除</el-dropdown-item>-->
<!-- <el-dropdown-item :command="[scope.row, '流程']">流程</el-dropdown-item>-->
</el-dropdown-menu>
@@ -757,7 +757,8 @@
@click="saveConfigStand"
:loading="isSubmit"
>提交</el-button>
<el-button class="common-button-default" icon="el-icon-close" @click="cancelConfigStand">取消</el-button>
<el-button class="common-button-default" style="padding: 7px 12px;" icon="el-icon-close" type="primary"
round @click="cancelConfigStand">取消</el-button>
</div>
</el-drawer>
<!-- 树---新增二级菜单模态窗 -->
src/pages/regulatoryRepository/standardForComments/index.vue
+3
View File
@@ -73,6 +73,9 @@
prop="endTime"
label="征求意见周期"
align="center">
<template slot-scope="scope">
{{ scope.row.startTime + ' ~ ' + scope.row.endTime }}
</template>
</el-table-column>
<el-table-column
prop="startTime"
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+6 -5
View File
@@ -11,7 +11,7 @@
<div v-show="heightShow" class="transition-box">
<p class="transition-box-p">
<label class="transition-box-label">标准号：</label>
<span class="transition-box-span">{{ this.$route.query.item.categorg }}</span>
<span class="transition-box-span">{{ this.$route.query.item.cid }}</span>
</p>
<p class="transition-box-p">
<label class="transition-box-label">标准名称：</label>
@@ -19,10 +19,11 @@
</p>
<p class="transition-box-p">
<label class="transition-box-label">上传时间：</label>
<span class="transition-box-span">{{ this.$route.query.item.starttime || '-' }}</span>
<span class="transition-box-span" v-if="this.$route.query.item.startTime && this.$route.query.item.endTime">{{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}}</span>
<span class="transition-box-span">-</span>
</p> <p class="transition-box-p">
<label class="transition-box-label">征求意见周期：</label>
<span class="transition-box-span">{{ this.$route.query.item.endtime || '-' }}</span>
<span class="transition-box-span">{{ this.$route.query.item.endTime || '-' }}</span>
</p>
</div>
</transition>
@@ -105,8 +106,8 @@
</el-form>
</div>
<div class="demo-drawer-footer">
<el-button :loading="isSubmit" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveUserInfo">提交</el-button>
<el-button class="common-button-default" icon="el-icon-close" @click="closeDrawer">取消</el-button>
<el-button :loading="isSubmit" size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveUserInfo">提交</el-button>
<el-button size="mini" class="common-button-default" icon="el-icon-close" @click="closeDrawer">取消</el-button>
</div>
</div>
</el-drawer>