From a908b04baa9f6c33ac913ccd65c2e57e9846b22d Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Wed, 15 May 2024 10:18:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=9312=E5=8F=B7?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  1 +
 src/views/Home.vue                            | 48 ++++++++----
 src/views/administrative/appointment.vue      |  1 +
 src/views/administrative/appointmentEdit.vue  |  1 +
 src/views/administrative/appointmentList.vue  |  8 +-
 src/views/common/analyse.vue                  |  6 ++
 src/views/common/pdfvVew.vue                  |  9 +--
 src/views/enforce/enforceNotice.vue           |  2 +-
 src/views/enforce/enforcementPlan.vue         | 28 ++++---
 src/views/enforce/enforcementPlanAdd.vue      |  3 +
 src/views/enforce/enterpriseBaseInfo.vue      | 34 ++++++--
 src/views/enforce/enterpriseScanPreview.vue   |  4 +-
 src/views/enforce/historyCheck.vue            | 51 ++++++------
 src/views/enforce/sign.vue                    | 38 ++++++---
 src/views/enterprise/complaint.vue            | 16 ++--
 src/views/enterprise/complaintNoScan.vue      |  5 +-
 .../enterprise/enterpriseInspectionDetail.vue | 77 ++++++++-----------
 .../enterprise/enterpriseInspectionList.vue   |  9 +--
 src/views/enterprise/qrCode.vue               |  4 -
 src/views/enterprise/register.vue             |  1 +
 src/views/enterprise/registrationEdit.vue     |  1 +
 src/views/enterprise/registrationList.vue     |  2 -
 src/views/login.vue                           |  4 +-
 23 files changed, 201 insertions(+), 152 deletions(-)

diff --git a/package.json b/package.json
index 75ff224..f2f176f 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "axios": "^1.6.7",
     "core-js": "^3.36.0",
     "crypto-js": "^4.2.0",
+    "date-fns": "^3.6.0",
     "echarts": "^5.5.0",
     "html2canvas": "^1.4.1",
     "jsonp": "^0.2.1",
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 21ea8b6..fc2d880 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -51,7 +51,9 @@
 import * as w6s from 'szient-js-sdk';
 import sha1 from 'crypto-js/sha1';
 import {getEnterpriseMerchantAuthorization,getSiqLoginAuth, getSiqLoginAuthTest} from '../api/Home';
-const { useCommon } = $globalStore;
+ import {showSuccessToast} from "vant";
+ import 'vant/es/toast/style';
+ const { useCommon } = $globalStore;
 const router = useRouter();
 const route = useRoute();
 let carouselList = reactive([]); // 轮播列表
@@ -84,7 +86,6 @@ const boutiqueGoods = async () => {
 };
 
 const toRegisterView = async() =>{
-  console.log(useCommon.enterpriseNumber);
   if(useCommon.enterpriseNumber == null || useCommon.enterpriseNumber == ""){
         router.push({ path: "/enterprise/register" });
       }else{
@@ -129,6 +130,16 @@ const generateRandomNumber =() =>{
       const randomNum = (Math.floor(Math.random() * (max - min + 1)) + min);
       return randomNum.toString().padStart(6, '0');
 }
+
+const getEnterpriseMerchant =(phoneNumber) => {
+	 getEnterpriseMerchantAuthorization({merchantTel: phoneNumber},success =>{
+		 if(!(success.data == null && success.data.length == 0)){
+			 useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);
+		 }
+	 },error =>{
+	 })
+ }
+
 onMounted(() => {
   // console.log(useCommon.phonenumber)
   // useCommon.SET_USER_PHONENUMBER(success.data.phonenumber);
@@ -147,11 +158,12 @@ onMounted(() => {
   // 最终还需要转成全小写
   const signature = sha1(str).toString().toLowerCase();
 
-  // //深i企鉴权
-	getSiqLoginAuthTest({userId: "1608644307579883522", userName: "汪鑫"},success =>{
-		console.log(success.data)
-		useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
-	},error =>{})
+  // //深i企鉴权测试
+	// getSiqLoginAuthTest({userId: "1608644307579883522", userName: "汪鑫"},success =>{
+	// 	useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
+	// 	useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
+	// 	console.log("phone : "+useCommon.phonenumber);
+	// },error =>{})
 
   w6s.config({
     access_key: access_key,
@@ -175,11 +187,14 @@ onMounted(() => {
       success: function(res) {
         console.log(res)
         console.log("认证",res);
-        console.log(res.result.result.code)
+        console.log("code: "+res.result.result.code);
         getSiqLoginAuth({code: res.result.result.code},success =>{
-          console.log(success.data)
+			useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
+			useCommon.SET_USER_ID(success.data.userId);
+			useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
+			getEnterpriseMerchant(success.data.phonenumber.toString());
         },error =>{
-
+			console.log("error : "+ error)
         })
       },
       fail: function(err) {
@@ -189,12 +204,13 @@ onMounted(() => {
   });
 });
 
-  getEnterpriseMerchantAuthorization({merchantTel: useCommon.phonenumber},success =>{
-        if(!(success.data == null && success.data.length == 0)){
-          useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);
-        }
-      },error =>{
-   })
+  // getEnterpriseMerchantAuthorization({merchantTel: useCommon.phonenumber},success =>{
+  //       if(!(success.data == null && success.data.length == 0)){
+  //       	console.log("success.data[0].enterpriseNumber :" + success.data[0].enterpriseNumber)
+  //         useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);
+  //       }
+  //     },error =>{
+  //  })
 });
 </script>
 
diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index 863d4c7..c5200dc 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -137,6 +137,7 @@
 <script setup name="register">
 
 import { showSuccessToast } from 'vant';
+import 'vant/es/toast/style';
 import {getByUserIdAndZero, addEnterpriseLawEnforcement, editEnterpriseLawEnforcement} from '../../api/administrative'
 import {queryUserInfo} from '../../api/enforce'
 import { queryEnterpriseInfoList } from '../../api/enterprise'
diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue
index 9a40228..12998c0 100644
--- a/src/views/administrative/appointmentEdit.vue
+++ b/src/views/administrative/appointmentEdit.vue
@@ -137,6 +137,7 @@
 <script setup name="register">
 
     import { showSuccessToast } from 'vant';
+    import 'vant/es/toast/style';
     import {getByUserIdAndZero, addEnterpriseLawEnforcement, editEnterpriseLawEnforcement, getByIdToDataFillIn} from '../../api/administrative'
     import {queryUserInfo} from '../../api/enforce'
     import { queryEnterpriseInfoList } from '../../api/enterprise'
diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue
index 70c062e..749bc06 100644
--- a/src/views/administrative/appointmentList.vue
+++ b/src/views/administrative/appointmentList.vue
@@ -5,7 +5,7 @@
 		<div class="header_body">
 			<header-nav :leftArrow="false" titelText="行政检查预约" />
 		</div>
-		<van-search v-model="searchParam.searchValue" show-action placeholder="执法事项/登记号/执法部门/企业名称" @search="onSearch">
+		<van-search v-model="searchParam.searchValue" show-action placeholder="执法项/执法部门/企业名称" @search="onSearch">
 			<template #action>
 				<div  @click="onClickButton">搜索</div>
 			</template>
@@ -15,6 +15,7 @@
 			<van-button plain hairline class="search-button" @click="searchDateType(1)" round type="primary" size="mini">本月</van-button>
 			<van-button plain hairline class="search-button" @click="searchDateType(2)" round type="primary" size="mini">本季</van-button>
 			<van-button plain hairline class="search-button" @click="searchDateType(3)" round type="primary" size="mini">本年</van-button>
+			<van-button plain hairline class="search-button" @click="selectDate" round type="primary" size="mini">筛选</van-button>
 		</div>
 		<div class="search-button-date">
 			<span class="date-select" @click="selectDate">{{  data.dateSearch }}</span>
@@ -113,8 +114,7 @@
 		isComplaint: null,
 		//企业统一信用码 ref(useCommon.enterpriseNumber)
 		enterpriseNumber: "",
-    	// lawEnforcerId: ref(useCommon.userId),
-		lawEnforcerId: "1731",
+    	lawEnforcerId: ref(useCommon.userId),
     //日期搜索
     searchDate: ref(),
 	});
@@ -135,8 +135,6 @@
 	onMounted(() => {
 		// getCard();
 		// searchParam.enterpriseNumber = useCommon.enterpriseNumber;
-    	searchParam.lawEnforcerId = useCommon.userId;
-    	searchParam.lawEnforcerId = "1731";
 		// 查询检查要求字典信息
 		// getDict({"dictType": "checkRequire"}, success => {
 		// 	for(var i=0; i<success.data.length; i++) {
diff --git a/src/views/common/analyse.vue b/src/views/common/analyse.vue
index 0228318..7039495 100644
--- a/src/views/common/analyse.vue
+++ b/src/views/common/analyse.vue
@@ -42,6 +42,7 @@
 
 <script setup name="addressEdit">
 
+import { onBeforeUnmount } from 'vue';
 import util from "@/util/area";
 import {queryStatisticalData} from '@/api/enforce';
 import * as echarts from 'echarts';
@@ -64,6 +65,11 @@ const goBack = () => {
 	router.go(-1);
 };
 
+onBeforeUnmount(() => {
+    // 当前路由不是首页，且用户确认离开时
+    router.replace('/enforceHome'); // 替换到首页
+});
+
 // 保存地址操作
 const onSave = () => {
 	router.replace({ name: "addressList" });
diff --git a/src/views/common/pdfvVew.vue b/src/views/common/pdfvVew.vue
index f11264a..d803ede 100644
--- a/src/views/common/pdfvVew.vue
+++ b/src/views/common/pdfvVew.vue
@@ -47,12 +47,11 @@ export default {
         console.log("状态:" + status + "，信息:" + msg + "，耗时:" + time + "毫秒");
       });
     },
+      // 返回
+      goBack(){
+          this.$router.go(-1)
+      }
   },
-  // 返回
- goBack(){
-  console.log(11111)
-	this.$router.go(-1)
-}
 };
 </script>
 <style scoped>
diff --git a/src/views/enforce/enforceNotice.vue b/src/views/enforce/enforceNotice.vue
index c4d12ff..296b444 100644
--- a/src/views/enforce/enforceNotice.vue
+++ b/src/views/enforce/enforceNotice.vue
@@ -31,7 +31,7 @@
          <div class="item-cont">
            <span class="item-title">{{ item.enforcementDepartment }}</span>
            <span class="item-time">{{ item.createTime }}</span>
-           <div class="item-text" @click="toPdfView(item.fileObject.fileUrl)"><a style="color: green; ">{{ item.fileObject.fileName }}</a></div>
+           <div class="item-text" @click="toPdfView(null==item.fileObject?'':item.fileObject.fileUrl)"><a style="color: green; ">{{ null==item.fileObject?'':item.fileObject.fileName }}</a></div>
          </div>
        </div>
 
diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue
index a8007cd..c21757d 100644
--- a/src/views/enforce/enforcementPlan.vue
+++ b/src/views/enforce/enforcementPlan.vue
@@ -49,7 +49,8 @@
 				<refresh-list v-model:freshMap="freshMap" @refresh="onRefresh" @onLoad="onLoad"
 						:resetScroll="resetScroll" class="refresh_box">
 					<div class="refresh_content" v-if="data?.dataList.length">
-						<div class="goods_box" v-for="(item, index) in data?.dataList" :key="index" @click="toPdfView(item.fileObject.fileUrl)">
+<!--						<div class="goods_box" v-for="(item, index) in data?.dataList" :key="index" @click="toPdfView(item.fileObject.fileUrl)">-->
+						<div class="goods_box" v-for="(item, index) in data?.dataList" :key="index" @click="toPdfView(null!=item.fileObject?item.fileObject.fileUrl:null)">
 							<van-swipe-cell class="swipe_cell">
 								<div class="card_box">
                   <div class="card_box_span">
@@ -92,6 +93,7 @@
 <script setup name="enforcementInspectionProgram">
 import {queryEnforcementInspectionProgramList} from "@/api/enforce";
 import { setGoodsNum } from "@/util/util";
+import { showFailToast } from 'vant';
 const { useCommon, useShopCard } = $globalStore;
 
 const router = useRouter();
@@ -102,7 +104,10 @@ let searchParam = reactive({
   //搜索框
   searchText: ref(''),
   //日期查询
-  searchDate: ref('')
+  searchDate: ref(''),
+    // 用户id
+    dataScopeId: useCommon.userId,
+    // dataScopeId: "1731",
 });
 
 const data = reactive({
@@ -156,14 +161,17 @@ const onClickButton = () =>{
 }
 
 const toPdfView = (url) =>{
-  console.log(url)
-  router.push(
-        { 
-          path: "/pdfView",
-          query: {
-            url: url
-            } 
-      });
+    if(null!=url) {
+        router.push(
+            {
+                path: "/pdfView",
+                query: {
+                    url: url
+                }
+            });
+    } else {
+        showFailToast("没有执行计划")
+    }
 }
 onActivated(() => {
 });
diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue
index 146b7cf..d08de2d 100644
--- a/src/views/enforce/enforcementPlanAdd.vue
+++ b/src/views/enforce/enforcementPlanAdd.vue
@@ -45,6 +45,7 @@
           placeholder="请选择"
           @click=""
           required
+          readonly
           :rules="[{ required: true, message: '请选择执法部门'}]"
         />
         <!-- <van-field
@@ -122,6 +123,8 @@ const data = reactive({
 });
 //保存参数
 const submitData = reactive({
+    //用户id
+    userId:useCommon.userId,
   //关联案件ID
   relId:"",
   //计划年度
diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue
index be46f7f..8c454e5 100644
--- a/src/views/enforce/enterpriseBaseInfo.vue
+++ b/src/views/enforce/enterpriseBaseInfo.vue
@@ -26,9 +26,13 @@
                   readonly
 					/>
 <!--					<van-field
-					        v-model="data.enterpriseInfo.enterpriseAddress"
-					        label="企业地址:"
-                  readonly
+							v-model="data.enterpriseInfo.enterpriseAddress"
+							label="企业地址:"
+							rows="2"
+							autosize
+							type="textarea"
+							show-word-limit
+							readonly
 					/>-->
 
           <van-field
@@ -41,6 +45,11 @@
 					        label="法人代表:"
                   readonly
 					/>
+<!--					<van-field-->
+<!--					        v-model="data.enterpriseInfo.enterpriseAddress"-->
+<!--					        label="企业地址:"-->
+<!--                  readonly-->
+<!--					/>-->
 					<van-field
 					        v-model="data.enterpriseInfo.registeredCapital"
 					        label="注册资本(元):"
@@ -155,10 +164,12 @@
 <script setup name="register">
 
 import { showSuccessToast } from 'vant';
+import 'vant/es/toast/style';
 import {addEnforcementRegistration,queryUserInfo,queryRegistrationList} from '../../api/enforce'
 import {getEnterpriseInformation} from '../../api/enterprise'
 import {getDict} from '../../api/Home'
 import { reactive, ref } from "vue";
+import { format } from 'date-fns';
 import {uploadFile} from "../../util/fileUpload";
 //用户筛选弹窗
 import Popup from './userFilter.vue';
@@ -193,6 +204,13 @@ const data = reactive({
     popupContent2: '',
 });
 
+const props = defineProps({
+	enterpriseNumber: {
+		type: String,
+		default: "",
+	},
+});
+
 
 const searchDateType = (item) =>{
   if(item.selected === false){
@@ -218,15 +236,17 @@ const queryList = () =>{
 //初始化参数，获取扫码的企业统一信用编码
 onMounted(() =>{
 	//查询企业信息
-    getEnterpriseInformation(route?.query?.enterpriseNumber,success =>{
+    // getEnterpriseInformation(route?.query?.enterpriseNumber,success =>{
+    getEnterpriseInformation(props?.enterpriseNumber,success =>{
       if (null != success.data) {
           data.enterpriseInfo.enterpriseName = success.data.enterpriseName
           data.enterpriseInfo.enterpriseNumber = success.data.enterpriseNumber
-		  data.enterpriseInfo.enterpriseType = success.data.enterpriseType
+		  console.log(success.data.companyOrgType)
+		  data.enterpriseInfo.enterpriseType = success.data.companyOrgType
 		  data.enterpriseInfo.enterpriseAddress = success.data.enterpriseAddress
 		  data.enterpriseInfo.legalPerson = success.data.legalPerson 
-		  data.enterpriseInfo.registeredCapital = success.data.registeredCapital 
-		  data.enterpriseInfo.establishmentTime = success.data.establishmentTime 
+		  data.enterpriseInfo.registeredCapital = success.data.registeredCapital +' (人民币/元)'
+		  data.enterpriseInfo.establishmentTime = format(success.data.establishmentTime, 'yyyy-MM-dd');
 		  data.enterpriseInfo.operatingTerm = success.data.operatingTerm
 		  data.enterpriseInfo.businessScope = success.data.businessScope
 		  //查询企业类型
diff --git a/src/views/enforce/enterpriseScanPreview.vue b/src/views/enforce/enterpriseScanPreview.vue
index e917003..71f122e 100644
--- a/src/views/enforce/enterpriseScanPreview.vue
+++ b/src/views/enforce/enterpriseScanPreview.vue
@@ -27,7 +27,7 @@
         </ul>
       </div>
         <div v-if="data.TabId === 0">
-          <enterpriseBaseInfo></enterpriseBaseInfo>
+          <enterpriseBaseInfo :enterpriseNumber="data.enterpriseNumber"></enterpriseBaseInfo>
         </div>
         <div v-if="data.TabId === 1">
           <enterpriseWarningInfo></enterpriseWarningInfo>
@@ -57,7 +57,7 @@ let freshMap = reactive({
 	listFinished: false, // 是否加载完成标识
 });
 const data = reactive({
-	// enterpriseNumber:"a7cbb677c11e4dffa810b4ad3abedc09$eb020e1a24a8a19a0bdc07b191aa9ce7",
+	// enterpriseNumber:"1cc6f476adff430fafb1adde3395509b$42341cb9e4d5b7cf964ff752b2a96d41",
 	enterpriseNumber:route?.query?.enterpriseNumber,
 	warningInfo:{},
 	searchParam:{},
diff --git a/src/views/enforce/historyCheck.vue b/src/views/enforce/historyCheck.vue
index 12e6e05..bbf5ef5 100644
--- a/src/views/enforce/historyCheck.vue
+++ b/src/views/enforce/historyCheck.vue
@@ -6,7 +6,7 @@
 			<!-- <header-nav :slefBack="true" @goBack="goBack" :titelText="`行政检查信息查询`"/> -->
 			<header-nav :slefBack="true" @goBack="goBack" :titelText="`历史检查信息`"/>
 		</div>
-		<van-search v-model="searchParam.searchValue" show-action placeholder="执法事项/部门/人员" @search="onSearch">
+		<van-search v-model="searchParam.searchValue" show-action placeholder="执法事项/部门/人员/企业" @search="onSearch">
 			<template #action>
 				<div  @click="onClickButton">搜索</div>
 			</template>
@@ -16,6 +16,7 @@
 			<van-button plain hairline class="search-button" @click="searchDateType(1)" round type="primary" size="mini">本月</van-button>
 			<van-button plain hairline class="search-button" @click="searchDateType(2)" round type="primary" size="mini">本季</van-button>
 			<van-button plain hairline class="search-button" @click="searchDateType(3)" round type="primary" size="mini">本年</van-button>
+			<van-button plain hairline class="search-button" @click="selectDate" round type="primary" size="mini">筛选</van-button>
 		</div>
 		<div class="search-button-date">
 			<span class="date-select" @click="selectDate">{{  data.dateSearch }}</span>
@@ -45,7 +46,7 @@
 							<van-swipe-cell class="swipe_cell">
 								<div class="card_box" >
 									<div class="card_box_span">
-										<p>执法时间：{{ item.createTime }}
+										<p>执法时间：{{ item.enforcementTime }}
 											<span class="card_box_action" v-if="item.isSubmit == 0">
                      							<van-button @click="toEditView(item.id)" type="primary" size="mini">编辑</van-button>
                    						</span>
@@ -64,7 +65,7 @@
                         <p><span class="card_box_label">执法人员：</span> {{ item.lawEnforcer }} , {{ item.lawEnforcerTwo }}</p>
                       </div>
                       <div class="card_box_span">
-                      <p><span class="card_box_label">备注：</span> {{ item.remark }}</p>
+                      <p><span class="card_box_label">企业：</span> {{ item.enterpriseName }}</p>
                       </div>
                   </div>
 								</div>
@@ -107,7 +108,6 @@
 		//企业统一信用码
 		// enterpriseNumber: ref(useCommon.enterpriseNumber),
 		lawEnforcerId: ref(useCommon.userId),
-		enterpriseNumber: ref(useCommon.enterpriseNumber),
     //日期搜索
     dateSearch: ref(),
 	});
@@ -121,17 +121,15 @@
 		minDate: new Date(2020, 0, 1),
 		maxDate: new Date(2125, 5, 1),
 		columnsType :['year', 'month'],
-    ga_columns: [],
+    	ga_columns: [],
 	});
 
 	// 设置初始值为当前时间
 	onMounted(() => {
 		// getCard();
-		// searchParam.enterpriseNumber = useCommon.enterpriseNumber;
 		searchParam.lawEnforcerId = useCommon.userId;
 		queryList();
-		searchParam.enterpriseNumber = useCommon.enterpriseNumber;
-		
+
 		data.dateSearch = nowDate(new Date());
 
     // queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "100"}, success => {
@@ -152,17 +150,17 @@
 	const queryList = () =>{
 		queryRegistrationList(searchParam,success =>{
 			data.dataList = success.data;
-      for (var i=0; i<success.data.length; i++) {
-      // var itemTxt = success.data[i].lawEnforcementItem;
-      // console.log(itemTxt);
-			// 	for (var j=0; j<data.ga_columns.length; j++) {
-			// 		if (itemTxt == data.ga_columns[j].value) {
-			// 			success.data[i].lawEnforcementItem = data.ga_columns[j].text;
-			// 			break;
-			// 		}
-			// 	}
-      // setLinkageItem(success.data[i].lawEnforcementItem,success.data[i]);
-      }
+		  for (var i=0; i<success.data.length; i++) {
+		  // var itemTxt = success.data[i].lawEnforcementItem;
+		  // console.log(itemTxt);
+				// 	for (var j=0; j<data.ga_columns.length; j++) {
+				// 		if (itemTxt == data.ga_columns[j].value) {
+				// 			success.data[i].lawEnforcementItem = data.ga_columns[j].text;
+				// 			break;
+				// 		}
+				// 	}
+		  // setLinkageItem(success.data[i].lawEnforcementItem,success.data[i]);
+		  }
      
 			
 		},error =>{
@@ -264,22 +262,17 @@
 
 	const selectDate  = () =>{
 		data.showDatePicker = true;
-		console.log(data.showDatePicker)
 	}
 
 	const onDateConfirm = (value)=> {
-		console.log(value);
-		value.selectedValues.forEach((item,index) => {
-			console.log(item);
-		});
 		data.dateSearch = value.selectedValues[0] + "/" + value.selectedValues[1]
 		data.showDatePicker = false;
 
-    //日期搜索条件
-    searchParam.dateSearch = value.selectedValues[0] + "-" + value.selectedValues[1]
-    //取消投诉
-    searchParam.isComplaint = null,
-    queryList();
+		//日期搜索条件
+		searchParam.dateSearch = value.selectedValues[0] + "-" + value.selectedValues[1]
+		//取消投诉
+		searchParam.isComplaint = null,
+		queryList();
 	}
 	const nowDate = (time) => {
 		var year = time.getFullYear(); // 年
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index 4131b80..7688847 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -7,34 +7,42 @@
     <span class="tohome" @click="toEnforceHomeView"><i class="van-badge__wrapper van-icon van-icon-wap-home-o"></i></span>
 		<!-- 中间 -->
 		<div class="warp_body">
-            <van-form @failed="onFailed">
+            <van-form @failed="onFailed" ref="form">
                 <van-cell-group>
                     <div style="font-size:large" class="zf-name">执法信息</div>
                     <van-field
                       v-model="submitData.lawEnforcement"
                       label="执法部门"
                       readonly
+                      required
+                      :rules="[{ required: true, message: '请加载执法部门' }]"
                     />
                     <van-field
                       v-model="submitData.lawCertificateNumText"
                       label="执法人员"
                       readonly
+                      required
+                      :rules="[{ required: true, message: '请加载执法人员' }]"
                     />
                     <van-field
                       v-model="submitData.lawCertificateNumTwoText"
                       label="执法人员"
                       readonly
+                      required
                       placeholder="请选择"
                       right-icon="add-o"
                       @click="showPopup"
+                      :rules="[{ required: true, message: '请选择执法人员' }]"
                     />
                     <van-field
                       v-model="submitData.subsidiaryerText"
                       label="辅助人员"
                       readonly
+                      required
                       placeholder="请选择"
                       right-icon="add-o"
                       @click="showPopup2"
+                      :rules="[{ required: true, message: '请选择辅助人员' }]"
                     />
                     <van-field
                       v-model="submitData.enforcementTime"
@@ -158,6 +166,7 @@
 <script setup name="register">
 
 import { showSuccessToast } from 'vant';
+import 'vant/es/toast/style';
 import {addEnforcementRegistration, editEnforcementRegistration, getRegByUserIdAndZero, queryUserInfo} from '../../api/enforce'
 import {getEnterpriseInformation} from '../../api/enterprise'
 import { reactive, ref } from "vue";
@@ -174,6 +183,7 @@ const { useCommon,useMy } = $globalStore
 const router = useRouter();
 //路由参数
 const route = useRoute();
+const form = ref(null);
 let queryaddressId = ref("");
 const data = reactive({
     showLawEnforcerFlag:false,
@@ -282,6 +292,7 @@ const getLinkageByParentIdToGA = (parentId) => {
 //3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd
 //初始化参数，获取扫码的企业统一信用编码
 onMounted(() =>{
+    // 数据填充
     // dataFillIn();
 
     //查询企业信息
@@ -400,7 +411,7 @@ const dataFillIn = () => {
 
 const tmpSave = () => {
     showSuccessToast('临时保存');
-    console.log(submitData);
+    submitData.userId = useCommon.userId;
     addEnforcementRegistration(submitData,success =>{
         //跳转企业二维码地址
         if(success.success){
@@ -413,16 +424,19 @@ const tmpSave = () => {
 }
 
 const submit = (type) =>{
-  submitData.isSubmit = type;
-    editEnforcementRegistration(submitData,success =>{
-    //跳转首页
-    if(success.success){
-        showSuccessToast('登记成功');
-        router.push({ path: "/enforceHome" });
-    }
-  },error=>{
-      console.log("登记失败")
-  })
+    submitData.isSubmit = type;
+    submitData.userId = useCommon.userId;
+    form.value.validate().then(() => {
+        editEnforcementRegistration(submitData, success => {
+            //跳转首页
+            if (success.success) {
+                showSuccessToast('登记成功');
+                router.push({path: "/enforceHome"});
+            }
+        }, error => {
+            console.log("登记失败")
+        })
+    });
 }
 
 const showPopup = () =>{
diff --git a/src/views/enterprise/complaint.vue b/src/views/enterprise/complaint.vue
index 4878011..513e85c 100644
--- a/src/views/enterprise/complaint.vue
+++ b/src/views/enterprise/complaint.vue
@@ -60,11 +60,16 @@
           <div class="file-upload-center">
             <label>上传附件</label> <span>(不多于9张)</span>
           </div>
-          <van-uploader v-model="submitData.fileListObj"  class="file" :after-read="uploadFiles" multiple :max-size="500 * 1024" @oversize="onOversize" :before-delete="deleteFile">
-            <template #preview-cover="{ file }">
-              <div class="preview-cover van-ellipsis">{{ file.name }}</div>
-            </template>
-          </van-uploader>
+<!--          <van-uploader v-model="submitData.fileListObj"  class="file" :after-read="uploadFiles" multiple :max-size="500 * 1024" @oversize="onOversize" :before-delete="deleteFile">-->
+<!--            <template #preview-cover="{ file }">-->
+<!--              <div class="preview-cover van-ellipsis">{{ file.name }}</div>-->
+<!--            </template>-->
+<!--          </van-uploader>-->
+            <van-uploader v-model="submitData.fileListObj" accept="" class="file" multiple :max-size="500 * 1024" :after-read="uploadFiles" :before-delete="deleteFile">
+                <template #preview-cover="{ file }">
+                    <div class="preview-cover van-ellipsis">{{ file.name }}</div>
+                </template>
+            </van-uploader>
 
         </div>
         <van-divider class="divdsty" />
@@ -198,7 +203,6 @@ const uploadFiles = (file) =>{
     submitData.fileList.push(res.url)
     console.log(submitData.fileList);
   });
-  
 }
 const deleteFile = (file,index) =>{
   console.log(index);
diff --git a/src/views/enterprise/complaintNoScan.vue b/src/views/enterprise/complaintNoScan.vue
index a1876f5..e9189c8 100644
--- a/src/views/enterprise/complaintNoScan.vue
+++ b/src/views/enterprise/complaintNoScan.vue
@@ -94,7 +94,7 @@ import {addEnterpriseComplaint} from '../../api/enterprise'
 import {getDict} from '../../api/Home'
 import {uploadFile} from '../../util/fileUpload'
 import { reactive, ref } from "vue";
-const { useMy } = $globalStore
+const { useCommon, useMy } = $globalStore
 
 const router = useRouter();
 const route = useRoute();
@@ -108,6 +108,8 @@ const data = reactive({
 });
 //保存参数
 const submitData = reactive({
+    //用户id
+    userId:useCommon.userId,
   //关联案件ID
   relId:"",
   //案件名称
@@ -141,7 +143,6 @@ const goBack = () => {
 const submit = () =>{
   // console.log(submitData);
   showSuccessToast('投诉成功');
-  return
   addEnterpriseComplaint(submitData,success =>{
     
     console.log(success)
diff --git a/src/views/enterprise/enterpriseInspectionDetail.vue b/src/views/enterprise/enterpriseInspectionDetail.vue
index 875defa..7ab69fc 100644
--- a/src/views/enterprise/enterpriseInspectionDetail.vue
+++ b/src/views/enterprise/enterpriseInspectionDetail.vue
@@ -8,42 +8,36 @@
 		<div>
 <!--            <van-cell-group>-->
         <van-form @failed="onFailed" @submit="submit">
-<!--           <van-field-->
-<!--            v-model="submitData.lawEnforcementCode"-->
-<!--             label="登记编号"-->
-<!--             readonly-->
-<!--           />-->
-<!--            <van-field-->
-<!--              v-model="submitData.enterpriseName"-->
-<!--              label="企业名称"-->
-<!--              required-->
-<!--              readonly-->
-<!--              :rules="[{ required: true, message: '必填项' }]"-->
-<!--            />-->
-<!--            <van-field-->
-<!--              v-model="submitData.linkMan"-->
-<!--              label="企业联系人"-->
-<!--              readonly-->
-<!--            />-->
-<!--            <van-field-->
-<!--              v-model="submitData.linkTel"-->
-<!--              label="联系人电话"-->
-<!--              :rules="[{ validator, message: '请输入正确内容' }]"-->
-<!--              readonly-->
-<!--            />-->
+           <van-field
+            v-model="submitData.lawEnforcementCode"
+             label="登记编号"
+             readonly
+           />
+            <van-field
+              v-model="submitData.enterpriseName"
+              label="企业名称"
+              readonly
+            />
+            <van-field
+              v-model="submitData.linkMan"
+              label="企业联系人"
+              readonly
+            />
+            <van-field
+              v-model="submitData.linkTel"
+              label="联系人电话"
+              :rules="[{ validator, message: '请输入正确内容' }]"
+              readonly
+            />
             <van-field
               v-model="submitData.checkTime"
-              required
               readonly
               label="检查时间"
-              :rules="[{ required: true, message: '必填项' }]"
-              
+
             />
             <van-field
               v-model="submitData.checkItem"
-              required
               label="检查事项"
-              :rules="[{ required: true, message: '必填项' }]"
               type="textarea"
               rows="1"
               autosize
@@ -51,9 +45,7 @@
             />
             <van-field
               v-model="submitData.checkRequire"
-              required
               label="检查要求"
-              :rules="[{ required: true, message: '必填项' }]"
               type="textarea"
               rows="1"
               autosize
@@ -63,8 +55,7 @@
                 v-model="submitData.lawEnforcement"
                 readonly
                 label="执法部门"
-                :rules="[{ required: true, message: '必填项' }]"
-                
+
             />
             <van-field
                 v-model="submitData.lawEnforcer"
@@ -76,17 +67,17 @@
                 readonly
                 label="执法人员"
             />
-<!--            <van-field-->
-<!--              v-model="submitData.remark"-->
-<!--              label="备注"-->
-<!--              rows="2"-->
-<!--              autosize-->
-<!--              type="textarea"-->
-<!--              maxlength="50"-->
-<!--              placeholder="请输入备注"-->
-<!--              show-word-limit-->
-<!--              readonly-->
-<!--            />-->
+            <van-field
+              v-model="submitData.remark"
+              label="备注"
+              rows="2"
+              autosize
+              type="textarea"
+              maxlength="50"
+              placeholder="请输入备注"
+              show-word-limit
+              readonly
+            />
         </van-form>
 <!--          </van-cell-group>-->
         </div>
diff --git a/src/views/enterprise/enterpriseInspectionList.vue b/src/views/enterprise/enterpriseInspectionList.vue
index d6e22c3..e2753f4 100644
--- a/src/views/enterprise/enterpriseInspectionList.vue
+++ b/src/views/enterprise/enterpriseInspectionList.vue
@@ -8,7 +8,7 @@
     <van-search
     v-model="searchParam.searchValue"
     show-action
-    placeholder="请输入关键字查询"
+    placeholder="请输入(检查项/执法部门/企业名称)查询"
     @search="onSearch"
     >
       <template #action>
@@ -33,7 +33,8 @@
       <van-button plain hairline class="search-button" @click="searchDateType(1)" round type="primary" size="mini">本月</van-button>
       <van-button plain hairline class="search-button" @click="searchDateType(2)" round type="primary" size="mini">本季度</van-button>
       <van-button plain hairline class="search-button" @click="searchDateType(3)" round type="primary" size="mini">本年度</van-button>
-      <van-button plain hairline class="search-button" @click="searchFilter" round type="primary" size="mini">筛选</van-button>
+<!--      <van-button plain hairline class="search-button" @click="searchFilter" round type="primary" size="mini">筛选</van-button>-->
+      <van-button plain hairline class="search-button" @click="selectDate" round type="primary" size="mini">筛选</van-button>
     </div>
     <div class="search-button-date">
       <span class="date-select" @click="selectDate">{{  data.dateSearch }}</span>
@@ -281,10 +282,6 @@ const selectDate  = () =>{
 }
 
 const onDateConfirm = (value)=> {
-      console.log(value);
-      value.selectedValues.forEach((item,index) => {
-        console.log(item);
-      });
       data.dateSearch = value.selectedValues[0] + "/" + value.selectedValues[1];
       searchParam.searchDate = value.selectedValues[0] + "-" + value.selectedValues[1];
       data.showDatePicker = false;
diff --git a/src/views/enterprise/qrCode.vue b/src/views/enterprise/qrCode.vue
index f4febc6..1dee27f 100644
--- a/src/views/enterprise/qrCode.vue
+++ b/src/views/enterprise/qrCode.vue
@@ -57,15 +57,11 @@ const goBack = () => {
 
 
 onMounted(() => {
-	console.log(route?.query?.enterpriseNumber);
-
   queryEnterpriseInformationQrCode(route?.query?.enterpriseNumber
   ,success =>{
-      console.log(success)
       if(success.success){
         data.qrCodeUrl = baseUrl + success.data.qrCodeUrl;
         data.enterpriseName = success.data.enterpriseName;
-        console.log(data.qrCodeUrl)
       }
   },error =>{
     console.log("查询失败")
diff --git a/src/views/enterprise/register.vue b/src/views/enterprise/register.vue
index 4bed760..f3d89cf 100644
--- a/src/views/enterprise/register.vue
+++ b/src/views/enterprise/register.vue
@@ -117,6 +117,7 @@
 <script setup name="register">
 
 import { showSuccessToast } from 'vant';
+import 'vant/es/toast/style';
 import {addEnterpriseInformation} from '../../api/enterprise'
 import {getDict} from '../../api/Home'
 import { reactive, ref } from "vue";
diff --git a/src/views/enterprise/registrationEdit.vue b/src/views/enterprise/registrationEdit.vue
index 757cb76..4747610 100644
--- a/src/views/enterprise/registrationEdit.vue
+++ b/src/views/enterprise/registrationEdit.vue
@@ -158,6 +158,7 @@
 <script setup name="register">
 
     import { showSuccessToast } from 'vant';
+    import 'vant/es/toast/style';
     import {addEnforcementRegistration, editEnforcementRegistration, getRegByUserIdAndZero, queryUserInfo, getByIdToDataFillIn} from '../../api/enforce'
     import {getEnterpriseInformation} from '../../api/enterprise'
     import { reactive, ref } from "vue";
diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue
index e2adfd8..15554d8 100644
--- a/src/views/enterprise/registrationList.vue
+++ b/src/views/enterprise/registrationList.vue
@@ -138,10 +138,8 @@ const data = reactive({
 
  // 设置初始值为当前时间
 onMounted(() => {
-  console.log(useCommon.enterpriseNumber);
 	// getCard();
   searchParam.enterpriseNumber = useCommon.enterpriseNumber;
-  console.log(useCommon.enterpriseNumber)
   // queryList();
   data.dateSearch = nowDate(new Date());
   queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "100"}, success => {
diff --git a/src/views/login.vue b/src/views/login.vue
index dab66d9..c1afc4c 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -43,8 +43,8 @@ const onSubmit = async (values) => {
   // return;
   userLogin(values,success=>{
     console.log(success);
-        router.push({ name: "Home" });
-        // router.push({ name: "enforceHome" });
+        // router.push({ name: "Home" });
+        router.push({ name: "enforceHome" });
         //设置全局变量
         useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
         useCommon.SET_USER_ID(success.data.userId);