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

src/views/FinancialManagement/AcountWithdrawal/ExtendFee.vue

@@ -177,6 +177,7 @@ export default {
         { prop: "riskcode", label: "险种", minWidth: 100 },
         { prop: "deptname", label: "机构", minWidth: 100 },
         { prop: "settlestatus", label: "结算状态"},
+        { prop: "signDate", label: "签单时间"},
         { prop: "inscompany", label: "保险公司", minWidth: 100 },
         { prop: "refereescode", label: "工号", minWidth: 100 },
         { prop: "refereesname", label: "姓名", minWidth: 100 },

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

@@ -40,27 +40,29 @@
       label-width="80px"
     >
       <el-row style="margin-bottom: 15px">
-        <el-col :span="4">
+        <el-col :span="6">
           <el-form-item label="订单号">
             <el-input
               size="small"
               clearable
+              style="width:220px"
               placeholder="订单号"
               v-model="queryForm.orderno"
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="6">
           <el-form-item label="机构编码">
             <el-input
               size="small"
               clearable
+              style="width:220px"
               placeholder="机构编码"
               v-model="queryForm.comcode"
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="6">
           <el-form-item label="机构级别">
             <el-select
               size="small"
@@ -75,26 +77,51 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="6">
           <el-form-item label="保单号">
             <el-input
               size="small"
               clearable
-              placeholder="车牌号"
+              style="width:220px"
+              placeholder="保单号"
               v-model="queryForm.policyno"
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="6">
           <el-form-item label="车牌号">
             <el-input
               size="small"
               clearable
+              style="width:220px"
               placeholder="车牌号"
               v-model="queryForm.licenseno"
             ></el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="6" style="height: 40px;">
+              <el-form-item label="结算状态">
+                <el-select v-model="queryForm.settlestatus" placeholder="请选择" clearable size="small">
+                    <el-option label="未结算" value="0"></el-option>
+                    <el-option label="已结算" value="1"></el-option>
+                  </el-select>
+              </el-form-item>
+            </el-col>
+          <el-col :span="6">
+            <el-form-item label="签单时间">
+              <el-date-picker style="width: 220px;"
+                size="small"
+                v-model="queryForm.signDate"
+                type="daterange"
+                @change="dateChange"
+                range-separator="至"
+                value-format="yyyy-MM-dd"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
         <el-col :span="4">
           <el-form-item label-width="20px">
             <el-button @click="getOrderList" size="small">查询</el-button>
@@ -211,6 +238,18 @@ export default {
             name: "licenseno",
             value: "",
           },
+          startdate: {
+            name: "startdate",
+            value: "",
+          },
+          settlestatus: {
+            name: "settlestatus",
+            value: "",
+          },
+          enddate: {
+            name: "enddate",
+            value: "",
+          },
         },
       },
       columns: [
@@ -218,6 +257,8 @@ export default {
         { prop: "orderno", label: "订单号", minWidth: 160 },
         { prop: "policyno", label: "保单号", minWidth: 160 },
         { prop: "licenseno", label: "车牌号", minWidth: 90 },
+        { prop: "settlestatus", label: "结算状态"},
+        { prop: "signDate", label: "签单时间"},
         { prop: "riskcode", label: "险种", minWidth: 90 },
         { prop: "inscompany", label: "保险公司", minWidth: 90 },
         { prop: "agreeid", label: "协议号", minWidth: 160 },
@@ -265,10 +306,14 @@ export default {
       this.pageRequest.columnFilters.comcode.value = this.queryForm.comcode;
       this.pageRequest.columnFilters.licenseno.value = this.queryForm.licenseno;
       this.pageRequest.columnFilters.policyno.value = this.queryForm.policyno;
+      this.pageRequest.columnFilters.settlestatus.value = this.queryForm.settlestatus;
       this.pageRequest.pageNum = 1;
       this.findPage();
     },
-
+    dateChange(e){
+      this.pageRequest.columnFilters.startdate.value=e[0];
+      this.pageRequest.columnFilters.enddate.value=e[1];
+    },
     //确认是否关闭对话框
     handleClose(done) {
       this.$confirm("确认关闭？")
@@ -323,7 +368,9 @@ export default {
       that.$api.task
         .queryDeptFee(that.pageRequest)
         .then((res) => {
-          console.log(res.data);
+          res.data.content.forEach(row=>{
+            row.settlestatus=row.settlestatus==='1'?'已结算':'未结算'
+          })
           that.pageResult = res.data;
         })
         .then(data != null ? data.callback : "");

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

@@ -1146,7 +1146,7 @@ export default {
         { prop: "deptid", label: "机构代码", minWidth: 160 },
         { prop: "settlestatus", label: "结算状态"},
         { prop: "deptname", label: "机构名称", minWidth: 160 },
-        { prop: "createtime", label: "出单日期", minWidth: 160 },
+        { prop: "signDate", label: "签单日期", minWidth: 160 },
         {
           prop: "inscompany",
           label: "保险公司",
@@ -1262,14 +1262,14 @@ export default {
     //-- formatter end--
 
     queryEsmInfo() {
-      if (this.queryForm.date != null) {
+      if (this.queryForm.signDate != null) {
         var startdate = formatWithSeperator(
-          this.queryForm.date[0],
+          this.queryForm.signDate[0],
           "-",
           ":"
         ).split(" ")[0];
         var enddate = formatWithSeperator(
-          this.queryForm.date[1],
+          this.queryForm.signDate[1],
           "-",
           ":"
         ).split(" ")[0];