结算

config/dev.env.js

@@ -12,8 +12,8 @@ module.exports = merge(prodEnv, {
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
-  BASE_URL: '"http:///192.168.0.253:8080/"',//田智
-  // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
+  // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
+  BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
   // BASE_URL: '"http:///192.168.0.103:8、080/"',//霍续亮

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/InvoicingUnsettled.vue

@@ -18,6 +18,29 @@
       <span slot="footer" class="dialog-footer">
       <el-button  size="small" @click="dialogVisible = false">取消</el-button>
     </span>
+  </el-dialog>
+  <el-dialog
+      title="结算"
+      :visible.sync="dialogVisiblebalance"
+      width="20%"
+      :before-close="handleClosebalance">
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item label="进账金额">
+          <el-input v-model="form.settlementAmount" style="width:220px"></el-input>
+        </el-form-item>
+        <el-form-item label="进账日期">
+          <el-date-picker
+            v-model="form.settlementTime"
+            type="date"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+      <el-button  size="small" @click="dialogVisiblebalance = false">取消</el-button>
+      <el-button type="primary" size="small" @click="balanceSumbit">确实</el-button>
+    </span>
   </el-dialog>
     </div>
 </template>
@@ -38,6 +61,8 @@ export default {
     },
     data() {
         return {
+            dialogVisiblebalance:false,
+            form:{},
             formTableData:[],
       tableConfigDetail:{
         columns: [
@@ -228,31 +253,59 @@ export default {
         },
         handleClose(){
       this.dialogVisible=false
-    },  
+    }, 
+    balanceSumbit() {
+      this.$api.task
+        .batchBxBalance({...this.openBalanceDetail,
+          otherFeevalue:this.formDetail.otherFeevalue,
+          partnerCompaniesId:this.formDetail.partnerCompaniesId,
+          companyId:this.formDetail.companyId,
+          isNotCar:'0',
+          handlingFeesStatus:'1',
+          ...this.form})
+        .then(res => {
+          if (res.code==200) {
+            this.haldDetail(this.formDetail)
+            this.dialogVisiblebalance=false
+            this.$message({
+                message: res.msg ||'操作成功',
+                type: 'success'
+            })
+          }
+          else{
+            this.$message.error(res.msg)
+          }
+        });
+    }, 
+    handleClosebalance() {
+      this.dialogVisiblebalance = false;
+    },
         // 结算
         balanceFun(row) {
-            this.$api.task
-                .batchBxBalance({
-                    ...row,
-                    otherFeevalue:this.formDetail.otherFeevalue,
-                    partnerCompaniesId:this.formDetail.partnerCompaniesId,
-                    companyId:this.formDetail.companyId,
-                    isNotCar:'0',
-                    handlingFeesStatus:'1',
-                    })
-                .then(res => {
-                    if (res.code==200) {
-                        this.haldDetail(this.formDetail)
-                        this.dialogVisible=false
-                        this.$message({
-                            message: res.msg ||'操作成功',
-                            type: 'success'
-                        })
-                    }
-                    else{
-                        this.$message.error(res.msg)
-                    }
-                });
+            this.openBalanceDetail=row
+            this.dialogVisiblebalance=true
+            // this.$api.task
+            //     .batchBxBalance({
+            //         ...row,
+            //         otherFeevalue:this.formDetail.otherFeevalue,
+            //         partnerCompaniesId:this.formDetail.partnerCompaniesId,
+            //         companyId:this.formDetail.companyId,
+            //         isNotCar:'0',
+            //         handlingFeesStatus:'1',
+            //         })
+            //     .then(res => {
+            //         if (res.code==200) {
+            //             this.haldDetail(this.formDetail)
+            //             this.dialogVisible=false
+            //             this.$message({
+            //                 message: res.msg ||'操作成功',
+            //                 type: 'success'
+            //             })
+            //         }
+            //         else{
+            //             this.$message.error(res.msg)
+            //         }
+            //     });
         },
         tablePageChange(val) {
             this.pageData.pageSize = val;

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/InvoicingUnsettled.vue

@@ -16,6 +16,29 @@
                 <el-button size="small" @click="dialogVisible = false">取消</el-button>
             </span>
         </el-dialog>
+        <el-dialog
+      title="结算"
+      :visible.sync="dialogVisiblebalance"
+      width="20%"
+      :before-close="handleClosebalance">
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item label="进账金额">
+          <el-input v-model="form.settlementAmount" style="width:220px"></el-input>
+        </el-form-item>
+        <el-form-item label="进账日期">
+          <el-date-picker
+            v-model="form.settlementTime"
+            type="date"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+      <el-button  size="small" @click="dialogVisiblebalance = false">取消</el-button>
+      <el-button type="primary" size="small" @click="balanceSumbit">确实</el-button>
+    </span>
+  </el-dialog>
     </div>
 </template>
 <script>
@@ -35,6 +58,8 @@ export default {
     },
     data() {
         return {
+            dialogVisiblebalance:false,
+            form:{},
             formTableData: [],
             dialogVisible: false,
             tableConfigDetail: {
@@ -222,30 +247,58 @@ export default {
             this.findPage(data)
         },
 
+        balanceSumbit() {
+      this.$api.task
+        .batchBxBalance({...this.openBalanceDetail,
+          otherFeevalue:this.formDetail.otherFeevalue,
+          partnerCompaniesId:this.formDetail.partnerCompaniesId,
+          companyId:this.formDetail.companyId,
+          isNotCar:'1',
+          handlingFeesStatus:'1',
+          ...this.form})
+        .then(res => {
+          if (res.code==200) {
+            this.haldDetail(this.formDetail)
+            this.dialogVisiblebalance=false
+            this.$message({
+                message: res.msg ||'操作成功',
+                type: 'success'
+            })
+          }
+          else{
+            this.$message.error(res.msg)
+          }
+        });
+    }, 
+    handleClosebalance() {
+      this.dialogVisiblebalance = false;
+    },
         // 结算
         balanceFun(row) {
-            this.$api.task
-            .batchBxBalance({
-                    ...row,
-                    otherFeevalue:this.formDetail.otherFeevalue,
-                    partnerCompaniesId:this.formDetail.partnerCompaniesId,
-                    companyId:this.formDetail.companyId,
-                    isNotCar:'0',
-                    handlingFeesStatus:'1',
-                    })
-                .then(res => {
-                    if (res.code == 200) {
-                        this.haldDetail(this.formDetail)
-                        this.dialogVisible=false
-                        this.$message({
-                            message: res.msg || '操作成功',
-                            type: 'success'
-                        })
-                    }
-                    else {
-                        this.$message.error(res.msg)
-                    }
-                });
+            this.openBalanceDetail=row
+            this.dialogVisiblebalance=true
+            // this.$api.task
+            //     .batchBxBalance({
+            //         ...row,
+            //         otherFeevalue:this.formDetail.otherFeevalue,
+            //         partnerCompaniesId:this.formDetail.partnerCompaniesId,
+            //         companyId:this.formDetail.companyId,
+            //         isNotCar:'0',
+            //         handlingFeesStatus:'1',
+            //         })
+            //     .then(res => {
+            //         if (res.code==200) {
+            //             this.haldDetail(this.formDetail)
+            //             this.dialogVisible=false
+            //             this.$message({
+            //                 message: res.msg ||'操作成功',
+            //                 type: 'success'
+            //             })
+            //         }
+            //         else{
+            //             this.$message.error(res.msg)
+            //         }
+            //     });
         },
         tablePageChange(val) {
             this.pageData.pageSize = val;

src/views/Task/daikeComponents/KtLetter.vue

@@ -4076,9 +4076,11 @@ export default {
     anshengInsuranceChange(index) {
       let data = this.anshengInsuranceData.find(val => val.projectCode == index);
       // this.anshengaccidentalDrivingVo.personFlag = data.personFlag;
-      this.anshengaccidentalDrivingVo.projectName = data.projectName;
-      this.anshengaccidentalDrivingVo.planCode = data.projectCode;
+      // this.anshengaccidentalDrivingVo.projectName = data.projectName;
+      // this.anshengaccidentalDrivingVo.planCode = data.projectCode;
       // this.anshengaccidentalDrivingVo.planSeries = data.planSeries;
+      this.anshengaccidentalDrivingVo.parentName = data.projectName;
+      this.anshengaccidentalDrivingVo.parentCode = data.projectCode;
       this.anshengInsuranceData1 = [];
       this.anshengInsuranceData1 = data.children;
     },
@@ -4630,8 +4632,9 @@ export default {
     //安盛驾意险选择
     ASDrivingRadio(row) {
       this.AStemplateSelection = row.projectCode;
-      this.anshengaccidentalDrivingVo.projectCode = row.projectCode;
-      this.anshengaccidentalDrivingVo.projectName = row.projectName;
+      this.anshengaccidentalDrivingVo=Object.assign({...row,...this.anshengaccidentalDrivingVo}) 
+      // this.anshengaccidentalDrivingVo.projectCode = row.projectCode;
+      // this.anshengaccidentalDrivingVo.projectName = row.projectName;
     },
     ZADrivingRadio(row) {
       this.ZADrivingChange(row);
@@ -5490,15 +5493,19 @@ export default {
     //中煤报价
     zhongmei(num, id) {
       let accidentalDrivingVo = {};
-      // if(this.zhongmeiaccidentalDrivingVo){
-      //   accidentalDrivingVo.rideRiskCode=this.zhongmeiaccidentalDrivingVo.schemeNo;
-      //   accidentalDrivingVo.rideRiskName=this.zhongmeiaccidentalDrivingVo.schemeName;
-      //   accidentalDrivingVo.quantity=this.zhongmeiaccidentalDrivingVo.quantity;
+   
+      // if (this.accidentFormZM.projectCode) {
+      //   accidentalDrivingVo = {
+      //     projectCode: this.accidentFormZM.projectCode,
+      //     projectName: this.accidentFormZM.projectName,
+      //     quantity: this.accidentFormZM.quantity
+      //       ? this.accidentFormZM.quantity
+      //       : "1"
+      //   };
       // }
       if (this.accidentFormZM.projectCode) {
         accidentalDrivingVo = {
-          projectCode: this.accidentFormZM.projectCode,
-          projectName: this.accidentFormZM.projectName,
+          ...this.zhongmeiInsuranceData.find(e=>e.projectCode==this.accidentFormZM.projectCode),
           quantity: this.accidentFormZM.quantity
             ? this.accidentFormZM.quantity
             : "1"
@@ -5788,13 +5795,11 @@ export default {
       this.isApplicantShow = false;
       let accidentalDrivingVo = {};
       if (this.accidentForm.projectCode) {
-        let data = this.accidentDataList.find(
+        let data= this.accidentDataList.find(
           val => val.projectCode == this.accidentForm.accidentType
         );
-
         accidentalDrivingVo = {
-          rideRiskCode: data.projectCode ? data.projectCode : "",
-          rideRiskName: data.projectName ? data.projectName : "",
+          ...data,
           quantity: this.accidentForm.quantity ? this.accidentForm.quantity : ""
         };
       }
@@ -5899,10 +5904,10 @@ export default {
       });
       let accidentalDrivingVo = {};
       if (this.guoRenaccidentForm.goodsCode) {
-        let goodsName = this.guoRenaccidentDataList.find(val => val.projectCode == this.guoRenaccidentForm.goodsCode).projectName
+        let data= this.guoRenaccidentDataList.find(val => val.projectCode == this.guoRenaccidentForm.goodsCode)
         accidentalDrivingVo = {
+          ...data,
           ...this.guoRenaccidentForm,
-          goodsName
         };
       }
       let params = {