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

src/utils/dataformat.ts

@@ -3,7 +3,6 @@ export function gainFocus(e: string, data: any[]) {
 
   // 检查元素是否存在
   const container = document.getElementById(e);
-  console.log(container);
   if (!container) {
     return data;
   }
@@ -39,7 +38,6 @@ export function gainFocus(e: string, data: any[]) {
 // 更改格式
 function disposeData(str) {
   var value = str.split("");
-  console.log(value);
   if (value.length == 4) {
     value.splice(4, 0, "-");
   }

src/views/externalAgreement/agreement/agreementIndex.vue

@@ -202,7 +202,7 @@ function findpage() {
 }
 const columns = [
   { prop: "agreementCode", label: "协议编号", width: '200', component: "RouterLink",
-  formatter: (row: any) => ({ name: 'AgreementDetails', query: { id: row.id} }) },
+  formatter: (row: any) => ({ name: 'ExternalAgreementDetails', query: { id: row.id} }) },
   {
     prop: "agreementTitle", label: "协议名称", width: '200',
   },

src/views/externalAgreement/agreement/components/contactPersonFeeDialogEdit.vue

@@ -149,7 +149,6 @@
 <script lang='ts' setup>
 import { ref, } from 'vue'
 import { DrawerProps, ComponentSize, FormInstance, FormRules, ElMessage,ElMessageBox } from 'element-plus';
-import { defineProps, defineEmits } from "vue";
 const direction = ref<DrawerProps['direction']>('rtl')
 const fromSize = ref<ComponentSize>('default')
 const props = defineProps<{

src/views/insurancePolicy/index.vue

@@ -3431,10 +3431,14 @@ const handleSubmit = async (InsurancePolicyRefs: FormInstance | undefined, scope
                 res.data.quoteTotal = Number(a) + Number(b) + Number(c) + Number(d)  // 总保费
                 // 替换保险公司返回的正确日期
                 if (res.data.ciStartDate) {
+                  res.data.ciRiskInfoVo.startDate = res.data.ciStartDate
+                  res.data.ciRiskInfoVo.endDate = res.data.ciEndDate
                   insurancePolicyForm.value.JQStartDate = res.data.ciStartDate
                   insurancePolicyForm.value.JQEndDate = res.data.ciEndDate
                 }
                 if (res.data.biStartDate) {
+                  res.data.biRiskInfoVo.startDate = res.data.biStartDate
+                  res.data.biRiskInfoVo.endDate = res.data.biEndDate
                   insurancePolicyForm.value.SYStartDate = res.data.biStartDate
                   insurancePolicyForm.value.SYEndDate = res.data.biEndDate
                 }

src/views/partnerManagement/commissionChangeLog.vue

@@ -21,7 +21,7 @@ import { ref, reactive, onBeforeMount } from 'vue'
 import api from '@/api'
 // 页面加载时获取机构列表
 onBeforeMount(() => {
-  
+
   findpage();
 });
 interface PageInfo {
@@ -36,7 +36,7 @@ const formInline = reactive({
   name: "",
   mobile: "",
   userId: "",
-  userGrade: "",
+  grade: "",
   changeTimes: [],//变更时间
 })
 const pageInfo = ref({
@@ -115,6 +115,13 @@ function getList(item: PageInfo) {
 
 };
 const resetForm = () => {
+  Object.assign(formInline, {
+    name: '',//姓名
+    mobile: "",//手机号
+    userId: '',//工号
+    grade: '',//合伙人等级
+    changeTimes: [],//变更时间
+  })
   findpage();
 }
 //数据查询

src/views/partnerManagement/commissionDetails.vue

@@ -60,7 +60,11 @@ const fields = ref([
     label: "工号", model: "userId", type: "input", placeholder: "请输入工号"
   },
   {
-    label: "等级", model: "source", type: "select", placeholder: "选择等级", options: userGradeList.value
+    label: "等级", model: "source", type: "select", placeholder: "选择等级", options: userGradeList,
+    props: {
+      label: 'gradeName',
+      value: 'grade',
+    }
   },
   {
     label: "订单号", model: "orderno", type: "input", placeholder: "请输入订单号"
@@ -103,6 +107,15 @@ function getList(item: PageInfo) {
 
 };
 const resetForm = () => {
+  Object.assign(formInline, {
+    userName: "",//姓名
+    mobile: "",//手机号
+    userId: "",//工号
+    source: "",//等级
+    orderno: "",//订单号
+    licenseno: "",//车牌号
+    signingTime: [],//签单时间
+  })
   findpage();
 }
 //数据查询

src/views/partnerManagement/expiredCommission.vue

@@ -89,6 +89,12 @@ function getList(item: PageInfo) {
 
 };
 const resetForm = () => {
+  Object.assign(formInline, {
+    name: "",
+    mobile: "",
+    userId: "",
+    startTime: [],//变更时间
+  })
   findpage();
 }
 //数据查询

src/views/partnerManagement/partner.vue

@@ -111,12 +111,12 @@ const deptTreeData = ref<any[]>([]);//机构树数据
 const tableData = ref([]);//表格数据
 const formInline = reactive({
   name: '',//姓名
-  mobile: "",//手机号
-  userId: '',//工号
-  grade: '',//合伙人等级
-  inviter: "",//邀请人
   deptId: '',//机构id
   typeAttr: '',
+  grade: '',//合伙人等级
+  status: '',//人员状态
+  isEnable: '',//账号状态
+  referrerName: '',//推荐人
 })
 const pageInfo = ref({
   pageNum: 1,
@@ -385,12 +385,12 @@ function getList(item: PageInfo) {
 const resetForm = () => {
   Object.assign(formInline, {
     name: '',//姓名
-    mobile: "",//手机号
-    userId: '',//工号
-    grade: '',//合伙人等级
-    inviter: "",//邀请人
     deptId: '',//机构id
     typeAttr: '',
+    grade: '',//合伙人等级
+    status: '',//人员状态
+    isEnable: '',//账号状态
+    referrerName: '',//推荐人
   })
   findpage();
 }

src/views/partnerManagement/purchaseHistory.vue

@@ -123,6 +123,12 @@ function getList(item: PageInfo) {
 
 };
 const resetForm = () => {
+  Object.assign(formInline, {
+    name: "",//姓名
+    mobile: "",//手机号
+    userId: "",//工号
+    signingTime: [],
+  })
   findpage();
 }
 //数据查询

src/views/partnerManagement/upgradeDowngradeRecord.vue

@@ -353,6 +353,14 @@ function getList(item: PageInfo) {
 
 };
 const resetForm = () => {
+  Object.assign(formInline, {
+    name: "",//姓名
+    mobile: "",//手机号
+    userId: "",//工号
+    type: "",//类型
+    applyTimes: [],//申请时间
+    auditStatus: formInline.auditStatus,
+  })
   findpage();
 }
 //数据查询

src/views/platform/platformRecord.vue

@@ -80,18 +80,13 @@
       <el-table-column
         prop="settlementId"
         label="结算记录编号"
-        width="200"
       ></el-table-column>
       <el-table-column
         prop="companyName"
         label="保险公司"
         width="200"
       ></el-table-column>
-      <el-table-column
-        prop="invoiceParty"
-        label="开票方"
-        width="150"
-      ></el-table-column>
+
       <el-table-column
         prop="invoiceType"
         label="应收项"
@@ -110,7 +105,6 @@
       <el-table-column
         prop="receivePaymentDate"
         label="收款日期"
-        width="150"
       ></el-table-column>
       <el-table-column label="收款凭证" width="100">
         <template #default="scope">
@@ -125,9 +119,7 @@
       <el-table-column
         prop="createTime"
         label="结算时间"
-        width="200"
       ></el-table-column>
-      <el-table-column prop="invoiceId" label="开票记录编号"></el-table-column>
     </el-table>
     <div class="pagination">
       <el-pagination