Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

config/dev.env.js

@@ -8,12 +8,12 @@ module.exports = merge(prodEnv, {
 
   ENV_CONFIG:'"dev"',
   // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
-  // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
+  BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
-  BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
+  // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',

src/views/Core/components/quotationDialog.vue

@@ -60,7 +60,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:'-' }}