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

src/views/quoteConfig/agreement/agreementDetails.vue

@@ -135,7 +135,7 @@
                 <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">添加费用
+                <el-button plain type="primary" @click=" ruleFeeAdd(item)" class="m-top-10 m-btn-10">添加费用
                   <template #icon>
                     <el-icon>
                       <Plus />
@@ -684,7 +684,7 @@ const costitemEditInfo = ref();
 const RulesInfo = ref({});
 const columns = [
   { prop: "costRules", label: "费用规则", width: '200', },
-  { prop: "priorityLevel", label: "优先级", width: '60', },
+  { prop: "priorityLevel", label: "优先级", width: '100', },
   { prop: "costDescribe", label: "费用规则", width: '200', },
   {
     prop: "ptlAgreementCostTypeList", label: "交强险费用", width: '300', formatter: (row: any) => {
@@ -785,33 +785,31 @@ const ruleFeeSave = (data: object) => {
   });
 }
 const ruleFeeEditSave = (data: object) => {
-  // 检查入口比例是否小于入口手续费比例
-  const hasInvalidItem = data.ptlAgreementCostTypeList.some((item: any) => {
-    // 获取当前险种对应的入口手续费比例
-    let entranceFeeRatio = 0;
-    if (item.costType == '交强险') {
-      entranceFeeRatio = handlingFeeInfo.value?.jqEntranceFeeRatio || 0;
-    } else if (item.costType == '商业险') {
-      entranceFeeRatio = handlingFeeInfo.value?.syEntranceFeeRatio || 0;
-    } else if (item.costType == '驾意险') {
-      entranceFeeRatio = handlingFeeInfo.value?.jyEntranceFeeRatio || 0;
-    }
+  // const hasInvalidItem = data.ptlAgreementCostTypeList.some((item: any) => {
+  //   let entranceFeeRatio = 0;
+  //   if (item.costType == '交强险') {
+  //     entranceFeeRatio = handlingFeeInfo.value?.jqEntranceFeeRatio || 0;
+  //   } else if (item.costType == '商业险') {
+  //     entranceFeeRatio = handlingFeeInfo.value?.syEntranceFeeRatio || 0;
+  //   } else if (item.costType == '驾意险') {
+  //     entranceFeeRatio = handlingFeeInfo.value?.jyEntranceFeeRatio || 0;
+  //   }
 
-    // 检查入口比例是否小于入口手续费比例（转换为数字比较）
-    if (Number(item.inlet) < Number(entranceFeeRatio)) {
-      ElMessage({
-        type: 'warning',
-        message: `${item.costType}入口比例不能小于入口手续费比例(${entranceFeeRatio}%)`,
-        plain: true,
-      });
-      return true; // 找到不符合条件的项，中断循环
-    }
-    return false;
-  });
+  //   // 检查入口比例是否小于入口手续费比例（转换为数字比较）
+  //   if (Number(item.inlet) < Number(entranceFeeRatio)) {
+  //     ElMessage({
+  //       type: 'warning',
+  //       message: `${item.costType}入口比例不能小于入口手续费比例(${entranceFeeRatio}%)`,
+  //       plain: true,
+  //     });
+  //     return true; // 找到不符合条件的项，中断循环
+  //   }
+  //   return false;
+  // });
 
-  if (hasInvalidItem) {
-    return;
-  }
+  // if (hasInvalidItem) {
+  //   return;
+  // }
   api.agreementApi.AgreementFeeupdate(data).then((res: any) => {
     if (res.code == '200') {
       ElMessage({
@@ -1010,15 +1008,16 @@ const uploadImage = (file: any) => {
 <!-- 样式区域 -->
 <style lang='scss' scoped>
 :deep(.demo-tabs .el-tabs__item) {
-  height: 60px;
   font-size: 20px;
   font-weight: bold !important;
+  align-items: start;
 }
 
 :deep(.ruleFee .el-tabs__item) {
-  height: 40px;
   font-size: 14px;
   font-weight: 500 !important;
+  align-items: center;
+
 }
 
 :deep(.agreement .p-5) {
@@ -1042,11 +1041,11 @@ const uploadImage = (file: any) => {
 }
 
 .RuleContainer {
-  margin-top: 20px;
+  margin-top: 10px;
 
   .list-item {
     padding: 18px 16px;
-    margin-bottom: 20px;
+    margin-bottom: 10px;
     border: 1px solid #e5e5e5;
     border-radius: 10px;
 

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

@@ -330,32 +330,32 @@ const save = async (formEl: FormInstance | undefined | any) => {
               });
               return;
             }
-            // 检查入口比例是否小于入口手续费比例
-            const hasInvalidItem = formRef.ptlAgreementCostTypeList.some((item: any) => {
-              // 获取当前险种对应的入口手续费比例
-              let entranceFeeRatio = 0;
-              if (item.costType == '交强险') {
-                entranceFeeRatio = props.handlingFee?.jqEntranceFeeRatio || 0;
-              } else if (item.costType == '商业险') {
-                entranceFeeRatio = props.handlingFee?.syEntranceFeeRatio || 0;
-              } else if (item.costType == '驾意险') {
-                entranceFeeRatio = props.handlingFee?.jyEntranceFeeRatio || 0;
-              }
+            // // 检查入口比例是否小于入口手续费比例
+            // const hasInvalidItem = formRef.ptlAgreementCostTypeList.some((item: any) => {
+            //   // 获取当前险种对应的入口手续费比例
+            //   let entranceFeeRatio = 0;
+            //   if (item.costType == '交强险') {
+            //     entranceFeeRatio = props.handlingFee?.jqEntranceFeeRatio || 0;
+            //   } else if (item.costType == '商业险') {
+            //     entranceFeeRatio = props.handlingFee?.syEntranceFeeRatio || 0;
+            //   } else if (item.costType == '驾意险') {
+            //     entranceFeeRatio = props.handlingFee?.jyEntranceFeeRatio || 0;
+            //   }
 
-              // 检查入口比例是否小于入口手续费比例（转换为数字比较）
-              if (Number(item.inlet) < Number(entranceFeeRatio)) {
-                ElMessage({
-                  type: 'warning',
-                  message: `${item.costType}入口比例不能小于入口手续费比例(${entranceFeeRatio}%)`,
-                  plain: true,
-                });
-                return true; // 找到不符合条件的项，中断循环
-              }
-              return false;
-            });
-            if (hasInvalidItem) {
-              return;
-            }
+            //   // 检查入口比例是否小于入口手续费比例（转换为数字比较）
+            //   if (Number(item.inlet) < Number(entranceFeeRatio)) {
+            //     ElMessage({
+            //       type: 'warning',
+            //       message: `${item.costType}入口比例不能小于入口手续费比例(${entranceFeeRatio}%)`,
+            //       plain: true,
+            //     });
+            //     return true; // 找到不符合条件的项，中断循环
+            //   }
+            //   return false;
+            // });
+            // if (hasInvalidItem) {
+            //   return;
+            // }
             if (ruleFeeinfo.value[insuranceTypeIndex.value].ptlAgreementCostAddList[index].ruleConditions.length && result) {
               resolve(true);
             }
@@ -440,26 +440,26 @@ const addRuleCondition = (index: number, Costindex: number) => {
 }
 
 const handelRK = (scope) => {
-  // 获取当前险种对应的入口手续费比例
-  let entranceFeeRatio = 0;
-  if (scope.row.costType == '交强险') {
-    entranceFeeRatio = props.handlingFee?.jqEntranceFeeRatio || 0;
-  } else if (scope.row.costType == '商业险') {
-    entranceFeeRatio = props.handlingFee?.syEntranceFeeRatio || 0;
-  } else if (scope.row.costType == '驾意险') {
-    entranceFeeRatio = props.handlingFee?.jyEntranceFeeRatio || 0;
-  }
+  // // 获取当前险种对应的入口手续费比例
+  // let entranceFeeRatio = 0;
+  // if (scope.row.costType == '交强险') {
+  //   entranceFeeRatio = props.handlingFee?.jqEntranceFeeRatio || 0;
+  // } else if (scope.row.costType == '商业险') {
+  //   entranceFeeRatio = props.handlingFee?.syEntranceFeeRatio || 0;
+  // } else if (scope.row.costType == '驾意险') {
+  //   entranceFeeRatio = props.handlingFee?.jyEntranceFeeRatio || 0;
+  // }
 
-  // 检查入口比例是否小于入口手续费比例
-  if (scope.row.inlet < entranceFeeRatio) {
-    ElMessage({
-      type: 'warning',
-      message: `入口比例不能小于入口手续费比例(${entranceFeeRatio}%)`,
-      plain: true,
-    });
-    scope.row.inlet = entranceFeeRatio;
-    return;
-  }
+  // // 检查入口比例是否小于入口手续费比例
+  // if (scope.row.inlet < entranceFeeRatio) {
+  //   ElMessage({
+  //     type: 'warning',
+  //     message: `入口比例不能小于入口手续费比例(${entranceFeeRatio}%)`,
+  //     plain: true,
+  //   });
+  //   scope.row.inlet = entranceFeeRatio;
+  //   return;
+  // }
 
   console.log(scope.row)
   if (scope.row.export && scope.row.addThrow || scope.row.export && scope.row.addThrow === 0) {

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

@@ -241,26 +241,26 @@ const addRules = () => {
 }
 
 const handelRK = (scope) => {
- // 获取当前险种对应的入口手续费比例
- let entranceFeeRatio = 0;
-  if (scope.row.costType == '交强险') {
-    entranceFeeRatio = costitemEditInfo.value?.jqEntranceFeeRatio || 0;
-  } else if (scope.row.costType == '商业险') {
-    entranceFeeRatio = costitemEditInfo.value?.syEntranceFeeRatio || 0;
-  } else if (scope.row.costType == '驾意险') {
-    entranceFeeRatio = costitemEditInfo.value?.jyEntranceFeeRatio || 0;
-  }
+//  // 获取当前险种对应的入口手续费比例
+//  let entranceFeeRatio = 0;
+//   if (scope.row.costType == '交强险') {
+//     entranceFeeRatio = costitemEditInfo.value?.jqEntranceFeeRatio || 0;
+//   } else if (scope.row.costType == '商业险') {
+//     entranceFeeRatio = costitemEditInfo.value?.syEntranceFeeRatio || 0;
+//   } else if (scope.row.costType == '驾意险') {
+//     entranceFeeRatio = costitemEditInfo.value?.jyEntranceFeeRatio || 0;
+//   }
 
-  // 检查入口比例是否小于入口手续费比例
-  if (scope.row.inlet < entranceFeeRatio) {
-    ElMessage({
-      type: 'warning',
-      message: `入口比例不能小于入口手续费比例(${entranceFeeRatio}%)`,
-      plain: true,
-    });
-    scope.row.inlet = entranceFeeRatio;
-    return;
-  }
+//   // 检查入口比例是否小于入口手续费比例
+//   if (scope.row.inlet < entranceFeeRatio) {
+//     ElMessage({
+//       type: 'warning',
+//       message: `入口比例不能小于入口手续费比例(${entranceFeeRatio}%)`,
+//       plain: true,
+//     });
+//     scope.row.inlet = entranceFeeRatio;
+//     return;
+//   }
 
     if(scope.row.export&&scope.row.addThrow || scope.row.export&&scope.row.addThrow === 0) {
         scope.row.keepPointRatio = scope.row.inlet + scope.row.addThrow - scope.row.export

src/views/receivable/documentary/documentaryRecord.vue

@@ -64,7 +64,6 @@
       <el-table-column prop="invoiceParty" label="开票方" width="150"></el-table-column>
       <el-table-column prop="accountsReceivable" label="应收项" width="100"></el-table-column>
       <el-table-column prop="receivableAmount" label="应收金额" width="120"></el-table-column>
-      <el-table-column prop="overinflatedAmount" label="虚增金额" width="120"></el-table-column>
       <el-table-column prop="paymentReason" label="差额原因" width="120"></el-table-column>
       <el-table-column prop="taxPoint" label="税点" width="120"></el-table-column>
       <el-table-column prop="receivableSupervisePremium" label="开票金额" width="120"></el-table-column>
@@ -112,9 +111,9 @@
         <el-form-item prop="receivableAmount" label="应收金额">
           <el-input v-model="countForm.receivableAmount" disabled placeholder="请输入"></el-input>
         </el-form-item>
-        <el-form-item prop="overinflatedAmount" label="虚增金额">
+        <!-- <el-form-item prop="overinflatedAmount" label="虚增金额">
           <el-input v-model="countForm.overinflatedAmount" disabled placeholder="请输入"></el-input>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item prop="taxPoint" label="税点">
           <el-input v-model="countForm.taxPoint" disabled placeholder="请输入"></el-input>
         </el-form-item>