From a646b6a12766ddadea945ca9770ae5bc6a2ab991 Mon Sep 17 00:00:00 2001 From: wxc <191104855@qq.com> Date: Thu, 9 Jan 2025 09:29:25 +0800 Subject: [PATCH] 250109 --- src/api/mv/VideoComponent.vue | 41 - src/api/request.ts | 1 - src/api/work/negative.ts | 16 +- src/components/data/gab-import.vue | 129 +- src/components/data/gj-import.vue | 126 +- src/components/negative/dialog.vue | 28 +- .../negative/verify-description.vue | 27 +- src/components/negative/verify.vue | 12 - src/components/negativeInfo/depart-dialog.vue | 5 +- src/components/time-limit-select.vue | 2 +- src/permission.ts | 2 +- src/router/routes.ts | 7 +- src/utils/token.ts | 30 +- src/views/baseData/Personal.vue | 1 - src/views/baseData/WorkPlace.vue | 1 - src/views/books/Ajhc.vue | 1 - src/views/books/Gabxf.vue | 3 +- src/views/books/Gjxf.vue | 3 +- src/views/books/Hdjq.vue | 3 +- src/views/books/Mail12337.vue | 9 + src/views/books/Xcdc.vue | 3 +- src/views/data/Ajhc.vue | 1 - src/views/data/Gabxf.vue | 1 - src/views/data/Gjxf.vue | 1 - src/views/data/Mail12337.vue | 76 +- src/views/data/PoliceMeeting.vue | 1 - src/views/data/VideoInspection.vue | 1 - .../sensitivePerception/DepartNegative.vue | 1 - src/views/sensitivePerception/Model.vue | 1 - src/views/sensitivePerception/ModelClue.vue | 1 - .../sensitivePerception/ModelClueManual.vue | 1 - .../sensitivePerception/ModelClueTask.vue | 1 - .../sensitivePerception/PoliceNegative.vue | 1 - src/views/sensitivePerception/RiskClue.vue | 1 - .../sensitivePerception/RiskPersonnel.vue | 1 - src/views/system/Depart.vue | 1 - src/views/system/DepartMaping.vue | 2 - src/views/system/Dict.vue | 2 - src/views/system/Police.vue | 1 - src/views/system/ProblemMaping.vue | 1 - src/views/system/User.vue | 1 - src/views/work/Alarm.vue | 1 - src/views/work/BatchDistribute.vue | 9 +- src/views/work/Done.vue | 1 - src/views/work/Fav.vue | 3 +- src/views/work/NegativeTask.vue | 3 +- src/views/work/News.vue | 1 - src/views/work/Query.vue | 5 +- src/views/work/Todo.vue | 5 +- src/views/work/VerifySubmit.vue | 1798 +++++++++++++++++ vite.config.ts | 3 + 51 files changed, 2064 insertions(+), 312 deletions(-) delete mode 100644 src/api/mv/VideoComponent.vue create mode 100644 src/views/books/Mail12337.vue create mode 100644 src/views/work/VerifySubmit.vue diff --git a/src/api/mv/VideoComponent.vue b/src/api/mv/VideoComponent.vue deleted file mode 100644 index f14bdaa..0000000 --- a/src/api/mv/VideoComponent.vue +++ /dev/null @@ -1,41 +0,0 @@ - - - - - diff --git a/src/api/request.ts b/src/api/request.ts index 4bbaeff..257be51 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -38,7 +38,6 @@ function del(options: Options) { let isRelogin = false; function ajax(url: string, options: Options) { const headers: Record = { - "Authorization": getToken() }; let body: string | FormData; diff --git a/src/api/work/negative.ts b/src/api/work/negative.ts index 12c8540..f983ad5 100644 --- a/src/api/work/negative.ts +++ b/src/api/work/negative.ts @@ -15,6 +15,12 @@ export function getNegativeDetails(id, workId) { }); } +export function getNegativeDetailsByOuter(id) { + return request.get({ + url: `/negative/outer/${id}` + }); +} + export function addNegative(body) { return request.post({ url: `/negative`, @@ -74,10 +80,18 @@ export function transferTodo(id) { }); } - +// 抽检 export function spotCheckNegative(id, body) { return request.post({ url: `/negative/${id}/spotCheck`, body }); +} + +// 提交办结 +export function verifySubmitNegative(id, body) { + return request.post({ + url: `/negative/${id}/verifySubmit`, + body + }); } \ No newline at end of file diff --git a/src/components/data/gab-import.vue b/src/components/data/gab-import.vue index 5ef9026..97fef56 100644 --- a/src/components/data/gab-import.vue +++ b/src/components/data/gab-import.vue @@ -1,5 +1,5 @@ @@ -210,7 +215,7 @@ import { onMounted } from "vue"; const emit = defineEmits(["close", "update"]); -const activeStep = ref(0) +const activeStep = ref(0); const fileList = ref([]); @@ -227,9 +232,7 @@ async function handleNext() { formData.append("file", fileList.value[fileList.value.length - 1].raw); loading.value = true; try { - importTableData.value = await importPetitionComplaintGab( - formData - ); + importTableData.value = await importPetitionComplaintGab(formData); } catch (e) { loading.value = false; throw e; @@ -239,29 +242,23 @@ async function handleNext() { return; } if (activeStep.value === 1) { - importTableData.value.forEach((item) => { - if (!item.departId) { - feedback.msgWarning("请选择办理单位"); - throw e; - } - }); loading.value = true; try { await addPetitionComplaintGab(importTableData.value); - } catch(e) { - loading.value = false - return + } catch (e) { + loading.value = false; + return; } - loading.value = false + loading.value = false; activeStep.value = 2; - emit('update') + emit("update"); return; } if (activeStep.value === 2) { - emit('close') - activeStep.value = 0 - importTableData.value = [] - fileList.value = [] + emit("close"); + activeStep.value = 0; + importTableData.value = []; + fileList.value = []; } } @@ -269,16 +266,18 @@ function handlePrev() { activeStep.value = activeStep.value - 1; } -const dialogRef = ref() +const dialogRef = ref(); -watch(() => dialogRef.value?.visible, (val) => { - if (!val) { - activeStep.value = 0 - importTableData.value = [] - fileList.value = [] +watch( + () => dialogRef.value?.visible, + (val) => { + if (!val) { + activeStep.value = 0; + importTableData.value = []; + fileList.value = []; + } } -}) - +); \ No newline at end of file diff --git a/src/components/data/gj-import.vue b/src/components/data/gj-import.vue index 2cb5da3..0c6afb2 100644 --- a/src/components/data/gj-import.vue +++ b/src/components/data/gj-import.vue @@ -14,43 +14,49 @@
- +
+

认定办结

+
+
+ + {{ + getDictLable( + dict.verifySituation, + negative.verifySituation + ) || "/" + }} +
+
+ + {{ + getDictLable( + dict.verifyFileSituation, + negative.verifyFileSituation + ) || "/" + }} +
+
+
- -
-
- - {{ - getDictLable( - dict.verifySituation, - negative.verifySituation - ) || '/' - }} -
-
- - {{ - getDictLable( - dict.verifyFileSituation, - negative.verifyFileSituation - ) || '/' - }} -
-
- + + \ No newline at end of file diff --git a/src/views/books/Xcdc.vue b/src/views/books/Xcdc.vue index 0e9149a..d56c1e4 100644 --- a/src/views/books/Xcdc.vue +++ b/src/views/books/Xcdc.vue @@ -177,9 +177,8 @@
- +