From e38f0d712062398829ba37275fec15188dae7dac Mon Sep 17 00:00:00 2001
From: shil <452061493@qq.com>
Date: Tue, 19 Aug 2025 16:03:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E9=A1=B9=E6=94=B9=E5=8A=A8=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E4=B8=8B,=20=E4=BF=9D=E5=AD=98=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=9A=84=E6=89=A7=E6=B3=95=E4=B8=BB=E4=BD=93=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/administrative/appointment.vue  |  4 +--
 src/views/enforce/enforcementPlan.vue     | 35 ++++++++++++-----------
 src/views/enforce/enforcementPlanAdd.vue  |  6 ++--
 src/views/enforceHome.vue                 | 10 ++++---
 src/views/enterprise/registrationEdit.vue | 10 +++----
 5 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index ca4bb7b..6dbce89 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -35,9 +35,9 @@
                         v-model="submitData.linkTel"
                         label="联系人电话"
                         required
-                        readonly
-                        :rules="[{ validator, message: '请输入正确内容' }]"
+                        :rules="[{ validator, message: '请输入正确手机号' }]"
                 />
+                <van-notice-bar :scrollable="false" text="请确认联系电话无误" />
                 <div class="flex-div">
                   <van-field
                           v-model="submitData.checkTime"
diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue
index 15b9566..544ded7 100644
--- a/src/views/enforce/enforcementPlan.vue
+++ b/src/views/enforce/enforcementPlan.vue
@@ -167,23 +167,24 @@
                 data.finished = 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 == 'month') {
-            //     const val = element.mouth + "月";
-            //     element.planName = element.planYear + "年" + val +  element.planName;
-            //   }
-            //   element.planName = element.bureauDeptName + element.planName;
-            // }
+            for (let index = 0; index < success.rows.length; index++) {
+              const element = success.rows[index];
+              // 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 == 'month') {
+                const val = element.mouth + "月";
+                element.planName = element.planYear + "年" + val +  element.planName;
+              }else if (element.timeType == 'year') {
+                element.planName = element.planYear + "年" + element.planName;
+              }
+              element.planName = element.bureauDeptName + element.planName;
+            }
             // data.dataList = success.data;
             data.dataList.push(...success.rows);
 
diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue
index 8eec170..6a0db18 100644
--- a/src/views/enforce/enforcementPlanAdd.vue
+++ b/src/views/enforce/enforcementPlanAdd.vue
@@ -305,11 +305,11 @@
        data.showIsPublish = true;
     }
     const addPlan = (val) =>{
-      var tmpPlanName = submitData.planName;
-      submitData.planName = nameObj.bureauDept + nameObj.planYear + nameObj.quarter + nameObj.mouth + nameObj.planName;
+      // var tmpPlanName = submitData.planName;
+      // submitData.planName = nameObj.bureauDept + nameObj.planYear + nameObj.quarter + nameObj.mouth + nameObj.planName;
       addEnforcementInspectionProgram(submitData, success => {
                 //跳转企业二维码地址
-                submitData.planName = tmpPlanName;
+                // submitData.planName = tmpPlanName;
                 if (success.success) {
                   data.showIsPublish = false;
                     showSuccessToast('保存成功');
diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue
index 570ea13..b60c977 100644
--- a/src/views/enforceHome.vue
+++ b/src/views/enforceHome.vue
@@ -270,10 +270,12 @@
         // getSzyptLoginAuth(route?.query?.code,success =>{
         getSzyptLoginAuth(code, success => {
             console.log(success)
-            useCommon.SET_USER_ID(success.data.userId);
-            useCommon.SET_TOKEN(success.data.token);
-            useCommon.SET_HAS_LAW(success.data.lawOfficer);
-            // useCommon.SET_HAS_LAW(true);
+            // useCommon.SET_USER_ID(success.data.userId);
+            // useCommon.SET_TOKEN(success.data.token);
+            // useCommon.SET_HAS_LAW(success.data.lawOfficer);
+            useCommon.SET_ORG_ID(success.data.bureauDept.deptId);
+            useCommon.SET_HAS_LAW(true);
+            console.log('-----------------------------> login: ', useCommon.orgId)
             // if (useCommon.firstLoad) {
                 isLoading.value = false;
             // }
diff --git a/src/views/enterprise/registrationEdit.vue b/src/views/enterprise/registrationEdit.vue
index 790f6a5..d1214ae 100644
--- a/src/views/enterprise/registrationEdit.vue
+++ b/src/views/enterprise/registrationEdit.vue
@@ -448,7 +448,7 @@ import {showFailToast, showSuccessToast} from 'vant';
         //执法人员2
         lawEnforcerTwo: "",
         lawEnforcerIdTwo: "",
-        lawEnforcerTwoId: "",
+        // lawEnforcerTwoId: "",
         lawCertificateNum: "",
         lawEnforcerTextTwo: "",
         lawCertificateNumTwoText: "",
@@ -1020,17 +1020,17 @@ import {showFailToast, showSuccessToast} from 'vant';
         submitData.lawEnforcementBasisText = submitData.lawEnforcementBasisText.substring(0, submitData.lawEnforcementBasisText.length - 1);
 
       // 执法人员
-      submitData.lawEnforcerTwoId = "";
+      submitData.lawEnforcerIdTwo = "";
       submitData.lawEnforcerTwo = "";
       submitData.lawCertificateNum = "";
       submitData.lawEnforcerTextTwo = "";
       for (var i=0; i<data.lawCer.length; i++) {
-        submitData.lawEnforcerTwoId += data.lawCer[i].id +",";
+        submitData.lawEnforcerIdTwo += data.lawCer[i].id +",";
         submitData.lawEnforcerTwo += data.lawCer[i].text +",";
         submitData.lawCertificateNum += data.lawCer[i].num +",";
         submitData.lawEnforcerTextTwo += data.lawCer[i].show +",";
       }
-      submitData.lawEnforcerTwoId = submitData.lawEnforcerTwoId.substring(0, submitData.lawEnforcerTwoId.length - 1);
+      submitData.lawEnforcerIdTwo = submitData.lawEnforcerIdTwo.substring(0, submitData.lawEnforcerIdTwo.length - 1);
       submitData.lawEnforcerTwo = submitData.lawEnforcerTwo.substring(0, submitData.lawEnforcerTwo.length - 1);
       submitData.lawCertificateNum = submitData.lawCertificateNum.substring(0, submitData.lawCertificateNum.length - 1);
       submitData.lawEnforcerTextTwo = submitData.lawEnforcerTextTwo.substring(0, submitData.lawEnforcerTextTwo.length - 1);
@@ -1210,7 +1210,7 @@ import {showFailToast, showSuccessToast} from 'vant';
         // submitData.lawText = item.checkItem;
 
         submitData.lawEnforcerTwo = item.lawEnforcerTwo;
-        submitData.lawEnforcerIdTwo = item.lawEnforcerTwoId;
+        submitData.lawEnforcerIdTwo = item.lawEnforcerIdTwo;
         submitData.lawCertificateNumTwoText = null==item.lawEnforcerTwo?"":item.lawEnforcerTwo + " " + null==item.lawCertificateNumTwo?"":item.lawCertificateNumTwo;
 
         submitData.lawText = item.enterpriseName;