bug

src/main/webapp/jsp/pipeline/pipelineDataList.jsp

@@ -88,7 +88,10 @@
         var checkedItems = $("#table").bootstrapTable('getSelections');
         var datas = "";
         $.each(checkedItems, function(index, item) {
-            datas += item.id + ",";
+            if (datas != "") {
+                datas += ",";
+            }
+            datas += item.id;
         });
         if (datas == "") {
             showAlert('d', '请先选择记录', 'mainAlertdiv');

src/main/webapp/jsp/safety/SafetyJobInsideAdd.jsp

@@ -234,7 +234,8 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
             {
                 formId: "addForm",
                 hiddenId: "userId",
-                textId: "userName"
+                textId: "userName",
+                displayDept: "true"
             }, function (data) {
                 $("#user4SelectDiv").html(data);
                 openModal("user4SelectModal");

src/main/webapp/jsp/safety/SafetyJobInsideSign.jsp

@@ -47,6 +47,11 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
         display: inline-block;
         vertical-align: top;
         padding: 8px;
+        width: 140px;
+        text-align: left;
+    }
+    .detail-row {
+        clear: both;
     }
 </style>
 <script type="text/javascript">
@@ -253,7 +258,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
     function initdeTail(list) {
         let temp = `<div >`
         list.forEach((item, index) => {
-            temp += `<div><div class="AAA">` + item.deptName + `</div>`
+            temp += `<div class="detail-row"><div class="AAA">` + item.deptName + `</div>`
             temp += `<div class="AAA">` + item.userName + `</div>`
             temp += `<div class="AAA">` + item.pass + `</div>`
             temp += `<div class="AAA">` + item.time + `</div></div>`
@@ -426,7 +431,9 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD
                             </div>
                             <div class="form-group">
                                 <label class="col-sm-2 control-label ">查看其它会签意见</label>
-                                <div id="deTail"></div>
+                                <div class="col-sm-10">
+                                    <div id="deTail"></div>
+                                </div>
                             </div>
                             <div class="form-group" style="margin-left: 39px">
                                 <div id="fileList"></div>

src/main/webapp/jsp/user/userForSelectByCompany.jsp

@@ -20,7 +20,12 @@
                 if(datas_name!=""){
                 	datas_name+=",";
                 }
-                datas_name+=item.caption;
+                // 支持通过参数控制显示部门名称还是用户名称
+                var displayField = item.caption;
+                if('${param.displayDept}' === 'true' && item._pname) {
+                    displayField = item._pname;
+                }
+                datas_name+=displayField;
             });
         	 $('#${param.formId} #${param.hiddenId}' ).val(datas);
              $('#${param.formId} #${param.textId}').val(datas_name);