Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/contract/index.vue

@@ -129,6 +129,7 @@ function exportContract() {
 }
 
 async function addEditor(row?: any) {
+  allLoading.addEditorSaveLoading = false
   editForm.value = row ? setEditForm(row) : {}
   allDynamicText.addEditorText = row ? '编辑合同' : '新增合同'
   contractTemplate.value.list = setTemplateDataDisable(contractTemplate.value.list, [...getTemplateKey(contractTemplate.value.list)], row?.status == 0)
@@ -223,6 +224,28 @@ async function addEditorSave() {
     endDate: data.endDate ? formatDate(new Date(data.endDate)) : '',
     paymentListStr: JSON.stringify(newPaymentPlan)
   })
+
+  let totalAmount = 0
+  // 判断
+  for(let i in paymentPlan) {
+    if(!paymentPlan[i].payDate) {
+      globalPopup?.showWarning('回款日期不能为空')
+      return
+    }
+
+    if(!paymentPlan[i].amount || paymentPlan[i].amount == 0) {
+      globalPopup?.showWarning('回款金额不能为空和0')
+      return
+    }
+
+    totalAmount += +paymentPlan[i].amount || 0
+  }
+
+  if(totalAmount > +(formVal.amounts || 0)) {
+    globalPopup?.showWarning('总回款金额不得大于合同金额')
+    return
+  }
+
   allLoading.addEditorSaveLoading = true
   post(url, { ...formVal }).then((res) => {
     if (enclosure.length > 0) {
@@ -231,6 +254,12 @@ async function addEditorSave() {
     if (enclosureDetele.length > 0) {
       fileUploadDetele(String(res.data || editForm.value.id), enclosureDetele)
     }
+    if(enclosure.length == 0) {
+      allLoading.addEditorSaveLoading = false
+      globalPopup?.showSuccess('添加成功')
+      allVisable.addEditorVisable = false
+      getContractTableList()
+    }
   }).catch(() => {
     allVisable.addEditorVisable = false
   })