Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/api/modules/finance.ts

@@ -126,6 +126,8 @@ const financeApi = (axiosInstance: ApiInstance) => ({
     platformSettlement: (data: any) => axiosInstance.post('/receivable/platformSettlement', data),
     // 平台应收联系人查询
     queryReceivableContact: (data: any) => axiosInstance.post('/receivable/queryReceivableContact', data),
+    // 平台应收对接人查询
+    queryContractVos: () => axiosInstance.get('/agreement/queryContractVos'),
     // 查应收金额
     getPlatformSettlementReceivableAmount: (data: any) => axiosInstance.post('/receivable/getPlatformSettlementReceivableAmount', data),
 

src/views/platform/ticket.vue

@@ -339,7 +339,13 @@ const initCompanyContact = () => {
     }
   })
 }
-
+const getqueryContractVos = async () => {
+  api.financeApi.queryContractVos().then((res: any) => {
+    if (res.code == 200) {
+      options.value = res.data
+    }
+  })
+}
 const showTicket = ref(false)
 const contactPerson = ref('')
 if (route.query?.invoiceType) {
@@ -348,8 +354,11 @@ if (route.query?.invoiceType) {
   searchList.value[0].search = route.query.contactPerson || ''
   contactPerson.value = route.query.contactPerson || ''
   getByCompanyId()
+  // 勾选数据查询对应对接人 未勾选查全部
   if(selectedList.value.length > 0) {
     initData()
+  }else{
+    getqueryContractVos()
   }
 } else {
   showTicket.value = false
@@ -601,6 +610,7 @@ const calSub = async (minuend: number = 0, subtrahend: number) => {
   return res.data || 0
 }
 
+
 const openSettlement = (list, name) => {
   contactPerson.value = name
   selectedList.value = list

src/views/receivable/documentary/ticket.vue

@@ -78,12 +78,15 @@
           activeindex: activeindex
         }
       })">取消</el-button>
-      <el-button plain type="primary" :disabled="selectedList.some(item => item.receivablePremium <= 0) || (selectedList.length > 1 && !selectedList.every(item => item.companyId === selectedList[0]?.companyId))"
+      <el-button plain type="primary"
+        :disabled="selectedList.some(item => item.receivablePremium <= 0) || (selectedList.length > 1 && !selectedList.every(item => item.companyId === selectedList[0]?.companyId))"
         @click="handleTicket(true)">开票并结算</el-button>
-      <el-button type="primary" :disabled="selectedList.some(item => item.receivablePremium <= 0) || (selectedList.length > 1 && !selectedList.every(item => item.companyId === selectedList[0]?.companyId))"
+      <el-button type="primary"
+        :disabled="selectedList.some(item => item.receivablePremium <= 0) || (selectedList.length > 1 && !selectedList.every(item => item.companyId === selectedList[0]?.companyId))"
         @click="handleTicket(false)">开票</el-button>
     </div>
-    <el-dialog :close-on-click-modal="false" v-model="countShow" width="600" :title="isSettlement ? '开票并结算' : '开票'">
+    <el-dialog :close-on-click-modal="false" v-model="countShow" width="600" :title="isSettlement ? '开票并结算' : '开票'"
+      @close="handleClose">
       <el-form ref="CountForm" :model="countForm" :rules="countRules" label-width="120">
         <el-form-item prop="invoiceParty" label="开票方">
           <el-select v-model="countForm.invoiceParty" placeholder="请选择开票方">
@@ -114,10 +117,12 @@
           <el-input-number v-model="countForm.actualReceivedAmount" style="width: 100%;" :min="0" :precision="2"
             controls-position="right" @change="handleChange" />
         </el-form-item>
-        <el-form-item v-if="isSettlement && countForm.actualReceivedAmount >= countForm.receivableSupervisePremium" prop="settlementPaymentDifference" label="回款差额" >
+        <el-form-item v-if="isSettlement && countForm.actualReceivedAmount >= countForm.receivableSupervisePremium"
+          prop="settlementPaymentDifference" label="回款差额">
           <el-input v-model="countForm.settlementPaymentDifference" disabled></el-input>
         </el-form-item>
-        <el-form-item v-if="isSettlement && countForm.actualReceivedAmount > countForm.receivableSupervisePremium" prop="settlementPaymentReason" label="差额原因">
+        <el-form-item v-if="isSettlement && countForm.actualReceivedAmount > countForm.receivableSupervisePremium"
+          prop="settlementPaymentReason" label="差额原因">
           <el-input v-model="countForm.settlementPaymentReason" placeholder="请输入"></el-input>
         </el-form-item>
         <el-form-item prop="invoiceTime" label="开票日期">
@@ -488,6 +493,13 @@ const handelComfirmEdit = () => {
     }
   })
 }
+/** 关闭弹窗 */
+const handleClose = () => {
+  countForm.value = {
+    attachmentIds: []
+  }
+  countShow.value = false
+}
 onMounted(() => {
   initData()
   initCompany()

src/views/receivable/handingFee/invoiceRecord.vue

@@ -482,7 +482,9 @@ const handelComfirm = (CountForm) => {
         receivePaymentDate: countForm.value.receivePaymentDate,
         attachmentIds: countForm.value.attachmentIds,
         paymentDifference: countForm.value.paymentDifference,
-        paymentReason: countForm.value.paymentReason
+        paymentReason: countForm.value.paymentReason,
+        settlementPaymentDifference: countForm.value.settlementPaymentDifference,
+        settlementPaymentReason: countForm.value.settlementPaymentReason
       }).then((res: any) => {
         countShow.value = false
         if (res.code == 200) {