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

Merge remote-tracking branch 'origin/master'

master
buaixuexideshitongxue 2 months ago
parent
c14221f50d 7733d6094e
commit
514724fa34
7 changed files with 61 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/components/negative/description.vue
  2. 4
      src/components/negative/verify-description.vue
  3. 91
      src/components/negative/verify.vue
  4. 13
      src/views/system/Police.vue
  5. 2
      src/views/work/BatchDistribute.vue
  6. 15
      src/views/work/Query.vue
  7. 7
      src/views/work/Todo.vue

2
src/components/negative/description.vue
Unescape View File

@ -28,7 +28,7 @@
</div> </div>
<div class="col col-6" v-if="negative.involveMoney"> <div class="col col-6" v-if="negative.involveMoney">
<label>问题金额</label> <label>问题金额</label>
<span>{{ negative.involveMoney }}万元</span> <span>{{ negative.involveMoney }}元</span>
</div> </div>
<div class="col col-6" v-if="negative.responderName"> <div class="col col-6" v-if="negative.responderName">
<label>投诉反映人</label> <label>投诉反映人</label>

4
src/components/negative/verify-description.vue
Unescape View File

@ -6,8 +6,8 @@
v-if="negative.checkStatus" v-if="negative.checkStatus"
> >
<div class="row"> <div class="row">
<div class="col col-6"> <div class="col col-12">
<label>核查情况</label> <label>核查结论</label>
<span>{{ negative.checkStatusName }}</span> <span>{{ negative.checkStatusName }}</span>
</div> </div>
<div class="col col-6" v-if="negative.isRectifyName"> <div class="col col-6" v-if="negative.isRectifyName">

91
src/components/negative/verify.vue
Unescape View File

@ -31,31 +31,43 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
label="核查情况" label="核查结论"
prop="checkStatus" prop="checkStatusCode"
:rules="{ :rules="{
required: true, required: true,
message: '请选择核查情况', message: '请选择核查结论',
trigger: ['blur'], trigger: ['blur'],
}" }"
> >
<el-radio-group
v-model="form.checkStatus" <el-select v-model="form.checkStatusCode" @change="(val) => handleChangeCheckStatus(val, item)" clearable style="width: 280px">
@change="(val) => handleChangeCheckStatus(val, item)" <el-option v-for="item in dict.checkStatus" :value="item.dictValue" :label="item.dictLabel"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span="12"
>
<el-form-item
label="涉及对象"
prop="accountabilityTarget"
:rules="{
required: true,
message: '请选择追责对象',
trigger: ['blur'],
}"
> >
<el-radio value="1">属实</el-radio> <el-radio-group v-model="form.accountabilityTarget">
<el-radio value="2">基本属实</el-radio>
<el-radio value="3">不属实</el-radio>
<el-radio <el-radio
value="4" v-for="item in dict.accountabilityTarget"
v-if="negative.problemSourcesCode === ProblemSources.XF12337" :key="item.dictCode"
>无法办理 :value="item.dictValue"
>{{ item.dictLabel }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="problemIsTrue">
<el-col :span="12">
<el-form-item <el-form-item
label="是否整改" label="是否整改"
prop="isRectifyCode" prop="isRectifyCode"
@ -64,7 +76,7 @@
message: '请选择是否整改', message: '请选择是否整改',
trigger: ['blur'], trigger: ['blur'],
}" }"
v-if="problemIsTrue && form.checkStatus !== InspectCase.UNABLE"
> >
<el-radio-group <el-radio-group
v-model="form.isRectifyCode" v-model="form.isRectifyCode"
@ -84,38 +96,12 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col
:span="12"
v-if="
negative.problemSourcesCode !== ProblemSources.JWDC &&
form.checkStatus !== InspectCase.UNABLE
"
>
<el-form-item
label="涉及对象"
prop="accountabilityTarget"
:rules="{
required: true,
message: '请选择追责对象',
trigger: ['blur'],
}"
>
<el-radio-group v-model="form.accountabilityTarget">
<el-radio
v-for="item in dict.accountabilityTarget"
:key="item.dictCode"
:value="item.dictValue"
>{{ item.dictLabel }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col <el-col
:span="12" :span="12"
v-if=" v-if="
problemIsTrue && problemIsTrue &&
form.isRectifyCode === IsRectify.NOT && form.isRectifyCode === IsRectify.NOT &&
form.checkStatus !== InspectCase.UNABLE (form.checkStatusCode === '1' || form.checkStatusCode === '2' || form.checkStatusCode === '3')
" "
> >
<el-form-item <el-form-item
@ -158,8 +144,7 @@
trigger: ['blur'], trigger: ['blur'],
}" }"
v-if=" v-if="
(form.isRectifyCode === '0' || form.isRectifyCode === '2') && (form.isRectifyCode === '0' || form.isRectifyCode === '2')
form.checkStatus !== InspectCase.UNABLE
" "
> >
<el-input <el-input
@ -417,7 +402,7 @@
<el-divider /> <el-divider />
</template> </template>
<template v-if="form.checkStatus !== InspectCase.UNABLE"> <template>
<div v-if="form.accountabilityTarget !== AccountabilityTarget.DEPARTMENT"> <div v-if="form.accountabilityTarget !== AccountabilityTarget.DEPARTMENT">
<el-form-item <el-form-item
@ -1575,20 +1560,16 @@ import {
IsRectify, IsRectify,
AccountabilityTarget, AccountabilityTarget,
BlameType, BlameType,
AssistCase,
ProblemSources, ProblemSources,
PersonType, PersonType,
HostLevel, HostLevel,
SubjectiveAspect, SubjectiveAspect,
} from "@/enums/dictEnums"; } from "@/enums/dictEnums";
import useCatchStore from "@/stores/modules/catch"; import useCatchStore from "@/stores/modules/catch";
import { reduceMerge } from "@/utils/util";
import feedback from "@/utils/feedback";
import { getConfinementListAll } from "@/api/work/confinement"; import { getConfinementListAll } from "@/api/work/confinement";
//获取数据 //获取数据
const catchSotre = useCatchStore(); const catchSotre = useCatchStore();
const dict = catchSotre.getDicts([ const dict = catchSotre.getDicts([
"inspectCase",
"isRectify", "isRectify",
"personType", "personType",
"superviseMeasures", "superviseMeasures",
@ -1601,6 +1582,7 @@ const dict = catchSotre.getDicts([
"leadResponsibilityType", "leadResponsibilityType",
"resolveSituation", "resolveSituation",
"resolveStatus", "resolveStatus",
"checkStatus"
]); ]);
const negative = inject("negative"); const negative = inject("negative");
@ -1644,7 +1626,7 @@ const fileConfinement = async (query, type = "All") => {
}; };
const problemIsTrue = computed(() => { const problemIsTrue = computed(() => {
return form.value.checkStatus !== InspectCase.FALSE; return form.value.checkStatusCode === '1' || form.value.checkStatusCode === '2' || form.value.checkStatusCode === '3';
}); });
getFormData(); getFormData();
@ -1657,7 +1639,7 @@ async function getFormData() {
form.value = { form.value = {
involveDepartId: negative.value.involveDepartId, involveDepartId: negative.value.involveDepartId,
caseNumber: negative.value.caseNumber, caseNumber: negative.value.caseNumber,
checkStatus: negative.value.checkStatus, checkStatusCode: negative.value.checkStatusCode,
checkStatusName: negative.value.checkStatusName, checkStatusName: negative.value.checkStatusName,
isRectifyName: negative.value.isRectifyName, isRectifyName: negative.value.isRectifyName,
isRectifyCode: negative.value.isRectifyCode, isRectifyCode: negative.value.isRectifyCode,
@ -1797,17 +1779,12 @@ watch(
); );
function handleChangeCheckStatus(val, item) { function handleChangeCheckStatus(val, item) {
if (val === "4") { form.value.checkStatusName = dict.checkStatus.filter(
form.value.checkStatusName = "无法办理";
return;
}
form.value.checkStatusName = dict.inspectCase.filter(
(item) => item.dictValue === val (item) => item.dictValue === val
)[0].dictLabel; )[0].dictLabel;
} }
function handleChangePolice(police, item) { function handleChangePolice(police, item) {
console.log(police);
item.blameName = police.name; item.blameName = police.name;
item.blameIdCode = police.idCode; item.blameIdCode = police.idCode;
item.ivPersonTypeCode = police.personType; item.ivPersonTypeCode = police.personType;

13
src/views/system/Police.vue
Unescape View File

@ -193,7 +193,7 @@
<el-table-column <el-table-column
label="警号" label="警号"
prop="empNo" prop="empNo"
width="100" width="90"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column label="所属机构" show-overflow-tooltip> <el-table-column label="所属机构" show-overflow-tooltip>
@ -229,13 +229,13 @@
<span v-if="row.level === 0" <span v-if="row.level === 0"
>局领导{{ row.position }}</span >局领导{{ row.position }}</span
> >
<span v-if="row.level === 2" <span v-else-if="row.level === 2 || (row.level === 3 && row.departShortName.indexOf('领导') > -1)"
>二级机构{{ row.position }}</span >二级机构{{ row.position }}</span
> >
<span v-if="row.level === 3" <span v-else-if="row.level === 3"
>三机机构{{ row.position }}</span >三机机构{{ row.position }}</span
> >
<span v-if="row.level === 4" <span v-else-if="row.level === 4"
>四机机构{{ row.position }}</span >四机机构{{ row.position }}</span
> >
</span> </span>
@ -246,6 +246,11 @@
prop="idCode" prop="idCode"
width="200" width="200"
/> />
<el-table-column
label="最后更新时间"
prop="updatedAt"
width="180"
/>
<el-table-column label="角色" show-overflow-tooltip> <el-table-column label="角色" show-overflow-tooltip>
<template #default="{ row }"> <template #default="{ row }">
<div class="flex gap" v-if="row.role"> <div class="flex gap" v-if="row.role">

2
src/views/work/BatchDistribute.vue
Unescape View File

@ -537,7 +537,7 @@
width="110" width="110"
/> />
<el-table-column <el-table-column
label="问题金额（万元）" label="问题金额（元）"
prop="involveMoney" prop="involveMoney"
width="90" width="90"
/> />

15
src/views/work/Query.vue
Unescape View File

@ -108,14 +108,15 @@
/> />
</div> </div>
<el-select <el-select
style="width: 120px" style="width: 160px"
placeholder="是否属实" placeholder="核查结论"
clearable clearable
v-model="query.checkStatus" v-model="query.checkStatusCode"
multiple multiple
collapse-tags
> >
<el-option <el-option
v-for="item in dict.inspectCase" v-for="item in dict.checkStatus"
:key="item.id" :key="item.id"
:label="item.dictLabel" :label="item.dictLabel"
:value="item.dictValue" :value="item.dictValue"
@ -183,11 +184,12 @@
/> />
</el-select> </el-select>
<el-select <el-select
style="width: 120px" style="width: 160px"
placeholder="办理状态" placeholder="办理状态"
clearable clearable
v-model="query.processingStatus" v-model="query.processingStatus"
multiple multiple
collapse-tags
> >
<el-option <el-option
v-for="item in dict.processingStatus" v-for="item in dict.processingStatus"
@ -378,7 +380,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="是否属实" label="核查结论"
prop="checkStatusName" prop="checkStatusName"
width="100" width="100"
align="center" align="center"
@ -862,6 +864,7 @@ const catchStore = useCatchStore();
const dict = catchStore.getDicts([ const dict = catchStore.getDicts([
"businessType", "businessType",
"inspectCase", "inspectCase",
"checkStatus",
"isRectify", "isRectify",
"suspectProblem", "suspectProblem",
"policeType", "policeType",

7
src/views/work/Todo.vue
Unescape View File

@ -340,9 +340,10 @@
prop="discoveryTime" prop="discoveryTime"
width="150" width="150"
/> />
<el-table-column label="问题来源" prop="problemSources" /> <el-table-column label="问题来源" prop="problemSources" width="110"
<el-table-column label="业务类别" prop="businessTypeName" /> show-overflow-tooltip />
<el-table-column label="涉嫌问题"> <el-table-column label="业务类别" prop="businessTypeName" width="110" />
<el-table-column label="涉嫌问题" show-overflow-tooltip>
<template #default="{ row }"> <template #default="{ row }">
<span>{{ <span>{{
getInvolveProblem( getInvolveProblem(

Write Preview
Loading…
Cancel
Save