From 1b4ae54d625c3ed3545d9d6ed17fcfcd7ca5f6b6 Mon Sep 17 00:00:00 2001
From: zouyx <1798599149@qq.com>
Date: Fri, 6 Sep 2024 18:21:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E5=AD=97=EF=BC=88=E4=BA=8C=E4=B8=8E?=
 =?UTF-8?q?=E4=B8=89=E5=AF=B9=E9=BD=90=EF=BC=89/=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=EF=BC=88=E4=BA=94=E4=B8=AA=E8=87=AA=E7=84=B6?=
 =?UTF-8?q?=E6=97=A5=E5=86=85=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/util/fileUpload.js                        | 19 ++++++++++-
 src/views/administrative/appointment.vue      | 10 +++---
 .../administrative/appointmentDetail.vue      | 11 +++---
 src/views/administrative/appointmentEdit.vue  | 13 ++++---
 src/views/enforce/enterpriseBaseInfo.vue      |  4 ++-
 src/views/enforce/historyCheck.vue            |  7 ++--
 src/views/enforce/sign.vue                    | 14 ++++----
 .../compaint/registrationListView.vue         |  7 ++--
 src/views/enterprise/complaintDetailView.vue  |  5 ++-
 src/views/enterprise/complaintNoScan.vue      | 34 +++++++++++++++++++
 src/views/enterprise/register.vue             |  4 +--
 src/views/enterprise/registrationDetail.vue   |  7 ++--
 src/views/enterprise/registrationEdit.vue     | 10 +++---
 src/views/enterprise/registrationList.vue     |  7 ++--
 14 files changed, 111 insertions(+), 41 deletions(-)

diff --git a/src/util/fileUpload.js b/src/util/fileUpload.js
index 4e76143..b8f9a8f 100644
--- a/src/util/fileUpload.js
+++ b/src/util/fileUpload.js
@@ -37,4 +37,21 @@ const uploadFile = (files,callback) => {
     
 }
 
-export{uploadFile};
\ No newline at end of file
+const nameCorrect=(name)=>{
+  //筛选出两个字人名
+  let name1=[{}];
+  name1=String(name).split(" ");
+  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]);
+    }else{
+      return (String(name1[0]).substr(0,1)+"\u3000"+String(name1[0]).substr(1));
+    }
+
+  }else{
+    return name;
+  }
+}
+
+export{uploadFile,nameCorrect};
\ No newline at end of file
diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index e095d89..647a5dc 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -204,7 +204,7 @@
                     <div class="add-inspect" v-if="data.checked">
                       <p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p>
                       <p v-for="(item, index) in submitData.userObjs" :key="index">
-                          <span class="add-dept">{{item.deptName}}</span><span class="add-name">{{item.userName}}</span>
+                          <span class="add-dept">{{item.deptName}}</span><span class="add-name">{{nameCorrect(item.userName)}}</span>
                       </p>
                       <div class="addbtn" @click.stop="data.deptChecked=true"><van-icon name="add-o" /></div>
                     </div>
@@ -283,7 +283,7 @@
 </template>
 
 <script setup name="register">
-
+    import {nameCorrect} from'@/util/fileUpload';
     import {showSuccessToast} from 'vant';
     import 'vant/es/toast/style';
     import {
@@ -474,7 +474,7 @@
         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 = item.userName + " " + item.lawCertificateNum;
+        data.lawCer[data.lawCerFlag].show = nameCorrect(item.userName + " " + item.lawCertificateNum);
 
         // submitData.lawEnforcerTwo = item.userName
         // submitData.lawCertificateNumTwo = item.lawCertificateNum;
@@ -684,7 +684,7 @@
             console.log(success.data)
             submitData.lawEnforcer = success.data.userName;
             submitData.lawCertificateNum = success.data.lawCertificateNum
-            submitData.lawEnforcerText = submitData.lawEnforcer +" "+ submitData.lawCertificateNum
+            submitData.lawEnforcerText = nameCorrect(submitData.lawEnforcer +" "+ submitData.lawCertificateNum)
             // submitData.lawEnforcerText = submitData.lawEnforcer
             submitData.lawEnforcerId = success.data.userId;
             submitData.lawEnforcement = success.data.dept.deptName;
@@ -715,7 +715,7 @@
     const reciveData = (item) => {
         submitData.enterpriseName = item.enterpriseName;
         submitData.linkTel = item.enterpriseTel;
-        submitData.linkMan = item.legalPerson;
+        submitData.linkMan = nameCorrect(item.legalPerson);
         submitData.enterpriseNumber = item.enterpriseNumber;
 
         // 查询设定的检查时间是否有别的企业对该部门进行检查, 如果有这提示可进行联合执法
diff --git a/src/views/administrative/appointmentDetail.vue b/src/views/administrative/appointmentDetail.vue
index 417e7f8..3a39f20 100644
--- a/src/views/administrative/appointmentDetail.vue
+++ b/src/views/administrative/appointmentDetail.vue
@@ -102,7 +102,7 @@
                   <div class="add-inspect">
                       <p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p>
                       <p v-for="(item, index) in submitData.userObjs" :key="index">
-                          <span class="add-dept">{{item.deptName}}</span><span class="add-name">{{item.userName}}</span>
+                          <span class="add-dept">{{item.deptName}}</span><span class="add-name">{{nameCorrect(item.userName)}}</span>
                       </p>
                   </div>
 
@@ -153,7 +153,7 @@
 </template>
 
 <script setup name="register">
-
+  import {nameCorrect} from'@/util/fileUpload';
     import { showSuccessToast } from 'vant';
     import 'vant/es/toast/style';
     import {
@@ -375,7 +375,7 @@
                 submitData.isSubmit =success.data['isSubmit'];
                 submitData.isReg = success.data['isReg'];
                 submitData.status = success.data['status'];
-
+                submitData.linkMan=nameCorrect(submitData['linkMan']);
                 // 是否联合执法
                 if (success.data.userObjs.length > 1) {
                     data.checked = true;
@@ -402,7 +402,7 @@
                     var lawEnforcer2Show = lawEnforcer2ShowStr.split(',');
                     data.lawCer = [];
                     for (var i = 0; i < tmpEnforceId.length; i++) {
-                        data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]});
+                        data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: nameCorrect(lawEnforcer2Show[i])});
                     }
                 }
 
@@ -412,7 +412,7 @@
                         console.log("queryUserInfo : ", success.data)
                         submitData.lawEnforcer = success.data.userName;
                         submitData.lawCertificateNum = success.data.lawCertificateNum
-                        submitData.lawEnforcerText = submitData.lawEnforcer +" "+ submitData.lawCertificateNum
+                        submitData.lawEnforcerText = nameCorrect(submitData.lawEnforcer +" "+ submitData.lawCertificateNum)
                         // submitData.lawEnforcerText = submitData.lawEnforcer
                         submitData.lawEnforcerId = success.data.userId;
                         submitData.lawEnforcement = success.data.dept.deptName;
@@ -557,6 +557,7 @@
 
     //初始化参数，获取扫码的企业统一信用编码
     onMounted(() =>{
+        nameCorrect();
         // 数据填充
         dataFillIn(route?.query?.id);
 
diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue
index dc1ff3a..1ccd1fc 100644
--- a/src/views/administrative/appointmentEdit.vue
+++ b/src/views/administrative/appointmentEdit.vue
@@ -167,7 +167,7 @@
                   <div class="add-inspect" v-if="data.checked || submitData.isSubmit == 1">
                       <p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p>
                       <p v-for="(item, index) in submitData.userObjs" :key="index">
-                          <span class="add-dept">{{item.deptName}}</span><span class="add-name">{{item.userName}}</span>
+                          <span class="add-dept">{{item.deptName}}</span><span class="add-name">{{nameCorrect(item.userName)}}</span>
                       </p>
                   </div>
                 </van-cell-group>
@@ -238,6 +238,7 @@
     //用户筛选弹窗
     import UserPopup from './userFilter.vue';
     import DeptPopup from './deptFilter.vue';
+    import {nameCorrect} from'@/util/fileUpload'
     const router = useRouter();
     //路由参数
     const route = useRoute();
@@ -345,7 +346,7 @@
         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 = item.userName + " " + item.lawCertificateNum;
+        data.lawCer[data.lawCerFlag].show = nameCorrect(item.userName + " " + item.lawCertificateNum);
 
         // submitData.lawEnforcerTwo = item.userName
         // submitData.lawCertificateNumTwo = item.lawCertificateNum;
@@ -425,6 +426,7 @@
                 submitData.lawEnforcerTextTwo =success.data['lawEnforcerTwo'];
                 submitData.isSubmit =success.data['isSubmit'];
                 submitData.bureauDeptName = success.data['bureauDeptName'];
+                submitData.linkMan=nameCorrect(submitData['linkMan']);
 
                 // 是否联合执法
                 if (success.data.userObjs.length > 1) {
@@ -452,7 +454,7 @@
                     var lawEnforcer2Show = lawEnforcer2ShowStr.split(',');
                     data.lawCer = [];
                     for (var i = 0; i < tmpEnforceId.length; i++) {
-                        data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]});
+                        data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: nameCorrect(lawEnforcer2Show[i])});
                     }
                 }
 
@@ -462,7 +464,7 @@
                         console.log("queryUserInfo : ", success.data)
                         submitData.lawEnforcer = success.data.userName;
                         submitData.lawCertificateNum = success.data.lawCertificateNum
-                        submitData.lawEnforcerText = submitData.lawEnforcer +" "+ submitData.lawCertificateNum
+                        submitData.lawEnforcerText = nameCorrect(submitData.lawEnforcer +" "+ submitData.lawCertificateNum)
                         // submitData.lawEnforcerText = submitData.lawEnforcer
                         submitData.lawEnforcerId = success.data.userId;
                         submitData.lawEnforcement = success.data.dept.deptName;
@@ -633,6 +635,7 @@
 
     //初始化参数，获取扫码的企业统一信用编码
     onMounted(() =>{
+        nameCorrect();
         // 数据填充
         dataFillIn(route?.query?.id);
 
@@ -658,7 +661,7 @@
     const reciveData = (item) =>{
         submitData.enterpriseName = item.enterpriseName;
         submitData.linkTel = item.enterpriseTel;
-        submitData.linkMan = item.legalPerson;
+        submitData.linkMan = nameCorrect(item.legalPerson);
         submitData.enterpriseNumber = item.enterpriseNumber;
     }
 </script>
diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue
index 350e2f6..c7f887d 100644
--- a/src/views/enforce/enterpriseBaseInfo.vue
+++ b/src/views/enforce/enterpriseBaseInfo.vue
@@ -191,6 +191,7 @@
     import {uploadFile} from "@/util/fileUpload";
     //用户筛选弹窗
     import Popup from './userFilter.vue';
+    import {nameCorrect}from'../../util/fileUpload'
 
     const {useMy} = $globalStore
 
@@ -275,6 +276,7 @@
     //3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd
     //初始化参数，获取扫码的企业统一信用编码
     onMounted(() => {
+        nameCorrect();
         //查询企业信息
         getEnterpriseInformation(route?.query?.enterpriseNumber, success => {
             // getEnterpriseInformation(props?.enterpriseNumber,success =>{
@@ -284,7 +286,7 @@
                 data.enterpriseInfo.enterpriseNumber = success.data.enterpriseNumber
                 data.enterpriseInfo.enterpriseType = success.data.companyOrgType
                 data.enterpriseInfo.enterpriseAddress = success.data.enterpriseAddress
-                data.enterpriseInfo.legalPerson = success.data.legalPerson
+                data.enterpriseInfo.legalPerson = nameCorrect(success.data.legalPerson)
                 // data.enterpriseInfo.registeredCapital = success.data.registeredCapital +' (人民币/元)'
                 var amount = 0.00;
                 if (null != success.data.registeredCapital) {
diff --git a/src/views/enforce/historyCheck.vue b/src/views/enforce/historyCheck.vue
index f7c3fa0..04892b8 100644
--- a/src/views/enforce/historyCheck.vue
+++ b/src/views/enforce/historyCheck.vue
@@ -80,8 +80,8 @@
                                         <p>
                                           <label class="card_box_label">执法人员：</label>
                                         <div>
-                                          <div>{{ item.lawEnforcer }}</div>
-                                          <div v-for="(item, index) in item.lawEnforcer2List">{{ item }}</div>
+                                          <div>{{ nameCorrect(item.lawEnforcer) }}</div>
+                                          <div v-for="(item, index) in item.lawEnforcer2List">{{ nameCorrect(item) }}</div>
                                         </div>
                                         </p>
                                       </div>
@@ -120,7 +120,7 @@
 <script setup name="registrationList">
     import {queryRegistrationList, getAttr} from '../../api/enforce';
     import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage";
-
+    import {nameCorrect} from'@/util/fileUpload';
     const {useCommon, useShopCard} = $globalStore;
 
     const router = useRouter();
@@ -182,6 +182,7 @@
 
     // 设置初始值为当前时间
     onMounted(async () => {
+        nameCorrect();
         // getCard();
         searchParam.lawEnforcerId = useCommon.userId;
         // queryList();
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index 659321a..8737232 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -150,7 +150,7 @@
                   <div class="add-inspect" v-if="data.checked">
                     <p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p>
                     <p v-for="(item, index) in submitData.userObjs" :key="index">
-                      <span class="add-dept">{{item.deptName}}</span><span class="add-name">{{item.userName}}</span>
+                      <span class="add-dept">{{item.deptName}}</span><span class="add-name">{{nameCorrect(item.userName)}}</span>
                     </p>
                     <div class="addbtn" @click.stop="data.deptChecked=true"><van-icon name="add-o" /></div>
                   </div>
@@ -247,7 +247,7 @@
 </template>
 
 <script setup name="register">
-
+    import {nameCorrect} from'@/util/fileUpload';
     import {showSuccessToast} from 'vant';
     import 'vant/es/toast/style';
     import {
@@ -468,6 +468,7 @@
     //3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd
     //初始化参数，获取扫码的企业统一信用编码
     onMounted(() => {
+        nameCorrect();
         submitData.enterpriseNumber = route?.query?.enterpriseNumber;
         submitData.enforce = route?.query?.reason;
         submitData.checkCss = route?.query?.checkCss;
@@ -497,7 +498,8 @@
         queryUserInfo(useCommon.userId, success => {
             if (null != success.data) {
                 submitData.lawEnforcer = success.data.userName
-                submitData.lawCertificateNumText = success.data.userName + " " + success.data.lawCertificateNum
+                submitData.lawCertificateNumText =nameCorrect(success.data.userName + " " + success.data.lawCertificateNum); 
+
                 // submitData.lawCertificateNumText = success.data.userName
                 submitData.lawEnforcerId = success.data.userId
                 submitData.lawEnforcement = success.data.dept.deptName;
@@ -681,7 +683,7 @@
                     var lawEnforcer2Show = lawEnforcer2ShowStr.split(',');
                     data.lawCer = [];
                     for (var i = 0; i < tmpEnforceId.length; i++) {
-                        data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]});
+                        data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: nameCorrect(lawEnforcer2Show[i])});
                     }
                 }
 
@@ -907,7 +909,7 @@
     const reciveData = (item) => {
         data.lawCer[data.lawCerFlag].id = item.userId;
         data.lawCer[data.lawCerFlag].text = item.userName;
-        data.lawCer[data.lawCerFlag].show = item.userName + " " + (null == item.lawCertificateNum ? "" : item.lawCertificateNum);
+        data.lawCer[data.lawCerFlag].show = nameCorrect(item.userName + " " + (null == item.lawCertificateNum ? "" : item.lawCertificateNum));
 
         // submitData.lawEnforcerTwo = item.userName;
         // submitData.lawCertificateNumTwoText = item.userName + " " + item.lawCertificateNum
@@ -972,7 +974,7 @@
             var lawEnforcer2Show = lawEnforcer2ShowStr.split(',');
             data.lawCer = [];
             for (var i = 0; i < tmpEnforceId.length; i++) {
-                data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]});
+                data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: nameCorrect(lawEnforcer2Show[i])});
             }
         }
     }
diff --git a/src/views/enterprise/compaint/registrationListView.vue b/src/views/enterprise/compaint/registrationListView.vue
index 4c33423..2eaabfa 100644
--- a/src/views/enterprise/compaint/registrationListView.vue
+++ b/src/views/enterprise/compaint/registrationListView.vue
@@ -78,8 +78,8 @@
                                       <p>
                                         <label class="card_box_label">执法人员：</label>
                                       <div>
-                                        <div>{{ item.lawEnforcer }}</div>
-                                        <div v-for="(item, index) in item.lawEnforcer2List">{{ item }}</div>
+                                        <div>{{ nameCorrect(item.lawEnforcer) }}</div>
+                                        <div v-for="(item, index) in item.lawEnforcer2List">{{ nameCorrect(item) }}</div>
                                       </div>
                                       </p>
                                     </div>
@@ -117,6 +117,8 @@
   import { queryListWithFiveDay } from '@/api/enterprise';
   import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage";
   import {setGoodsNum} from "@/util/util";
+  import {nameCorrect} from'@/util/fileUpload';
+  
 
   const {useCommon, useShopCard} = $globalStore;
 
@@ -169,6 +171,7 @@
 
   // 设置初始值为当前时间
   onMounted(() => {
+    nameCorrect();
       // getCard();
       searchParam.enterpriseNumber = useCommon.enterpriseNumber;
       // queryList();
diff --git a/src/views/enterprise/complaintDetailView.vue b/src/views/enterprise/complaintDetailView.vue
index 13c3a95..5d1f0be 100644
--- a/src/views/enterprise/complaintDetailView.vue
+++ b/src/views/enterprise/complaintDetailView.vue
@@ -135,6 +135,7 @@
   import {uploadFile} from '../../util/fileUpload'
   import {reactive, ref} from "vue";
   import * as w6s from 'szient-js-sdk';
+  import {nameCorrect} from'@/util/fileUpload';
 
   const {useCommon, useMy} = $globalStore
 
@@ -276,6 +277,7 @@
       return true;
   }
   onMounted(() => {
+      nameCorrect();
       console.log(props.id);
       submitData.relId = route?.query?.id;
       submitData.lawEnforcementIncidentText = route?.query?.lawEnforcementItemText;
@@ -287,7 +289,8 @@
         submitData.problemDescription = success.data.problemDescription;
         submitData.lawEnforcementIncidentText = success.data.lawEnforcementIncident;
         submitData.enterpriseAddress = success.data.enterpriseAddress;
-        submitData.linkman = success.data.linkman;
+        submitData.linkman = nameCorrect(success.data.linkman);
+        console.log(submitData.linkman)
         submitData.linkmanTel = success.data.linkmanTel;
         submitData.bureauDeptName = success.data.bureauDeptName;
         // 判断是否入企不扫码
diff --git a/src/views/enterprise/complaintNoScan.vue b/src/views/enterprise/complaintNoScan.vue
index cd4d6ce..35b4dbd 100644
--- a/src/views/enterprise/complaintNoScan.vue
+++ b/src/views/enterprise/complaintNoScan.vue
@@ -64,6 +64,8 @@
                             <van-date-picker
                                     type="time"
                                     v-model="data.currentDate"
+                                    :min-date="addDate()"
+                                    :max-date="new Date()"
                                     @confirm="onConfirm"
                                     @cancel="data.showTimePicker = false"
                             />
@@ -170,6 +172,7 @@
     import {uploadFile} from '../../util/fileUpload'
     import {reactive, ref,defineProps} from "vue";
     import DeptPopup from '@/views/enterprise/compaint/selectDeptFilter.vue';
+    import {formattedTimeYYYYmmdd} from "@/util/util";
 
     const {useCommon, useMy} = $globalStore;
     const props = defineProps({
@@ -233,6 +236,7 @@
     })
 
 
+
 // 返回
     const goBack = () => {
       // router.go(-1);
@@ -312,8 +316,37 @@
     const selectTime = () =>{
       data.showTimePicker = true;
     }
+    //五个自然工作日内最小值日期
+    const addDate=()=>{
+        //()mm都从0开始取
+        let nowdate=new Date();
+        let yy=nowdate.getFullYear();
+        let mm=nowdate.getMonth()+1;
+        let dd=nowdate.getDate();
+        console.log(nowdate,yy,mm,dd)
+        if(dd>5){
+            console.log(yy,mm,dd-5);
+           return new Date(yy,mm-1,dd-4);
+        }else{
+            if(mm==1){
+                return new Date(yy-1,11,30+dd-4);
+            }else{
+                if(mm-1==2){
+                dd=(yy%4==0?29:28)+dd-4;
+                return new Date(yy,mm-2,dd)
+            }else if(mm-1==4||mm-1==6||mm-1==9||mm-1==11){
+                dd=30+dd-5;
+                return new Date(yy,mm-2,dd);
+            }else{
+                dd=31+dd-5;
+                return new Date(yy,mm-2,dd);
+            } 
+            }
+        } 
 
 
+    }
+
     const selectCh = (val) => {
         submitData.authorization = val;
         if (val == 0) {
@@ -394,6 +427,7 @@
     const closePopup = () =>{
         data.popupVisible = false;
     }
+
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/enterprise/register.vue b/src/views/enterprise/register.vue
index 0531cb3..b5b3ac6 100644
--- a/src/views/enterprise/register.vue
+++ b/src/views/enterprise/register.vue
@@ -136,7 +136,7 @@
 </template>
 
 <script setup name="register">
-
+import {nameCorrect} from'@/util/fileUpload'
 import { showSuccessToast } from 'vant';
 import 'vant/es/toast/style';
 import {addEnterpriseInformation} from '../../api/enterprise'
@@ -285,7 +285,7 @@ const reciveData = (item) =>{
     console.log(item.establishmentTime);
     submitData.enterpriseName = item.enterpriseName;
     submitData.enterpriseNumber = item.enterpriseNumber;
-    submitData.legalPerson = item.legalPerson;
+    submitData.legalPerson = nameCorrect(item.legalPerson);
     submitData.enterpriseType = item.enterpriseType;
     submitData.enterpriseAddress = item.enterpriseAddress;
     submitData.registeredCapital = item.registeredCapital;
diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue
index 5d242b7..6ab4272 100644
--- a/src/views/enterprise/registrationDetail.vue
+++ b/src/views/enterprise/registrationDetail.vue
@@ -219,6 +219,7 @@ import { reactive, ref,nextTick } from "vue";
 import {uploadFile} from "../../util/fileUpload";
 import {getDict} from "../../api/Home";
 import {queryLinkageById} from "../../api/linkage";
+import {nameCorrect} from'../../util/fileUpload'
 //用户筛选弹窗
 // import Popup from './userFilter.vue';
 
@@ -355,7 +356,7 @@ const onChange = (newIndex) => {
 //初始化参数，获取扫码的企业统一信用编码
 onMounted(() =>{
  
-
+    nameCorrect();
     //查询执法登记信息
     queryEnforcementRegistrationById(route?.query?.id,success =>{
         submitData.enterpriseName = success.data.enterpriseName;
@@ -371,7 +372,7 @@ onMounted(() =>{
         // submitData.lawEnforcementBasis = success.data.lawEnforcementBasis;
         // submitData.lawEnforcementBasisText = success.data.lawEnforcementBasisText;
         // submitData.lawEnforcerIdTwo = success.data.lawEnforcerIdTwo;
-        submitData.lawEnforcer = success.data.lawEnforcer;
+        submitData.lawEnforcer = nameCorrect(success.data.lawEnforcer);
         submitData.remark = success.data.remark;
         submitData.enforce = success.data.enforce;
         // 执法领域
@@ -421,7 +422,7 @@ onMounted(() =>{
             var lawEnforcer2Show = lawEnforcer2ShowStr.split(',');
             data.lawCer = [];
             for (var i = 0; i < tmpEnforceId.length; i++) {
-                data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]});
+                data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: nameCorrect(lawEnforcer2Show[i])});
             }
         }
 
diff --git a/src/views/enterprise/registrationEdit.vue b/src/views/enterprise/registrationEdit.vue
index 6c1b925..80a66c7 100644
--- a/src/views/enterprise/registrationEdit.vue
+++ b/src/views/enterprise/registrationEdit.vue
@@ -234,7 +234,7 @@
                   <div class="add-inspect" v-if="data.checked">
                     <p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p>
                     <p v-for="(item, index) in submitData.userObjs" :key="index">
-                      <span class="add-dept">{{item.deptName}}</span><span class="add-name">{{item.userName}}</span>
+                      <span class="add-dept">{{item.deptName}}</span><span class="add-name">{{nameCorrect(item.userName)}}</span>
                     </p>
                     <div class="addbtn" @click.stop="data.deptChecked=true"><van-icon name="add-o" /></div>
                   </div>
@@ -310,7 +310,7 @@
     import {addEnforcementRegistration, editEnforcementRegistration, getRegByUserIdAndZero, getByUserIdAndEnterpriseNumber, queryUserInfo} from '../../api/enforce'
     import {getEnterpriseInformation} from '../../api/enterprise'
     import { reactive, ref } from "vue";
-    import {uploadFile} from "../../util/fileUpload";
+    import {nameCorrect, uploadFile} from "../../util/fileUpload";
     import {formattedTime} from "@/util/util";
     import Compressor from 'compressorjs'
     //用户筛选弹窗
@@ -515,7 +515,7 @@
         queryUserInfo(useCommon.userId,success =>{
             if (null != success.data) {
                 submitData.lawEnforcer = success.data.userName
-                submitData.lawCertificateNumText = success.data.userName + " " + success.data.lawCertificateNum
+                submitData.lawCertificateNumText = nameCorrect(success.data.userName + " " + success.data.lawCertificateNum)
                 // submitData.lawCertificateNumText = success.data.userName
                 submitData.lawEnforcerId = success.data.userId
                 submitData.lawEnforcement = success.data.dept.deptName;
@@ -645,7 +645,7 @@
                     var lawEnforcer2Show = lawEnforcer2ShowStr.split(',');
                     data.lawCer = [];
                     for (var i = 0; i < tmpEnforceId.length; i++) {
-                        data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]});
+                        data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: nameCorrect(lawEnforcer2Show[i])});
                     }
                 }
 
@@ -850,7 +850,7 @@
     const reciveData = (item) =>{
         data.lawCer[data.lawCerFlag].id = item.userId;
         data.lawCer[data.lawCerFlag].text = item.userName;
-        data.lawCer[data.lawCerFlag].show = item.userName + " " + item.lawCertificateNum;
+        data.lawCer[data.lawCerFlag].show = nameCorrect(item.userName + " " + item.lawCertificateNum);
 
         // submitData.lawEnforcerTwo = item.userName;
         // submitData.lawCertificateNumTwoText = item.userName + " " + item.lawCertificateNum
diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue
index a2529ee..13e2d93 100644
--- a/src/views/enterprise/registrationList.vue
+++ b/src/views/enterprise/registrationList.vue
@@ -100,8 +100,8 @@
                                         <p>
                                           <label class="card_box_label">执法人员：</label>
                                         <div>
-                                          <div>{{ item.lawEnforcer }}</div>
-                                          <div v-for="(item, index) in item.lawEnforcer2List">{{ item }}</div>
+                                          <div>{{ nameCorrect(item.lawEnforcer) }}</div>
+                                          <div v-for="(item, index) in item.lawEnforcer2List">{{ nameCorrect(item)}}</div>
                                         </div>
                                         </p>
                                       </div>
@@ -141,6 +141,7 @@
     import {queryEnterpriseList} from '@/api/enterprise';
     import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage";
     import {setGoodsNum} from "@/util/util";
+    import {nameCorrect} from'@/util/fileUpload';
 
     const {useCommon, useShopCard} = $globalStore;
 
@@ -189,6 +190,7 @@
         finished: false,
         refreshing: false,
         curPage: 1,
+        name:""
     });
 
     // 设置初始值为当前时间
@@ -201,6 +203,7 @@
         //     getLinkageByParentIdToItem(success.id)
         // }, error => {
         // });
+        nameCorrect();
     });
     const getLinkageByParentIdToItem = (parentId) => {
         // 查询检查要求字典信息