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

src/views/insurancePolicy/index.vue

@@ -1038,7 +1038,7 @@
                             </div>
                             <div class="Factor-item flex a-c f-c ">
                               <span class="item-header flex a-c ">类型</span>
-                              <span>{{ scope.row.quoteResult?.scoreVo?.type || '续保' }}</span>
+                              <span>{{ scope.row.quoteResult?.scoreVo?.type || '--' }}</span>
                             </div>
                             <div class="Factor-item flex a-c f-c ">
                               <span class="item-header flex a-c ">交强出险次数</span>
@@ -2940,7 +2940,6 @@ const handleUnderwritingClose = (bool: any, dataObj: any) => {
       type: 'success'
     })
     quoteData.value[underwritingIndex.value].underwritingMsg = "";
-
     underwritingMsgShow.value = true
   } else {
     ElMessage({

src/views/partnerManagement/partner.vue

@@ -383,6 +383,15 @@ function getList(item: PageInfo) {
 
 };
 const resetForm = () => {
+  Object.assign(formInline, {
+    name: '',//姓名
+    mobile: "",//手机号
+    userId: '',//工号
+    grade: '',//合伙人等级
+    inviter: "",//邀请人
+    deptId: '',//机构id
+    typeAttr: '',
+  })
   findpage();
 }
 //数据查询

src/views/quoteConfig/agreement/agreementDetails.vue

@@ -29,7 +29,7 @@
             <el-tag type="primary" style="margin-right: 20px;">{{
               getDict('is_enable').find(val => val.value == agreementInfo.isEnable)?.label}}</el-tag>
             <el-tag type="success">{{getDict('valid_status').find(val => val.value == agreementInfo.validStatus)?.label
-              }}</el-tag>
+            }}</el-tag>
           </div>
         </div>
         <el-descriptions :column="3" style="margin-top: 10px;">
@@ -51,13 +51,13 @@
         <el-tab-pane label="协议信息" name="agreementInfo">
           <el-descriptions title="基本信息" class="m-top-20" :column="3">
             <el-descriptions-item label="协议名称：">{{ agreementInfo.agreementTitle
-            }}</el-descriptions-item>
+              }}</el-descriptions-item>
             <el-descriptions-item label="协议简称：">{{ agreementInfo.agreementAbbreviation
-            }}</el-descriptions-item>
+              }}</el-descriptions-item>
             <el-descriptions-item label="协议生效时间：">{{ agreementInfo.startDate }}</el-descriptions-item>
             <el-descriptions-item label="协议失效时间：">{{ agreementInfo.endDate }}</el-descriptions-item>
             <el-descriptions-item label="是否含增值税结算：">
-              {{  getDict('with_tax').find(val => val.value == agreementInfo.withTax)?.label }}
+              {{getDict('with_tax').find(val => val.value == agreementInfo.withTax)?.label}}
 
             </el-descriptions-item>
             <el-descriptions-item label="结算周期：">T{{ agreementInfo.moneyTime }} </el-descriptions-item>
@@ -66,7 +66,8 @@
           <el-descriptions title="其他信息" class="m-top-20" :column="3">
             <el-descriptions-item label="协议归属：">{{ agreementInfo.deptName }} </el-descriptions-item>
             <el-descriptions-item label="保险公司："> {{ agreementInfo.company }}</el-descriptions-item>
-            <el-descriptions-item label="协议类型：">{{ getDict('agreement_type').find(val => val.value == agreementInfo.agreementType)?.label}} </el-descriptions-item>
+            <el-descriptions-item label="协议类型：">{{getDict('agreement_type').find(val => val.value ==
+              agreementInfo.agreementType)?.label}} </el-descriptions-item>
 
             <el-descriptions-item label="管理人："> {{ agreementInfo.managerName }}</el-descriptions-item>
             <el-descriptions-item label="对接人："> {{ agreementInfo.dockingPerson }} </el-descriptions-item>
@@ -116,7 +117,7 @@
                   <div class="flex a-c">
                     <img src="../../../assets/images/fee.png" alt="">
                     <span style="margin-right: 30px;font-size: 16px;" class="strong m-left-10">承保规则一{{ index + 1
-                      }}</span>
+                    }}</span>
                   </div>
                   <div class="flex">
                     <el-button link type="primary" :icon="Delete" @click="ruleDel(item.id)">删除</el-button>
@@ -131,7 +132,7 @@
                       </el-icon></el-button>
                   </div>
                 </div>
-                <p class=" m-top-10" style="font-size: 14px;">规则描述：{{ item.ruleDescription }}</p>
+                <p class=" m-top-10" style="font-size: 14px;letter-spacing: 2px;">规则描述：{{ item.ruleDescription }}</p>
               </div>
               <div class="header-content" v-if="item.ruleFeeShow">
                 <el-button plain type="primary" @click=" ruleFeeAdd(item)" class="m-top-20 m-btn-20">添加费用
@@ -144,7 +145,8 @@
                 <el-tabs :tab-position="ruleFeePosition" class="ruleFee" v-if="item.costVoList">
                   <el-tab-pane v-for="(costitem, costindex) in item.costVoList" :key="costindex"
                     :label="costitem.productName" :name="costitem.productName">
-                    <span class="strong">{{ costitem.productName }}费用（{{ costitem.ptlAgreementCostVoList.length }}条）</span>
+                    <span class="strong">{{ costitem.productName }}费用（{{ costitem.ptlAgreementCostVoList.length
+                      }}条）</span>
                     <ComplexTable :tableData="costitem.ptlAgreementCostVoList" :columns="columns" :maxHeight="250"
                       :showIndex="false" :columnwidth="200" :showSelect="false">
                       <template v-slot:operation="scope">
@@ -193,16 +195,17 @@
     </el-drawer>
     <!-- 协议授权弹窗 -->
     <auth-Drawer :Drawer="agreementAuthDrawer" @cancel="agreementAuthDrawer = false" @save="DrawerSave"
-      @query="Drawerquery" @echoValue="echoValue" :deptlist="deptauthList" :checkedKeys="checkedKeys" :checkedIds="checkedIds"></auth-Drawer>
+      @query="Drawerquery" @echoValue="echoValue" :deptlist="deptauthList" :checkedKeys="checkedKeys"
+      :checkedIds="checkedIds"></auth-Drawer>
     <!-- 规则条件弹窗 -->
-    <RuleCondition ref="RuleConditionRefs" :ruleConditionVisible="ruleConditionVisible" @cancel="ruleConditionVisible = false"
-      @save="ruleConditionSave" :attrIdList="rulesAttrListInfo.rulesAttrList" />
+    <RuleCondition ref="RuleConditionRefs" :ruleConditionVisible="ruleConditionVisible"
+      @cancel="ruleConditionVisible = false" @save="ruleConditionSave" :attrIdList="rulesAttrListInfo.rulesAttrList" />
     <!-- 规则费用抽屉组件 -->
     <ruleFeeDialog v-if="ruleFeeVisible" :ruleFeeVisible="ruleFeeVisible" :agreementInfo="agreementInfo"
       :RulesInfo="RulesInfo" @save="ruleFeeSave" @cancel="ruleFeeVisible = false" />
     <!-- 规则费用编辑组件 -->
     <ruleFeeDialogEdit :ruleFeeVisible="ruleFeeEditVisible" :headerTitle="ruleFeeHeaderTitle"
-      :agreementInfo="agreementInfo" :RulesInfo="RulesInfo"  :costitemEditInfo="costitemEditInfo" @save="ruleFeeEditSave"
+      :agreementInfo="agreementInfo" :RulesInfo="RulesInfo" :costitemEditInfo="costitemEditInfo" @save="ruleFeeEditSave"
       @cancel="ruleFeeEditVisible = false" />
   </div>
 </template>
@@ -231,13 +234,12 @@ const authDeptlength = ref<number>(0);
 
 let RuleConditionRefs = ref()
 const addRules = () => {
-    ruleConditionVisible.value = true
-    RuleConditionRefs.value.ruleAttr(agreementInfo.value.companyId)
+  ruleConditionVisible.value = true
+  RuleConditionRefs.value.ruleAttr(agreementInfo.value.companyId)
 }
 
 onBeforeMount(async () => {
   await loadDicts(['agreement_type', 'valid_status', 'is_enable', 'with_tax', 'audit_status']);//获取多个字典
-
   if (id.value) {
     detailsInfo();//协议信息
     agreementRulesList();//承保规则
@@ -245,8 +247,8 @@ onBeforeMount(async () => {
     regionLicenseNumber('14');//车牌号
     rulesAttrListInfo.agreementId = id.value;//赋值协议id
   }
-  if(route.query.from as string) {
-      activeName.value = 'costManagement'
+  if (route.query.from as string) {
+    activeName.value = 'costManagement'
   }
 })
 //协议详情
@@ -286,8 +288,8 @@ const Drawerquery = (name: any) => {
   agreementAuth(name)
 }
 //全选赋值
-const echoValue=(ids:any[])=>{
-  checkedKeys.value=ids;
+const echoValue = (ids: any[]) => {
+  checkedKeys.value = ids;
 }
 //授权保存
 const DrawerSave = (list: any) => {
@@ -458,12 +460,12 @@ const ruleFeePosition = ref<TabsInstance['tabPosition']>('left')
 const direction = ref<DrawerProps['direction']>('rtl')
 const addUnderwritingRule = () => {
   addUnderwritingRuleShow.value = true;
-    rulesAttrListInfo.rulesAttrList = []
+  rulesAttrListInfo.rulesAttrList = []
 }
 //承保规则保存事件
 const UnderwritingRuleSave = () => {
-    // "OwnersInfoAge" 车主年龄
-    // "NonMotorInsurance" 非车险
+  // "OwnersInfoAge" 车主年龄
+  // "NonMotorInsurance" 非车险
   if (rulesAttrListInfo.id) {//判断id是否存在
     api.agreementApi.agreementRulesEdit(rulesAttrListInfo).then((res: any) => {
       if (res.code == '200') {
@@ -473,9 +475,7 @@ const UnderwritingRuleSave = () => {
           plain: true,
         })
         addUnderwritingRuleShow.value = false;
-        router.push({
-          name: 'reload',
-        })
+        agreementRulesList();
       } else {
 
       }
@@ -489,9 +489,7 @@ const UnderwritingRuleSave = () => {
           plain: true,
         })
         addUnderwritingRuleShow.value = false;
-        router.push({
-          name: 'reload',
-        })
+        agreementRulesList();
       } else {
       }
     });
@@ -578,8 +576,8 @@ const ruleFeeHeaderTitle = ref();//编辑弹窗title
 const costitemEditInfo = ref();
 const RulesInfo = ref({});
 const columns = [
-    { prop: "costRules", label: "费用规则", width: '200', },
-    { prop: "costDescribe", label: "费用规则", width: '200', },
+  { prop: "costRules", label: "费用规则", width: '200', },
+  { prop: "costDescribe", label: "费用规则", width: '200', },
   {
     prop: "ptlAgreementCostTypeList", label: "交强险费用", width: '300', formatter: (row: any) => {
       let info = row.ptlAgreementCostTypeList.find((val: any) => val.costType == '交强险');

src/views/quoteConfig/agreement/components/orderAccount.vue

@@ -64,6 +64,9 @@ const tableData = ref([
 ]);
 const loding = ref(false);
 const columns = [
+  {
+    prop: "createTime", label: "创建时间", align: 'left',
+  },
   {
     prop: "username", label: "账号信息", align: 'left', formatter: (row: any) => {
       return `用户名：${row.username}\n简称：${row.userAbbr}`