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 LAWS/laws-system-front-FOTON!165
This commit is contained in:
王夏晖
2021-09-28 09:10:07 +08:00
parent 2ff888466f 23f6532ff8
commit 66077fe597
11 changed files with 181 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.js
+11 -3
View File
@@ -76,10 +76,18 @@ router.beforeEach(function (to, from, next) {
next({path:"bzqdfbStep1-4"+param})
}else if (prcType === '5'){
//标准项目合规评估 标准维度
next({path:"xmpgStep1-2"+param})
if(path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2"){
next({path:"xmpgStep1-2"+param})
}else {
next({path:"xmpgStep1-7"+param})
}
}else if(prcType === '6'){
//标准项目合规评估 项目维度
next({path:"xmpg2Step1-2"+param})
if(path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2"){
next({path:"xmpg2Step1-2"+param})
}else {
next({path:"xmpg2Step1-12"+param})
}
} else if (prcType === '8') {
// 未符合项整改
next({path:"wfhxzgStep5-1"+param})
@@ -93,7 +101,7 @@ router.beforeEach(function (to, from, next) {
next({path:"bzzqyjStep1-9"+param})
}else if(prcType === '10'){
//项目清单确认
next({path:"xmqdqrStep1-2"+param})
next({path:"xmqdqrStep1-3"+param})
}
}
console.log("res : res =>", res);
src/pages/config/pages/attributeCustom/components/stand.vue
+40 -41
View File
@@ -2,8 +2,8 @@
<template>
<div class="attribute-custom v-class">
<div class="action-bar1">
<el-button class="common-button-primary add-button" size="mini" v-btn-permission="''" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
<el-button class="common-button-default" size="small" v-btn-permission="''" @click="showDisplayLocationDialog">展示区域管理</el-button>
<el-button size="mini" style="margin-right: 5px" class="common-button-primary add-button" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
<el-button size="small" class="common-button-default" @click="showDisplayLocationDialog">展示区域管理</el-button>
</div>
<loading :loading="attributeDataLoading">数据处理中</loading>
<div class="content">
@@ -74,16 +74,16 @@
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-btn-permission="''" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
<el-dropdown-item v-btn-permission="''" :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑']">编辑</el-dropdown-item>
<el-dropdown-item :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</template>
</el-table-column>
</el-table>
</el-table>
</div>
<pagination :total="total" :pageChange="pageNo" :pageSizeChange="pageSize" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
<!-- 新建抽屉-->
@@ -118,7 +118,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="属性字段" prop="attrField" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
<el-form-item label="属性字段" prop="attrField" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
<el-input v-model.trim="attributeEO.attrField" :disabled="addOrEdit === 'edit'" placeholder="请输入属性字段" clearable/>
</el-form-item>
<el-form-item label="属性名称" prop="attrName" class="add-form-item">
@@ -135,7 +135,7 @@
</el-select>
</el-form-item>
<el-form-item label="选项值" prop="selVal" class="add-form-item" v-if="attributeEO.attrType === 'SEL_OPTION' || attributeEO.attrType === 'SEL_OPTS'">
<el-select v-model="attributeEO.selVal" placeholder="请选择" filterable>
<el-select v-model="attributeEO.selVal" placeholder="请选择" :disabled="addOrEdit === 'edit'" filterable>
<el-option
v-for="item in relateDicIdOptions"
:label="item.label"
@@ -188,8 +188,8 @@
</el-form>
</div>
<div id="roleFormButton" class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveInfo()">提交</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelModel">取消</el-button>
<el-button class="common-button-primary" icon="el-icon-check" type="primary" @click="saveInfo()">提交</el-button>
<el-button class="common-button-default" icon="el-icon-close" @click="cancelModel">取消</el-button>
</div>
</el-drawer>
@@ -199,7 +199,7 @@
width="400px"
>
<div style="margin-bottom: 10px;">
<el-button size="mini" class="common-button-primary add-button" v-btn-permission="'e128da8f053dd19113e75772f2c70f29'" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)">新增</el-button>
<el-button class="common-button-primary add-button" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)">新增</el-button>
</div>
<el-table
:loading="displayLocationDialogTableConfig.loading"
@@ -228,10 +228,10 @@
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand2">
<i class="iconfont">&#xe61e;</i>
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-btn-permission="'2a788bca1cca66384e97f8ff722d4232'" :command="[scope.row, '修改']">修改</el-dropdown-item>
<el-dropdown-item v-btn-permission="'116a3f339f3600e639271d0073045912'" :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']">删除</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '修改']">修改</el-dropdown-item>
<el-dropdown-item :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']">删除</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -273,8 +273,8 @@
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="mini" class="common-button-default" @click="handleDisplayLocationFormDialogReset('displayLocationDialogForm')">取 消</el-button>
<el-button size="mini" class="common-button-primary" type="primary" @click="handleDisplayLocationFormDialogSubmit('displayLocationDialogForm')">确 定</el-button>
<el-button class="common-button-default" @click="handleDisplayLocationFormDialogReset('displayLocationDialogForm')">取 消</el-button>
<el-button class="common-button-primary" type="primary" @click="handleDisplayLocationFormDialogSubmit('displayLocationDialogForm')">确 定</el-button>
</span>
</el-dialog>
</div>
@@ -319,7 +319,6 @@ export default {
},
displayLocationDialogFormData: {
areaName: '',
sarType: '',
showIndex: ''
},
displayLocationDialogFormRules: {
@@ -331,8 +330,7 @@ export default {
{required: true, message: '所属模块不能为空', trigger: 'change'}
],
showIndex: [
{ required: true, message: '排序号不能为空且为正整数', trigger: 'blur'},
{ type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'},
{ type: 'number', required: true, message: '请输入排序号', trigger: 'blur' },
{ type: 'number', min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
]
},
@@ -353,7 +351,7 @@ export default {
showRegionId: '',
selVal: '',
isSearch: '1',
sarType: 'STAND',
sarType: '',
isWarn: '1'
},
attrTypeOptions: [
@@ -561,7 +559,7 @@ export default {
queryDisplayLocationList (sarType) {
return new Promise((resolve, reject) => {
this.$http.get('lawssBase/utArea/getAreaList', {
sarType: sarType
sarType: sarType || 'INLAND_STAND'
}, {
_this: this
}, res => {
@@ -589,17 +587,17 @@ export default {
},
getAttrByPage () {
this.$http.get('lawss/sarStandAttrDetails/page', {
page: this.pageNo,
pageSize: this.pageSize,
sarType: this.sarType
}, {
_this: this,
loading: 'attributeDataLoading'
},
res => {
this.attributeList = res.data.list
this.total = res.data.count
}, e => {})
page: this.pageNo,
pageSize: this.pageSize,
sarType: this.sarType
}, {
_this: this,
loading: 'attributeDataLoading'
},
res => {
this.attributeList = res.data.list
this.total = res.data.count
}, e => {})
this.$refs.selections.clearSelection()
},
async showAddModel () {
@@ -609,7 +607,6 @@ export default {
this.addOrEdit = 'add'
this.attributeTitle = '新增'
this.showInfoModal = true
this.attributeEO = {}
this.$nextTick(() => {
this.$refs['attributeEO'].resetFields()
})
@@ -679,13 +676,13 @@ export default {
},
getDictionarySelList () {
this.$http.get('sys/dictionary/getDictionaryCodeSelList', {
sarType: this.sarType
}, {
_this: this
},
res => {
this.relateDicIdOptions = res.data
}, e => {})
sarType: this.sarType
}, {
_this: this
},
res => {
this.relateDicIdOptions = res.data
}, e => {})
},
getAttrTypeText (type) {
let texts = ''
@@ -725,7 +722,9 @@ export default {
this.addOrEdit = 'edit'
this.attributeTitle = '编辑'
this.showInfoModal = true
this.attributeEO = JSON.parse(JSON.stringify(params))
this.$nextTick(() => {
this.attributeEO = JSON.parse(JSON.stringify(params))
})
},
handleTableDelete (params) {
this.selectedList = []
src/pages/config/pages/mechanismManage/index.vue
+30 -3
View File
@@ -65,15 +65,20 @@
height="100%"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
prop="account"
label="账号"
width="100px">
</el-table-column>
<el-table-column
prop="uname"
label="姓名"
width="170px">
width="100px">
</el-table-column>
<el-table-column
prop="sex"
label="性别"
width="170px">
width="50px">
<template slot-scope="scope">
<div v-if="scope.row.sex === '1'">男</div>
<div v-if="scope.row.sex === '2'">女</div>
@@ -92,14 +97,36 @@
<el-table-column
prop="institutionName"
label="所属部门">
<template slot-scope="scope">
<el-popover trigger="hover" placement="top">
{{scope.row.institutionName}}
<div slot="reference" class="name-wrapper">
<p v-if="scope.row.institutionName.length<15">
{{scope.row.institutionName}}
</p>
<p v-else> {{scope.row.institutionName.substring(0,15)}}...</p>
</div>
</el-popover>
</template>
</el-table-column>
<el-table-column
prop="NameList"
label="所属岗位">
<template slot-scope="scope">
<el-popover trigger="hover" placement="top">
{{scope.row.NameList}}
<div slot="reference" class="name-wrapper">
<p v-if="scope.row.NameList.length<15">
{{scope.row.NameList}}
</p>
<p v-else> {{scope.row.NameList.substring(0,15)}}...</p>
</div>
</el-popover>
</template>
</el-table-column>
<el-table-column
label="状态"
width="170px">
width="100px">
<template slot-scope="scope">
<div v-if="scope.row.disableFlag === '1'">已禁用</div>
<div v-else>已启用</div>
src/pages/config/pages/postManage/index.vue
+1 -1
View File
@@ -57,7 +57,7 @@
<el-table-column
prop="name"
label="岗位名称"
width="170px">
width="300px">
</el-table-column>
<el-table-column
prop="NameList"
src/pages/details/otherStandardDetails/index.vue
+3 -3
View File
@@ -2883,9 +2883,9 @@
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) {
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+1 -1
View File
@@ -569,7 +569,7 @@
style="width: 100%"
border
ref="table"
height="100%"
height="90%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectThree"
src/pages/processCenter/pages/newProcess/index.vue
+76 -1
View File
@@ -148,7 +148,7 @@
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="">
<el-col :span="size ? 6 : 8" v-btn-permission="'9d3775db9a76f37402e3e49f3e55e77e'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('11')">
<div class="card-top">
@@ -166,6 +166,63 @@
</div>
</el-card>
</el-col>
<!--严逸舟写的分割线-->
<el-col :span="size ? 6 : 8" v-btn-permission="">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('12')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">赵开耀的流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
<!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。-->
<!-- </div>-->
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('13')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">严逸舟的流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
<!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。-->
<!-- </div>-->
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('14')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">张宇欢的流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
<!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。-->
<!-- </div>-->
</div>
</el-card>
</el-col>
<!--严逸舟写的分割线-->
</div>
</div>
<div v-if="zcgllc">
@@ -283,6 +340,24 @@ export default {
name:'xmqdqrStep1'
})
break
case '12':
// 赵开耀的流程
this.$router.push({
name: 'zhaokaiyaoStep1'
})
break
case '13':
// 严逸舟的流程
this.$router.push({
name: 'yanyizhouStep1'
})
break
case '14':
// 张宇欢的流程
this.$router.push({
name: 'zhangyuhuanStep1'
})
break
}
},
checkPermission(permissionIdArray) {
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+1 -4
View File
@@ -374,18 +374,15 @@ export default {
});
}
},
created() {
this.searchSarAccess();
},
mounted() {
// 分页查询数据
this.searchSarAccess();
// 从数据库中查询各下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", "", {
_this: this
}, res => {
this.countryOptions = res.data.COUNTRY;
this.setMap(this.countryOptions);
this.searchSarAccess();
}, e => {
});
}
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+16 -1
View File
@@ -81,7 +81,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="标准名称" class="search-item">
<el-form-item label="标准号/标准名称" class="search-item">
<el-input
v-model="sarAccessInfoSearch.standName"
placeholder="请输入"
@@ -605,6 +605,7 @@ export default {
},
data() {
return {
// isAdvancedSearch: false,
textStatusMap: {},
countryAreaMap: {},
typeApplicableMap: {},
@@ -951,6 +952,20 @@ export default {
}
this.selectLawsStands()
},
// selectMoreBtn() {
// this.isAdvancedSearch = true
// this.standardFormList.standName = ''
// this.standardFormList.typeApplicable = ''
// this.standardFormList.nylx = ''
// this.standardFormList.zrbm = ''
// this.standardFormList.sycpx = ''
// this.showTableFlag = false
// this.page = 1
// this.standardForm.page = 1
// this.selectInfoMore()
// },
// 法规维护人树
getDept() {
return new Promise((resolve, reject) => {
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+1 -1
View File
@@ -389,7 +389,7 @@ export default {
})
},
handleQueryPdf(file){
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.id))
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.attId))
}
},
mounted() {
src/pages/searchCenter/pages/standardSearch.vue
+1 -1
View File
@@ -243,7 +243,7 @@
<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 style="cursor:pointer;" class="AllBoxText" v-html="item.title" @click="toPage(item)"></span>
<span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 5px;">更多</span>
<span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 5px;">详情</span>
</div>
<div class="AllBoxContent" v-html="item.textContent"></div>
<div v-if="item.indexType !== 'items' && item.indexType !== 'msgdyinfo'" class="AllTime">