From a39d1819b979444cd5b5c6beb2d21a8fa002538a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 02 三月 2020 21:08:59 +0800
Subject: [PATCH] 巡检点代码调整

---
 WebService/src/main/resources/components/inspectionPointPackage/inspectionPoint-manage/inspectionPointManage.html |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/WebService/src/main/resources/components/inspectionPointPackage/inspectionPoint-manage/inspectionPointManage.html b/WebService/src/main/resources/components/inspectionPointPackage/inspectionPoint-manage/inspectionPointManage.html
index 283a4b7..b630aeb 100644
--- a/WebService/src/main/resources/components/inspectionPointPackage/inspectionPoint-manage/inspectionPointManage.html
+++ b/WebService/src/main/resources/components/inspectionPointPackage/inspectionPoint-manage/inspectionPointManage.html
@@ -23,7 +23,14 @@
                                        class=" form-control">
                             </div>
                         </div>
-                        <div class="col-sm-1">
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" placeholder="璇疯緭鍏ュ贰妫�鐐笽D"
+                                       v-model="inspectionPointManageInfo.conditions.inspectionId"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-2">
                             <button type="button" class="btn btn-primary btn-sm"
                                     v-on:click="_queryInspectionPointMethod()">
                                 <i class="glyphicon glyphicon-search"></i> 鏌ヨ
@@ -45,7 +52,7 @@
                         <button type="button" class="btn btn-primary btn-sm"
                                 v-on:click="_openAddInspectionPointModal()">
                             <i class="glyphicon glyphicon-plus"></i>
-                            娣诲姞宸℃鐐�
+                            娣诲姞
                         </button>
                     </div>
                 </div>
@@ -57,10 +64,10 @@
                         <thead>
                         <tr>
                             <th class="text-center">宸℃鐐瑰悕绉�</th>
+                            <th class="text-center">宸℃鐐笽D</th>
                             <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>
 
 
@@ -69,10 +76,11 @@
                         <tbody>
                         <tr v-for="inspectionPoint in inspectionPointManageInfo.inspectionPoints">
                             <td class="text-center">{{inspectionPoint.inspectionName}}</td>
+                            <td class="text-center">{{inspectionPoint.inspectionId}}</td>
                             <td class="text-center">{{inspectionPoint.locationObjName}}</td>
                             <td class="text-center">{{inspectionPoint.machineCode}}</td>
                             <td class="text-center">{{inspectionPoint.machineName}}</td>
-                            <td class="text-center">{{inspectionPoint.remark}}</td>
+
                             <td class="text-center">
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs"

--
Gitblit v1.8.0