Merge remote-tracking branch 'origin/master'

zjugis-business/src/main/resources/templates/Travel/index.ftl

@@ -1,168 +1,167 @@
 <@w.workFlow javascripts=['/Travel/js/index.js','/flow/js/formCommon.js','/js/moment.js']
-styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
-    <div class="z-position form-boss" name="createReqVO">
-        <div class="z-form-row" style="display: none;">
-            <input type="text" value="${formEntity.instanceId!}" name="createReqVO$instanceId">
-            <input type="text" value="${formEntity.id!}" name="createReqVO$id">
-            <input type="text" value='${timeObject!}' id="timeObject">
-        </div>
-        <div class="form-title" style="margin-top: 0px;">
-            <div class="form-icon">
-                <img src="/imgs/titleIcon.png" alt="">
-                <span>基本信息</span>
+  styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
+  <div class="z-position form-boss" name="createReqVO">
+    <div class="z-form-row" style="display: none;">
+      <input type="text" value="${formEntity.instanceId!}" name="createReqVO$instanceId">
+      <input type="text" value="${formEntity.id!}" name="createReqVO$id">
+      <input type="text" value='${timeObject!}' id="timeObject">
+    </div>
+    <div class="form-title" style="margin-top: 0px;">
+      <div class="form-icon">
+        <img src="/imgs/titleIcon.png" alt="">
+        <span>基本信息</span>
+      </div>
+      <div class="form-btn">
+      </div>
+    </div>
+    <div class="jbxx-box jbxx-box-flex">
+      <table class="jbxx-table-info">
+        <tr>
+          <td class="th">
+            <div class="form-label">出差人：</div>
+          </td>
+          <td>
+            <div class="form-group">
+              <div class="form-item">
+                <div class="z-comp-input" name="createReqVO$userNickname">
+                  <input type="text" value="${formEntity.userNickname!}">
+                </div>
+              </div>
             </div>
-            <div class="form-btn">
+          </td>
+          <td class="th">
+            <div class="form-label">所在部门：</div>
+          </td>
+          <td>
+            <div class="form-group">
+              <div class="form-item">
+                <div class="z-comp-input" name="createReqVO$deptName">
+                  <input type="text" value="${formEntity.deptName!}">
+                </div>
+              </div>
             </div>
-        </div>
-        <div class="jbxx-box jbxx-box-flex">
-            <table class="jbxx-table-info">
-                <tr>
-                    <td class="th">
-                        <div class="form-label">出差人：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$userNickname">
-                                    <input type="text" value="${formEntity.userNickname!}">
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td class="th">
-                        <div class="form-label">所在部门：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$deptName">
-                                    <input type="text" value="${formEntity.deptName!}">
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="th">
-                        <div class="form-label">申请时间：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-date z-readonly" name="createReqVO$createTime">
-                                    <input type="text" value="${(formEntity.createTime?date)!}">
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td class="th">
-                        <div class="form-label">出差单号：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$attendanceNoteNo">
-                                    <input type="text" value="${formEntity.travelNo!}">
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="th">
-                        <div class="form-label">同行人：</div>
-                    </td>
-                    <td colspan="3">
-                        <div class="form-group">
-                            <div class="z-comp-selecttree" name="partners">
-                                <input type="hidden" name="createReqVO$partners" value="${formEntity.partners!}">
-                                <div class="z-inputselect-bar">
-                                    <span>${formEntity.partnerNames!}</span><i></i>
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="th">
-                        <div class="form-label">出差的地点：</div>
-                    </td>
-                    <td colspan="3">
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$travelPlace">
-                                    <input type="text" value="${formEntity.travelPlace!}">
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="th">
-                        <div class="form-label">项目名称：</div>
-                    </td>
-                    <td colspan="3">
-                        <div class="form-group">
-                            <div class="form-item">
-                                <input type="hidden" name="createReqVO$projectId" value="${formEntity.projectId!}">
-                                <div class="z-comp-input" name="createReqVO$projectName">
-                                    <input type="text" value="${projectName!}">
-                                </div>
-                                <div id="selectProject" style="width: 50px; float: right;">
-                                    <div class="btn btn-sm btn-primary">选择</div>
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="th">
-                        <div class="form-label">出差安排：</div>
-                    </td>
-                    <td colspan="3">
-                        <div class="form-group">
-                            <div class="form-item" style="margin: 10px 0;">
-                                <div class="z-comp-textarea" name="createReqVO$travelReason">
-                                    <textarea>${formEntity.travelReason!}</textarea>
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-            </table>
-        </div>
-        <div class="form-title">
-            <div class="form-icon">
-                <img src="/imgs/titleIcon.png" alt="">
-                <span>出差时间信息</span>
+          </td>
+        </tr>
+        <tr>
+          <td class="th">
+            <div class="form-label">申请时间：</div>
+          </td>
+          <td>
+            <div class="form-group">
+              <div class="form-item">
+                <div class="z-comp-date z-readonly" name="createReqVO$createTime">
+                  <input type="text" value="${(formEntity.createTime?date)!}">
+                </div>
+              </div>
             </div>
-            <div class="form-btn">
-                <div id="addData">
-                    <img src="/imgs/addIcon.png" alt="">
-                    <span>新增</span>
+          </td>
+          <td class="th">
+            <div class="form-label">出差单号：</div>
+          </td>
+          <td>
+            <div class="form-group">
+              <div class="form-item">
+                <div class="z-comp-input" name="createReqVO$attendanceNoteNo">
+                  <input type="text" value="${formEntity.travelNo!}">
                 </div>
+              </div>
             </div>
+          </td>
+        </tr>
+        <tr>
+          <td class="th">
+            <div class="form-label">同行人：</div>
+          </td>
+          <td colspan="3">
+            <div class="form-group">
+              <div class="z-comp-selecttree" name="partners">
+                <input type="hidden" name="createReqVO$partners" value="${formEntity.partners!}">
+                <div class="z-inputselect-bar">
+                  <span> ${formEntity.partnerNames!} </span><i></i>
+                </div>
+              </div>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td class="th">
+            <div class="form-label">出差的地点：</div>
+          </td>
+          <td colspan="3">
+            <div class="form-group">
+              <div class="form-item">
+                <div class="z-comp-input" name="createReqVO$travelPlace">
+                  <input type="text" value="${formEntity.travelPlace!}">
+                </div>
+              </div>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td class="th">
+            <div class="form-label">项目名称：</div>
+          </td>
+          <td colspan="3">
+            <div class="form-group">
+              <div class="form-item btns-form-box">
+                <input type="hidden" name="createReqVO$projectId" value="${formEntity.projectId!}">
+                <div class="z-comp-input" name="createReqVO$projectName">
+                  <input type="text" value="${projectName!}">
+                  <div id="selectProject" style="width: 50px; float: right;">
+                    <div class="btn btn-sm btn-primary">选择</div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td class="th">
+            <div class="form-label">出差安排：</div>
+          </td>
+          <td colspan="3">
+            <div class="form-group">
+              <div class="form-item" style="margin: 10px 0;">
+                <div class="z-comp-textarea" name="createReqVO$travelReason">
+                  <textarea> ${formEntity.travelReason!} </textarea>
+                </div>
+              </div>
+            </div>
+          </td>
+        </tr>
+      </table>
+    </div>
+    <div class="form-title">
+      <div class="form-icon">
+        <img src="/imgs/titleIcon.png" alt="">
+        <span>出差时间信息</span>
+      </div>
+      <div class="form-btn">
+        <div id="addData">
+          <img src="/imgs/addIcon.png" alt="">
+          <span>新增</span>
         </div>
-        <div class="qjsjxx-box">
-            <table class="form-table-info">
-                <tr>
-                    <td>序号</td>
-                    <td style="width: 30%;">起始时间</td>
-                    <td style="width: 30%;">截止时间</td>
-                    <td>备注</td>
-                    <td>操作</td>
-                </tr>
-                <tbody class="tbody tbodyQjsq">
-                </tbody>
-            </table>
-        </div>
+      </div>
+    </div>
+    <div class="qjsjxx-box">
+      <table class="form-table-info">
+        <tr>
+          <td>序号</td>
+          <td style="width: 30%;">起始时间</td>
+          <td style="width: 30%;">截止时间</td>
+          <td>备注</td>
+          <td>操作</td>
+        </tr>
+        <tbody class="tbody tbodyQjsq">
+        </tbody>
+      </table>
     </div>
-    <script language="javascript" src="/timeSelector/TimeSelector.js"></script>
-    <script language="javascript">
-        ;
-        (function () {
-        })();
-    </script>
-    <style type="text/css">
-    </style>
+  </div>
+  <script language="javascript" src="/timeSelector/TimeSelector.js"></script>
+  <script language="javascript">
+  ;
+  (function() {})();
+  </script>
+  <style type="text/css">
+  </style>
 </@w.workFlow>

zjugis-business/src/main/resources/templates/Travel/js/index.js

@@ -58,7 +58,7 @@
       for (let i = 0; i < arrays.length; i++) {
         let startDate = moment(arrays[i].startTime).format('YYYY-MM-DD')
         let endDate = moment(arrays[i].endTime).format('YYYY-MM-DD')
-        html += '<tr id="qjsj_' + i + '" style="background:#fff"> <td name="qjsj_seq">' + (i + 1) + '</td>'
+        html += '<tr class="qjsjClass" id="qjsj_' + i + '" style="background:#fff"> <td name="qjsj_seq">' + (i + 1) + '</td>'
           + '<td>'
           + '<div class="form-flex">'
           + '<div class="form-item" style="width: 50%;margin-right: 5px;">'
@@ -128,12 +128,13 @@
         })
       }
 
-      let s = document.querySelectorAll('.qjsjxx-box .z-comp-dateTime')
+      let sTbody = document.querySelectorAll('.qjsjClass')
       for (let i = 0; i < arrays.length; i++) {
         let startHHmm = moment(arrays[i].startTime).format('HH:mm')
         let endHHmm = moment(arrays[i].endTime).format('HH:mm')
-        z.ui.datetime("[name='LeaveTimeDO[" + i + "]$startTimeRange']").setValue(startHHmm)
-        z.ui.datetime("[name='LeaveTimeDO[" + i + "]$endTimeRange']").setValue(endHHmm)
+        sTbody[i].children[1].children[0].children[1].children[0].children[0].value = startHHmm
+        sTbody[i].children[2].children[0].children[1].children[0].children[0].value = endHHmm
+        sTbody[i].children[3].children[0].children[0].children[0].value = arrays[i].bz1 || ''
       }