From 2650a30ab5c008e1a53218742c0d8818b75dcf7d Mon Sep 17 00:00:00 2001 From: wxc <191104855@qq.com> Date: Wed, 4 Dec 2024 18:04:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E6=9C=AC=E7=BA=A7=E5=8A=9E=E7=90=86=E6=97=B6?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=BB=B6=E6=9C=9F=E7=95=8C=E9=9D=A2=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=20fit:=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E2=80=9C=E9=A2=84=E8=AD=A6=E6=A8=A1=E5=9E=8B=E2=80=9D=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E4=BE=9B=E6=A8=A1=E5=9E=8B=E5=9B=BE=E6=A0=87?= =?UTF-8?q?+=E9=A2=9C=E8=89=B2=E7=9A=84=E7=BB=84=E5=90=88=E6=9D=A5?= =?UTF-8?q?=E4=B8=BA=E2=80=9C=E9=A2=84=E8=AD=A6=E6=A8=A1=E5=9E=8B=E2=80=9D?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=B0=E5=AF=8C=E7=9A=84=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E6=95=88=E6=9E=9C=20fit:=20=E6=B6=89=E5=8F=8A=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E3=80=81=E5=BD=93=E5=89=8D=E5=A4=84=E7=90=86=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8=E7=AE=80=E7=A7=B0?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E6=B5=81=E7=A8=8B=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=8D=95=E4=BD=8D=E7=AE=80=E7=A7=B0=E3=80=82?= =?UTF-8?q?=20fit:=20=E9=97=AE=E9=A2=98=E5=BD=95=E5=85=A5=EF=BC=9A?= =?UTF-8?q?=E4=B8=BB=E5=8A=9E=E5=B1=82=E7=BA=A7=E5=A6=82=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E6=9C=BA=E6=9E=84=E4=B8=BB=E5=8A=9E=EF=BC=8C?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=89=E7=BA=A7=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/ic_01.svg | 30 +----- src/assets/icons/ic_02.svg | 30 +----- src/assets/icons/ic_03.svg | 30 +----- src/assets/icons/ic_04.svg | 30 +----- src/assets/icons/ic_05.svg | 36 ++----- src/assets/icons/ic_06.svg | 34 ++----- src/assets/icons/ic_07.svg | 14 +++ src/assets/icons/ic_08.svg | 13 +++ src/assets/icons/ic_09.svg | 13 +++ src/assets/icons/ic_10.svg | 13 +++ src/assets/icons/ic_11.svg | 11 +++ src/assets/icons/ic_12.svg | 13 +++ src/assets/icons/ic_13.svg | 13 +++ src/assets/icons/ic_14.svg | 13 +++ src/assets/icons/ic_15.svg | 13 +++ src/assets/icons/ic_16.svg | 13 +++ src/assets/icons/ic_17.svg | 13 +++ src/assets/icons/ic_18.svg | 13 +++ src/assets/icons/ic_19.svg | 11 +++ src/components/home/work/my-fav.vue | 6 +- src/components/home/work/my-todo.vue | 18 +++- src/components/model-icon-picker.vue | 98 ++++++++++++++---- src/components/negative/add.vue | 126 ++++++++++++------------ src/components/negative/description.vue | 6 +- src/style/public.scss | 3 +- src/utils/util.ts | 6 +- src/views/sensitivePerception/Model.vue | 55 +++++------ src/views/work/Done.vue | 47 ++++----- src/views/work/Fav.vue | 4 +- src/views/work/Query.vue | 53 ++-------- src/views/work/Todo.vue | 50 ++++------ 31 files changed, 446 insertions(+), 382 deletions(-) create mode 100644 src/assets/icons/ic_07.svg create mode 100644 src/assets/icons/ic_08.svg create mode 100644 src/assets/icons/ic_09.svg create mode 100644 src/assets/icons/ic_10.svg create mode 100644 src/assets/icons/ic_11.svg create mode 100644 src/assets/icons/ic_12.svg create mode 100644 src/assets/icons/ic_13.svg create mode 100644 src/assets/icons/ic_14.svg create mode 100644 src/assets/icons/ic_15.svg create mode 100644 src/assets/icons/ic_16.svg create mode 100644 src/assets/icons/ic_17.svg create mode 100644 src/assets/icons/ic_18.svg create mode 100644 src/assets/icons/ic_19.svg diff --git a/src/assets/icons/ic_01.svg b/src/assets/icons/ic_01.svg index c4c0d0a..6e3fd9b 100644 --- a/src/assets/icons/ic_01.svg +++ b/src/assets/icons/ic_01.svg @@ -1,31 +1,11 @@ ic_01 - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/assets/icons/ic_02.svg b/src/assets/icons/ic_02.svg index 3e9be01..55cc3fa 100644 --- a/src/assets/icons/ic_02.svg +++ b/src/assets/icons/ic_02.svg @@ -1,31 +1,11 @@ ic_02 - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/assets/icons/ic_03.svg b/src/assets/icons/ic_03.svg index 91eef50..155f3f3 100644 --- a/src/assets/icons/ic_03.svg +++ b/src/assets/icons/ic_03.svg @@ -1,31 +1,11 @@ ic_03 - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/assets/icons/ic_04.svg b/src/assets/icons/ic_04.svg index 34616df..6c14974 100644 --- a/src/assets/icons/ic_04.svg +++ b/src/assets/icons/ic_04.svg @@ -1,31 +1,11 @@ ic_04 - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/assets/icons/ic_05.svg b/src/assets/icons/ic_05.svg index 253fcb0..bb5931e 100644 --- a/src/assets/icons/ic_05.svg +++ b/src/assets/icons/ic_05.svg @@ -1,34 +1,12 @@ - ic_07 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + ic_05 + + + + + + diff --git a/src/assets/icons/ic_06.svg b/src/assets/icons/ic_06.svg index 6f83adc..8b263d6 100644 --- a/src/assets/icons/ic_06.svg +++ b/src/assets/icons/ic_06.svg @@ -1,34 +1,12 @@ ic_06 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/src/assets/icons/ic_07.svg b/src/assets/icons/ic_07.svg new file mode 100644 index 0000000..eca753d --- /dev/null +++ b/src/assets/icons/ic_07.svg @@ -0,0 +1,14 @@ + + + ic_07 + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/ic_08.svg b/src/assets/icons/ic_08.svg new file mode 100644 index 0000000..f5eb306 --- /dev/null +++ b/src/assets/icons/ic_08.svg @@ -0,0 +1,13 @@ + + + ic_08 + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/ic_09.svg b/src/assets/icons/ic_09.svg new file mode 100644 index 0000000..83aff14 --- /dev/null +++ b/src/assets/icons/ic_09.svg @@ -0,0 +1,13 @@ + + + ic_09 + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/ic_10.svg b/src/assets/icons/ic_10.svg new file mode 100644 index 0000000..0457194 --- /dev/null +++ b/src/assets/icons/ic_10.svg @@ -0,0 +1,13 @@ + + + ic_10 + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/ic_11.svg b/src/assets/icons/ic_11.svg new file mode 100644 index 0000000..2b008be --- /dev/null +++ b/src/assets/icons/ic_11.svg @@ -0,0 +1,11 @@ + + + ic_11 + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/ic_12.svg b/src/assets/icons/ic_12.svg new file mode 100644 index 0000000..187e74d --- /dev/null +++ b/src/assets/icons/ic_12.svg @@ -0,0 +1,13 @@ + + + ic_12 + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/ic_13.svg b/src/assets/icons/ic_13.svg new file mode 100644 index 0000000..eac9afe --- /dev/null +++ b/src/assets/icons/ic_13.svg @@ -0,0 +1,13 @@ + + + ic_13 + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/ic_14.svg b/src/assets/icons/ic_14.svg new file mode 100644 index 0000000..e0e4acf --- /dev/null +++ b/src/assets/icons/ic_14.svg @@ -0,0 +1,13 @@ + + + ic_14 + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/ic_15.svg b/src/assets/icons/ic_15.svg new file mode 100644 index 0000000..9137fe8 --- /dev/null +++ b/src/assets/icons/ic_15.svg @@ -0,0 +1,13 @@ + + + ic_15 + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/ic_16.svg b/src/assets/icons/ic_16.svg new file mode 100644 index 0000000..4762d33 --- /dev/null +++ b/src/assets/icons/ic_16.svg @@ -0,0 +1,13 @@ + + + ic_16 + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/ic_17.svg b/src/assets/icons/ic_17.svg new file mode 100644 index 0000000..303311c --- /dev/null +++ b/src/assets/icons/ic_17.svg @@ -0,0 +1,13 @@ + + + ic_17 + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/ic_18.svg b/src/assets/icons/ic_18.svg new file mode 100644 index 0000000..72c05bf --- /dev/null +++ b/src/assets/icons/ic_18.svg @@ -0,0 +1,13 @@ + + + ic_18 + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/ic_19.svg b/src/assets/icons/ic_19.svg new file mode 100644 index 0000000..7d95339 --- /dev/null +++ b/src/assets/icons/ic_19.svg @@ -0,0 +1,11 @@ + + + ic_08 + + + + + + + + \ No newline at end of file diff --git a/src/components/home/work/my-fav.vue b/src/components/home/work/my-fav.vue index acc11ab..477c3c3 100644 --- a/src/components/home/work/my-fav.vue +++ b/src/components/home/work/my-fav.vue @@ -35,7 +35,7 @@
{{ - getInvolveProblem(row.involveProblem) || "/" + getInvolveProblem(row.involveProblem, dict.suspectProblem) || "/" }}
@@ -77,7 +77,7 @@ @@ -131,7 +131,7 @@ import { getDictLable, getInvolveProblem } from "@/utils/util"; import useCatchStore from "@/stores/modules/catch"; const catchStore = useCatchStore(); -const dict = catchStore.getDicts(["processingStatus"]); +const dict = catchStore.getDicts(["processingStatus", "suspectProblem"]); const flowNodes = catchStore.getFlowNodes(); const favs = ref([]); diff --git a/src/components/home/work/my-todo.vue b/src/components/home/work/my-todo.vue index 453f197..9ac4faf 100644 --- a/src/components/home/work/my-todo.vue +++ b/src/components/home/work/my-todo.vue @@ -62,7 +62,7 @@
{{ - getInvolveProblem(row.involveProblem) || "/" + getInvolveProblem(row.involveProblem, dict.suspectProblem) || "/" }}
@@ -155,7 +155,7 @@ @@ -168,7 +168,7 @@ import { getDictLable, getInvolveProblem } from "@/utils/util"; import useCatchStore from "@/stores/modules/catch"; const catchStore = useCatchStore(); -const dict = catchStore.getDicts(["processingStatus"]); +const dict = catchStore.getDicts(["processingStatus", "suspectProblem"]); const flowNodes = catchStore.getFlowNodes(); const props = defineProps({ @@ -232,6 +232,18 @@ function handleAction(row) { } const addShow = ref(false); + +function handleUpdate() { + emit('refresh') + if (myTodoActionTab.value === ALL_LABEL) { + todos.value = props.data; + } else { + todos.value = props.data.filter((item) => item.problemSources === myTodoActionTab.value); + if (todos.value.length === 0) { + todos.value = ALL_LABEL + } + } +} \ No newline at end of file diff --git a/src/components/negative/add.vue b/src/components/negative/add.vue index 217de5a..77c2547 100644 --- a/src/components/negative/add.vue +++ b/src/components/negative/add.vue @@ -67,8 +67,13 @@ - - + + - - + - + @@ -129,9 +143,8 @@ }" >
-

审批流程

-
- - - {{ item.dictLabel - }}{{ - item.remark ? `(${item.remark})` : "" - }} - -
-

- 三级审核　在问题提交办结时，需经过“所队—>二级机构—>市局”三级审核，通过后方可办结； -

-

- 二级审核　在问题提交办结时，仅需经过“所队—>二级机构”两级审核，通过后即可办结； -

-
- +
+

审批流程

+
+ + + {{ item.dictLabel + }}{{ + item.remark ? `(${item.remark})` : "" + }} + +
+

+ 三级审核　在问题提交办结时，需经过“所队—>二级机构—>市局”三级审核，通过后方可办结； +

+

+ 二级审核　在问题提交办结时，仅需经过“所队—>二级机构”两级审核，通过后即可办结； +

+
+ +
@@ -452,15 +467,15 @@ const dict = catchStore.getDicts([ "hostLevel", "timeLimit", "approvalFlow", - "specialSupervision" + "specialSupervision", ]); const props = defineProps({ modeType: { type: String, - default: 'add' - } -}) + default: "add", + }, +}); const emit = defineEmits(["close"]); @@ -479,7 +494,7 @@ watch( ); onMounted(() => { getDeparts(); -}) +}); const formRef = ref(null); const loading = ref(false); @@ -512,34 +527,21 @@ async function handleAddNegative() { } const departs = ref([]); -const departLoading = ref(false) +const departLoading = ref(false); async function getDeparts() { - departLoading.value = true + departLoading.value = true; if (form.value.hostLevel === HostLevel.FIRST) { departs.value = await listByFirstHost(); } else if (form.value.hostLevel === HostLevel.SECOND) { departs.value = await secondList(); } - departLoading.value = false + departLoading.value = false; } function handleSelectDepart(row, node) { form.value.departName = row.shortName; } -function handleSelectInvolveProblem(vals) { - form.value.involveProblem = vals.map((val) => { - const dictItem = dict.suspectProblem.filter( - (item) => item.dictValue === val - )[0]; - return { - dictType: "suspectProblem", - dictLabel: dictItem.dictLabel, - dictValue: dictItem.dictValue, - }; - }); -} - function handleLinkDepart() { form.value.departId = form.value.involveDepartId; form.value.departName = form.value.involveDepartName; @@ -547,10 +549,12 @@ function handleLinkDepart() { function handleChangeHostLevel(val) { if (val === HostLevel.FIRST) { - form.value.departId = '' + form.value.departId = ""; + } + if (val === HostLevel.SECOND) { + form.value.approvalFlow = "3"; } } - \ No newline at end of file diff --git a/src/views/work/Done.vue b/src/views/work/Done.vue index f81c68f..5d7d463 100644 --- a/src/views/work/Done.vue +++ b/src/views/work/Done.vue @@ -33,17 +33,14 @@ v-model="query.originId" clearable style="width: 200px" - size="small" />
-
-
-
@@ -153,17 +139,26 @@ placeholder="涉及人员" v-model="query.blameValue" clearable - size="small" - style="width: 160px" + style="width: 190px" />
+ + +
@@ -235,7 +225,6 @@ placeholder="投诉反映人" v-model="query.responderValue" clearable - size="small" style="width: 160px" />
@@ -288,7 +277,7 @@
{{ - getInvolveProblem(row.involveProblem) + getInvolveProblem(row.involveProblem, dict.suspectProblem) }}
@@ -328,7 +317,7 @@ diff --git a/src/views/work/Fav.vue b/src/views/work/Fav.vue index 755fcee..9025587 100644 --- a/src/views/work/Fav.vue +++ b/src/views/work/Fav.vue @@ -122,7 +122,7 @@
- {{ getInvolveProblem(row.involveProblem) || '/' }} + {{ getInvolveProblem(row.involveProblem, dict.suspectProblem) || '/' }}
@@ -142,7 +142,7 @@
@@ -106,12 +99,10 @@ @@ -153,8 +142,7 @@ placeholder="涉及人员" v-model="query.blameValue" clearable - size="small" - style="width: 160px" + style="width: 190px" /> @@ -163,7 +151,6 @@
@@ -235,7 +217,6 @@ placeholder="投诉反映人" v-model="query.responderValue" clearable - size="small" style="width: 160px" />
@@ -292,7 +273,7 @@
{{ - getInvolveProblem(row.involveProblem) + getInvolveProblem(row.involveProblem, dict.suspectProblem) }}
@@ -564,8 +545,8 @@ item.dictValue - ); + formData.value.involveProblem = formData.value.involveProblem.split(',') + } else { + formData.value.involveProblem = [] } } @@ -915,18 +894,6 @@ async function handleSumbit() { getList(); } -function handleSelectInvolveProblem(vals) { - formData.value.involveProblem = vals.map((val) => { - const dictItem = dict.suspectProblem.filter( - (item) => item.dictValue === val - )[0]; - return { - dictType: "suspectProblem", - dictLabel: dictItem.dictLabel, - dictValue: dictItem.dictValue, - }; - }); -} \ No newline at end of file diff --git a/src/views/work/Todo.vue b/src/views/work/Todo.vue index 3a26d49..e0bdf00 100644 --- a/src/views/work/Todo.vue +++ b/src/views/work/Todo.vue @@ -33,17 +33,14 @@ v-model="query.originId" clearable style="width: 200px" - size="small" /> @@ -104,11 +97,9 @@ @@ -150,15 +139,16 @@ placeholder="涉及人员" v-model="query.blameValue" clearable - size="small" - style="width: 160px" + style="width: 190px" /> - + 其他选项
@@ -244,14 +228,20 @@ placeholder="投诉反映人" v-model="query.responderValue" clearable - size="small" style="width: 160px" />
-
+
+ 问题下发