diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 18c0ac5..7a2bf32 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -93,7 +93,11 @@
-
+
@@ -225,12 +230,14 @@ export default {
],
url: {
list: '/paymentRecord/payPaymentRecord/mainList',
- exportXlsUrl: ''
+ exportXlsUrl: '/paymentRecord/payPaymentRecord/exportXls'
},
selectProjectId: null, // 选中项目id
selectProjectType: null, // 选中项目类型
- selectProjectName: null, // 选中项目名称
- selectProjectChargeCompanyName: null // 选中项目来款企业
+ selectProjectName: null, // 选中项目名称open
+ selectProjectChargeCompanyName: null, // 选中项目来款企业
+ invoicingVisible: false,
+ arriveVisible: false
}
},
methods: {
@@ -240,7 +247,7 @@ export default {
*/
incomePayment(id) {
this.selectProjectId = id
- this.$refs.arriveStage.open()
+ this.arriveVisible = true
},
/**
* 开票
@@ -252,7 +259,7 @@ export default {
this.selectProjectType = record.projectType
this.selectProjectName = record.chargeProject
this.selectProjectChargeCompanyName = record.chargeCompanyTemporaryName
- this.$refs.invoicingStage.open()
+ this.invoicingVisible = true
}
}
}
diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
index f84fe75..a7be668 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
@@ -62,19 +62,30 @@ export default {
type: String,
required: false,
default: null
+ },
+ visible: {
+ type: Boolean,
+ required: false,
+ default: false
}
},
data() {
return {
title: '来款阶段',
width: 900,
- visible: false,
confirmLoading: false,
form: this.$form.createForm(this),
// 阶段列表,用于循环展示阶段信息
stageList: []
}
},
+ watch: {
+ visible(value) {
+ if (value) {
+ this.open()
+ }
+ }
+ },
methods: {
handleAdd() {
this.$refs.arriveModal.title = '添加阶段'
@@ -89,10 +100,10 @@ export default {
},
open() {
this.loadData()
- this.visible = true
},
close() {
- this.visible = false
+ this.$emit('update:visible', false)
+ this.$emit('ok')
},
loadData() {
this.confirmLoading = true
diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue
index bdde141..0777273 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue
@@ -51,7 +51,7 @@
-
+
添加阶段
@@ -72,25 +72,44 @@ import { payBillList } from '../../../../api/incomePaymentsApi'
export default {
name: 'InvoicingStageModule',
components: { InvoicingModule },
+ provide: {
+
+ },
props: {
// 项目id
projectId: {
type: String,
required: false,
default: null
+ },
+ // 弹窗显隐
+ visible: {
+ type: Boolean,
+ required: false,
+ default: false
}
},
data() {
return {
title: '开票阶段',
width: 900,
- visible: false,
+ // visible: false,
confirmLoading: false,
form: this.$form.createForm(this),
// 阶段列表,用于循环展示阶段信息
stageList: []
}
},
+ watch: {
+ // 弹窗显示时获取数据
+ visible: {
+ handler(value) {
+ if(value) {
+ this.open()
+ }
+ }
+ }
+ },
methods: {
handleAdd() {
this.$refs.invoicingModal.title = '添加阶段'
@@ -104,11 +123,14 @@ export default {
this.close()
},
open() {
+ // this.visible = true
+ console.log(this.projectId)
this.loadData()
- this.visible = true
},
close() {
- this.visible = false
+ // this.visible = false
+ this.$emit('update:visible', false)
+ this.$emit('ok')
},
loadData() {
this.confirmLoading = true
@@ -153,7 +175,7 @@ export default {
//将【一十】换成【十】
result = result.replace(/^一十/g, '十')
return result
- }
+ },
}
}