From 348ccf7ac7ef3aa3f954e5ee4ce0859cb46eb973 Mon Sep 17 00:00:00 2001
From: laozt <2721205210@qq.com>
Date: Fri, 22 Dec 2023 16:39:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/newyjLayout.vue              |  8 +++---
 src/views/components/AddDialog/tab1.vue |  2 +-
 src/views/components/AddDialog/tab2.vue |  2 +-
 src/views/components/AddDialog/tab3.vue |  2 +-
 src/views/yingji/enforcing.vue          | 35 ++++++++++++++++---------
 src/views/yingji/planManage.vue         | 13 ++++++++-
 6 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/src/layout/newyjLayout.vue b/src/layout/newyjLayout.vue
index e509d5f..d37821a 100644
--- a/src/layout/newyjLayout.vue
+++ b/src/layout/newyjLayout.vue
@@ -101,11 +101,12 @@ export default {
     let isGovernmentAffairsNetwork = localStorage.getItem(
       "isGovernmentAffairsNetwork"
     );
-    const G_USER_INFO = JSON.parse(localStorage.getItem("G_USER_INFO"));
+    // const G_USER_INFO = JSON.parse(localStorage.getItem("G_USER_INFO"));
+    let userInfo = JSON.parse(sessionStorage.getItem("USER_INFO"));
     if (isGovernmentAffairsNetwork == "1") {
-      this.userName = G_USER_INFO.data.username;
+      this.userName = userInfo.lawLevel + " " + userInfo.nickName;
     } else {
-      this.userName = this.dept.deptName + " " + this.username;
+      this.userName = userInfo.lawLevel + " " + userInfo.nickName;
     }
   },
   watch: {
@@ -146,7 +147,6 @@ export default {
               localStorage.removeItem("isGovernmentAffairsNetwork");
               location.href = "/login?redirect=%2Findex";
             }
-
           });
         })
         .catch(() => {});
diff --git a/src/views/components/AddDialog/tab1.vue b/src/views/components/AddDialog/tab1.vue
index 3838205..f5d8c6a 100644
--- a/src/views/components/AddDialog/tab1.vue
+++ b/src/views/components/AddDialog/tab1.vue
@@ -82,7 +82,7 @@
       </el-form>
     </div>
     <div class="tables" v-loading="loading">
-      <el-table v-loading="loading" :data="newList" height="380">
+      <el-table v-loading="loading" :data="newList" height="350">
         <el-table-column
           label="企业名称"
           align="center"
diff --git a/src/views/components/AddDialog/tab2.vue b/src/views/components/AddDialog/tab2.vue
index afe8fa0..5bcb33a 100644
--- a/src/views/components/AddDialog/tab2.vue
+++ b/src/views/components/AddDialog/tab2.vue
@@ -82,7 +82,7 @@
       </el-form>
     </div>
     <div class="tables" v-loading="loading">
-      <el-table v-loading="loading" :data="newList">
+      <el-table v-loading="loading" :data="newList" height="350">
         <el-table-column
           label="企业名称"
           align="center"
diff --git a/src/views/components/AddDialog/tab3.vue b/src/views/components/AddDialog/tab3.vue
index fc7d1cd..72c9339 100644
--- a/src/views/components/AddDialog/tab3.vue
+++ b/src/views/components/AddDialog/tab3.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="tables" v-loading="loading">
-      <el-table v-loading="loading" :data="enterpriseList">
+      <el-table v-loading="loading" :data="enterpriseList" height="350">
         <el-table-column label="计划年份" align="center" prop="plannedYear" />
 
         <el-table-column label="计划月份" align="center" prop="plannedMonth">
diff --git a/src/views/yingji/enforcing.vue b/src/views/yingji/enforcing.vue
index d51f4a8..dda7567 100644
--- a/src/views/yingji/enforcing.vue
+++ b/src/views/yingji/enforcing.vue
@@ -106,6 +106,11 @@
             >
           </template>
         </el-table-column>
+        <el-table-column
+          prop="enterpriseName"
+          label="企业名称"
+          header-align="center"
+        />
         <el-table-column
           prop="district"
           label="行政区划"
@@ -117,12 +122,7 @@
             <span>{{ componendDistrict(scope.row.district) }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="enterpriseName"
-          label="企业名称"
-          header-align="center"
-        >
-        </el-table-column>
+
         <el-table-column
           prop="checkStatus"
           label="检查状态"
@@ -131,22 +131,32 @@
           <template slot-scope="scope">
             <div
               style="font-family: 'Alibaba PuHuiTi'"
-              :class="scope.row.checkStatus == '2' ? 'isStyle' : 'isStyle1'"
+              :class="scope.row.checkStatus == '1' ? 'isStyle1' : 'isStyle'"
             >
-              {{ scope.row.checkStatus == 2 ? "未检查" : "已检查" }}
+              {{ scope.row.checkStatus == 1 ? "已检查" : "未检查" }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="examineEndTime" label="检查结束时间" header-align="center" />
+        <el-table-column
+          prop="examineEndTime"
+          label="检查结束时间"
+          header-align="center"
+        />
         <el-table-column
           prop="checkAgeing"
           label="检查时效"
           header-align="center"
         >
           <template slot-scope="scope">
-            <span style="color:green" v-if="scope.row.checkAgeing == 1">{{ scope.row.checkAgeing | checkAgeing }}</span>
-            <span style="color:blue" v-else-if="scope.row.checkAgeing == 2">{{ scope.row.checkAgeing | checkAgeing }}</span>
-            <span style="color:red" v-else-if="scope.row.checkAgeing == 3">{{ scope.row.checkAgeing | checkAgeing }}</span>
+            <span style="color: green" v-if="scope.row.checkAgeing == 1">{{
+              scope.row.checkAgeing | checkAgeing
+            }}</span>
+            <span style="color: blue" v-else-if="scope.row.checkAgeing == 2">{{
+              scope.row.checkAgeing | checkAgeing
+            }}</span>
+            <span style="color: red" v-else-if="scope.row.checkAgeing == 3">{{
+              scope.row.checkAgeing | checkAgeing
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" header-align="center">
@@ -289,6 +299,7 @@ export default {
         //检测状态
         checkStatus: "",
         enterpriseName: "",
+        status: 1,
       },
       plannedMonth: "",
       checkList: [""],
diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue
index 96efd55..a415b79 100644
--- a/src/views/yingji/planManage.vue
+++ b/src/views/yingji/planManage.vue
@@ -57,11 +57,15 @@
             ref="executive"
           />
         </el-form-item>
-        <el-form-item label="执法层级" prop="lawHierarchy">
+        <el-form-item
+          label="执法层级"
+          prop="lawHierarchy"
+        >
           <el-select
             v-model="queryParams.lawHierarchy"
             placeholder="请选择执法层级"
             filterable
+          :disabled="islawHierarchy"
           >
             <el-option
               v-for="item in dict.type.dict_law_hierarchy"
@@ -207,6 +211,7 @@ export default {
   dicts: ["dict_law_hierarchy"],
   data() {
     return {
+      islawHierarchy: false,
       lawHierarchys: [
         {
           value: "1",
@@ -470,12 +475,18 @@ export default {
     let userInfo = JSON.parse(sessionStorage.getItem("USER_INFO"));
     if (userInfo.lawLevel == "县级" || userInfo.lawLevel == "镇级") {
       this.queryParams.district = userInfo.permissionCode;
+      this.queryParams.lawHierarchy = userInfo.userName;
+    }
+
+    if (userInfo.lawLevel == "镇级") {
+      this.islawHierarchy = true;
     }
     this.queryParams.plannedYear = this.$moment(new Date()).format("yyyy");
     if (this.$route.query.lawHierarchy) {
       // console.log(this.$route.query.lawHierarchy);
       this.queryParams.lawHierarchy = this.$route.query.lawHierarchy;
     }
+
     // 初始化
     this.getList();
   },