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

当信件来源为12337时，选择无法办理，无需选择涉及人及涉及单位

main
wxc 11 months ago
parent
d5182d79e4
commit
699aae2919
7 changed files with 1017 additions and 939 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. 7
      src/components/home/work/index.vue
  2. 175
      src/components/negative/verify.vue
  3. 4
      src/enums/dictEnums.ts
  4. 8
      src/views/books/Ajhc.vue
  5. 3
      src/views/books/Gabxf.vue
  6. 2
      src/views/books/Gjxf.vue
  7. 5
      src/views/system/ProblemMaping.vue

7
src/components/home/work/index.vue
Unescape View File

@ -39,7 +39,7 @@
</el-badge> </el-badge>
<span class="tab-nav-title" v-else>通知提醒</span> <span class="tab-nav-title" v-else>通知提醒</span>
</template> </template>
<div v-loading="loading" class="pt-20"> <div v-loading="alarmLoading" class="pt-20">
<home-work-my-alarm :data="alarms" @update="getAlarmList" /> <home-work-my-alarm :data="alarms" @update="getAlarmList" />
</div> </div>
</el-tab-pane> </el-tab-pane>
@ -73,15 +73,16 @@ function getList() {
}); });
} }
const alarmLoading = ref(true)
function getAlarmList() { function getAlarmList() {
loading.value = true alarmLoading.value = true
alarmNotificationPageByTodo({ alarmNotificationPageByTodo({
current: 1, current: 1,
size: 100, size: 100,
}).then((data) => { }).then((data) => {
alarms.value = data.records; alarms.value = data.records;
myAlarmTotal.value = data.total myAlarmTotal.value = data.total
loading.value = false alarmLoading.value = false
}); });
} }

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

@ -43,12 +43,17 @@
v-model="form.checkStatus" v-model="form.checkStatus"
@change="(val) => handleChangeCheckStatus(val, item)" @change="(val) => handleChangeCheckStatus(val, item)"
> >
<el-radio value="1">属实</el-radio>
<el-radio value="2">基本属实</el-radio>
<el-radio value="3">不属实</el-radio>
<el-radio <el-radio
v-for="item in dict.inspectCase" value="4"
:key="item.dictCode" v-if="
:value="item.dictValue" negative.problemSourcesCode ===
>{{ item.dictLabel }} ProblemSources.XF12337
</el-radio> "
>无法办理</el-radio
>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -62,7 +67,7 @@
message: '请选择是否整改', message: '请选择是否整改',
trigger: ['blur'], trigger: ['blur'],
}" }"
v-if="form.checkStatus !== InspectCase.FALSE" v-if="form.checkStatus !== InspectCase.FALSE && form.checkStatus !== InspectCase.UNABLE"
> >
<el-radio-group <el-radio-group
v-model="form.isRectifyCode" v-model="form.isRectifyCode"
@ -84,7 +89,7 @@
</el-col> </el-col>
<el-col <el-col
:span="12" :span="12"
v-if="negative.problemSourcesCode !== ProblemSources.JWDC" v-if="negative.problemSourcesCode !== ProblemSources.JWDC && form.checkStatus !== InspectCase.UNABLE"
> >
<el-form-item <el-form-item
label="涉及对象" label="涉及对象"
@ -109,7 +114,7 @@
:span="12" :span="12"
v-if=" v-if="
form.checkStatus !== InspectCase.FALSE && form.checkStatus !== InspectCase.FALSE &&
form.isRectifyCode === IsRectify.NOT form.isRectifyCode === IsRectify.NOT && form.checkStatus !== InspectCase.UNABLE
" "
> >
<el-form-item <el-form-item
@ -151,7 +156,7 @@
message: '请输入未整改原因', message: '请输入未整改原因',
trigger: ['blur'], trigger: ['blur'],
}" }"
v-if="form.isRectifyCode === '0' || form.isRectifyCode === '2'" v-if="(form.isRectifyCode === '0' || form.isRectifyCode === '2') && form.checkStatus !== InspectCase.UNABLE"
> >
<el-input <el-input
type="textarea" type="textarea"
@ -180,9 +185,12 @@
:autosize="{ minRows: 4 }" :autosize="{ minRows: 4 }"
/> />
</el-form-item> </el-form-item>
<template v-if="form.checkStatus !== InspectCase.UNABLE">
<div <div
v-if="form.accountabilityTarget !== AccountabilityTarget.DEPARTMENT" v-if="
form.accountabilityTarget !==
AccountabilityTarget.DEPARTMENT
"
> >
<el-form-item <el-form-item
label-position="top" label-position="top"
@ -205,7 +213,8 @@
form.blames form.blames
.filter( .filter(
(blame) => (blame) =>
blame.type === BlameType.PERSONAL blame.type ===
BlameType.PERSONAL
) )
.indexOf(item) + 1 .indexOf(item) + 1
}} }}
@ -234,7 +243,8 @@
<police-select <police-select
:host-level="negative.hostLevel" :host-level="negative.hostLevel"
:depart-id=" :depart-id="
negative.hostLevel === HostLevel.SECOND negative.hostLevel ===
HostLevel.SECOND
? negative.handleSecondDepartId ? negative.handleSecondDepartId
: negative.handleThreeDepartId : negative.handleThreeDepartId
" "
@ -303,7 +313,8 @@
(item.ivPersonType = (item.ivPersonType =
dict.personType.filter( dict.personType.filter(
(item) => (item) =>
item.dictValue === val item.dictValue ===
val
)[0].dictLabel) )[0].dictLabel)
" "
> >
@ -341,7 +352,10 @@
trigger: ['blur'], trigger: ['blur'],
}" }"
> >
<div class="flex between" style="width: 100%"> <div
class="flex between"
style="width: 100%"
>
<div class="flex gap"> <div class="flex gap">
<problem-type-select <problem-type-select
v-model="problem.threeLevelCode" v-model="problem.threeLevelCode"
@ -399,12 +413,16 @@
<el-button <el-button
type="danger" type="danger"
plain plain
@click="item.problems.splice(j, 1)" @click="
item.problems.splice(j, 1)
"
v-if="j !== 0" v-if="j !== 0"
size="small" size="small"
> >
<template #icon> <template #icon>
<icon name="el-icon-Delete" /> <icon
name="el-icon-Delete"
/>
</template> </template>
删除问题 删除问题
</el-button> </el-button>
@ -435,7 +453,9 @@
message: '请选择责任类别', message: '请选择责任类别',
trigger: ['blur'], trigger: ['blur'],
}" }"
v-if="form.checkStatus !== InspectCase.FALSE" v-if="
form.checkStatus !== InspectCase.FALSE
"
> >
<el-radio-group <el-radio-group
v-model="item.responsibilityTypeCode" v-model="item.responsibilityTypeCode"
@ -444,7 +464,8 @@
(item.responsibilityTypeName = (item.responsibilityTypeName =
dict.responsibilityType.filter( dict.responsibilityType.filter(
(item) => (item) =>
item.dictValue === val item.dictValue ===
val
)[0].dictLabel) )[0].dictLabel)
" "
> >
@ -501,7 +522,9 @@
" "
> >
<el-input <el-input
v-model="item.subjectiveAspectName" v-model="
item.subjectiveAspectName
"
placeholder="请输入其他主观方面" placeholder="请输入其他主观方面"
style="width: 120px" style="width: 120px"
/> />
@ -531,7 +554,8 @@
(item.handleResultName = (item.handleResultName =
dict.handleResult.filter( dict.handleResult.filter(
(item) => (item) =>
item.dictValue === val item.dictValue ===
val
)[0].dictLabel) )[0].dictLabel)
" "
> >
@ -544,7 +568,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<template v-if="form.checkStatus !== InspectCase.FALSE"> <template
v-if="form.checkStatus !== InspectCase.FALSE"
>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
label="督察措施" label="督察措施"
@ -615,7 +641,11 @@
</el-row> </el-row>
</div> </div>
<div class="flex center" style="width: 100%"> <div class="flex center" style="width: 100%">
<el-button type="primary" plain @click="handleAddPersonal"> <el-button
type="primary"
plain
@click="handleAddPersonal"
>
<template #icon> <template #icon>
<icon name="el-icon-Plus" /> <icon name="el-icon-Plus" />
</template> </template>
@ -632,7 +662,10 @@
message: '请添加涉及领导', message: '请添加涉及领导',
}" }"
> >
<div v-for="(item, index) in form.blameLeaders" :key="index"> <div
v-for="(item, index) in form.blameLeaders"
:key="index"
>
<div class="flex v-center"> <div class="flex v-center">
<h5>涉及领导{{ index + 1 }}</h5> <h5>涉及领导{{ index + 1 }}</h5>
<el-button <el-button
@ -661,7 +694,8 @@
border border
v-for="(obj, j) in form.blames.filter( v-for="(obj, j) in form.blames.filter(
(obj) => (obj) =>
obj.type === BlameType.PERSONAL && obj.type ===
BlameType.PERSONAL &&
obj.blameIdCode obj.blameIdCode
)" )"
:key="obj.blameIdCode" :key="obj.blameIdCode"
@ -696,7 +730,8 @@
<police-select <police-select
:host-level="negative.hostLevel" :host-level="negative.hostLevel"
:depart-id=" :depart-id="
negative.hostLevel === HostLevel.SECOND negative.hostLevel ===
HostLevel.SECOND
? negative.handleSecondDepartId ? negative.handleSecondDepartId
: negative.handleThreeDepartId : negative.handleThreeDepartId
" "
@ -754,16 +789,21 @@
message: '请选择责任类别', message: '请选择责任类别',
trigger: ['blur'], trigger: ['blur'],
}" }"
v-if="form.checkStatus !== InspectCase.FALSE" v-if="
form.checkStatus !== InspectCase.FALSE
"
> >
<el-radio-group <el-radio-group
v-model="item.leadResponsibilityTypeCode" v-model="
item.leadResponsibilityTypeCode
"
@change=" @change="
(val) => (val) =>
(item.leadResponsibilityTypeName = (item.leadResponsibilityTypeName =
dict.leadResponsibilityType.filter( dict.leadResponsibilityType.filter(
(item) => (item) =>
item.dictValue === val item.dictValue ===
val
)[0].dictLabel) )[0].dictLabel)
" "
> >
@ -785,7 +825,9 @@
message: '请选择处理结果', message: '请选择处理结果',
trigger: ['blur'], trigger: ['blur'],
}" }"
v-if="form.checkStatus !== InspectCase.FALSE" v-if="
form.checkStatus !== InspectCase.FALSE
"
> >
<el-select <el-select
v-model="item.leadHandleResultCode" v-model="item.leadHandleResultCode"
@ -795,7 +837,8 @@
(item.leadHandleResultName = (item.leadHandleResultName =
dict.handleResult.filter( dict.handleResult.filter(
(item) => (item) =>
item.dictValue === val item.dictValue ===
val
)[0].dictLabel) )[0].dictLabel)
" "
> >
@ -817,7 +860,9 @@
label="督察措施" label="督察措施"
:prop="`blameLeaders.${index}.leadMeasuresCode`" :prop="`blameLeaders.${index}.leadMeasuresCode`"
> >
<el-radio-group v-model="item.leadMeasuresCode"> <el-radio-group
v-model="item.leadMeasuresCode"
>
<el-radio <el-radio
v-for="dictItem in dict.superviseMeasures" v-for="dictItem in dict.superviseMeasures"
:key="dictItem.dictCode" :key="dictItem.dictCode"
@ -828,8 +873,10 @@
item.leadMeasuresCode === item.leadMeasuresCode ===
dictItem.dictValue dictItem.dictValue
) { ) {
item.leadMeasuresCode = ''; item.leadMeasuresCode =
item.leadMeasuresName = ''; '';
item.leadMeasuresName =
'';
} else { } else {
item.leadMeasuresCode = item.leadMeasuresCode =
dictItem.dictValue; dictItem.dictValue;
@ -858,7 +905,8 @@
(item.leadProtectRightsName = (item.leadProtectRightsName =
dict.protectRights.filter( dict.protectRights.filter(
(item) => (item) =>
item.dictValue === val item.dictValue ===
val
)[0].dictLabel) )[0].dictLabel)
" "
> >
@ -897,7 +945,9 @@
</div> </div>
<el-form-item <el-form-item
label-position="top" label-position="top"
v-if="form.accountabilityTarget !== AccountabilityTarget.PERSONAL" v-if="
form.accountabilityTarget !== AccountabilityTarget.PERSONAL
"
> >
<div v-for="(item, index) in form.blames" :key="index"> <div v-for="(item, index) in form.blames" :key="index">
<template v-if="item.type === BlameType.DEPARTMENT"> <template v-if="item.type === BlameType.DEPARTMENT">
@ -918,7 +968,8 @@
<police-select <police-select
:host-level="negative.hostLevel" :host-level="negative.hostLevel"
:depart-id=" :depart-id="
negative.hostLevel === HostLevel.SECOND negative.hostLevel ===
HostLevel.SECOND
? negative.handleSecondDepartId ? negative.handleSecondDepartId
: negative.handleThreeDepartId : negative.handleThreeDepartId
" "
@ -926,7 +977,8 @@
@change=" @change="
(police) => { (police) => {
item.blameName = police.name; item.blameName = police.name;
item.blameIdCode = police.idCode; item.blameIdCode =
police.idCode;
} }
" "
/> />
@ -959,7 +1011,9 @@
trigger: ['blur'], trigger: ['blur'],
}" }"
> >
<el-radio-group v-model="item.ivPersonTypeCode"> <el-radio-group
v-model="item.ivPersonTypeCode"
>
<el-radio :value="PersonType.POLICE" <el-radio :value="PersonType.POLICE"
>民警 >民警
</el-radio> </el-radio>
@ -981,7 +1035,8 @@
(item.superviseMeasuresName = (item.superviseMeasuresName =
dict.superviseMeasures.filter( dict.superviseMeasures.filter(
(item) => (item) =>
item.dictValue === val item.dictValue ===
val
)[0].dictLabel) )[0].dictLabel)
" "
> >
@ -1019,7 +1074,10 @@
trigger: ['blur'], trigger: ['blur'],
}" }"
> >
<div class="flex between" style="width: 100%"> <div
class="flex between"
style="width: 100%"
>
<div class="flex gap"> <div class="flex gap">
<problem-type-select <problem-type-select
v-model="problem.threeLevelCode" v-model="problem.threeLevelCode"
@ -1077,12 +1135,16 @@
<el-button <el-button
type="danger" type="danger"
plain plain
@click="item.problems.splice(j, 1)" @click="
item.problems.splice(j, 1)
"
v-if="j !== 0" v-if="j !== 0"
size="small" size="small"
> >
<template #icon> <template #icon>
<icon name="el-icon-Delete" /> <icon
name="el-icon-Delete"
/>
</template> </template>
删除问题 删除问题
</el-button> </el-button>
@ -1121,7 +1183,8 @@
(item.subjectiveAspectName = (item.subjectiveAspectName =
dict.subjectiveAspect.filter( dict.subjectiveAspect.filter(
(item) => (item) =>
item.dictValue === val item.dictValue ===
val
)[0].dictLabel) )[0].dictLabel)
" "
> >
@ -1144,7 +1207,9 @@
message: '请选择责任类别', message: '请选择责任类别',
trigger: ['blur'], trigger: ['blur'],
}" }"
v-if="form.checkStatus !== InspectCase.FALSE" v-if="
form.checkStatus !== InspectCase.FALSE
"
> >
<el-radio-group <el-radio-group
v-model="item.responsibilityTypeCode" v-model="item.responsibilityTypeCode"
@ -1153,7 +1218,8 @@
(item.responsibilityTypeName = (item.responsibilityTypeName =
dict.responsibilityType.filter( dict.responsibilityType.filter(
(item) => (item) =>
item.dictValue === val item.dictValue ===
val
)[0].dictLabel) )[0].dictLabel)
" "
> >
@ -1175,7 +1241,9 @@
message: '请选择处理结果', message: '请选择处理结果',
trigger: ['blur'], trigger: ['blur'],
}" }"
v-if="form.checkStatus !== InspectCase.FALSE" v-if="
form.checkStatus !== InspectCase.FALSE
"
> >
<el-select <el-select
v-model="item.handleResultCode" v-model="item.handleResultCode"
@ -1185,7 +1253,8 @@
(item.handleResultName = (item.handleResultName =
dict.handleResult.filter( dict.handleResult.filter(
(item) => (item) =>
item.dictValue === val item.dictValue ===
val
)[0].dictLabel) )[0].dictLabel)
" "
> >
@ -1202,6 +1271,7 @@
</template> </template>
</div> </div>
</el-form-item> </el-form-item>
</template>
<el-form-item <el-form-item
prop="files" prop="files"
label-position="top" label-position="top"
@ -1370,7 +1440,8 @@ watch(
handleRemovePersonal(item); handleRemovePersonal(item);
} }
}); });
if (form.value.blames.filter( if (
form.value.blames.filter(
(item) => item.type === BlameType.DEPARTMENT (item) => item.type === BlameType.DEPARTMENT
).length === 0 ).length === 0
) { ) {
@ -1382,13 +1453,15 @@ watch(
form.value.blameLeaders = []; form.value.blameLeaders = [];
} }
if (val === AccountabilityTarget.PERSONAL_AND_DEPARTMENT) { if (val === AccountabilityTarget.PERSONAL_AND_DEPARTMENT) {
if (form.value.blames.filter( if (
form.value.blames.filter(
(item) => item.type === BlameType.PERSONAL (item) => item.type === BlameType.PERSONAL
).length === 0 ).length === 0
) { ) {
handleAddPersonal(); handleAddPersonal();
} }
if (form.value.blames.filter( if (
form.value.blames.filter(
(item) => item.type === BlameType.DEPARTMENT (item) => item.type === BlameType.DEPARTMENT
).length === 0 ).length === 0
) { ) {

4
src/enums/dictEnums.ts
Unescape View File

@ -6,7 +6,9 @@ export enum InspectCase {
// 部分属实 // 部分属实
PARTIALLY_TRUE = '2', PARTIALLY_TRUE = '2',
// 不属实 // 不属实
FALSE = '3' FALSE = '3',
// 无法办理
UNABLE = '4'
} }
// 是否整改 // 是否整改

8
src/views/books/Ajhc.vue
Unescape View File

@ -61,7 +61,9 @@
</el-form> </el-form>
<div class="mb-25 flex between"> <div class="mb-25 flex between">
<div> <div>
<el-button type="primary" @click="handleExport"
>数据导出</el-button
>
</div> </div>
<div> <div>
<el-button type="primary" @click="getList"> <el-button type="primary" @click="getList">
@ -204,6 +206,10 @@ function handleAction(row) {
show.value = true; show.value = true;
activeNegativeId.value = row.id; activeNegativeId.value = row.id;
} }
function handleExport() {
window.open(`${BASE_PATH}/negative/books/export/ajhc?` + new URLSearchParams(query.value).toString())
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
</style> </style>

3
src/views/books/Gabxf.vue
Unescape View File

@ -314,7 +314,8 @@ function handleAction(row) {
} }
function handleExport() { function handleExport() {
window.open(`${BASE_PATH}/negative/books/export/xf/${ProblemSources.GABXF}`)
window.open(`${BASE_PATH}/negative/books/export/xf/${ProblemSources.GABXF}?` + new URLSearchParams(query.value).toString())
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

2
src/views/books/Gjxf.vue
Unescape View File

@ -314,7 +314,7 @@ function handleAction(row) {
} }
function handleExport() { function handleExport() {
window.open(`${BASE_PATH}/negative/books/export/xf/${ProblemSources.GABXF}`) window.open(`${BASE_PATH}/negative/books/export/xf/${ProblemSources.GABXF}?` + new URLSearchParams(query.value).toString())
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

5
src/views/system/ProblemMaping.vue
Unescape View File

@ -108,11 +108,6 @@
<el-form-item <el-form-item
label="数字督察问题类型" label="数字督察问题类型"
prop="internalId" prop="internalId"
:rules="{
required: true,
message: '请选择',
trigger: ['blur'],
}"
> >
<problem-type-select <problem-type-select
v-model="formData.internalId" v-model="formData.internalId"

Write Preview
Loading…
Cancel
Save