From 46b9d4738d2d16e1fd7d6469e25194dd4d89350e Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Thu, 1 Aug 2024 14:15:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E5=92=8C=E6=89=A7=E6=B3=95=E9=A2=86=E5=9F=9F=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enforce/earlyWarning.vue            |  7 ++---
 src/views/enforce/enforcementPlan.vue         |  2 +-
 src/views/enforce/historyCheck.vue            |  2 +-
 src/views/enforce/sign.vue                    | 26 ++++++++++++++++++-
 .../enterprise/enterpriseInspectionDetail.vue |  4 ++-
 5 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/views/enforce/earlyWarning.vue b/src/views/enforce/earlyWarning.vue
index 1c36ad8..d8cc358 100644
--- a/src/views/enforce/earlyWarning.vue
+++ b/src/views/enforce/earlyWarning.vue
@@ -61,8 +61,8 @@
                                     </div>
                                     <div class="card_box_span">
                                         <p style="padding-left: 0.9rem;"><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>
@@ -109,7 +109,8 @@
         //企业统一信用码
         enterpriseNumber: ref(useCommon.enterpriseNumber),
         //搜索时间
-        searchDate: ref()
+        searchDate: ref(),
+        warnType: 1,
     });
 
     const data = reactive({
diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue
index 3ec980f..09f3c90 100644
--- a/src/views/enforce/enforcementPlan.vue
+++ b/src/views/enforce/enforcementPlan.vue
@@ -80,7 +80,7 @@
                                         <p><span class="card_box_label">执法区域：</span> {{ item.enforcementArea }}</p>
                                     </div>
                                     <div class="card_box_span">
-                                        <p><span class="card_box_label">执法部门：</span> {{ item.enforcementDepartment }}
+                                        <p><span class="card_box_label">执法部门：</span> {{ item.bureauDeptName }}
                                         </p>
                                     </div>
 <!--                                    <div class="card_box_span">-->
diff --git a/src/views/enforce/historyCheck.vue b/src/views/enforce/historyCheck.vue
index 34c204e..a5b997a 100644
--- a/src/views/enforce/historyCheck.vue
+++ b/src/views/enforce/historyCheck.vue
@@ -69,7 +69,7 @@
                                             <p>{{ item.lawEnforcementItemText }}</p>
                                         </div>
                                         <div class="card_box_span">
-                                            <p><span class="card_box_label">执法部门：</span> {{ item.lawEnforcement }}</p>
+                                            <p><span class="card_box_label">执法部门：</span> {{ item.bureauDeptName }}</p>
                                         </div>
                                         <div class="card_box_span">
                                             <p><span class="card_box_label">执法人员：</span> {{ item.lawEnforcer }} , {{
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index e2c6e81..7eae973 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -206,6 +206,13 @@
                         @cancel="gaCancel"
             />
         </van-popup>
+        <van-popup v-model:show="data.lawFieldShow" position="bottom" :style="{ height: '30%' }">
+            <van-picker title="执法领域"
+                        :columns="data.lawField_columns"
+                        @confirm="lawFieldConfirm"
+                        @cancel="gaCancel"
+            />
+        </van-popup>
         <Popupzq :visible="data.popupVisibleqz" :content="data.popupContentqz" @close="closePopup" @reciveData="reciveDataqz" />
 <!--        <van-popup v-model:show="data.showGA" position="bottom" :style="{ height: '30%' }">-->
 <!--            <van-picker title="依据"-->
@@ -270,6 +277,9 @@ const data = reactive({
     lawList: [{ text:"", id:"" }],
     lawCerFlag: 0,
     lawCer:[{ text:"", id:"" }],
+    lawFieldShow: false,
+    lawField_columns: [],
+    lawFieldText:"",
 });
 var fileSize = 0;
 //保存参数
@@ -319,6 +329,8 @@ const submitData = reactive({
     enforce: "",
     checkCss: "",
     enforceReason: "",
+    lawField:"",
+
 })
 
 const tapGood = () => {
@@ -398,7 +410,9 @@ onMounted(() =>{
             submitData.lawEnforcerId = success.data.userId
             submitData.lawEnforcement = success.data.dept.deptName;
             submitData.lawEnforcementId = success.data.dept.deptId;
-            submitData.bureauDeptName = success.data.dept.deptName;
+            //局级部门
+            submitData.bureauDeptName = success.data.bureauDept.deptName;
+            submitData.bureauDeptId = success.data.bureauDept.deptId;
         }
     },error=>{
 
@@ -408,6 +422,15 @@ onMounted(() =>{
     getLinkageByValueAndParentId("check_item", "100");
     //初始化时间
     submitData.enforcementTime = formattedTime(new Date());
+    // getDict({},success =>{
+
+    // },error =>{});
+    // 查询检查要求字典信息
+        getDict({"dictType": "law_field"}, success => {
+            for(var i=0; i<success.data.length; i++) {
+                data.lawField_columns.push({ text: success.data[i].dictLabel, value: success.data[i].dictValue })
+            }
+        },error=>{});
 })
 
 // 返回
@@ -466,6 +489,7 @@ const itemChange =({ selectedOptions }) => {
 const gaCancel = () => {
     data.showGA = false;
     data.showItem = false;
+    data.lawFieldShow = false;
 }
 /* 检查要求 end */
 
diff --git a/src/views/enterprise/enterpriseInspectionDetail.vue b/src/views/enterprise/enterpriseInspectionDetail.vue
index 76fa00f..4acaafb 100644
--- a/src/views/enterprise/enterpriseInspectionDetail.vue
+++ b/src/views/enterprise/enterpriseInspectionDetail.vue
@@ -77,7 +77,7 @@
 <!--            />-->
             <van-field
                 v-if="!data.isEnterprise"
-                v-model="submitData.lawEnforcement"
+                v-model="submitData.bureauDeptName"
                 readonly
                 label="执法部门"
 
@@ -239,6 +239,8 @@ onMounted(() =>{
         submitData.remark = success.data.remark;
         submitData.isReg = success.data.isReg;
         submitData.status = success.data.status;
+        submitData.bureauDeptName = success.data.bureauDeptName;
+        submitData.bureauDeptId = success.data.bureauDeptId;
 
         setLinkageItem(submitData.checkItem);
         setLinkageGA(submitData.checkRequire);