guoyuepeng
/
qa-prevention-gwj-vue
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

消防区域维护：可以批量修改负责部门； 

消防点位维护：可以批量修改负责人；
消防器材管理：优化条件查询列表；消防点位检查表管理：新建检查表①检查人可以在多个部门选择②删除岗位条件，可以修改检查人，检查类型增加半月检查。
pull/11/head
limingyu 2024-03-28 09:10:16 +08:00
parent ef95c37933
commit d5b7d9fb70
9 changed files with 433 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/check/listmanager/components/list.vue
View File

@ -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() {

177
src/views/firefighting/checklist/components/edit.vue
View File

@ -23,30 +23,40 @@
<el-col :span="5">
<el-form-item label="负责部门：" prop="DEPARTMENT_ID">
<SelectTree
v-if="treeData.length !== 0"
v-if="treeData.length !== 0 && FIRE_CHECK_ID != ''"
ref="deptTree_Select"
:disable="FIRE_CHECK_ID !=''"
:clearable="false"
:options="treeData"
:props="defaultProps"
:key="form.UPDATE_DEPARTMENT_ID"
v-model="form.UPDATE_DEPARTMENT_ID"
placeholder="请选择部门"
@change="updateDeptChange"/>
<Treeselect
v-if="updateValue && FIRE_CHECK_ID == ''"
:multiple="true"
:flat="true"
:default-expand-level="1"
:options="treeData"
:normalizer="normalizer"
:disable="true"
:clearable="false"
v-model="form.DEPARTMENT_ID"
placeholder="请选择部门"/>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="岗位：" prop="POST_ID">
<el-select
:disabled="FIRE_CHECK_ID !=''"
v-model="form.POST_ID"
placeholder="请选择">
<el-option v-for="item in postList" :key="item.POST_ID" :label="item.NAME" :value="item.POST_ID" />
</el-select>
placeholder="请选择部门"
no-options-text="暂无数据"
no-children-text="暂无数据"
style="width: 100%;"
@select="handleSelect"
@deselect="handleRemove"
/>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="检查人：" prop="USER_ID">
<el-select
:disabled="FIRE_CHECK_ID !=''"
v-if="FIRE_CHECK_ID == ''"
ref="userTree_Select"
:key="userListChangeValue"
v-model="form.USER_ID"
multiple
clearable
@ -54,6 +64,16 @@
class="filter-item">
<el-option v-for="item in peopleList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
</el-select>
<el-select
v-if="FIRE_CHECK_ID != ''"
ref="userTree_Select"
:key="form.UPDATE_USER_ID"
v-model="form.UPDATE_USER_ID"
clearable
placeholder="请选择人员"
class="filter-item">
<el-option v-for="item in peopleList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
@ -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,13 +578,19 @@ export default {
},
// 部门列表树
async getTreeData() {
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) {
// debugger
@ -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 = ''
}
}
}

20
src/views/firefighting/device/components/list.vue
View File

@ -34,6 +34,16 @@
<el-input v-model="keySelect.FIRE_DEVICE_CODE" placeholder="请输入关键字"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="负责部门" label-width="110px">
<el-input v-model="keySelect.DEPARTMENT_NAME" placeholder="请输入关键字"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="负责人" label-width="110px">
<el-input v-model="keySelect.USER_NAME" placeholder="请输入关键字"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label-width="10px">
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
@ -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() {

143
src/views/firefighting/points/components/list.vue
View File

@ -13,6 +13,19 @@
<el-input v-model="FIRE_POINT_CODE" placeholder="请输入关键字"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="负责部门" label-width="110px">
<SelectTree
ref="deptTree_Select"
:key="selectForm.DEPARTMENT_ID"
:clearable="true"
:options="deptTreeData"
:props="defaultProps"
v-model="selectForm.DEPARTMENT_ID"
placeholder="请选择部门"
style="width: 100%;"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="10px">
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
@ -78,6 +91,7 @@
<div>
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete">批量删除</el-button>
<el-button type="info" icon="el-icon-plus" @click="handleEditUser">批量修改负责人</el-button>
</div>
<pagination
:total="total"
@ -116,6 +130,22 @@
<el-button v-print="'#printTest'" type="primary">打 印</el-button>
</div>
</el-dialog>
<el-dialog v-loading ="listLoading" :visible.sync="dialogEditUser" title="批量修改负责人" width="800px">
<el-form ref="firefightingBatchEditDept" :model="dialogEditUserForm" :rules="dialogEditUserRules" label-width="150px">
<el-row>
<el-form-item label="负责部门" prop="USER_ID">
<el-select v-model="dialogEditUserForm.USER_ID" placeholder="请选择人员" class="filter-item" style="width: 80%;">
<el-option v-for="item in userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
</el-select>
</el-form-item>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogEditUser = false">取 消</el-button>
<el-button type="primary" @click="dialogEditUserConfirm">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
@ -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 + '&currentPage=' + 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) {

15
src/views/firefighting/region/components/edit.vue
View File

@ -42,6 +42,14 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="检查照片上传方式：" prop="PHOTO_UPLOAD_METHOD">
<el-radio v-model="form.PHOTO_UPLOAD_METHOD" label="1">相机照相</el-radio>
<el-radio v-model="form.PHOTO_UPLOAD_METHOD" label="2">相册获取</el-radio>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<div class="ui-foot">
@ -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

96
src/views/firefighting/region/components/list.vue
View File

@ -80,6 +80,7 @@
<div>
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
<el-button type="danger" icon="el-icon-plus" @click="handelDelete">批量删除</el-button>
<el-button type="info" icon="el-icon-plus" @click="handelEditDept">批量修改负责部门</el-button>
</div>
<pagination
:total="total"
@ -89,7 +90,30 @@
</div>
</div>
</div>
<el-dialog v-loading ="listLoading" :visible.sync="dialogEditDept" title="批量修改负责部门" width="800px">
<el-form ref="firefightingBatchEditDept" :model="form" :rules="rule" label-width="150px">
<el-row>
<el-form-item label="负责部门" prop="DEPARTMENT_ID">
<SelectTree
v-if="deptTreeData.length !== 0"
ref="deptTree_Select"
:key="form.DEPARTMENT_ID"
:clearable="false"
:options="deptTreeData"
:props="defaultProps"
v-model="form.DEPARTMENT_ID"
style="width: 80%;"
placeholder="请选择部门"
/>
</el-form-item>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogEditDept = false">取 消</el-button>
<el-button type="primary" @click="dialogEditDeptConfirm">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
@ -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 = []

9
src/views/hotwork/hotwork/components/list.vue
View File

@ -94,7 +94,8 @@
<!-- <el-button :disabled="row.STATE !='11'" type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HOTWORKAPPLICATION_ID,'apply')">申请</el-button>-->
<!-- <el-button :disabled="row.STATE !='-2'" type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HOTWORKAPPLICATION_ID,'repulse')">打回</el-button>-->
<el-button icon="el-icon-view" size="mini" @click="goInfo(row.HOTWORKAPPLICATION_ID,'see')">查看</el-button>
<el-button v-if="row.STATE=='-6' && row.CREATOR == loginUserID" type="danger" icon="el-icon-delete" plain @click="batchDel(row.HOTWORKAPPLICATION_ID)">删除</el-button>
<!--<el-button v-if="row.STATE=='-6' && row.CREATOR == loginUserID" type="danger" icon="el-icon-delete" plain @click="batchDel(row.HOTWORKAPPLICATION_ID)">删除</el-button>-->
<el-button v-if="row.CREATOR == loginUserID || loginUserID == '1' || loginRoleNumber == 'R20201225624685'" type="danger" icon="el-icon-delete" plain @click="batchDel(row.HOTWORKAPPLICATION_ID)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -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({

4
src/views/safetyenvironmental/archive/components/info.vue
View File

@ -145,8 +145,8 @@
:preview-src-list="new Array(config.fileUrl + pd.INSPECTED_SITEUSER_SIGN_IMG)"
style="width: 100px; height: 100px"/>
</td>
<td class="tbg">确认时间：</td>
<td>{{ pd.INSPECTED_SITEUSER_SIGN_TIME }}</td>
<!--<td class="tbg">确认时间：</td>-->
<!--<td>{{ pd.INSPECTED_SITEUSER_SIGN_TIME }}</td>-->
</tr>
</table>
</div>

4
src/views/safetyenvironmental/inspection/components/info.vue
View File

@ -182,8 +182,8 @@
:preview-src-list="new Array(config.fileUrl + pd.INSPECTED_SITEUSER_SIGN_IMG)"
style="width: 100px; height: 100px"/>
</td>
<td class="tbg">确认时间：</td>
<td>{{ pd.INSPECTED_SITEUSER_SIGN_TIME }}</td>
<!--<td class="tbg">确认时间：</td>-->
<!--<td>{{ pd.INSPECTED_SITEUSER_SIGN_TIME }}</td>-->
</tr>
</table>
</div>