Parcourir la source

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

祁鹏飞 il y a 2 mois
Parent
commit
b83f0af093

+ 4 - 4
src/views/receivable/documentary/documentaryReport.vue

@@ -67,7 +67,7 @@
                   <template #dropdown>
                   <template #dropdown>
                     <el-dropdown-menu>
                     <el-dropdown-menu>
                       <el-dropdown-item @click="handleSettlementDetail(scope.row)">结算明细</el-dropdown-item>
                       <el-dropdown-item @click="handleSettlementDetail(scope.row)">结算明细</el-dropdown-item>
-                      <!-- <el-dropdown-item @click="handleInvoiceRecord(scope.row)">开票明细</el-dropdown-item> -->
+                      <el-dropdown-item @click="handleInvoiceRecord(scope.row)">开票明细</el-dropdown-item>
                     </el-dropdown-menu>
                     </el-dropdown-menu>
                   </template>
                   </template>
                 </el-dropdown>
                 </el-dropdown>
@@ -621,9 +621,9 @@ const handleSettlementDetail = (row) => {
 }
 }
 // 开票明细
 // 开票明细
 const handleInvoiceRecord = (row) => {
 const handleInvoiceRecord = (row) => {
-  activeName.value = '3'
-  recordForm2.value.partnerCompanyId = row.partnerCompanyId
-  initData3(['2'])
+  router.push({
+    path: '/receivable/documentary/documentaryRecord',
+  })
 }
 }
 
 
 const handleExport = (type) => {
 const handleExport = (type) => {

+ 1 - 1
src/views/receivable/documentary/ticket.vue

@@ -258,7 +258,7 @@ const handlePtlAgreementChange = (index: any, e: any) => {
 
 
 // 保险公司选择器改变时触发
 // 保险公司选择器改变时触发
 const handleCompanyChange = (index: any, e: any) => {
 const handleCompanyChange = (index: any, e: any) => {
-  searchList.value[index].search = e[e.length - 1] || ''
+  searchList.value[index].search = e.join(',') || ''
 }
 }
 // 签单时间选择器改变时触发
 // 签单时间选择器改变时触发
 const signDateSelectChange = (index: any, e: any) => {
 const signDateSelectChange = (index: any, e: any) => {