规则增加是否包含

config/dev.env.js

@@ -7,8 +7,8 @@ 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: '"http://192.168.0.115:8080/"', //凯森
+  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/"',//武鸿鹏

config/test.env.js

@@ -5,8 +5,8 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"testing"',
   ENV_CONFIG: '"test"',
-  // BASE_URL: '"http://proxy.517game.site:6100"',//测试服务器
-  BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
+  BASE_URL: '"http://proxy.517game.site:6100"',//测试服务器
+  // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
   // BASE_URL: '"http://192.168.0.115:8080"',
   APP_BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',    // app打包上传地址
   CONSOLE_BASE_URL: '"https://test.baoxianzhanggui.com/console-api"' //控制台测试服务器

src/assets/css/common.css

@@ -1,160 +1,230 @@
-
 :root {
-	--themeColor: #D42426;
-	--themeColorHover: #BB1012;
-  }
+  --themeColor: #D42426;
+  --themeColorHover: #BB1012;
+}
 
 /* flex布局 */
-.u-f,.u-f-ac,.u-f-ajc,.u-f-jsb,.u-f-je,.u-f1,.u-f-column,.u-f-sa{
-	display: flex;
+.u-f,
+.u-f-ac,
+.u-f-ajc,
+.u-f-jsb,
+.u-f-je,
+.u-f1,
+.u-f-column,
+.u-f-sa {
+  display: flex;
 }
-.u-f-ac,.u-f-ajc{
-	align-items: center;
+
+.u-f-ac,
+.u-f-ajc {
+  align-items: center;
 }
-.u-f-ajc{
-	justify-content: center;
+
+.u-f-ajc {
+  justify-content: center;
 }
-.u-f-jsb{
-	justify-content: space-between;
+
+.u-f-jsb {
+  justify-content: space-between;
 }
-.u-f-je{
-	justify-content: flex-end;
+
+.u-f-je {
+  justify-content: flex-end;
 }
-.u-f-sa{
-	justify-content: space-around;
+
+.u-f-sa {
+  justify-content: space-around;
 }
-.u-f1{
-	flex: 1;
+
+.u-f1 {
+  flex: 1;
 }
-.u-f-column{
-	flex-direction: column;
+
+.u-f-column {
+  flex-direction: column;
 }
-.flex{
-	display: flex;
+
+.flex {
+  display: flex;
 
 }
-.f-wrap{
+
+.f-wrap {
   flex-wrap: wrap;
 }
-.j-s{
-	justify-content: space-between;
+
+.j-s {
+  justify-content: space-between;
 }
-.j-c{
-	justify-content: center;
+
+.j-c {
+  justify-content: center;
 }
-.j-start{
-	justify-content: flex-start;
+
+.j-start {
+  justify-content: flex-start;
 }
-.j-end{
-	justify-content: flex-end;
+
+.j-end {
+  justify-content: flex-end;
 }
 
-.a-c{
-	align-items: center;
+.a-c {
+  align-items: center;
 }
-.a-start{
-	align-items: flex-start;
+
+.a-start {
+  align-items: flex-start;
 }
-.a-end{
-	align-items: flex-end;
+
+.a-end {
+  align-items: flex-end;
 }
-.f-c{
-	flex-direction: column;
+
+.f-c {
+  flex-direction: column;
 }
-.p-1{
+
+.p-1 {
   padding: 10px;
 }
-.p-2{
+
+.p-2 {
   padding: 20px;
 }
-.mrgin-1{
+
+.mrgin-1 {
   margin: 10px;
 }
-.mrgin-2{
+
+.mrgin-2 {
   margin: 20px;
 }
+
 .m-top-5 {
-	margin-top: 5px;
+  margin-top: 5px;
 }
+
 .m-top-10 {
-	margin-top: 10px;
+  margin-top: 10px;
 }
 
 .m-btn-10 {
-	margin-bottom: 10px;
+  margin-bottom: 10px;
 }
 
 .m-btn-15 {
-	margin-bottom: 15px;
+  margin-bottom: 15px;
 }
-.el-button:hover,.el-button:focus
-{
-	color: var(--themeColor);
-    border-color: rgba(212, 36, 38,0.2);
-    background-color: rgba(212, 36, 38,0.2);
+
+.el-button:hover,
+.el-button:focus {
+  color: var(--themeColor) ;
 }
-.el-button--primary,.el-button--primary:focus{
-	background-color: var(--themeColor);
-	color: #fff;
-	border-color: var(--themeColor);
+
+.el-button--primary,
+.el-button--primary:focus {
+  background-color: var(--themeColor) !important;
+  color: #fff;
+  border-color: var(--themeColor) !important;
 }
-.el-button--primary.is-plain{
-	background-color: #EAEDF1;
-	color: var(--themeColor);
-	border-color: #EAEDF1;
+
+.el-button--primary.is-plain {
+  background-color: #EAEDF1 !important;
+  color: var(--themeColor);
+  border-color: #EAEDF1 !important;
 }
-.el-button--primary:hover{
-	color: #fff;
-	background-color: var(--themeColorHover); ;
-	border-color: var(--themeColorHover); ;
 
+.el-button--primary:hover {
+  color: #fff;
+  background-color: var(--themeColorHover);
+  border-color: var(--themeColorHover);
 }
-.el-button--primary.is-plain:hover,.el-button--primary.is-disabled,.el-button--primary.is-disabled:hover{
-	background-color: #D2D2D2;
-	color: var(--themeColor);
-	border-color: #D2D2D2;
+
+.el-button--primary.is-plain:hover,
+.el-button--primary.is-disabled,
+.el-button--primary.is-disabled:hover {
+  background-color: #D2D2D2;
+  color: var(--themeColor);
+  border-color: #D2D2D2;
 }
 
-.el-tabs__active-bar, .el-date-table td.start-date span,.el-date-table td.end-date span,.el-date-table td.current:not(.disabled) span{
-	background-color:var(--themeColor)
+.el-tabs__active-bar,
+.el-date-table td.start-date span,
+.el-date-table td.end-date span,
+.el-date-table td.current:not(.disabled) span {
+  background-color: var(--themeColor)
 }
-.el-tabs__item:hover,.el-picker-panel__icon-btn:hover,.el-date-table td.available:hover,.el-button--text,.el-pager li:hover,
-.el-dialog__headerbtn:hover .el-dialog__close,.el-button--text:hover,.el-button--text:focus{
-	color: var(--themeColorHover);
+
+.el-tabs__item:hover,
+.el-picker-panel__icon-btn:hover,
+.el-date-table td.available:hover,
+.el-button--text,
+.el-pager li:hover,
+.el-dialog__headerbtn:hover .el-dialog__close,
+.el-button--text:hover,
+.el-button--text:focus {
+  color: var(--themeColorHover);
 }
-.dialog-title{
-    font-weight: bold;
-    padding-bottom: 10px;
+
+.dialog-title {
+  font-weight: bold;
+  padding-bottom: 10px;
 }
-.el-pager li.active,.el-select-dropdown__item.selected,.el-button--text,.el-tabs__item.is-active,.el-select-dropdown.is-multiple .el-select-dropdown__item.selected,
-.el-checkbox__input.is-checked+.el-checkbox__label,.el-button--primary.is-plain:focus{
-	color: var(--themeColor);
+
+.el-pager li.active,
+.el-select-dropdown__item.selected,
+.el-button--text,
+.el-tabs__item.is-active,
+.el-select-dropdown.is-multiple .el-select-dropdown__item.selected,
+.el-checkbox__input.is-checked+.el-checkbox__label,
+.el-button--primary.is-plain:focus {
+  color: var(--themeColorHover);
 }
-.el-range-editor.is-active,.el-pagination button,.el-pager li,.el-pagination__sizes .el-input .el-input__inner:hover,.el-checkbox__inner:hover
-,.el-range-editor.is-active, .el-range-editor.is-active:hover{
-	border-color: var(--themeColorHover);
+
+.el-range-editor.is-active,
+.el-pagination button,
+.el-pager li,
+.el-pagination__sizes .el-input .el-input__inner:hover,
+.el-checkbox__inner:hover,
+.el-range-editor.is-active,
+.el-range-editor.is-active:hover {
+  border-color: var(--themeColorHover);
 }
-.el-select .el-input.is-focus .el-input__inner ,.el-input__inner:focus,.el-select .el-input__inner:focus,.el-button--primary.is-plain:focus {
-	border-color: var(--themeColor);
- }
-.el-radio__input.is-checked + .el-radio__label {
-	color: var(--themeColor) !important;
+
+.el-select .el-input.is-focus .el-input__inner,
+.el-input__inner:focus,
+.el-select .el-input__inner:focus,
+.el-button--primary.is-plain:focus {
+  border-color: var(--themeColor);
 }
-.el-radio__input.is-checked .el-radio__inner,.el-checkbox__input.is-checked .el-checkbox__inner,
-.el-checkbox__input.is-indeterminate .el-checkbox__inner{
-	background: var(--themeColor) !important;
-	border-color: var(--themeColor) !important;
+
+.el-radio__input.is-checked+.el-radio__label {
+  color: var(--themeColor) !important;
+}
+
+.el-radio__input.is-checked .el-radio__inner,
+.el-checkbox__input.is-checked .el-checkbox__inner,
+.el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  background: var(--themeColor) !important;
+  border-color: var(--themeColor) !important;
 }
-.el-button--text,.el-button--text:hover,.el-button--text:focus{
-	border: none;
-    background-color: transparent;
+
+.el-button--text,
+.el-button--text:hover,
+.el-button--text:focus {
+  border: none;
+  background-color: transparent;
 }
+
 .el-button--primary.is-plain:focus {
-    background-color: #C8CDD9;
+  background-color: #C8CDD9;
 }
-.themeColor{
-	color: var(--themeColor) ;
+
+.themeColor {
+  color: var(--themeColor);
+}
+
+.el-table .flagRow {
+  background: rgba(64, 158, 255, .1) !important;
 }
-.el-table .flagRow{
-    background:rgba(64,158,255,.1) !important; 
-  }

src/components/Form/ProductCostForm.vue

@@ -2,8 +2,9 @@
   <div class="flex j-s " style="position: relative;">
     <div class="sidebarShortcut">
       <ul class="flex j-c a-c f-c">
-        <li v-if="underwritingRulesForm" :class="{ sidebarstyle: sidebarItem == 'gzxx' }" class="flex a-c " @click="scrollToSection('gzxx')">
-          <div :style="{ opacity: sidebarItem == 'gzxx' ? 1 : 0 }" class="ornament flex a-c j-c" ></div>规则信息
+        <li v-if="underwritingRulesForm" :class="{ sidebarstyle: sidebarItem == 'gzxx' }" class="flex a-c "
+          @click="scrollToSection('gzxx')">
+          <div :style="{ opacity: sidebarItem == 'gzxx' ? 1 : 0 }" class="ornament flex a-c j-c"></div>规则信息
         </li>
         <li :class="{ sidebarstyle: sidebarItem == 'clxx' }" class="flex a-c " @click="scrollToSection('clxx')">
           <div :style="{ opacity: sidebarItem == 'clxx' ? 1 : 0 }" class="ornament flex a-c j-c"></div>车辆信息
@@ -17,10 +18,12 @@
         <li :class="{ sidebarstyle: sidebarItem == 'bbrxx' }" class="flex a-c " @click="scrollToSection('bbrxx')">
           <div :style="{ opacity: sidebarItem == 'bbrxx' ? 1 : 0 }" class="ornament flex a-c j-c"></div>被保人信息
         </li>
-        <li v-if="insuranceTypeAttr.length>0" :class="{ sidebarstyle: sidebarItem == 'xbxx' }" class="flex a-c " @click="scrollToSection('xbxx')">
+        <li v-if="insuranceTypeAttr.length > 0" :class="{ sidebarstyle: sidebarItem == 'xbxx' }" class="flex a-c "
+          @click="scrollToSection('xbxx')">
           <div :style="{ opacity: sidebarItem == 'xbxx' ? 1 : 0 }" class="ornament flex a-c j-c"></div>险别信息
         </li>
-        <li v-if="insurerCostFactorAttr.length>0" :class="{ sidebarstyle: sidebarItem == 'bsfyyz' }" class="flex a-c " @click="scrollToSection('bsfyyz')">
+        <li v-if="insurerCostFactorAttr.length > 0" :class="{ sidebarstyle: sidebarItem == 'bsfyyz' }" class="flex a-c "
+          @click="scrollToSection('bsfyyz')">
           <div :style="{ opacity: sidebarItem == 'bsfyyz' ? 1 : 0 }" class="ornament flex a-c j-c"></div>保司费用因子
         </li>
       </ul>
@@ -60,8 +63,8 @@
               </el-col>
               <el-col :span="24">
                 <el-form-item label="规则描述">
-                  <el-input type="textarea" v-model="underwritingRulesForm.ruleDescription" placeholder="请输入承保规则描述" maxlength="100"
-                    show-word-limit></el-input>
+                  <el-input type="textarea" v-model="underwritingRulesForm.ruleDescription" placeholder="请输入承保规则描述"
+                    maxlength="100" show-word-limit></el-input>
                 </el-form-item>
               </el-col>
             </el-form>
@@ -119,8 +122,13 @@
                     v-model="LicenseNoChecked"
                     @change="LicenseNoCheckedChange($event, 'LicenseNo', 'min')">全选</el-checkbox>
                 </div>
-                <el-input v-if="formItems.attrType == 'input'" v-model="formItems.min"
-                  placeholder="输入（宝马、奥迪等）多个输入，用，隔开"></el-input>
+                <div v-if="formItems.attrType == 'input'" style="display: flex;">
+                  <el-input v-model="formItems.min" placeholder="输入（宝马、奥迪等）多个输入，用，隔开"></el-input>
+                  <el-select v-model="formItems.operator" placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                    <el-option label="包含" value="1"></el-option>
+                    <el-option label="不包含" value="2"></el-option>
+                  </el-select>
+                </div>
                 <el-checkbox-group v-if="formItems.attrType == 'checkbox'" v-model="formItems.minArray"
                   @change="checkboxChange($event, formItems.id, 'min')">
                   <el-checkbox v-for="dict in formItems.dictLabal" :key="dict.id" :label="dict.name"></el-checkbox>
@@ -332,7 +340,7 @@
             </el-col>
           </div>
         </el-card>
-        <el-card shadow="hover" class="margin-bom" id="xbxx" v-if="insuranceTypeAttr.length>0">
+        <el-card shadow="hover" class="margin-bom" id="xbxx" v-if="insuranceTypeAttr.length > 0">
           <div slot="header" class="clearfix flex j-s a-c">
             <div class="flex j-s a-c">
               <span>险别信息</span>
@@ -397,7 +405,7 @@
             </el-col>
           </div>
         </el-card>
-        <el-card shadow="hover" class="margin-bom" id="bsfyyz" v-if="insurerCostFactorAttr.length>0">
+        <el-card shadow="hover" class="margin-bom" id="bsfyyz" v-if="insurerCostFactorAttr.length > 0">
           <div slot="header" class="clearfix flex j-s a-c">
             <div class="flex j-s a-c">
               <span>保司费用因子</span>

src/http/moudules/insCompany.js

@@ -872,6 +872,8 @@ export const attrAdd = (data) => {
 export const ruleListQuery = (data) => {
   return axios({
     url: '/plt/scheme/ruleList',
+    method: 'post',
+    data
   })
 
 }
@@ -883,6 +885,13 @@ export const ruleUpdate = (data) => {
     data
   })
 }
+//获取商业险列表
+export const getBusinessInsurance = () => {
+  return axios({
+    url: "/plt/scheme/getBusinessInsurance",
+    method: 'post',
+  })
+}
 
 //获取详情信息
 export const ruledetails = (id, carnature, vehicleType, energyType) => {
@@ -901,6 +910,14 @@ export const ruleDelete = (data) => {
 }
 //方案配置
 
+//获取保险公司列表
+export const solutioncompanyList = (data) => {
+  return axios({
+    url: "/plt/scheme/companyList",
+    method: 'post',
+    data
+  })
+}
 
 //添加方案
 export const shcemeAdd = (data) => {

src/views/PeopleManage/Sales/SalesManage.vue

@@ -1177,31 +1177,31 @@ export default {
 </style>
 
 <style lang="scss" scoped>
-> > > .el-tabs__item:hover {
+>>> .el-tabs__item:hover {
   color: #2d4d89;
 }
 
-> > > .el-tabs__item.is-active {
+>>> .el-tabs__item.is-active {
   color: #fff;
   background: #2d4d89;
   transition: all ease 0.5s;
 }
 
-> > > .el-tabs__active-bar {
+>>> .el-tabs__active-bar {
   background-color: #2d4d89;
 }
 
-> > > .el-tabs__item.is-top:nth-child(2) {
+>>> .el-tabs__item.is-top:nth-child(2) {
   padding-left: 20px !important;
 }
 
-> > > .el-tabs--top .el-tabs__item.is-top:last-child {
+>>> .el-tabs--top .el-tabs__item.is-top:last-child {
   padding-right: 20px !important;
 }
 
 .el-tabs {
-  > > > .el-input__inner:focus,
-  > > > .el-select .el-input.is-focus .el-input__inner {
+  >>> .el-input__inner:focus,
+  >>> .el-select .el-input.is-focus .el-input__inner {
     border-color: #2d4d89;
   }
 

src/views/Sys/Appversion.vue

@@ -251,7 +251,7 @@ export default {
         updateflag: false, //强制更新
         issueflag: false, //上线发行
         sid: "",
-       
+
       },
       // 查看
       appformLabelAlign1: {},
@@ -605,4 +605,4 @@ export default {
   padding: 20px;
   box-sizing: border-box;
 }
-</style>
+</style>