From 85b9dbfaa4afdc5738dcf97a40b50b58b1ee6ad6 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期五, 15 八月 2025 17:19:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue | 55 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue b/ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue
index 50225bc..4bd13f5 100644
--- a/ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue
@@ -310,7 +310,7 @@
// labelWidth: 120,
column: {
projectName: {
- label: '椤圭洰鍚嶇О1',
+ label: '椤圭洰鍚嶇О',
},
dispatchNo: {
label: '璋冨害鍗曞彿',
@@ -350,7 +350,9 @@
},
handleSelectionChangeFunc: (selection: any) => {
selectionList.value = selection;
- }
+ },
+
+
})
const dialog = reactive({
visible: false,
@@ -382,6 +384,7 @@
const handleAmend = (row) => {
newFormData.value.billId = row.id;
+ importForm.value.billId = row.id;
dispIshow.value = true;
newOption.value.menu = true;
listPendingSettlementBusiness({ billId: row.id }).then((res) => {
@@ -421,26 +424,31 @@
}
const newFormRef = ref();
const submitForm = () => {
- newFormRef.value!.validate(valid => {
- if (valid) {
- let data = {
- billId: newForm.value.id,
- fileName: newForm.value.attachment
- }
- addEstimatedReceivableLog(data).then((res1) => {
- if (res1.code === 200) {
- estimatedReceivableBillSettlement(newForm.value).then((res) => {
- if (res.code === 200) {
- proxy.$message.success('鎿嶄綔鎴愬姛');
- dialog.visible = false;
- newForm.value = {};
-
- }
- })
+ if(newTableData.value.length == 0) {
+ proxy.$message.error('鏃犲叧鑱旀槑缁嗭紝鏃犳硶缁撶畻');
+ }else {
+ newFormRef.value!.validate(valid => {
+ if (valid) {
+ let data = {
+ billId: newForm.value.id,
+ fileName: newForm.value.attachment
}
- })
- }
- });
+ addEstimatedReceivableLog(data).then((res1) => {
+ if (res1.code === 200) {
+ estimatedReceivableBillSettlement(newForm.value).then((res) => {
+ if (res.code === 200) {
+ onLoad(page.value);
+ proxy.$message.success('鎿嶄綔鎴愬姛');
+ dialog.visible = false;
+ newForm.value = {};
+
+ }
+ })
+ }
+ })
+ }
+ });
+ }
@@ -448,8 +456,9 @@
const submitFormTow = () => {
proxy.$modal.confirm(`鏄惁纭淇敼璐﹀崟鍚嶇О?`).then(function () {
- return updateEstimatedReceivableBillNmae(newForm.value);
+ return updateEstimatedReceivableBillNmae(importForm.value);
}).then((res) => {
+ onLoad(page.value);
proxy.$modal.msgSuccess(res.msg);
})
@@ -523,7 +532,7 @@
const flowParams = ref([])
const handleFlow = (row: string) => {
let data = {
- estimatedId: row.id,
+ billId: row.id,
}
listEstimatedReceivableBillLog(data).then((res) => {
flowParams.value = res.rows
--
Gitblit v1.8.0