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

src/views/receivable/documentary/documentaryRecord.vue

@@ -73,7 +73,6 @@
       <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" @click="handleView(scope.row)">明细查询</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -210,9 +209,7 @@ const uploadImage = async (file) => {
     attachmentIds.value.push(data.id)
   }
 }
-const handleView = () => {
 
-}
 // 列表
 const initList = () => {
   api.invoiceRecordApi.invoiceRecord({

src/views/receivable/handingFee/invoiceRecord.vue

@@ -84,7 +84,7 @@
       <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" @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" @click="handleDelete(scope.row)">删除</el-button>
         </template>

src/views/receivable/handingFee/ticket.vue

@@ -318,7 +318,6 @@ let searchList = ref([
 ])
 if (route.query) {
   console.log(route.query)
-
   selectedList.value = JSON.parse(route.query.selectedList || '[]')
   searchList.value[0].search = route.query.id
   getByCompanyId()