From 4770756b5a429687d243ab2a6361793da36128da Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Sat, 14 Sep 2024 21:52:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E7=94=BB?= =?UTF-8?q?=E5=83=8F=E5=A4=84=E7=BD=9A=E6=A1=88=E4=BB=B6=20=E6=8A=95?= =?UTF-8?q?=E8=AF=89=E5=B1=95=E7=A4=BA=20=E8=81=94=E5=90=88=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E4=BA=BA=E5=91=98=E9=80=89=E6=8B=A9=20=E4=B8=8D?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/administrative/appointment.vue | 16 ++++++--- .../administrative/appointmentDetail.vue | 2 +- src/views/administrative/appointmentEdit.vue | 23 +++++++------ src/views/administrative/deptFilter.vue | 18 ++++++++-- src/views/enforce/enterpriseBaseInfo.vue | 4 +-- src/views/enforce/noScanFilter.vue | 2 +- src/views/enforce/sign.vue | 34 ++++++++----------- src/views/enterprise/complaintDetailView.vue | 21 +++++++----- src/views/enterprise/registrationDetail.vue | 6 ++-- 9 files changed, 74 insertions(+), 52 deletions(-) diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue index bf94577..06c0fc5 100644 --- a/src/views/administrative/appointment.vue +++ b/src/views/administrative/appointment.vue @@ -204,10 +204,12 @@
- +

- {{nameCorrect(item.userName)}} - {{item.deptName}} + {{item.zzDisplayPath}}{{nameCorrect(item.userName)}} + {{item.lawCertificateNum}} +

@@ -501,7 +503,13 @@ for (var i=0; i { - console.log("queryUserInfo : ", success.data) - submitData.lawEnforcer = success.data.userName; - submitData.lawCertificateNum = success.data.lawCertificateNum - submitData.lawEnforcerText = nameCorrect(submitData.lawEnforcer +" "+ submitData.lawCertificateNum) - // submitData.lawEnforcerText = submitData.lawEnforcer - submitData.lawEnforcerId = success.data.userId; - submitData.lawEnforcement = success.data.dept.deptName; - submitData.lawEnforcementId = success.data.dept.deptId; - },error=>{}); + // queryUserInfo(useCommon.userId,success =>{ + // console.log("queryUserInfo : ", success.data) + // submitData.lawEnforcer = success.data.userName; + // submitData.lawCertificateNum = success.data.lawCertificateNum + // submitData.lawEnforcerText = nameCorrect(submitData.lawEnforcer +" "+ submitData.lawCertificateNum) + // submitData.lawEnforcerText = submitData.lawEnforcer + // submitData.lawEnforcerId = success.data.userId; + // submitData.lawEnforcement = success.data.dept.deptName; + // submitData.lawEnforcementId = success.data.dept.deptId; + // },error=>{}); // } } },error=>{ diff --git a/src/views/administrative/deptFilter.vue b/src/views/administrative/deptFilter.vue index 1fca138..d18b058 100644 --- a/src/views/administrative/deptFilter.vue +++ b/src/views/administrative/deptFilter.vue @@ -61,11 +61,16 @@ {{item.userName}} -->
- +
{{item.userName}} - {{ item.dept.deptName}} + {{ item.dept.zzDisplayPath}}
+
@@ -183,7 +188,14 @@ let checkeds = JSON.parse(JSON.stringify(this.checked)); for (var i=0; i处罚种类： {{ item.cfzl }}

-

处罚方式：给予处罚 +

处罚决定：给予处罚

-

处罚方式：不予处罚 +

处罚决定：不予处罚

diff --git a/src/views/enforce/noScanFilter.vue b/src/views/enforce/noScanFilter.vue index 914e53b..3056049 100644 --- a/src/views/enforce/noScanFilter.vue +++ b/src/views/enforce/noScanFilter.vue @@ -101,7 +101,7 @@ const props = defineProps( { // } // }, onMounted(() =>{ - getDict({"dictType":"no-scan-reason"}, success => { + getDict({"dictType":"no-scan-reason","status": 0}, success => { if (success.success) { dicts.value.push(...success.data); } diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index 322b3a5..c097337 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -124,12 +124,19 @@ + - - - @@ -282,7 +285,6 @@ import LawPopup from './lawFilter.vue'; import PopupA from './assistUserFilter.vue'; import Popupzq from './zqyjjdmFilter.vue'; - import popupcp from '../enterprise/companyFilter.vue'; import {getDict} from "../../api/Home"; import {queryLinkage, queryLinkageDictByValueAndParentId} from "../../api/linkage"; import { @@ -487,9 +489,9 @@ onMounted(() => { nameCorrect(); submitData.enterpriseNumber = route?.query?.enterpriseNumber; - submitData.enforceReason = route?.query?.reason; - submitData.checkCss = eval(route?.query?.checkCss); - data.isNoScan = eval(route?.query?.isNoScan); + submitData.enforce = route?.query?.reason; + submitData.checkCss = route?.query?.checkCss; + data.isNoScan = route?.query?.isNoScan; // let dateLimit = new Date(); // data.maxDate = new Date(this.$moment(dateLimit).format('YYYY/MM/DD')); @@ -500,8 +502,7 @@ initCheckCategory(); // 数据填充 - // if (!data.isNoScan) { dataFillIn('add'); } - + dataFillIn(); //查询企业信息 getEnterpriseInformation(route?.query?.enterpriseNumber, success => { @@ -648,9 +649,9 @@ }); } - const dataFillIn = (modth) => { + const dataFillIn = () => { // getRegByUserIdAndZero(useCommon.userId,success =>{ - getByUserIdAndEnterpriseNumber(modth, useCommon.userId, submitData.enterpriseNumber, success => { + getByUserIdAndEnterpriseNumber("add", useCommon.userId, submitData.enterpriseNumber, success => { //跳转企业二维码地址 if (success.success) { console.log("============> : ", success.data); @@ -920,18 +921,10 @@ data.popupVisible = false; data.popupVisible2 = false; data.popupVisibleqz = false; - data.popupCp = false; data.lawChecked = false; data.deptChecked = false; } - const reciveVisible = (item) => { - data.lawCer[data.lawCerFlag].id = item.userId; - data.lawCer[data.lawCerFlag].text = item.userName; - data.lawCer[data.lawCerFlag].num = item.lawCertificateNum; - data.lawCer[data.lawCerFlag].show = nameCorrect(item.userName + " " + item.lawCertificateNum); - } - const reciveData = (item) => { data.lawCer[data.lawCerFlag].id = item.userId; data.lawCer[data.lawCerFlag].text = item.userName; @@ -1091,6 +1084,7 @@ return s; } +