From f5a136596fbf37e55d7203fe5c15b544e0de7a8c Mon Sep 17 00:00:00 2001 From: shil <452061493@qq.com> Date: Tue, 30 Sep 2025 14:54:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E8=AF=89=E6=B6=89=E4=BA=8B=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E7=9A=84=E7=BA=A7=E8=81=94,=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=B8=82=E5=A4=96=E4=BC=81=E4=B8=9A=E7=9A=84=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Home.js | 2 + src/views/enforce/noScanFilter.vue | 11 ++++-- src/views/enforce/outsideRegister.vue | 35 ++++++++++++++---- src/views/enforce/sign.vue | 25 +++++++++++++ src/views/enterprise/companyFilter.vue | 8 ++-- src/views/enterprise/complaint.vue | 39 +++++++++++++++----- src/views/enterprise/complaintDetailView.vue | 2 +- src/views/non-law/noScanFilter.vue | 11 ++++-- 8 files changed, 105 insertions(+), 28 deletions(-) diff --git a/src/api/Home.js b/src/api/Home.js index 0a77ad3..c1baba9 100644 --- a/src/api/Home.js +++ b/src/api/Home.js @@ -7,6 +7,8 @@ export const testLogin = (params, success, error) => _post("/app/thirdLogin/tes //查询字典 export const getDict = (params, success, error) => _get("/app/queryDict",params,success,error); +//获取级联街道字典 +export const getRegionCascade = (params, success, error) => _get("/app/code/item/getRegionCascade",params,success,error); //查询用户关联企业授权信息 export const getEnterpriseMerchantAuthorization = (params, success, error) => _get("/app/code/authorization/queryList",params,success,error); diff --git a/src/views/enforce/noScanFilter.vue b/src/views/enforce/noScanFilter.vue index 9c6bf87..77da779 100644 --- a/src/views/enforce/noScanFilter.vue +++ b/src/views/enforce/noScanFilter.vue @@ -203,7 +203,12 @@ const props = defineProps( { const toRegister = () => { router.push({ path: "/outsideRegister", - + query: { + to_path: "/enterpriseScanPreview", + to_reason: reason.value, + to_checkCss: checkCss.value, + to_isNoScan: true, + } }); }; @@ -453,7 +458,7 @@ const props = defineProps( { align-items: center; margin: -4% 0 0 8%; padding: 0.15rem 0.35rem; - width: 3.25rem; + width: 3.55rem; background-color: #fff; border-radius: 0.25rem; box-shadow: 0 0 0.15rem #dee9e9; @@ -465,6 +470,6 @@ const props = defineProps( { .link-box > span > i.van-icon { position: absolute; - right: 0.2rem; + right: 0.1rem; } \ No newline at end of file diff --git a/src/views/enforce/outsideRegister.vue b/src/views/enforce/outsideRegister.vue index f1321a0..ff55f1a 100644 --- a/src/views/enforce/outsideRegister.vue +++ b/src/views/enforce/outsideRegister.vue @@ -42,7 +42,7 @@ :rules="[{ required: true, message: '必填项' }]" /> { console.log(success) //跳转企业二维码地址 if(success.success){ - console.log("登记成功"); showSuccessToast('登记成功'); - router.push( - { - path: "/enterprise/qrCode", + console.log(data.to_path) + console.log(data.to_checkCss) + console.log(submitData.enterpriseNumber) + console.log(data.to_isNoScan) + router.push({ + path: data.to_path, query: { - enterpriseNumber: submitData.enterpriseNumber, - } + reason: data.to_reason, + checkCss: data.to_checkCss, + enterpriseNumber: submitData.enterpriseNumber, + isNoScan: data.to_isNoScan, + } }); + + // router.push( + // { + // path: "/enterprise/qrCode", + // query: { + // enterpriseNumber: submitData.enterpriseNumber, + // } + // }); } },error=>{console.log("登记失败")}) }).catch((errors) => { @@ -305,7 +325,6 @@ const cancelSelectDate = () =>{ onMounted(() => { currentDate(); - getDict({"dictType": "enterpriseType"},success =>{ success.data.forEach(res =>{ console.log(res) diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index fd65ff0..a590626 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -1529,4 +1529,29 @@ margin-left: -0.2rem; } + .tip-txt { + position: relative; + margin: 1% var(--van-padding-md) 0; + padding-bottom: 0.25rem; + color: #999; + font-size: 0.3rem; + text-align: right; + } + + .tip-txt:after { + position: absolute; + box-sizing: border-box; + content: " "; + pointer-events: none; + left: 0; + bottom: 0; + width: 100%; + border-bottom: 1px solid #ebedf0; + transform: scaleY(.5); + } + + .noborder:after { + border: 0 !important; + } + diff --git a/src/views/enterprise/companyFilter.vue b/src/views/enterprise/companyFilter.vue index 5344896..859f46f 100644 --- a/src/views/enterprise/companyFilter.vue +++ b/src/views/enterprise/companyFilter.vue @@ -119,7 +119,9 @@ toRegister() { this.router.push({ path: "/outsideRegister", - + query: { + to_path: "/appointmentBase", + } }) }, @@ -376,7 +378,7 @@ align-items: center; margin: -4% 0 0 8%; padding: 0.15rem 0.35rem; - width: 3.25rem; + width: 3.55rem; background-color: #fff; border-radius: 0.25rem; box-shadow: 0 0 0.15rem #dee9e9; @@ -388,6 +390,6 @@ .link-box > span > i.van-icon { position: absolute; - right: 0.2rem; + right: 0.1rem; } \ No newline at end of file diff --git a/src/views/enterprise/complaint.vue b/src/views/enterprise/complaint.vue index 8eab748..8707b70 100644 --- a/src/views/enterprise/complaint.vue +++ b/src/views/enterprise/complaint.vue @@ -103,28 +103,31 @@ />-->
+ + + 深圳市 - + @click="data.showRegionCascade = true" + /> -->
@@ -170,7 +173,7 @@ import {showSuccessToast, showLoadingToast, closeToast, Toast, showToast} from 'vant'; import {addEnterpriseComplaint,selectRegistrationList} from '@/api/enterprise' - import {getDict} from '@/api/Home' + import {getDict, getRegionCascade} from '@/api/Home' import {uploadFile} from '@/util/fileUpload' import {reactive, ref} from "vue"; import * as w6s from 'szient-js-sdk'; @@ -178,6 +181,7 @@ import MssqFilter from '@/views/enterprise/compaint/selectMssqFilter.vue'; import ItemPopup from './complaintItem.vue' import {queryDepts} from '@/api/user' +import { da } from 'date-fns/locale'; const {useCommon, useMy} = $globalStore @@ -200,7 +204,12 @@ comItemData:[], comItemContent:"", comItemIndex:0, - deptText:"" + deptText:"", + // 做级联的 + showRegionCascade: false, + regionCascade: [], + cascaderValue: '', + houseText: '' }); //保存参数 @@ -241,6 +250,12 @@ recordType:"" }) + // 全部选项选择完毕后，会触发 finish 事件 + const onFinish = ({ selectedOptions }) => { + data.showRegionCascade = false; + data.cascaderValue = selectedOptions.map((option) => option.text).join('') + }; + const showItemPopup=(ind)=>{ data.comItemPopup = true; data.comItemIndex=ind @@ -313,6 +328,7 @@ const submit = () => { submitData.enterpriseNumber = useCommon.enterpriseNumber; submitData.fileListObj = [] + submitData.enterpriseAddress = "深圳市"+data.cascaderValue + data.houseText addEnterpriseComplaint(submitData, success => { //跳转企业二维码地址 if (success.success) { @@ -378,6 +394,9 @@ return true; } onMounted(() => { + getRegionCascade({}, success => { + data.regionCascade = success.data; + }); submitData.relId = route?.query?.id; submitData.complaintRecordItem = route?.query?.lawEnforcementItemText; @@ -887,7 +906,7 @@ .flex-div .van-field:first-child { float: left; padding-left: 0.2rem; - width: 75%; + width: 100%; } .site-city { diff --git a/src/views/enterprise/complaintDetailView.vue b/src/views/enterprise/complaintDetailView.vue index ae06266..35655dd 100644 --- a/src/views/enterprise/complaintDetailView.vue +++ b/src/views/enterprise/complaintDetailView.vue @@ -81,7 +81,7 @@ - { router.push({ path: "/outsideRegister", - + query: { + to_path: "/non-preview", + to_reason: reason.value, + to_checkCss: checkCss.value, + to_isNoScan: true, + } }); }; @@ -446,7 +451,7 @@ const toRegister = () => { align-items: center; margin: -4% 0 0 8%; padding: 0.15rem 0.35rem; - width: 3.25rem; + width: 3.55rem; background-color: #fff; border-radius: 0.25rem; box-shadow: 0 0 0.15rem #dee9e9; @@ -458,6 +463,6 @@ const toRegister = () => { .link-box > span > i.van-icon { position: absolute; - right: 0.2rem; + right: 0.1rem; } \ No newline at end of file