渤海非车

config/dev.env.js

@@ -5,10 +5,10 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG:'"dev"',
-  BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
+  // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
-  // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
+  BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   // BASE_URL: '"http:///192.168.0.253:8082/"',//田智
   // BASE_URL: '"http:///192.168.0.253:8082/"',//田智
@@ -18,3 +18,4 @@ module.exports = merge(prodEnv, {
 
 
 
+

src/views/FinancialManagement/AcountWithdrawal/AcountBalance.vue

@@ -9,7 +9,7 @@
                 clearable
                 size="small"
                 placeholder="工号"
-                v-model="queryFrom.userid"
+                v-model="queryFrom.userId"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -68,7 +68,7 @@ export default {
         pageSize: 10,
       },
       queryFrom: {
-        userid: "", //工号
+        userId: "", //工号
         deptId: "", //机构
       },
       columns: [
@@ -118,8 +118,8 @@ export default {
         .findPageAccountPro({
           ...this.pageRequest,
           columnFilters: {
-            deptid: { name: "deptid", value: this.queryFrom.deptId },
-            userid: { name: "userid", value: this.queryFrom.userid },
+            deptId: { name: "deptId", value: this.queryFrom.deptId },
+            userId: { name: "userId", value: this.queryFrom.userId },
           },
         })
         .then((res) => {

src/views/Letter/Letter.vue

@@ -1666,8 +1666,8 @@
             <template
               v-if="reslistitem.namesimple == '紫金财险' && reslistitem.checked && reslistitem.agreementId"
             >
-              <div style="margin-left:100px;margin:15px 0">
-                <span style="margin-right:30px" >自主定价系数</span>
+              <div style="margin:15px 0 15px 100px">
+                <span  >自主定价系数</span>
                 <el-input style="width:220px" size="small" v-model="reslistitem.coefficient" placeholder="请输入内容"></el-input>
               </div>
               <div class="flex f-c Driving-risk">
@@ -1980,7 +1980,7 @@
                     <el-select
                       clearable
                       placeholder="未选择"
-                      @clear="clearAccidentFormGr"
+                      @clear="clearAccidentFormBh"
                       @change="bhcxchange"
                       v-model="boHaiaccidentForm.packageCode"
                     >
@@ -1992,7 +1992,7 @@
                       ></el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item label=" ">
+                  <!-- <el-form-item label=" ">
                     <el-select
                       clearable
                       v-model="boHaiaccidentForm.productCode"
@@ -2003,10 +2003,10 @@
                         v-for="(item, index) in boHaiaccidentDataListChild"
                         :key="index"
                         :label="item.coverageName"
-                        :value="item.productCode"
+                        :value="item.insuredAmount"
                       ></el-option>
                     </el-select>
-                  </el-form-item>
+                  </el-form-item> -->
                   <el-form-item label="选择份数" style="margin-right:30px;">
                     <el-input-number
                       v-model="boHaiaccidentForm.copies"
@@ -2015,23 +2015,23 @@
                     ></el-input-number>
                   </el-form-item>
                   <el-form-item label="保费：">
-                    <span>{{boHaiaccidentForm.premium*boHaiaccidentForm.policyNum}}&ensp;元</span>
+                    <span>{{boHaiaccidentForm.premium*boHaiaccidentForm.copies}}&ensp;元</span>
                   </el-form-item>
                 </el-form>
                 <el-table
-                  v-if="boHaiaccidentForm.prodCode"
+                  v-if="boHaiaccidentForm.packageCode"
                   size="small"
                   :data="boHaiaccidenttableData"
                   border
+                  v-loading="accidentLoadingbh"
                   ref="expandTable"
                   highlight-current-row
                   :header-cell-style="{ background: '#F7F7F9 ', fontWeight: '700', color: '#333333' }"
                 >
-                  <el-table-column prop="liabName" label="保险责任" align="center"></el-table-column>
-                  <el-table-column prop="liabAmount" label="保额 (元)" align="center"></el-table-column>
-                  <el-table-column prop="liabPremium" label="保费 (元)" align="center">
+                  <el-table-column prop="coverageName" label="保险责任名称" align="center"></el-table-column>
+                  <el-table-column prop="insuredAmount" label="保额 (元)" align="center">
                     <template slot-scope="scope" >
-                      ￥{{scope.row.liabPremium }}
+                      ￥{{scope.row.insuredAmount }}
                     </template>
                   </el-table-column>
                 </el-table>
@@ -3324,7 +3324,6 @@ export default {
         unitPremium:0
       }, //中煤意外险内容
       boHaiaccidentDataList:[], //渤海意外险
-      boHaiaccidentDataListChild:[],
       boHaiaccidentForm:{
         copies:'1',
         policyNum:0
@@ -5158,37 +5157,21 @@ else{
       if(index){
         this.accidentLoadingbh=true
         this.boHaiaccidentForm.copies = "1";
-        // this.guoRenaccidentForm.productCode=""
+        this.boHaiaccidentForm.premium =Number(this.boHaiaccidentDataList.find(e=>e.packageCode==index).premium) 
         let data = await this.$api.letter.productDetailsQueryboHai({
           packageCode: index,
-          agreementId:this.guoRenaccidentForm.agreementId
+          productCode:this.boHaiaccidentDataList.find(e=>e.packageCode==index).productCode,
+          agreementId:this.boHaiaccidentForm.agreementId
         });
-        if (data.code == 200) {
-          let num = 0;
-            data.data.forEach(item => {
-              num += Number(item.premium);
-            });
+        if (data.code == 200 && data.data) {
           this.accidentLoadingbh=false
-          this.boHaiaccidentDataListChild = data.data;
+          this.boHaiaccidenttableData = data.data;
         }
         else{
-          this.accidentLoadingbh=false
           this.$message.error(data.msg)
-          this.boHaiaccidentDataListChild=[]
+          this.boHaiaccidenttableData=[]
         }
       }
-    },
-     // 渤海选择意外险子级类型
-     async bhcxchangeChild(index) {
-      let list=this.boHaiaccidentDataListChild.find(val => val.prodCode == index)
-      this.boHaiaccidentForm={
-        ... this.boHaiaccidentForm,
-        copies:list.copies,
-        riskCode:list.riskCode,
-        amount:list.amount,
-        policyNum:Number(list.policyNum)
-      }
-      this.boHaiaccidenttableData=list.prodCvgLiabList
     },
      // 国任选择意外险类型
      async grcxchange(index) {
@@ -5721,6 +5704,14 @@ else{
       };
 
     },
+    clearAccidentFormBh(){
+      this.boHaiaccidenttableData=[]
+      this.boHaiaccidentForm= {
+        copies: "1",
+        premium:0
+      };
+      // this.bohaiaccidentalDrivingVo={};
+    },
     clearAccidentFormHN(){
       this.huanongaccidentalDrivingVo={};
     },
@@ -6727,11 +6718,13 @@ else{
     //渤海报价
     bohai(num, id) {
       let accidentalDrivingVo = [];
-      // if ( this.boHaiaccidentForm.goodsCode) {
-      //   accidentalDrivingVo = {
-      //     ...this.boHaiaccidentForm,
-      //   };
-      // }
+      if ( this.boHaiaccidentForm.packageCode) {
+        accidentalDrivingVo=[{
+          packageCode:this.boHaiaccidentForm.packageCode,
+          productCode:this.boHaiaccidentDataList.find(e=>e.packageCode==this.boHaiaccidentForm.packageCode).productCode,
+          copies:this.boHaiaccidentForm.copies,
+        }]
+      }
       let params = {
         accidentalDrivingVo,
         orderNo: this.orderno,