Merge branch 'feature/master' into feature/develop

src/views/business/financial/payment/form.vue

@@ -599,6 +599,15 @@
     if (id != null) {
       getPayment(id).then((res) => {
         form.value = res.data;
+        if(!res.data.collection) {
+          form.value.collection = {
+            projectNo: '',
+            projectName: '',
+            projectMainName: '',
+            isProject: '',
+          }
+        }
+        console.log(form.value)
         editStatus.value = false;
         paymentCauseChange(form.value.paymentCauseId);
         paymentSubjectChange(form.value.paymentSubjectId);