报价单修改

src/views/Core/components/quotationDialog.vue

@@ -214,7 +214,8 @@ export default {
             if((data.kindinfo && data.kindinfo.length > 0)  || (data.accidentInfo && data.accidentInfo.length > 0)){
                 data.kindinfo && data.kindinfo.length > 0 ? data.kindinfo.forEach(el => {el.label = '商业险', el.name = el.kindName;el.totalPremium=data.sypremium}) : data.kindinfo
                 data.accidentInfo && data.accidentInfo.length > 0 ? data.accidentInfo.forEach(e => {e.label = '驾意险';e.totalPremium=data.jypremium}) : data.accidentInfo
-                this.allProducts =data.jqInsuranceType.concat(data.kindinfo, data.accidentInfo)
+                this.allProducts =data.jqInsuranceType.concat(data.kindinfo && data.kindinfo.length > 0?data.kindinfo:[],data.accidentInfo && data.accidentInfo.length > 0? data.accidentInfo:[])
+
             }
             else{
                 this.allProducts=data.jqInsuranceType

src/views/Core/components/quotationDialogPro.vue

@@ -91,7 +91,28 @@
                 </el-table-column>
                 <el-table-column width="450" prop="name" align="center" label="险别/名称">
                 </el-table-column>
-                <el-table-column align="center" prop="amount" label="保额"></el-table-column>
+                <el-table-column align="center" prop="amount" label="保额">
+                    <template slot-scope="scope">
+                        <div v-if="['D4', 'SY_FJ_YBW2'].includes(scope.row.kindCode)">
+                            <span>{{ scope.row.unitAmount }}</span>/<span>{{ queryOrders.carinfo.seatCount - 1 }}座</span>
+                        </div>
+                        <div v-else-if="['MJ1', 'MJ2', 'MJ3', 'MJ4'].includes(
+                            scope.row.kindCode
+                        )
+                            ">
+                            <span>{{ scope.row.deductibleRate }}</span>
+                        </div>
+                        <div v-else-if="['TY1', 'TY2', 'TY3', 'TY4'].includes(
+                            scope.row.kindCode
+                        )
+                            ">
+                            <span>{{ scope.row.serviceTimes }}/次</span>
+                        </div>
+                        <div v-else>
+                            <span>{{ scope.row.amount }}</span>
+                        </div>
+                    </template>
+                </el-table-column>
                 <el-table-column align="center" prop="coveragePremium" label="保费（元）">
                     <template slot-scope="scope">
                         {{ scope.row.label=='商业险'?scope.row.coveragePremium:scope.row.label=='驾意险'?scope.row.premium:'-' }}
@@ -152,7 +173,8 @@ export default {
             if((data.kindinfo && data.kindinfo.length > 0)  || (data.accidentInfo && data.accidentInfo.length > 0)){
                 data.kindinfo && data.kindinfo.length > 0 ? data.kindinfo.forEach(el => {el.label = '商业险', el.name = el.kindName;el.totalPremium=data.sypremium}) : data.kindinfo
                 data.accidentInfo && data.accidentInfo.length > 0 ? data.accidentInfo.forEach(e => {e.label = '驾意险';e.totalPremium=data.jypremium}) : data.accidentInfo
-                this.allProducts =data.jqInsuranceType.concat(data.kindinfo, data.accidentInfo)
+                this.allProducts =data.jqInsuranceType.concat(data.kindinfo && data.kindinfo.length > 0?data.kindinfo:[],data.accidentInfo && data.accidentInfo.length > 0? data.accidentInfo:[])
+
             }
             else{
                 this.allProducts=data.jqInsuranceType