From 5baca05809de7e56f9fb29fd9fa7d167873a1098 Mon Sep 17 00:00:00 2001
From: laozt <2721205210@qq.com>
Date: Fri, 22 Dec 2023 15:57:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/AddDialog/index.vue | 19 ++++++++------
 src/views/components/AddDialog/tab1.vue  | 32 ++++++++++++++++--------
 src/views/components/AddDialog/tab2.vue  | 17 +++++++------
 src/views/components/AddDialog/tab3.vue  |  4 +--
 src/views/yingji/planManage.vue          |  2 +-
 5 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/src/views/components/AddDialog/index.vue b/src/views/components/AddDialog/index.vue
index efc15b9..f7b7f9c 100644
--- a/src/views/components/AddDialog/index.vue
+++ b/src/views/components/AddDialog/index.vue
@@ -48,13 +48,13 @@
 
           <!-- tabs-content -->
           <div v-show="activeTab == 0">
-            <tab1 @nextTab="selectTab" />
+            <tab1 ref="tabs1" @nextTab="selectTab" />
           </div>
           <div v-show="activeTab == 1">
-            <tab2 @nextTab="selectTab" />
+            <tab2 ref="tabs2" @nextTab="selectTab" />
           </div>
           <div v-show="activeTab == 2">
-            <tab3 ref="tabs" @closeDialogtabs="closeDialog"/>
+            <tab3 ref="tabs" @closeDialogtabs="closeDialog" />
           </div>
         </div>
       </div>
@@ -85,19 +85,24 @@ export default {
   created() {},
   methods: {
     selectTab(index) {
-      console.log(index);
+      // console.log(index);
       this.activeTab = index;
-      if (index == 2) {
+      if (index == 0) {
+        this.$refs.tabs1.refreshList();
+      } else if (index == 1) {
+        this.$refs.tabs2.refreshList();
+      } else if (index == 2) {
         this.$refs.tabs.reList();
       }
     },
     // 打开
-    openDialog(item, dept) {
+    openDialog() {
+      this.activeTab = 0;
       this.dialogVisible = true;
     },
     // 关闭
     closeDialog() {
-      this.$emit("closeDialog")
+      this.$emit("closeDialog");
       this.dialogVisible = false;
     },
   },
diff --git a/src/views/components/AddDialog/tab1.vue b/src/views/components/AddDialog/tab1.vue
index 3eff287..3838205 100644
--- a/src/views/components/AddDialog/tab1.vue
+++ b/src/views/components/AddDialog/tab1.vue
@@ -39,7 +39,7 @@
             clearable
           />
         </el-form-item>
-         <el-form-item label="安全风险等级" prop="riskLevel">
+        <el-form-item label="安全风险等级" prop="riskLevel">
           <el-select
             v-model="queryParams.riskLevel"
             placeholder="请输入安全风险等级"
@@ -180,7 +180,14 @@ import firmDialog from "@/views/components/firmDialog/index.vue";
 import dictzh from "@/utils/dictzh.js";
 // 行政区域
 import executive from "../../yingji/echarts/executive.vue";
-import { listNew, listGetNew ,getNew, delNew, addNew, updateNew } from "@/api/yingji/new";
+import {
+  listNew,
+  listGetNew,
+  getNew,
+  delNew,
+  addNew,
+  updateNew,
+} from "@/api/yingji/new";
 import {
   listEnterprise,
   getEnterprise,
@@ -196,7 +203,7 @@ export default {
     "is_point",
     "entpr_color",
     "major_hazard_level",
-        "dict_risk_level",
+    "dict_risk_level",
     "dict_stand_level",
   ],
   components: { firmDialog, executive },
@@ -235,7 +242,7 @@ export default {
         updateId: null,
         userId: null,
         deptId: null,
-              isPoint: 1,
+        isPoint: 1,
       },
       // 表单参数
       form: {},
@@ -271,15 +278,18 @@ export default {
     };
   },
   created() {
-    let userInfo = JSON.parse(sessionStorage.getItem("USER_INFO"));
-    if (userInfo.lawLevel == "县级" || userInfo.lawLevel == "镇级") {
-      this.queryParams.district = userInfo.permissionCode;
-      this.queryPlanEnterpriseParams.district = userInfo.permissionCode;
-    }
-    this.getList();
-    this.getPlanEnterpriseList();
+  this.refreshList()
   },
   methods: {
+    refreshList() {
+      let userInfo = JSON.parse(sessionStorage.getItem("USER_INFO"));
+      if (userInfo.lawLevel == "县级" || userInfo.lawLevel == "镇级") {
+        this.queryParams.district = userInfo.permissionCode;
+        this.queryPlanEnterpriseParams.district = userInfo.permissionCode;
+      }
+      this.getList();
+      this.getPlanEnterpriseList();
+    },
     /** 查询计划企业列表 */
     getPlanEnterpriseList() {
       listEnterprise(this.queryPlanEnterpriseParams).then((response) => {
diff --git a/src/views/components/AddDialog/tab2.vue b/src/views/components/AddDialog/tab2.vue
index 4fbfa2c..afe8fa0 100644
--- a/src/views/components/AddDialog/tab2.vue
+++ b/src/views/components/AddDialog/tab2.vue
@@ -278,15 +278,18 @@ export default {
     };
   },
   created() {
-    let userInfo = JSON.parse(sessionStorage.getItem("USER_INFO"));
-    if (userInfo.lawLevel == "县级" || userInfo.lawLevel == "镇级") {
-      this.queryParams.district = userInfo.permissionCode;
-      this.queryPlanEnterpriseParams.district = userInfo.permissionCode;
-    }
-    this.getList();
-    this.getPlanEnterpriseList();
+    this.refreshList();
   },
   methods: {
+    refreshList() {
+      let userInfo = JSON.parse(sessionStorage.getItem("USER_INFO"));
+      if (userInfo.lawLevel == "县级" || userInfo.lawLevel == "镇级") {
+        this.queryParams.district = userInfo.permissionCode;
+        this.queryPlanEnterpriseParams.district = userInfo.permissionCode;
+      }
+      this.getList();
+      this.getPlanEnterpriseList();
+    },
     /** 查询计划企业列表 */
     getPlanEnterpriseList() {
       listEnterprise(this.queryPlanEnterpriseParams).then((response) => {
diff --git a/src/views/components/AddDialog/tab3.vue b/src/views/components/AddDialog/tab3.vue
index 3d7ef5f..fc7d1cd 100644
--- a/src/views/components/AddDialog/tab3.vue
+++ b/src/views/components/AddDialog/tab3.vue
@@ -42,7 +42,7 @@
 
         <el-table-column label="状态" align="center" prop="status">
           <template slot-scope="scope">
-            <span>{{ scope.row.isPoint == 1 ? "正式" : "草稿" }}</span>
+            <span>{{ scope.row.status == 1 ? "正式" : "草稿" }}</span>
           </template>
         </el-table-column>
 
@@ -190,7 +190,7 @@ export default {
         .then(({ value }) => {
           // 调用接口
           if (row.id != null) {
-            row.createTime = null;
+            // row.createTime = null;
             row.plannedMonth = value;
             updateEnterprise(row).then((response) => {
               this.$modal.msgSuccess("修改成功");
diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue
index bef4926..96efd55 100644
--- a/src/views/yingji/planManage.vue
+++ b/src/views/yingji/planManage.vue
@@ -388,7 +388,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$refs.addDialog.openDialog("newlyIncreased", this.dept);
+      this.$refs.addDialog.openDialog();
     },
     /** 详情按钮操作 */
     handleInfo(row) {