From 8f25f537b24b1d335ce6f6875c7614f5fa872d7f Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 23 Aug 2024 10:19:31 +0800
Subject: [PATCH] =?UTF-8?q?576=20=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=8E=89=E7=BA=BF=20557=20=E6=90=9C=E7=B4=A2=E6=A1=86=E4=B8=8D?=
 =?UTF-8?q?=E5=A5=BD=E4=BD=BF=20558=20=E6=80=8E=E4=B9=88=E7=9C=8B=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E4=BA=BA=E6=98=AF=E8=B0=81=20556=20=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=80=89=E6=8B=A9=20=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A1=86=20=E5=8A=A0=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../company_plan/components/addfrom.vue       |  6 ++---
 .../company_plan/components/list.vue          | 26 ++++++++++++++-----
 .../components/yjshenherenyuan.vue            | 11 +++-----
 .../company_plan/components/yvanfujian.vue    |  1 -
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/addfrom.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/addfrom.vue
index 873fbe6..e57b1ba 100644
--- a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/addfrom.vue
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/addfrom.vue
@@ -258,12 +258,12 @@ export default {
       this.$refs.zhiling.getTreeList()
     },
 
-    yjwenancheck(id) {
-      console.log(id)
+    yjwenancheck(row) {
       const params = {
         FIRERESERVEPLAN_ID: this.PLAN_ID,
         CHECKSTATUS: '1',
-        AUDIT_UESRID: id
+        AUDIT_UESRID: row.USER_ID,
+        AUDIT_UESR_NAME: row.NAME
       }
       requestFN('/major/emergencyplan/submitCheck', params).then((data) => {
         this.$message({
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/list.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/list.vue
index 0514251..aacf27e 100644
--- a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/list.vue
@@ -1,16 +1,26 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;margin-right: 10px;" />
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
-        搜索
-      </el-button>
+      <el-form>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="预案名称:">
+              <el-input v-model="PLANNAME" placeholder="搜索" class="filter-item" style="width: 200px;margin-right: 10px;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">搜索</el-button>
+            <el-button class="filter-item" type="info" icon="el-icon-search" @click="resetting">重置</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
     </div>
     <el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="PLANNAME" label="预案名称" width="180" />
       <el-table-column prop="PLANCODE" label="预案编码" />
+      <el-table-column prop="AUDIT_UESR_NAME" label="审核人" />
       <el-table-column :show-overflow-tooltip="true" prop="PLANDES" label="预案概述" />
       <el-table-column prop="AUDIT_STATUS" label="审核状态" >
         <template slot-scope="{row}">
@@ -53,7 +63,7 @@ export default {
       },
       total: 0,
       varList: [],
-      KEYWORDS: '',
+      PLANNAME: '',
       dialogFormEdit: false,
       dialogFormShow: false,
       dialogType: 'add'
@@ -91,7 +101,7 @@ export default {
       requestFN(
         '/major/emergencyplan/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
-          PLAN_NAME: this.KEYWORDS
+          PLANNAME: this.PLANNAME
         }
       ).then((data) => {
         this.listISLOADing = false
@@ -181,6 +191,10 @@ export default {
     getQuery() {
       this.$refs.multipleTable.clearSelection()
       this.getList()
+    },
+    resetting() {
+      this.PLANNAME = ''
+      this.getList()
     }
 
   }
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yjshenherenyuan.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yjshenherenyuan.vue
index 23d3995..0b6b85a 100644
--- a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yjshenherenyuan.vue
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yjshenherenyuan.vue
@@ -26,7 +26,6 @@
                 <el-input v-model="KEYWORDS" style="width: 150px" placeholder="请输入关键字"/>
               </el-form-item>
             </el-col>
-
             <el-col :span="12" style="text-align: right">
               <el-form-item label-width="10px">
                 <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
@@ -46,20 +45,16 @@
           border
           fit
           highlight-current-row>
-
           <el-table-column type="index" label="序号" width="50" align="center" />
           <el-table-column prop="USERNAME" label="用户名" />
           <el-table-column prop="NAME" label="姓名" />
-          <!--          <el-table-column prop="PID_NAME" label="上级部门" />-->
-
           <el-table-column label="操作" width="80px">
             <template slot-scope="{row}">
-              <el-button type="primary" size="mini" @click="isChoose(row.USER_ID)">选择</el-button>
+              <el-button type="primary" size="mini" @click="isChoose(row)">选择</el-button>
             </template>
           </el-table-column>
         </el-table>
         <div class="page-btn-group">
-
           <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList(USER_ID)" />
         </div>
       </el-main>
@@ -133,8 +128,8 @@ export default {
     this.getList()
   },
   methods: {
-    isChoose(id) {
-      this.$emit('yjwenancheck', id)
+    isChoose(row) {
+      this.$emit('yjwenancheck', row)
     },
     getQuery() {
       this.getList()
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanfujian.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanfujian.vue
index d17ed68..eab0f4d 100644
--- a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanfujian.vue
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanfujian.vue
@@ -7,7 +7,6 @@
       </el-button>
     </div>
     <el-table ref="multipleTable" :data="yjzjvarList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
-
       <el-table-column prop="FILENAME" label="文件名称" width="180" />
       <el-table-column prop="BZ" label="备注" />
       <el-table-column prop="createTimeStr" label="维护日期" />