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

Merge branch 'fix_foton_20231213' into 'master'

Browse Source 
Fix foton 20231213

See merge request laws-foton-slrs/foton-laws-system-front!134
This commit is contained in:
高嵩
2023-12-21 08:51:44 +00:00
parent 618347413c e7f1cf82b9
commit 37405db88f
12 changed files with 419 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/mechanismManage/components/SetRoleForDepartment.vue
+164
View File
@@ -0,0 +1,164 @@
<template>
<el-drawer
title="绑定角色"
:visible.sync="visible"
:wrapperClosable="false"
size="800px"
>
<div class="drawer-content" style="padding-top: 20px">
<el-form
ref="form"
:model="form"
label-width="120px"
label-position="left"
>
<el-form-item label="部门名称">
{{ form.institutionName }}
</el-form-item>
<el-divider style="margin: 0" />
<el-form-item label="绑定角色" class="search-item">
<el-select
:value="getRoleIds"
placeholder="请选择"
multiple
collapse-tags
size="medium"
@change="roleIdsChange"
>
<el-option
v-for="item in allRoleOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-form>
</div>
<div class="drawer-footer">
<el-button
class="common-button-default"
icon="el-icon-close"
size="mini"
:loading="btnLoading"
@click="onCancel"
>
取消
</el-button>
<el-button
class="common-button-primary"
icon="el-icon-check"
type="primary"
size="mini"
:loading="btnLoading"
@click="onSubmit"
>
确定
</el-button>
</div>
<loading :loading="loading">加载中...</loading>
</el-drawer>
</template>
<script>
export default {
name: 'SetRoleForDepartment',
data () {
return {
visible: false,
allRoleOptions: [],
form: {
institutionId: '', // 部门id
institutionName: '',
roleIds: '', // 角色id
},
loading: false,
btnLoading: false,
}
},
computed: {
getRoleIds () {
if (!this.form.roleIds || this.form.roleIds === '') {
return []
} else {
return this.form.roleIds.split(',')
}
}
},
created () {
this.getAllRole()
},
methods: {
open (id) {
this.form.institutionId = id
this.form.roleIds = ''
this.form.institutionName = ''
const config = {
_this: this,
loading: 'loading'
}
const query = { institutionId: this.form.institutionId }
this.$http._getData('SarInstitution/institution/findInstitutionTree', query, config).then(res => {
if (res.ok && res.data) {
this.form.institutionName = res.data.institutionName
this.form.roleIds = res.data.selectedRoleIds.join(',') || ''
}
})
this.visible = true
},
getAllRole () {
this.$http._getData('sarRole/role/getAllRole').then(res => {
if (res.ok && res.data) {
this.allRoleOptions = res.data
}
})
},
roleIdsChange (val) {
this.form.roleIds = val.join(',')
},
onSubmit () {
const config = {
_this: this,
loading: 'btnLoading'
}
this.$http._getData('/SarInstitution/institution/setRoleToInstitutionAndUser', this.form, config).then(res => {
if (res.ok) {
this.$emit('success')
this.onCancel()
}
})
console.log(this.form)
},
onCancel () {
this.visible = false
}
}
}
</script>
<style scoped lang="less">
.drawer-content {
padding: 0 19px;
overflow-y: auto;
flex: auto;
/deep/.el-form-item{
margin: 0 !important;
}
/deep/.el-divider{
margin: 0 !important;
}
/deep/ .el-select .el-tag {
max-width: 110px !important;
}
}
.drawer-footer {
width: 100%;
padding: 0 20px;
height: 70px;
line-height: 69px;
border-top: 1px solid #e8e8e8;
text-align: right;
background: #fff;
z-index: 999;
}
</style>
src/pages/config/pages/mechanismManage/pages/mechanism.vue
+180 -150
View File
@@ -5,76 +5,66 @@
<div class="tree">
<!-- @keyup.enter.native="searchPeople"-->
<el-input
v-model="filterText"
class="filter-tree-input"
placeholder="输入关键字进行过滤"
v-model="filterText">
</el-input>
<!-- <el-tree-->
<!-- node-key="id"-->
<!-- :data="treeData"-->
<!-- :props="defaultProps"-->
<!-- :default-checked-keys="nodeList"-->
<!-- :current-node-key="nodeKeyId"-->
<!-- highlight-current-->
<!-- check-strictly-->
<!-- :expand-on-click-node="false"-->
<!-- ref="tree"-->
<!-- :load="loadNode"-->
<!-- @node-click="handleNodeClick"-->
<!-- lazy>-->
<!-- </el-tree>-->
/>
<el-tree
ref="tree"
:data="treeData"
:props="defaultProps"
:current-node-key="nodeKeyId"
node-key="id"
:filter-node-method="filterNode"
highlight-current
ref="tree"
:expand-on-click-node="false"
@node-click="handleNodeClick">
</el-tree>
@node-click="handleNodeClick"
/>
</div>
<div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }">
<div class="tree-collapse" :class="{ 'tree-close': sideClose }" @click="treeCollapse">
<!--切换折叠样式-->
<i class="el-icon-arrow-left" v-if="sideClose === false"></i>
<i class="el-icon-arrow-right" v-if="sideClose === true"></i>
<i v-if="sideClose === false" class="el-icon-arrow-left" />
<i v-if="sideClose === true" class="el-icon-arrow-right" />
</div>
</div>
<div class="tree-right">
<div class="content">
<!--搜索区域-->
<div class="search-area">
<el-form inline class="label-input-form" v-model="searchForm">
<el-form v-model="searchForm" inline class="label-input-form">
<el-form-item label="姓名" class="search-item">
<el-input placeholder="根据姓名查询" clearable v-model="searchForm.uname">
</el-input>
<el-input v-model="searchForm.uname" placeholder="根据姓名查询" clearable />
</el-form-item>
<el-form-item label="邮箱" class="search-item">
<el-input placeholder="根据邮箱查询" clearable v-model="searchForm.email">
</el-input>
<el-input v-model="searchForm.email" placeholder="根据邮箱查询" clearable />
</el-form-item>
<el-form-item>
<el-button type="primary" size="mini"
class="common-button-primary" @click="getDatas('1')" v-btn-permission="'d285ee99b52abcd63d863f6783e350f0'">
<el-button
v-btn-permission="'d285ee99b52abcd63d863f6783e350f0'"
type="primary"
size="mini"
class="common-button-primary"
@click="getDatas('1')"
>
查询
</el-button>
</el-form-item>
<el-form-item>
<el-button size="mini" class="common-button-default" @click="clearAllSearch" v-btn-permission="'12a6b1f548cef7b152746c978fc32dbb'">
<el-button v-btn-permission="'12a6b1f548cef7b152746c978fc32dbb'" size="mini" class="common-button-default" @click="clearAllSearch">
清空
</el-button>
</el-form-item>
<el-form-item>
<el-button size="mini" type="primary" @click="selectEdit" v-btn-permission="'786a941b255a4fe4d13b7e67f100a4e5'">
<el-button v-btn-permission="'786a941b255a4fe4d13b7e67f100a4e5'" size="mini" type="primary" @click="selectEdit">
批量配置角色
</el-button>
<el-button size="mini" type="primary" @click="selectEditOfOrg" v-btn-permission="'786a941b255a4fe4d13b7e67f100a4e5'">
<el-button v-btn-permission="'786a941b255a4fe4d13b7e67f100a4e5'" size="mini" type="primary" @click="selectEditOfOrg">
根据部门批量配置角色
</el-button>
<el-button v-btn-permission="'335a0e7929ac7e11887bec0d7efd0fef'" size="mini" type="primary" @click="setRoleForDepartment">
配置部门绑定角色
</el-button>
</el-form-item>
</el-form>
</div>
@@ -86,19 +76,21 @@
style="width: 100%; flex: auto;"
class="drag-table"
height="100%"
@selection-change="selectedData"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
fontWeight: 'bold', height: '48px'}"
@selection-change="selectedData"
>
<el-table-column
type="selection"
width="55"
align="center"
/>
<el-table-column
type="index"
width="55"
label="序号"
align="center">
type="index"
width="55"
label="序号"
align="center"
>
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (page - 1) * pageSize }}
</template>
@@ -106,17 +98,18 @@
<el-table-column
prop="account"
label="账号"
width="100px">
</el-table-column>
width="100px"
/>
<el-table-column
prop="uname"
label="姓名"
width="100px">
</el-table-column>
width="100px"
/>
<el-table-column
prop="sex"
label="性别"
width="50px">
width="50px"
>
<template slot-scope="scope">
<div v-if="scope.row.sex === '1'">男</div>
<div v-if="scope.row.sex === '2'">女</div>
@@ -125,16 +118,17 @@
<el-table-column
prop="phone"
label="电话"
width="170px">
</el-table-column>
width="170px"
/>
<el-table-column
prop="email"
label="邮箱"
width="170px">
</el-table-column>
width="170px"
/>
<el-table-column
prop="institutionName"
label="所属部门">
label="所属部门"
>
<template slot-scope="scope">
<el-popover trigger="hover" placement="top">
{{ scope.row.institutionName }}
@@ -148,31 +142,32 @@
</template>
</el-table-column>
<el-table-column
prop="roles"
label="角色"
>
<template slot-scope="scope">
{{getRoleName(scope.row.roles)}}
prop="roles"
label="角色"
>
<template slot-scope="scope">
{{ getRoleName(scope.row.roles) }}
</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.institutionName ||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-->
<!-- 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.institutionName ||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="100px">
width="100px"
>
<template slot-scope="scope">
<div v-if="scope.row.disableFlag === '1'">已禁用</div>
<div v-else>已启用</div>
@@ -180,16 +175,17 @@
</el-table-column>
<el-table-column
label="操作"
width="50px">
width="50px"
>
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<div style="display: inline-block" @click.stop>
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-btn-permission="'30db3b395deb5004266cd65d302c2776'" v-if="scope.row.disableFlag === '1'" :command="[scope.row, '启用']" >
<el-dropdown-item v-if="scope.row.disableFlag === '1'" v-btn-permission="'30db3b395deb5004266cd65d302c2776'" :command="[scope.row, '启用']">
启用
</el-dropdown-item>
<el-dropdown-item v-btn-permission="'30db3b395deb5004266cd65d302c2776'" v-if="scope.row.disableFlag === '0'" :command="[scope.row, '禁用']">
<el-dropdown-item v-if="scope.row.disableFlag === '0'" v-btn-permission="'30db3b395deb5004266cd65d302c2776'" :command="[scope.row, '禁用']">
禁用
</el-dropdown-item>
@@ -204,7 +200,13 @@
</el-table>
</div>
<loading :loading="Loading">加载中...</loading>
<pagination :page="page" :total="total" :pageSize="pageSize" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
<pagination
:page="page"
:total="total"
:pageSize="pageSize"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"
/>
</div>
<el-drawer
class="postPage"
@@ -215,29 +217,42 @@
@close="resetFormPost"
>
<el-form ref="" :model="sarPost" inline>
<el-form-item class="search-item" style="padding-left: 25px">
<el-input v-model="sarPost.name"
size="small"
placeholder="角色名称查找"
clearable></el-input>
<el-form-item class="search-item" style="padding-left: 25px">
<el-input
v-model="sarPost.name"
size="small"
placeholder="角色名称查找"
clearable
/>
</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
v-btn-permission="''"
class="common-button-primary"
type="primary"
size="mini"
@click="searchPostName"
>
查询
</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
v-btn-permission=""
class="common-button-default"
size="mini"
@click="resetSelect"
>
清空
</el-button>
</el-form-item>
</el-form>
<el-tree
v-if="modalPost"
ref="tree2"
node-key="id"
class="filter-tree"
style="height: 100%; overflow: auto;"
v-if="modalPost"
:props="props"
:data="postList"
:filter-node-method="filterNode"
@@ -246,9 +261,16 @@
check-strictly
default-expand-all
:expand-on-click-node="false"
show-checkbox>
</el-tree>
<pagination :auto-size="true" :page="page1" :pageSize="pageSize1" :total="total2" @pageChange="pageChange2" @pageSizeChange="pageSizeChange2"></pagination>
show-checkbox
/>
<pagination
:auto-size="true"
:page="page1"
:pageSize="pageSize1"
:total="total2"
@pageChange="pageChange2"
@pageSizeChange="pageSizeChange2"
/>
<div id="roleFormButton" class="demo-drawer-footer">
<el-button
size="mini"
@@ -257,26 +279,32 @@
type="primary"
:loading="butionLoading"
@click="PostSubmit"
>确定
>
确定
</el-button>
<el-button size="mini" class="common-button-default" icon="el-icon-close" @click="resetFormPost">取消</el-button>
</div>
</el-drawer>
<loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
<SetRoleForDepartment ref="SetRoleForDepartmentRef" @success="getDatas('1')" />
</div>
</template>
<script>
import SetRoleForDepartment from '../components/SetRoleForDepartment'
export default {
name: 'mechanism',
data() {
name: 'Mechanism',
components: {
SetRoleForDepartment
},
data () {
return {
formLoading: true,
peopleType: '', //1为树结构 2 为全机构
peopleType: '', // 1为树结构 2 为全机构
nodeKeyId: '',
searchForm: {
uname: "",
email: ""
uname: '',
email: ''
},
userId: '',
postList: [],
@@ -287,7 +315,7 @@ export default {
nodeList: [],
modalPost: false,
sarPost: {
name: "", // 角色名称
name: '', // 角色名称
},
filterText: '', // 树结构检索条件
defaultProps: {
@@ -299,8 +327,8 @@ export default {
total: 0,
total2: 0,
pageSize: this.$store.getters.userInfo.configContent,
page1:1,
pageSize1:20,
page1: 1,
pageSize1: 20,
sideClose: false,
data: [], // table数据
treeLoading: false,
@@ -309,31 +337,46 @@ export default {
id: '',
// 批量配置角色勾选暂存
manageData: [],
configOrgManage:false,
configOrgManage: false,
drawerTitle: '配置角色'
}
},
computed: {},
watch: {
filterText (val) {
this.$refs.tree.filter(val);
},
},
mounted () {
// 获取组织结构树
this.getTree()
this.getTree2()
},
methods: {
getRoleName(roles){
let names=roles.map(item=>{
return item.name
})
// 给部门所有人员配置角色·
setRoleForDepartment () {
this.$refs.SetRoleForDepartmentRef.open(this.id)
},
getRoleName (roles) {
const names = roles.map(item => {
return item.name
})
return names.join(',')
},
clearAllSearch() {
clearAllSearch () {
this.searchForm = {
uname: "",
email: ""
uname: '',
email: ''
}
this.page = 1
this.getData()
},
resetFormPost() {
resetFormPost () {
this.modalPost = false
this.postList = []
this.page1 = 1
},
PostSubmit() {
PostSubmit () {
this.butionLoading = true
if (this.drawerTitle === '配置角色') {
this.$http.postData('sarUser/user/role', {
@@ -347,8 +390,8 @@ export default {
this.getData()
}
})
} else if(this.configOrgManage){
//批量配置角色信息
} else if(this.configOrgManage) {
// 批量配置角色信息
this.$http.postData('sarUser/user/roleBatchByOrgId', {
roleIds: this.$refs.tree2.getCheckedKeys(),
orgId: this.id
@@ -373,18 +416,17 @@ export default {
}
})
}
},
searchPostName() {
searchPostName () {
this.page = 1;
this.getTree2();
this.sarPost.name = "";
this.sarPost.name = '';
}, // 查询
resetSelect() {
this.sarPost.name = "";
resetSelect () {
this.sarPost.name = '';
this.getTree2();
}, // 外层清空条件查询
handleCommand(command) {
handleCommand (command) {
switch (command[1]) {
case '启用':
this.disableFlagEdit(command[0], 0)
@@ -398,7 +440,7 @@ export default {
}
},
getTree2() {
getTree2 () {
this.$http.get('sarRole/role/allPage', {
current: this.page1,
pageSize: this.pageSize1,
@@ -410,10 +452,10 @@ export default {
this.total2 = res.data.total
})
},
postsConfigure(row) {
postsConfigure (row) {
this.configOrgManage = false
this.drawerTitle = '配置角色'
var arr = []
const arr = []
this.userId = row.userId
row.positions.forEach((item) => {
arr.push(item.id)
@@ -422,8 +464,8 @@ export default {
this.modalPost = true
this.getTree2()
},
disableFlagEdit(row, type) {
let json = {}
disableFlagEdit (row, type) {
const json = {}
json.userId = row.userId
json.disableFlag = type
this.$http.postData('sarUser/user/disable', json, {},
@@ -438,14 +480,14 @@ export default {
}
})
},
treeCollapse() {
treeCollapse () {
this.sideClose = !this.sideClose
},
filterNode(value, data) {
filterNode (value, data) {
if (!value) return true;
return data.name.indexOf(value) !== -1;
},
handleNodeClick(data) {
handleNodeClick (data) {
this.id = data.id
this.page = 1
this.getData()
@@ -485,7 +527,7 @@ export default {
// }, e => {
// })
// },
getTree() {
getTree () {
this.$http.get('SarInstitution/institution', {}, {
_this: this,
loading: 'treeLoading'
@@ -501,7 +543,7 @@ export default {
console.log(e);
})
},
getDatas(type) {
getDatas (type) {
if (type === '1') {
this.page = 1
}
@@ -530,7 +572,7 @@ export default {
this.total = res.data.total
})
},
getData() {
getData () {
this.peopleType = 1;
this.$http.post('SarInstitution/institution/userUnderInstitution', {
current: this.page,
@@ -556,42 +598,42 @@ export default {
this.total = res.data.total
})
},
pageChange(page) {
pageChange (page) {
this.page = page
if(this.peopleType === 1){
if(this.peopleType === 1) {
this.getData()
}else{
this.getDatas()
}
},
pageSizeChange(pageSize) {
pageSizeChange (pageSize) {
this.pageSize = pageSize
if(this.peopleType === 1){
if(this.peopleType === 1) {
this.getData()
}else{
this.getDatas()
}
},
pageChange2(page1) {
pageChange2 (page1) {
this.page1 = page1
this.getTree2()
},
pageSizeChange2(pageSize1) {
pageSizeChange2 (pageSize1) {
this.pageSize1 = pageSize1
this.getTree2()
},
/** 批量编辑角色的勾选数据 */
selectedData(val) {
selectedData (val) {
this.manageData = val
},
selectEdit() {
selectEdit () {
this.configOrgManage = false
this.getTree2()
if(this.manageData.length){
if(this.manageData.length) {
this.userId = []
this.manageData.forEach(item=>{
this.manageData.forEach(item => {
this.userId.push(item.userId)
})
this.drawerTitle = '批量配置角色'
@@ -600,24 +642,13 @@ export default {
this.$message.warning('请选择需要批量配置的角色')
}
},
selectEditOfOrg() {
selectEditOfOrg () {
this.configOrgManage = true
this.getTree2()
this.drawerTitle = '批量配置角色'
this.modalPost = true
},
},
computed: {},
watch: {
filterText(val) {
this.$refs.tree.filter(val);
},
},
mounted() {
// 获取组织结构树
this.getTree()
this.getTree2()
}
}
</script>
@@ -728,5 +759,4 @@ export default {
}
}
</style>
src/pages/phone/components/standardSystemPopup.vue
+35 -25
View File
@@ -1,10 +1,12 @@
<template>
<van-popup v-model="popupShow"
position="right"
:style="{ height: '100%', width: '90%' }"
round
:close-on-click-overlay="false"
@click-overlay="handleCancel">
<van-popup
v-model="popupShow"
position="right"
:style="{ height: '100%', width: '70%' }"
round
:close-on-click-overlay="false"
@click-overlay="handleCancel"
>
<h3 class="popup-title">
<span>体系结构</span>
<van-icon name="cross" size="22px" @click="handleCancel" />
@@ -13,28 +15,43 @@
<van-field name="radio" label="标准状态">
<template #input>
<van-radio-group v-model="textStatusName" direction="horizontal">
<van-radio name="全部">全部</van-radio>
<van-radio name="全部" style="margin-bottom: 5px;">全部</van-radio>
<van-radio name="现行有效">现行有效</van-radio>
</van-radio-group>
</template>
</van-field>
<standardSystemTree ref="standardSystemTreeRef" :data="standardSystemTreeData" :loading="loading" @checkedKey="getCheckedKey"></standardSystemTree>
<standardSystemTree ref="standardSystemTreeRef" :data="standardSystemTreeData" :loading="loading" @checkedKey="getCheckedKey" />
</div>
<div class="popup-footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleReset">重置</el-button>
<!--<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleCancel">取消</el-button>-->
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="handleOk">确定</el-button>
<el-button
class="common-button-primary"
size="mini"
icon="el-icon-check"
type="primary"
@click="handleOk"
>
确定
</el-button>
</div>
</van-popup>
</template>
<script>
import standardSystemTree from "./standardSystemTree";
import standardSystemTree from './standardSystemTree';
export default {
name: "standardSystemPopup",
name: 'StandardSystemPopup',
components: {
standardSystemTree,
},
props: {
// 以前的选中项
initKeys: {
type: Array,
required: true
}
},
data () {
return {
popupShow: true,
@@ -48,13 +65,6 @@ export default {
}
}
},
props: {
// 以前的选中项
initKeys: {
type: Array,
required: true
}
},
methods: {
initOpen () {
this.checkedKeys = []
@@ -76,8 +86,8 @@ export default {
},
handleOk () {
// if (this.checkedKeys.length > 0) {
this.popupShow = false
// this.$emit('standSystemKeys', this.checkedKeys)
this.popupShow = false
// this.$emit('standSystemKeys', this.checkedKeys)
this.$emit('searchQuery', { checkedKeys: this.checkedKeys, textStatusName: this.textStatusName })
// } else {
// // this.$toast('请至少选择一项');
@@ -87,7 +97,7 @@ export default {
},
handleCancel () {
// if (this.initKeys.length > 0) {
this.hide()
this.hide()
// } else {
// this.$message.error('请至少选择一项')
// this.open()
@@ -100,7 +110,7 @@ export default {
},
async getData () {
let url = this.api.getListStand
let query = { sorDivide: 'INLAND_STAND' }
const query = { sorDivide: 'INLAND_STAND' }
switch (this.$route.query.standType) {
case 'INLAND':
break
@@ -112,9 +122,9 @@ export default {
query.sorDivide = 'BUSINESS_STAND'
break
}
//INLAND 国内 FOREIGN 海外 bussstand 企标
const res = await this.$http._getData(url,query,{
_this:this,
// INLAND 国内 FOREIGN 海外 bussstand 企标
const res = await this.$http._getData(url, query, {
_this: this,
loading: 'loading'
})
if (res.ok && res.data) {
src/pages/phone/standDynamics/components/folderPopup.vue
+21 -11
View File
@@ -1,30 +1,40 @@
<template>
<van-popup v-model="popupShow"
position="right"
:style="{ height: '100%', width: '90%' }"
round
:close-on-click-overlay="false"
@click-overlay="handleCancel"
get-container="body">
<van-popup
v-model="popupShow"
position="right"
:style="{ height: '100%', width: '70%' }"
round
:close-on-click-overlay="false"
get-container="body"
@click-overlay="handleCancel"
>
<h3 class="popup-title">
<span>体系结构</span>
<van-icon name="cross" size="22px" @click="handleCancel" />
</h3>
<div class="popup-main">
<folderTree ref="folderTreeRef" @checked="getChecked"></folderTree>
<folderTree ref="folderTreeRef" @checked="getChecked" />
</div>
<div class="popup-footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleReset">重置</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleCancel">取消</el-button>
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="handleOk">确定</el-button>
<el-button
class="common-button-primary"
size="mini"
icon="el-icon-check"
type="primary"
@click="handleOk"
>
确定
</el-button>
</div>
</van-popup>
</template>
<script>
import folderTree from "./folderTree";
import folderTree from './folderTree';
export default {
name: "folderPopup",
name: 'FolderPopup',
components: {
folderTree,
},
src/pages/processCenter/pages/creatProcess/qbfs/step6.vue
+4 -4
View File
@@ -526,12 +526,12 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="征求意见（各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-杨卫利），项目组各PMT/PAT）" prop="bussUser5Name" placement="top" :color="roleForm.bussUser5Name ? '#66b1ff' : ''">
<el-timeline-item timestamp="征求意见（各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-刘金英），项目组各PMT/PAT）" prop="bussUser5Name" placement="top" :color="roleForm.bussUser5Name ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="bussUser5Name" style="margin-bottom: 0">
<h4>各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-杨卫利），项目组各PMT/PAT</h4>
<h4>各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-刘金英），项目组各PMT/PAT</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.bussUser5Name" readonly="readonly" placeholder="选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-杨卫利），项目组各PMT/PAT" @click.native="choiceZRRList('bussUser5', '选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-杨卫利），项目组各PMT/PAT', roleForm.bussUser5)"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.bussUser5Name" readonly="readonly" placeholder="选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-刘金英），项目组各PMT/PAT" @click.native="choiceZRRList('bussUser5', '选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-刘金英），项目组各PMT/PAT', roleForm.bussUser5)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -1332,7 +1332,7 @@ export default {
{ required: true, message: '选择标准法规工程师/事业部标准化员', trigger: 'blur' },
],
bussUser5Name: [
{ required: true, message: '选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-杨卫利），项目组各PMT/PAT', trigger: 'blur' },
{ required: true, message: '选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-刘金英），项目组各PMT/PAT', trigger: 'blur' },
],
bussUser7Name: [
{ required: true, message: '选择标准法规工程师', trigger: 'blur' },
src/pages/processCenter/pages/creatProcess/qbfs/step7.vue
+4 -4
View File
@@ -531,12 +531,12 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="征求意见（张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师）" prop="hqUserName" placement="top" :color="roleForm.hqUserName ? '#66b1ff' : ''">
<el-timeline-item timestamp="征求意见（张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、刘金英、技术委员会相关成员、总院相关中心总工及四五级工程师）" prop="hqUserName" placement="top" :color="roleForm.hqUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="hqUserName" style="margin-bottom: 0">
<h4>张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师</h4>
<h4>张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、刘金英、技术委员会相关成员、总院相关中心总工及四五级工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.hqUserName" placeholder="选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师" readonly="readonly" @click.native="choiceZRRList('hqUserId', '选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', roleForm.hqUserId)"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.hqUserName" placeholder="选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、刘金英、技术委员会相关成员、总院相关中心总工及四五级工程师" readonly="readonly" @click.native="choiceZRRList('hqUserId', '选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、刘金英、技术委员会相关成员、总院相关中心总工及四五级工程师', roleForm.hqUserId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -1498,7 +1498,7 @@ export default {
{ required: true, message: '选择总院各中心兼职标准化员/各事业部标准化员', trigger: 'change' },
],
hqUserName: [
{ required: true, message: '选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', trigger: 'change' },
{ required: true, message: '选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、刘金英、技术委员会相关成员、总院相关中心总工及四五级工程师', trigger: 'change' },
],
fggcsUserName: [
{ required: true, message: '选择标准法规工程师', trigger: 'change' },
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+1 -1
View File
@@ -159,7 +159,7 @@
@submit="handleSubmit"
>
</ProcessFooter>
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件" v-dragDialogWidth :close-on-click-modal="false">
<upload-file v-if="fileMadel" :fileList="fileList"
:action="fileUrl"
:limit="8"
src/pages/processCenter/pages/creatProcess/qbrk-product/step6-1.vue
+1 -1
View File
@@ -2214,7 +2214,7 @@
case 'GLWJBUSS':
this.fileList=this.GLWJBUSSFileList
break;
case 'XGDFileList':
case 'XGD':
this.fileList=this.XGDFileList
break;
default : ;
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+1 -1
View File
@@ -2238,7 +2238,7 @@
case 'GLWJBUSS':
this.fileList=this.GLWJBUSSFileList
break;
case 'XGDFileList':
case 'XGD':
this.fileList=this.XGDFileList
break;
default : ;
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+1 -1
View File
@@ -2226,7 +2226,7 @@
case 'GLWJBUSS':
this.fileList=this.GLWJBUSSFileList
break;
case 'XGDFileList':
case 'XGD':
this.fileList=this.XGDFileList
break;
default : ;
src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+5 -5
View File
@@ -672,16 +672,16 @@
</el-card>
</el-timeline-item>
<el-timeline-item
timestamp="征求意见（张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师）"
timestamp="征求意见（张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、刘金英、技术委员会相关成员、总院相关中心总工及四五级工程师）"
prop="hqUserName" placement="top" :color="roleForm.hqUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="hqUserName" style="margin-bottom: 0">
<h4>张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师</h4>
<h4>张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、刘金英、技术委员会相关成员、总院相关中心总工及四五级工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.hqUserName"
placeholder="选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师"
placeholder="选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、刘金英、技术委员会相关成员、总院相关中心总工及四五级工程师"
readonly="readonly"
@click.native="choiceZRRList('hqUserId', '选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', roleForm.hqUserId)"></el-input>
@click.native="choiceZRRList('hqUserId', '选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、刘金英、技术委员会相关成员、总院相关中心总工及四五级工程师', roleForm.hqUserId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -1724,7 +1724,7 @@
hqUserName: [
{
required: true,
message: '选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师',
message: '选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、刘金英、技术委员会相关成员、总院相关中心总工及四五级工程师',
trigger: 'blur'
},
],
src/pages/processCenter/pages/phone/qbrk/components/RoleInfo.vue
+2 -2
View File
@@ -38,8 +38,8 @@
></TimeLineFormItem>
<TimeLineFormItem
prop="hqUserName"
timestamp="征求意见（张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师）"
title="张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师"
timestamp="征求意见（张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、刘金英、技术委员会相关成员、总院相关中心总工及四五级工程师）"
title="张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、刘金英、技术委员会相关成员、总院相关中心总工及四五级工程师"
:id.sync="roleForm.hqUserId"
:name.sync="roleForm.hqUserName"
disabled