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

src/views/insurancePolicy/index.vue

@@ -974,7 +974,7 @@
                                     :value="item.value"></el-option>
                                 </el-select>
                                 <span v-if="props.row.kindName == '乘客责任险'">*{{ insurancePolicyForm.seatCount - 1
-                                }}/座</span>
+                                  }}/座</span>
                               </div>
                             </template>
                           </el-table-column>
@@ -1046,7 +1046,7 @@
                           <el-table-column label="产品名称" prop="productName" align="center">
                             <template #default="props">
                               <el-button link type="primary" @click="getJYXDetail(props.row)">{{ props.row.productName
-                              }}</el-button>
+                                }}</el-button>
                             </template>
                           </el-table-column>
                           <el-table-column label="数量" align="center">
@@ -1099,12 +1099,12 @@
                             <div class="Factor-item flex a-c f-c ">
                               <span class="item-header flex a-c ">交强续保</span>
                               <span>{{ ['', '新保', '续保', '转保'][Number(scope.row.quoteResult?.scoreVo?.jqRenewal)] || '--'
-                                }}</span>
+                              }}</span>
                             </div>
                             <div class="Factor-item flex a-c f-c ">
                               <span class="item-header flex a-c ">商业续保</span>
                               <span>{{ ['', '新保', '续保', '转保'][Number(scope.row.quoteResult?.scoreVo?.syRenewal)] || '--'
-                                }}</span>
+                              }}</span>
                             </div>
                             <div class="Factor-item flex a-c f-c ">
                               <span class="item-header flex a-c ">总折扣率</span>
@@ -1182,9 +1182,8 @@
             </el-table-column>
             <el-table-column label="报价协议" prop="" align="center" width="300">
               <template #default="scope">
-                <el-select v-model="scope.row.agreement"
-                  :disabled="!!scope.row.isDispatch || scope.row.agreements?.length == 1"
-                  v-if="scope.row.checked || isViewSuccess" :placeholder="scope.row.isDispatch ? '默认' : '请选择'">
+                <el-select v-model="scope.row.agreement" :disabled="scope.row.isDispatch"
+                  v-if="scope.row.checked || isViewSuccess" :placeholder="scope.row.isDispatch===1 ? '默认' : '请选择'">
                   <el-option v-for="item in scope.row.agreements" :value="item.id"
                     :label="item.agreementName"></el-option>
                 </el-select>
@@ -3981,7 +3980,7 @@ const ruleFilterCompany = (item: any, obj: any) => {
       quoteData.value = res.data
       // 如果只有一个协议，自动选择
       quoteData.value.forEach((item: any) => {
-        if (item.agreements && item.agreements.length == 1 && !!item.isDispatch) {
+        if (item.agreements && item.agreements.length == 1 && !item.isDispatch) {
           item.agreement = item.agreements[0].id
         }
       })

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

@@ -288,6 +288,7 @@ const handelRK = (scope) => {
   if (scope.row.keepPointRatio && scope.row.addThrow || scope.row.keepPointRatio && scope.row.addThrow === 0) {
     scope.row.export = scope.row.inlet + scope.row.addThrow - scope.row.keepPointRatio
   }
+  if (scope.row.inlet < scope.row.export) scope.row.export = scope.row.inlet;handelCK(scope)
 }
 const handelCK = (scope) => {
   if (scope.row.inlet && scope.row.addThrow || scope.row.inlet && scope.row.addThrow === 0) {
@@ -302,6 +303,7 @@ const handelCK = (scope) => {
   if (scope.row.keepPointRatio) {
     scope.row.exportKeepPointRatio = scope.row.export - scope.row.keepPointRatio
   }
+  if (scope.row.exportKeepPointRatio > scope.row.export) scope.row.exportKeepPointRatio = scope.row.export
 }
 const handelJT = (scope) => {
   if (scope.row.inlet && scope.row.export) {