diff --git a/src/views/check/checkrecord/components/checkdstart.vue b/src/views/check/checkrecord/components/checkdstart.vue index 7aff043..ad2c7a1 100644 --- a/src/views/check/checkrecord/components/checkdstart.vue +++ b/src/views/check/checkrecord/components/checkdstart.vue @@ -406,50 +406,56 @@ - - - - - - - - - - - - - 添加 - - - - - - + + - - - 删除 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -679,7 +685,8 @@ export default { } }, editVector: '添加隐患', - addLoading: false + addLoading: false, + modelKey: 0 } }, watch: { @@ -1511,7 +1518,8 @@ export default { LISTMANAGER_ID: this.LISTMANAGER_ID, HAVESCHEME: 0, hiddenPartType: this.hiddenPartType, - findCreator: findCreator + findCreator: findCreator, + hiddenFindCreator: this.myUserInfo.USER_ID // DISCOVERYTIME: this.hiddenForm.DISCOVERYTIME, // 隐患发现时间 // CONFIRM_USER: this.hiddenForm.CONFIRM_USER // 隐患确认人 } @@ -1730,11 +1738,17 @@ export default { requestFN( '/user/goEditMyInfo', {} - ).then((data) => { + ).then(async(data) => { // var o = { 'DEPARTMENT_ID': data.pd.DEPARTMENT_ID, 'USER_ID': data.pd.USER_ID } - this.myUserInfo.DEPARTMENT_ID = data.depname + // this.myUserInfo.DEPARTMENT_ID = data.depname + this.myUserInfo.DEPARTMENT_ID = data.pd.DEPARTMENT_ID this.myUserInfo.DEPARTMENTName = data.pd.deptName + if (data.pd.DEPARTMENT_ID) { + await this.getFindUserListByDepId(data.pd.DEPARTMENT_ID) + } + this.modelKey++ // 为了重新渲染级联选择器 this.myUserInfo.USERNAME = data.pd.NAME + this.myUserInfo.USER_ID = data.pd.USER_ID this.$forceUpdate() }).catch((e) => { this.addLoading = false @@ -1747,24 +1761,46 @@ export default { remoFindOther(index) { // 删除隐患发现人员 this.findCreatorList.splice(index, 1) }, - updateFindOtherDep(DEPARTMENT_ID, i) { // 点击发现部门 - this.findCreatorList[i].USER_ID = '' - this.getFindUserList(DEPARTMENT_ID, i) + updateFindDep(DEPARTMENT_ID) { + this.myUserInfo.USER_ID = '' + this.getFindUserListByDepId(DEPARTMENT_ID) }, - getFindUserList(DEPARTMENT_ID, index) { // 获取发现发现部门的人员信息 - this.listLoading = true - requestFN( - '/user/listAll', - { - DEPARTMENT_ID: DEPARTMENT_ID, - tm: new Date().getTime() - } - ).then((data) => { - this.$set(this.findUserList, index, data.userList) - }).catch((e) => { - this.listLoading = false + // updateFindOtherDep(DEPARTMENT_ID, i) { // 点击发现部门 + // this.findCreatorList[i].USER_ID = '' + // this.getFindUserList(DEPARTMENT_ID, i) + // }, + getFindUserListByDepId(DEPARTMENT_ID) { + return new Promise((resolve) => { + this.listLoading = true + requestFN( + '/user/listAll', + { + DEPARTMENT_ID: DEPARTMENT_ID, + tm: new Date().getTime() + } + ).then((data) => { + this.findUserList = data.userList + this.$forceUpdate() + resolve() + }).catch((e) => { + this.listLoading = false + }) }) }, + // getFindUserList(DEPARTMENT_ID, index) { // 获取发现发现部门的人员信息 + // this.listLoading = true + // requestFN( + // '/user/listAll', + // { + // DEPARTMENT_ID: DEPARTMENT_ID, + // tm: new Date().getTime() + // } + // ).then((data) => { + // this.$set(this.findUserList, index, data.userList) + // }).catch((e) => { + // this.listLoading = false + // }) + // }, updateConfirmDept() { // 根据选择的隐患确认部门显示隐患确认人 this.listLoading = true requestFN( diff --git a/src/views/check/listmanager/components/list.vue b/src/views/check/listmanager/components/list.vue index 25fe2f3..5dab278 100644 --- a/src/views/check/listmanager/components/list.vue +++ b/src/views/check/listmanager/components/list.vue @@ -300,7 +300,13 @@ export default { goQrcode(row) { this.dialogVisible = true this.pd = Object.assign({}, row) - this.qrcodeStr = row.LISTMANAGER_ID + // this.qrcodeStr = row.LISTMANAGER_ID + const json = { + LISTMANAGER_ID: row.LISTMANAGER_ID, + MANAGER_TYPE: 'listManager' + } + const jsonStr = JSON.stringify(json) + this.qrcodeStr = jsonStr }, // 判断按钮权限，用于是否显示按钮 hasButton: function() { diff --git a/src/views/firefighting/checklist/components/edit.vue b/src/views/firefighting/checklist/components/edit.vue index 982f05f..137f116 100644 --- a/src/views/firefighting/checklist/components/edit.vue +++ b/src/views/firefighting/checklist/components/edit.vue @@ -23,30 +23,40 @@ + - - - - - - - + placeholder="请选择部门" + no-options-text="暂无数据" + no-children-text="暂无数据" + style="width: 100%;" + @select="handleSelect" + @deselect="handleRemove" + /> + + + @@ -343,8 +363,10 @@ export default { FIRE_CHECK_TYPE: '', POST_ID: [], FIRE_CHECK_TYPE_NAME: '', - DEPARTMENT_ID: '', + DEPARTMENT_ID: [], + UPDATE_DEPARTMENT_ID: '', USER_ID: [], + UPDATE_USER_ID: '', DATA: '' }, rules: { @@ -394,7 +416,17 @@ export default { }, multipleSelectionAll: [], // 所有选中的数据包含跨页数据 multipleSelection: [], // 当前页选中的数据 - accidentList: [] + accidentList: [], + updateValue: true, + normalizer(node) { + return { + id: node.id, + label: node.name, + children: node.nodes, + isDisabled: node.pId === '0' + } + }, + userListChangeValue: 0 } }, watch: { @@ -420,21 +452,34 @@ export default { if (newVal !== '') this.getDeviceByPointId(newVal) }, immediate: false }, - 'form.POST_ID': { - handler(newVal, oldVal) { - this.peopleList = [] - this.form.USER_ID = [] - if (this.form.POST_ID != '') this.getUserList() - } - }, + // 'form.POST_ID': { + // handler(newVal, oldVal) { + // this.peopleList = [] + // this.form.USER_ID = [] + // if (this.form.POST_ID != '') this.getUserList() + // } + // }, 'form.DEPARTMENT_ID': { // 选择了负责部门 查询相关的点检 handler(newVal, oldVal) { this.peopleList = [] - if (newVal !== '') this.form.POST_ID = '' - if (newVal !== '') this.getList(newVal) - if (newVal !== '') this.getCheckList(newVal) - if (newVal !== '') this.getPostList(newVal) + // if (newVal !== '') this.form.POST_ID = '' + if (newVal.length !== 0) this.getList(newVal) + if (newVal.length !== 0) this.getCheckList(newVal) + // if (newVal !== '') this.getPostList(newVal) + if (newVal.length !== 0) this.getUserList() + }, + immediate: false + }, + 'form.UPDATE_DEPARTMENT_ID': { + // 选择了负责部门 查询相关的点检 + handler(newVal, oldVal) { + this.peopleList = [] + // if (newVal !== '') this.form.POST_ID = '' + if (newVal.length !== 0) this.getList(newVal) + if (newVal.length !== 0) this.getCheckList(newVal) + // if (newVal !== '') this.getPostList(newVal) + if (newVal.length !== 0) this.getUserList() }, immediate: false } @@ -451,11 +496,18 @@ export default { }, methods: { getUserList() { + let DEPARTMENT_ID = '' + if (this.FIRE_CHECK_ID != '') { + DEPARTMENT_ID = this.form.UPDATE_DEPARTMENT_ID + } else { + DEPARTMENT_ID = this.form.DEPARTMENT_ID.toString() + } requestFN( '/user/listAll', { - DEPARTMENT_ID: this.form.DEPARTMENT_ID, - POST_ID: this.form.POST_ID + DEPARTMENT_ID: DEPARTMENT_ID + // DEPARTMENT_ID: this.form.DEPARTMENT_ID, + // POST_ID: this.form.POST_ID } ).then((data) => { this.peopleList = data.userList @@ -526,12 +578,18 @@ export default { }, // 部门列表树 async getTreeData() { - requestFN( - '/department/listTree', - {} - ).then((data) => { - this.treeData = JSON.parse(data.zTreeNodes) - }).catch((e) => { + return new Promise((resolve, reject) => { + requestFN( + '/department/listTree', + {} + ).then((data) => { + this.treeData = JSON.parse(data.zTreeNodes) + this.treeData.forEach((item) => { + item.isDisabled = true + }) + resolve() + }).catch((e) => { + }) }) }, getList(DEPARTMENT_ID) { @@ -544,7 +602,7 @@ export default { '/user/getDepartmentId', { KEYWORDS: this.KEYWORDS, - DEPARTMENT_ID: this.DEPARTMENT_ID + DEPARTMENT_ID: this.DEPARTMENT_ID.toString() } ).then((data) => { this.listLoading = false @@ -639,7 +697,7 @@ export default { if (!this.FIRE_CHECK_ID) { requestFN( '/fireCheckList/getCheckList', - { DEPARTMENT_ID: DEPARTMENT_ID } + { DEPARTMENT_ID: DEPARTMENT_ID.toString() } ).then((data) => { this.checkList = data.varList this.checkListBackUp = data.varList @@ -923,13 +981,16 @@ export default { ).then((data) => { this.form.FIRE_CHECK_STANDARD_NAME = data.checkListInfo.FIRE_CHECK_STANDARD_NAME this.form.FIRE_CHECK_TYPE = data.checkListInfo.FIRE_CHECK_TYPE - this.form.DEPARTMENT_ID = data.checkListInfo.DEPARTMENT_ID + // this.form.DEPARTMENT_ID = data.checkListInfo.DEPARTMENT_ID + this.form.DEPARTMENT_ID.push(data.checkListInfo.DEPARTMENT_ID) + this.form.UPDATE_DEPARTMENT_ID = data.checkListInfo.DEPARTMENT_ID this.$nextTick(() => { - this.form.POST_ID = data.checkListInfo.POST_ID + // this.form.POST_ID = data.checkListInfo.POST_ID this.userList = [] this.getUserList() const u = [] u.push(data.checkListInfo.USER_ID) + this.form.UPDATE_USER_ID = data.checkListInfo.USER_ID this.$nextTick(() => { this.form.USER_ID = u this.checkListBackUp = data.checkStandardList @@ -968,6 +1029,56 @@ export default { ).then((data) => { this.deviceTypeList = data.list }) + }, + onClick() { + this.updateValue = false + this.$nextTick(() => { + this.updateValue = true + }) + }, + // 选择项时触发的事件 + handleSelect(selectedItems) { + // 选择父节点时同时勾选全部子节点 + if (!this.form.DEPARTMENT_ID.includes(selectedItems.id)) { + this.form.DEPARTMENT_ID.push(selectedItems.id) + } + this.pullSelectedNodes(selectedItems) + this.onClick() + }, + // 将树节点的子节点全部添加到数组中 + pullSelectedNodes(selectedItems) { + if (selectedItems.nodes && selectedItems.nodes.length > 0) { + for (let i = 0; i < selectedItems.nodes.length; i++) { + if (!this.form.DEPARTMENT_ID.includes(selectedItems.nodes[i].id)) { + this.form.DEPARTMENT_ID.push(selectedItems.nodes[i].id) + } + this.pullSelectedNodes(selectedItems.nodes[i]) + } + } + }, + // 移除选中项时触发的事件 + handleRemove(selectedItems) { + this.form.USER_ID = [] + // 移除选中项时同时移除全部子节点 + if (this.form.INVOLVING_CORPS_DEPART_ID.includes(selectedItems.id)) { + this.form.INVOLVING_CORPS_DEPART_ID.splice(this.form.INVOLVING_CORPS_DEPART_ID.indexOf(selectedItems.id), 1) + } + this.removeSelectedNodes(selectedItems) + this.onClick() + }, + // 将选中项的子节点全部移除 + removeSelectedNodes(selectedItems) { + if (selectedItems.nodes && selectedItems.nodes.length > 0) { + for (let i = 0; i < selectedItems.nodes.length; i++) { + if (this.form.INVOLVING_CORPS_DEPART_ID.includes(selectedItems.nodes[i].id)) { + this.form.INVOLVING_CORPS_DEPART_ID.splice(this.form.INVOLVING_CORPS_DEPART_ID.indexOf(selectedItems.nodes[i].id), 1) + } + this.removeSelectedNodes(selectedItems.nodes[i]) + } + } + }, + updateDeptChange() { + this.form.UPDATE_USER_ID = '' } } } diff --git a/src/views/firefighting/device/components/list.vue b/src/views/firefighting/device/components/list.vue index 09cc403..14c8689 100644 --- a/src/views/firefighting/device/components/list.vue +++ b/src/views/firefighting/device/components/list.vue @@ -34,6 +34,16 @@ + + + + + + + + + + @@ -183,7 +193,9 @@ export default { FIRE_DEVICE_TYPE_ID: '', FIRE_REGION_ID: '', FIRE_POINT_NAME: '', - FIRE_DEVICE_CODE: '' + FIRE_DEVICE_CODE: '', + DEPARTMENT_NAME: '', + USER_NAME: '' }, treeData: [], typeData: [], @@ -284,7 +296,9 @@ export default { FIRE_REGION_ID: this.keySelect.FIRE_REGION_ID, FIRE_DEVICE_TYPE_ID: this.keySelect.FIRE_DEVICE_TYPE_ID, FIRE_POINT_NAME: this.keySelect.FIRE_POINT_NAME, - FIRE_DEVICE_CODE: this.keySelect.FIRE_DEVICE_CODE + FIRE_DEVICE_CODE: this.keySelect.FIRE_DEVICE_CODE, + DEPARTMENT_NAME: this.keySelect.DEPARTMENT_NAME, + USER_NAME: this.keySelect.USER_NAME } ).then((data) => { this.listLoading = false @@ -299,6 +313,8 @@ export default { this.keySelect.FIRE_DEVICE_TYPE_ID = '' this.keySelect.FIRE_REGION_ID = '' this.keySelect.FIRE_DEVICE_CODE = '' + this.keySelect.DEPARTMENT_NAME = '' + this.keySelect.USER_NAME = '' this.getList() }, getDict() { diff --git a/src/views/firefighting/points/components/list.vue b/src/views/firefighting/points/components/list.vue index 895841d..0a2a9c7 100644 --- a/src/views/firefighting/points/components/list.vue +++ b/src/views/firefighting/points/components/list.vue @@ -13,6 +13,19 @@ + + + + + @@ -78,6 +91,7 @@
新增 批量删除 + 批量修改负责人
打 印 + + + + + + + + + + +
+ 取 消 + 确 定 +
+ + @@ -153,6 +183,9 @@ export default { KEYWORDS: '', FIRE_POINT_NAME: '', FIRE_POINT_CODE: '', + selectForm: { + DEPARTMENT_ID: '' + }, // 树形菜单 filterText: '', varList: [], @@ -161,7 +194,17 @@ export default { value: 'id', children: 'nodes', label: 'name' - } + }, + editDataIds: [], + dialogEditUser: false, + dialogEditUserForm: { + USER_ID: '' + }, + dialogEditUserRules: { + USER_ID: [{ required: true, message: '请选择负责人', trigger: 'change' }] + }, + deptTreeData: [], + userList: [] } }, watch: { @@ -173,12 +216,19 @@ export default { created() { this.getList() this.hasButton() + this.getTreeData() }, methods: { handleShowQr(ROW) { this.dialogFormShow = true this.qrInfo = ROW - this.qrcodeStr = this.config.weburlWaiwang + 'static/qrcode/views/bsbw/point_list.html?id=' + ROW.FIRE_POINT_ID + // this.qrcodeStr = this.config.weburlWaiwang + 'static/qrcode/views/bsbw/point_list.html?id=' + ROW.FIRE_POINT_ID + const json = { + MANAGER_TYPE: 'fireListManager', + FIRE_POINT_ID: ROW.FIRE_POINT_ID + } + const jsonStr = JSON.stringify(json) + this.qrcodeStr = jsonStr }, handleEdit(FIRE_POINT_ID) { this.$parent.FIRE_POINT_ID = FIRE_POINT_ID @@ -211,7 +261,8 @@ export default { '/firePoint/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, { FIRE_POINT_NAME: this.FIRE_POINT_NAME, - FIRE_POINT_CODE: this.FIRE_POINT_CODE + FIRE_POINT_CODE: this.FIRE_POINT_CODE, + DEPARTMENT_ID: this.selectForm.DEPARTMENT_ID } ).then((data) => { this.listLoading = false @@ -224,6 +275,9 @@ export default { }, goKeyReset() { this.FIRE_POINT_NAME = '' this.FIRE_POINT_CODE = '' + this.selectForm = { + DEPARTMENT_ID: '' + } this.getList() }, getDict() { @@ -263,6 +317,89 @@ export default { this.listLoading = false }) }, + // 部门列表树 + getTreeData() { + requestFN( + '/department/listTreeV2', + {} + ).then((data) => { + this.deptTreeData = JSON.parse(data.zTreeNodes) + }).catch((e) => { + }) + }, + // 批量修改负责人 + handleEditUser(row) { + this.editDataIds = [] + if (row.FIRE_POINT_ID) { + this.editDataIds.push(row.FIRE_POINT_ID) + } else { + const selection = this.$refs.multipleTable.selection + if (!selection.length > 0) { + this.$message({ + type: 'warning', + message: '请选择要修改的数据' + }) + return + } + selection.forEach(item => { + this.editDataIds.push(item.FIRE_POINT_ID) + }) + } + const selection = this.$refs.multipleTable.selection + const DEPARTMENT_ID = selection[0].DEPARTMENT_ID + if (selection.length > 1) { + let flag = false + selection.forEach(item => { + if (DEPARTMENT_ID !== item.DEPARTMENT_ID) { + this.$message({ + type: 'warning', + message: '只能选择同一部门下的数据' + }) + flag = true + } + }) + if (flag) { + return + } + } + this.getUserList(DEPARTMENT_ID) + this.dialogEditUserForm = { + USER_ID: '' + } + this.dialogEditUser = true + }, + getUserList(DEPARTMENT_ID) { + requestFN( + '/user/listAll', + { + DEPARTMENT_ID: DEPARTMENT_ID + } + ).then((data) => { + this.userList = data.userList + }).catch((e) => { + }) + }, + dialogEditUserConfirm() { + this.$refs.firefightingBatchEditDept.validate((valid) => { + if (valid) { + this.listLoading = true + requestFN( + '/firePoint/batchEditFirePointUser', + { + DATA_IDS: this.editDataIds.join(','), + USER_ID: this.dialogEditUserForm.USER_ID + } + ).then(() => { + this.$message({ + message: '修改成功', + type: 'success' + }) + this.dialogEditUser = false + this.getList() + }).catch(() => {}) + } + }) + }, handleDelete(row) { const DATA_IDS = [] if (row.FIRE_POINT_ID) { diff --git a/src/views/firefighting/region/components/edit.vue b/src/views/firefighting/region/components/edit.vue index f892cba..2a2cb57 100644 --- a/src/views/firefighting/region/components/edit.vue +++ b/src/views/firefighting/region/components/edit.vue @@ -42,6 +42,14 @@ + + + + 相机照相 + 相册获取 + + +
@@ -73,7 +81,8 @@ export default { FIRE_REGION_ID: '', DEPARTMENT_ID: '', REMAKE: '', - FIRE_REGION_CODE: '' + FIRE_REGION_CODE: '', + PHOTO_UPLOAD_METHOD: '' // 1相机 2相册 }, riskForm: {}, KEYWORDS: '', @@ -139,7 +148,8 @@ export default { FIRE_REGION_CODE: this.form.FIRE_REGION_CODE, DEPARTMENT_ID: this.form.DEPARTMENT_ID, DEPARTMENT_ID_OLD: this.DEPARTMENT_ID_OLD, - REMAKE: this.form.REMAKE + REMAKE: this.form.REMAKE, + PHOTO_UPLOAD_METHOD: this.form.PHOTO_UPLOAD_METHOD } ).then((data) => { if (data.code != 0) { @@ -186,6 +196,7 @@ export default { this.DEPARTMENT_ID_OLD = data.res.DEPARTMENT_ID this.form.FIRE_REGION_ID = data.res.FIRE_REGION_ID this.form.REMAKE = data.res.REMAKE + this.form.PHOTO_UPLOAD_METHOD = data.res.PHOTO_UPLOAD_METHOD.toString() this.dialogFormVisible = false }).catch((e) => { this.dialogFormVisible = false diff --git a/src/views/firefighting/region/components/list.vue b/src/views/firefighting/region/components/list.vue index 1e79e13..b4298be 100644 --- a/src/views/firefighting/region/components/list.vue +++ b/src/views/firefighting/region/components/list.vue @@ -80,6 +80,7 @@
新增 批量删除 + 批量修改负责部门
+ + + + + + + + +
+ 取 消 + 确 定 +
+ @@ -128,7 +152,16 @@ export default { value: 'id', children: 'nodes', label: 'name' - } + }, + dialogEditDept: false, + form: { + DEPARTMENT_ID: '' + }, + rule: { + DEPARTMENT_ID: [{ required: true, message: '负责部门不能为空', trigger: 'blur' }] + }, + deptTreeData: [], + editDataIds: [] } }, watch: { @@ -141,6 +174,7 @@ export default { this.getList() this.hasButton() this.getTreeList() + this.getTreeData() }, methods: { filterNode(value, data) { @@ -162,6 +196,16 @@ export default { this.$parent.FIRE_REGION_NAME = FIRE_REGION_ID this.$parent.activeName = 'Subset' }, + // 部门列表树 + getTreeData() { + requestFN( + '/department/listTreeV2', + {} + ).then((data) => { + this.deptTreeData = JSON.parse(data.zTreeNodes) + }).catch((e) => { + }) + }, handleClose(FIRE_REGION_ID, name) { this.$confirm('确定要禁用[' + name + ']吗?', { confirmButtonText: '确定', @@ -226,6 +270,56 @@ export default { selectable(row, index) { return row.ITEMCOUNT == 0 }, + // 批量修改负责部门 + handelEditDept(row) { + this.editDataIds = [] + if (row.FIRE_REGION_ID) { + this.editDataIds.push(row.FIRE_REGION_ID) + } else { + const selection = this.$refs.multipleTable.selection + if (!selection.length > 0) { + this.$message({ + type: 'warning', + message: '请选择要修改负责部门的数据' + }) + return + } + selection.forEach(item => { + this.editDataIds.push(item.FIRE_REGION_ID) + }) + } + this.dialogEditDept = true + this.form = { + DEPARTMENT_ID: '' + } + }, + dialogEditDeptConfirm() { + this.$refs.firefightingBatchEditDept.validate((valid) => { + if (valid) { + this.listLoading = true + requestFN( + '/fireregion/batchEditDeptByIds', + { + DATA_IDS: this.editDataIds.join(','), + DEPARTMENT_ID: this.form.DEPARTMENT_ID + } + ).then(() => { + this.$message({ + message: '修改成功', + type: 'success' + }) + this.$refs.multipleTable.clearSelection() + this.listLoading = false + this.dialogEditDept = false + this.varList = [] + this.listQuery.page = 1 + this.getList() + }).catch((e) => { + this.listLoading = false + }) + } + }) + }, // 批量删除 handelDelete(row) { const DATA_IDS = [] diff --git a/src/views/hidden/confirm/components/detail.vue b/src/views/hidden/confirm/components/detail.vue index ada18b1..dc96c83 100644 --- a/src/views/hidden/confirm/components/detail.vue +++ b/src/views/hidden/confirm/components/detail.vue @@ -65,7 +65,7 @@
- 提 交 + 提 交 打 回 返 回
diff --git a/src/views/hidden/ignore/components/detail.vue b/src/views/hidden/ignore/components/detail.vue index 33ad799..f447939 100644 --- a/src/views/hidden/ignore/components/detail.vue +++ b/src/views/hidden/ignore/components/detail.vue @@ -47,8 +47,9 @@ 隐患级别 - {{ pd.editLevelName }} - {{ pd.HIDDENLEVELNAME }} + + + {{ pd.HIDDENLEVELNAME }} 隐患类型 diff --git a/src/views/hidden/list/components/edit.vue b/src/views/hidden/list/components/edit.vue index e253af6..bafe935 100644 --- a/src/views/hidden/list/components/edit.vue +++ b/src/views/hidden/list/components/edit.vue @@ -163,46 +163,28 @@ - - - - - - - - - - - - 添加 - - - - - + + - - 删除 - - @@ -360,7 +342,8 @@ export default { confirmUserList: [], // 隐患确认人 isClearRectificationor: true, // 是否清空整改人 iframeSrc: '', - dialogMap: false + dialogMap: false, + modelKey: 0 } }, watch: { @@ -506,9 +489,13 @@ export default { requestFN( '/user/goEditMyInfo', {} - ).then((data) => { - this.myUserInfo.DEPARTMENT_ID = data.deptname - this.myUserInfo.USERNAME = data.pd.NAME + ).then(async(data) => { + this.myUserInfo.DEPARTMENT_ID = data.pd.DEPARTMENT_ID + this.modelKey++ // 为了触发级联选择器重新渲染 + if (data.pd.DEPARTMENT_ID) { + await this.getFindUserListByDepId(data.pd.DEPARTMENT_ID) + } + this.myUserInfo.USER_ID = data.pd.USER_ID this.$forceUpdate() }).catch((e) => { @@ -555,6 +542,7 @@ export default { } this.pd.findCreator = findCreator this.pd.hiddenPartType = this.hiddenPartType + this.pd.hiddenFindCreator = this.myUserInfo.USER_ID this.$refs.form.validate(valid => { if (this.pd.HIDDEN_ID) { if (valid) { @@ -810,24 +798,46 @@ export default { remoFindOther(index) { // 删除隐患发现人员 this.findCreatorList.splice(index, 1) }, - updateFindOtherDep(DEPARTMENT_ID, i) { // 点击发现部门 - this.findCreatorList[i].USER_ID = '' - this.getFindUserList(DEPARTMENT_ID, i) + // updateFindOtherDep(DEPARTMENT_ID, i) { // 点击发现部门 + // this.findCreatorList[i].USER_ID = '' + // this.getFindUserList(DEPARTMENT_ID, i) + // }, + updateFindDep(DEPARTMENT_ID) { + this.myUserInfo.USER_ID = '' + this.getFindUserListByDepId(DEPARTMENT_ID) }, - getFindUserList(DEPARTMENT_ID, index) { // 获取发现发现部门的人员信息 - this.listLoading = true - requestFN( - '/user/listAll', - { - DEPARTMENT_ID: DEPARTMENT_ID, - tm: new Date().getTime() - } - ).then((data) => { - this.$set(this.findUserList, index, data.userList) - }).catch((e) => { - this.listLoading = false + getFindUserListByDepId(DEPARTMENT_ID) { + return new Promise((resolve) => { + this.listLoading = true + requestFN( + '/user/listAll', + { + DEPARTMENT_ID: DEPARTMENT_ID, + tm: new Date().getTime() + } + ).then((data) => { + this.findUserList = data.userList + this.$forceUpdate() + resolve() + }).catch((e) => { + this.listLoading = false + }) }) }, + // getFindUserList(DEPARTMENT_ID, index) { // 获取发现发现部门的人员信息 + // this.listLoading = true + // requestFN( + // '/user/listAll', + // { + // DEPARTMENT_ID: DEPARTMENT_ID, + // tm: new Date().getTime() + // } + // ).then((data) => { + // this.$set(this.findUserList, index, data.userList) + // }).catch((e) => { + // this.listLoading = false + // }) + // }, updateConfirmDept() { // 根据选择的隐患确认部门显示隐患确认人 this.pd.CONFIRM_USER = '' this.listLoading = true diff --git a/src/views/hiddenApi/publicMethod/detail.vue b/src/views/hiddenApi/publicMethod/detail.vue index b6b5f86..e214305 100644 --- a/src/views/hiddenApi/publicMethod/detail.vue +++ b/src/views/hiddenApi/publicMethod/detail.vue @@ -393,6 +393,27 @@
+ +
+
+
+

验收打回信息

+
+ + + + + + + + + + + + + +
验收打回意见{{ returnInformation.EXAMINE }}
验收人{{ returnInformation.CREATORNAME }}
验收时间{{ returnInformation.CREATTIME }}
+
@@ -488,7 +509,8 @@ export default { }, dialogVideoVisible: false, dialogViewPdf: false, - hiddenExamineList: [] + hiddenExamineList: [], + returnInformation: '' } }, @@ -510,6 +532,17 @@ export default { var vm = this vm.pd = data.hidden// 隐患信息 this.hiddenExamineList = data.hiddenExa // 特殊处置审核信息 隐患记录 + // 找出hiddenExamineList中验收打回日期最新的一条 + if (this.hiddenExamineList.length > 0) { + for (let i = 0; i < this.hiddenExamineList.length; i++) { + if (this.hiddenExamineList[i].TYPE === 3) { + this.returnInformation = this.hiddenExamineList[i] + if (this.returnInformation != '' && new Date(this.hiddenExamineList[i].CREATTIME).getTime() > new Date(this.returnInformation.CREATTIME).getTime()) { + this.returnInformation = this.hiddenExamineList[i] + } + } + } + } vm.hs = data.hs // 查询整改方案 vm.checkList = data.checkList // 验收信息 this.hImgs = data.hImgs // 图片 diff --git a/src/views/hotwork/hotwork/components/list.vue b/src/views/hotwork/hotwork/components/list.vue index c8f5d5e..71632aa 100644 --- a/src/views/hotwork/hotwork/components/list.vue +++ b/src/views/hotwork/hotwork/components/list.vue @@ -94,7 +94,8 @@ 查看 - 删除 + + 删除 @@ -204,7 +205,8 @@ export default { HOT_WORK_POSITION: '', UNIT_LEADER_DEPARTMENT_ID: '' }, - loginUserID: '' + loginUserID: '', + loginRoleNumber: JSON.parse(sessionStorage.getItem('user')).RNUMBER } }, created() { @@ -335,7 +337,8 @@ export default { requestFN( '/hotworkapplication/delete', { - HOTWORKAPPLICATION_ID: id + HOTWORKAPPLICATION_ID: id, + loginUserId: this.loginUserID } ).then(() => { this.$message({ diff --git a/src/views/keyprojects/inspection/components/record-list.vue b/src/views/keyprojects/inspection/components/record-list.vue index 4157125..fec821b 100644 --- a/src/views/keyprojects/inspection/components/record-list.vue +++ b/src/views/keyprojects/inspection/components/record-list.vue @@ -54,9 +54,10 @@ - + @@ -78,6 +79,7 @@ export default { directives: { waves }, data() { return { + loginUserId: JSON.parse(sessionStorage.getItem('user')).USER_ID, listLoading: true, listQuery: { page: 1, @@ -132,6 +134,36 @@ export default { this.$parent.KEYPROJECTCHECK_ID = ID this.$parent.activeName = 'Info' }, + goDelete(ID) { + this.$confirm('是否删除该安全环保检查及以下隐患?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.listLoading = true + requestFN( + '/keyprojectcheck/goDelete', + { + KEYPROJECTCHECK_ID: ID + } + ).then((data) => { + this.$message({ + type: 'success', + message: '删除成功!' + }) + this.listLoading = false + this.getList() + }).catch((e) => { + this.$message({ + type: 'info', + message: '删除失败!' + }) + this.listLoading = false + }) + }).catch(() => { + console.log('取消删除') + }) + }, back() { this.$parent.activeName = 'List' this.$parent.OUTSOURCED_ID = '' diff --git a/src/views/safetyenvironmental/archive/components/info.vue b/src/views/safetyenvironmental/archive/components/info.vue index 8bed751..f8ff359 100644 --- a/src/views/safetyenvironmental/archive/components/info.vue +++ b/src/views/safetyenvironmental/archive/components/info.vue @@ -75,9 +75,10 @@ {{ item.HIDDENDESCR }} 隐患部位 {{ item.HIDDENPART_NAME?item.HIDDENPART_NAME:item.HIDDENPART }} - + 查看 流程图 + 删除 @@ -144,8 +145,8 @@ :preview-src-list="new Array(config.fileUrl + pd.INSPECTED_SITEUSER_SIGN_IMG)" style="width: 100px; height: 100px"/> - 确认时间： - {{ pd.INSPECTED_SITEUSER_SIGN_TIME }} + +
@@ -308,6 +309,34 @@ export default { checkFlow(item) { this.$refs.flowChart.init(item) }, + goDelete(item) { + this.$confirm('确定要删除此隐患吗？', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + requestFN( + '/hiddenApi/deleteHiddenForSafetyenvironmental', + { + HIDDEN_ID: item.HIDDEN_ID, + tm: new Date().getTime() + } + ).then((res) => { + if (res.result === 'success') { + this.$message({ + message: '删除成功', + type: 'success' + }) + } else { + this.$message({ + message: res.codeMsg, + type: 'error' + }) + } + this.getData() + }).catch((e) => {}) + }).catch(() => {}) + }, goBack() { this.$parent.INSPECTION_ID = '' this.$parent.activeName = 'List' diff --git a/src/views/safetyenvironmental/inspection/components/info.vue b/src/views/safetyenvironmental/inspection/components/info.vue index 532620f..2414b31 100644 --- a/src/views/safetyenvironmental/inspection/components/info.vue +++ b/src/views/safetyenvironmental/inspection/components/info.vue @@ -182,8 +182,8 @@ :preview-src-list="new Array(config.fileUrl + pd.INSPECTED_SITEUSER_SIGN_IMG)" style="width: 100px; height: 100px"/> - 确认时间： - {{ pd.INSPECTED_SITEUSER_SIGN_TIME }} + + diff --git a/src/views/security_commitment/promise/components/list.vue b/src/views/security_commitment/promise/components/list.vue index 9e51cb6..626fa8e 100644 --- a/src/views/security_commitment/promise/components/list.vue +++ b/src/views/security_commitment/promise/components/list.vue @@ -45,7 +45,7 @@ 查看 启用 禁用 - 删除 + 删除 编辑 diff --git a/static/bi/index.html b/static/bi/index.html index e718d18..f4f6f37 100644 --- a/static/bi/index.html +++ b/static/bi/index.html @@ -13,6 +13,8 @@ + + @@ -140,32 +142,38 @@ 本年隐患 -
-
- 待处理 + +
+
+ 待处理 +
+
+ {{hdCount.yearUncheck}} +
-
- {{hdCount.yearUncheck}} + + +
+
+ 已处理 +
+
+ {{hdCount.yearChecked}} +
-
-
-
- 已处理 -
-
- {{hdCount.yearChecked}} -
-
-
-
- 隐患整改率 -
-
+ + +
+
+ 隐患整改率 +
+
{{hdCount.yearTotal==0?0:((hdCount.yearChecked/hdCount.yearTotal*100).toFixed(2))}} - % + % +
-
+
@@ -176,32 +184,38 @@ 本季隐患
-
-
- 待处理 + +
+
+ 待处理 +
+
+ {{hdCount.quarterUncheck}} +
-
- {{hdCount.quarterUncheck}} + + +
+
+ 已处理 +
+
+ {{hdCount.quarterChecked}} +
-
-
-
- 已处理 + + +
+
+ 隐患整改率 +
+
+ {{hdCount.quarterTotal==0?0:((hdCount.quarterChecked/hdCount.quarterTotal*100).toFixed(2))}} + % +
-
- {{hdCount.quarterChecked}} -
-
-
-
- 隐患整改率 -
-
- {{hdCount.quarterTotal==0?0:((hdCount.quarterChecked/hdCount.quarterTotal*100).toFixed(2))}} - % -
-
+
@@ -212,32 +226,38 @@ 本月隐患
-
-
- 待处理 + +
+
+ 待处理 +
+
+ {{hdCount.monthUncheck}} +
-
- {{hdCount.monthUncheck}} + + +
+
+ 已处理 +
+
+ {{hdCount.monthChecked}} +
-
-
-
- 已处理 + + +
+
+ 隐患整改率 +
+
+ {{hdCount.monthTotal==0?0:((hdCount.monthChecked/hdCount.monthTotal*100).toFixed(2))}} + % +
-
- {{hdCount.monthChecked}} -
-
-
-
- 隐患整改率 -
-
- {{hdCount.monthTotal==0?0:((hdCount.monthChecked/hdCount.monthTotal*100).toFixed(2))}} - % -
-
+
@@ -250,32 +270,38 @@ 本旬隐患
-
-
- 待处理 + +
+
+ 待处理 +
+
+ {{hdCount.xunUncheck}} +
-
- {{hdCount.xunUncheck}} + + +
+
+ 已处理 +
+
+ {{hdCount.xunChecked}} +
-
-
-
- 已处理 + + +
+
+ 隐患整改率 +
+
+ {{hdCount.xunTotal==0?0:((hdCount.xunChecked/hdCount.xunTotal*100).toFixed(2))}} + % +
-
- {{hdCount.xunChecked}} -
-
-
-
- 隐患整改率 -
-
- {{hdCount.xunTotal==0?0:((hdCount.xunChecked/hdCount.xunTotal*100).toFixed(2))}} - % -
-
+
@@ -286,32 +312,38 @@ 本周隐患
-
-
- 待处理 + +
+
+ 待处理 +
+
+ {{hdCount.weekUncheck}} +
-
- {{hdCount.weekUncheck}} + + +
+
+ 已处理 +
+
+ {{hdCount.weekChecked}} +
-
-
-
- 已处理 + + +
+
+ 隐患整改率 +
+
+ {{hdCount.weekTotal==0?0:((hdCount.weekChecked/hdCount.weekTotal*100).toFixed(2))}} + % +
-
- {{hdCount.weekChecked}} -
-
-
-
- 隐患整改率 -
-
- {{hdCount.weekTotal==0?0:((hdCount.weekChecked/hdCount.weekTotal*100).toFixed(2))}} - % -
-
+
@@ -322,32 +354,38 @@ 本日隐患
-
-
- 待处理 + +
+
+ 待处理 +
+
+ {{hdCount.dayUncheck}} +
-
- {{hdCount.dayUncheck}} + + +
+
+ 已处理 +
+
+ {{hdCount.dayChecked}} +
-
-
-
- 已处理 + + +
+
+ 隐患整改率 +
+
+ {{hdCount.dayTotal==0?0:((hdCount.dayChecked/hdCount.dayTotal*100).toFixed(2))}} + % +
-
- {{hdCount.dayChecked}} -
-
-
-
- 隐患整改率 -
-
- {{hdCount.dayTotal==0?0:((hdCount.dayChecked/hdCount.dayTotal*100).toFixed(2))}} - % -
-
+