diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsServiceImpl.java
index c39f97e3..5f1aab04 100644
--- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsServiceImpl.java
+++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsServiceImpl.java
@@ -132,6 +132,7 @@ public class PatrolContentsServiceImpl implements PatrolContentsService {
                         jsonObject.put("id", list3.get(j).getId());
                         jsonObject.put("name", list3.get(j).getContents());
                         jsonObject.put("text", list3.get(j).getContents());
+                        jsonObject.put("contentsDetail", list3.get(j).getContentsDetail());
                         jsonObject.put("type", TimeEfficiencyCommStr.PatrolEquipment_Equipment);
                         jsonObject.put("icon", TimeEfficiencyCommStr.PatrolContents);
                         jsonArrayEqu.add(jsonObject);
diff --git a/src/main/webapp/JS/comm.js b/src/main/webapp/JS/comm.js
index af4c833f..6bc8574a 100644
--- a/src/main/webapp/JS/comm.js
+++ b/src/main/webapp/JS/comm.js
@@ -870,7 +870,7 @@ function openModal(modalId) {
             }
 
         }
-    })
+    });
 };
 
 /**
@@ -1060,6 +1060,12 @@ $(function () {
     });
     //FastClick.attach(document.body);
 
+    // 解决嵌套模态框中输入框无法获得焦点的问题
+    // 禁用Bootstrap模态框的enforceFocus，允许嵌套模态框中的输入框正常工作
+    if ($.fn.modal && $.fn.modal.Constructor) {
+        $.fn.modal.Constructor.prototype.enforceFocus = function() {};
+    }
+
     //弹窗关闭触发方法
     /*$(".modal").on("hidden.bs.modal", function() {
     	$('.modal').css("overflow","auto");
diff --git a/src/main/webapp/jsp/activiti/taskList.jsp b/src/main/webapp/jsp/activiti/taskList.jsp
index 9620753c..b50c9f40 100644
--- a/src/main/webapp/jsp/activiti/taskList.jsp
+++ b/src/main/webapp/jsp/activiti/taskList.jsp
@@ -533,6 +533,14 @@
                   $("#subDiv").html(data);
                   openModal('subModal');
                 });
+            } else if (type.indexOf('${SAFETY_JOB_INSIDE}') != -1) {
+                $.post(ext.contextPath + '/safety/SafetyJobInside/view.do', {id: id}, function (data) {
+                  $("#subDiv").html(data);
+                  openModal('subModal');
+                });
+            }
+            else {
+                showAlert('w', `未查询到任务模块！${type}`, 'mainAlertdiv');
             }
         };
         var deleteFun = function (id) {
diff --git a/src/main/webapp/jsp/equipment/equipmentBelongListForSelect.jsp b/src/main/webapp/jsp/equipment/equipmentBelongListForSelect.jsp
index c7169f44..cfe3a51b 100644
--- a/src/main/webapp/jsp/equipment/equipmentBelongListForSelect.jsp
+++ b/src/main/webapp/jsp/equipment/equipmentBelongListForSelect.jsp
@@ -19,6 +19,10 @@
         }
     };
     
+    var dosearchBelong = function() {
+        $("#equipmentBelongTable").bootstrapTable('refresh');
+    };
+    
     
     //显示已经勾选的数据
     function stateFormatter(value, row, index) {  
@@ -53,6 +57,7 @@
                     page: params.offset/params.limit+1, // 每页显示数据的开始页码
                     sort: params.sort, // 要排序的字段
                     order: params.order,
+                    search_name: $('#search_belongname').val()
                 }
             },
             queryParamsType: "limit",
@@ -110,6 +115,12 @@
                 <div id="mainAlertdiv"></div>
                 <div id="menu4SelectDiv"></div> 
 				<div id="modal-body">
+                    <div class="input-group input-group-sm" style="width: 250px;float: right;margin-bottom: 15px;">
+                        <input type="text" id="search_belongname" name="search_belongname" class="form-control pull-right" placeholder="归属名称/编码">
+                        <div class="input-group-btn">
+                            <button  class="btn btn-default" onclick="dosearchBelong();"><i class="fa fa-search"></i></button>
+                        </div>
+                    </div>
                     <div class="table-scrollable">
 					   <table class="table table-bordered table-striped" style="overflow:auto;width:100%" id="equipmentBelongTable"></table>
 					</div>
diff --git a/src/main/webapp/jsp/safety/EducationBuilderList.jsp b/src/main/webapp/jsp/safety/EducationBuilderList.jsp
index 2c24c6be..01e67b61 100644
--- a/src/main/webapp/jsp/safety/EducationBuilderList.jsp
+++ b/src/main/webapp/jsp/safety/EducationBuilderList.jsp
@@ -263,7 +263,8 @@
                         field: 'name', // 返回json数据中的name
                         title: '姓名', // 表格表头显示文字
                         align: 'center', // 左右居中
-                        valign: 'middle' // 上下居中
+                        valign: 'middle', // 上下居中
+                        width: 200,
                     }, {
 /*                        field: 'gender', // 返回json数据中的name
                         title: '性别', // 表格表头显示文字
diff --git a/src/main/webapp/jsp/safety/SafetyJobInsideAdd.jsp b/src/main/webapp/jsp/safety/SafetyJobInsideAdd.jsp
index 8c0c2364..0ca1f89a 100644
--- a/src/main/webapp/jsp/safety/SafetyJobInsideAdd.jsp
+++ b/src/main/webapp/jsp/safety/SafetyJobInsideAdd.jsp
@@ -72,7 +72,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
     var fileinput = function () {
         $('#file').click();
     };
-    var filedel = function () {
+    var filedel = function (index) {
         fileList.splice(index, 1)
         $('#test').html(initFileInputView())
     };