From a2db291c1bf2ff7f69572f7b0dbf8bb7ddd97394 Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Tue, 10 Sep 2024 09:42:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=9A=E7=9F=A5=E8=A1=8C?= =?UTF-8?q?=E6=94=BF=E6=A3=80=E6=9F=A5=E8=AE=A1=E5=88=92=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=20=E9=A2=84=E8=AD=A6=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/util/fileUpload.js | 2 +- src/views/administrative/appointment.vue | 2 + .../administrative/appointmentDetail.vue | 4 +- src/views/enforce/earlyWarning.vue | 3 +- src/views/enforce/enforceNotice.vue | 17 +++ src/views/enforce/enforcementPlanAdd.vue | 29 +++- src/views/enforce/sign.vue | 8 +- .../enterpriseEvaluate/evaluate.vue | 37 ++--- src/views/enterprise/registrationDetail.vue | 131 ++++++++++-------- 9 files changed, 145 insertions(+), 88 deletions(-) diff --git a/src/util/fileUpload.js b/src/util/fileUpload.js index b8f9a8f..1e83782 100644 --- a/src/util/fileUpload.js +++ b/src/util/fileUpload.js @@ -41,7 +41,7 @@ const nameCorrect=(name)=>{ //筛选出两个字人名 let name1=[{}]; name1=String(name).split(" "); - console.log(name1); + // console.log(name1); if(name1[0].length==2){ if(name1.length>1){ return (String(name1[0]).substr(0,1)+"\u3000"+String(name1[0]).substr(1)+" "+name1[1]); diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue index 647a5dc..db56d94 100644 --- a/src/views/administrative/appointment.vue +++ b/src/views/administrative/appointment.vue @@ -45,6 +45,7 @@ is-link label="检查时间" placeholder="日期" + readonly :rules="[{ required: true, message: '必填项' }]" @click="data.showTimePicker = true" /> @@ -54,6 +55,7 @@ is-link label="" placeholder="时段" + readonly :rules="[{ required: true, message: '必填项' }]" @click="data.checkTimePicker = true" /> diff --git a/src/views/administrative/appointmentDetail.vue b/src/views/administrative/appointmentDetail.vue index 3a39f20..5e67370 100644 --- a/src/views/administrative/appointmentDetail.vue +++ b/src/views/administrative/appointmentDetail.vue @@ -99,12 +99,12 @@ --> -
+ 取消 diff --git a/src/views/enforce/earlyWarning.vue b/src/views/enforce/earlyWarning.vue index b05d706..c8eca99 100644 --- a/src/views/enforce/earlyWarning.vue +++ b/src/views/enforce/earlyWarning.vue @@ -192,7 +192,7 @@ // 设置初始值为当前时间 onMounted(() => { // getCard(); - searchParam.enterpriseNumber = useCommon.enterpriseNumber; + // searchParam.enterpriseNumber = useCommon.enterpriseNumber; queryList(); data.dateSearch = nowDate(new Date()); isLodding.value = false; @@ -390,6 +390,7 @@ } } } + searchParam.enterpriseNumber = ""; },error =>{ }) diff --git a/src/views/enforce/enforceNotice.vue b/src/views/enforce/enforceNotice.vue index 6bccdd8..91de95c 100644 --- a/src/views/enforce/enforceNotice.vue +++ b/src/views/enforce/enforceNotice.vue @@ -123,6 +123,23 @@ data.finished = ref(true); return; } + for (let index = 0; index < success.rows.length; index++) { + const element = success.rows[index]; + console.log(element); + // element.planName = element.planYear + element.planName; + if(element.timeType == 'quarter'){ + let val = ""; + if(element.quarter == "1") val = "一季度"; + if(element.quarter == "2") val = "二季度"; + if(element.quarter == "3") val = "三季度"; + if(element.quarter == "4") val = "四季度"; + element.planName = element.planYear + "年" + val + element.planName; + }else if (element.timeType == 'mouth') { + const val = element.mouth + "月"; + element.planName = element.planYear + "年" + val + element.planName; + } + element.planName = element.bureauDeptName + element.planName; + } // data.dataList = success.data; data.dataList.push(...success.rows); freshMap.refreshLoad = false; diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue index 888368a..f1a4b72 100644 --- a/src/views/enforce/enforcementPlanAdd.vue +++ b/src/views/enforce/enforcementPlanAdd.vue @@ -31,6 +31,7 @@ :columns-type="data.columnsType" @confirm="onDateConfirm" @cancel="cancelSelectDate" + readonly /> @@ -60,6 +61,7 @@ placeholder="请选择年份" required @click="data.showDatePicker = true" + readonly />
@@ -69,6 +71,8 @@ placeholder="请选择年/季/月度" is-link @click="data.dateShowPicker = true" + required + readonly />
@@ -84,13 +90,15 @@ placeholder="请选择季度" is-link @click="data.dataQuarterShowPicker = true" + readonly + required />
+
@@ -296,11 +304,14 @@ //跳转企业二维码地址 if (success.success) { console.log("保存成功"); + data.showIsPublish = false; showSuccessToast('保存成功'); goBack(); + } }, error => { - console.log("保存失败") + console.log("保存失败"); + data.showIsPublish = false; }) // showConfirmDialog(submitData).then(() => { @@ -393,6 +404,8 @@ return true; } onMounted(() => { + submitData.planName = "行政检查计划"; + nameObj.planName = '行政检查计划'; console.log(route?.query?.id); console.log(route?.query?.lawEnforcementIncident); submitData.relId = route?.query?.id; @@ -497,10 +510,14 @@ }; const foucePlan = () =>{ - nameObj.planName = '行政检查计划'; - submitData.planName = '行政检查计划'; - } - + console.log(submitData.planName); + nameObj.planName = submitData.planName; + } + //写函数（开启深度监视）： 监听内容属相变化 + watch(()=>submitData.planName,(newValue,oldValue)=>{ + console.log('submitData.planName变化了',newValue,oldValue) + nameObj.planName = newValue; + },{deep:true}) diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index f0c416e..2431e08 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -142,12 +142,12 @@ - + - - +

diff --git a/src/views/enterprise/enterpriseEvaluate/evaluate.vue b/src/views/enterprise/enterpriseEvaluate/evaluate.vue index bd479ab..e475874 100644 --- a/src/views/enterprise/enterpriseEvaluate/evaluate.vue +++ b/src/views/enterprise/enterpriseEvaluate/evaluate.vue @@ -6,20 +6,20 @@

您对我们的执法检查满意吗？

- + + v-for="n in (3 - data.dataObj.dealSpeedMetrics)"/> - 非常不满意 - 不满意 - 基本满意 - 满意 - 非常满意 + 不满意 + 较满意 + 满意 +
-
+ + + -
+
@@ -293,11 +293,11 @@ } .eval-star { - margin: 0 0.3rem 0 0.2rem; + margin: 0 0.7rem 0 0.2rem; } .eval-star i { - margin: 0 0.1rem; + margin: 0 0.3rem; color: #ddd; font-size: 0.5rem; } @@ -305,6 +305,9 @@ .eval-star i.active { color: #fbb516; } + .eval-star-font{ + font-weight: bold; + } .eval-all { display: flex; diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue index 6ab4272..cec5c1e 100644 --- a/src/views/enterprise/registrationDetail.vue +++ b/src/views/enterprise/registrationDetail.vue @@ -22,61 +22,53 @@ -
执法信息联
- -
- - -
- -
- 执法信息 + +
+ 联
+
+ - + /> +
+ + +
- -
+
- + /> +
+ + +
+ +
+ +