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

src/views/receivable/documentary/documentaryRecord.vue

@@ -75,7 +75,11 @@
       <el-table-column prop="createTime" label="开票时间" width="150"></el-table-column>
       <el-table-column label="操作" width="150" fixed="right">
         <template #default="scope">
-          <el-button link type="primary" @click="handleCount(scope.row)">结算</el-button>
+          <el-button link type="primary" v-if="scope.row.settlementStatus == '未结算'"  @click="handleCount(scope.row)">结算</el-button>
+          <el-button link type="primary" v-if="scope.row.settlementStatus == '已结算'" @click="handleView(scope.row)">明细查询</el-button>
+          <el-button link type="primary" v-if="scope.row.settlementStatus == '未结算'" @click="handleDelete(scope.row)">删除</el-button>
+
+
         </template>
       </el-table-column>
     </el-table>
@@ -147,8 +151,10 @@
 <script setup lang="ts">
 
 import api from "@/api";
-import { ElMessage } from 'element-plus'
-
+import { useRoute, useRouter } from 'vue-router'
+import { ElMessage, ElMessageBox } from 'element-plus'
+const route = useRoute()
+const router = useRouter()
 let form = ref({})
 let tableData = ref([])
 
@@ -237,7 +243,44 @@ const calSub = async (minuend: number = 0, subtrahend: number) => {
   const res = await api.financeApi.calSub({ minuend, subtrahend })
   return res.data || 0
 }
+// 明细查询
+const handleView = (row) => {
+  router.push({
+    path: '/receivable/documentary/documentaryReport',
+    query: {
+      activeName: '2',
+      id: row.id
+    }
+  })
+}
+// 删除
+const handleDelete = (row) => {
+  ElMessageBox.confirm(
+    '确定要删除吗',
+    '删除发票',
+    {
+      confirmButtonText: '确定',
+      type: 'error',
+      center: true,
+      confirmButtonClass: 'el-button--danger',
+    }
+  )
+    .then(() => {
+      api.financeApi.deleteInvoiceById(row.id).then((res: any) => {
+        if (res.code == 200) {
+          reset()
+          ElMessage({
+            message: res.msg,
+            type: 'success'
+          })
+        } else {
 
+        }
+      })
+    })
+    .catch(() => {
+    })
+}
 // 列表
 const initList = () => {
   api.invoiceRecordApi.invoiceRecord({

src/views/receivable/documentary/documentaryReport.vue

@@ -446,13 +446,13 @@ const initData1 = () => {
 const initData2 = () => {
   api.settlementApi.superviseSettlementExcel({
     agreementType: '2',
-    settlementId: recordForm1.settlementId,
-    companyId: recordForm1.companyId,
-    invoiceParty: recordForm1.invoiceParty,
-    invoiceType: recordForm1.invoiceType,
-    status: recordForm1.status,
-    settlementPerson: recordForm1.settlementPerson,
-    invoiceId: recordForm1.invoiceId,
+    settlementId: recordForm1.value.settlementId,
+    companyId: recordForm1.value.companyId,
+    invoiceParty: recordForm1.value.invoiceParty,
+    invoiceType: recordForm1.value.invoiceType,
+    status: recordForm1.value.status,
+    settlementPerson: recordForm1.value.settlementPerson,
+    invoiceId: recordForm1.value.invoiceId,
     settlementTimeStart: recordForm1.value.settlementTime?.[0],
     settlementTimeEnd: recordForm1.value.settlementTime?.[1],
     pages: pages.value,
@@ -468,11 +468,11 @@ const initData2 = () => {
 const initData3 = (invoiceTypes) => {
   let params = invoiceTypes.includes('2') ?
     {
-      invoiceId: recordForm2.invoiceId,
-      companyId: recordForm2.companyId,
-      invoiceParty: recordForm2.invoiceParty,
-      settlementPerson: recordForm2.settlementPerson,
-      status: recordForm2.status,
+      invoiceId: recordForm2.value.invoiceId,
+      companyId: recordForm2.value.companyId,
+      invoiceParty: recordForm2.value.invoiceParty,
+      settlementPerson: recordForm2.value.settlementPerson,
+      status: recordForm2.value.status,
       settlementTimeStart: recordForm2.value.settlementTime?.[0],
       settlementTimeEnd: recordForm2.value.settlementTime?.[1],
       pages: pages.value,
@@ -481,11 +481,11 @@ const initData3 = (invoiceTypes) => {
     } :
     invoiceTypes.includes('4') ?
       {
-        invoiceId: recordForm3.invoiceId,
-        companyId: recordForm3.companyId,
-        invoiceParty: recordForm3.invoiceParty,
-        settlementPerson: recordForm3.settlementPerson,
-        status: recordForm3.status,
+        invoiceId: recordForm3.value.invoiceId,
+        companyId: recordForm3.value.companyId,
+        invoiceParty: recordForm3.value.invoiceParty,
+        settlementPerson: recordForm3.value.settlementPerson,
+        status: recordForm3.value.status,
         settlementTimeStart: recordForm3.value.settlementTime?.[0],
         settlementTimeEnd: recordForm3.value.settlementTime?.[1],
         pages: pages.value,
@@ -689,6 +689,13 @@ const initOption = () => {
 }
 
 onMounted(() => {
+  if (route.query.activeName === '2') {
+    recordForm1.value.invoiceId = route.query.id
+    activeName.value = '2'
+    initData2();
+  } else {
+    initData1();
+  }
   initData1();
   initCompany();
   initOption();

src/views/receivable/handingFee/invoiceRecord.vue

@@ -83,11 +83,9 @@
       <el-table-column prop="createTime" label="开票时间" width="150"></el-table-column>
       <el-table-column label="操作" width="200" fixed="right" align="center">
         <template #default="scope">
-          <el-button link type="primary" v-if="scope.row.settlementStatus == '未结算'"
-            @click="handleCount(scope.row)">结算</el-button>
-          <el-button link type="primary" v-if="scope.row.settlementStatus == '已结算'"
-            @click="handleView(scope.row)">明细查询</el-button>
-          <el-button link type="primary" @click="handleDelete(scope.row)">删除</el-button>
+          <el-button link type="primary" v-if="scope.row.settlementStatus == '未结算'"  @click="handleCount(scope.row)">结算</el-button>
+          <el-button link type="primary" v-if="scope.row.settlementStatus == '已结算'" @click="handleView(scope.row)">明细查询</el-button>
+          <el-button link type="primary" v-if="scope.row.settlementStatus == '未结算'" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>