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

src/views/operationManagement/modules/addOperation.vue

@@ -19,7 +19,7 @@
                 </el-col>
                 <el-col :span="8">
                   <el-form-item prop="organizationId" label="所属团队" v-if="operationForm.typeAttr != '6'">
-                    <el-select v-model="operationForm.organizationId" placeholder="请选择所属团队" @change="deptChange">
+                    <el-select v-model="operationForm.organizationId" placeholder="请选择所属团队" @change="deptChange" filterable>
                       <el-option v-for="item in teamList" :key="item.id" :value="item.id"
                         :label="item.name"></el-option>
                     </el-select>
@@ -75,7 +75,7 @@
                     <el-select v-model="operationForm.leaderId" filterable placeholder="请选择管理人"
                       @change="(e) => { operationForm.leaderNumber = e }">
                       <el-option v-for="(item, index) in recommendList" :key="item.id" :value="item.id"
-                        :label="item.name"></el-option>
+                        :label="`${item.name}-${item.mobile}`"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -89,7 +89,7 @@
                     <el-select v-model="operationForm.referrerId" clearable filterable placeholder="请选择推荐人"
                       @change="(e) => { operationForm.referrerNumber = e }">
                       <el-option v-for="(item, index) in userList" :key="item.id" :value="item.id"
-                        :label="item.name"></el-option>
+                        :label="`${item.name}-${item.mobile}`"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -1188,6 +1188,7 @@ const getUser = (id) => {
   }).then(res => {
     if (res?.code == 200) {
       userList.value = res.data
+      console.log("推荐人",userList.value)
     } else {
       ElMessage({
         message: res.msg,
@@ -1203,6 +1204,7 @@ const getRecommend = (id) => {
   }).then(res => {
     if (res?.code == 200) {
       recommendList.value = res.data
+      console.log("管理人",recommendList.value)
     } else {
       ElMessage({
         message: res.msg,

src/views/operationManagement/operation.vue

@@ -206,7 +206,10 @@ const typeMatch = (typeAttr: string) => {
     '7': '渠道',
     '5': '团队',
     '8': '电销组',
+    '4': '工作室管理员',
     '3': '合伙人',
+    '2': '后线人员',
+    '1': '前线人员',
   }
   return typeAttr?.split(',')
     .map((typeId: any) => map[typeId] || typeId)

src/views/receivable/documentary/index.vue

@@ -1154,13 +1154,7 @@ const getJyOtherReceivableList = () => {
       allData.value = res.data.insPlyIncomeOrders
       total2.value = res.data.insPlyIncomePage.total
       JYreceivedAmountTotal.value = res.data.allAmount
-      receiveData.value.forEach(element => {
-        if (selectedList.value.find(v => v.id === element.id)) {
-          nextTick(() => {
-            ReceiveDataRef2.value!.toggleRowSelection(element, true)
-          })
-        }
-      });
+
     }
   })
 }

src/views/receivable/documentary/ticket.vue

@@ -57,13 +57,15 @@
       <el-table-column prop="receivablePremium" label="应收总额"></el-table-column>
       <el-table-column prop="reconciliationAmount" label="对账金额">
         <template #default="scope">
-          <div class="flex items-center cursor-pointer" @click="handleEdit(scope.row, scope.$index)"
+          <span v-if="scope.row.invoiced > 0">￥{{ scope.row.reconciliationAmount || 0 }}</span>
+          <div v-else class="flex items-center cursor-pointer" @click="handleEdit(scope.row, scope.$index)"
             @mouseenter="scope.row.showEdit = true" @mouseleave="scope.row.showEdit = false">
             ￥{{ scope.row.reconciliationAmount || 0 }}
             <el-icon class="m-l-4px " v-if="scope.row.showEdit">
               <Edit />
             </el-icon>
           </div>
+
         </template>
       </el-table-column>
       <el-table-column prop="falselyIncreasedDifference" label="虚增金额"></el-table-column>

src/views/receivable/handingFee/index.vue

@@ -383,7 +383,7 @@
                     <el-dropdown-item command="数据导入">数据导入</el-dropdown-item>
                   </el-dropdown-menu>
                 </template>
-              </el-dropdown> -->
+      </el-dropdown> -->
             </template>
           </el-table-column>
         </el-table>
@@ -481,14 +481,14 @@
           <el-form :model="editForm">
             <el-radio v-model="feeRate">手续费比例</el-radio>
             <el-row :gutter="20">
-              <el-col :span="12"  v-if="activeName === '1'">
+              <el-col :span="12" v-if="activeName === '1'">
                 <el-form-item label="交强险手续费比例">
                   <el-input v-model="editForm.jqSuperviseCostsProportion">
                     <template #append>%</template>
                   </el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="12"  v-if="activeName === '1'">
+              <el-col :span="12" v-if="activeName === '1'">
                 <el-form-item label="商业险手续费比例">
                   <el-input v-model="editForm.sySuperviseCostsProportion">
                     <template #append>%</template>
@@ -569,10 +569,8 @@ import { useRouter } from 'vue-router'
 import api from '@/api'
 
 const route = useRoute()
-
 let myRouter = useRouter()
-
-let activeName = ref('1')
+let activeName = ref( route.query.activeindex as any ||'1')
 let subActiveName = ref('first')
 const receivedAmountTotal = ref(0)//应收金额总计
 const JYreceivedAmountTotal = ref(0)//驾意险应收金额总计
@@ -679,7 +677,9 @@ const handleInvoice = () => {
     myRouter.push({
       name: 'HandingFeeTicket',
       query: {
-        invoiceType: activeName.value == '1' ? '1' : activeName.value == '2' ? '3' : ''
+        invoiceType: activeName.value == '1' ? '1' : activeName.value == '2' ? '3' : '',
+        activeindex: activeName.value
+
       }
     })
   } else {
@@ -862,7 +862,8 @@ const handleInvoiceSubmit = () => {
     query: {
       id: invoiceRadio.value,
       selectedList: JSON.stringify(selectedList.value),
-      invoiceType: activeName.value == '1' ? '1' : activeName.value == '2' ? '3' : ''
+      invoiceType: activeName.value == '1' ? '1' : activeName.value == '2' ? '3' : '',
+      activeindex: activeName.value
     }
   })
 }
@@ -1101,7 +1102,7 @@ const getCommissionReceivableList = () => {
     jqEndDate: receivableForm.value?.jqDate?.[1],
     syStartDate: receivableForm.value?.syDate?.[0],
     syEndDate: receivableForm.value?.syDate?.[1],
-    invoiceType:'1'
+    invoiceType: '1'
   }
   api.financeApi.getCommissionReceivableList({
     ...params,
@@ -1135,7 +1136,7 @@ const getJyReceivableList = () => {
     jqEndDate: receivableForm.value?.jqDate?.[1],
     syStartDate: receivableForm.value?.syDate?.[0],
     syEndDate: receivableForm.value?.syDate?.[1],
-    invoiceType:'3'
+    invoiceType: '3'
   }
   api.financeApi.getJyCommissionReceivableList({
     ...params,
@@ -1147,13 +1148,7 @@ const getJyReceivableList = () => {
       allData.value = res.data.insPlyIncomeOrders
       total2.value = res.data.insPlyIncomePage.total
       JYreceivedAmountTotal.value = res.data.allAmount
-      receiveData.value.forEach(element => {
-        if (selectedList.value.find(v => v.id === element.id)) {
-          nextTick(() => {
-            ReceiveDataRef2.value!.toggleRowSelection(element, true)
-          })
-        }
-      });
+
     }
   })
 }
@@ -1202,9 +1197,13 @@ onMounted(() => {
   dictDetails();
   initCompany();
   initDept();
-  getCommissionReceivableList();
-  getreceivedAmountTotal()
   getagreementList()
+  if (activeName.value == '1') {
+    getCommissionReceivableList()
+    getreceivedAmountTotal()
+  } else if (activeName.value == '2') {
+    getJyReceivableList()
+  }
 })
 </script>
 
@@ -1242,6 +1241,7 @@ onMounted(() => {
 :deep(.el-radio) {
   width: 100%;
 }
+
 /* 自定义表格点击高亮颜色 */
 :deep(.el-table__body tr.current-row > td) {
   background-color: #c1e8fa !important;

src/views/receivable/handingFee/ticket.vue

@@ -88,12 +88,17 @@
       <el-table-column prop="syPremium" label="商业险保费"></el-table-column>
       <el-table-column prop="sySuperviseCostsProportion" label="商业险手续费比例"></el-table-column>
       <el-table-column prop="receivableAmount" label="总应收"></el-table-column>
-      <el-table-column v-if="route.query.invoiceType == '1'" prop="receivableAmount4Car" label="车险应收"></el-table-column>
+      <el-table-column v-if="route.query.invoiceType == '1'" prop="carInsuranceSuperviseCostsPremiums" label="车险应收"></el-table-column>
       <el-table-column v-if="route.query.invoiceType == '3'" prop="nonCarInsuranceSuperviseCostsPremiums"
         label="非车险应收"></el-table-column>
     </el-table>
     <div class="footer">
-      <el-button plain @click="handleBack">取消</el-button>
+      <el-button plain @click="router.push({
+        path: previousRoute,
+        query: {
+          activeindex: activeindex
+        }
+      })">取消</el-button>
       <el-button plain type="primary" @click="handleTicket(true)">开票并结算</el-button>
       <el-button type="primary" @click="handleTicket(false)">开票</el-button>
     </div>
@@ -272,6 +277,9 @@ import { registerRuntimeCompiler } from 'vue';
 let route = useRoute()
 let router = useRouter()
 let batchShow = ref(false)
+const activeindex = ref(route.query.activeindex)
+// 获取上一个路由的完整信息
+const previousRoute = ref(router.options.history.state.back)
 const selectedList = ref([])//选中的应收单据
 const companyList = ref()//保险公司
 const insurerContract = ref()//保险公司协议