From 060bc308aab36fafefd3f00d4c1ae5454f44125e Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Fri, 16 Aug 2024 17:58:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E6=A3=80=E6=9F=A5=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=81=9A=E6=88=90=E5=8D=B3=E6=97=B6=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?+=E5=8E=86=E5=8F=B2=E9=80=9A=E7=9F=A5=E9=80=89=E6=98=BE?=
 =?UTF-8?q?=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/footer-nav/index.vue           |  2 +-
 src/router/home.js                            |  6 +++
 src/views/enforce/enterpriseBaseInfo.vue      | 40 +++++----------
 src/views/enforce/sign.vue                    | 50 +++++++++----------
 .../enterprise/enterpriseInspectionList.vue   | 23 +++++++--
 5 files changed, 63 insertions(+), 58 deletions(-)

diff --git a/src/components/footer-nav/index.vue b/src/components/footer-nav/index.vue
index 8c7ef6d..bb8252f 100644
--- a/src/components/footer-nav/index.vue
+++ b/src/components/footer-nav/index.vue
@@ -4,7 +4,7 @@
 			<van-tabbar-item name="Home" replace icon="wap-home-o" to="/home">{{
 				$t("common.lang_home")
 			}}</van-tabbar-item>
-			<van-tabbar-item name="Classify" replace icon="description-o" to="/enterprise/enterpriseInspectionList">
+			<van-tabbar-item name="Classify" replace icon="description-o" to="/enterprise/enterpriseInspectionNotice">
 				行政检查通知
 			</van-tabbar-item>
 			<van-tabbar-item name="Classify" replace icon="description-o" to="/enterprise/complaintList">
diff --git a/src/router/home.js b/src/router/home.js
index a957111..309bd9a 100644
--- a/src/router/home.js
+++ b/src/router/home.js
@@ -81,6 +81,12 @@ const routes = [
 		name: "complaintEvaluate",
 		component: () => import("@/views/enterprise/complaintEvaluate.vue"),
 	},
+	// 行政检查通知
+	{
+		path: "/enterprise/enterpriseInspectionNotice",
+		name: "enterpriseInspectionNotice",
+		component: () => import("@/views/enterprise/enterpriseInspectionNotice.vue"),
+	},
   // 执法列表
 	{
 		path: "/enterprise/enterpriseInspectionList",
diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue
index f925860..b6e3a96 100644
--- a/src/views/enforce/enterpriseBaseInfo.vue
+++ b/src/views/enforce/enterpriseBaseInfo.vue
@@ -9,7 +9,7 @@
         <van-form @failed="onFailed" @submit="submit">
 
             <van-cell-group>
-                <div class="qy-name">企业信息</div>
+<!--                <div class="qy-name">企业信息</div>-->
                 <van-field
                         v-model="data.enterpriseInfo.enterpriseName"
                         label="企业名称:"
@@ -20,11 +20,21 @@
                         label="统一社会信用代码:"
                         readonly
                 />
+                <van-field
+                        v-model="data.enterpriseInfo.legalPerson"
+                        label="法人代表:"
+                        readonly
+                />
                 <van-field
                         v-model="data.enterpriseInfo.enterpriseType"
                         label="企业类型:"
                         readonly
                 />
+                <van-field
+                        v-model="data.enterpriseInfo.registeredCapital"
+                        label="注册资本:"
+                        readonly
+                />
                 <van-field
                         v-model="data.enterpriseInfo.enterpriseAddress"
                         label="企业地址:"
@@ -33,16 +43,6 @@
                         type="textarea"
                         show-word-limit
                 />
-                <van-field
-                        v-model="data.enterpriseInfo.legalPerson"
-                        label="法人代表:"
-                        readonly
-                />
-                <van-field
-                        v-model="data.enterpriseInfo.registeredCapital"
-                        label="注册资本:"
-                        readonly
-                />
                 <van-field
                         v-model="data.enterpriseInfo.establishmentTime"
                         label="成立日期:"
@@ -63,7 +63,7 @@
             <van-divider class="divdsty"/>
 
             <van-cell-group>
-                <div class="qy-name">案件信息</div>
+<!--                <div class="qy-name">案件信息</div>-->
                 <div class="search-button-list">
 						<span v-for="(item, index) in data?.optionList" :key="index" plain hairline @click="searchDateType(item)"
                                         :style="item.selected == true ? 'background-color:#1989fa;color:#ffffff':'background-color:#e3e0e0;color:#4c4c4c'">{{item.name}}
@@ -73,14 +73,9 @@
                     <div class="goods_box" v-for="(item, index) in data?.checkDataList" :key="index">
                         <van-swipe-cell class="swipe_cell">
                             <div class="card_box">
-
-                                <!--									<div  style="background-color: aqua; border: 2px; height: .1px;" class="van-hairline&#45;&#45;bottom"></div>-->
                                 <div class="card_box_span">
                                     <p>{{ item.c601002 }}</p>
                                 </div>
-<!--                                 <div class="card_box_span">
-                                    <p><span class="card_box_label">案件名称：</span> {{ item.c601002 }}</p>
-                                </div>-->
                                 <div class="card_box_span">
                                     <p><span class="card_box_label">检查日期：</span>
                                         <!--											{{formattedTimeYYYYmmdd(item.c601005)}}，  {{ item.lawEnforcerTwo }}</p>-->
@@ -97,9 +92,7 @@
                 <div class="refresh_content" v-if="data?.punishDataList.length && data?.show == 2">
                     <div class="goods_box" v-for="(item, index) in data?.punishDataList" :key="index">
                         <van-swipe-cell class="swipe_cell">
-                            <!-- <div class="card_box" @click="toDetailView(item.id)"> -->
                             <div class="card_box">
-                                <!--									<div  style="background-color: aqua; border: 2px; height: .1px;" class="van-hairline&#45;&#45;bottom"></div>-->
                                 <div class="card_box_span">
                                     <p>{{ item.c201002 }}</p>
                                 </div>
@@ -113,11 +106,7 @@
                                     <p v-if="item.c206010 == '01'"><span class="card_box_label">处罚方式：</span>给予处罚</p>
                                     <p v-if="item.c206010 == '02'"><span class="card_box_label">处罚方式：</span>不予处罚</p>
                                 </div>
-                              <!-- <div class="card_box_span">
-                                <p><span class="card_box_label">处罚方式：</span></p>
-                              </div> -->
                                 <div class="card_box_span">
-<!--                                    <p><span class="card_box_label">处罚日期：</span> {{ item.c206013 }}</p>-->
                                     <p><span class="card_box_label">处罚日期：</span> {{formattedTimeYYYYmmdd(item.c206013)}}</p>
                                 </div>
                             </div>
@@ -127,10 +116,8 @@
                 <div class="refresh_content" v-if="data?.forceDataList.length && data?.show == 3">
                     <div class="goods_box" v-for="(item, index) in data?.forceDataList" :key="index">
                         <van-swipe-cell class="swipe_cell">
-                            <!-- <div class="card_box" @click="toDetailView(item.id)"> -->
                             <div class="card_box">
 
-                                <!--									<div class="van-hairline&#45;&#45;bottom"></div>-->
                                 <div class="card_box_span">
                                     <p v-if="item.c301002 != '无'">{{ item.c301002 }}</p>
                                     <p v-if="item.c301002 == '无'">************</p>
@@ -144,7 +131,6 @@
                                     <p><span class="card_box_label">强制措施：</span> {{ item.c302001 }}</p>
                                 </div>
                                 <div class="card_box_span">
-<!--                                    <p><span class="card_box_label">批准时间：</span> {{ item.c302007 }}</p>-->
                                     <p><span class="card_box_label">批准时间：</span> {{formattedTimeYYYYmmdd(item.c302007)}}</p>
                                 </div>
                             </div>
@@ -255,7 +241,7 @@
                 // data.enterpriseInfo.operatingTerm = success.data.operatingTerm
                 var tmpoperatingTerm = success.data.operatingTerm;
                 if (tmpoperatingTerm.indexOf('null') >= 0) {
-                    tmpoperatingTerm = tmpoperatingTerm.substring(0, tmpoperatingTerm.indexOf('null'));
+                    tmpoperatingTerm = tmpoperatingTerm.substring(0, tmpoperatingTerm.indexOf('null')) + " 至今";
                 }
                 data.enterpriseInfo.operatingTerm = tmpoperatingTerm;
                 data.enterpriseInfo.businessScope = success.data.businessScope
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index ca25a7c..87d009c 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -96,24 +96,24 @@
                             :rules="[{ required: true, message: '必填项' }]"
                             @click="data.showTimePicker = true"
                     />
-                    <van-field
-                            v-model="submitData.lawFieldText"
-                            label="执法领域"
-                            placeholder="请选择 执法领域"
-                            is-link
-                            readonly
-                            required
-                            :rules="[{ required: true, message: '请加执法领域' }]"
-                            @click="data.showLawFieldPicker = true"
-                    />
+<!--                    <van-field-->
+<!--                            v-model="submitData.lawFieldText"-->
+<!--                            label="执法领域"-->
+<!--                            placeholder="请选择 执法领域"-->
+<!--                            is-link-->
+<!--                            readonly-->
+<!--                            required-->
+<!--                            :rules="[{ required: true, message: '请加执法领域' }]"-->
+<!--                            @click="data.showLawFieldPicker = true"-->
+<!--                    />-->
                     <van-field
                             v-model="submitData.checkCategoryText"
-                            label="执法类别"
-                            placeholder="请选择 执法类别"
+                            label="检查类别"
+                            placeholder="请选择 检查类别"
                             is-link
                             readonly
                             required
-                            :rules="[{ required: true, message: '请加执法类别' }]"
+                            :rules="[{ required: true, message: '请加检查类别' }]"
                             @click="data.showCheckCategoryPicker = true"
                     />
 
@@ -194,16 +194,16 @@
                     <!--                            </div>-->
                     <!--                        </template>-->
                     <!--                    </van-field>-->
-                    <van-field
-                            v-model="submitData.remark"
-                            label="备注"
-                            rows="2"
-                            autosize
-                            type="textarea"
-                            maxlength="100"
-                            placeholder="请输入备注"
-                            show-word-limit
-                    />
+<!--                    <van-field-->
+<!--                            v-model="submitData.remark"-->
+<!--                            label="备注"-->
+<!--                            rows="2"-->
+<!--                            autosize-->
+<!--                            type="textarea"-->
+<!--                            maxlength="100"-->
+<!--                            placeholder="请输入备注"-->
+<!--                            show-word-limit-->
+<!--                    />-->
 
                     <van-divider class="divdsty"/>
 
@@ -741,7 +741,7 @@
     const tmpSave = () => {
         if (submitData.lawCertificateNumText.length <= 0
             || submitData.bureauDeptName.length <= 0
-            || submitData.lawFieldText.length <= 0
+            // || submitData.lawFieldText.length <= 0
             || submitData.checkCategoryText.length <= 0
             || data.lawCer[0].id.length <= 0) {
             return null;
@@ -791,7 +791,7 @@
     const submit = (type) => {
         if (submitData.lawCertificateNumText.length <= 0
             || submitData.bureauDeptName.length <= 0
-            || submitData.lawFieldText.length <= 0
+            // || submitData.lawFieldText.length <= 0
             || submitData.checkCategoryText.length <= 0
             || data.lawCer[0].id.length <= 0) {
             return null;
diff --git a/src/views/enterprise/enterpriseInspectionList.vue b/src/views/enterprise/enterpriseInspectionList.vue
index dbc0afa..b4df20e 100644
--- a/src/views/enterprise/enterpriseInspectionList.vue
+++ b/src/views/enterprise/enterpriseInspectionList.vue
@@ -102,21 +102,25 @@
         </div>
 
         <!-- 底部 -->
-        <div class="shop_footer_body">
-            <footer-nav></footer-nav>
-        </div>
+<!--        <div class="shop_footer_body">-->
+<!--            <footer-nav></footer-nav>-->
+<!--        </div>-->
     </div>
 </template>
 
-<script setup name="registrationList">
+<script setup name="register">
     import {showToast} from "vant";
+    import { defineProps } from 'vue';
     import {queryEnforcementList} from '../../api/enterprise';
     import {formattedTimeYYYYmmdd} from "@/util/util";
     import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage";
 
     const {useCommon, useShopCard} = $globalStore;
 
+    //路由参数
+    const route = useRoute();
     const router = useRouter();
+
     let allchecked = ref(false); // 是否全选
     let refreshLoad = ref(false); // 是否加载中
     let value = ref('')
@@ -142,7 +146,6 @@
         searchDate: null,
         beginTime: "",
         endTime: ""
-
     });
 
     const data = reactive({
@@ -164,6 +167,13 @@
         curPage: 1,
     });
 
+    const props = defineProps({
+        isReg: {
+            type: String,
+            default: "",
+        },
+    });
+
     const toComplaint = (id, checkItem) => {
         router.push({
             path: "/enterprise/complaint",
@@ -187,7 +197,10 @@
         });
         data.dateSearch = nowDate(new Date());
     });
+
     const queryList = () => {
+        // 区分即时查询还是历史查询
+        searchParam.isReg = props?.isReg;
         //TODO 临时注释
         if (searchParam.enterpriseNumber == '' || searchParam.enterpriseNumber == null) {
             console.log("该用户没有关联企业！");