Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

wujianwei

2025-08-18 7fe4969de94ec291b9f08e45a4570c7b32337b25

Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

 ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue

@@ -452,6 +452,16 @@
          billId: newForm.value.id,
          fileName: newForm.value.attachment
        }
       if (newForm.value.attachment == null || newForm.value.attachment === '' || newForm.value.attachment === undefined) {
             estimatedReceivableBillSettlement(newForm.value).then((res) => {
              if (res.code === 200) {
                onLoad(page.value);
                proxy.$message.success('操作成功');
                dialog.visible = false;
                newForm.value = {};
              }
            })
        }else{ 
        addEstimatedReceivableLog(data).then((res1) => {
          if (res1.code === 200) {
            estimatedReceivableBillSettlement(newForm.value).then((res) => {
@@ -464,6 +474,9 @@
            })
          }
        })
        }

   
      } else {
        // 表单验证失败
        return false;