开票流程修改

zjugis-business/src/main/resources/templates/FlowContract/js/selectMilestoneList.js

@@ -56,7 +56,7 @@
                 {name: "id", hidden: true, key: true},
                 {label: '里程碑名称', name: "name", width: 200},
                 {label: '回款金额', name: "returnAmount",align:"center", width: 100},
-                {label: '计划回款时间', name: "contractAmount",align:"center", width: 150},
+                {label: '计划回款时间', name: "planReturnTime",align:"center", width: 150},
                 {label: '说明', name: "description",align:"center", width: 300}
             ],
             loadComplete: function (xhr) {

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

@@ -303,6 +303,20 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                           </td>
                       </tr>
                       <tr>
+                          <td class="th">
+                              <div class="form-label">开票单位：</div>
+                          </td>·
+                          <td>
+                              <div class="form-group">
+                                  <div class="z-comp-selecttree" name="invoiceCompany">
+                                      <input type="hidden" name="contractInvoice$invoiceCompanyId" value="${formEntity.invoiceCompanyId!}">
+                                      <input type="hidden" name="contractInvoice$invoiceCompany" value="${formEntity.invoiceCompany!}">
+                                      <div class="z-inputselect-bar">
+                                          <span> ${formEntity.invoiceCompany!} </span><i></i>
+                                      </div>
+                                  </div>
+                              </div>
+                          </td>
                           <td class="th">
                               <div class="form-label">开票金额：</div>
                           </td>
@@ -315,6 +329,8 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                                   </div>
                               </div>
                           </td>
+                      </tr>
+                      <tr>
                           <td class="th">
                               <div class="form-label">发票类型：</div>
                           </td>
@@ -330,12 +346,10 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                                   </div>
                               </div>
                           </td>
-                      </tr>
-                      <tr>
                           <td class="th">
                               <div class="form-label">开票内容：</div>
                           </td>
-                          <td colspan="3">
+                          <td>
                               <div class="form-group">
                                   <div class="form-item">
                                       <div class="z-comp-input" name="contractInvoice$invoiceContent">

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

@@ -28,6 +28,7 @@
 
     function initData(){
         initPayCompany();
+        initInvoiceCompany();
     }
 
     function bindGenerateSerial(){
@@ -424,6 +425,27 @@
         }
     }
 
+
+    function initInvoiceCompany(){
+        z.ui.ajax({
+            type: "get",
+            url: "/common/company-tree",
+            data: {},
+            success: function (res) {
+                if(res && res.code === 0 && res.data.length > 0){
+                    selecttree("[name='invoiceCompany']",res.data,clickInvoiceCompany)
+                }
+            },
+            error: function () {
+            }
+        })
+    }
+
+    function clickInvoiceCompany(even, treeId, treeNode) {
+        $("[name='contractInvoice$invoiceCompany']").val(treeNode.name);
+        $("[name='contractInvoice$invoiceCompanyId']").val(treeNode.id);
+    }
+
     function initPayCompany(){
         z.ui.ajax({
             type: "get",