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

config/dev.env.js

@@ -11,9 +11,9 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
-  // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
+  BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
-  BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
+  // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
   // BASE_URL: '"http:///192.168.0.103:8080/"',//
 })
 

src/assets/css/common.css

@@ -105,7 +105,7 @@
 	border-color: var(--themeColorHover); ;
 
 }
-.el-button--primary.is-plain:hover{
+.el-button--primary.is-plain:hover,.el-button--primary.is-disabled,.el-button--primary.is-disabled:hover{
 	background-color: #D2D2D2;
 	color: var(--themeColor);
 	border-color: #D2D2D2;
@@ -138,7 +138,7 @@
 	color: var(--themeColor) !important;
 }
 .el-radio__input.is-checked .el-radio__inner,.el-checkbox__input.is-checked .el-checkbox__inner,
-.el-checkbox__input.is-indeterminate .el-checkbox__inner {
+.el-checkbox__input.is-indeterminate .el-checkbox__inner{
 	background: var(--themeColor) !important;
 	border-color: var(--themeColor) !important;
 }
@@ -146,7 +146,7 @@
 	border: none;
     background-color: transparent;
 }
-.el-button--primary.is-plain:focus{
+.el-button--primary.is-plain:focus {
     background-color: #C8CDD9;
 }
 .themeColor{

src/components/TemplateTable/index.vue

@@ -63,8 +63,8 @@
         <el-button type="primary" size="small" @click="handleSearchList()">查询</el-button>
         <template v-if="btnGroup.length > 0">
           <span v-for="(val, idx) in btnGroup" :key="idx" style="margin-left:10px">
-            <slot v-if="val.slot" show-overflow-tooltip :name="val.name"></slot>
-            <el-button v-else :type="val.type || 'primary'" size="small" @click="val.click()">{{ val.name }}</el-button>
+            <slot  v-if="val.slot" show-overflow-tooltip :name="val.name"></slot>
+            <el-button v-else :disabled="false || (val.disabled && val.disabled())" :type="val.type || 'primary'" size="small" @click="val.click()">{{ val.name }}</el-button>
           </span>
         </template>
       </el-form-item>

src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalance.vue

@@ -7,6 +7,7 @@
       custom
       :searchData.sync="searchData"
       :tableConfig="tableConfig"
+      @selectionChange="selectionChange"
       :btnGroup="btnGroup"
       :data="tableData"
       @findPage="findPage"
@@ -23,16 +24,6 @@
         <el-button size="small" type="primary">导入</el-button>
       </el-upload>
     </template>
-    <div v-if="!Object.keys(moneyList).length == 0">
-    <el-row class="customStyle" >
-      <el-col :span="4">预收金额：{{moneyList.totalFeevalue}}</el-col>
-      <el-col :span="4">手续费金额：{{moneyList.commissionFeevalue}}</el-col>
-      <el-col :span="4">跟单费金额：{{moneyList.otherFeevalue}}</el-col>
-      <el-col :span="4">未结算金额：{{moneyList.readyTotalFeevalue}}</el-col>
-      <el-col :span="4">未结算手续费金额：{{moneyList.readyCommissionFeevalue}}</el-col>
-      <el-col :span="4">未结算跟单金额：{{moneyList.readyOtherFeevalue}}</el-col>
-    </el-row>
-  </div>
     <template slot="data">
       <yearMonthYay ref="yearMonthYay" @getYearData="getYearData"  @getMonthData="getMonthData"  @getDayData="getDayData"></yearMonthYay>
     </template>
@@ -138,6 +129,21 @@
     <el-button   size="small" type="primary" @click="onSubmit">保存</el-button>
   </span>
   </el-dialog>
+  <el-dialog
+      title="批量结算"
+      :visible.sync="dialogVisibleBatch"
+      width="35%"
+      :before-close="handleCloseBatch">
+      <el-row class="customStyle" >
+        <el-col :span="8">预收金额：{{moneyList.totalFeevalue}}</el-col>
+        <el-col :span="8">手续费金额：{{moneyList.commissionFeevalue}}</el-col>
+        <el-col :span="8">跟单费金额：{{moneyList.otherFeevalue}}</el-col>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+    <el-button size="small" @click="dialogVisibleBatch = false">取消</el-button>
+    <el-button   size="small" type="primary" @click="onSubmitBatch">保存</el-button>
+  </span>
+  </el-dialog>
   </div>
 </template>
   <script>
@@ -161,6 +167,7 @@ export default {
       formDataList:{},
       formDataId:'',
       dialogVisibleDetail:false,
+      dialogVisibleBatch:false,
       moneyList:{},
       searchData:{},
       tableDataselect:[],
@@ -242,6 +249,10 @@ export default {
     btnGroup:[
       {
         name:'批量结算',
+        disabled:()=>{
+          let isdisabled=this.selectionList && this.selectionList.length>0?false:true
+          return isdisabled
+        },
         click:(row, index) => {return this.balanceFunPro()},
       },
       {
@@ -283,7 +294,8 @@ export default {
           {
             prop: "companyName",
             label: "保险公司",
-            type: "text"
+            type: "text",
+            width:'100',
           },
           {
             prop: "riskcode",
@@ -293,7 +305,8 @@ export default {
           {
             prop: "partnerCompaniesName",
             label: "保司机构",
-            type: "text"
+            type: "text",
+            width:'150',
           },
           {
             prop: "agreementId",
@@ -424,12 +437,19 @@ export default {
         loading:true,
         isPaginationShow:true,
         isShowIndex: true,
+        isCheckBox:true,
+        operationWidth:'180',
         optBtns:[
           {
             type:'primary',
             label:'编辑',
             click:(row, index) => {return this.haldUpload(row)},
         },
+        {
+            type:'primary',
+            label:'结算',
+            click:(row, index) => {return this.balanceFun(row)},
+        },
         ]
     },
     formTableData:[],
@@ -523,12 +543,11 @@ export default {
         agreementType: '1',
         isNotCar:'0',
         isOther:'0',
-
-
         handlingFeesStatus:'0'
       },
       dataValue:'',
       selectionOption:[],
+      selectionList:[],
     };
   },
   created(){
@@ -574,31 +593,36 @@ export default {
       a.href = `${process.env.BASE_URL}/template/SettlementTemplate.xlsx`;
       a.click();
     },
+    selectionChange(row){
+      this.selectionList=[]
+      if(row &&row.length>0){
+        this.selectionList=row.map(e=>e.id)
+      }
+      console.log(this.selectionList,1111111);
+
+    },
     // 查询
     handleSearchList(data) {
-      // if( this.formData.year ||  this.formData.month ||  this.formData.date){
-        let signDateStart=''
-        let signDateEnd=''
-        if(data && data.signDate && data.signDate.length>0){
-          signDateStart=data.signDate[0]
-          signDateEnd=data.signDate[1]
-        }
-        else{
-          signDateStart=''
-          signDateEnd=''
-        }
-        this.$api.task
-          .totalAmount({...this.formData,...this.pageData,...data,signDateStart,signDateEnd})
-          .then(res => {
-            if (res.code==200) {
-              console.log(res.data,222222);
-                this.moneyList=res.data
-            }
-            else{
-              this.$message.error(res.msg)
-            }
-          });
+        // let signDateStart=''
+        // let signDateEnd=''
+        // if(data && data.signDate && data.signDate.length>0){
+        //   signDateStart=data.signDate[0]
+        //   signDateEnd=data.signDate[1]
         // }
+        // else{
+        //   signDateStart=''
+        //   signDateEnd=''
+        // }
+        // this.$api.task
+        //   .totalAmount({...this.formData,...this.pageData,...data,signDateStart,signDateEnd})
+        //   .then(res => {
+        //     if (res.code==200) {
+        //         this.moneyList=res.data
+        //     }
+        //     else{
+        //       this.$message.error(res.msg)
+        //     }
+        //   });
       this.findPage(data);
     },
     //列表数据
@@ -633,6 +657,9 @@ export default {
     closdialogVisible() {
       this.dialogVisible = false;
     },
+    handleCloseBatch() {
+      this.dialogVisibleBatch = false;
+    },
     handExport(){
       let signDateStart=''
         let signDateEnd=''
@@ -662,38 +689,35 @@ export default {
             }
           });
     },
-    balanceFunPro(){
-      if(( this.formData.year ||  this.formData.month ||  this.formData.date ) && this.$refs.templateTable.searchDataClone){
-        let signDateStart=''
-        let signDateEnd=''
-        if(this.$refs.templateTable.searchDataClone && this.$refs.templateTable.searchDataClone.signDate && this.$refs.templateTable.searchDataClone.signDate.length>0){
-          signDateStart=this.$refs.templateTable.searchDataClone.signDate[0]
-          signDateEnd=this.$refs.templateTable.searchDataClone.signDate[1]
-        }
-      else{
-        signDateStart=''
-        signDateEnd=''
-      }
+    onSubmitBatch(){
         this.$api.task
-          .batchPinBalance({...this.formData,...this.$refs.templateTable.searchDataClone,signDateStart,signDateEnd})
+          .batchPinBalance({...this.formData,selectIds:this.selectionList,...this.moneyList})
           .then(res => {
             if (res.code==200) {
               this.$message({
                     message: '批量结算成功',
                     type: 'success'
                 })
+                this.findPage()
+                this.dialogVisibleBatch=false
+            }
+            else{
+              this.$message.error(res.msg)
+            }
+          });
+    },
+    balanceFunPro(){
+      this.dialogVisibleBatch=true
+       this.$api.task
+          .totalAmount({selectIds:this.selectionList})
+          .then(res => {
+            if (res.code==200) {
+                this.moneyList=res.data
             }
             else{
               this.$message.error(res.msg)
             }
           });
-        }
-        else{
-          this.$message.error('请先输入年月日和搜索条件！！！')
-
-        }
-      // this.dataValue=''
-      // this.dialogVisible=true
     },
     handImport(file){
       var file = file.raw;

src/views/Sys/QuotationManagement.vue

@@ -116,16 +116,8 @@ export default {
       quotationImage: '',
       qrCodeImage:'',
       dialogVisible: false, //控制对话框显示
-      form: {
-        title: "", //标题
-        url: "", //跳转链接
-        image: "", //图片base64
-        sort: "", //排序
-        enable: 1, //是否开启 1:0
-        color: "", //颜色
-      },
+      form: {},
       pageResult: [],
-      color: null,
       id: "",
       columns:[ //数据列
           {prop: "id",label: "id"},
@@ -205,9 +197,6 @@ export default {
           });
         })
     },
-    colorchange(e) {
-      this.form.color = e;
-    },
     submit() {
       if (!!this.id) {
         this.$api.menu.quotationUpdate(this.form, this.id).then((res) => {