From a7934bb1a6bf4a3bc8cbfde671f0dc18ffd9e051 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sun, 29 Mar 2020 01:21:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A1=E6=A3=80=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspectionPlanManage.html                 | 20 ++++++++++---------
 .../inspectionPlanManage.js                   |  3 ++-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/public/components/inspectionPlanManage/inspectionPlanManage.html b/public/components/inspectionPlanManage/inspectionPlanManage.html
index 2c69aea38..79c33ca2a 100644
--- a/public/components/inspectionPlanManage/inspectionPlanManage.html
+++ b/public/components/inspectionPlanManage/inspectionPlanManage.html
@@ -12,8 +12,14 @@
                     <div class="row">
                         <div class="col-sm-4">
                             <div class="form-group">
-                                <input type="text" placeholder="计划名称、执行人员姓名"
-                                       v-model="inspectionPlanManageInfo.conditions.keyWord" class=" form-control">
+                                <input type="text" placeholder="计划名称"
+                                       v-model="inspectionPlanManageInfo.conditions.inspectionPlanName" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" placeholder="执行人员姓名"
+                                       v-model="inspectionPlanManageInfo.conditions.staffName" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-4">
@@ -45,7 +51,7 @@
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddInspectionPlanModal()">
                             <i class="fa fa-plus"></i>
-                            添加巡检计划
+                            添加
                         </button>
                     </div>
                 </div>
@@ -66,10 +72,7 @@
                             <th class="text-center">制定人</th>
                             <th class="text-center">制定时间</th>
                             <th class="text-center">状态</th>
-                            <th class="text-center">备注</th>
-                            <th class="text-center">操作</th>
-
-
+                            <th class="text-right">操作</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -84,8 +87,7 @@
                             <td class="text-center">{{inspectionPlan.createUserName}}</td>
                             <td class="text-center">{{inspectionPlan.createTime}}</td>
                             <td class="text-center">{{inspectionPlan.stateName}}</td>
-                            <td class="text-center">{{inspectionPlan.remark}}</td>
-                            <td class="text-center">
+                            <td class="text-right">
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs"
                                             v-on:click="_openEditInspectionPlanModel(inspectionPlan)">修改
diff --git a/public/components/inspectionPlanManage/inspectionPlanManage.js b/public/components/inspectionPlanManage/inspectionPlanManage.js
index 4f78aafaa..94e5d24ad 100644
--- a/public/components/inspectionPlanManage/inspectionPlanManage.js
+++ b/public/components/inspectionPlanManage/inspectionPlanManage.js
@@ -14,7 +14,8 @@
                 inspectionPlanName: '',
                 states:'',
                 conditions: {
-                    keyWord: '',
+                    inspectionPlanName: '',
+                    staffName:'',
                     state: '',
 
                 }