From 4260ba8cbda7ab6660d7a9f4b782677f6a4e07c7 Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Fri, 2 Aug 2024 14:22:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E8=AD=A6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=20=E4=BC=81=E4=B8=9A=E8=AF=A6=E6=83=85=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enforce/enforcementPlan.vue         | 11 +++---
 src/views/enforce/enterpriseBaseInfo.vue      | 37 +++++++++++++++++--
 src/views/enforce/enterpriseScanPreview.vue   |  1 +
 src/views/enforce/enterpriseWarningInfo.vue   |  2 +-
 .../enterprise/enterpriseInspectionDetail.vue |  1 -
 5 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue
index 09f3c90..935565d 100644
--- a/src/views/enforce/enforcementPlan.vue
+++ b/src/views/enforce/enforcementPlan.vue
@@ -67,22 +67,21 @@
                                     </div>
                                     <!-- <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" /> -->
                                     <div class="van-hairline--bottom"></div>
-<!--                                    <div class="card_box_span card-title">-->
-<!--                                        <p>{{ item.planName }}</p>-->
-<!--                                    </div>-->
-
                                     <div class="card_box_span">
                                         <p style="display: flex;"><span class="card_box_label">执法计划：</span> <a style="color: #2b75fd;">{{
                                             null!=item.fileObject?item.fileObject.fileName:"" }}</a></p>
                                     </div>
-
                                     <div class="card_box_span">
-                                        <p><span class="card_box_label">执法区域：</span> {{ item.enforcementArea }}</p>
+                                        <p style="display: flex;"><span class="card_box_label">计划名称：</span>{{item.planName }}</p>
                                     </div>
                                     <div class="card_box_span">
                                         <p><span class="card_box_label">执法部门：</span> {{ item.bureauDeptName }}
                                         </p>
                                     </div>
+                                    <div class="card_box_span">
+                                        <p><span class="card_box_label">执法区域：</span> {{ item.enforcementArea }}</p>
+                                    </div>
+                                    
 <!--                                    <div class="card_box_span">-->
 <!--                                        <p style="display: flex;"><span class="card_box_label">执法计划：</span> <a style="color: #2b75fd;">{{-->
 <!--                                            null!=item.fileObject?item.fileObject.fileName:"" }}</a></p>-->
diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue
index d3c471f..c18eee7 100644
--- a/src/views/enforce/enterpriseBaseInfo.vue
+++ b/src/views/enforce/enterpriseBaseInfo.vue
@@ -127,7 +127,7 @@
                                 <p><span class="card_box_label">执法主体：</span></p>
                               </div>
                               <div class="card_box_span">
-                                <p><span class="card_box_label">处罚种类：</span> {{ item.lawKind }}</p>
+                                <p><span class="card_box_label">处罚种类：</span> {{ item.cfzl }}</p>
                               </div>
 <!--                              <div class="card_box_span">
                                     <p v-if="item.c206010 == '01'"><span class="card_box_label">处罚方式：</span>给予处罚</p>
@@ -156,7 +156,9 @@
                                     <p v-if="item.c301002 == '无'">************</p>
                                 </div>
                                 <div class="card_box_span">
-                                    <p><span class="card_box_label">强制种类：</span> {{ item.c302002 }}</p>
+                                    <p><span class="card_box_label">强制种类：</span>
+                                       <span v-if="item.c302002 == ''"></span>
+                                      {{ item.c302002 }}</p>
                                 </div>
                                 <div class="card_box_span">
                                     <p><span class="card_box_label">强制措施：</span> {{ item.lawDate }}</p>
@@ -307,6 +309,12 @@
                 //查询历史强制案件
                 queryQZAJList(success.data.enterpriseNumber, res => {
                     console.log("历史强制案件---", res.data)
+                    res.data.forEach(res =>{
+                      var obj = {}
+                      obj = res;
+                      obj.cfzl = "罚款";
+                      data.forceDataList.push(obj);
+                    })
                     data.forceDataList = res.data;
                 }, error => {
 
@@ -315,7 +323,30 @@
                 //历史处罚案件
                 queryCFAJList(success.data.enterpriseNumber, res => {
                     console.log("历史处罚案件---", res.data)
-                    data.punishDataList = res.data;
+                    // data.punishDataList = res.data;
+                    res.data.forEach(res =>{
+                      var obj = {}
+                      var textArr = "";
+                      obj = res;
+                      
+                      var arr = res.c206011.split(",");
+                      console.log(arr)
+                      for (const key in arr) {
+                        if(arr[key] == "01")textArr += "警告,";
+                        if(arr[key] == "02")textArr += "通报批评,";
+                        if(arr[key] == "03")textArr += "罚款,";
+                        if(arr[key] == "04")textArr += "没收违法所得,";
+                        if(arr[key] == "05")textArr += "没收违法财产,";
+                        if(arr[key] == "06")textArr += "责令停业整改,";
+                        if(arr[key] == "07")textArr += "暂扣许可证件,";
+                        if(arr[key] == "08")textArr += "行政拘留,";
+                        if(arr[key] == "09")textArr += "吊销许可证件,";
+                      }
+                      obj.cfzl = textArr;
+                      
+                      data.punishDataList.push(obj);
+                    })
+                    // data.forceDataList = res.data;
                 }, error => {
 
                 })
diff --git a/src/views/enforce/enterpriseScanPreview.vue b/src/views/enforce/enterpriseScanPreview.vue
index c4a192d..ccd9111 100644
--- a/src/views/enforce/enterpriseScanPreview.vue
+++ b/src/views/enforce/enterpriseScanPreview.vue
@@ -151,6 +151,7 @@
             if (null != success.data) {
                 console.log(success.data);
                 data.searchParam.enterpriseNumber = success.data.enterpriseNumber;
+                data.searchParam.warnType = 1;
                 console.log(data.searchParam.enterpriseNumber);
                 //查询企业历史检查案件
                 queryEarlyWarning(data.searchParam, success => {
diff --git a/src/views/enforce/enterpriseWarningInfo.vue b/src/views/enforce/enterpriseWarningInfo.vue
index 48fd0c4..2c50b35 100644
--- a/src/views/enforce/enterpriseWarningInfo.vue
+++ b/src/views/enforce/enterpriseWarningInfo.vue
@@ -56,7 +56,7 @@
 									</div>
 									<div class="card_box_span">
 										<p class="warn-cont"><span class="card_box_label">预警级别：</span>
-											{{ item.warningLevel==1?"Ⅰ级 (特别严重)":item.warningLevel==2?"Ⅱ级 (严重)": item.warningLevel==3?"Ⅲ级 (较重)": "Ⅳ (一般)"}}
+											{{ item.warningLevel==1?"Ⅰ级 (严重)":item.warningLevel==2?"Ⅱ级 (较严重)": item.warningLevel==3?"Ⅲ级 (一般)": "Ⅳ (一般)"}}
 										</p>
 									</div>
 								</div>
diff --git a/src/views/enterprise/enterpriseInspectionDetail.vue b/src/views/enterprise/enterpriseInspectionDetail.vue
index c73d9f6..ff827dd 100644
--- a/src/views/enterprise/enterpriseInspectionDetail.vue
+++ b/src/views/enterprise/enterpriseInspectionDetail.vue
@@ -76,7 +76,6 @@
 <!--              readonly-->
 <!--            />-->
             <van-field
-                v-if="!data.isEnterprise"
                 v-model="submitData.bureauDeptName"
                 readonly
                 label="执法部门"