'[协议管理]-[保险公司方案配置]-[客车/货车/燃油/新能源]方案配置的交互改版'

build/webpack.dev.conf.js

@@ -52,7 +52,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
   },
   plugins: [
     new webpack.DefinePlugin({
-      'process.env': require('../config/dev.env')
+      'process.env': require('../config/test.env')
     }),
     new webpack.HotModuleReplacementPlugin(),
     new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update.
@@ -89,9 +89,9 @@ module.exports = new Promise((resolve, reject) => {
       // Add FriendlyErrorsPlugin
       devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
         compilationSuccessInfo: {
-          messages: [ 
+          messages: [
             `App runing at: `,
-            ` - Local: http://localhost:${port}`, 
+            ` - Local: http://localhost:${port}`,
             ` - Network: http://${require('ip').address()}:${port}`,
           ],
         },

src/utils/bus.js

@@ -0,0 +1,4 @@
+//创建一个都可以访问到的事件总线(空的 Vue实例)
+import Vue from 'vue'
+const Bus = new Vue();
+export default Bus

src/views/AgreementManage/InsuranceCompany/CargoTruck/BusinessOperation/Fuel/AddOptionalsolutionConfig.vue

@@ -195,6 +195,7 @@
 <script>
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import Editor from "@/components/Tinymce/index.vue";//富文本
+
 export default {
   // 数据存放区域
   components: {
@@ -294,7 +295,7 @@ export default {
     customsolutionUpdate({ row, column }) {
       this.customsolutionType = 'edit';
       this.customsolutionTitle = '自选方案修改';
-      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A0', '0').then((res) => {
+      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A1', '0').then((res) => {
         if (res.code == '200') {
           res.data.kinds.map(val => {
             if (val.amount.length > 0) {
@@ -364,7 +365,7 @@ export default {
       });
     },
     customsolutionFindPage() {
-      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data,
@@ -383,14 +384,14 @@ export default {
     },
     customsolutionSubmit() {
       if (this.customsolutionType == 'add') {
-        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A", energyType: "0" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
               message: res.msg,
             });
-            this.$emit('optionalsolutionConfigSubmit')
             this.customsolutionFindPage();
+            this.$emit('optionalsolutionConfigSubmit');
           } else {
             this.$message({
               type: 'error',
@@ -399,7 +400,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -491,8 +492,8 @@ export default {
       })
     },
     customsolutionAdd() {
-      this.customsolutionType = 'add';
-      this.customsolutionTitle = '自选方案配置';
+      // this.customsolutionType = 'add';
+      // this.customsolutionTitle = '自选方案配置';
     },
     getDicType(type) {
       this.$api.insCompany.dicType(type).then((res) => {

src/views/AgreementManage/InsuranceCompany/CargoTruck/BusinessOperation/Fuel/AddOrdinaryPlan.vue

@@ -537,7 +537,7 @@ export default {
     },
     solutionSubmit(formName) {
       if (this.solutionDialogType == 'add') {
-        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A1",energyType:"0"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -553,7 +553,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A1",energyType:"0"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -582,7 +582,7 @@ export default {
       this.solutionDialogTitle = '添加方案'
     },
     solutionFindPage() {
-      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A0",energyType:"0" }).then((res) => {
+      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A1",energyType:"0" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data.records,
@@ -603,7 +603,7 @@ export default {
     solutionUpdate({ row, column }) {
       this.solutionDialogType = 'edit';
       this.solutionDialogTitle = '编辑方案'
-      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A0','0').then((res) => {
+      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A1','0').then((res) => {
         if (res.code == '200') {
           res.data.productList.map(valA => {
             valA.kinds.map(valB => {

src/views/AgreementManage/InsuranceCompany/CargoTruck/BusinessOperation/Fuel/OptionalsolutionConfig.vue

@@ -11,7 +11,7 @@
       button2Name="编辑" button2Type="text" @findPage="customsolutionFindPage" @handleButton2="customsolutionUpdate" button3Name="删除" button3Type="text"
       @handleButton3="customsolutionDel" :columns="customsolutionColumns">
     </kt-common-table>
-    <el-dialog v-dialogDrag :modal="false" :title="customsolutionTitle" :visible.sync="customsolutionVisible" width="80%" top="2vh"
+    <el-dialog v-dialogDrag :title="customsolutionTitle" :visible.sync="customsolutionVisible" width="80%" top="2vh"
       @close="customsolutioncloseDialog">
       <div class="tab-panestyle">
         <div class="tab-panecent">
@@ -184,7 +184,7 @@
           @click="customsolutionSubmit('solutionForm')">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog :append-to-body="true" :modal="false" v-dialogDrag :title="insDrivingIntentionInsuranceSon.projectName"
+    <el-dialog :append-to-body="true" v-dialogDrag :title="insDrivingIntentionInsuranceSon.projectName"
       :visible.sync="insDrivingIntentionInsuranceSondialogVisible" width="50%">
       <el-table :data="insDrivingIntentionInsuranceSon.insDrivingIntentionInsuranceSon" size="mini" :header-cell-style="{
         background: '#F7F7F9',
@@ -218,6 +218,10 @@ export default {
       default: function () {
         return 1
       }
+    },
+    optionalIndex: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -262,6 +266,11 @@ export default {
       if (newVal === 1) {
         this.initData()
       }
+    },
+    optionalIndex (newVal) {
+      if (newVal) {
+        this.initData()
+      }
     }
   },
   // 生命周期函数

src/views/AgreementManage/InsuranceCompany/CargoTruck/BusinessOperation/Fuel/OrdinaryPlan.vue

@@ -7,7 +7,7 @@
     <!-- @findPage="solutionFindPage" -->
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="solutionResult" button2Name="编辑"
-      button2Type="text" @handleButton2="solutionUpdate" @findPage="solutionFindPage" button3Name="删除" button3Type="text" @handleButton3="solutionDel"
+      button2Type="text" @findPage="solutionFindPage" @handleButton2="solutionUpdate" button3Name="删除" button3Type="text" @handleButton3="solutionDel"
       :columns="solutionColumns">
     </kt-common-table>
     <el-dialog v-dialogDrag :title="solutionDialogTitle" :visible.sync="solutionVisible" width="90%" top="2vh"
@@ -257,6 +257,10 @@ export default {
       default: function () {
         return 0
       }
+    },
+    ordinaryIndex: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -308,6 +312,11 @@ export default {
       if (newVal === 0) {
         this.initData()
       }
+    },
+    ordinaryIndex (newVal) {
+      if (newVal) {
+        this.initData()
+      }
     }
   },
   // 生命周期函数
@@ -568,7 +577,7 @@ export default {
     },
     solutionSubmit(formName) {
       if (this.solutionDialogType == 'add') {
-        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A1",energyType:"0"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -584,7 +593,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A1",energyType:"0"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -614,7 +623,7 @@ export default {
       this.solutionVisible = true;
     },
     solutionFindPage() {
-      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A0",energyType:"0" }).then((res) => {
+      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A1",energyType:"0" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data.records,
@@ -635,7 +644,7 @@ export default {
     solutionUpdate({ row, column }) {
       this.solutionDialogType = 'edit';
       this.solutionDialogTitle = '编辑方案'
-      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A0','0').then((res) => {
+      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A1','0').then((res) => {
         if (res.code == '200') {
           res.data.productList.map(valA => {
             valA.kinds.map(valB => {

src/views/AgreementManage/InsuranceCompany/CargoTruck/BusinessOperation/Fuel/SolutionConfig.vue

@@ -5,10 +5,10 @@
       </div>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
           <el-tab-pane label="普通方案配置" name="first">
-              <ordinary-plan :activeIndex="activeIndex"/>
+              <ordinary-plan :activeIndex="activeIndex" :ordinaryIndex="ordinaryIndex"/>
           </el-tab-pane>
           <el-tab-pane label="自选方案配置" name="second">
-              <optionalsolution-config :activeIndex="activeIndex"/>
+              <optionalsolution-config :activeIndex="activeIndex" :optionalIndex="optionalIndex"/>
           </el-tab-pane>
       </el-tabs>
       <el-dialog v-dialogDrag title="添加方案" :visible.sync="newPlanflag" width="80%" top="2vh" @close="newPlanflag = false">
@@ -44,6 +44,8 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
           dialogFlage: false,
           newPlanflag: false,
           activeIndex: 0,
+          ordinaryIndex: 0, // 普通方案组件更新
+          optionalIndex: 0, // 自选方案组件更新
         }
       },
       created () {
@@ -61,16 +63,18 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
         },
         optionalsolutionConfigSubmit () {
             this.newPlanflag = false
+            this.optionalIndex = (this.optionalIndex + 1) % 3
         },
         optionalsolutionConfigCancel () {
             this.newPlanflag = false
         },
         ordinaryPlanSubmit () {
             this.newPlanflag = false
+            this.ordinaryIndex = (this.ordinaryIndex + 1) % 3
         },
         ordinaryPlanCancel () {
-            this.newPlanflag = false   
-        }
+            this.newPlanflag = false
+        },
       }
   }
 </script>
@@ -85,4 +89,4 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
   box-sizing: border-box;
   justify-content: flex-end;
 }
-</style>
+</style>

src/views/AgreementManage/InsuranceCompany/CargoTruck/BusinessOperation/NewEnergy/AddOptionalsolutionConfig.vue

@@ -195,6 +195,7 @@
 <script>
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import Editor from "@/components/Tinymce/index.vue";//富文本
+
 export default {
   // 数据存放区域
   components: {
@@ -294,7 +295,7 @@ export default {
     customsolutionUpdate({ row, column }) {
       this.customsolutionType = 'edit';
       this.customsolutionTitle = '自选方案修改';
-      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A0', '0').then((res) => {
+      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A1', '1').then((res) => {
         if (res.code == '200') {
           res.data.kinds.map(val => {
             if (val.amount.length > 0) {
@@ -364,7 +365,7 @@ export default {
       });
     },
     customsolutionFindPage() {
-      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A1", energyType: "1" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data,
@@ -383,14 +384,14 @@ export default {
     },
     customsolutionSubmit() {
       if (this.customsolutionType == 'add') {
-        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "1" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
               message: res.msg,
             });
-            this.$emit('optionalsolutionConfigSubmit')
             this.customsolutionFindPage();
+            this.$emit('optionalsolutionConfigSubmit');
           } else {
             this.$message({
               type: 'error',
@@ -399,7 +400,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "1" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -491,8 +492,8 @@ export default {
       })
     },
     customsolutionAdd() {
-      this.customsolutionType = 'add';
-      this.customsolutionTitle = '自选方案配置';
+      // this.customsolutionType = 'add';
+      // this.customsolutionTitle = '自选方案配置';
     },
     getDicType(type) {
       this.$api.insCompany.dicType(type).then((res) => {

src/views/AgreementManage/InsuranceCompany/CargoTruck/BusinessOperation/NewEnergy/AddOrdinaryPlan.vue

@@ -537,7 +537,7 @@ export default {
     },
     solutionSubmit(formName) {
       if (this.solutionDialogType == 'add') {
-        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A1",energyType:"1"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -553,7 +553,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A1",energyType:"1"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -582,7 +582,7 @@ export default {
       this.solutionDialogTitle = '添加方案'
     },
     solutionFindPage() {
-      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A0",energyType:"0" }).then((res) => {
+      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A1",energyType:"1" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data.records,
@@ -603,7 +603,7 @@ export default {
     solutionUpdate({ row, column }) {
       this.solutionDialogType = 'edit';
       this.solutionDialogTitle = '编辑方案'
-      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A0','0').then((res) => {
+      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A1','1').then((res) => {
         if (res.code == '200') {
           res.data.productList.map(valA => {
             valA.kinds.map(valB => {

src/views/AgreementManage/InsuranceCompany/CargoTruck/BusinessOperation/NewEnergy/AttrConfig.vue

@@ -172,7 +172,7 @@ export default {
     },
     attrUpdate({ row, column }) {
       this.ruleform.id = row.id;
-      this.$api.insCompany.ruledetails(row.id,'01',"A1",'1').then((res) => {
+      this.$api.insCompany.ruledetails(row.id,"01","A1","1").then((res) => {
         if (res.code == '200') {
           let obj = Object.assign({}, res.data);
           obj.attrs.map(val => {
@@ -236,9 +236,9 @@ export default {
       this.ruleSaveVo.attrs = Arraydata.myArray ? Arraydata.myArray : [];
       this.ruleSaveVo.rule = this.ruleform;
       this.ruleSaveVo.id = this.id;
-      this.ruleSaveVo.rule.carnature="01";
       this.ruleSaveVo.rule.vehicleType="A1";
       this.ruleSaveVo.rule.energyType="1";
+      this.ruleSaveVo.rule.carnature="01";
       this.$refs[formName].validate((valid) => {
 
         if (valid) {

src/views/AgreementManage/InsuranceCompany/CargoTruck/BusinessOperation/NewEnergy/OptionalsolutionConfig.vue

@@ -11,7 +11,7 @@
       button2Name="编辑" button2Type="text" @findPage="customsolutionFindPage" @handleButton2="customsolutionUpdate" button3Name="删除" button3Type="text"
       @handleButton3="customsolutionDel" :columns="customsolutionColumns">
     </kt-common-table>
-    <el-dialog v-dialogDrag :modal="false" :title="customsolutionTitle" :visible.sync="customsolutionVisible" width="80%" top="2vh"
+    <el-dialog v-dialogDrag :title="customsolutionTitle" :visible.sync="customsolutionVisible" width="80%" top="2vh"
       @close="customsolutioncloseDialog">
       <div class="tab-panestyle">
         <div class="tab-panecent">
@@ -184,7 +184,7 @@
           @click="customsolutionSubmit('solutionForm')">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog :append-to-body="true" :modal="false" v-dialogDrag :title="insDrivingIntentionInsuranceSon.projectName"
+    <el-dialog :append-to-body="true" v-dialogDrag :title="insDrivingIntentionInsuranceSon.projectName"
       :visible.sync="insDrivingIntentionInsuranceSondialogVisible" width="50%">
       <el-table :data="insDrivingIntentionInsuranceSon.insDrivingIntentionInsuranceSon" size="mini" :header-cell-style="{
         background: '#F7F7F9',
@@ -218,6 +218,10 @@ export default {
       default: function () {
         return 1
       }
+    },
+    optionalIndex: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -262,6 +266,11 @@ export default {
       if (newVal === 1) {
         this.initData()
       }
+    },
+    optionalIndex (newVal) {
+      if (newVal) {
+        this.initData()
+      }
     }
   },
   // 生命周期函数
@@ -327,7 +336,7 @@ export default {
     customsolutionUpdate({ row, column }) {
       this.customsolutionType = 'edit';
       this.customsolutionTitle = '自选方案修改';
-      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A1', '0').then((res) => {
+      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A1', '1').then((res) => {
         if (res.code == '200') {
           res.data.kinds.map(val => {
             if (val.amount.length > 0) {
@@ -398,7 +407,7 @@ export default {
       });
     },
     customsolutionFindPage() {
-      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A1", energyType: "1" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data,
@@ -414,7 +423,7 @@ export default {
     },
     customsolutionSubmit() {
       if (this.customsolutionType == 'add') {
-        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "1" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -430,7 +439,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "1" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',

src/views/AgreementManage/InsuranceCompany/CargoTruck/BusinessOperation/NewEnergy/OrdinaryPlan.vue

@@ -7,7 +7,7 @@
     <!-- @findPage="solutionFindPage" -->
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="solutionResult" button2Name="编辑"
-      button2Type="text" @handleButton2="solutionUpdate" @findPage="solutionFindPage" button3Name="删除" button3Type="text" @handleButton3="solutionDel"
+      button2Type="text" @findPage="solutionFindPage" @handleButton2="solutionUpdate" button3Name="删除" button3Type="text" @handleButton3="solutionDel"
       :columns="solutionColumns">
     </kt-common-table>
     <el-dialog v-dialogDrag :title="solutionDialogTitle" :visible.sync="solutionVisible" width="90%" top="2vh"
@@ -257,6 +257,10 @@ export default {
       default: function () {
         return 0
       }
+    },
+    ordinaryIndex: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -308,6 +312,11 @@ export default {
       if (newVal === 0) {
         this.initData()
       }
+    },
+    ordinaryIndex (newVal) {
+      if (newVal) {
+        this.initData()
+      }
     }
   },
   // 生命周期函数
@@ -568,7 +577,7 @@ export default {
     },
     solutionSubmit(formName) {
       if (this.solutionDialogType == 'add') {
-        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A1",energyType:"1"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -584,7 +593,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A1",energyType:"1"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -614,7 +623,7 @@ export default {
       this.solutionVisible = true;
     },
     solutionFindPage() {
-      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A0",energyType:"0" }).then((res) => {
+      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A1",energyType:"1" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data.records,
@@ -635,7 +644,7 @@ export default {
     solutionUpdate({ row, column }) {
       this.solutionDialogType = 'edit';
       this.solutionDialogTitle = '编辑方案'
-      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A0','0').then((res) => {
+      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A1','1').then((res) => {
         if (res.code == '200') {
           res.data.productList.map(valA => {
             valA.kinds.map(valB => {

src/views/AgreementManage/InsuranceCompany/CargoTruck/BusinessOperation/NewEnergy/SolutionConfig.vue

@@ -5,10 +5,10 @@
       </div>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
           <el-tab-pane label="普通方案配置" name="first">
-              <ordinary-plan :activeIndex="activeIndex"/>
+              <ordinary-plan :activeIndex="activeIndex" :ordinaryIndex="ordinaryIndex"/>
           </el-tab-pane>
           <el-tab-pane label="自选方案配置" name="second">
-              <optionalsolution-config :activeIndex="activeIndex"/>
+              <optionalsolution-config :activeIndex="activeIndex" :optionalIndex="optionalIndex"/>
           </el-tab-pane>
       </el-tabs>
       <el-dialog v-dialogDrag title="添加方案" :visible.sync="newPlanflag" width="80%" top="2vh" @close="newPlanflag = false">
@@ -44,6 +44,8 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
           dialogFlage: false,
           newPlanflag: false,
           activeIndex: 0,
+          ordinaryIndex: 0, // 普通方案组件更新
+          optionalIndex: 0, // 自选方案组件更新
         }
       },
       created () {
@@ -61,16 +63,18 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
         },
         optionalsolutionConfigSubmit () {
             this.newPlanflag = false
+            this.optionalIndex = (this.optionalIndex + 1) % 3
         },
         optionalsolutionConfigCancel () {
             this.newPlanflag = false
         },
         ordinaryPlanSubmit () {
             this.newPlanflag = false
+            this.ordinaryIndex = (this.ordinaryIndex + 1) % 3
         },
         ordinaryPlanCancel () {
-            this.newPlanflag = false   
-        }
+            this.newPlanflag = false
+        },
       }
   }
 </script>
@@ -85,4 +89,4 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
   box-sizing: border-box;
   justify-content: flex-end;
 }
-</style>
+</style>

src/views/AgreementManage/InsuranceCompany/CargoTruck/NonBusiness/Fuel/AddOptionalsolutionConfig.vue

@@ -195,6 +195,7 @@
 <script>
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import Editor from "@/components/Tinymce/index.vue";//富文本
+
 export default {
   // 数据存放区域
   components: {
@@ -294,7 +295,7 @@ export default {
     customsolutionUpdate({ row, column }) {
       this.customsolutionType = 'edit';
       this.customsolutionTitle = '自选方案修改';
-      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A0', '0').then((res) => {
+      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "02", 'A1', '0').then((res) => {
         if (res.code == '200') {
           res.data.kinds.map(val => {
             if (val.amount.length > 0) {
@@ -364,7 +365,7 @@ export default {
       });
     },
     customsolutionFindPage() {
-      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "02", vehicleType: "A1", energyType: "0" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data,
@@ -383,14 +384,14 @@ export default {
     },
     customsolutionSubmit() {
       if (this.customsolutionType == 'add') {
-        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "02", vehicleType: "A1", energyType: "0" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
               message: res.msg,
             });
-            this.$emit('optionalsolutionConfigSubmit')
             this.customsolutionFindPage();
+            this.$emit('optionalsolutionConfigSubmit');
           } else {
             this.$message({
               type: 'error',
@@ -399,7 +400,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "02", vehicleType: "A1", energyType: "0" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -491,8 +492,8 @@ export default {
       })
     },
     customsolutionAdd() {
-      this.customsolutionType = 'add';
-      this.customsolutionTitle = '自选方案配置';
+      // this.customsolutionType = 'add';
+      // this.customsolutionTitle = '自选方案配置';
     },
     getDicType(type) {
       this.$api.insCompany.dicType(type).then((res) => {

src/views/AgreementManage/InsuranceCompany/CargoTruck/NonBusiness/Fuel/AddOrdinaryPlan.vue

@@ -537,7 +537,7 @@ export default {
     },
     solutionSubmit(formName) {
       if (this.solutionDialogType == 'add') {
-        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"02",vehicleType:"A1",energyType:"0"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -553,7 +553,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"02",vehicleType:"A1",energyType:"0"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -582,7 +582,7 @@ export default {
       this.solutionDialogTitle = '添加方案'
     },
     solutionFindPage() {
-      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A0",energyType:"0" }).then((res) => {
+      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"02",vehicleType:"A1",energyType:"0" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data.records,
@@ -603,7 +603,7 @@ export default {
     solutionUpdate({ row, column }) {
       this.solutionDialogType = 'edit';
       this.solutionDialogTitle = '编辑方案'
-      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A0','0').then((res) => {
+      this.$api.insCompany.schemedetails(row.companyId, row.productId,"02",'A1','0').then((res) => {
         if (res.code == '200') {
           res.data.productList.map(valA => {
             valA.kinds.map(valB => {

src/views/AgreementManage/InsuranceCompany/CargoTruck/NonBusiness/Fuel/AttrConfig.vue

@@ -172,7 +172,7 @@ export default {
     },
     attrUpdate({ row, column }) {
       this.ruleform.id = row.id;
-      this.$api.insCompany.ruledetails(row.id,'02','A1',"0").then((res) => {
+      this.$api.insCompany.ruledetails(row.id,"02","A1","0").then((res) => {
         if (res.code == '200') {
           let obj = Object.assign({}, res.data);
           obj.attrs.map(val => {

src/views/AgreementManage/InsuranceCompany/CargoTruck/NonBusiness/Fuel/OptionalsolutionConfig.vue

@@ -7,11 +7,11 @@
     </div> -->
     <!-- @findPage="customsolutionFindPage" -->
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
-      :showBatchDelete="false" :showBatchSettled="false" @findPage="customsolutionFindPage" :showBatchPrint="false" :data="customsolutionResult"
-      button2Name="编辑" button2Type="text" @handleButton2="customsolutionUpdate" button3Name="删除" button3Type="text"
+      :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="customsolutionResult"
+      button2Name="编辑" button2Type="text" @findPage="customsolutionFindPage" @handleButton2="customsolutionUpdate" button3Name="删除" button3Type="text"
       @handleButton3="customsolutionDel" :columns="customsolutionColumns">
     </kt-common-table>
-    <el-dialog v-dialogDrag :modal="false" :title="customsolutionTitle" :visible.sync="customsolutionVisible" width="80%" top="2vh"
+    <el-dialog v-dialogDrag :title="customsolutionTitle" :visible.sync="customsolutionVisible" width="80%" top="2vh"
       @close="customsolutioncloseDialog">
       <div class="tab-panestyle">
         <div class="tab-panecent">
@@ -184,7 +184,7 @@
           @click="customsolutionSubmit('solutionForm')">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog :append-to-body="true" :modal="false" v-dialogDrag :title="insDrivingIntentionInsuranceSon.projectName"
+    <el-dialog :append-to-body="true" v-dialogDrag :title="insDrivingIntentionInsuranceSon.projectName"
       :visible.sync="insDrivingIntentionInsuranceSondialogVisible" width="50%">
       <el-table :data="insDrivingIntentionInsuranceSon.insDrivingIntentionInsuranceSon" size="mini" :header-cell-style="{
         background: '#F7F7F9',
@@ -218,6 +218,10 @@ export default {
       default: function () {
         return 1
       }
+    },
+    optionalIndex: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -262,6 +266,11 @@ export default {
       if (newVal === 1) {
         this.initData()
       }
+    },
+    optionalIndex (newVal) {
+      if (newVal) {
+        this.initData()
+      }
     }
   },
   // 生命周期函数
@@ -327,7 +336,7 @@ export default {
     customsolutionUpdate({ row, column }) {
       this.customsolutionType = 'edit';
       this.customsolutionTitle = '自选方案修改';
-      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A1', '0').then((res) => {
+      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "02", 'A1', '0').then((res) => {
         if (res.code == '200') {
           res.data.kinds.map(val => {
             if (val.amount.length > 0) {
@@ -398,7 +407,7 @@ export default {
       });
     },
     customsolutionFindPage() {
-      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "02", vehicleType: "A1", energyType: "0" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data,
@@ -414,7 +423,7 @@ export default {
     },
     customsolutionSubmit() {
       if (this.customsolutionType == 'add') {
-        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "02", vehicleType: "A1", energyType: "0" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -430,7 +439,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "02", vehicleType: "A1", energyType: "0" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',

src/views/AgreementManage/InsuranceCompany/CargoTruck/NonBusiness/Fuel/OrdinaryPlan.vue

@@ -7,7 +7,7 @@
     <!-- @findPage="solutionFindPage" -->
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="solutionResult" button2Name="编辑"
-      button2Type="text" @handleButton2="solutionUpdate" @findPage="solutionFindPage" button3Name="删除" button3Type="text" @handleButton3="solutionDel"
+      button2Type="text" @findPage="solutionFindPage" @handleButton2="solutionUpdate" button3Name="删除" button3Type="text" @handleButton3="solutionDel"
       :columns="solutionColumns">
     </kt-common-table>
     <el-dialog v-dialogDrag :title="solutionDialogTitle" :visible.sync="solutionVisible" width="90%" top="2vh"
@@ -257,6 +257,10 @@ export default {
       default: function () {
         return 0
       }
+    },
+    ordinaryIndex: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -308,6 +312,11 @@ export default {
       if (newVal === 0) {
         this.initData()
       }
+    },
+    ordinaryIndex (newVal) {
+      if (newVal) {
+        this.initData()
+      }
     }
   },
   // 生命周期函数
@@ -568,7 +577,7 @@ export default {
     },
     solutionSubmit(formName) {
       if (this.solutionDialogType == 'add') {
-        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"02",vehicleType:"A1",energyType:"0"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -584,7 +593,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"02",vehicleType:"A1",energyType:"0"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -614,7 +623,7 @@ export default {
       this.solutionVisible = true;
     },
     solutionFindPage() {
-      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A0",energyType:"0" }).then((res) => {
+      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"02",vehicleType:"A1",energyType:"0" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data.records,
@@ -635,7 +644,7 @@ export default {
     solutionUpdate({ row, column }) {
       this.solutionDialogType = 'edit';
       this.solutionDialogTitle = '编辑方案'
-      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A0','0').then((res) => {
+      this.$api.insCompany.schemedetails(row.companyId, row.productId,"02",'A1','0').then((res) => {
         if (res.code == '200') {
           res.data.productList.map(valA => {
             valA.kinds.map(valB => {

src/views/AgreementManage/InsuranceCompany/CargoTruck/NonBusiness/Fuel/SolutionConfig.vue

@@ -5,10 +5,10 @@
       </div>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
           <el-tab-pane label="普通方案配置" name="first">
-              <ordinary-plan :activeIndex="activeIndex"/>
+              <ordinary-plan :activeIndex="activeIndex" :ordinaryIndex="ordinaryIndex"/>
           </el-tab-pane>
           <el-tab-pane label="自选方案配置" name="second">
-              <optionalsolution-config :activeIndex="activeIndex"/>
+              <optionalsolution-config :activeIndex="activeIndex" :optionalIndex="optionalIndex"/>
           </el-tab-pane>
       </el-tabs>
       <el-dialog v-dialogDrag title="添加方案" :visible.sync="newPlanflag" width="80%" top="2vh" @close="newPlanflag = false">
@@ -44,6 +44,8 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
           dialogFlage: false,
           newPlanflag: false,
           activeIndex: 0,
+          ordinaryIndex: 0, // 普通方案组件更新
+          optionalIndex: 0, // 自选方案组件更新
         }
       },
       created () {
@@ -61,16 +63,18 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
         },
         optionalsolutionConfigSubmit () {
             this.newPlanflag = false
+            this.optionalIndex = (this.optionalIndex + 1) % 3
         },
         optionalsolutionConfigCancel () {
             this.newPlanflag = false
         },
         ordinaryPlanSubmit () {
             this.newPlanflag = false
+            this.ordinaryIndex = (this.ordinaryIndex + 1) % 3
         },
         ordinaryPlanCancel () {
-            this.newPlanflag = false   
-        }
+            this.newPlanflag = false
+        },
       }
   }
 </script>
@@ -85,4 +89,4 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
   box-sizing: border-box;
   justify-content: flex-end;
 }
-</style>
+</style>

src/views/AgreementManage/InsuranceCompany/CargoTruck/NonBusiness/NewEnergy/AddOptionalsolutionConfig.vue

@@ -195,6 +195,7 @@
 <script>
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import Editor from "@/components/Tinymce/index.vue";//富文本
+
 export default {
   // 数据存放区域
   components: {
@@ -294,7 +295,7 @@ export default {
     customsolutionUpdate({ row, column }) {
       this.customsolutionType = 'edit';
       this.customsolutionTitle = '自选方案修改';
-      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A0', '0').then((res) => {
+      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "02", 'A1', '1').then((res) => {
         if (res.code == '200') {
           res.data.kinds.map(val => {
             if (val.amount.length > 0) {
@@ -364,7 +365,7 @@ export default {
       });
     },
     customsolutionFindPage() {
-      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "02", vehicleType: "A1", energyType: "1" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data,
@@ -383,14 +384,14 @@ export default {
     },
     customsolutionSubmit() {
       if (this.customsolutionType == 'add') {
-        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "02", vehicleType: "A1", energyType: "1" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
               message: res.msg,
             });
-            this.$emit('optionalsolutionConfigSubmit')
             this.customsolutionFindPage();
+            this.$emit('optionalsolutionConfigSubmit');
           } else {
             this.$message({
               type: 'error',
@@ -399,7 +400,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "02", vehicleType: "A1", energyType: "1" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -491,8 +492,8 @@ export default {
       })
     },
     customsolutionAdd() {
-      this.customsolutionType = 'add';
-      this.customsolutionTitle = '自选方案配置';
+      // this.customsolutionType = 'add';
+      // this.customsolutionTitle = '自选方案配置';
     },
     getDicType(type) {
       this.$api.insCompany.dicType(type).then((res) => {

src/views/AgreementManage/InsuranceCompany/CargoTruck/NonBusiness/NewEnergy/AddOrdinaryPlan.vue

@@ -537,7 +537,7 @@ export default {
     },
     solutionSubmit(formName) {
       if (this.solutionDialogType == 'add') {
-        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"02",vehicleType:"A1",energyType:"1"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -553,7 +553,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"02",vehicleType:"A1",energyType:"1"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -582,7 +582,7 @@ export default {
       this.solutionDialogTitle = '添加方案'
     },
     solutionFindPage() {
-      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A0",energyType:"0" }).then((res) => {
+      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"02",vehicleType:"A1",energyType:"1" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data.records,
@@ -603,7 +603,7 @@ export default {
     solutionUpdate({ row, column }) {
       this.solutionDialogType = 'edit';
       this.solutionDialogTitle = '编辑方案'
-      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A0','0').then((res) => {
+      this.$api.insCompany.schemedetails(row.companyId, row.productId,"02",'A1','1').then((res) => {
         if (res.code == '200') {
           res.data.productList.map(valA => {
             valA.kinds.map(valB => {

src/views/AgreementManage/InsuranceCompany/CargoTruck/NonBusiness/NewEnergy/OptionalsolutionConfig.vue

@@ -11,7 +11,7 @@
       button2Name="编辑" button2Type="text" @findPage="customsolutionFindPage" @handleButton2="customsolutionUpdate" button3Name="删除" button3Type="text"
       @handleButton3="customsolutionDel" :columns="customsolutionColumns">
     </kt-common-table>
-    <el-dialog v-dialogDrag :modal="false" :title="customsolutionTitle" :visible.sync="customsolutionVisible" width="80%" top="2vh"
+    <el-dialog v-dialogDrag :title="customsolutionTitle" :visible.sync="customsolutionVisible" width="80%" top="2vh"
       @close="customsolutioncloseDialog">
       <div class="tab-panestyle">
         <div class="tab-panecent">
@@ -184,7 +184,7 @@
           @click="customsolutionSubmit('solutionForm')">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog :append-to-body="true" :modal="false" v-dialogDrag :title="insDrivingIntentionInsuranceSon.projectName"
+    <el-dialog :append-to-body="true" v-dialogDrag :title="insDrivingIntentionInsuranceSon.projectName"
       :visible.sync="insDrivingIntentionInsuranceSondialogVisible" width="50%">
       <el-table :data="insDrivingIntentionInsuranceSon.insDrivingIntentionInsuranceSon" size="mini" :header-cell-style="{
         background: '#F7F7F9',
@@ -218,6 +218,10 @@ export default {
       default: function () {
         return 1
       }
+    },
+    optionalIndex: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -262,6 +266,11 @@ export default {
       if (newVal === 1) {
         this.initData()
       }
+    },
+    optionalIndex (newVal) {
+      if (newVal) {
+        this.initData()
+      }
     }
   },
   // 生命周期函数
@@ -327,7 +336,7 @@ export default {
     customsolutionUpdate({ row, column }) {
       this.customsolutionType = 'edit';
       this.customsolutionTitle = '自选方案修改';
-      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A1', '0').then((res) => {
+      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "02", 'A1', '1').then((res) => {
         if (res.code == '200') {
           res.data.kinds.map(val => {
             if (val.amount.length > 0) {
@@ -398,7 +407,7 @@ export default {
       });
     },
     customsolutionFindPage() {
-      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "02", vehicleType: "A1", energyType: "1" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data,
@@ -414,7 +423,7 @@ export default {
     },
     customsolutionSubmit() {
       if (this.customsolutionType == 'add') {
-        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "02", vehicleType: "A1", energyType: "1" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -430,7 +439,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "02", vehicleType: "A1", energyType: "1" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',

src/views/AgreementManage/InsuranceCompany/CargoTruck/NonBusiness/NewEnergy/OrdinaryPlan.vue

@@ -257,6 +257,10 @@ export default {
       default: function () {
         return 0
       }
+    },
+    ordinaryIndex: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -308,6 +312,11 @@ export default {
       if (newVal === 0) {
         this.initData()
       }
+    },
+    ordinaryIndex (newVal) {
+      if (newVal) {
+        this.initData()
+      }
     }
   },
   // 生命周期函数
@@ -568,7 +577,7 @@ export default {
     },
     solutionSubmit(formName) {
       if (this.solutionDialogType == 'add') {
-        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"02",vehicleType:"A1",energyType:"1"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -584,7 +593,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"02",vehicleType:"A1",energyType:"1"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -614,7 +623,7 @@ export default {
       this.solutionVisible = true;
     },
     solutionFindPage() {
-      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A0",energyType:"0" }).then((res) => {
+      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"02",vehicleType:"A1",energyType:"1" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data.records,
@@ -635,7 +644,7 @@ export default {
     solutionUpdate({ row, column }) {
       this.solutionDialogType = 'edit';
       this.solutionDialogTitle = '编辑方案'
-      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A0','0').then((res) => {
+      this.$api.insCompany.schemedetails(row.companyId, row.productId,"02",'A1','1').then((res) => {
         if (res.code == '200') {
           res.data.productList.map(valA => {
             valA.kinds.map(valB => {

src/views/AgreementManage/InsuranceCompany/CargoTruck/NonBusiness/NewEnergy/SolutionConfig.vue

@@ -5,10 +5,10 @@
       </div>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
           <el-tab-pane label="普通方案配置" name="first">
-              <ordinary-plan :activeIndex="activeIndex"/>
+              <ordinary-plan :activeIndex="activeIndex" :ordinaryIndex="ordinaryIndex"/>
           </el-tab-pane>
           <el-tab-pane label="自选方案配置" name="second">
-              <optionalsolution-config :activeIndex="activeIndex"/>
+              <optionalsolution-config :activeIndex="activeIndex" :optionalIndex="optionalIndex"/>
           </el-tab-pane>
       </el-tabs>
       <el-dialog v-dialogDrag title="添加方案" :visible.sync="newPlanflag" width="80%" top="2vh" @close="newPlanflag = false">
@@ -44,6 +44,8 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
           dialogFlage: false,
           newPlanflag: false,
           activeIndex: 0,
+          ordinaryIndex: 0, // 普通方案组件更新
+          optionalIndex: 0, // 自选方案组件更新
         }
       },
       created () {
@@ -61,16 +63,18 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
         },
         optionalsolutionConfigSubmit () {
             this.newPlanflag = false
+            this.optionalIndex = (this.optionalIndex + 1) % 3
         },
         optionalsolutionConfigCancel () {
             this.newPlanflag = false
         },
         ordinaryPlanSubmit () {
             this.newPlanflag = false
+            this.ordinaryIndex = (this.ordinaryIndex + 1) % 3
         },
         ordinaryPlanCancel () {
-            this.newPlanflag = false   
-        }
+            this.newPlanflag = false
+        },
       }
   }
 </script>
@@ -85,4 +89,4 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
   box-sizing: border-box;
   justify-content: flex-end;
 }
-</style>
+</style>

src/views/AgreementManage/InsuranceCompany/PassengerBus/BusinessOperation/Fuel/AddOptionalsolutionConfig.vue

@@ -195,6 +195,7 @@
 <script>
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import Editor from "@/components/Tinymce/index.vue";//富文本
+
 export default {
   // 数据存放区域
   components: {
@@ -389,8 +390,8 @@ export default {
               type: 'success',
               message: res.msg,
             });
-            this.$emit('optionalsolutionConfigSubmit')
             this.customsolutionFindPage();
+            this.$emit('optionalsolutionConfigSubmit');
           } else {
             this.$message({
               type: 'error',
@@ -491,8 +492,8 @@ export default {
       })
     },
     customsolutionAdd() {
-      this.customsolutionType = 'add';
-      this.customsolutionTitle = '自选方案配置';
+      // this.customsolutionType = 'add';
+      // this.customsolutionTitle = '自选方案配置';
     },
     getDicType(type) {
       this.$api.insCompany.dicType(type).then((res) => {

src/views/AgreementManage/InsuranceCompany/PassengerBus/BusinessOperation/Fuel/AttrConfig.vue

@@ -390,41 +390,5 @@ export default {
   padding: 20px;
   background: #F2F2F2;
 }
-
-.tab-panecent {
-  background: #fff;
-  border-radius: 4px;
-  padding: 15px;
-  box-sizing: border-box;
-  max-height: 600px;
-  overflow-y: auto;
-}
->>> .el-step__description {
-  padding-right: 0;
-}
-.tab-panecent2 {
-  border-radius: 4px;
-  box-sizing: border-box;
-}
-
-.tab-panecent1 {
-  background: #fff;
-  border-radius: 4px;
-  padding: 10px;
-  box-sizing: border-box;
-  margin-bottom: 20px;
-
-  >div {
-    font-size: 15px;
-    color: #2D4D89;
-    font-weight: bold;
-  }
-
-  >span {
-    color: rgba(51, 51, 51, 0.8);
-    font-size: 13px;
-  }
-}
-
 </style>
 

src/views/AgreementManage/InsuranceCompany/PassengerBus/BusinessOperation/Fuel/OptionalsolutionConfig.vue

@@ -8,10 +8,10 @@
     <!-- @findPage="customsolutionFindPage" -->
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="customsolutionResult"
-      button2Name="编辑" button2Type="text" @handleButton2="customsolutionUpdate" @findPage="customsolutionFindPage" button3Name="删除" button3Type="text"
+      button2Name="编辑" button2Type="text" @findPage="customsolutionFindPage" @handleButton2="customsolutionUpdate" button3Name="删除" button3Type="text"
       @handleButton3="customsolutionDel" :columns="customsolutionColumns">
     </kt-common-table>
-    <el-dialog v-dialogDrag :modal="false" :title="customsolutionTitle" :visible.sync="customsolutionVisible" width="80%" top="2vh"
+    <el-dialog v-dialogDrag :title="customsolutionTitle" :visible.sync="customsolutionVisible" width="80%" top="2vh"
       @close="customsolutioncloseDialog">
       <div class="tab-panestyle">
         <div class="tab-panecent">
@@ -184,7 +184,7 @@
           @click="customsolutionSubmit('solutionForm')">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog :append-to-body="true" :modal="false" v-dialogDrag :title="insDrivingIntentionInsuranceSon.projectName"
+    <el-dialog :append-to-body="true" v-dialogDrag :title="insDrivingIntentionInsuranceSon.projectName"
       :visible.sync="insDrivingIntentionInsuranceSondialogVisible" width="50%">
       <el-table :data="insDrivingIntentionInsuranceSon.insDrivingIntentionInsuranceSon" size="mini" :header-cell-style="{
         background: '#F7F7F9',
@@ -218,6 +218,10 @@ export default {
       default: function () {
         return 1
       }
+    },
+    optionalIndex: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -262,6 +266,11 @@ export default {
       if (newVal === 1) {
         this.initData()
       }
+    },
+    optionalIndex (newVal) {
+      if (newVal) {
+        this.initData()
+      }
     }
   },
   // 生命周期函数
@@ -327,7 +336,7 @@ export default {
     customsolutionUpdate({ row, column }) {
       this.customsolutionType = 'edit';
       this.customsolutionTitle = '自选方案修改';
-      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A1', '0').then((res) => {
+      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A0', '0').then((res) => {
         if (res.code == '200') {
           res.data.kinds.map(val => {
             if (val.amount.length > 0) {
@@ -398,7 +407,7 @@ export default {
       });
     },
     customsolutionFindPage() {
-      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data,
@@ -414,7 +423,7 @@ export default {
     },
     customsolutionSubmit() {
       if (this.customsolutionType == 'add') {
-        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -430,7 +439,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',

src/views/AgreementManage/InsuranceCompany/PassengerBus/BusinessOperation/Fuel/OrdinaryPlan.vue

@@ -7,7 +7,7 @@
     <!-- @findPage="solutionFindPage" -->
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="solutionResult" button2Name="编辑"
-      button2Type="text" @handleButton2="solutionUpdate" @findPage="solutionFindPage" button3Name="删除" button3Type="text" @handleButton3="solutionDel"
+      button2Type="text" @findPage="solutionFindPage" @handleButton2="solutionUpdate" button3Name="删除" button3Type="text" @handleButton3="solutionDel"
       :columns="solutionColumns">
     </kt-common-table>
     <el-dialog v-dialogDrag :title="solutionDialogTitle" :visible.sync="solutionVisible" width="90%" top="2vh"
@@ -257,6 +257,10 @@ export default {
       default: function () {
         return 0
       }
+    },
+    ordinaryIndex: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -308,6 +312,11 @@ export default {
       if (newVal === 0) {
         this.initData()
       }
+    },
+    ordinaryIndex (newVal) {
+      if (newVal) {
+        this.initData()
+      }
     }
   },
   // 生命周期函数

src/views/AgreementManage/InsuranceCompany/PassengerBus/BusinessOperation/Fuel/SolutionConfig.vue

@@ -5,10 +5,10 @@
       </div>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
           <el-tab-pane label="普通方案配置" name="first">
-              <ordinary-plan :activeIndex="activeIndex"/>
+              <ordinary-plan :activeIndex="activeIndex" :ordinaryIndex="ordinaryIndex"/>
           </el-tab-pane>
           <el-tab-pane label="自选方案配置" name="second">
-              <optionalsolution-config :activeIndex="activeIndex"/>
+              <optionalsolution-config :activeIndex="activeIndex" :optionalIndex="optionalIndex"/>
           </el-tab-pane>
       </el-tabs>
       <el-dialog v-dialogDrag title="添加方案" :visible.sync="newPlanflag" width="80%" top="2vh" @close="newPlanflag = false">
@@ -44,6 +44,8 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
           dialogFlage: false,
           newPlanflag: false,
           activeIndex: 0,
+          ordinaryIndex: 0, // 普通方案组件更新
+          optionalIndex: 0, // 自选方案组件更新
         }
       },
       created () {
@@ -61,16 +63,18 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
         },
         optionalsolutionConfigSubmit () {
             this.newPlanflag = false
+            this.optionalIndex = (this.optionalIndex + 1) % 3
         },
         optionalsolutionConfigCancel () {
             this.newPlanflag = false
         },
         ordinaryPlanSubmit () {
             this.newPlanflag = false
+            this.ordinaryIndex = (this.ordinaryIndex + 1) % 3
         },
         ordinaryPlanCancel () {
-            this.newPlanflag = false   
-        }
+            this.newPlanflag = false
+        },
       }
   }
 </script>
@@ -85,4 +89,4 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
   box-sizing: border-box;
   justify-content: flex-end;
 }
-</style>
+</style>

src/views/AgreementManage/InsuranceCompany/PassengerBus/BusinessOperation/NewEnergy/AddOptionalsolutionConfig.vue

@@ -195,6 +195,7 @@
 <script>
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import Editor from "@/components/Tinymce/index.vue";//富文本
+
 export default {
   // 数据存放区域
   components: {
@@ -294,7 +295,7 @@ export default {
     customsolutionUpdate({ row, column }) {
       this.customsolutionType = 'edit';
       this.customsolutionTitle = '自选方案修改';
-      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A0', '0').then((res) => {
+      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A0', '1').then((res) => {
         if (res.code == '200') {
           res.data.kinds.map(val => {
             if (val.amount.length > 0) {
@@ -364,7 +365,7 @@ export default {
       });
     },
     customsolutionFindPage() {
-      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A0", energyType: "1" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data,
@@ -383,14 +384,14 @@ export default {
     },
     customsolutionSubmit() {
       if (this.customsolutionType == 'add') {
-        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "1" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
               message: res.msg,
             });
-            this.$emit('optionalsolutionConfigSubmit')
             this.customsolutionFindPage();
+            this.$emit('optionalsolutionConfigSubmit');
           } else {
             this.$message({
               type: 'error',
@@ -399,7 +400,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "1" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -491,8 +492,8 @@ export default {
       })
     },
     customsolutionAdd() {
-      this.customsolutionType = 'add';
-      this.customsolutionTitle = '自选方案配置';
+      // this.customsolutionType = 'add';
+      // this.customsolutionTitle = '自选方案配置';
     },
     getDicType(type) {
       this.$api.insCompany.dicType(type).then((res) => {

src/views/AgreementManage/InsuranceCompany/PassengerBus/BusinessOperation/NewEnergy/AddOrdinaryPlan.vue

@@ -537,7 +537,7 @@ export default {
     },
     solutionSubmit(formName) {
       if (this.solutionDialogType == 'add') {
-        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"1"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -553,7 +553,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"1"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -582,7 +582,7 @@ export default {
       this.solutionDialogTitle = '添加方案'
     },
     solutionFindPage() {
-      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A0",energyType:"0" }).then((res) => {
+      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A0",energyType:"1" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data.records,
@@ -603,7 +603,7 @@ export default {
     solutionUpdate({ row, column }) {
       this.solutionDialogType = 'edit';
       this.solutionDialogTitle = '编辑方案'
-      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A0','0').then((res) => {
+      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A0','1').then((res) => {
         if (res.code == '200') {
           res.data.productList.map(valA => {
             valA.kinds.map(valB => {

src/views/AgreementManage/InsuranceCompany/PassengerBus/BusinessOperation/NewEnergy/AttrConfig.vue

@@ -240,6 +240,7 @@ export default {
       this.ruleSaveVo.rule.energyType="1";
       this.ruleSaveVo.rule.carnature="01";
       this.$refs[formName].validate((valid) => {
+
         if (valid) {
           if (this.attrDialogType == 'add') {
             this.$api.insCompany.attrAdd(this.ruleSaveVo).then((res) => {

src/views/AgreementManage/InsuranceCompany/PassengerBus/BusinessOperation/NewEnergy/OptionalsolutionConfig.vue

@@ -8,10 +8,10 @@
     <!-- @findPage="customsolutionFindPage" -->
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="customsolutionResult"
-      button2Name="编辑" button2Type="text" @handleButton2="customsolutionUpdate" button3Name="删除" button3Type="text"
-      @handleButton3="customsolutionDel" :columns="customsolutionColumns" @findPage="customsolutionFindPage">
+      button2Name="编辑" button2Type="text" @findPage="customsolutionFindPage" @handleButton2="customsolutionUpdate" button3Name="删除" button3Type="text"
+      @handleButton3="customsolutionDel" :columns="customsolutionColumns">
     </kt-common-table>
-    <el-dialog v-dialogDrag :modal="false" :title="customsolutionTitle" :visible.sync="customsolutionVisible" width="80%" top="2vh"
+    <el-dialog v-dialogDrag :title="customsolutionTitle" :visible.sync="customsolutionVisible" width="80%" top="2vh"
       @close="customsolutioncloseDialog">
       <div class="tab-panestyle">
         <div class="tab-panecent">
@@ -184,7 +184,7 @@
           @click="customsolutionSubmit('solutionForm')">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog :append-to-body="true" :modal="false" v-dialogDrag :title="insDrivingIntentionInsuranceSon.projectName"
+    <el-dialog :append-to-body="true" v-dialogDrag :title="insDrivingIntentionInsuranceSon.projectName"
       :visible.sync="insDrivingIntentionInsuranceSondialogVisible" width="50%">
       <el-table :data="insDrivingIntentionInsuranceSon.insDrivingIntentionInsuranceSon" size="mini" :header-cell-style="{
         background: '#F7F7F9',
@@ -218,6 +218,10 @@ export default {
       default: function () {
         return 1
       }
+    },
+    optionalIndex: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -262,6 +266,11 @@ export default {
       if (newVal === 1) {
         this.initData()
       }
+    },
+    optionalIndex (newVal) {
+      if (newVal) {
+        this.initData()
+      }
     }
   },
   // 生命周期函数
@@ -327,7 +336,7 @@ export default {
     customsolutionUpdate({ row, column }) {
       this.customsolutionType = 'edit';
       this.customsolutionTitle = '自选方案修改';
-      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A1', '0').then((res) => {
+      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A0', '1').then((res) => {
         if (res.code == '200') {
           res.data.kinds.map(val => {
             if (val.amount.length > 0) {
@@ -398,7 +407,7 @@ export default {
       });
     },
     customsolutionFindPage() {
-      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A0", energyType: "1" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data,
@@ -414,7 +423,7 @@ export default {
     },
     customsolutionSubmit() {
       if (this.customsolutionType == 'add') {
-        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "1" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -430,7 +439,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "1" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',

src/views/AgreementManage/InsuranceCompany/PassengerBus/BusinessOperation/NewEnergy/OrdinaryPlan.vue

@@ -7,7 +7,7 @@
     <!-- @findPage="solutionFindPage" -->
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="solutionResult" button2Name="编辑"
-      button2Type="text" @handleButton2="solutionUpdate" @findPage="solutionFindPage" button3Name="删除" button3Type="text" @handleButton3="solutionDel"
+      button2Type="text" @findPage="solutionFindPage" @handleButton2="solutionUpdate" button3Name="删除" button3Type="text" @handleButton3="solutionDel"
       :columns="solutionColumns">
     </kt-common-table>
     <el-dialog v-dialogDrag :title="solutionDialogTitle" :visible.sync="solutionVisible" width="90%" top="2vh"
@@ -257,6 +257,10 @@ export default {
       default: function () {
         return 0
       }
+    },
+    ordinaryIndex: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -308,6 +312,11 @@ export default {
       if (newVal === 0) {
         this.initData()
       }
+    },
+    ordinaryIndex (newVal) {
+      if (newVal) {
+        this.initData()
+      }
     }
   },
   // 生命周期函数
@@ -568,7 +577,7 @@ export default {
     },
     solutionSubmit(formName) {
       if (this.solutionDialogType == 'add') {
-        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"1"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -584,7 +593,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"1"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -614,7 +623,7 @@ export default {
       this.solutionVisible = true;
     },
     solutionFindPage() {
-      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A0",energyType:"0" }).then((res) => {
+      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A0",energyType:"1" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data.records,
@@ -635,7 +644,7 @@ export default {
     solutionUpdate({ row, column }) {
       this.solutionDialogType = 'edit';
       this.solutionDialogTitle = '编辑方案'
-      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A0','0').then((res) => {
+      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A0','1').then((res) => {
         if (res.code == '200') {
           res.data.productList.map(valA => {
             valA.kinds.map(valB => {

src/views/AgreementManage/InsuranceCompany/PassengerBus/BusinessOperation/NewEnergy/SolutionConfig.vue

@@ -5,10 +5,10 @@
       </div>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
           <el-tab-pane label="普通方案配置" name="first">
-              <ordinary-plan :activeIndex="activeIndex"/>
+              <ordinary-plan :activeIndex="activeIndex" :ordinaryIndex="ordinaryIndex"/>
           </el-tab-pane>
           <el-tab-pane label="自选方案配置" name="second">
-              <optionalsolution-config :activeIndex="activeIndex"/>
+              <optionalsolution-config :activeIndex="activeIndex" :optionalIndex="optionalIndex"/>
           </el-tab-pane>
       </el-tabs>
       <el-dialog v-dialogDrag title="添加方案" :visible.sync="newPlanflag" width="80%" top="2vh" @close="newPlanflag = false">
@@ -44,6 +44,8 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
           dialogFlage: false,
           newPlanflag: false,
           activeIndex: 0,
+          ordinaryIndex: 0, // 普通方案组件更新
+          optionalIndex: 0, // 自选方案组件更新
         }
       },
       created () {
@@ -61,16 +63,18 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
         },
         optionalsolutionConfigSubmit () {
             this.newPlanflag = false
+            this.optionalIndex = (this.optionalIndex + 1) % 3
         },
         optionalsolutionConfigCancel () {
             this.newPlanflag = false
         },
         ordinaryPlanSubmit () {
             this.newPlanflag = false
+            this.ordinaryIndex = (this.ordinaryIndex + 1) % 3
         },
         ordinaryPlanCancel () {
-            this.newPlanflag = false   
-        }
+            this.newPlanflag = false
+        },
       }
   }
 </script>
@@ -85,4 +89,4 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
   box-sizing: border-box;
   justify-content: flex-end;
 }
-</style>
+</style>

src/views/AgreementManage/InsuranceCompany/PassengerBus/NonBusiness/Fuel/AddOptionalsolutionConfig.vue

@@ -195,6 +195,7 @@
 <script>
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import Editor from "@/components/Tinymce/index.vue";//富文本
+
 export default {
   // 数据存放区域
   components: {
@@ -294,7 +295,7 @@ export default {
     customsolutionUpdate({ row, column }) {
       this.customsolutionType = 'edit';
       this.customsolutionTitle = '自选方案修改';
-      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A0', '0').then((res) => {
+      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "02", 'A0', '0').then((res) => {
         if (res.code == '200') {
           res.data.kinds.map(val => {
             if (val.amount.length > 0) {
@@ -364,7 +365,7 @@ export default {
       });
     },
     customsolutionFindPage() {
-      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "02", vehicleType: "A0", energyType: "0" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data,
@@ -383,14 +384,14 @@ export default {
     },
     customsolutionSubmit() {
       if (this.customsolutionType == 'add') {
-        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "02", vehicleType: "A0", energyType: "0" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
               message: res.msg,
             });
-            this.$emit('optionalsolutionConfigSubmit')
             this.customsolutionFindPage();
+            this.$emit('optionalsolutionConfigSubmit');
           } else {
             this.$message({
               type: 'error',
@@ -399,7 +400,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "02", vehicleType: "A0", energyType: "0" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -491,8 +492,8 @@ export default {
       })
     },
     customsolutionAdd() {
-      this.customsolutionType = 'add';
-      this.customsolutionTitle = '自选方案配置';
+      // this.customsolutionType = 'add';
+      // this.customsolutionTitle = '自选方案配置';
     },
     getDicType(type) {
       this.$api.insCompany.dicType(type).then((res) => {

src/views/AgreementManage/InsuranceCompany/PassengerBus/NonBusiness/Fuel/AddOrdinaryPlan.vue

@@ -537,7 +537,7 @@ export default {
     },
     solutionSubmit(formName) {
       if (this.solutionDialogType == 'add') {
-        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"02",vehicleType:"A0",energyType:"0"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -553,7 +553,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"02",vehicleType:"A0",energyType:"0"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -582,7 +582,7 @@ export default {
       this.solutionDialogTitle = '添加方案'
     },
     solutionFindPage() {
-      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A0",energyType:"0" }).then((res) => {
+      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"02",vehicleType:"A0",energyType:"0" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data.records,
@@ -603,7 +603,7 @@ export default {
     solutionUpdate({ row, column }) {
       this.solutionDialogType = 'edit';
       this.solutionDialogTitle = '编辑方案'
-      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A0','0').then((res) => {
+      this.$api.insCompany.schemedetails(row.companyId, row.productId,"02",'A0','0').then((res) => {
         if (res.code == '200') {
           res.data.productList.map(valA => {
             valA.kinds.map(valB => {

src/views/AgreementManage/InsuranceCompany/PassengerBus/NonBusiness/Fuel/AttrConfig.vue

@@ -172,7 +172,7 @@ export default {
     },
     attrUpdate({ row, column }) {
       this.ruleform.id = row.id;
-      this.$api.insCompany.ruledetails(row.id,'02',"A0","0").then((res) => {
+      this.$api.insCompany.ruledetails(row.id,"02","A0","0").then((res) => {
         if (res.code == '200') {
           let obj = Object.assign({}, res.data);
           obj.attrs.map(val => {

src/views/AgreementManage/InsuranceCompany/PassengerBus/NonBusiness/Fuel/OptionalsolutionConfig.vue

@@ -7,11 +7,11 @@
     </div> -->
     <!-- @findPage="customsolutionFindPage" -->
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
-      :showBatchDelete="false" :showBatchSettled="false" @findPage="customsolutionFindPage" :showBatchPrint="false" :data="customsolutionResult"
-      button2Name="编辑" button2Type="text" @handleButton2="customsolutionUpdate" button3Name="删除" button3Type="text"
+      :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="customsolutionResult"
+      button2Name="编辑" button2Type="text" @findPage="customsolutionFindPage" @handleButton2="customsolutionUpdate" button3Name="删除" button3Type="text"
       @handleButton3="customsolutionDel" :columns="customsolutionColumns">
     </kt-common-table>
-    <el-dialog v-dialogDrag :modal="false" :title="customsolutionTitle" :visible.sync="customsolutionVisible" width="80%" top="2vh"
+    <el-dialog v-dialogDrag :title="customsolutionTitle" :visible.sync="customsolutionVisible" width="80%" top="2vh"
       @close="customsolutioncloseDialog">
       <div class="tab-panestyle">
         <div class="tab-panecent">
@@ -184,7 +184,7 @@
           @click="customsolutionSubmit('solutionForm')">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog :append-to-body="true" :modal="false" v-dialogDrag :title="insDrivingIntentionInsuranceSon.projectName"
+    <el-dialog :append-to-body="true" v-dialogDrag :title="insDrivingIntentionInsuranceSon.projectName"
       :visible.sync="insDrivingIntentionInsuranceSondialogVisible" width="50%">
       <el-table :data="insDrivingIntentionInsuranceSon.insDrivingIntentionInsuranceSon" size="mini" :header-cell-style="{
         background: '#F7F7F9',
@@ -218,6 +218,10 @@ export default {
       default: function () {
         return 1
       }
+    },
+    optionalIndex: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -262,6 +266,11 @@ export default {
       if (newVal === 1) {
         this.initData()
       }
+    },
+    optionalIndex (newVal) {
+      if (newVal) {
+        this.initData()
+      }
     }
   },
   // 生命周期函数
@@ -327,7 +336,7 @@ export default {
     customsolutionUpdate({ row, column }) {
       this.customsolutionType = 'edit';
       this.customsolutionTitle = '自选方案修改';
-      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A1', '0').then((res) => {
+      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "02", 'A0', '0').then((res) => {
         if (res.code == '200') {
           res.data.kinds.map(val => {
             if (val.amount.length > 0) {
@@ -398,7 +407,7 @@ export default {
       });
     },
     customsolutionFindPage() {
-      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "02", vehicleType: "A0", energyType: "0" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data,
@@ -414,7 +423,7 @@ export default {
     },
     customsolutionSubmit() {
       if (this.customsolutionType == 'add') {
-        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "02", vehicleType: "A0", energyType: "0" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -430,7 +439,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "02", vehicleType: "A0", energyType: "0" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',

src/views/AgreementManage/InsuranceCompany/PassengerBus/NonBusiness/Fuel/OrdinaryPlan.vue

@@ -7,7 +7,7 @@
     <!-- @findPage="solutionFindPage" -->
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="solutionResult" button2Name="编辑"
-      button2Type="text" @handleButton2="solutionUpdate" @findPage="solutionFindPage" button3Name="删除" button3Type="text" @handleButton3="solutionDel"
+      button2Type="text" @findPage="solutionFindPage" @handleButton2="solutionUpdate" button3Name="删除" button3Type="text" @handleButton3="solutionDel"
       :columns="solutionColumns">
     </kt-common-table>
     <el-dialog v-dialogDrag :title="solutionDialogTitle" :visible.sync="solutionVisible" width="90%" top="2vh"
@@ -257,6 +257,10 @@ export default {
       default: function () {
         return 0
       }
+    },
+    ordinaryIndex: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -308,6 +312,11 @@ export default {
       if (newVal === 0) {
         this.initData()
       }
+    },
+    ordinaryIndex (newVal) {
+      if (newVal) {
+        this.initData()
+      }
     }
   },
   // 生命周期函数
@@ -568,7 +577,7 @@ export default {
     },
     solutionSubmit(formName) {
       if (this.solutionDialogType == 'add') {
-        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"02",vehicleType:"A0",energyType:"0"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -584,7 +593,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"02",vehicleType:"A0",energyType:"0"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -614,7 +623,7 @@ export default {
       this.solutionVisible = true;
     },
     solutionFindPage() {
-      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A0",energyType:"0" }).then((res) => {
+      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"02",vehicleType:"A0",energyType:"0" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data.records,
@@ -635,7 +644,7 @@ export default {
     solutionUpdate({ row, column }) {
       this.solutionDialogType = 'edit';
       this.solutionDialogTitle = '编辑方案'
-      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A0','0').then((res) => {
+      this.$api.insCompany.schemedetails(row.companyId, row.productId,"02",'A0','0').then((res) => {
         if (res.code == '200') {
           res.data.productList.map(valA => {
             valA.kinds.map(valB => {

src/views/AgreementManage/InsuranceCompany/PassengerBus/NonBusiness/Fuel/SolutionConfig.vue

@@ -5,10 +5,10 @@
       </div>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
           <el-tab-pane label="普通方案配置" name="first">
-              <ordinary-plan :activeIndex="activeIndex"/>
+              <ordinary-plan :activeIndex="activeIndex" :ordinaryIndex="ordinaryIndex"/>
           </el-tab-pane>
           <el-tab-pane label="自选方案配置" name="second">
-              <optionalsolution-config :activeIndex="activeIndex"/>
+              <optionalsolution-config :activeIndex="activeIndex" :optionalIndex="optionalIndex"/>
           </el-tab-pane>
       </el-tabs>
       <el-dialog v-dialogDrag title="添加方案" :visible.sync="newPlanflag" width="80%" top="2vh" @close="newPlanflag = false">
@@ -44,6 +44,8 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
           dialogFlage: false,
           newPlanflag: false,
           activeIndex: 0,
+          ordinaryIndex: 0, // 普通方案组件更新
+          optionalIndex: 0, // 自选方案组件更新
         }
       },
       created () {
@@ -61,16 +63,18 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
         },
         optionalsolutionConfigSubmit () {
             this.newPlanflag = false
+            this.optionalIndex = (this.optionalIndex + 1) % 3
         },
         optionalsolutionConfigCancel () {
             this.newPlanflag = false
         },
         ordinaryPlanSubmit () {
             this.newPlanflag = false
+            this.ordinaryIndex = (this.ordinaryIndex + 1) % 3
         },
         ordinaryPlanCancel () {
-            this.newPlanflag = false   
-        }
+            this.newPlanflag = false
+        },
       }
   }
 </script>
@@ -85,4 +89,4 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
   box-sizing: border-box;
   justify-content: flex-end;
 }
-</style>
+</style>

src/views/AgreementManage/InsuranceCompany/PassengerBus/NonBusiness/NewEnergy/AddOptionalsolutionConfig.vue

@@ -195,6 +195,7 @@
 <script>
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import Editor from "@/components/Tinymce/index.vue";//富文本
+
 export default {
   // 数据存放区域
   components: {
@@ -294,7 +295,7 @@ export default {
     customsolutionUpdate({ row, column }) {
       this.customsolutionType = 'edit';
       this.customsolutionTitle = '自选方案修改';
-      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A0', '0').then((res) => {
+      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "02", 'A0', '1').then((res) => {
         if (res.code == '200') {
           res.data.kinds.map(val => {
             if (val.amount.length > 0) {
@@ -364,7 +365,7 @@ export default {
       });
     },
     customsolutionFindPage() {
-      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "02", vehicleType: "A0", energyType: "1" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data,
@@ -383,14 +384,14 @@ export default {
     },
     customsolutionSubmit() {
       if (this.customsolutionType == 'add') {
-        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "02", vehicleType: "A0", energyType: "1" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
               message: res.msg,
             });
-            this.$emit('optionalsolutionConfigSubmit')
             this.customsolutionFindPage();
+            this.$emit('optionalsolutionConfigSubmit');
           } else {
             this.$message({
               type: 'error',
@@ -399,7 +400,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A0", energyType: "0" }).then((res) => {
+        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "02", vehicleType: "A0", energyType: "1" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -491,8 +492,8 @@ export default {
       })
     },
     customsolutionAdd() {
-      this.customsolutionType = 'add';
-      this.customsolutionTitle = '自选方案配置';
+      // this.customsolutionType = 'add';
+      // this.customsolutionTitle = '自选方案配置';
     },
     getDicType(type) {
       this.$api.insCompany.dicType(type).then((res) => {

src/views/AgreementManage/InsuranceCompany/PassengerBus/NonBusiness/NewEnergy/AddOrdinaryPlan.vue

@@ -537,7 +537,7 @@ export default {
     },
     solutionSubmit(formName) {
       if (this.solutionDialogType == 'add') {
-        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"02",vehicleType:"A0",energyType:"1"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -553,7 +553,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"02",vehicleType:"A0",energyType:"1"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -582,7 +582,7 @@ export default {
       this.solutionDialogTitle = '添加方案'
     },
     solutionFindPage() {
-      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A0",energyType:"0" }).then((res) => {
+      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"02",vehicleType:"A0",energyType:"1" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data.records,
@@ -603,7 +603,7 @@ export default {
     solutionUpdate({ row, column }) {
       this.solutionDialogType = 'edit';
       this.solutionDialogTitle = '编辑方案'
-      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A0','0').then((res) => {
+      this.$api.insCompany.schemedetails(row.companyId, row.productId,"02",'A0','1').then((res) => {
         if (res.code == '200') {
           res.data.productList.map(valA => {
             valA.kinds.map(valB => {

src/views/AgreementManage/InsuranceCompany/PassengerBus/NonBusiness/NewEnergy/OptionalsolutionConfig.vue

@@ -11,7 +11,7 @@
       button2Name="编辑" button2Type="text" @findPage="customsolutionFindPage" @handleButton2="customsolutionUpdate" button3Name="删除" button3Type="text"
       @handleButton3="customsolutionDel" :columns="customsolutionColumns">
     </kt-common-table>
-    <el-dialog v-dialogDrag :modal="false" :title="customsolutionTitle" :visible.sync="customsolutionVisible" width="80%" top="2vh"
+    <el-dialog v-dialogDrag :title="customsolutionTitle" :visible.sync="customsolutionVisible" width="80%" top="2vh"
       @close="customsolutioncloseDialog">
       <div class="tab-panestyle">
         <div class="tab-panecent">
@@ -184,7 +184,7 @@
           @click="customsolutionSubmit('solutionForm')">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog :append-to-body="true" :modal="false" v-dialogDrag :title="insDrivingIntentionInsuranceSon.projectName"
+    <el-dialog :append-to-body="true" v-dialogDrag :title="insDrivingIntentionInsuranceSon.projectName"
       :visible.sync="insDrivingIntentionInsuranceSondialogVisible" width="50%">
       <el-table :data="insDrivingIntentionInsuranceSon.insDrivingIntentionInsuranceSon" size="mini" :header-cell-style="{
         background: '#F7F7F9',
@@ -218,6 +218,10 @@ export default {
       default: function () {
         return 1
       }
+    },
+    optionalIndex: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -262,6 +266,11 @@ export default {
       if (newVal === 1) {
         this.initData()
       }
+    },
+    optionalIndex (newVal) {
+      if (newVal) {
+        this.initData()
+      }
     }
   },
   // 生命周期函数
@@ -327,7 +336,7 @@ export default {
     customsolutionUpdate({ row, column }) {
       this.customsolutionType = 'edit';
       this.customsolutionTitle = '自选方案修改';
-      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "01", 'A1', '0').then((res) => {
+      this.$api.insCompany.optionalSchemeInfo(row.companyId, row.productId, "02", 'A0', '1').then((res) => {
         if (res.code == '200') {
           res.data.kinds.map(val => {
             if (val.amount.length > 0) {
@@ -398,7 +407,7 @@ export default {
       });
     },
     customsolutionFindPage() {
-      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+      this.$api.insCompany.optionalShcemeList({ companyId: this.companyId, carnature: "02", vehicleType: "A0", energyType: "1" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data,
@@ -414,7 +423,7 @@ export default {
     },
     customsolutionSubmit() {
       if (this.customsolutionType == 'add') {
-        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+        this.$api.insCompany.addOptionalScheme({ ...this.CustomPlanData, carnature: "02", vehicleType: "A0", energyType: "1" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -430,7 +439,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "01", vehicleType: "A1", energyType: "0" }).then((res) => {
+        this.$api.insCompany.updateOptionalScheme({ ...this.CustomPlanData, carnature: "02", vehicleType: "A0", energyType: "1" }).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',

src/views/AgreementManage/InsuranceCompany/PassengerBus/NonBusiness/NewEnergy/OrdinaryPlan.vue

@@ -7,7 +7,7 @@
     <!-- @findPage="solutionFindPage" -->
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="solutionResult" button2Name="编辑"
-      button2Type="text" @handleButton2="solutionUpdate" @findPage="solutionFindPage" button3Name="删除" button3Type="text" @handleButton3="solutionDel"
+      button2Type="text" @findPage="solutionFindPage" @handleButton2="solutionUpdate" button3Name="删除" button3Type="text" @handleButton3="solutionDel"
       :columns="solutionColumns">
     </kt-common-table>
     <el-dialog v-dialogDrag :title="solutionDialogTitle" :visible.sync="solutionVisible" width="90%" top="2vh"
@@ -257,6 +257,10 @@ export default {
       default: function () {
         return 0
       }
+    },
+    ordinaryIndex: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -308,6 +312,11 @@ export default {
       if (newVal === 0) {
         this.initData()
       }
+    },
+    ordinaryIndex (newVal) {
+      if (newVal) {
+        this.initData()
+      }
     }
   },
   // 生命周期函数
@@ -568,7 +577,7 @@ export default {
     },
     solutionSubmit(formName) {
       if (this.solutionDialogType == 'add') {
-        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.shcemeAdd({...this.solutionData,carnature:"02",vehicleType:"A0",energyType:"1"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -584,7 +593,7 @@ export default {
           }
         });
       } else {
-        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"01",vehicleType:"A0",energyType:"0"}).then((res) => {
+        this.$api.insCompany.schemeUpdate({...this.solutionData,carnature:"02",vehicleType:"A0",energyType:"1"}).then((res) => {
           if (res.code == '200') {
             this.$message({
               type: 'success',
@@ -614,7 +623,7 @@ export default {
       this.solutionVisible = true;
     },
     solutionFindPage() {
-      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"01",vehicleType:"A0",energyType:"0" }).then((res) => {
+      this.$api.insCompany.schemeList({ ...this.pageRequest, companyId: this.companyId,carnature:"02",vehicleType:"A0",energyType:"1" }).then((res) => {
         if (res.code == '200') {
           let pageList = {
             content: res.data.records,
@@ -635,7 +644,7 @@ export default {
     solutionUpdate({ row, column }) {
       this.solutionDialogType = 'edit';
       this.solutionDialogTitle = '编辑方案'
-      this.$api.insCompany.schemedetails(row.companyId, row.productId,"01",'A0','0').then((res) => {
+      this.$api.insCompany.schemedetails(row.companyId, row.productId,"02",'A0','1').then((res) => {
         if (res.code == '200') {
           res.data.productList.map(valA => {
             valA.kinds.map(valB => {

src/views/AgreementManage/InsuranceCompany/PassengerBus/NonBusiness/NewEnergy/SolutionConfig.vue

@@ -5,10 +5,10 @@
       </div>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
           <el-tab-pane label="普通方案配置" name="first">
-              <ordinary-plan :activeIndex="activeIndex"/>
+              <ordinary-plan :activeIndex="activeIndex" :ordinaryIndex="ordinaryIndex"/>
           </el-tab-pane>
           <el-tab-pane label="自选方案配置" name="second">
-              <optionalsolution-config :activeIndex="activeIndex"/>
+              <optionalsolution-config :activeIndex="activeIndex" :optionalIndex="optionalIndex"/>
           </el-tab-pane>
       </el-tabs>
       <el-dialog v-dialogDrag title="添加方案" :visible.sync="newPlanflag" width="80%" top="2vh" @close="newPlanflag = false">
@@ -44,6 +44,8 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
           dialogFlage: false,
           newPlanflag: false,
           activeIndex: 0,
+          ordinaryIndex: 0, // 普通方案组件更新
+          optionalIndex: 0, // 自选方案组件更新
         }
       },
       created () {
@@ -61,16 +63,18 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
         },
         optionalsolutionConfigSubmit () {
             this.newPlanflag = false
+            this.optionalIndex = (this.optionalIndex + 1) % 3
         },
         optionalsolutionConfigCancel () {
             this.newPlanflag = false
         },
         ordinaryPlanSubmit () {
             this.newPlanflag = false
+            this.ordinaryIndex = (this.ordinaryIndex + 1) % 3
         },
         ordinaryPlanCancel () {
-            this.newPlanflag = false   
-        }
+            this.newPlanflag = false
+        },
       }
   }
 </script>
@@ -85,4 +89,4 @@ import AddOrdinaryPlan from './AddOrdinaryPlan';
   box-sizing: border-box;
   justify-content: flex-end;
 }
-</style>
+</style>