commit
This commit is contained in:
@@ -14,6 +14,7 @@
|
||||
<el-form
|
||||
ref="qbkwForm"
|
||||
:model="form"
|
||||
:rules="formRules"
|
||||
class="label-input-form"
|
||||
label-width="210px"
|
||||
>
|
||||
@@ -30,10 +31,10 @@
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="完成时间" prop="year" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="完成时间" prop="date" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
v-model="form.year"
|
||||
type="year"
|
||||
v-model="form.date"
|
||||
type="date"
|
||||
placeholder="请选择完成时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
@@ -56,98 +57,86 @@
|
||||
</el-form>
|
||||
</div>
|
||||
<div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="调研描述">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入调研描述"
|
||||
v-model="textarea">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
<!-- <el-collapse accordion>-->
|
||||
<!-- <el-collapse-item title="调研描述">-->
|
||||
<!-- <div style="margin: 10px 0;">-->
|
||||
<!-- <el-input-->
|
||||
<!-- type="textarea"-->
|
||||
<!-- :rows="3"-->
|
||||
<!-- resize="none"-->
|
||||
<!-- placeholder="请输入调研描述"-->
|
||||
<!-- v-model="textarea">-->
|
||||
<!-- </el-input>-->
|
||||
<!-- </div>-->
|
||||
<!-- </el-collapse-item>-->
|
||||
<!-- </el-collapse>-->
|
||||
</div>
|
||||
</div>
|
||||
<div class="content" v-if="active === '2'">
|
||||
<div class="block" style="padding-top: 20px;">
|
||||
<el-timeline>
|
||||
<el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<h4>流程发起人</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="user1" placeholder="流程发起人"></el-input>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="选择责任人" placement="top" :color="user2 ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<h4>责任对接人</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="user2" placeholder="选择责任人" @click.native="choiceZRR">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="上传调研结果" placement="top" :color="user3 ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<h4>责任人</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="user3" placeholder="选择责任人"></el-input>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
|
||||
<el-timeline-item timestamp="审批" placement="top" :color="user4 ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<h4>责任对接人</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="user5" placeholder="选择责任对接人"></el-input>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="调研汇总" placement="top" :color="user5 ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<h4>标准法规工程师</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="user4" placeholder="选择标准法规工程师"></el-input>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="会签审核" placement="top" :color="user6 ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<h4>责任人</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="user5" placeholder="选择责任人"></el-input>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="会签审核" placement="top" :color="user7 ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<h4>责任部门领导与标准法规部部长</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="user5" placeholder="选择责任部门领导与标准法规部部长"></el-input>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="审定" placement="top" :color="user8 ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<h4>技术管理中心负责人</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="user5" placeholder="选择技术管理中心负责人"></el-input>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="批准" placement="top" :color="user9 ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<h4>标准法规业务院级领导</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="user5" placeholder="选择标准法规业务院级领导"></el-input>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-form
|
||||
ref="Form"
|
||||
:model="roleForm"
|
||||
:rules="roleFormRules"
|
||||
class="label-input-form">
|
||||
<el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="startUserName" style="margin-bottom: 0">
|
||||
<h4>流程发起人</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.startUser" style="display: none;"></el-input>
|
||||
<el-input v-model="roleForm.startUserName" placeholder="流程发起人"></el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="选择部门责任人" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="dockUserName" style="margin-bottom: 0">
|
||||
<h4>责任部门对接人</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
|
||||
<el-input v-model="roleForm.dockUserName" placeholder="选择责任人" @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="审批" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="ministerUserName" style="margin-bottom: 0">
|
||||
<h4>标准法规部部长</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
|
||||
<el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规部部长" @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="审定" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="directorUserName" style="margin-bottom: 0">
|
||||
<h4>技术管理中心主任</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
|
||||
<el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="批准人" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="presidentUserName" style="margin-bottom: 0">
|
||||
<h4>工程研究总院院长</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.presidentUser" style="display: none;"></el-input>
|
||||
<el-input v-model="roleForm.presidentUserName" placeholder="选择工程研究总院院长" @click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)"></el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
</el-form>
|
||||
</el-timeline>
|
||||
</div>
|
||||
</div>
|
||||
@@ -166,10 +155,13 @@
|
||||
:wrapperClosable="false"
|
||||
size="800px">
|
||||
<el-tree
|
||||
v-if="modalshowflag"
|
||||
style="height: 100%;"
|
||||
node-key="id"
|
||||
class="filter-tree"
|
||||
:data="treeData"
|
||||
:props="defaultProps"
|
||||
:default-checked-keys="nodeList"
|
||||
highlight-current
|
||||
check-strictly
|
||||
@check="drawerCheck"
|
||||
@@ -178,6 +170,10 @@
|
||||
show-checkbox
|
||||
ref="tree">
|
||||
</el-tree>
|
||||
<div id="roleFormButton" class="demo-drawer-footer">
|
||||
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
|
||||
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
|
||||
</div>
|
||||
</el-drawer>
|
||||
</div>
|
||||
</template>
|
||||
@@ -191,6 +187,9 @@ export default {
|
||||
name: "bzdyStep1",
|
||||
data() {
|
||||
return {
|
||||
roleRow: {},
|
||||
nodeList: [],
|
||||
type: '',
|
||||
defaultProps: {
|
||||
children: 'children',
|
||||
label: 'name'
|
||||
@@ -206,20 +205,47 @@ export default {
|
||||
saveLoading: false,
|
||||
form: {
|
||||
title: '', // 调研标题
|
||||
year: '', // 完成时间
|
||||
date: '', // 完成时间
|
||||
model: '', // 上传模板
|
||||
},
|
||||
formRules: {
|
||||
title: [
|
||||
{ required: true, message: '请输入调研标题', trigger: 'blur' },
|
||||
],
|
||||
date: [
|
||||
{ type: 'date', required: true, message: '请选择完成时间', trigger: 'change' }
|
||||
]
|
||||
},
|
||||
data: [], // 标准列表数据
|
||||
ListForm: {}, // 新增数据
|
||||
user1: '',
|
||||
user2: '',
|
||||
user3: '',
|
||||
user4: '',
|
||||
user5: '',
|
||||
user6: '',
|
||||
user7: '',
|
||||
user8: '',
|
||||
user9: '',
|
||||
roleForm: {
|
||||
startUserName: this.$store.getters.userInfo.account,
|
||||
startUser: this.$store.getters.userInfo.id,
|
||||
dockUser: '',
|
||||
responUserList: '',
|
||||
ministerUser: '',
|
||||
directorUser: '',
|
||||
presidentUser: '',
|
||||
dockUserName: '',
|
||||
responUserListName: '',
|
||||
ministerUserName: '',
|
||||
directorUserName: '',
|
||||
presidentUserName: ''
|
||||
},
|
||||
roleFormRules: {
|
||||
dockUserName: [
|
||||
{ required: true, message: '请输入调研标题', trigger: 'blur' },
|
||||
],
|
||||
ministerUserName: [
|
||||
{ required: true, message: '请输入调研标题', trigger: 'blur' },
|
||||
],
|
||||
directorUserName: [
|
||||
{ required: true, message: '请输入调研标题', trigger: 'blur' },
|
||||
],
|
||||
presidentUserName: [
|
||||
{ required: true, message: '请输入调研标题', trigger: 'blur' },
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
components: {
|
||||
@@ -228,15 +254,39 @@ export default {
|
||||
ProcessTitle
|
||||
},
|
||||
methods: {
|
||||
saveUserInfo () {
|
||||
if (this.type === 'dockUser') {
|
||||
this.roleForm.dockUser = this.roleRow.id
|
||||
this.roleForm.dockUserName = this.roleRow.name
|
||||
} else if (this.type === 'ministerUser') {
|
||||
this.roleForm.ministerUser = this.roleRow.id
|
||||
this.roleForm.ministerUserName = this.roleRow.name
|
||||
} else if (this.type === 'directorUser') {
|
||||
this.roleForm.directorUser = this.roleRow.id
|
||||
this.roleForm.directorUserName = this.roleRow.name
|
||||
} else if (this.type === 'presidentUser') {
|
||||
this.roleForm.presidentUser = this.roleRow.id
|
||||
this.roleForm.presidentUserName = this.roleRow.name
|
||||
}
|
||||
this.modalshowflag = false
|
||||
},
|
||||
cancleUserInfo () {
|
||||
this.modalshowflag = false
|
||||
},
|
||||
drawerCheck (data) {
|
||||
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
|
||||
if(getlist.length == 1) {
|
||||
this.roleRow = getlist[0]
|
||||
}else {
|
||||
this.$refs.tree.setCheckedKeys([data.id]);
|
||||
this.roleRow = this.$refs.tree.getCheckedNodes()[0]
|
||||
}
|
||||
},
|
||||
choiceZRR () {
|
||||
this.drawerTitle = '选择责任人'
|
||||
choiceZRR (type, title, id) {
|
||||
this.nodeList = []
|
||||
this.nodeList.push(id)
|
||||
this.type = type
|
||||
this.drawerTitle = title
|
||||
this.modalshowflag = true
|
||||
},
|
||||
getTree () {
|
||||
@@ -263,6 +313,13 @@ export default {
|
||||
},
|
||||
handleSave() {},
|
||||
handleSubmit() {
|
||||
this.$refs['Form'].validate((valid) => {
|
||||
if (valid) {
|
||||
alert('submit!');
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
mounted () {
|
||||
|
||||
@@ -3,26 +3,17 @@
|
||||
<div id="domesticStandardDatabase" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class">
|
||||
<div class="tree-content" :class="{ 'tree-closed': sideClose }">
|
||||
<div class="tree">
|
||||
<laws-tree :zNodes="zNodes"
|
||||
ref="domesticTree"
|
||||
treeDivId="domesticTree"
|
||||
showRMenu
|
||||
deptSelect
|
||||
autoSelect
|
||||
add-id="Q8SLTYESAL"
|
||||
edit-id="94V5KRZUJF"
|
||||
remove-id="5F7U4B2Q24"
|
||||
:drag="hasPermissionDrag"
|
||||
drag-bind=".drag-table"
|
||||
drag-dom="drag-row"
|
||||
:hideRMenuNode="['gxhbq', 'wdsc']"
|
||||
@treeAdd="(treeId, treeNode) => clickDropMenu('newMenu', treeNode)"
|
||||
@treeEdit="(treeId, treeNode) => clickDropMenu('editMenu', treeNode)"
|
||||
@treeClick="(treeId, treeNode) => treeClick(treeNode)"
|
||||
@treeRightClick="(treeId, treeNode) => treeRightClick(treeNode)"
|
||||
@treeRemove="(treeId, treeNode) => clickDropMenu('deleteMenu', treeNode)"
|
||||
@drag="drag"
|
||||
></laws-tree>
|
||||
<el-tree
|
||||
ref="tree"
|
||||
node-key="id"
|
||||
class="filter-tree"
|
||||
:props="props"
|
||||
:data="treeList"
|
||||
highlight-current
|
||||
@node-click="treeClick"
|
||||
default-expand-all
|
||||
:expand-on-click-node="false">
|
||||
</el-tree>
|
||||
</div>
|
||||
<div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }">
|
||||
<!--切换折叠样式-->
|
||||
@@ -961,6 +952,11 @@ export default {
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
props: {
|
||||
label: 'menuName',
|
||||
children: 'children'
|
||||
},
|
||||
treeList: [],
|
||||
visibleOrgTable: false,
|
||||
orgTableVal: '',
|
||||
orgTableValName: '',
|
||||
@@ -1693,104 +1689,12 @@ export default {
|
||||
})
|
||||
}
|
||||
},
|
||||
// 二级菜单新建,编辑,删除
|
||||
clickDropMenu (name, treeNode) {
|
||||
this.selectSarMenu = JSON.parse(JSON.stringify(treeNode))
|
||||
if (undefined !== this.selectSarMenu.id) { // 当前有选中节点
|
||||
if (name === 'newMenu') {
|
||||
this.menuModalTitle = '新增目录'
|
||||
this.menuModalFlag = true
|
||||
this.menuAddOrUpdateFlag = 1
|
||||
this.sarMenu = {
|
||||
id: '',
|
||||
parentId: '',
|
||||
menuName: '',
|
||||
sorDivide: 'INLAND_STAND',
|
||||
displaySeq: '',
|
||||
parentIds: '',
|
||||
remarks: ''
|
||||
}
|
||||
} else if (name === 'editMenu') {
|
||||
this.menuModalTitle = '编辑目录'
|
||||
this.menuModalFlag = true
|
||||
this.menuAddOrUpdateFlag = 2
|
||||
this.sarMenu.id = treeNode.id
|
||||
this.sarMenu.parentId = treeNode.pId
|
||||
this.sarMenu.menuName = treeNode.oldname || treeNode.name
|
||||
this.sarMenu.displaySeq = treeNode.displaySeq
|
||||
if (treeNode.remarks == null || treeNode.remarks === '' || treeNode.remarks === 'null') {
|
||||
this.sarMenu.remarks = ''
|
||||
} else {
|
||||
this.sarMenu.remarks = treeNode.remarks
|
||||
}
|
||||
} else {
|
||||
if (this.selectSarMenu.parentId == null) { // 如果父id为null 说明是根目录
|
||||
this.$message({
|
||||
title: '提示',
|
||||
content: '根目录不可删除!'
|
||||
})
|
||||
} else {
|
||||
// deleteMenu 删除二级菜单,先判断是否选中,选中项目,然后调用删除方法
|
||||
// 先判断目录下是否有菜单
|
||||
this.$http.post('lawss/sarMenu/judgequeryMenuByPid', this.selectSarMenu, {
|
||||
_this: this, loading: 'loading'
|
||||
}, res => {
|
||||
if (res.data) {
|
||||
// this.deleteMenuModal = true
|
||||
this.$confirm('该节点下有记录,确定删除?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
confirmButtonClass: 'common-button-primary',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
roundButton: false
|
||||
}).then(() => {
|
||||
this.$http.post('lawss/sarMenu/deleteMenuAndChildren', this.selectSarMenu, {
|
||||
_this: this, loading: 'loading'
|
||||
}, res => {
|
||||
this.selectMenu() // 删除成功后,更新二级菜单
|
||||
// 获取下一个节点
|
||||
let currentNode = this.$refs.domesticTree.getNextNode()
|
||||
let nodeId = ''
|
||||
// 如果这个节点为null, 本次删除了最后一个节点
|
||||
if (currentNode === null) {
|
||||
// 选中根节点
|
||||
this.$refs.domesticTree.selectRootNode()
|
||||
} else {
|
||||
nodeId = currentNode.id
|
||||
}
|
||||
this.getDomesticStandardTable(nodeId)
|
||||
}, e => {
|
||||
})
|
||||
}).catch(() => {
|
||||
// 取消删除,清空选择
|
||||
// this.$refs.selections.clearSelection()
|
||||
})
|
||||
} else {
|
||||
this.sureDeleteSarMenu()
|
||||
}
|
||||
}, e => {
|
||||
})
|
||||
}
|
||||
}
|
||||
} else {
|
||||
this.$Modal.info({
|
||||
title: '提示',
|
||||
content: '请选择节点!'
|
||||
})
|
||||
}
|
||||
},
|
||||
treeClick (treeNode) {
|
||||
this.selectSarMenu = treeNode // 记录当前选中的二级菜单
|
||||
this.standCommonlySearch.menuId = treeNode.id
|
||||
this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询
|
||||
this.sarStandardsSearch.page = 1
|
||||
this.standCommonlySearch.page = 1
|
||||
this.getDomesticStandardTable(this.tableFlag) // 根据选中的二级菜单查询对应的标准列表
|
||||
},
|
||||
treeRightClick (treeNode) {
|
||||
this.selectSarMenu = treeNode // 记录当前选中的二级菜单
|
||||
this.standCommonlySearch.menuId = treeNode.id
|
||||
this.sarStandardsSearch.menuId = treeNode.id
|
||||
this.getDomesticStandardTable(this.tableFlag)
|
||||
},
|
||||
// 点击搜索按钮
|
||||
searchBtnClick (standCommonlySearch) {
|
||||
@@ -1906,43 +1810,12 @@ export default {
|
||||
},
|
||||
// 查询二级菜单
|
||||
selectMenu () {
|
||||
return new Promise((resolve, reject) => {
|
||||
this.$http.get('lawss/sarMenu/selectMenuByRole', {sorDivide: 'INLAND_STAND'}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
let treeNode = []
|
||||
this.parentNode = {}
|
||||
if (res.data == null) {
|
||||
res.data = []
|
||||
}
|
||||
res.data.map((item, index) => {
|
||||
let treeItem = {}
|
||||
for (let key in item) {
|
||||
if (key === 'parentId') {
|
||||
treeItem.pId = item[key]
|
||||
treeItem.parentId = item[key]
|
||||
} else if (key === 'menuName') {
|
||||
treeItem.name = item[key]
|
||||
} else {
|
||||
treeItem[key] = item[key]
|
||||
}
|
||||
if (this.initZNode === '' && item.id === '64df1d5522bb49c09af2') { this.initZNode = treeItem }
|
||||
}
|
||||
treeNode[index] = treeItem
|
||||
// 记录最外层父节点
|
||||
if (treeItem.parentId === '' || treeItem.parentId == null) {
|
||||
this.parentNode = treeItem
|
||||
}
|
||||
})
|
||||
this.zNodes = treeNode
|
||||
// 查完左侧目录后,如果没有选中的,设置最外层选中
|
||||
if (JSON.stringify(this.selectSarMenu) === '{}' || !this.selectSarMenu) {
|
||||
this.selectSarMenu = JSON.parse(JSON.stringify(this.parentNode))
|
||||
}
|
||||
resolve(res)
|
||||
}, e => {
|
||||
reject(e)
|
||||
})
|
||||
this.$http.get('sarResource/ts-resource', {
|
||||
sorDivide: 'INLAND_STAND'
|
||||
}, {}, res => {
|
||||
if (res.ok) {
|
||||
this.treeList = res.data
|
||||
}
|
||||
})
|
||||
},
|
||||
// 树-删除
|
||||
@@ -2446,7 +2319,12 @@ export default {
|
||||
}
|
||||
// this.sarStandardsSearch.menuId = this.selectSarMenu.id
|
||||
const formData = {...data}
|
||||
formData.menuId = this.selectSarMenu.id
|
||||
if (!item) {
|
||||
formData.menuId = this.sarStandardsSearch.menuId
|
||||
} else {
|
||||
formData.menuId = this.selectSarMenu.id
|
||||
}
|
||||
|
||||
// 排序
|
||||
formData.orderBy = this.orderBy
|
||||
// 处理我的收藏和个性化标签传参
|
||||
|
||||
@@ -3,27 +3,17 @@
|
||||
<div id="foreignStandardsAndRegulations" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class">
|
||||
<div class="tree-content" :class="{ 'tree-closed': sideClose }">
|
||||
<div class="tree">
|
||||
<laws-tree :zNodes="zNodes"
|
||||
ref="domesticTree"
|
||||
treeDivId="domesticTree"
|
||||
showRMenu
|
||||
deptSelect
|
||||
autoSelect
|
||||
add-id="QE4VD4BUQY"
|
||||
edit-id="NR9VRJ3VY3"
|
||||
remove-id="NTUFYC8TCC"
|
||||
:drag="hasPermissionDrag"
|
||||
drag-bind=".drag-table"
|
||||
drag-dom="drag-row"
|
||||
:hideRMenuNode="['gxhbq', 'wdsc']"
|
||||
:loading="menuTreeLoading"
|
||||
@treeAdd="(treeId, treeNode) => clickDropMenu('newMenu', treeNode)"
|
||||
@treeEdit="(treeId, treeNode) => clickDropMenu('editMenu', treeNode)"
|
||||
@treeClick="(treeId, treeNode) => treeClick(treeNode)"
|
||||
@treeRightClick="(treeId, treeNode) => treeRightClick(treeNode)"
|
||||
@treeRemove="(treeId, treeNode) => clickDropMenu('deleteMenu', treeNode)"
|
||||
@drag="drag"
|
||||
></laws-tree>
|
||||
<el-tree
|
||||
ref="tree"
|
||||
node-key="id"
|
||||
class="filter-tree"
|
||||
:props="props"
|
||||
:data="treeList"
|
||||
highlight-current
|
||||
@node-click="treeClick"
|
||||
default-expand-all
|
||||
:expand-on-click-node="false">
|
||||
</el-tree>
|
||||
</div>
|
||||
<div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }">
|
||||
<!--切换折叠样式-->
|
||||
@@ -934,6 +924,11 @@ export default {
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
treeList: [],
|
||||
props: {
|
||||
label: 'menuName',
|
||||
children: 'children'
|
||||
},
|
||||
menuTreeLoading: true,
|
||||
orderBy:'',
|
||||
nowOrder:'',
|
||||
@@ -1644,101 +1639,11 @@ export default {
|
||||
})
|
||||
})
|
||||
},
|
||||
// 二级菜单新建,编辑,删除
|
||||
clickDropMenu (name, treeNode) {
|
||||
this.selectSarMenu = JSON.parse(JSON.stringify(treeNode))
|
||||
if (undefined !== this.selectSarMenu.id) { // 当前有选中节点
|
||||
if (name === 'newMenu') {
|
||||
this.menuModalTitle = '新增目录'
|
||||
this.menuModalFlag = true
|
||||
this.menuAddOrUpdateFlag = 1
|
||||
this.sarMenu = {
|
||||
id: '',
|
||||
parentId: '',
|
||||
menuName: '',
|
||||
sorDivide: 'FOREIGN_STAND',
|
||||
displaySeq: '',
|
||||
parentIds: '',
|
||||
remarks: ''
|
||||
}
|
||||
} else if (name === 'editMenu') {
|
||||
this.menuModalTitle = '编辑目录'
|
||||
this.menuModalFlag = true
|
||||
this.menuAddOrUpdateFlag = 2
|
||||
this.sarMenu.id = treeNode.id
|
||||
this.sarMenu.parentId = treeNode.pId
|
||||
this.sarMenu.menuName = treeNode.oldname || treeNode.name
|
||||
this.sarMenu.displaySeq = treeNode.displaySeq
|
||||
if (treeNode.remarks == null || treeNode.remarks === '' || treeNode.remarks === 'null') {
|
||||
this.sarMenu.remarks = ''
|
||||
} else {
|
||||
this.sarMenu.remarks = treeNode.remarks
|
||||
}
|
||||
} else {
|
||||
if (this.selectSarMenu.parentId == null) { // 如果父id为null 说明是根目录
|
||||
this.$message({
|
||||
title: '提示',
|
||||
content: '根目录不可删除!'
|
||||
})
|
||||
} else {
|
||||
// deleteMenu 删除二级菜单,先判断是否选中,选中项目,然后调用删除方法
|
||||
// 先判断目录下是否有菜单
|
||||
this.$http.post('lawss/sarMenu/judgequeryMenuByPid', this.selectSarMenu, {
|
||||
_this: this, loading: 'loading'
|
||||
}, res => {
|
||||
if (res.data) {
|
||||
// this.deleteMenuModal = true
|
||||
this.$confirm('该节点下有记录,确定删除?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
confirmButtonClass: 'common-button-primary',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
roundButton: false
|
||||
}).then(() => {
|
||||
this.$http.post('lawss/sarMenu/deleteMenuAndChildren', this.selectSarMenu, {
|
||||
_this: this, loading: 'loading'
|
||||
}, res => {
|
||||
this.selectMenu() // 删除成功后,更新二级菜单
|
||||
// 获取下一个节点
|
||||
let currentNode = this.$refs.domesticTree.getNextNode()
|
||||
let nodeId = ''
|
||||
// 如果这个节点为null, 本次删除了最后一个节点
|
||||
if (currentNode === null) {
|
||||
// 选中根节点
|
||||
this.$refs.domesticTree.selectRootNode()
|
||||
} else {
|
||||
nodeId = currentNode.id
|
||||
}
|
||||
this.getDomesticStandardTable()
|
||||
}, e => {
|
||||
})
|
||||
}).catch(() => {
|
||||
// 取消删除,清空选择
|
||||
// this.$refs.selections.clearSelection()
|
||||
})
|
||||
} else {
|
||||
this.sureDeleteSarMenu()
|
||||
}
|
||||
}, e => {
|
||||
})
|
||||
}
|
||||
}
|
||||
} else {
|
||||
this.$Modal.info({
|
||||
title: '提示',
|
||||
content: '请选择节点!'
|
||||
})
|
||||
}
|
||||
},
|
||||
treeClick (treeNode) {
|
||||
this.selectSarMenu = treeNode // 记录当前选中的二级菜单
|
||||
this.selectSarMenu = treeNode
|
||||
this.standCommonlySearch.menuId = treeNode.id
|
||||
this.standCommonlySearch.page = 1
|
||||
this.getDomesticStandardTable() // 根据选中的二级菜单查询对应的标准列表
|
||||
},
|
||||
treeRightClick (treeNode) {
|
||||
this.selectSarMenu = treeNode // 记录当前选中的二级菜单
|
||||
this.standCommonlySearch.menuId = treeNode.id
|
||||
this.getDomesticStandardTable()
|
||||
},
|
||||
// 点击搜索按钮
|
||||
searchBtnClick () {
|
||||
@@ -1828,40 +1733,12 @@ export default {
|
||||
},
|
||||
// 查询二级菜单
|
||||
selectMenu () {
|
||||
return new Promise((resolve, reject) => {
|
||||
this.$http.get('lawss/sarMenu/selectMenuByRole', {sorDivide: 'FOREIGN_STAND'}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
let treeNode = []
|
||||
this.parentNode = {}
|
||||
res.data.forEach((item, index) => {
|
||||
let treeItem = {}
|
||||
for (let key in item) {
|
||||
if (key === 'parentId') {
|
||||
treeItem.pId = item[key]
|
||||
treeItem.parentId = item[key]
|
||||
} else if (key === 'menuName') {
|
||||
treeItem.name = item[key]
|
||||
} else {
|
||||
treeItem[key] = item[key]
|
||||
}
|
||||
if (this.initZNode === '' && item.id === '64df1d5522bb49c09af2') { this.initZNode = treeItem }
|
||||
}
|
||||
treeNode[index] = treeItem
|
||||
// 记录最外层父节点
|
||||
if (treeItem.parentId === '' || treeItem.parentId == null) {
|
||||
this.parentNode = treeItem
|
||||
}
|
||||
})
|
||||
this.zNodes = treeNode
|
||||
// 查完左侧目录后,如果没有选中的,设置最外层选中
|
||||
if (JSON.stringify(this.selectSarMenu) === '{}' || !this.selectSarMenu) {
|
||||
this.selectSarMenu = JSON.parse(JSON.stringify(this.parentNode))
|
||||
}
|
||||
resolve(res)
|
||||
}, e => {
|
||||
reject(e)
|
||||
})
|
||||
this.$http.get('sarResource/ts-resource', {
|
||||
sorDivide: 'FOREIGN_STAND'
|
||||
}, {}, res => {
|
||||
if (res.ok) {
|
||||
this.treeList = res.data
|
||||
}
|
||||
})
|
||||
},
|
||||
// 树-删除
|
||||
@@ -2416,7 +2293,11 @@ export default {
|
||||
data.sarStandardsSearch = ''
|
||||
}
|
||||
const formData = {...data}
|
||||
formData.menuId = this.selectSarMenu.id
|
||||
if (!item) {
|
||||
formData.menuId = this.selectSarMenu.id
|
||||
} else {
|
||||
formData.menuId = this.standCommonlySearch.menuId
|
||||
}
|
||||
formData.nowOrderBy = this.nowOrder ? this.orderBy : ''
|
||||
formData.nowOrder = this.nowOrder
|
||||
// 处理我的收藏和个性化标签传参
|
||||
@@ -2437,7 +2318,6 @@ export default {
|
||||
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
|
||||
_this: this, loading: 'loading'
|
||||
}, res => {
|
||||
console.log('2441',formData);
|
||||
this.isAdvancedSearch = false
|
||||
if (res.ok) {
|
||||
for (let i = 0; i < res.data.list.length; i++) {
|
||||
|
||||
Reference in New Issue
Block a user