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

src/views/additionalOrder/additional/index.vue

@@ -1596,6 +1596,15 @@
                   </el-input-number>
                 </el-form-item>
               </el-col>
+              <el-col :span="6">
+                <el-form-item label="补录费用" prop="" class="p-l-24px">
+                  <el-select v-model="additionalForm.isrecordByLeader"  placeholder="请选择"
+                    filterable >
+                    <el-option :value="true" label="代客录单费用-1"></el-option>
+                    <el-option :value="false" label="内部协议费用不做-1"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <template #icon="{ isActive }">
               <span class="icon">
@@ -3971,6 +3980,7 @@ const handleSave = () => {
     syRenewal: additionalForm.value.syRenewal,
     syPremium: additionalForm.value.syPremium,
     sumPremium: additionalForm.value.sumPremium,
+    isrecordByLeader: additionalForm.value.isrecordByLeader,
   }
   obj.insOrders = {
     ...obj.insOrders,
@@ -4209,6 +4219,7 @@ const handleSubmit = async (FormRefs) => {
     syRenewal: additionalForm.value.syRenewal,
     syPremium: additionalForm.value.syPremium,
     sumPremium: additionalForm.value.sumPremium,
+    isrecordByLeader: additionalForm.value.isrecordByLeader,
   }
   obj.insOrders = {
     ...obj.insOrders,

src/views/finance/index.vue

@@ -555,7 +555,8 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="forthData" height="calc(100% - 262px )" style="width: 100%; margin-top: 20px;" highlight-current-row>
+        <el-table :data="forthData" height="calc(100% - 262px )" style="width: 100%; margin-top: 20px;"
+          highlight-current-row>
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
@@ -724,6 +725,14 @@ const auditReceive = (row) => {
               message: res.msg,
               type: 'success'
             })
+            myRouter.push({
+              path: '/finance/auditOrderDetail',
+              query: {
+                id: row.orderNo,
+                isShow: 1,
+                activeindex: activeName.value
+              }
+            })
           }
         })
       } else {
@@ -864,9 +873,9 @@ const handleExport = (type: any) => {
     ...firstForm.value,
     auditStatus: type,
   }
-  if(type=='0'){
+  if (type == '0') {
     obj.allTodoReceive = true;
-  }else{
+  } else {
     delete obj.allTodoReceive;
   }
   api.financeApi.exportOrderExcel(obj).then((res: any) => {
@@ -948,6 +957,7 @@ onMounted(() => {
 :deep(.el-badge__content--danger) {
   background-color: #D40000;
 }
+
 /* 自定义表格点击高亮颜色 */
 :deep(.el-table__body tr.current-row > td) {
   background-color: #c1e8fa !important;