表单样式修改

zjugis-business/src/main/resources/static/flow/css/formCommon.css

@@ -156,7 +156,7 @@
   table-layout: fixed; /* 将表格布局设置为固定布局 */
 }
 .attendance-type-show {
-  display: none;
+  display: none !important;
 }
 
 .jbxx-table-info tr {
@@ -164,20 +164,33 @@
 }
 
 .jbxx-table-info tr td {
-  text-align: center;
   padding: 0 15px;
   box-sizing: border-box;
 }
 
-/*.jbxx-table-info tr td:nth-child(2n-1) {*/
-  /*width: 170px;*/
-  /*text-align: right;*/
-/*}*/
+/* .jbxx-table-info tr td:nth-child(2n-1) {
+  width: 170px;
+  text-align: right;
+} */
 
-/*.jbxx-table-info tr td:nth-child(2n) {*/
-  /*text-align: left;*/
-  /*width: calc(50% - 170px);*/
-/*}*/
+/* .jbxx-table-info tr td:nth-child(2n) {
+  text-align: left;
+  width: calc(50% - 170px);
+} */
+.jbxx-box-flex .th {
+  width: 160px !important;
+  text-align: right;
+}
+.jbxx-box-flex>table>tbody>tr {
+  display: flex;
+  height: auto !important;
+}
+.jbxx-box-flex>table>tbody>tr>td {
+  padding: 10px 10px;
+}
+.jbxx-box-flex>table>tbody>tr>td:not(.th) {
+  flex: 1;
+}
 .form-td-table table {
   width: 100%;
   border-collapse: collapse;

zjugis-business/src/main/resources/templates/FlowProject/apply.ftl

@@ -1,224 +1,242 @@
-<@w.workFlow javascripts=['/FlowProject/js/apply.js','/flow/js/formCommon.js'] styles=[ '/flow/css/formCommon.css']>
-    <div class="z-position form-boss" name="flow-form">
-        <div class="z-form-row" style="display: none;">
-            <input type="text" value="${formEntity.instanceId!}" name="project$instanceId">
-            <input type="text" value="${formEntity.id!}" name="project$id">
-        </div>
-        <div class="form-title" style="margin-top: 0px;">
-            <div class="form-icon">
-                <img src="/imgs/titleIcon.png" alt="">
-                <span>基本信息</span>
+<@w.workFlow javascripts=['/FlowProject/js/apply.js','/flow/js/formCommon.js']
+  styles=[ '/flow/css/formCommon.css' ]>
+  <div class="z-position form-boss" name="flow-form">
+    <div class="z-form-row" style="display: none;">
+      <input type="text" value="${formEntity.instanceId!}" name="project$instanceId">
+      <input type="text" value="${formEntity.id!}" name="project$id">
+    </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="project$xmmc">
+                  <input type="text" value="${formEntity.xmmc!}">
+                </div>
+              </div>
             </div>
-            <div class="form-btn">
+          </td>
+          <td class="th">
+            <div class="form-label">项目经理：</div>
+          </td>
+          <td>
+            <div class="form-group">
+              <div class="z-comp-selecttree" name="xmjl">
+                <input type="hidden" name="project$xmjlId" value="${formEntity.xmjlId!}">
+                <input type="hidden" name="project$xmjl" value="${formEntity.xmjl!}">
+                <div class="z-inputselect-bar">
+                  <span> ${formEntity.xmjl!} </span><i></i>
+                </div>
+              </div>
             </div>
-        </div>
-        <div class="jbxx-box">
-            <table class="jbxx-table-info">
-
-                <tr>
-                    <td>
-                        <div class="form-label">项目名称：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="project$xmmc">
-                                    <input type="text" value="${formEntity.xmmc!}">
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td>
-                        <div class="form-label">项目经理：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="z-comp-selecttree" name="xmjl">
-                                <input type="hidden" name="project$xmjlId" value="${formEntity.xmjlId!}">
-                                <input type="hidden" name="project$xmjl" value="${formEntity.xmjl!}">
-                                <div class="z-inputselect-bar">
-                                    <span>${formEntity.xmjl!}</span><i></i>
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <div class="form-label">责任部门：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="z-comp-selecttree" name="zrbm">
-                                <input type="hidden" name="project$zrbmId" value="${formEntity.zrbmId!}">
-                                <input type="hidden" name="project$zrbm" value="${formEntity.zrbm!}">
-                                <div class="z-inputselect-bar">
-                                    <span>${formEntity.zrbm!}</span><i></i>
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td>
-                        <div class="form-label">立项时间：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="z-comp-date" name="project$lxsj">
-                                <input type="text" value="${formEntity.lxsj!}">
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <div class="form-label">销售人员：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="z-comp-selecttree" name="xsry">
-                                <input type="hidden" name="project$xsryId" value="${formEntity.xsryId!}">
-                                <input type="hidden" name="project$xsry" value="${formEntity.xsry!}">
-                                <div class="z-inputselect-bar">
-                                    <span>${formEntity.xsry!}</span><i></i>
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td>
-                        <div class="form-label">行政区：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="z-comp-selecttree" name="area">
-                                <input type="hidden" name="project$xzqdm" value="${formEntity.xzqdm!}">
-                                <input type="hidden" name="project$xzqmc" value="${formEntity.xzqmc!}">
-                                <div class="z-inputselect-bar">
-                                    <span>${formEntity.xzqmc!}</span><i></i>
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <div class="form-label">项目类型：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="z-comp-selecttree" name="projectType">
-                                <input type="hidden" name="project$projectTypeId" value="${formEntity.projectTypeId!}">
-                                <input type="hidden" name="project$projectTypeName" value="${formEntity.projectTypeName!}">
-                                <div class="z-inputselect-bar">
-                                    <span>${formEntity.projectTypeName!}</span><i></i>
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td>
-                        <div class="form-label">行业：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="form-item">
-                                    <div class="z-comp-select" name="project$hyId"
-                                         data='${hyTypeList!}'>
-                                        <div class="z-inputselect-bar">
-                                            <span>${hyName!}</span><i></i>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <div class="form-label">预估工期：(天)</div>
-                    </td>
-                    <td >
-                        <div class="form-group">
-                            <div class="form-item" style="margin: 10px 0;">
-                                <div class="z-comp-input" name="project$yggq">
-                                    <input type="text" value="${formEntity.yggq!}">
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td>
-                        <div class="form-label">归属公司：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="z-comp-selecttree" name="belongCompany">
-                                <input type="hidden" name="project$belongCompanyid" value="${formEntity.belongCompanyid!}">
-                                <input type="hidden" name="project$belongCompanyname" value="${formEntity.belongCompanyname!}">
-                                <div class="z-inputselect-bar">
-                                    <span>${formEntity.belongCompanyname!}</span><i></i>
-                                </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="z-comp-selecttree" name="zrbm">
+                <input type="hidden" name="project$zrbmId" value="${formEntity.zrbmId!}">
+                <input type="hidden" name="project$zrbm" value="${formEntity.zrbm!}">
+                <div class="z-inputselect-bar">
+                  <span> ${formEntity.zrbm!} </span><i></i>
+                </div>
+              </div>
             </div>
-            <div class="form-btn">
+          </td>
+          <td class="th">
+            <div class="form-label">立项时间：</div>
+          </td>
+          <td>
+            <div class="form-group">
+              <div class="z-comp-date" name="project$lxsj">
+                <input type="text" value="${formEntity.lxsj!}">
+              </div>
             </div>
-        </div>
-        <div class="qjsjxx-box">
-            <div class="jbxx-box">
-                <table class="jbxx-table-info">
-                    <tr>
-                        <td>
-                            <div class="form-label">是否签合同：</div>
-                        </td>
-                        <td>
-                            <div class="form-group">
-                                <div class="z-comp-radio" name="project$isSign">
-                                    <div class="z-radio-item <#if (formEntity.isSign!-1) == 1>checked</#if>" value="1"><i></i>是</div>
-                                    <div class="z-radio-item <#if (formEntity.isSign!-1) == 0>checked</#if>" value="0"><i></i>否</div>
-                                </div>
-                            </div>
-                        </td>
-                        <td>
-                            <div class="form-label">利益分成（公司/部门）：</div>
-                        </td>
-                        <td>
-                            <div class="form-group">
-                                <div class="form-item">
-                                    <div class="z-comp-radio" name="project$shareRatio">
-                                        <div class="z-radio-item <#if (formEntity.shareRatio!0) == 0.4>checked</#if>" value="0.4"><i></i> 60% / 40%</div>
-                                        <div class="z-radio-item <#if (formEntity.shareRatio!0) == 0.375>checked</#if>" value="0.375"><i></i>62.5% / 37.5%</div>
-                                        <div class="z-radio-item " value=""><i></i>__% / __%</div>
-                                    </div>
-                                </div>
-                            </div>
-                        </td>
-                    </tr>
-                </table>
+          </td>
+        </tr>
+        <tr>
+          <td class="th">
+            <div class="form-label">销售人员：</div>
+          </td>
+          <td>
+            <div class="form-group">
+              <div class="z-comp-selecttree" name="xsry">
+                <input type="hidden" name="project$xsryId" value="${formEntity.xsryId!}">
+                <input type="hidden" name="project$xsry" value="${formEntity.xsry!}">
+                <div class="z-inputselect-bar">
+                  <span> ${formEntity.xsry!} </span><i></i>
+                </div>
+              </div>
             </div>
-        </div>
-        <#if WORKFLOW.OPINION! != "">
-            <div class="form-title">
-                <div class="form-icon">
-                    <img src="/imgs/titleIcon.png" alt="">
-                    <span>审批意见</span>
+          </td>
+          <td class="th">
+            <div class="form-label">行政区：</div>
+          </td>
+          <td>
+            <div class="form-group">
+              <div class="z-comp-selecttree" name="area">
+                <input type="hidden" name="project$xzqdm" value="${formEntity.xzqdm!}">
+                <input type="hidden" name="project$xzqmc" value="${formEntity.xzqmc!}">
+                <div class="z-inputselect-bar">
+                  <span> ${formEntity.xzqmc!} </span><i></i>
                 </div>
-                <div class="form-btn">
+              </div>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td class="th">
+            <div class="form-label">项目类型：</div>
+          </td>
+          <td>
+            <div class="form-group">
+              <div class="z-comp-selecttree" name="projectType">
+                <input type="hidden" name="project$projectTypeId" value="${formEntity.projectTypeId!}">
+                <input type="hidden" name="project$projectTypeName" value="${formEntity.projectTypeName!}">
+                <div class="z-inputselect-bar">
+                  <span> ${formEntity.projectTypeName!} </span><i></i>
                 </div>
+              </div>
             </div>
-            <div class="qjsjxx-box">
-                <div class="z-form-wrap" name="opinionsDiv">
-                    <div class="z-form-row">${WORKFLOW.OPINION!}</div>
+          </td>
+          <td class="th">
+            <div class="form-label">行业：</div>
+          </td>
+          <td>
+            <div class="form-group">
+              <div class="form-item">
+                <div class="form-item">
+                  <div class="z-comp-select" name="project$hyId"
+                    data='${hyTypeList!}'>
+                    <div class="z-inputselect-bar">
+                      <span> ${hyName!} </span><i></i>
+                    </div>
+                  </div>
                 </div>
+              </div>
             </div>
-        </#if>
+          </td>
+        </tr>
+        <tr>
+          <td class="th">
+            <div class="form-label">预估工期(天)：</div>
+          </td>
+          <td>
+            <div class="form-group">
+              <div class="form-item" style="margin: 10px 0;">
+                <div class="z-comp-input" name="project$yggq">
+                  <input type="text" value="${formEntity.yggq!}">
+                </div>
+              </div>
+            </div>
+          </td>
+          <td class="th">
+            <div class="form-label">归属公司：</div>
+          </td>
+          <td>
+            <div class="form-group">
+              <div class="z-comp-selecttree" name="belongCompany">
+                <input type="hidden" name="project$belongCompanyid" value="${formEntity.belongCompanyid!}">
+                <input type="hidden" name="project$belongCompanyname" value="${formEntity.belongCompanyname!}">
+                <div class="z-inputselect-bar">
+                  <span> ${formEntity.belongCompanyname!} </span><i></i>
+                </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>
     </div>
-    <style type="text/css">
-    </style>
-</@w.workFlow>
+    <div class="qjsjxx-box jbxx-box-flex">
+      <div class="jbxx-box">
+        <table class="jbxx-table-info">
+          <tr>
+            <td class="th">
+              <div class="form-label">是否签合同：</div>
+            </td>
+            <td>
+              <div class="form-group">
+                <div class="z-comp-radio" name="project$isSign">
+                  <div class="z-radio-item <#if (formEntity.isSign!-1) == 1>checked</#if>" value="1"><i></i>是</div>
+                  <div class="z-radio-item <#if (formEntity.isSign!-1) == 0>checked</#if>" value="0"><i></i>否</div>
+                </div>
+              </div>
+            </td>
+            <td class="th">
+              <div class="form-label">利益分成(公司/部门)：</div>
+            </td>
+            <td class="lyfc">
+              <div class="form-group">
+                <div class="form-item">
+                  <div class="z-comp-radio" name="project$shareRatio">
+                    <div class="z-radio-item <#if (formEntity.shareRatio!0) == 0.4>checked</#if>" value="0.4"><i></i> 60% / 40%</div>
+                    <div class="z-radio-item <#if (formEntity.shareRatio!0) == 0.375>checked</#if>" value="0.375"><i></i>62.5% / 37.5%</div>
+                    <div class="z-radio-item flexInputTwo" value=""><i></i>
+                      <input id="lyfcBm" type="text">%&nbsp;&nbsp;/&nbsp;&nbsp;  <input id="lyfcGs" type="text">%
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </td>
+          </tr>
+        </table>
+      </div>
+    </div>
+    <#if WORKFLOW.OPINION! !="">
+      <div class="form-title">
+        <div class="form-icon">
+          <img src="/imgs/titleIcon.png" alt="">
+          <span>审批意见</span>
+        </div>
+        <div class="form-btn">
+        </div>
+      </div>
+      <div class="qjsjxx-box">
+        <div class="z-form-wrap" name="opinionsDiv">
+          <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
+        </div>
+      </div>
+    </#if>
+  </div>
+  <style type="text/css">
+    .lyfc .z-comp-radio{
+      display: flex;
+      align-items: center;
+    }
+    .lyfc .flexInputTwo{
+      display: flex;
+      align-items: center;
+    }
+    .lyfc .flexInputTwo input{
+      border: 0;
+      width: 30px;
+      border-bottom: 1px solid #000;
+    }
+    .lyfc .flexInputTwo i{
+      margin-top: 0;
+    }
+  </style>
+</@w.workFlow>

zjugis-business/src/main/resources/templates/FlowProject/js/apply.js

@@ -1,159 +1,168 @@
 (function () {
-    let flowInstanceId = "";
-    let isView = "";
-    window.onload = function () {
-        flowInstanceId = z.ui.comm.getUrlParam("flowInstanceId");
-        bindEvents();
-    };
-
-    function bindEvents() {
-        initData();
-        z.workflow.saveBtn.addListener("onSaveClick", submit);
+  let flowInstanceId = "";
+  let isView = "";
+  window.onload = function () {
+    flowInstanceId = z.ui.comm.getUrlParam("flowInstanceId");
+
+    document.getElementById("lyfcBm").addEventListener("change", function (val) {
+      console.log(document.getElementById("lyfcBm").value);
+    });
+    document.getElementById("lyfcGs").addEventListener("change", function (val) {
+      console.log(document.getElementById("lyfcGs").value);
+    });
+
+
+    bindEvents();
+  };
+
+  function bindEvents() {
+    initData();
+    z.workflow.saveBtn.addListener("onSaveClick", submit);
+  }
+
+  function initData() {
+    initArea();
+    initXmjlAndXsry();
+    initZrbm();
+    initProjectType();
+    initBelongCompany();
+  }
+
+
+  function submit(all, istransfer) {
+    var postData = z.ui.form.getFormFields("[name=flow-form]", { validatorRequired: istransfer });
+    if (postData === false) {
+      all({ success: false });
+      return;
     }
-
-    function initData(){
-        initArea();
-        initXmjlAndXsry();
-        initZrbm();
-        initProjectType();
-        initBelongCompany();
-    }
-
-
-    function submit(all, istransfer) {
-        var postData = z.ui.form.getFormFields("[name=flow-form]", {validatorRequired: istransfer});
-        if (postData === false) {
-            all({success: false});
-            return;
+    z.ui.ajax({
+      url: z.ui.comm.getEntranceUrl("/flow/project/update"),
+      data: z.ui.form.childStringify(postData),
+      success: function () {
+        all({ success: true });
+      },
+      error: function () {
+        all({ success: false });
+      }
+    })
+  }
+
+  function initArea() {
+    z.ui.ajax({
+      type: "get",
+      url: "/common/area-tree",
+      data: {},
+      success: function (res) {
+        if (res && res.code === 0 && res.data.length > 0) {
+          selecttree("[name='area']", res.data, clickArea)
         }
-        z.ui.ajax({
-            url: z.ui.comm.getEntranceUrl("/flow/project/update"),
-            data: z.ui.form.childStringify(postData),
-            success: function () {
-                all({success: true});
-            },
-            error: function () {
-                all({success: false});
-            }
-        })
-    }
-
-    function initArea(){
-        z.ui.ajax({
-            type: "get",
-            url: "/common/area-tree",
-            data: {},
-            success: function (res) {
-                if(res && res.code === 0 && res.data.length > 0){
-                    selecttree("[name='area']",res.data,clickArea)
-                }
-            },
-            error: function () {
-            }
-        })
-    }
-
-    function initXmjlAndXsry(){
-        z.ui.ajax({
-            type: "get",
-            url: "/common/user-tree",
-            data: {},
-            success: function (res) {
-                if(res && res.length > 0){
-                    selecttree("[name='xmjl']",res,clickXmjl,allowChildClick)
-                    selecttree("[name='xsry']",res,clickXsry,allowChildClick);
-                }
-            },
-            error: function () {
-            }
-        })
-    }
-
-    function initBelongCompany(){
-        z.ui.ajax({
-            type: "get",
-            url: "/common/company-tree",
-            data: {},
-            success: function (res) {
-                if(res && res.data.length > 0){
-                    selecttree("[name='belongCompany']",res.data,clickBelongCompany)
-                }
-            },
-            error: function () {
-            }
-        })
-    }
-
-
-    function initZrbm(){
-        z.ui.ajax({
-            type: "get",
-            url: "/common/dept-tree",
-            data: {},
-            success: function (res) {
-                if(res && res.length > 0){
-                    selecttree("[name='zrbm']",res,clickZrbm)
-                }
-            },
-            error: function () {
-            }
-        })
-    }
-
-    function initProjectType(){
-        z.ui.ajax({
-            type: "get",
-            url: "/common/project-type-tree",
-            data: {},
-            success: function (res) {
-                if(res && res.code === 0 && res.data.length > 0){
-                    selecttree("[name='projectType']",res.data,clickProjectType)
-                }
-            },
-            error: function () {
-            }
-        })
-    }
-
-    function clickXmjl(even, treeId, treeNode) {
-        if(treeNode.type === 3){
-            $("[name='project$xmjl']").val(treeNode.name);
-            $("[name='project$xmjlId']").val(treeNode.id);
+      },
+      error: function () {
+      }
+    })
+  }
+
+  function initXmjlAndXsry() {
+    z.ui.ajax({
+      type: "get",
+      url: "/common/user-tree",
+      data: {},
+      success: function (res) {
+        if (res && res.length > 0) {
+          selecttree("[name='xmjl']", res, clickXmjl, allowChildClick)
+          selecttree("[name='xsry']", res, clickXsry, allowChildClick);
         }
-    }
-
-
-    function clickXsry(even, treeId, treeNode) {
-        if(treeNode.type === 3){
-
-            $("[name='project$xsry']").val(treeNode.name);
-            $("[name='project$xsryId']").val(treeNode.id);
+      },
+      error: function () {
+      }
+    })
+  }
+
+  function initBelongCompany() {
+    z.ui.ajax({
+      type: "get",
+      url: "/common/company-tree",
+      data: {},
+      success: function (res) {
+        if (res && res.data.length > 0) {
+          selecttree("[name='belongCompany']", res.data, clickBelongCompany)
         }
+      },
+      error: function () {
+      }
+    })
+  }
+
+
+  function initZrbm() {
+    z.ui.ajax({
+      type: "get",
+      url: "/common/dept-tree",
+      data: {},
+      success: function (res) {
+        if (res && res.length > 0) {
+          selecttree("[name='zrbm']", res, clickZrbm)
+        }
+      },
+      error: function () {
+      }
+    })
+  }
+
+  function initProjectType() {
+    z.ui.ajax({
+      type: "get",
+      url: "/common/project-type-tree",
+      data: {},
+      success: function (res) {
+        if (res && res.code === 0 && res.data.length > 0) {
+          selecttree("[name='projectType']", res.data, clickProjectType)
+        }
+      },
+      error: function () {
+      }
+    })
+  }
+
+  function clickXmjl(even, treeId, treeNode) {
+    if (treeNode.type === 3) {
+      $("[name='project$xmjl']").val(treeNode.name);
+      $("[name='project$xmjlId']").val(treeNode.id);
     }
+  }
 
-    function clickProjectType(even, treeId, treeNode) {
-        $("[name='project$projectTypeName']").val(treeNode.name);
-        $("[name='project$projectTypeId']").val(treeNode.id);
-    }
 
-    function clickArea(even, treeId, treeNode) {
-        $("[name='project$xzqmc']").val(treeNode.name);
-        $("[name='project$xzqdm']").val(treeNode.id);
-    }
+  function clickXsry(even, treeId, treeNode) {
+    if (treeNode.type === 3) {
 
-    function clickZrbm(even, treeId, treeNode) {
-        if(treeNode.type === 3){
-            $("[name='project$zrbm']").val(treeNode.name);
-            $("[name='project$zrbmId']").val(treeNode.id);
-        }
+      $("[name='project$xsry']").val(treeNode.name);
+      $("[name='project$xsryId']").val(treeNode.id);
+    }
+  }
+
+  function clickProjectType(even, treeId, treeNode) {
+    $("[name='project$projectTypeName']").val(treeNode.name);
+    $("[name='project$projectTypeId']").val(treeNode.id);
+  }
+
+  function clickArea(even, treeId, treeNode) {
+    $("[name='project$xzqmc']").val(treeNode.name);
+    $("[name='project$xzqdm']").val(treeNode.id);
+  }
+
+  function clickZrbm(even, treeId, treeNode) {
+    if (treeNode.type === 3) {
+      $("[name='project$zrbm']").val(treeNode.name);
+      $("[name='project$zrbmId']").val(treeNode.id);
     }
+  }
 
-    function clickBelongCompany(even, treeId, treeNode) {
-        if(treeNode.type === 3){
-            $("[name='project$belongCompanyname']").val(treeNode.name);
-            $("[name='project$belongCompanyid']").val(treeNode.id);
-        }
+  function clickBelongCompany(even, treeId, treeNode) {
+    if (treeNode.type === 3) {
+      $("[name='project$belongCompanyname']").val(treeNode.name);
+      $("[name='project$belongCompanyid']").val(treeNode.id);
     }
+  }
 
 
 

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

@@ -15,10 +15,10 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
             <div class="form-btn">
             </div>
         </div>
-        <div class="jbxx-box">
+        <div class="jbxx-box jbxx-box-flex">
             <table class="jbxx-table-info">
                 <tr>
-                    <td>
+                    <td class="th">
                         <div class="form-label">请假人：</div>
                     </td>
                     <td>
@@ -30,7 +30,7 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
                             </div>
                         </div>
                     </td>
-                    <td>
+                    <td class="th">
                         <div class="form-label">所在部门：</div>
                     </td>
                     <td>
@@ -44,7 +44,7 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
                     </td>
                 </tr>
                 <tr>
-                    <td>
+                    <td class="th">
                         <div class="form-label">申请时间：</div>
                     </td>
                     <td>
@@ -56,7 +56,7 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
                             </div>
                         </div>
                     </td>
-                    <td>
+                    <td class="th">
                         <div class="form-label">请假单号：</div>
                     </td>
                     <td>
@@ -70,7 +70,7 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
                     </td>
                 </tr>
                 <tr>
-                    <td>
+                    <td class="th">
                         <div class="form-label">休假类型：</div>
                     </td>
                     <td>
@@ -85,7 +85,7 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
                             </div>
                         </div>
                     </td>
-                    <td>
+                    <td class="th">
                         <div class="form-label">休假天数：</div>
                     </td>
                     <td>
@@ -99,7 +99,7 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
                     </td>
                 </tr>
                 <tr class="attendance-type-show">
-                    <td>
+                    <td class="th">
                         <div class="form-label">考勤类型：</div>
                     </td>
                     <td colspan="3">
@@ -114,7 +114,7 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
                     </td>
                 </tr>
                 <tr>
-                    <td>
+                    <td class="th">
                         <div class="form-label">请假原因：</div>
                     </td>
                     <td colspan="3">

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

@@ -10,7 +10,7 @@
         tbodyBoss.innerHTML = ''
         attendanceIndex = value
         if (value == '81') {
-          attendanceType.style = 'display:table-row'
+          attendanceType.style = 'display:flex !important'
         } else {
           attendanceType.style = 'display:none'
         }
@@ -168,7 +168,7 @@
         }
       }
     }
-    let days = sum /7.5;
+    let days = sum / 7.5;
     if (String(days).indexOf('.') > -1) {
       //有小数的话保留两位小数
       days = days.toFixed(2)

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

@@ -1,10 +1,10 @@
-<@w.workFlow javascripts=['/Travel/js/index.js','/flow/js/formCommon.js']
+<@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">
+            <input type="text" value='${timeObject!}' id="timeObject">
         </div>
         <div class="form-title" style="margin-top: 0px;">
             <div class="form-icon">
@@ -14,10 +14,10 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
             <div class="form-btn">
             </div>
         </div>
-        <div class="jbxx-box">
+        <div class="jbxx-box jbxx-box-flex">
             <table class="jbxx-table-info">
                 <tr>
-                    <td>
+                    <td class="th">
                         <div class="form-label">出差人：</div>
                     </td>
                     <td>
@@ -29,7 +29,7 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
                             </div>
                         </div>
                     </td>
-                    <td>
+                    <td class="th">
                         <div class="form-label">所在部门：</div>
                     </td>
                     <td>
@@ -43,7 +43,7 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
                     </td>
                 </tr>
                 <tr>
-                    <td>
+                    <td class="th">
                         <div class="form-label">申请时间：</div>
                     </td>
                     <td>
@@ -55,7 +55,7 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
                             </div>
                         </div>
                     </td>
-                    <td>
+                    <td class="th">
                         <div class="form-label">出差单号：</div>
                     </td>
                     <td>
@@ -69,7 +69,7 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
                     </td>
                 </tr>
                 <tr>
-                    <td>
+                    <td class="th">
                         <div class="form-label">同行人：</div>
                     </td>
                     <td colspan="3">
@@ -84,7 +84,7 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
                     </td>
                 </tr>
                 <tr>
-                    <td>
+                    <td class="th">
                         <div class="form-label">出差的地点：</div>
                     </td>
                     <td colspan="3">
@@ -98,7 +98,7 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
                     </td>
                 </tr>
                 <tr>
-                    <td>
+                    <td class="th">
                         <div class="form-label">项目名称：</div>
                     </td>
                     <td colspan="3">
@@ -116,7 +116,7 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
                     </td>
                 </tr>
                 <tr>
-                    <td>
+                    <td class="th">
                         <div class="form-label">出差安排：</div>
                     </td>
                     <td colspan="3">

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

@@ -1,165 +1,273 @@
 (function () {
-    window.onload = function (ex) {
-        var lists = []
-        var trFragment = document.createDocumentFragment();
-        $("#addData").click(function () {
-            var dataObj = {}
-            trFragment.appendChild(generateTableTrHtml(lists.length))
-            $(".tbody").append(trFragment)
-            timeSelector({
-                ele: ".startTimeRange" + lists.length,
-                name: "TravelTimeDO[" + lists.length + "]$startTimeRange",
-                callback: function (val) {
-                }
-            })
-            timeSelector({
-                ele: ".endTimeRange" + lists.length,
-                name: "TravelTimeDO[" + lists.length + "]$endTimeRange",
-                callback: function (val) {
-                }
-            })
-            $("#delBtn_" + lists.length).click(function () {
-                var index = this.id.substring(this.id.indexOf("_") + 1)
-                z.ui.confirm("compid").init({
-                    content: "确定删除吗？",
-                    onConfirm: function () {
-                        var element = document.getElementById("qjsj_" + index);
-                        element.remove();
-                        buildQjsjSeq();
-                    },
-                    onCancel: function () {
-
-                    }
-                })
-
-            })
-            z.ui.date("[name='TravelTimeDO[" + lists.length + "]$startTime']").init()
-            z.ui.date("[name='TravelTimeDO[" + lists.length + "]$endTime']").init()
+  window.onload = function (ex) {
+    let timeObject = document.querySelector('#timeObject')
+    let arrays = JSON.parse(timeObject.value)
+    var lists = []
+    var trFragment = document.createDocumentFragment();
+    $("#addData").click(function () {
+      var dataObj = {}
+      trFragment.appendChild(generateTableTrHtml(lists.length))
+      $(".tbody").append(trFragment)
+      let listsLength = lists.length
+      if (arrays.length > 0) {
+        listsLength = arrays.length + lists.length
+      }
+      timeSelector({
+        ele: ".startTimeRange" + listsLength,
+        name: "TravelTimeDO[" + listsLength + "]$startTimeRange",
+        callback: function (val) {
+        }
+      })
+      timeSelector({
+        ele: ".endTimeRange" + listsLength,
+        name: "TravelTimeDO[" + listsLength + "]$endTimeRange",
+        callback: function (val) {
+        }
+      })
+      $("#delBtn_" + listsLength).click(function () {
+        var index = this.id.substring(this.id.indexOf("_") + 1)
+        z.ui.confirm("compid").init({
+          content: "确定删除吗？",
+          onConfirm: function () {
+            var element = document.getElementById("qjsj_" + index);
+            element.remove();
             buildQjsjSeq();
-            lists.push(dataObj)
-        })
-        initPartners();
-        $("#selectProject").click(function (){
-            selectProject(null,setProject);
+          },
+          onCancel: function () {
+
+          }
         })
-        bindEvents();
-    }
 
+      })
+      z.ui.date("[name='TravelTimeDO[" + listsLength + "]$startTime']").init()
+      z.ui.date("[name='TravelTimeDO[" + listsLength + "]$endTime']").init()
+      buildQjsjSeq();
+      lists.push(dataObj)
+    })
+    initPartners();
+    $("#selectProject").click(function () {
+      selectProject(null, setProject);
+    })
+    bindEvents();
 
-    //注册业务保存事件
-    function bindEvents() {
-        z.workflow.saveBtn.addListener("onSaveClick", saveForm);
-    }
+    //根据返回的json对象渲染出差时间信息
 
-    function buildQjsjSeq() {
-        let elementsByName = document.getElementsByName("qjsj_seq");
-        for (let i = 0; i < elementsByName.length; i++) {
-            const seqElement = elementsByName[i];
-            seqElement.innerHTML = i + 1;
-        }
-    }
+    let tbodyQjsq = document.querySelector('.tbodyQjsq')
+    let html = ""
+    if (arrays.length > 0) {
+      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>'
+          + '<td>'
+          + '<div class="form-flex">'
+          + '<div class="form-item" style="width: 50%;margin-right: 5px;">'
+          + '<div class="z-comp-date" name="TravelTimeDO[' + i + ']$startTime">'
+          + '<input type="text" value="' + startDate + '">'
+          + '</div>'
+          + '</div>'
+          + '<div style="width: 50%;margin-left: 5px;" class="dateTimeRange startTimeRange' + (i) + '">'
+          + '</div>'
+          + '<span class="nbsp"> - </span>'
+          + '</div>'
+          + '</td>'
+          + '<td>'
+          + '<div class="form-flex">'
+          + '<div class="form-item" style="width: 50%;margin-right: 5px;">'
+          + '<div class="z-comp-date" name="TravelTimeDO[' + i + ']$endTime">'
+          + '<input type="text" value="' + endDate + '">'
+          + '</div>'
+          + '</div>'
+          + '<div style="width: 50%;margin-left: 5px;" class="dateTimeRange endTimeRange' + (i) + '">'
+          + '</div>'
+          + '</div>'
+          + '</td>'
+          + '<td>'
+          + '<div class="form-item">'
+          + '<div class="z-comp-input" name="TravelTimeDO[0]$bz1">'
+          + '<input type="text" value="">'
+          + '</div>'
+          + '</div>'
+          + '</td>'
+          + '<td>'
+          + '<div id="delBtn_' + (i) + '" class="table-btn delBtn_' + (i) + '" data-index="' + (i) + '">'
+          + '<span>删除</span>'
+          + '</div>'
+          + '</td></tr>';
+      }
+      tbodyQjsq.innerHTML = html
 
-    /*
-	* all 工作流js传递到业务的参数 success执行的方法
-	* istransfer 工作流js传递到业务的参数 是否转件
-	* */
-    function saveForm(all, istransfer) {
-        var postData = z.ui.form.getFormFields($("[name=createReqVO]"));
-        if (postData == false) return;
-        postData.createReqVO.instanceId = z.ui.comm.getUrlParam("flowInstanceId");
-        var travelTimeCreateList = new Array()
-        for (let key of Object.keys(postData)) {
-            let mealName = postData[key];
-            if (key.startsWith("TravelTimeDO")) {
-                mealName.startTime = Date.parse(mealName.startTime + " " + mealName.startTimeRange);
-                mealName.endTime = Date.parse(mealName.endTime + " " + mealName.endTimeRange);
-                travelTimeCreateList.push(z.ui.form.childStringify(mealName));
-            }
-        }
-        postData.createReqVO.travelTimeCreateList = travelTimeCreateList;
-        z.ui.ajax({
-            type: "post",
-            url: "/BusinessTravel/update",
-            data: JSON.stringify(postData.createReqVO),
-            contentType: "application/json",
-            success: function () {
-                all({success: true});
+      for (let i = 0; i < arrays.length; i++) {
+        timeSelector({
+          ele: ".startTimeRange" + (i),
+          name: "LeaveTimeDO[" + (i) + "]$startTimeRange",
+          callback: function (val) {
+          }
+        })
+
+        timeSelector({
+          ele: ".endTimeRange" + (i),
+          name: "LeaveTimeDO[" + (i) + "]$endTimeRange",
+          callback: function (val) {
+          }
+        })
+
+        $("#delBtn_" + i).click(function () {
+          z.ui.confirm("compid").init({
+            content: "确定删除吗？",
+            onConfirm: function () {
+              var element = document.getElementById("qjsj_" + i);
+              element.remove();
+              buildQjsjSeq();
             },
-            error: function () {
-                all({success: false});
+            onCancel: function () {
+
             }
+          })
+
         })
+      }
+
+      let s = document.querySelectorAll('.qjsjxx-box .z-comp-dateTime')
+      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)
+      }
+
+
+
     }
 
+  }
+
+
+
+
+  //注册业务保存事件
+  function bindEvents() {
+    z.workflow.saveBtn.addListener("onSaveClick", saveForm);
+  }
 
-    function generateTableTrHtml(index) {
-        var trDom = document.createElement("tr");
-        trDom.style.backgroundColor = "#fff";
-        trDom.id = "qjsj_" + index;
-        trDom.innerHTML = '<td name="qjsj_seq">' + (index + 1) + '</td>'
-            + '<td>'
-            + '<div class="form-flex">'
-            + '<div class="form-item" style="width: 50%;margin-right: 5px;">'
-            + '<div class="z-comp-date" name="TravelTimeDO[' + index + ']$startTime">'
-            + '<input type="text" value="">'
-            + '</div>'
-            + '</div>'
-            + '<div style="width: 50%;margin-left: 5px;" class="dateTimeRange startTimeRange' + (index) + '">'
-            + '</div>'
-            + '<span class="nbsp"> - </span>'
-            + '</div>'
-            + '</td>'
-            + '<td>'
-            + '<div class="form-flex">'
-            + '<div class="form-item" style="width: 50%;margin-right: 5px;">'
-            + '<div class="z-comp-date" name="TravelTimeDO[' + index + ']$endTime">'
-            + '<input type="text" value="">'
-            + '</div>'
-            + '</div>'
-            + '<div style="width: 50%;margin-left: 5px;" class="dateTimeRange endTimeRange' + (index) + '">'
-            + '</div>'
-            + '</div>'
-            + '</td>'
-            + '<td>'
-            + '<div class="form-item">'
-            + '<div class="z-comp-input" name="TravelTimeDO[0]$bz1">'
-            + '<input type="text" value="">'
-            + '</div>'
-            + '</div>'
-            + '</td>'
-            + '<td>'
-            + '<div id="delBtn_' + (index) + '" class="table-btn delBtn_' + (index) + '" data-index="' + (index) + '">'
-            + '<span>删除</span>'
-            + '</div>'
-            + '</td>';
-        return trDom;
+  function buildQjsjSeq() {
+    let elementsByName = document.getElementsByName("qjsj_seq");
+    for (let i = 0; i < elementsByName.length; i++) {
+      const seqElement = elementsByName[i];
+      seqElement.innerHTML = i + 1;
     }
+  }
 
-    function initPartners(){
-        z.ui.ajax({
-            type: "get",
-            url: "/common/user-tree",
-            data: {},
-            success: function (res) {
-                if(res && res.length > 0){
-                    selectMutiTree("[name='partners']",res,clickPartners)
-                }
-                if($("[name='createReqVO$partners']").val()){
-                    z.ui.selecttree("[name='partners']").setValue($("[name='createReqVO$partners']").val().split(","));
-                }
-            },
-            error: function () {
-            }
-        })
+  /*
+* all 工作流js传递到业务的参数 success执行的方法
+* istransfer 工作流js传递到业务的参数 是否转件
+* */
+  function saveForm(all, istransfer) {
+    var postData = z.ui.form.getFormFields($("[name=createReqVO]"));
+    if (postData == false) return;
+    postData.createReqVO.instanceId = z.ui.comm.getUrlParam("flowInstanceId");
+    var travelTimeCreateList = new Array()
+    for (let key of Object.keys(postData)) {
+      let mealName = postData[key];
+      if (key.startsWith("TravelTimeDO")) {
+        mealName.startTime = Date.parse(mealName.startTime + " " + mealName.startTimeRange);
+        mealName.endTime = Date.parse(mealName.endTime + " " + mealName.endTimeRange);
+        travelTimeCreateList.push(z.ui.form.childStringify(mealName));
+      }
     }
+    postData.createReqVO.travelTimeCreateList = travelTimeCreateList;
+    z.ui.ajax({
+      type: "post",
+      url: "/BusinessTravel/update",
+      data: JSON.stringify(postData.createReqVO),
+      contentType: "application/json",
+      success: function () {
+        all({ success: true });
+      },
+      error: function () {
+        all({ success: false });
+      }
+    })
+  }
+
 
-    function clickPartners(even, treeId, treeNode) {
-        $("[name='createReqVO$partners']").val(z.ui.selecttree("[name='partners']").getValue());
+  function generateTableTrHtml(index) {
+    let timeObject = document.querySelector('#timeObject')
+    let arrays = JSON.parse(timeObject.value)
+    let indexC = 0
+    if (arrays.length > 0) {
+      indexC = arrays.length + index
+    } else {
+      indexC = index
     }
-    function setProject(res){
-        if(res.data){
-            $("[name='createReqVO$projectId']").val(res.data.id);
-            z.ui.input("[name='createReqVO$projectName']").setValue(res.data.xmmc);
+
+    var trDom = document.createElement("tr");
+    trDom.style.backgroundColor = "#fff";
+    trDom.id = "qjsj_" + indexC;
+    trDom.innerHTML = '<td name="qjsj_seq">' + (indexC + 1) + '</td>'
+      + '<td>'
+      + '<div class="form-flex">'
+      + '<div class="form-item" style="width: 50%;margin-right: 5px;">'
+      + '<div class="z-comp-date" name="TravelTimeDO[' + indexC + ']$startTime">'
+      + '<input type="text" value="">'
+      + '</div>'
+      + '</div>'
+      + '<div style="width: 50%;margin-left: 5px;" class="dateTimeRange startTimeRange' + (indexC) + '">'
+      + '</div>'
+      + '<span class="nbsp"> - </span>'
+      + '</div>'
+      + '</td>'
+      + '<td>'
+      + '<div class="form-flex">'
+      + '<div class="form-item" style="width: 50%;margin-right: 5px;">'
+      + '<div class="z-comp-date" name="TravelTimeDO[' + indexC + ']$endTime">'
+      + '<input type="text" value="">'
+      + '</div>'
+      + '</div>'
+      + '<div style="width: 50%;margin-left: 5px;" class="dateTimeRange endTimeRange' + (indexC) + '">'
+      + '</div>'
+      + '</div>'
+      + '</td>'
+      + '<td>'
+      + '<div class="form-item">'
+      + '<div class="z-comp-input" name="TravelTimeDO[0]$bz1">'
+      + '<input type="text" value="">'
+      + '</div>'
+      + '</div>'
+      + '</td>'
+      + '<td>'
+      + '<div id="delBtn_' + (indexC) + '" class="table-btn delBtn_' + (indexC) + '" data-index="' + (indexC) + '">'
+      + '<span>删除</span>'
+      + '</div>'
+      + '</td>';
+    return trDom;
+  }
+
+  function initPartners() {
+    z.ui.ajax({
+      type: "get",
+      url: "/common/user-tree",
+      data: {},
+      success: function (res) {
+        if (res && res.length > 0) {
+          selectMutiTree("[name='partners']", res, clickPartners)
         }
+        if ($("[name='createReqVO$partners']").val()) {
+          z.ui.selecttree("[name='partners']").setValue($("[name='createReqVO$partners']").val().split(","));
+        }
+      },
+      error: function () {
+      }
+    })
+  }
+
+  function clickPartners(even, treeId, treeNode) {
+    $("[name='createReqVO$partners']").val(z.ui.selecttree("[name='partners']").getValue());
+  }
+  function setProject(res) {
+    if (res.data) {
+      $("[name='createReqVO$projectId']").val(res.data.id);
+      z.ui.input("[name='createReqVO$projectName']").setValue(res.data.xmmc);
     }
+  }
 }());