From 632d07bb67b5617d9d7d3baec65ae79e10f8f073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= <pi.wei@ebiz-fooge.com>
Date: Tue, 19 Nov 2019 16:23:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=84=8F=E5=A4=96=E4=BC=A4?=
 =?UTF-8?q?=E5=AE=B3=E9=99=A9=E7=A7=8D=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/CalculatePremium.vue | 51 ++++++++++++++++++++++
 src/views/ebiz/sale/InsuredInfo.vue        |  1 +
 2 files changed, 52 insertions(+)

diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index fd6f15ae8..445dc261a 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -50,6 +50,46 @@
               @click="toSelect(index, riskFactorIndex, riskFactor.columns)"
             />
           </div>
+          <div class="border-bottom" v-if="riskFactor.type == 3">
+            <div class="pv12 border-bd">{{ riskFactor.name }}</div>
+            <div class="duty">
+              <div
+                class="flex justify-content-s border-bd pv10 align-items-c"
+                v-for="(dutyItem, dutyItemIndex) in riskFactor.rules"
+                :key="dutyItemIndex"
+              >
+                <span class="fs14">{{ dutyItem.dutyName }}({{ dutyItem.suffix }})</span>
+                <div class="flex">
+                  <van-stepper
+                    v-model="dutyItem.defaultDutyAmt"
+                    :min="dutyItem.minDutyAmt"
+                    :max="dutyItem.maxDutyAmt"
+                    class="ml10 mr10"
+                    @focus="focusStep"
+                    @blur="blurStep"
+                    @change="
+                      dutyStepperChange(
+                        item.calFactorLst[riskFactorIndex].rules[dutyItemIndex].defaultDutyAmt,
+                        index,
+                        riskFactorIndex,
+                        dutyItemIndex,
+                        dutyItem.checked,
+                        dutyItem.minDutyAmt,
+                        dutyItem.maxDutyAmt
+                      )
+                    "
+                    input-width="100"
+                    :integer="true"
+                  />
+                  <van-checkbox
+                    v-model="dutyItem.checked"
+                    shape="square"
+                    @change="changeChecked(index, riskFactorIndex, dutyItemIndex)"
+                  ></van-checkbox>
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
       <!-- 豁免险条件 -->
@@ -530,6 +570,17 @@ export default {
             }
           } else if (factor.type == 2) {
             trialInfo[factor.extra] = this.saleInsuredPersonInfo[factor.code]
+          } else if (factor.type == 3) {
+            let result = []
+            factor.rules.forEach(dutyItem => {
+              if (dutyItem.checked) {
+                result.push({
+                  amt: dutyItem.amt,
+                  dutyCode: dutyItem.duty
+                })
+              }
+            })
+            trialInfo.duty = result
           }
         })
         //通用规则1：交费方式为一次交情，无交费期限
diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index 3ab5c75d4..6da420f1f 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -8,6 +8,7 @@
         v-validate="'required|name'"
         name="姓名"
         label="姓名"
+        required
         :parentShowPicker.sync="customerShowPicker"
         :value.sync="userInfo.name"
         @nameChange="nameChange"