[update] 到账开票bug修改；导出功能

src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue

@@ -93,7 +93,11 @@
       </div>
     </a-card>
     <!--    来款阶段-->
-    <arrive-stage-module ref="arriveStage" @ok="modalFormOk" :project-id="selectProjectId"></arrive-stage-module>
+    <arrive-stage-module
+      ref="arriveStage"
+      @ok="modalFormOk"
+      :project-id="selectProjectId"
+      :visible.sync="arriveVisible"></arrive-stage-module>
     <!--    开票阶段-->
     <invoicing-stage-module
       ref="invoicingStage"
@@ -101,6 +105,7 @@
       :project-id="selectProjectId"
       :project-type="selectProjectType"
       :project-name="selectProjectName"
+      :visible.sync="invoicingVisible"
       :charge-company-name="selectProjectChargeCompanyName"></invoicing-stage-module>
     <project-detail-modal ref="projectDetail"></project-detail-modal>
   </div>
@@ -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
     }
   }
 }

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

src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue

@@ -51,7 +51,7 @@
       </div>
     </a-spin>
 
-<!--    <a-empty v-else></a-empty>-->
+    <!--    <a-empty v-else></a-empty>-->
 
     <template slot="footer">
       <a-button type="primary" @click="handleAdd">添加阶段</a-button>
@@ -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
-    }
+    },
   }
 }
 </script>