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

src/views/insurancePolicy/order.vue

@@ -152,7 +152,7 @@
             v-if="['1', '3', '4'].includes(scope.row.orderStatus)">报价单预览</el-button>
           <el-button link type="danger" @click="deleteOrder(scope.row.orderNo)"
             v-if="scope.row.orderStatus === '6' || scope.row.orderStatus === '8'">删除订单</el-button>
-          <!--          <el-dropdown trigger="click" class="ml-[12px] align-middle" v-if="scope.row.orderStatus === '5'">
+          <el-dropdown trigger="click" class="ml-[12px] align-middle" v-if="scope.row.orderStatus === '5'">
             <el-button link type="primary">
               订单批改
               <el-icon class="el-icon&#45;&#45;right">
@@ -165,7 +165,7 @@
                 <el-dropdown-item @click="onClick(0, scope.row)">整单退保</el-dropdown-item>
               </el-dropdown-menu>
             </template>
-    </el-dropdown>-->
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -791,7 +791,33 @@ const getStateText = (d: any, v: any) => {
   let label = d.find((item: any) => item.value == v)?.label;
   return label || '--';
 };
-
+const onClick = (type: any, row: any) => {
+  console.log(type, row)
+  api.insurancePolicyApi.adjustAdd({
+    type: type,
+    orderNo: row.orderNo,
+  }).then((res: any) => {
+    if (res.code == 200) {
+      formData.value = {
+        ...row,
+        orderNo: row.orderNo,
+        adjustId: res.data.id,
+        tableList: type === 1 ? res.data.changeInfoVosList : res.data.infoVosList
+      };
+      if (type === 1) {
+        isEditVisible.value = true;
+      }
+      if (type === 0) {
+        isCancelVisible.value = true;
+      }
+    } else {
+      ElMessage({
+        message: res.msg,
+        type: 'warning'
+      })
+    }
+  });
+}
 // 批改记录
 const openDetail = (e: any) => {
   window.open(`/#/insurancePolicy/record?orderNo=${e.orderNo}`, '_blank');

src/views/receivable/handingFee/report.vue

@@ -85,8 +85,10 @@
                   <template #dropdown>
                     <el-dropdown-menu>
                       <el-dropdown-item @click="handleSettlementDetail(scope.row)">结算明细</el-dropdown-item>
-                      <el-dropdown-item :disabled="!['10','20'].includes(recordForm.accountsReceivable)"
-                        @click="handleInvoiceRecord(scope.row)">开票明细</el-dropdown-item>
+                      <el-dropdown-item
+                        @click="handleInvoiceRecord1(scope.row)">车险开票明细</el-dropdown-item>
+                        <el-dropdown-item
+                        @click="handleInvoiceRecord2(scope.row)">非车险开票明细</el-dropdown-item>
                     </el-dropdown-menu>
                   </template>
                 </el-dropdown>
@@ -693,23 +695,16 @@ const handleSettlementDetail = (row) => {
   initData2()
 }
 // 开票明细
-const handleInvoiceRecord = (row) => {
-  switch (recordForm.value.accountsReceivable) {
-    case '10':
+const handleInvoiceRecord1 = (row) => {
       activeName.value = '3'
       recordForm2.value.companyId = row.id
       initData3(['1'])
-      break;
-    case '20':
+}
+const handleInvoiceRecord2 = (row) => {
       activeName.value = '4'
       recordForm3.value.companyId = row.id
       initData3(['3'])
-      break;
-    default:
-  }
-
 }
-
 const handleExport = (type) => {
   switch (type) {
     case 2: