分销费用明细、机构管理费明细修改

src/views/FinancialManagement/AcountWithdrawal/ExtendFee.vue

@@ -67,13 +67,20 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8" style="height: 40px;">
+              <el-form-item label="结算状态">
+                <el-select v-model="queryForm.settlestatus" placeholder="请选择" style="width: 100%;" clearable>
+                    <el-option label="未结算" value="0"></el-option>
+                    <el-option label="已结算" value="1"></el-option>
+                  </el-select>
+              </el-form-item>
+            </el-col>
           <el-col :span="8">
-            <el-form-item label="出单时间">
+            <el-form-item label="签单时间">
               <el-date-picker style="width: 220px;"
                 size="small"
-                v-model="queryForm.date"
+                v-model="queryForm.signDate"
                 type="daterange"
-                align="left"
                 @change="dateChange"
                 range-separator="至"
                 value-format="yyyy-MM-dd"
@@ -152,6 +159,10 @@ export default {
             name: "startdate",
             value: "",
           },
+          settlestatus: {
+            name: "settlestatus",
+            value: "",
+          },
           enddate: {
             name: "enddate",
             value: "",
@@ -165,6 +176,7 @@ export default {
         { prop: "licenseno", label: "车牌号", minWidth: 100 },
         { prop: "riskcode", label: "险种", minWidth: 100 },
         { prop: "deptname", label: "机构", minWidth: 100 },
+        { prop: "settlestatus", label: "结算状态"},
         { prop: "inscompany", label: "保险公司", minWidth: 100 },
         { prop: "refereescode", label: "工号", minWidth: 100 },
         { prop: "refereesname", label: "姓名", minWidth: 100 },
@@ -230,6 +242,7 @@ export default {
       this.pageRequest.columnFilters.username.value = this.queryForm.username;
       this.pageRequest.columnFilters.licenseNo.value = this.queryForm.licenseNo;
       this.pageRequest.columnFilters.inscompany.value = this.queryForm.inscompany;
+      this.pageRequest.columnFilters.settlestatus.value = this.queryForm.settlestatus;
       this.pageRequest.pageNum = 1;
       this.findPage();
     },
@@ -244,6 +257,9 @@ export default {
       that.$api.task
         .queryCommission(that.pageRequest)
         .then((res) => {
+          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

@@ -39,10 +39,24 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="12" style="height: 40px;">
+            <!-- <el-col :span="12" style="height: 40px;">
               <el-form-item label="出单时间">
                 <el-date-picker v-model="queryForm.date" style="width:100%"  type="daterange" align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
               </el-form-item>
+            </el-col> -->
+			
+			<el-col :span="6" style="height: 40px;">
+              <el-form-item label="结算状态">
+                <el-select v-model="queryForm.settlestatus" placeholder="请选择" style="width: 100%;" clearable>
+                    <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" style="height: 40px;">
+              <el-form-item label="签单时间">
+                <el-date-picker v-model="queryForm.signDate" style="width:100%"  type="daterange" align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
+              </el-form-item>
             </el-col>
             <el-col :span="24" class="u-f u-f-je" style="height:40px;">
               <div class="u-f" style="margin-bottom: 20px; width: 60px;height: 32px; border-radius: 5px;overflow: hidden;" @click="queryEsmInfo" >
@@ -1130,6 +1144,7 @@ export default {
         { prop: "userid", label: "工号", minWidth: 160 },
         { prop: "username", label: "姓名", minWidth: 160 },
         { prop: "deptid", label: "机构代码", minWidth: 160 },
+        { prop: "settlestatus", label: "结算状态"},
         { prop: "deptname", label: "机构名称", minWidth: 160 },
         { prop: "createtime", label: "出单日期", minWidth: 160 },
         {
@@ -1271,6 +1286,7 @@ export default {
         this.queryForm.inscompany;
       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();
     },
@@ -1300,6 +1316,9 @@ export default {
       that.$api.task
         .queryInsCompanyFee(that.pageRequest)
         .then((res) => {
+			res.data.content.forEach(row=>{
+				 row.settlestatus=row.settlestatus==='1'?'已结算':'未结算'
+			})
           that.pageResult = res.data;
         })
         .then(data != null ? data.callback : "");