WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_third_stage' 到 'master'

Browse Source 
Dev third stage

查看合并请求 laws-nio/laws-weilai!183
This commit is contained in:
高嵩
2022-09-30 22:45:04 +08:00
parent 39bdc386ed 294f9ea383
commit 2c40b01b9c
5 changed files with 262 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_third_record.sql
+5 -5
View File
@@ -1160,23 +1160,23 @@ MODIFY COLUMN `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_gener
ALTER TABLE `laws_weilai`.`project_laws_inventory`
MODIFY COLUMN `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `engineering_interface_person`;
-- 月报填写表 新增一级目录字段2022-09-25 未同步生产环境
-- 月报填写表 新增一级目录字段2022-09-25 已同步生产环境
ALTER TABLE `laws_weilai`.`laws_monthly_report_write`
ADD COLUMN `memories_chapter_one` varchar(255) NULL COMMENT '章节目录对应的一级标题' AFTER `source_en`;
-- 法规意见收集-评估结果表 增加字段 条款内容 2022-09-27 未同步生产环境
-- 法规意见收集-评估结果表 增加字段 条款内容 2022-09-27 已同步生产环境
ALTER TABLE `laws_weilai`.`laws_opinion_assessment_result`
ADD COLUMN `clause_content` varchar(600) NULL COMMENT '条款内容' AFTER `acti_proc_inst_id`;
-- 法规意见收集 增加字段 评估人id 2022-09-27 未同步生产环境
-- 法规意见收集 增加字段 评估人id 2022-09-27 已同步生产环境
ALTER TABLE `laws_weilai`.`laws_opinion_gather`
ADD COLUMN `evaluator_ids` varchar(4000) NULL COMMENT '评估人ids，多个之间使用英文逗号分隔' AFTER `opinion_archive_id`;
-- 标签管理，文档拆分字段 处理查询 技术领域id:ccf68e6578a0a446a6ac34018f0a477d、信息类别id:09fa6530229280174071eae0514e0f63。 2022-09-27 未同步生产环境
-- 标签管理，文档拆分字段 处理查询 技术领域id:ccf68e6578a0a446a6ac34018f0a477d、信息类别id:09fa6530229280174071eae0514e0f63。 2022-09-27 已同步生产环境
update onl_cgform_field set is_query = '1' where id = 'ccf68e6578a0a446a6ac34018f0a477d';
update onl_cgform_field set is_query = '1', is_read_only = '1' where id = '09fa6530229280174071eae0514e0f63';
-- 配置表，增加问题知识库预览图片配置 2022-09-27 未同步生产环境
-- 配置表，增加问题知识库预览图片配置 2022-09-27 已同步生产环境
INSERT INTO `laws_weilai`.`sys_config` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `config`, `config_name`) VALUES ('4', 'admin', '2022-09-28 14:35:30', NULL, NULL, 'A01', 'http://grp.nioint.com/', 'domianWebImgURL');
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class ExtRepoFolderController extends JeroController<ExtRepoFolder, IExtR
@GetMapping(value = "/list")
public Result<ERFTreeDataVO> queryList() {
ERFTreeDataVO dataVO = new ERFTreeDataVO();
dataVO.setManager(true);
dataVO.setManager(extRepoFolderService.isManager());
dataVO.setList(extRepoFolderService.queryTreeList());
return Result.OK(dataVO);
}
jero-web/src/components/PersonnelSelection/index.vue
+254 -228
View File
@@ -32,37 +32,40 @@
v-model="searchModel" @search="onSearch"/>
<div class="drawer-content">
<JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
<virtualNodeTree
v-if="treeVisible"
:keeps="40"
show-checkbox
v-model="checkboxList"
class="treeWrap"
:props="{
isLeaf: 'leaf'
}"
:defaultCheckedKeys="defaultCheckedKeys"
:check-strictly="false"
node-key="id"
@check-change="handleCheckChange"
:data.sync="gData">
<span slot-scope="{ data }">
<span>{{ data.title }}</span>
</span>
</virtualNodeTree>
<!-- <a-tree-->
<!-- style="margin-bottom: 60px;height: 600px"-->
<!-- <virtualNodeTree-->
<!-- v-if="treeVisible"-->
<!-- checkable-->
<!-- checkStrictly-->
<!-- :loading="loading"-->
<!-- :tree-data="gData"-->
<!-- @check="onCheck"-->
<!-- @expand="onExpand"-->
<!-- v-model:checkedKeys="defaultCheckedKeys"-->
<!-- :defaultExpandedKeys="defaultExpandedKeys"-->
<!-- >-->
<!-- </a-tree>-->
<!-- :keeps="40"-->
<!-- show-checkbox-->
<!-- v-model="checkboxList"-->
<!-- class="treeWrap"-->
<!-- :props="{-->
<!-- isLeaf: 'leaf'-->
<!-- }"-->
<!-- :defaultCheckedKeys="defaultCheckedKeys"-->
<!-- :defaultExpandAll="defaultExpandAll"-->
<!-- :check-strictly="false"-->
<!-- node-key="id"-->
<!-- @check-change="handleCheckChange"-->
<!-- :data.sync="gData">-->
<!-- <span slot-scope="{ data }">-->
<!-- <span :class="{'active':data.color ? true:false}">-->
<!-- {{ data.title }}-->
<!-- </span>-->
<!-- </span>-->
<!-- </virtualNodeTree>-->
<a-tree
style="margin-bottom: 60px;height: 600px"
v-if="treeVisible"
checkable
checkStrictly
:loading="loading"
:tree-data="gData"
@check="onCheck"
@expand="onExpand"
v-model:checkedKeys="defaultCheckedKeys"
:defaultExpandedKeys="defaultExpandedKeys"
>
</a-tree>
</div>
<div class="drawer-bootom-button">
<a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
@@ -89,7 +92,7 @@
return {
loading: false,
gData: [],
autoExpandParent: true,
autoExpandParent: false,
checkboxList: [],
expandedKeys: [],
visible: false,
@@ -103,107 +106,110 @@
defaultCheckedKeys: [],
defaultCheckedKeysName: [],
content: [],
dataList: []
dataList: [],
defaultExpandAll: false
}
},
mounted() {
},
methods: {
handleCheckChange(val, checked, indeterminate) {
if (checked) {
this.userName.push(val.title)
this.userIds.push(val.id)
} else {
for (let i = 0; i < this.userName.length; i++) {
if (this.userName[i] == val.title) {
this.userName.splice(i, 1)
i--
}
}
for (let i = 0; i < this.userIds.length; i++) {
if (this.userIds[i] == val.id) {
this.userIds.splice(i, 1)
i--
}
}
}
},
// handleCheckChange(val, checked, indeterminate) {
// if (checked) {
// this.userName.push(val.title)
// this.userIds.push(val.id)
// } else {
// for (let i = 0; i < this.userName.length; i++) {
// if (this.userName[i] == val.title) {
// this.userName.splice(i, 1)
// i--
// }
// }
// for (let i = 0; i < this.userIds.length; i++) {
// if (this.userIds[i] == val.id) {
// this.userIds.splice(i, 1)
// i--
// }
// }
// }
// },
standardClick() {
this.visible = true
this.treeVisible = false
this.departId = ''
this.searchModel = ''
this.userName = []
this.userIds = []
let gData = localStorage.getItem('gData')
if (gData) {
let dataList = JSON.parse(gData)
if (!this.selectDepartment) {
dataList.forEach(res => {
if (res.type == 'Depart') {
res.disabled = true
}
})
}
this.dataList = this.toTree(dataList)
}
setTimeout(() => {
if (gData) {
this.gData = this.dataList
this.gData = [...this.gData]
// this.treeVisible = true
if (this.personneQuery[this.query.db_field_name + 'Name']) {
this.userName = this.personneQuery[this.query.db_field_name + 'Name'].split(',')
} else if (this.personneQuery[this.query.db_field_name]) {
this.userName = this.personneQuery[this.query.db_field_name].split(',')
} else {
this.userName = []
}
if (this.personneQuery[this.query.db_field_name + '_id']) {
this.userIds = this.personneQuery[this.query.db_field_name + '_id'].split(',')
} else if (this.personneQuery[this.query.db_field_name]) {
this.userIds = this.personneQuery[this.query.db_field_name].split(',')
} else {
this.userIds = []
}
this.defaultCheckedKeys = this.userIds
this.defaultCheckedKeys = [...this.defaultCheckedKeys]
this.treeVisible = true
} else {
this.queryDepartUserTreeList(1)
}
}, 200)
this.userName = []
this.queryDepartUserTreeList(1)
this.visible = true
// let gData = localStorage.getItem('gData')
// if (gData) {
// let dataList = JSON.parse(gData)
// if (!this.selectDepartment) {
// dataList.forEach(res => {
// if (res.type == 'Depart') {
// res.disabled = true
// }
// })
// }
// this.dataList = this.toTree(dataList)
// }
// setTimeout(() => {
// if (gData) {
// this.gData = this.dataList
// this.gData = [...this.gData]
// // this.treeVisible = true
// if (this.personneQuery[this.query.db_field_name + 'Name']) {
// this.userName = this.personneQuery[this.query.db_field_name + 'Name'].split(',')
// } else if (this.personneQuery[this.query.db_field_name]) {
// this.userName = this.personneQuery[this.query.db_field_name].split(',')
// } else {
// this.userName = []
// }
// if (this.personneQuery[this.query.db_field_name + '_id']) {
// this.userIds = this.personneQuery[this.query.db_field_name + '_id'].split(',')
// } else if (this.personneQuery[this.query.db_field_name]) {
// this.userIds = this.personneQuery[this.query.db_field_name].split(',')
// } else {
// this.userIds = []
// }
// this.defaultCheckedKeys = this.userIds
// this.defaultCheckedKeys = [...this.defaultCheckedKeys]
// this.defaultExpandAll = false
// this.treeVisible = true
// } else {
// this.queryDepartUserTreeList(1)
// }
// }, 200)
},
//将数据拼成树形结构
toTree(config) {
// 删除 所有 children,以防止多次调用
config.forEach(function(item) {
delete item.children
})
// 将数据存储为 以 id 为 KEY 的 map 索引数据列
let map = {}
config.forEach((item) => {
item.label = item.name
item.key = item.id
item.title = item.name + (item.itemName ? ' ' + item.itemName : '')
map[item.id] = item
})
let val = []
config.forEach((item) => {
// 以当前遍历项，的pid,去map对象中找到索引的id
let parent = map[item.parentId]
// 如果找到索引，那么说明此项不在顶级当中,那么需要把此项添加到，他对应的父级中
if (parent) {
(parent.children || (parent.children = [])).push(item)
} else {
//如果没有在map中找到对应的索引ID,那么直接把 当前的item添加到 val结果集中，作为顶级
val.push(item)
}
})
return val
},
// toTree(config) {
// // 删除 所有 children,以防止多次调用
// config.forEach(function(item) {
// delete item.children
// })
// // 将数据存储为 以 id 为 KEY 的 map 索引数据列
// let map = {}
// config.forEach((item) => {
// item.label = item.name
// item.key = item.id
//
// item.title = item.name + (item.itemName ? ' ' + item.itemName : '')
// map[item.id] = item
// })
// let val = []
// config.forEach((item) => {
// // 以当前遍历项，的pid,去map对象中找到索引的id
// let parent = map[item.parentId]
// // 如果找到索引，那么说明此项不在顶级当中,那么需要把此项添加到，他对应的父级中
// if (parent) {
// (parent.children || (parent.children = [])).push(item)
// } else {
// //如果没有在map中找到对应的索引ID,那么直接把 当前的item添加到 val结果集中，作为顶级
// val.push(item)
// }
// })
// return val
// },
standardDelete() {
this.$emit('input', null)
this.$forceUpdate()
@@ -283,12 +289,12 @@
}
let userIds = JSON.parse(JSON.stringify(this.userIds))
let userName = JSON.parse(JSON.stringify(this.userName))
userName = userName.filter(function(item, index) {
return userName.indexOf(item) === index // 因为indexOf 只能查找到第一个
})
userIds = userIds.filter(function(item, index) {
return userIds.indexOf(item) === index // 因为indexOf 只能查找到第一个
})
// userName = userName.filter(function(item, index) {
// return userName.indexOf(item) === index // 因为indexOf 只能查找到第一个
// })
// userIds = userIds.filter(function(item, index) {
// return userIds.indexOf(item) === index // 因为indexOf 只能查找到第一个
// })
this.$emit('input', userName.join(','))
this.$emit('change', this.query.db_field_name, userIds.join(','), this.query.subscript)
this.visible = false
@@ -306,133 +312,148 @@
this.defaultCheckedKeys = []
},
onSearch(e) {
this.loading = true
// this.loading = true
// this.treeVisible = false
let p = new Promise((resolve, reject) => {
resolve()
// let p = new Promise((resolve, reject) => {
// resolve()
// })
// p.then(() => {
// let gData = localStorage.getItem('gData')
// let content = []
// if (gData) {
// if (e) {
// JSON.parse(gData).forEach(res => {
// if (res.type == 'User') {
// if (res.name.includes(e)) {
// res.color = true
// content.push(res)
// }
// } else if (res.type == 'Depart') {
// if (!this.selectDepartment) {
// res.disabled = true
// }
// content.push(res)
// }
// })
// this.defaultExpandAll = true
// this.gData = this.toTree(content)
// } else {
// let content = JSON.parse(gData)
// if (!this.selectDepartment) {
// content.forEach(res => {
// if (res.type == 'Depart') {
// res.disabled = true
// }
// })
// }
// this.gData = this.toTree(content)
// this.defaultExpandAll = false
// }
// }
// this.defaultCheckedKeys = this.userIds
// this.defaultCheckedKeys = [...this.defaultCheckedKeys]
// this.treeVisible = true
// this.loading = false
// })
this.gData = []
this.departId = ''
this.visibleTree = false
if (e) {
this.getUserAndDepart()
} else {
this.treeVisible = false
this.queryDepartUserTreeList(2)
}
},
getUserAndDepart() {
getAction('sys/user/getUserAndDepart', { name: this.searchModel }).then((res) => {
if (res) {
this.gData = res.filter(ele => ele.flag === 'DEPART')
} else {
this.gData = []
}
this.visibleTree = true
})
p.then(() => {
let gData = localStorage.getItem('gData')
let content = []
if (gData) {
if (e) {
JSON.parse(gData).forEach(res => {
if (res.type == 'User') {
if (res.name.includes(e)) {
content.push(res)
}
} else if (res.type == 'Depart') {
content.push(res)
}
})
this.gData = this.toTree(content)
},
onExpand(selectedKeys, val) {
if (this.searchModel == '' || !this.searchModel) {
if (val.expanded) {
if (this.departId == val.node.value) {
} else {
this.gData = this.toTree(JSON.parse(gData))
this.departId = val.node.value
this.queryDepartUserTreeList(2)
}
}
this.defaultCheckedKeys = this.userIds
this.defaultCheckedKeys = [...this.defaultCheckedKeys]
// this.treeVisible = true
this.loading = false
})
// this.gData = []
// this.departId = ''
// this.visibleTree = false
// if (e) {
// this.getUserAndDepart()
// } else {
// this.treeVisible = false
// this.queryDepartUserTreeList(2)
// }
}
},
// getUserAndDepart() {
// getAction('sys/user/getUserAndDepart', { name: this.searchModel }).then((res) => {
// if (res) {
// this.gData = res.filter(ele => ele.flag === 'DEPART')
// } else {
// this.gData = []
// }
// this.visibleTree = true
// })
// },
// onExpand(selectedKeys, val) {
// if (this.searchModel == '' || !this.searchModel) {
// if (val.expanded) {
// if (this.departId == val.node.value) {
// } else {
// this.departId = val.node.value
// this.queryDepartUserTreeList(2)
// }
// }
// }
// },
queryDepartUserTreeList(num) {
// let gData = JSON.parse(JSON.stringify(this.gData))
// if (gData && gData.length > 0) {
// gData = JSON.stringify(gData)
// } else {
// gData = ''
// }
let gData = JSON.parse(JSON.stringify(this.gData))
if (gData && gData.length > 0) {
gData = JSON.stringify(gData)
} else {
gData = ''
}
this.confirmLoading = true
this.loading = true
//queryDepartUserTreeList
//queryUserTreeList
getAction('sys/user/queryUserTreeList', {
// departId: this.departId,
// json: gData,
// flag: '1'
postAction('sys/user/queryDepartUserTreeList', {
departId: this.departId,
json: gData,
flag: '1'
}).then((res) => {
this.confirmLoading = false
if (res.success) {
this.loading = false
// localStorage.setItem('gData', JSON.stringify(res.result))
// this.toTree(dataList)
let content = JSON.parse(JSON.stringify(res.result))
if (!this.selectDepartment) {
res.result.forEach(res => {
if (res.type == 'Depart') {
res.disabled = true
}
})
}
localStorage.removeItem('gData')
localStorage.setItem('gData', JSON.stringify(content))
this.gData = this.toTree(res.result)
console.log(this.gData)
// let content = JSON.parse(JSON.stringify(res.result))
// if (!this.selectDepartment) {
// res.result.forEach(res => {
// if (res.type == 'Depart') {
// res.disabled = true
// }
// })
// }
// localStorage.removeItem('gData')
// localStorage.setItem('gData', JSON.stringify(content))
// this.gData = this.toTree(res.result)
this.gData = res.result
this.gData = [...this.gData]
// this.gData[0].isLeaf = false
// this.defaultExpandedKeys = [this.departId]
this.defaultExpandedKeys = [this.departId]
if (num == 1) {
// if (this.userName && this.userName.length == 0) {
if (this.personneQuery[this.query.db_field_name + 'Name']) {
this.userName = this.personneQuery[this.query.db_field_name + 'Name'].split(',')
} else if (this.personneQuery[this.query.db_field_name]) {
this.userName = this.personneQuery[this.query.db_field_name].split(',')
} else {
this.userName = []
if (this.userName && this.userName.length == 0) {
if (this.personneQuery[this.query.db_field_name + 'Name']) {
this.userName = this.personneQuery[this.query.db_field_name + 'Name'].split(',')
} else if (this.personneQuery[this.query.db_field_name]) {
this.userName = this.personneQuery[this.query.db_field_name].split(',')
} else {
this.userName = []
}
}
// }
// if (this.userIds && this.userIds.length == 0) {
if (this.personneQuery[this.query.db_field_name + '_id']) {
this.userIds = this.personneQuery[this.query.db_field_name + '_id'].split(',')
} else if (this.personneQuery[this.query.db_field_name]) {
this.userIds = this.personneQuery[this.query.db_field_name].split(',')
} else {
this.userIds = []
if (this.userIds && this.userIds.length == 0) {
if (this.personneQuery[this.query.db_field_name + '_id']) {
this.userIds = this.personneQuery[this.query.db_field_name + '_id'].split(',')
} else if (this.personneQuery[this.query.db_field_name]) {
this.userIds = this.personneQuery[this.query.db_field_name].split(',')
} else {
this.userIds = []
}
}
// }
this.defaultCheckedKeys = this.userIds
this.defaultCheckedKeys = [...this.defaultCheckedKeys]
// this.defaultCheckedKeysName = []
// if (this.defaultCheckedKeys.length > 0) {
// for (let i = 0; i < this.defaultCheckedKeys.length; i++) {
// this.defaultCheckedKeysName.push({
// id: this.defaultCheckedKeys[i],
// name: this.userName[i]
// })
// }
// }
this.defaultCheckedKeysName = []
if (this.defaultCheckedKeys.length > 0) {
for (let i = 0; i < this.defaultCheckedKeys.length; i++) {
this.defaultCheckedKeysName.push({
id: this.defaultCheckedKeys[i],
name: this.userName[i]
})
}
}
}
this.defaultExpandAll = false
this.treeVisible = true
} else {
this.gData = []
@@ -524,6 +545,11 @@
}
.treeWrap {
height: 600px;
height: calc(100vh - 240px);
}
.active {
color: #21c9cc;
display: inline-block;
}
</style>
jero-web/src/views/externalReports/index.vue
+2 -2
View File
@@ -208,7 +208,7 @@
<a-form-model-item class="itemModel" prop="authManageIdsName">
<PersonnelSelection class="box-input add-input"
:personneQuery="form"
selectDepartment
:selectDepartment="true"
:query="{db_field_name:'authManageIds',db_field_txt:$t('Administrativeprivileges')}"
@change="PersonnelSelectionChange"
v-model="form.authManageIdsName"/>
@@ -226,7 +226,7 @@
<a-form-model-item class="itemModel" prop="authViewIdsName">
<PersonnelSelection
class="box-input add-input"
selectDepartment
:selectDepartment="true"
:personneQuery="form"
:query="{db_field_name:'authViewIds',db_field_txt:$t('Checkthepermissions')}"
@change="PersonnelSelectionChange"
jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
-1
View File
@@ -33,7 +33,6 @@
:title="titleName"
:isSendBack="isSendBackOne"
ref="examineInformationRef"
:isSendBack="isSendBackOne"
:url="url"/>
<!-- @terminationProcess="terminationProcess"-->
<footerProcess