supervision
/
supervision-vue
4
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fit：1、警员选择 && 六项规定督察、重点督察下发问题

main
pengwei 4 months ago
parent
2e43fca83a
commit
35142d9281
2 changed files with 223 additions and 203 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 386
      src/components/police-picker.vue
  2. 40
      src/views/mobileSupervise/Inspection.vue

386
src/components/police-picker.vue
Unescape View File

@ -1,270 +1,258 @@
<template>
<div class="flex gap">
<el-tag type="info" effect="plain" closable v-for="(item, index) in modelValue" :key="item" @close="handleRemove(index)">{{ item.name }}</el-tag>
<el-button size="small" type="primary" plain @click="show = true">
<template #icon>
<icon name="el-icon-Plus" />
</template>
</el-button>
</div>
<el-dialog title="选择警员" v-model="show" width="60vw" top="5vh">
<div style="min-height: 70vh">
<el-row :gutter="20">
<el-col :span="6">
<el-scrollbar max-height="70vh">
<el-tree
:data="treeData"
:props="{ label: 'shortName', value: 'id' }"
:default-expanded-keys="['12630']"
node-key="id"
@node-click="handleSelectDepart"
/>
</el-scrollbar>
</el-col>
<el-col :span="18">
<header class="flex between mb-20">
<el-form class="flex gap wrap">
<el-input
placeholder="警员姓名"
v-model="query.name"
clearable
style="width: 190px"
/>
<el-input
placeholder="请输入"
v-model="query.empNo"
clearable
style="width: 190px"
/>
<el-input
placeholder="身份证号码"
v-model="query.idCode"
clearable
style="width: 190px"
/>
</el-form>
<el-button type="primary" @click="getList">查询</el-button>
</header>
<div class="table-container">
<el-table
ref="ableRef"
:data="polices"
row-key="id"
max-height="890px"
@selection-change="selectionChange"
v-loading="loading"
>
<el-table-column type="selection" width="55" />
<el-table-column
label="姓名"
prop="name"
width="90"
/>
<el-table-column
label="警号"
prop="empNo"
width="100"
show-overflow-tooltip
/>
<el-table-column
label="人员属性"
width="120"
align="center"
>
<template #default="{ row }">
<div class="flex gap">
<el-tag type="info" effect="plain" closable v-for="(item, index) in modelValue" :key="item"
@close="handleRemove(index)">{{ item.name }}
</el-tag>
<el-button size="small" type="primary" plain @click="show = true">
<template #icon>
<icon name="el-icon-Plus"/>
</template>
</el-button>
</div>
<el-dialog title="选择警员" v-model="show" width="60vw" top="5vh">
<div style="min-height: 70vh">
<el-row :gutter="20">
<el-col :span="6">
<el-scrollbar max-height="70vh">
<el-tree
:data="treeData"
:props="{ label: 'shortName', value: 'id' }"
:default-expanded-keys="['12630']"
node-key="id"
@node-click="handleSelectDepart"
/>
</el-scrollbar>
</el-col>
<el-col :span="18">
<header class="flex between mb-20">
<el-form class="flex gap wrap">
<el-input
placeholder="警员姓名"
v-model="query.name"
clearable
style="width: 190px"
/>
<el-input
placeholder="请输入"
v-model="query.empNo"
clearable
style="width: 190px"
/>
<el-input
placeholder="身份证号码"
v-model="query.idCode"
clearable
style="width: 190px"
/>
</el-form>
<el-button type="primary" @click="getList">查询</el-button>
</header>
<div class="table-container">
<el-table
ref="ableRef"
:data="polices"
row-key="id"
max-height="890px"
v-loading="loading"
>
<el-table-column width="55">
<template #default="{row}">
<el-checkbox
v-model="row.isCheck" @change="changeCheck(row)" size="large" />
</template>
</el-table-column>
<el-table-column
label="姓名"
prop="name"
width="90"
/>
<el-table-column
label="警号"
prop="empNo"
width="100"
show-overflow-tooltip
/>
<el-table-column
label="人员属性"
width="120"
align="center"
>
<template #default="{ row }">
<span>{{
getDictLable(
dict.personType,
row.personType
)
}}</span>
</template>
</el-table-column>
<el-table-column
label="职位"
width="120"
align="center"
>
<template #default="{ row }">
}}</span>
</template>
</el-table-column>
<el-table-column
label="职位"
width="120"
align="center"
>
<template #default="{ row }">
<span v-if="row.position">
<span v-if="row.level === 0"
>局领导{{ row.position }}</span
>局领导{{ row.position }}</span
>
<span v-if="row.level === 2"
>二级机构{{ row.position }}</span
>二级机构{{ row.position }}</span
>
<span v-if="row.level === 3"
>三机机构{{ row.position }}</span
>三机机构{{ row.position }}</span
>
<span v-if="row.level === 4"
>四机机构{{ row.position }}</span
>四机机构{{ row.position }}</span
>
</span>
</template>
</el-table-column>
<el-table-column
label="机构名称"
prop="departShortName"
width="200"
/>
</el-table>
</div>
<div class="flex end mt-8">
<el-pagination
@size-change="getList"
@current-change="getList"
:page-sizes="[10, 20]"
v-model:page-size="query.size"
v-model:current-page="query.current"
layout="total, sizes, prev, pager, next"
:total="total"
>
</el-pagination>
</div>
<div class="flex gap mt-10 wrap v-center">
<span>已选警员：</span>
<el-tag
v-for="(item, index) in checkPolices"
:key="item"
closable
@close="handleRemove(index)"
>{{ item.name }}</el-tag
>
</div>
</el-col>
</el-row>
</div>
<footer class="flex end">
<el-button @click="show = false">取消</el-button>
<el-button type="primary" @click="submit">确定</el-button>
</footer>
</el-dialog>
</template>
</el-table-column>
<el-table-column
label="机构名称"
prop="departShortName"
width="200"
/>
</el-table>
</div>
<div class="flex end mt-8">
<el-pagination
@size-change="getList"
@current-change="getList"
:page-sizes="[10, 20]"
v-model:page-size="query.size"
v-model:current-page="query.current"
layout="total, sizes, prev, pager, next"
:total="total"
>
</el-pagination>
</div>
<div class="flex gap mt-10 wrap v-center">
<span>已选 {{checkPolices.length}} 员警员：</span>
<el-tag
v-for="(item, index) in checkPolices"
:key="item"
closable
@close="handleRemove(index)"
>{{ item.name }}
</el-tag
>
</div>
</el-col>
</el-row>
</div>
<footer class="flex end">
<el-button @click="show = false">取消</el-button>
<el-button type="primary" @click="submit">确定</el-button>
</footer>
</el-dialog>
</template>
<script setup>
import { departTreeList } from "@/api/system/depart";
import { listPolice } from "@/api/system/police";
import {departTreeList} from "@/api/system/depart";
import {listPolice} from "@/api/system/police";
import useCatchStore from "@/stores/modules/catch";
import { getDictLable } from "@/utils/util";
import {getDictLable} from "@/utils/util";
const catchSotre = useCatchStore();
const dict = catchSotre.getDicts(["personType"]);
const props = defineProps({
modelValue: {
type: Array,
default: []
},
departId: {
type: String
}
modelValue: {
type: Array,
default: []
},
departId: {
type: String
}
});
const emit = defineEmits(['update:modelValue'])
const show = ref(false);
const query = ref({
current:1,
departBranch: true
current: 1,
departBranch: true
});
watch(() => props.departId, (val) => {
query.value.departId = val;
getList()
query.value.departId = val;
getList()
})
const total = ref(0);
const ableRef =ref(null)
const ableRef = ref(null)
const treeData = catchSotre.getDepartsAll();
const polices = ref([]);
const loading = ref(false)
function getList() {
loading.value = true
listPolice(query.value).then((data) => {
polices.value = data.records;
console.log('polices',polices)
setCheckFun(data.records)
total.value = data.total;
loading.value = false
});
loading.value = true
listPolice(query.value).then((data) => {
polices.value = data.records;
setCheckFun(data.records)
total.value = data.total;
loading.value = false
});
}
const setCheckFun =(row)=>{
row.forEach((s)=>{
let data =checkPolices.value.find(x=>{
return JSON.stringify(x) === JSON.stringify({
name: s.name,
empNo: s.empNo,
idCode: s.idCode
})
});
if(data){
nextTick(()=>{
ableRef.value.toggleRowSelection(s, true);
})
const setCheckFun = (row) => {
let keyValue = checkPolices.value.map(s=>s.empNo);
row.forEach((s) => {
if(keyValue.indexOf(s.empNo) >= 0){
s.isCheck=true;
}else{
s.isCheck=false;
}
})
}
const checkPolices = ref([]);
const checkPolicesMap =ref([])
function selectionChange(selectionRows) {
if( checkPolicesMap.value['key'+query.value.current]){
let data = checkPolicesMap.value['key'+query.value.current];
checkPolicesMap.value['key'+query.value.current]=getCheckData(data,selectionRows);
}else{
checkPolicesMap.value['key'+query.value.current] =getCheckData([],selectionRows);
}
checkPolices.value=[]
for (let key in checkPolicesMap.value){
checkPolices.value=checkPolices.value.concat(checkPolicesMap.value[key])
}
}
const getCheckData = (data,selectionRows) =>{
selectionRows.forEach(item => {
if (data.findIndex(o => o.empNo === item.empNo) === -1) {
data.push({
name: item.name,
empNo: item.empNo,
idCode: item.idCode
})
}
})
data.forEach((s,i)=>{
if (selectionRows.findIndex(o => o.empNo === s.empNo) === -1){
data.splice(i,1)
const changeCheck = (row)=>{
let checkIndex =checkPolices.value.map(s=>s.empNo);
if(row.isCheck){
checkPolices.value.push({
name: row.name,
empNo: row.empNo,
idCode: row.idCode
});
}else{
checkPolices.value.splice(checkIndex.indexOf(row.empNo),1)
}
})
return data;
}
function handleSelectDepart(node) {
query.value.departId = node.id;
getList();
query.value.departId = node.id;
getList();
}
function handleRemove(index) {
checkPolices.value.splice(index, 1)
emit('update:modelValue', checkPolices.value)
console.log(index)
polices.value.forEach(s=>{
if(s.empNo == checkPolices.value[index].empNo){
s.isCheck =false
}
})
checkPolices.value.splice(index, 1)
emit('update:modelValue', checkPolices.value)
}
function submit() {
emit('update:modelValue', checkPolices.value)
show.value = false
emit('update:modelValue', checkPolices.value)
show.value = false
}
onMounted(() => {
getList();
getList();
});
</script>
<style lang="scss">
.el-tree-node.is-current > .el-tree-node__content {
background-color: #e8e9f3;
background-color: #e8e9f3;
}
</style>

40
src/views/mobileSupervise/Inspection.vue
Unescape View File

@ -1393,6 +1393,13 @@
<span>{{ row.unTestingDesc }}</span>
</template>
</el-table-column>
<el-table-column label="下发状态" >
<template #default="{row}">
<el-tag type="info" v-if=" row.drinkResult === '饮酒' && row.distributionState == '0' ">未下发</el-tag>
<el-tag type="primary" v-if="row.drinkResult === '饮酒' && row.distributionState == '1' ">已分发</el-tag>
<el-tag type="primary" v-if="row.drinkResult === '饮酒' && row.distributionState == '2' ">已处置</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="100">
<template #default="{ row }">
<el-button
@ -1401,7 +1408,7 @@
@click="handleShowPeople(row)"
>详情
</el-button>
<el-button v-if="row.drinkResult === '饮酒' && row.issueState != 'done' " type="primary" link @click="issueMatterFun(row,'zjdc')">下发</el-button>
<el-button v-if="row.drinkResult === '饮酒' " type="primary" link @click="issueMatterFun(row,'lxgddc')">下发</el-button>
</template>
</el-table-column>
</el-table>
@ -1635,6 +1642,11 @@
</el-table-column>
<el-table-column label="督察方式" prop="supType"></el-table-column>
<el-table-column label="督察情况" prop="supDesc"></el-table-column>
<el-table-column label="操作">
<template #default="{row}">
<el-button v-if="['失控','无法确认'].includes(row.supStatus)" @click="issueMatterFun(row,'zdrydc')" type="primary" link>下发</el-button>
</template>
</el-table-column>
</el-table>
<div class="flex end mt-8">
<el-pagination
@ -2030,7 +2042,6 @@ function handleShowAdd() {
fileData.value=[]
filterDataTable.value=[]
riskDataTable.value=[]
form.value.times[0]=timeFormat(new Date(),"yyyy-mm-dd hh:MM:ss");
}
@ -2464,7 +2475,22 @@ const formRefs =ref();
//六项规定督察下发问题
const issueMatterFun =(row,key)=>{
console.log('row',row)
issueForm.value.problemVo = row
switch (key){
case "sdzc":
issueForm.value.problemVo = row
break;
case "rcdc":
issueForm.value.problemVo = row
break;
case "lxgddc":
issueForm.value.taskId = row.taskId;
issueForm.value.empNo =row.empNo;
break;
case "zdrydc":
issueForm.value.supRecordId =row.id
break;
}
issueForm.value.tableKey = key
distributeShow.value=true;
}
@ -2489,6 +2515,12 @@ const handleSubmitTask =async ()=>{
case "rcdc":
getProblems();
break;
case "lxgddc":
getTestingAlcoholPeople();
break;
case "zdrydc":
getTaskSupDataFun();
break;
}
}
@ -2570,7 +2602,7 @@ watch(() => form.value.samplingTarget, (newVal) => {
watch(() => form.value.supervisionType, (newVal) => {
if (newVal === '日常督察') {
form.value.taskContentHtml = '<p>仍无要求</p>'
form.value.taskContentHtml = '<p>任务要求</p>'
} else {
delete form.value.taskContentHtml
}

Write Preview
Loading…
Cancel
Save