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!129
This commit is contained in:
王夏晖
2021-09-07 10:17:45 +08:00
parent 7dfeea6c50 904514ddb5
commit e1ef35e076
4 changed files with 105 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/mechanismManage/index.vue
+10 -5
View File
@@ -122,7 +122,7 @@
</el-table>
</div>
<loading :loading="Loading">加载中...</loading>
<pagination :page="page" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
<pagination :page="page" :total="total" :pageSize="pageSize" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
</div>
<loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
<el-drawer
@@ -278,13 +278,18 @@ export default {
_this: this,
loading: 'treeLoading'
}, res => {
console.log(res);
this.treeData = res.data
this.id = res.data[0].id
this.getData()
}, e => {
console.log(e);
})
},
getData () {
this.$http.post('SarInstitution/institution/user', {
current:this.page,
size: this.pageSize,
institutionId: this.id,
uname: this.searchForm.uname,
email: this.searchForm.email
@@ -293,7 +298,7 @@ export default {
loading: 'Loading'
}, res => {
console.log(res.data)
res.data.forEach((item) => {
res.data.records.forEach((item) => {
var NameList = ''
item.positions.forEach((items) => {
if (NameList.length > 0) {
@@ -303,8 +308,8 @@ export default {
})
item.NameList = NameList
})
this.data = res.data
this.total = res.data.length
this.data = res.data.records
this.total = res.data.total
})
},
pageChange (page) {
@@ -312,7 +317,7 @@ export default {
this.getData()
},
pageSizeChange (pageSize) {
this.$store.getters.userInfo.configContent = pageSize
this.pageSize = pageSize
this.getData()
},
},
src/pages/config/pages/postManage/index.vue
+63 -5
View File
@@ -1,6 +1,30 @@
<!-- 配置管理 - 岗位管理 -->
<template>
<div id="post-manage">
<div class="search-area">
<div class="left">
<el-form ref="" :model="sarPost" inline>
<el-form-item label="岗位名称" class="search-item">
<el-input v-model="sarPost.name"
placeholder="岗位名称查找"
clearable></el-input>
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button class="common-button-primary" type="primary" size="mini" @click="searchPostName"
v-btn-permission="">查询
</el-button>
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button class="common-button-default" @click="resetSelect" size="mini"
v-btn-permission="">清空
</el-button>
</el-form-item>
</el-form>
</div>
<div class="right">
</div>
</div>
<div class="action-bar">
<el-button type="primary"
class="common-button-primary add-button"
@@ -65,6 +89,7 @@
</template>
</el-table-column>
</el-table>
<pagination :page="page" :pageSize="pageSize" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
</div>
<loading :loading="Loading">加载中...</loading>
<el-dialog
@@ -133,7 +158,13 @@
name: 'PostManage',
data () {
return {
editId: '',
sarPost: {
name: "", // 岗位名称
},
pageSize: this.$store.getters.userInfo.configContent,
page: 1,
total: 0,
editId: '',
type: '', // 1为新增 2为编辑
dialogTitle: '',
nodeList: [],
@@ -160,6 +191,24 @@
}
},
methods: {
searchPostName() {
this.page = 1;
this.getData();
}, // 查询
pageChange(page) {
this.page = page;
this.getData();
},
pageSizeChange(pageSize) {
this.pageSize = pageSize;
this.getData();
},
// 分页查询
resetSelect() {
this.sarPost.name = "";
this.getData();
}, // 外层清空条件查询
handleCommand (command) {
switch (command[1]) {
case '删除':
@@ -177,7 +226,10 @@
if (res.ok) {
this.$message.success('删除成功')
this.getData()
} else {
this.$message.warning(res.message)
}
this.submitLoading = false
})
},
editData (row) {
@@ -225,11 +277,15 @@
}
},
getData () { // 获取岗位数据
this.$http.get('sarPosition/position', {}, {
this.$http.get('sarPosition/position', {
current: this.page,
pageSize: this.pageSize,
...this.sarPost,
}, {
_this: this,
loading: 'Loading'
}, res=> {
res.data.forEach((item)=>{
res.data.records.forEach((item)=>{
var idList = []
var NameList = ''
item.roles.forEach((items)=>{
@@ -242,7 +298,9 @@
item.idList = idList
item.NameList = NameList
})
this.data = res.data
// this.data = res.data
this.data = res.data.records
this.total = res.data.total
})
},
addModal () { // 点击新增按钮
@@ -317,7 +375,7 @@
#post-manage {
height: 100%;
.content {
height: calc(~'100% - 53px')
height: calc(~'100% - 105px - 56px')
}
.filter-tree {
height: calc(~'100% - 50px')
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+15 -29
View File
@@ -459,7 +459,7 @@
clearable></el-input>
</el-form-item>
<el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
prop="textStatus" label-width="150px" class="add-form-item">
prop="textStatusBuss" label-width="150px" class="add-form-item">
<template slot="label">文本状态</template>
<el-select v-model="sarBussionessStandEO.textStatusBuss"
placeholder="请选择文本状态"
@@ -529,7 +529,7 @@
class="add-form-item"
>
<template slot="label">关联模块--VPPS编码</template>
<el-input v-model="sarBussionessStandEO.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', sarBussionessStandEO.VPPSBMBUSS)"></el-input>
<el-input v-model="sarBussionessStandEO.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', sarBussionessStandEO.VPPSBMBUSS,true)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'VPPSCNBUSS'">
@@ -1004,10 +1004,10 @@
</el-select>
</el-form-item>
<el-form-item label="体系类别" class="add-form-item form-item-disabled">
<el-input v-model="sarBussionessSearch.TXLBBUSS" placeholder="请输入体系类别" clearable></el-input>
<el-input v-model="sarBussionessSearch.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', sarBussionessStandEO.TXLBBUSS)"></el-input>
</el-form-item>
<el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
<el-input v-model="sarBussionessSearch.VPPSBMBUSS" placeholder="请输入模块VPPS编码" clearable></el-input>
<el-input v-model="sarBussionessSearch.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', sarBussionessStandEO.VPPSBMBUSS,false)"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -1189,7 +1189,7 @@
<tree-select-new
width = "500"
:lazy=true
:multiple=true
:multiple="multipleFlag2"
:check-strictly=true
:modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle"
@@ -1900,6 +1900,7 @@ export default {
qcbm: '',
qcbmName: '',
drawerTitle1:'',
multipleFlag2:'',
modalShowFlag1: false,
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
@@ -1929,9 +1930,11 @@ export default {
if(checkedData) {
if(checkedData.length > 0){
this.sarBussionessStandEO.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.sarBussionessStandEO.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
}else {
this.sarBussionessStandEO.VPPSBMBUSS = checkedData.code
this.sarBussionessSearch.VPPSBMBUSS = checkedData.code
this.sarBussionessStandEO.VPPSCNBUSS = checkedData.chineseName
}
}
@@ -1942,16 +1945,19 @@ export default {
if(checkedData) {
if(checkedData.length > 0){
this.sarBussionessStandEO.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
this.sarBussionessSearch.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
}else {
this.sarBussionessStandEO.TXLBBUSS = checkedData.menuName
this.sarBussionessSearch.TXLBBUSS = checkedData.menuName
}
}
this.modalShowFlag1 = false
this.$forceUpdate()
},
choiceZRR2 (type, title, id) {
choiceZRR2 (type, title, id,multFlag) {
this.drawerTitle = title
this.modalShowFlag2 = true
this.multipleFlag2 = multFlag
this.url = ''
this.urlChild = ''
this.url="sarVppsTree/list"
@@ -2759,7 +2765,7 @@ export default {
const value = nowstandinfo[item.attrField]
// 时间格式处理
if (item.attrType === 'DATE_PICKER' && value) {
nowstandinfo[item.attrField] = this.$dateFormat(this.sarBussionessStandEO[item.attrField], 'yyyy-MM-dd hh:mm:ss')
nowstandinfo[item.attrField] = this.$moment(this.sarBussionessStandEO[item.attrField]).format('YYYY-MM-DD')
} else if (item.attrType === 'DATE_PICKER' && !value) {
delete nowstandinfo[item.attrField]
}
@@ -3283,28 +3289,6 @@ export default {
this.tableFlag = item
// item.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
this.getBussionStandTable(item,'',type)
this.sarBussionessSearch.applyCountry = ''
this.sarBussionessSearch.standGenera = ''
this.sarBussionessSearch.standSubclass = ''
this.sarBussionessSearch.issueTime = ''
this.sarBussionessSearch.putTime = ''
this.sarBussionessSearch.responsibleUnit = ''
this.sarBussionessSearch.classifyCode = ''
this.sarBussionessSearch.standCode = ''
this.sarBussionessSearch.standName = ''
this.sarBussionessSearch.numberName = ''
this.sarBussionessSearch.standSort = ''
this.sarBussionessSearch.replaceStandNum = ''
this.sarBussionessSearch.orgName = ''
this.sarBussionessSearch.id = ''
this.sarBussionessSearch.synopsis = ''
this.sarBussionessSearch.classifyCode = ''
this.sarBussionessSearch.quoteStand = ''
this.sarBussionessSearch.standStatus = ''
this.sarBussionessSearch.citationUser = ''
this.sarBussionessSearch.advanceSearchVOStr = ''
},
// 清空搜索框
clearAllSearch (flag) {
@@ -3329,6 +3313,8 @@ export default {
this.sarBussionessSearch.quoteStand = ''
this.sarBussionessSearch.standStatus = ''
this.sarBussionessSearch.citationUser = ''
this.sarBussionessSearch.TXLBBUSS = ''
this.sarBussionessSearch.VPPSBMBUSS = ''
this.sarBussionessSearch.advanceSearchVOStr = ''
this.pageChange(1)
this.getBussionStandTable(this.sarBussionessSearch)
src/pages/searchCenter/pages/advancedSearch.vue
+17 -6
View File
@@ -795,8 +795,20 @@
<el-col :span="12">
<el-form-item label="关联模块-VPPS编码" prop="VPPSBMBUSS">
<el-input v-model="standForm.VPPSBMBUSS" clearable
placeholder="请输入关联模块-VPPS编码查找"></el-input>
<el-input v-model="standForm.VPPSBMBUSS" placeholder="请输入关联模块-VPPS编码查找" clearable @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', standForm.VPPSBMBUSS,false)"></el-input>
<tree-select-new
width = "800"
:key="key1"
:lazy=true
:multiple=true
:check-strictly= true
:modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle"
:show-checkBox="showCheckBox"
:url="url"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -1489,11 +1501,9 @@ export default {
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
this.standForm.cycvppsbm = checkedData.map(item => item.code).join(",")
this.standForm.cycvppscn = checkedData.map(item => item.chineseName).join(",")
this.standForm.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
}else {
this.standForm.cycvppsbm = checkedData.code
this.standForm.cycvppscn = checkedData.chineseName
this.standForm.VPPSBMBUSS = checkedData.code
}
}
this.modalShowFlag2 = false
@@ -1694,6 +1704,7 @@ export default {
}
}
}
this.$forceUpdate()
this.searchSarBykey();
},
/**