From 4d1354d2bfec557c302384f691466e5b8f81ee0a Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Fri, 2 Aug 2024 15:44:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E6=89=80?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=9A=84=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E4=B8=BAxxx=E5=B1=80=E4=B8=80=E7=BA=A7=20=E6=89=A7=E6=B3=95?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=9B=9E=E6=98=BE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/administrative/appointment.vue     |  4 ++--
 src/views/administrative/appointmentEdit.vue |  3 ++-
 src/views/enforce/enterpriseBaseInfo.vue     | 10 +++++-----
 src/views/enforce/enterpriseWarningInfo.vue  | 10 +++++++++-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index 079391e..447a655 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -551,8 +551,8 @@
             submitData.lawEnforcement = success.data.dept.deptName;
             submitData.lawEnforcementId = success.data.dept.deptId;
             //局级部门
-            submitData.bureauDeptName = success.data.dept.deptName;
-            submitData.bureauDeptId = success.data.dept.deptId;
+            submitData.bureauDeptName = success.data.bureauDept.deptName;
+            submitData.bureauDeptId = success.data.bureauDept.deptId;
         }, error => {
         });
 
diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue
index 261ba48..603800d 100644
--- a/src/views/administrative/appointmentEdit.vue
+++ b/src/views/administrative/appointmentEdit.vue
@@ -86,7 +86,7 @@
 <!--                />-->
 <!--                <van-field v-model="submitData.checkRequire" v-show="false" />-->
                 <van-field
-                        v-model="submitData.lawEnforcement"
+                        v-model="submitData.bureauDeptName"
                         readonly
                         label="执法部门"
                         :rules="[{ required: true, message: '必填项' }]"
@@ -375,6 +375,7 @@
                 data.checkRequireText =success.data['params'].checkRequireText;
                 submitData.lawEnforcerText =success.data['lawEnforcer'];
                 submitData.lawEnforcerTextTwo =success.data['lawEnforcerTwo'];
+                submitData.bureauDeptName = success.data['bureauDeptName'];
 
                 if (success.data.deptObjs.length > 1) {
                     data.checked = true;
diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue
index c18eee7..e2a7ebb 100644
--- a/src/views/enforce/enterpriseBaseInfo.vue
+++ b/src/views/enforce/enterpriseBaseInfo.vue
@@ -124,18 +124,18 @@
                                     <p>{{ item.c201002 }}</p>
                                 </div>
                               <div class="card_box_span">
-                                <p><span class="card_box_label">执法主体：</span></p>
+                                <p><span class="card_box_label">执法主体：</span>{{ item.c201003 }}</p>
                               </div>
                               <div class="card_box_span">
                                 <p><span class="card_box_label">处罚种类：</span> {{ item.cfzl }}</p>
                               </div>
-<!--                              <div class="card_box_span">
+                             <div class="card_box_span">
                                     <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">
+                                </div>
+                              <!-- <div class="card_box_span">
                                 <p><span class="card_box_label">处罚方式：</span></p>
-                              </div>
+                              </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>
diff --git a/src/views/enforce/enterpriseWarningInfo.vue b/src/views/enforce/enterpriseWarningInfo.vue
index 2c50b35..4ed4d26 100644
--- a/src/views/enforce/enterpriseWarningInfo.vue
+++ b/src/views/enforce/enterpriseWarningInfo.vue
@@ -21,7 +21,7 @@
       </van-popup>
     </div>-->
   <div class="search-button-list">
-    <van-button plain hairline :class="null==data.checkNum?'search-button active':'search-button'" @click="searchWarnType(1)" round type="primary" size="mini">
+    <van-button plain hairline :class="0==data.checkNum?'search-button active':'search-button'" @click="searchWarnType(1)" round type="primary" size="mini">
       本企业预警
     </van-button>
     <van-button plain hairline :class="1==data.checkNum?'search-button active':'search-button'" @click="searchWarnType(0)" round type="primary"
@@ -98,6 +98,8 @@
     //搜索时间
     searchDate: ref(),
     warnType: 1,
+    //用户ID
+    userId:"",
 	});
 
 	const data = reactive({
@@ -109,6 +111,7 @@
 		minDate: new Date(2020, 0, 1),
 		maxDate: new Date(2125, 5, 1),
 		columnsType :['year', 'month'],
+    checkNum: 0,
 	});
 
   const props = defineProps({
@@ -253,6 +256,11 @@
 		searchParam.isComplaint =  null;
     searchParam.warnType =  val;
 		queryList();
+    if(val == 0){
+      data.checkNum = 1;
+    }else{
+      data.checkNum = 0;
+    }
 	}
 	const searchComplaint = (val) =>{
 		searchParam.isComplaint =  val;