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

src/views/receivable/documentary/index.vue

@@ -184,7 +184,7 @@
           <el-table-column prop="dockingPerson" label="对接人" width="100"></el-table-column>
           <el-table-column label="操作" width="120" fixed="right">
             <template #default="scope">
-              <el-button link type="primary" @click="toEdit(scope.row)">编辑</el-button>
+              <el-button link type="primary" @click="toEdit(scope.row, '1')">编辑</el-button>
               <el-button link type="primary" @click="toDelete([scope.row.id])">删除</el-button>
             </template>
           </el-table-column>
@@ -368,7 +368,7 @@
             <template #default="scope">
               <div style="display: flex; align-items: center; justify-content: center">
                 <el-button link type="primary" @click="toDelete([scope.row.id])">删除</el-button>
-                <el-button link type="primary" @click="toEdit(scope.row)">编辑</el-button>
+                <el-button link type="primary" @click="toEdit(scope.row, '2')">编辑</el-button>
                 <el-dropdown trigger="click" placement="bottom" @command="dropdownCommand">
                   <el-button link type="primary">
                     更多
@@ -702,13 +702,15 @@ const selectTypeChange = (type) => {
   }
 }
 // 编辑
-const toEdit = (row: any) => {
-  myRouter.push({
-    name: 'InsurancePolicyOrderDetail',
-    query: {
-      orderNo: row.orderNo
-    }
+const toEdit = (row: any, type: string) => {
+  const tableRef = activeName.value == '1' ? ReceiveDataRef1 : ReceiveDataRef2
+  receiveData.value.forEach(item => {
+    tableRef.value!.toggleRowSelection(item, false)
   })
+  tableRef.value!.toggleRowSelection(row, true)
+  selectedList.value = [row]
+  batchEditShow.value = true
+
 }
 // 获取协议列表
 const agreementList = ref()

src/views/receivable/handingFee/report.vue

@@ -374,16 +374,12 @@ const invoice_status = ref([
 const settlement_status = ref([
   {
     value: '0',
-    label: '已开票未结清'
+    label: '未结清'
   },
   {
     value: '1',
     label: '已结清'
   },
-  {
-    value: '2',
-    label: '未开票'
-  },
 ])
 const companyIdprops = {
   expandTrigger: 'hover' as const,