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

config/dev.env.js

@@ -5,9 +5,8 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG:'"dev"',
-  BASE_URL: '"http://39.98.239.48/web-api"',//测试服务器
-  // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
-  // BASE_URL:'"http://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
+  BASE_URL: '"https://test.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.253:8082/"',//田智
   // BASE_URL: '"http:///192.168.0.253:8082/"',//田智

src/views/Core/KtCommonTable.vue

@@ -11,7 +11,7 @@
       }" style="width: 100%" :row-class-name="tableRowClassName">
       <el-table-column type="selection" width="40" fixed
         v-if="showBatchDelete || showBatchSettled || showBatchPrint"></el-table-column>
-      <el-table-column label="序号" type="index" width="50" align="center"></el-table-column>
+      <el-table-column v-if="SerialShow" label="序号" type="index" width="50" align="center"></el-table-column>
       <template v-for="column in columns">
         <el-table-column header-align="center" align="center" :prop="column.prop" :label="column.label"
           :width="column.width" :min-width="column.minWidth" :fixed="column.fixed" :key="column.prop" :type="column.type"
@@ -100,6 +100,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    SerialShow:{
+      type: Boolean,
+      default: true,
+    },
    settledName:{
     //批量按钮name
     type: String,

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

@@ -6,6 +6,8 @@
         :model="pageRequest"
         class="demo-form-inline"
         size="small"
+        :rules="queryRules"
+        ref="queryForm"
         label-width="90px"
       >
         <el-row>
@@ -16,7 +18,7 @@
             :lg="lgcell"
             :xl="xlcell"
           >
-            <el-form-item label="保险公司:">
+            <el-form-item label="保险公司:" prop="companyId">
               <el-select
                 v-model="pageRequest.companyId"
                 filterable
@@ -39,7 +41,7 @@
             :lg="lgcell"
             :xl="xlcell"
           >
-            <el-form-item label="机构:">
+            <el-form-item label="机构:" prop="deptId">
               <el-cascader
                 class="widths"
                 :options="institutionOptions"
@@ -61,7 +63,7 @@
             :lg="lgcell"
             :xl="xlcell"
           >
-            <el-form-item label="出单时间:">
+            <el-form-item label="出单时间:" prop="startDate">
               <el-date-picker
                 class="widths"
                 style="width: 220px"
@@ -83,7 +85,7 @@
             :lg="lgcell"
             :xl="xlcell"
           >
-            <el-button type="primary" size="small" @click="onSubmit"
+            <el-button type="primary" size="small" @click="onSubmit('queryForm')"
               >查询</el-button
             >
           </el-col>
@@ -389,6 +391,7 @@
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import KtButton from "@/views/Core/KtButton";
 import CommonUtil from "@/utils/comutil.js";
+import DocQuery from "./DocQuery.vue";
 export default {
   components: {
     KtCommonTable,
@@ -461,6 +464,15 @@ export default {
         { prop: "allFeeValue", label: "总费用", minWidth: 160 },
         { prop: "finalFeeValue", label: "已结算费用", minWidth: 160 },
       ],
+      queryRules: {
+        companyId: [
+          { required: true, message: "保险公司必传", trigger: "change" },
+        ],
+        deptId: [
+          { required: true, message: "机构必传", trigger: "change" },
+        ],
+        startDate: [{ required: true, message: "日期不能为空", trigger: "change" }],
+      },
     };
   },
   created() {
@@ -494,19 +506,29 @@ export default {
       });
     },
     //查询
-    onSubmit() {
-      this.$api.settlement
+    onSubmit(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.$api.settlement
         .iscompanyTosettledQuery(this.pageRequest)
         .then((res) => {
           if (res.code == "200") {
             this.pageResult = res.data;
-          } else {
-            this.$message({
+            if(res.data.content.length<1){
+              this.$message({
               message: "无数据",
               type: "warning",
             });
+            }
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "error",
+            });
           }
         });
+        }
+      })
     },
     //保险公司查询
     companyquery() {
@@ -1210,8 +1232,6 @@ export default {
     border-bottom: none;
 
 }
-.Risk_title>div:nth-child(1) {
-}
 
 .Risk_title>div:nth-child(2) {
   border-left: none;

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

@@ -1556,9 +1556,6 @@ export default {
     border-bottom: none;
 
 }
-.Risk_title>div:nth-child(1) {
-}
-
 .Risk_title>div:nth-child(2) {
   border-left: none;
       border-right: none;

src/views/FinancialManagement/CarInsurance/PersonSettlement/CommissionList.vue

@@ -1126,6 +1126,7 @@ export default {
       columns: [
         //数据列
         { prop: "orderno", label: "订单号", minWidth: 160 },
+        { prop: "policyno", label: "保单号", minWidth: 160 },
         { prop: "userid", label: "工号", minWidth: 160 },
         { prop: "username", label: "姓名", minWidth: 160 },
         { prop: "deptid", label: "机构代码", minWidth: 160 },