From b5578bb295b48bbbbe988ad86755f4877b511b77 Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Fri, 27 Sep 2024 16:12:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=A6=E6=83=85=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E9=A2=84=E8=A7=88=20=E5=85=A5=E4=BC=81=E4=B8=8D?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=8A=95=E8=AF=89=E8=AF=A6=E6=83=85=20?= =?UTF-8?q?=E6=8A=95=E8=AF=89=E9=A1=B5=E9=9D=A2=E8=AF=A6=E6=83=85=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/enterprise.js | 11 +++++ .../compaint/registrationListView.vue | 8 +-- src/views/enterprise/complaint.vue | 9 ++++ src/views/enterprise/complaintDetailView.vue | 2 +- src/views/enterprise/complaintNoScan.vue | 8 +-- src/views/enterprise/registrationDetail.vue | 49 ++++++++++++------- 6 files changed, 63 insertions(+), 24 deletions(-) diff --git a/src/api/enterprise.js b/src/api/enterprise.js index c036dc8..3f65a79 100644 --- a/src/api/enterprise.js +++ b/src/api/enterprise.js @@ -131,3 +131,14 @@ export const checkIsExists = (enterpriseNumber, success, error) =>_get("/app/ent * @returns */ export const addEvaluateInfo = (params, success, error) =>_post("/app/evaluate/add",params,success, error) + + + +/** + * 查询民生诉求执法部门列表 + * @param {*} params + * @param {*} success + * @param {*} error + * @returns + */ +export const queryComplaintItemList = (params, success, error) =>_get("/app/code/item/queryList",params,success, error) diff --git a/src/views/enterprise/compaint/registrationListView.vue b/src/views/enterprise/compaint/registrationListView.vue index 6ca9072..54afe34 100644 --- a/src/views/enterprise/compaint/registrationListView.vue +++ b/src/views/enterprise/compaint/registrationListView.vue @@ -89,7 +89,7 @@
- + 投诉 @@ -245,7 +245,7 @@ * @param {*} id * @param {*} name */ - const toComplaintView = (id, name, text,uniteCheck) => { + const toComplaintView = (id, name, text,uniteCheck,bureauDeptName,bureauDeptId) => { console.log(id, name) console.log(uniteCheck) router.push({ @@ -255,7 +255,9 @@ lawEnforcementIncident: name, lawEnforcementItemText: text, isSelect: false, - uniteCheck: uniteCheck + uniteCheck: uniteCheck, + complaintDepartments: bureauDeptName, + complaintDepartmentIds: bureauDeptId } }); } diff --git a/src/views/enterprise/complaint.vue b/src/views/enterprise/complaint.vue index 7a4371c..90f6f6a 100644 --- a/src/views/enterprise/complaint.vue +++ b/src/views/enterprise/complaint.vue @@ -402,10 +402,19 @@ console.log("================") console.log(submitData.userId); console.log("================") + submitData.relId = route?.query?.id; submitData.lawEnforcementIncidentText = route?.query?.lawEnforcementItemText; + submitData.complaintDepartments = route?.query?.complaintDepartments; + submitData.complaintDepartmentIds = route?.query?.complaintDepartmentIds; data.isSelect = route?.query?.isSelect; submitData.comOrOpi = route?.query?.comOrOpi; + + if(route?.query?.complaintDepartmentIds != null && route?.query?.complaintDepartmentIds != ''){ + data.depts = [{text: route?.query?.complaintDepartments,id: route?.query?.complaintDepartmentIds}] + } + + getDict({"dictType": "caseType"}, success => { console.log(success); success.data.forEach(res => { diff --git a/src/views/enterprise/complaintDetailView.vue b/src/views/enterprise/complaintDetailView.vue index 421dd0c..2f2467d 100644 --- a/src/views/enterprise/complaintDetailView.vue +++ b/src/views/enterprise/complaintDetailView.vue @@ -314,7 +314,7 @@ submitData.linkmanTel = success.data.linkmanTel; submitData.bureauDeptName = success.data.bureauDeptName // 判断是否入企不扫码 - if (null == success.data.enforceType || null == success.data.relId) { + if (3 == success.data.enforceType || null == success.data.relId) { data.isNoScan = true; submitData.complaintTime = success.data.complaintTime; submitData.complaintDepartments = success.data.complaintDepartments; diff --git a/src/views/enterprise/complaintNoScan.vue b/src/views/enterprise/complaintNoScan.vue index a1e7aa4..17ef9d4 100644 --- a/src/views/enterprise/complaintNoScan.vue +++ b/src/views/enterprise/complaintNoScan.vue @@ -171,7 +171,7 @@ import {getDict} from '@/api/Home' import {uploadFile} from '@/util/fileUpload' import {reactive, ref,defineProps} from "vue"; - import DeptPopup from '@/views/enterprise/compaint/selectDeptFilter.vue'; + import DeptPopup from '@/views/enterprise/compaint/selectMssqFilter.vue'; import {formattedTimeYYYYmmdd} from "@/util/util"; const {useCommon, useMy} = $globalStore; @@ -233,6 +233,8 @@ enforcementTime:"", complaintDepartments:"", complaintDepartmentIds:"", + complaintItemCodes:"", + complaintItemNames:"", }) @@ -259,8 +261,8 @@ deptNameArr.push(element.text); deptIdArr.push(element.id); } - submitData.complaintDepartmentIds = deptIdArr.join(","); - submitData.complaintDepartments = deptNameArr.join(","); + submitData.complaintItemCodes = deptIdArr.join(","); + submitData.complaintItemNames = deptNameArr.join(","); console.log(submitData) // return; addEnterpriseComplaint(submitData, success => { diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue index e0ea5fe..ef8ca69 100644 --- a/src/views/enterprise/registrationDetail.vue +++ b/src/views/enterprise/registrationDetail.vue @@ -14,8 +14,8 @@
执法信息联
- -
+ +
@@ -46,9 +46,9 @@
预览图片 - - +
@@ -61,7 +61,7 @@
- +
@@ -97,9 +97,9 @@
预览图片 - - + @click="imagePreview2(index)" :key="index"/> + +
@@ -144,6 +144,7 @@ lawCer: [{text: "", id: ""}], imageList: [], show: ref(false), + show2: ref(false), dataList: [], evaluateImageList: [], regList: [], @@ -209,13 +210,10 @@ data.bad = "#7FFFD4"; submitData.reslut = 1; } - const index = ref(0); + const indexImg = ref(0); + const indexImg2 = ref(0); const imagePreview = (newIndex) => { var imgstrArr = data.imgstr.split(","); -// showImagePreview({ -// images:data.imageList[index], -// startPosition: index, -// }); nextTick(() => { // console.log(this.$refs.testRef) @@ -223,9 +221,20 @@ // const imagePre = ref("imagePre"); // imagePre.change(newIndex); }); -// index.value = newIndex; data.show = ref(true); + } + const imagePreview2 = (newIndex) => { + var imgstrArr = data.imgstr.split(","); + + nextTick(() => { + // console.log(this.$refs.testRef) + // this.$refs.imagePre.change(newIndex) + // const imagePre = ref("imagePre"); + // imagePre.change(newIndex); + }); + data.show2 = ref(true); + } const setLinkageItem = (id) => { @@ -284,7 +293,10 @@ } const onChange = (newIndex) => { - index.value = newIndex; + indexImg.value = newIndex; + }; + const onChange2 = (newIndex) => { + indexImg2.value = newIndex; }; //3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd //初始化参数，获取扫码的企业统一信用编码 @@ -296,7 +308,7 @@ // queryEnforcementRegistrationById(); queryRegUniteById(); - setAttr(); + // setAttr(); }) const queryRegById = () => { @@ -519,7 +531,8 @@ // data.imgstr = data.imgstr.substring(0, data.imgstr.length - 1); // } for (const key in success.data.filePreview.fileList) { - images[key] = success.data.filePreview.fileList[key]; + images[key] = baseUrl + success.data.filePreview.fileList[key]; + data.imageList.push(baseUrl + success.data.filePreview.fileList[key]) } obj.images = images; data.regList.push(obj); @@ -527,6 +540,7 @@ if (proFlag == regs.length) { res(); } + console.log(data.imageList); }, error => { }); } @@ -1034,5 +1048,6 @@ border: 0; } +