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

src/views/payCredit/myTask.vue

@@ -57,7 +57,7 @@
           </el-row>
         </el-form>
         <div style="font-size: 14px; color: #606266">应付总额：￥{{ totalAmount }}</div>
-        <el-table :data="firstData1" height="calc(100% - 164px)" style="width: 100%; margin-top: 20px;">
+        <el-table :data="firstData1" height="calc(100% - 214px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="attrType" label="业务员类型">
             <template #default="scope">
               {{ scope.row.attrType === '1' ? '前线人员' : scope.row.attrType === '2' ? '后线人员' : scope.row.attrType === '3'
@@ -169,7 +169,7 @@
         </el-form>
         <div style="font-size: 14px; color: #606266">应付总额：￥{{ totalAmount }}</div>
 
-        <el-table :data="firstData2" height="calc(100% - 164px)" style="width: 100%; margin-top: 20px;">
+        <el-table :data="firstData2" height="calc(100% - 244px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="attrType" label="业务员类型" width="120">
             <template #default="scope">
               {{ scope.row.attrType === '1' ? '前线人员' : scope.row.attrType === '2' ? '后线人员' : scope.row.attrType === '3'
@@ -270,7 +270,7 @@
         </el-form>
         <div style="font-size: 14px; color: #606266">应付总额：￥{{ totalAmount }}</div>
 
-        <el-table :data="firstData3" height="calc(100% - 164px)" style="width: 100%; margin-top: 20px;">
+        <el-table :data="firstData3" height="calc(100% - 244px)" style="width: 100%; margin-top: 20px;">
           <el-table-column prop="name" label="业务员"></el-table-column>
           <el-table-column prop="mobile" label="业务员工号"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型">

src/views/platform/ticket.vue

@@ -604,13 +604,20 @@ const handleBack = () => {
   }
 }
 const handleSettlement = () => {
-  if (contactPerson.value == '') {
+  if (!contactPerson.value) {
     ElMessage({
       message: '请选择对接人！',
       type: 'warning'
     })
     return
   }
+  if (tableData.value.some(item => item.contactPerson != contactPerson.value)) {
+    ElMessage({
+      message: '存在多个对接人，无法结算！',
+      type: 'warning'
+    })
+    return
+  }
   // 查应收金额
   api.financeApi.getPlatformSettlementReceivableAmount({
     invoiceType: "5",

src/views/representative/externalCostApproval.vue

@@ -25,13 +25,19 @@
               </el-dropdown-menu>
             </template>
           </el-dropdown>
+          <span class="col-108 ">
+            已选: <span class="text-red">{{ sysUpAndDownList.length }}</span> 条
+          </span>
+        </template>
+        <template #costDescribe="{ data, bodyCell }">
+          <div class="whitespace-normal">{{ data.costDescribe }}</div>
         </template>
         <template v-slot:operation="scope">
           <el-button v-if="scope.operationData.auditStatus == '0'" type="primary" link
             @click="agreemenUpdate(scope.operationData.id)"> 审核
           </el-button>
-          <el-button v-if="scope.operationData.auditStatus == '2'  || scope.operationData.auditStatus == '1'" type="primary" link
-            @click="agreemenUpdate(scope.operationData.id)"> 详情
+          <el-button v-if="scope.operationData.auditStatus == '2' || scope.operationData.auditStatus == '1'"
+            type="primary" link @click="agreemenUpdate(scope.operationData.id)"> 详情
           </el-button>
         </template>
       </ComplexTable>
@@ -65,12 +71,22 @@ onBeforeMount(async () => {
   findpage(0);//列表数据
   findpage(1);//列表数据
   findpage(2);//列表数据
+  getAgreement();//获取协议列表
+  initCompany();//保险公司列表
   valid_status.value = getDict('valid_status');//生效状态
   is_enable.value = getDict('is_enable');//协议状态
   insurance_type.value = getDict('insurance_type')
   audit_status.value = getDict('audit_status')
 
 });
+const agreementListALL = ref();//全部协议列表
+const company_list = ref();//保险公司列表
+const companyIdprops = {
+  expandTrigger: 'hover' as const,
+  value: 'id',
+  label: 'name',
+  checkStrictly: true,
+}
 const activeName = ref('pendingReview')
 const pendingReviewlength = ref(0);
 const passlength = ref(0);//审核通过
@@ -79,6 +95,7 @@ const reviewRejectedlength = ref(0);
 const tableData1 = ref([]);//待审核
 const tableData2 = ref([]);//审核通过
 const tableData3 = ref([]);//审核不通过
+
 const pageInfoPending = ref({
   pageNum: 1,
   pageSize: 20,
@@ -123,13 +140,26 @@ const formInline = reactive({
   validState: "",
   effectiveTime: [],
   failureTime: [],
+  companyId: '',//保险公司id
 })
 //表格字段数据
 const fields = ref([
-  { label: "所属协议", model: "agreement", type: "input", placeholder: "输入代码，名称，简称查找" },
+  {
+    label: "所属协议", model: "agreementIds", type: "select", multiple: true, placeholder: "输入代码，名称，简称查找", options: agreementListALL,
+    props: {
+      label: (item: any) => `${item.agreementTitle}`,
+      value: 'id'
+    }, filterable: true
+  },
   {
     label: "险种", model: "productId", type: "select", options: insurance_type,
   },
+  {
+    label: "保险公司", model: "companyId", type: "cascader", placeholder: "选择保险公司", options: company_list, props: companyIdprops, placement: 'left', onChange: (value: any) => {
+      formInline.companyId = value[value.length - 1];
+      getAgreement();
+    }
+  },
   {
     label: "承保规则", model: "rulesName", type: "input", placeholder: "输入业务规则查找",
   },
@@ -187,10 +217,10 @@ function findpage(status: any) {
 }
 
 const columns = [
-  {
-    prop: "agreementAbbreviation", label: "协议信息", width: '300',
+ {
+    prop: "agreementTitle", label: "协议信息", width: '350', fixed: 'left',
     formatter: (row: any) => {
-      return `${row.agreementCode}\n${row.agreementAbbreviation}`
+      return `${row.agreementTitle}--${row.contactPerson || ''}`
     }
   },
   { prop: "productName", label: "险种", width: '120', },
@@ -217,7 +247,7 @@ const columns = [
       }
     }
   },
-  { prop: "costDescribe", label: "费用描述", width: '500', },
+  { prop: "costDescribe", label: "费用描述", width: '500', component: 'customSlot', },
   { prop: "priorityLevel", label: "优先级", width: '120', },
   {
     prop: "isEnabled", label: "费用状态", width: '100', component: "Tag",
@@ -322,6 +352,29 @@ const ruleFeeEditSave = (data: object) => {
     }
   });
 }
+// 获取协议列表
+const getAgreement = () => {
+  api.agreementApi.agreementList({ pages: 1, size: 1000, companyId: formInline.companyId,isExternal:"1" }).then((res: any) => {
+    if (res.code == '200') {
+      agreementListALL.value = res.data.records;
+    } else {
+    }
+  });
+}
+// 保险公司
+const initCompany = () => {
+  api.agreementApi.findTree({ name: "", systemCode: localStorage.getItem('login_system') }).then((res: any) => {
+    if (res.code == '200') {
+      company_list.value = res.data;
+    } else {
+      ElMessage({
+        type: 'error',
+        message: res.msg,
+        plain: true,
+      })
+    }
+  });
+}
 //多选事件
 const selectionChange = (val: any) => {
   sysUpAndDownList.value = val;
@@ -427,6 +480,7 @@ const resetForm = () => {
   formInline.validState = "";
   formInline.effectiveTime = [];
   formInline.failureTime = [];
+  formInline.companyId = '';//保险公司id
   if (activeName.value == 'pendingReview') {
     findpage(0);
   } else if (activeName.value == 'pass') {

src/views/representative/quoteApproval.vue

@@ -183,7 +183,7 @@ const fields = ref([
   {
     label: "所属协议", model: "agreementIds", type: "select", multiple: true, placeholder: "输入代码，名称，简称查找", options: agreementListALL,
     props: {
-      label: (item: any) => `${item.agreementTitle}--${item.userAbbr}`,
+      label: (item: any) => `${item.agreementTitle}--${item.dockingPerson || ''}`,
       value: 'id'
     }, filterable: true
   },
@@ -297,7 +297,7 @@ function agreement() {
   });
 }
 const getAgreement = () => {
-  api.agreementApi.agreementList({ pages: 1, size: 1000, companyId: formInline.companyId }).then((res: any) => {
+  api.agreementApi.agreementList({ pages: 1, size: 1000, companyId: formInline.companyId,isExternal:"0" }).then((res: any) => {
     if (res.code == '200') {
       agreementListALL.value = res.data.records;
     } else {
@@ -308,7 +308,7 @@ const columns = [
   {
     prop: "agreementAbbreviation", label: "协议信息", width: '300', fixed: 'left',
     formatter: (row: any) => {
-      return `${row.agreementTitle}\n${row.userAbbr || ''}`
+      return `${row.agreementTitle}--${row.dockingPerson || ''}`
     }
   },
   { prop: "effectiveTime", label: "生效时间", width: '200' },