From 73d5cd83a497e540f7622b695f31de31e2de2833 Mon Sep 17 00:00:00 2001
From: shil <452061493@qq.com>
Date: Sun, 28 Sep 2025 18:27:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=96=87=E5=AD=97=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9,=20=E9=9D=9E=E6=B7=B1=E5=9C=B3=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/enterprise.js                       |  3 +
 src/views/enforce/comprehensiveAnalysis.vue | 13 ++-
 src/views/enforce/noScanFilter.vue          |  2 +-
 src/views/enforce/outsideRegister.vue       | 93 +++++++++++++--------
 src/views/enforce/sign.vue                  | 30 +------
 src/views/enforceHome.vue                   | 12 ++-
 src/views/enterprise/companyFilter.vue      |  2 +-
 src/views/enterprise/registrationEdit.vue   | 19 +++--
 src/views/non-law/noScanFilter.vue          |  4 +-
 9 files changed, 100 insertions(+), 78 deletions(-)

diff --git a/src/api/enterprise.js b/src/api/enterprise.js
index f09336c..3fcd3ba 100644
--- a/src/api/enterprise.js
+++ b/src/api/enterprise.js
@@ -3,6 +3,9 @@ import { _get, _post,_form,_delete } from "../http/index";
 //企业信息登记
 export const addEnterpriseInformation = (params, success, error)  => _post("/app/enterpriseInformation/add", params, success, error);
 
+//查询企业信息
+export const searchEnterpriseByNumber = (enterpriseNumber, success, error)  => _get("/app/enterpriseInformation/searchEnterpriseByNumber/"+enterpriseNumber, null, success, error);
+
 //查询企业二维码
 export const queryEnterpriseInformationQrCode = (enterpriseNumber, success, error) => _get("/app/enterpriseInformation/getQrCode/"+enterpriseNumber,null,success,error)
 
diff --git a/src/views/enforce/comprehensiveAnalysis.vue b/src/views/enforce/comprehensiveAnalysis.vue
index 430309a..beadc5d 100644
--- a/src/views/enforce/comprehensiveAnalysis.vue
+++ b/src/views/enforce/comprehensiveAnalysis.vue
@@ -77,9 +77,12 @@
           <span class="item_sub">
             <label>执法预告</label>
             <b>{{data.whole.noticeTotal}}</b> </span>
-          <span class="item_sub">
+          <span class="item_sub" v-if="data.ontabClass1">
+            <label>委托执法</label>
+            <b> - </b> </span>
+          <span class="item_sub" v-if="data.ontabClass2">
             <label>委托执法</label>
-            <b>526</b> </span>
+            <b>{{data.whole.authTotal}}</b> </span>
           <span class="item_sub">
             <label>评价</label>
             <b>{{data.whole.evaluateTotal}}</b> </span>
@@ -181,6 +184,7 @@ const data = reactive({
     huanPercentage: 0,
     huanPercentageStr: "-",
     uniteTotal: 0,
+    authTotal: 0,
     evaluateTotal: 0,
     complaintTotal: 0,
     lawEnforceCategoryList:[],
@@ -231,6 +235,11 @@ const getWhole = () => {
       } else {
         data.whole.uniteTotal = success.uniteTotal;
       }
+      if (success.authTotal == null || success.authTotal == 0) {
+        data.whole.authTotal = "-";
+      } else {
+        data.whole.authTotal = success.authTotal;
+      }
       if (success.noticeTotal == null || success.noticeTotal == 0) {
         data.whole.noticeTotal = "-";
       } else {
diff --git a/src/views/enforce/noScanFilter.vue b/src/views/enforce/noScanFilter.vue
index 0716c96..9c6bf87 100644
--- a/src/views/enforce/noScanFilter.vue
+++ b/src/views/enforce/noScanFilter.vue
@@ -453,7 +453,7 @@ const props = defineProps( {
     align-items: center;
     margin: -4% 0 0 8%;
     padding: 0.15rem 0.35rem;
-    width: 3.85rem;
+    width: 3.25rem;
     background-color: #fff;
     border-radius: 0.25rem;
     box-shadow: 0 0 0.15rem #dee9e9;
diff --git a/src/views/enforce/outsideRegister.vue b/src/views/enforce/outsideRegister.vue
index 78b5f06..f1321a0 100644
--- a/src/views/enforce/outsideRegister.vue
+++ b/src/views/enforce/outsideRegister.vue
@@ -13,7 +13,7 @@
     -->
 		<!-- 中间 -->
 		<div class="warp_body">
-      <van-form @failed="onFailed" @submit="submit">
+      <van-form @failed="onFailed" ref="formRef">
 			<van-cell-group>
         <van-field
             v-model="submitData.enterpriseName"
@@ -23,13 +23,17 @@
             :rules="[{ required: true, message: '必填项' }]"
           />
           <Popup :visible="popupVisible" :content="popupContent" @close="closePopup"  @reciveData="reciveData" />
-        <van-field class="mult-line"
+        <van-field
           v-model="submitData.enterpriseNumber"
           required
           label="统一社会信用代码"
           placeholder="必填 统一社会信用代码"
           :rules="[{ required: true, message: '必填项' }]"
-        />
+        >
+        <!-- <template #right-icon>
+          <van-icon name="search" @click="onHelpClick"/>
+        </template> -->
+      </van-field>
         <van-field
           v-model="submitData.legalPerson"
           label="法定代表人"
@@ -50,6 +54,8 @@
           label="企业类型"
           placeholder="选填 企业类型"
           readonly
+          required
+          :rules="[{ required: true, message: '必填项' }]"
           clickable
           is-link
           @click="selectType"
@@ -66,15 +72,18 @@
         <van-field
           v-model="submitData.registeredCapital"
           label="注册资本"
-          placeholder="选填 注册资本"
-          readonly
+          placeholder="注册资本"
+          required
+          :rules="[{ required: true, message: '必填项' }]"
         />
         <van-field
           v-model="submitData.establishmentTime"
           label="成立日期"
-          placeholder="选填 成立日期"
+          placeholder="成立日期"
           is-link
           readonly
+          required
+          :rules="[{ required: true, message: '必填项' }]"
           @click="selectDate"
         />
         <van-popup v-model:show="data.showDatePicker" position="bottom">
@@ -111,11 +120,13 @@
       </van-popup>
 
 
-                <van-field
-                    v-model="submitData.enterpriseAddress"
-                    label="注册地址"
-                    placeholder="选填 注册地址"
-                />
+      <van-field
+          v-model="submitData.enterpriseAddress"
+          label="注册地址"
+          required
+          :rules="[{ required: true, message: '必填项' }]"
+          placeholder="注册地址"
+      />
               <!--<div class="fold-div"><label>注册地址</label>
                 <van-text-ellipsis :content="submitData.enterpriseAddress" rows="2" autosize expand-text="展开" collapse-text="收起" />
               </div>-->
@@ -138,7 +149,7 @@
         <van-action-bar-button text="提交"  @click="submit()" />
       </van-action-bar>-->
           <van-action-bar>
-            <van-button round block type="info" native-type="cancel" @click="closePage">取消</van-button>
+            <van-button round block type="info" native-type="cancel" @click="backPage">取消</van-button>
             <van-button round block type="info" native-type="submit" @click="submit()">保存</van-button>
           </van-action-bar>
 		</div>
@@ -149,7 +160,7 @@
 import {nameCorrect} from'@/util/fileUpload'
 import { showSuccessToast } from 'vant';
 import 'vant/es/toast/style';
-import {addEnterpriseInformation} from '../../api/enterprise'
+import {addEnterpriseInformation, searchEnterpriseByNumber} from '../../api/enterprise'
 import {getDict} from '../../api/Home'
 import { reactive, ref } from "vue";
 const { useMy,useCommon } = $globalStore
@@ -197,34 +208,50 @@ const submitData = reactive({
 const goBack = () => {
 	router.go(-1);
 };
-
+const formRef = ref(null)
 const submit = () =>{
   console.log(submitData);
-  addEnterpriseInformation(submitData,success =>{
-    //重新设置本地存储
-    useCommon.SET_USER_ENTERPRISE_NUMBER(submitData.enterpriseNumber);
-    console.log(success)
-    //跳转企业二维码地址
-    if(success.success){
-      console.log("登记成功");
-      showSuccessToast('登记成功');
-      router.push(
-        { 
-          path: "/enterprise/qrCode",
-          query: {
-            enterpriseNumber: submitData.enterpriseNumber,
-            } 
-      });
-    }
-  },error=>{
-      console.log("登记失败")
-  })
+  formRef.value.validate().then(() => {
+    addEnterpriseInformation(submitData,success =>{
+      //重新设置本地存储
+      useCommon.SET_USER_ENTERPRISE_NUMBER(submitData.enterpriseNumber);
+      console.log(success)
+      //跳转企业二维码地址
+      if(success.success){
+        console.log("登记成功");
+        showSuccessToast('登记成功');
+        router.push(
+          { 
+            path: "/enterprise/qrCode",
+            query: {
+              enterpriseNumber: submitData.enterpriseNumber,
+              } 
+        });
+      }
+    },error=>{console.log("登记失败")})
+  }).catch((errors) => {
+      data.overlayShow = false;    // 遮罩层
+  });
 }
 // 保存地址操作
 const onSave = () => {
 	router.replace({ name: "addressList" });
 };
 
+const onHelpClick = () => {
+  searchEnterpriseByNumber(submitData.enterpriseNumber,success =>{
+    console.log(success)
+    if(success.success && success.data){
+        console.log("查询成功");
+        reciveData(success.data);
+    }else{
+        showSuccessToast('未查询到相关企业信息，请手动填写');
+    }
+  },error=>{
+      console.log("查询失败")
+  })
+}
+
 const onConfirm = (value)=> {
       data.value = value;
       data.showPicker = false;
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index 4accdc6..fd65ff0 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -168,6 +168,7 @@
                         <!-- <van-switch v-model="data.union_checked" @click="!data.union_checked"/> -->
                     </template>
                   </van-cell>
+                  <div v-show="data.union_checked == '' && data.tmp_is_save" style="text-align: right; padding-right: 66px;" class="van-field__error-message">请选择一个选项</div>
 
                   <div class="add-inspect" v-if="data.union_checked==1">
                     <div v-for="(item, index) in data.union_datas" :key="index" ref="radio_fales" @click="check_radio(Object.values(item)[0].unionNo, index)" class="item-inspect">
@@ -179,7 +180,7 @@
                     <div class="item-inspect" @click="check_radio(null, null)">
                         <van-icon :name="data.allNo" />
                       <div class="dept-inspect no-inspect">
-                        <p>开启新的联合执法</p>
+                        <p>创建新的联合执法</p>
                       </div>
                     </div>
                   </div>
@@ -192,6 +193,7 @@
                         </van-radio-group>
                     </template>
                   </van-cell>
+                  <div v-show="data.auth_checked == '' && data.tmp_is_save" style="text-align: right; padding-right: 66px;" class="van-field__error-message">请选择一个选项</div>
                     <div class="tip-txt">本次执法是否为受委托事项</div>
                   <view v-if="data.auth_checked=='1'">
                     <van-field
@@ -215,7 +217,7 @@
                     <div class="addbtn" @click.stop="data.deptChecked=true"><van-icon name="add-o" /></div>
                   </div>
 
-                    <van-divider class="divdsty"/>
+<!--                    <van-divider class="divdsty"/>-->
 
                     <div class="file-upload">
                         <div class="file-upload-center">
@@ -1527,28 +1529,4 @@
       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;
-    }
 </style>
diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue
index 2e04074..a685090 100644
--- a/src/views/enforceHome.vue
+++ b/src/views/enforceHome.vue
@@ -269,13 +269,11 @@
         isLoading.value = useCommon.firstLoad;
         // 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_ORG_ID(success.data.bureauDept.deptId);
-            // useCommon.SET_HAS_LAW(true);
-            console.log('-----------------------------> login: ', useCommon.orgId)
+            // 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);
             // if (useCommon.firstLoad) {
                 isLoading.value = false;
             // }
diff --git a/src/views/enterprise/companyFilter.vue b/src/views/enterprise/companyFilter.vue
index f459572..5344896 100644
--- a/src/views/enterprise/companyFilter.vue
+++ b/src/views/enterprise/companyFilter.vue
@@ -376,7 +376,7 @@
         align-items: center;
         margin: -4% 0 0 8%;
         padding: 0.15rem 0.35rem;
-        width: 3.85rem;
+        width: 3.25rem;
         background-color: #fff;
         border-radius: 0.25rem;
         box-shadow: 0 0 0.15rem #dee9e9;
diff --git a/src/views/enterprise/registrationEdit.vue b/src/views/enterprise/registrationEdit.vue
index 1534e6f..e716dcd 100644
--- a/src/views/enterprise/registrationEdit.vue
+++ b/src/views/enterprise/registrationEdit.vue
@@ -254,6 +254,7 @@
                         <!-- <van-switch v-model="data.union_checked" @click="!data.union_checked"/> -->
                     </template>
                   </van-cell>
+                  <div v-show="data.union_checked == '' && data.tmp_is_save" style="text-align: right; padding-right: 66px;" class="van-field__error-message">请选择一个选项</div>
 
                   <div class="add-inspect" v-show="data.union_checked==1">
                     <div v-for="(item, index) in data.union_datas" :key="index" ref="radio_fales" @click="check_radio(Object.values(item)[0].unionNo, index)" class="item-inspect">
@@ -265,12 +266,12 @@
                     <div class="item-inspect" @click="check_radio(null, null)">
                         <van-icon :name="data.allNo" />
                       <div class="dept-inspect no-inspect">
-                        <p>开启新的联合执法</p>
+                        <p>创建新的联合执法</p>
                       </div>
                     </div>
                   </div>
                   <van-divider class="divdsty" />
-                  <van-cell center title="受委托执法">
+                  <van-cell center title="受委托执法" required>
                     <template #right-icon>
                       <van-radio-group v-model="data.auth_checked" shape="square" direction="horizontal">
                             <van-radio name="0">否</van-radio>
@@ -278,6 +279,7 @@
                       </van-radio-group>
                     </template>
                   </van-cell>
+                  <div v-show="data.auth_checked == '' && data.tmp_is_save" style="text-align: right; padding-right: 66px;" class="van-field__error-message">请选择一个选项</div>
                   <view v-if="data.auth_checked=='1'">
                     <van-field
                             v-model="submitData.entrustDeptName"
@@ -451,12 +453,13 @@ import {showFailToast, showSuccessToast} from 'vant';
         //vant组件上传照片列表
         fileListObj:[],
         allNo: 'circle',
-        union_checked: '0',   // 联合执法选择
-        auth_checked: '0',   // 委托执法选择
+        union_checked: '',   // 联合执法选择
+        auth_checked: '',   // 委托执法选择
         union_datas: [],    // 联合执法用的分组list
         check_union_no: '',     // 选中的联合执法编号
         radio_flag: 'circle',    // 联合执法单选按钮的选择标识
         checkCss: '0',
+        tmp_is_save: false,  // 临时判断是否发生点击
         showTimePicker: false,
         currentDate: [],
         showBl: false,
@@ -1038,10 +1041,12 @@ import {showFailToast, showSuccessToast} from 'vant';
         if (data.lawCertificateNumText.length <= 0
             || submitData.bureauDeptName.length <= 0
             // || submitData.lawFieldText.length <= 0
+            || data.union_checked == '' || data.auth_checked == ''
             || submitData.checkCategoryText.length <= 0
             || data.lawCer[0].id.length <= 0
             ||submitData.lawEnforcementItemText.length <= 0) {
-          return null;
+                data.tmp_is_save = true;
+                return null;
         }
         data.overlayShow = true;    // 遮罩层
         submitData.userId = useCommon.userId;
@@ -1117,9 +1122,11 @@ import {showFailToast, showSuccessToast} from 'vant';
           || submitData.bureauDeptName.length <= 0
           // || submitData.lawFieldText.length <= 0
           || submitData.checkCategoryText.length <= 0
+          || data.union_checked == '' || data.auth_checked == ''
           || data.lawCer[0].id.length <= 0
           ||submitData.lawEnforcementItemText.length <= 0) {
-        return null;
+                data.tmp_is_save = true;
+                return null;
       }
       data.overlayShow = true;    // 遮罩层
       submitData.isSubmit = type;
diff --git a/src/views/non-law/noScanFilter.vue b/src/views/non-law/noScanFilter.vue
index 3e95400..407155a 100644
--- a/src/views/non-law/noScanFilter.vue
+++ b/src/views/non-law/noScanFilter.vue
@@ -46,7 +46,7 @@
             </div>
           </van-list>
         </van-pull-refresh>
-          <div class="link-box"><h5>非深圳市注册企业</h5><span @click="toRegister">市外注册企业信息录入<van-icon name="arrow" /></span></div>
+         <div class="link-box"><h5>非深圳市注册企业</h5><span @click="toRegister">市外注册企业信息录入<van-icon name="arrow" /></span></div>
       </div>
     </div>
   </div>
@@ -446,7 +446,7 @@ const toRegister = () => {
     align-items: center;
     margin: -4% 0 0 8%;
     padding: 0.15rem 0.35rem;
-    width: 3.85rem;
+    width: 3.25rem;
     background-color: #fff;
     border-radius: 0.25rem;
     box-shadow: 0 0 0.15rem #dee9e9;