Преглед на файлове

回款登记子项目问题修改

yewc преди 9 месеца
родител
ревизия
69cf43ab5a

+ 14 - 2
zjugis-business/src/main/resources/templates/FlowContractInvoice/js/afterFinance.js

@@ -172,7 +172,8 @@
                     virtualAmount: contractList[i].virtualAmount || "",
                     invoiceAmount: contractList[i].invoiceAmount || "",
                     returnAmount: contractList[i].returnAmount || "",
-                    id: contractList[i].id || ""
+                    id: contractList[i].id || "",
+                    contractId: contractList[i].contractId || "",
                 }
                 contractInvoiceList.push(obj)
             }
@@ -191,6 +192,7 @@
                 + '<div class="form-flex">'
                 + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
                 + '<input type="hidden" name="Contract[' + i + ']$id" value="'+contractInvoiceList[i].id+'"/>'
+                + '<input type="hidden" name="Contract[' + i + ']$contractId" value="'+contractInvoiceList[i].contractId+'"/>'
                 + '<div class="z-comp-input" name="Contract[' + i + ']$type">'
                 + '<input type="text" value="'+type+'">'
                 + '</div>'
@@ -395,6 +397,7 @@
         }
         $("#addData").click(function(){
             addContractReturnMoney();
+            calcReturnAmount();
         })
         updateView()
     }
@@ -749,6 +752,14 @@
                 var returnId = tr.find("[name='ContractReturnMoney["+i+"]$id']").val();
 
                 var bz =tr.find("[name='ContractReturnMoney["+i+"]$bz'] input").val();
+                var formInfo = z.ui.form.getFormFields("[name=flow-form]", {validatorRequired: false});
+                var relationList = [];
+                for (let key of Object.keys(formInfo)) {
+                    let mealName = formInfo[key];
+                    if (key.startsWith("Contract[")) {
+                        relationList.push(z.ui.form.childStringify(mealName));
+                    }
+                }
                 if (html === '保存')  {
 
                     z.ui.ajax({
@@ -763,7 +774,8 @@
                             'contractMilestoneName' : contractMilestoneName,
                             'returnAmount': returnAmount,
                             'returnDate': returnDate,
-                            'bz': bz
+                            'bz': bz,
+                            'relationList': relationList
                         }),
                         success: function (res) {
                             if(res.code === 0){

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

@@ -220,7 +220,8 @@
                     virtualAmount: contractList[i].virtualAmount || "",
                     invoiceAmount: contractList[i].invoiceAmount || "",
                     returnAmount: contractList[i].returnAmount || "",
-                    id: contractList[i].id || ""
+                    id: contractList[i].id || "",
+                    contractId: contractList[i].contractId || "",
                 }
                 contractInvoiceList.push(obj)
             }
@@ -239,6 +240,7 @@
                 + '<div class="form-flex">'
                 + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
                 + '<input type="hidden" name="Contract[' + i + ']$id" value="'+contractInvoiceList[i].id+'"/>'
+                + '<input type="hidden" name="Contract[' + i + ']$contractId" value="'+contractInvoiceList[i].contractId+'"/>'
                 + '<div class="z-comp-input" name="Contract[' + i + ']$type">'
                 + '<input type="text" value="'+type+'">'
                 + '</div>'
@@ -443,6 +445,7 @@
         }
         $("#addData").click(function(){
             addContractReturnMoney();
+            calcReturnAmount();
         })
         updateView()
     }
@@ -797,6 +800,14 @@
                 var returnId = tr.find("[name='ContractReturnMoney["+i+"]$id']").val();
 
                 var bz =tr.find("[name='ContractReturnMoney["+i+"]$bz'] input").val();
+                var formInfo = z.ui.form.getFormFields("[name=flow-form]", {validatorRequired: false});
+                var relationList = [];
+                for (let key of Object.keys(formInfo)) {
+                    let mealName = formInfo[key];
+                    if (key.startsWith("Contract[")) {
+                        relationList.push(z.ui.form.childStringify(mealName));
+                    }
+                }
                 if (html === '保存')  {
 
                     z.ui.ajax({
@@ -811,7 +822,8 @@
                             'contractMilestoneName' : contractMilestoneName,
                             'returnAmount': returnAmount,
                             'returnDate': returnDate,
-                            'bz': bz
+                            'bz': bz,
+                            'relationList': relationList
                         }),
                         success: function (res) {
                             if(res.code === 0){