1、新增服务查询目录

2、修改财务管理-账户体提现管理-待支付任务和已支付任务的列表接口

config/dev.env.js

@@ -8,12 +8,12 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
   // BASE_URL:'"https://sxzgkj.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.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   // BASE_URL: '"http:///192.168.0.253:8082/"',//田智
-  // BASE_URL: '"http:///192.168.0.253:8082/"',//田智
+  // 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/"',//郝宇
 })
 
 

src/http/api.js

@@ -48,6 +48,7 @@ import * as expense from './moudules/expense.js'
 
 //报表管理
 import * as report from './moudules/report.js'
+import * as one from './moudules/service/one'
 
 // 默认全部导出
 export default {
@@ -87,4 +88,5 @@ export default {
     expense,
     //报表管理
     report,
+    one
 }

src/http/moudules/service/one.js

@@ -0,0 +1,26 @@
+import axios from '../../axios'
+
+// export const gainTopList = (params) => {
+//     return axios({
+//         url: "/esmInsCompany/gainTopList",
+//         method: "get",
+//         params
+//     })
+// }
+
+// 获取一键救援-订单查询列表
+export const rescueOrderPage= (data) => {
+    return axios({
+        url: "/ser/rescue/rescueOrderPage",
+        method: "post",
+        data
+    })
+}
+// 获取年检代办-订单查询列表
+export const annualAuditOrderPage= (data) => {
+    return axios({
+        url: "/ser/annualAuditOrder/annualAuditOrderPage",
+        method: "post",
+        data
+    })
+}

src/http/moudules/task.js

@@ -150,6 +150,13 @@ export const payApplyFindPage = (data) => {
   })
 }
 
+export const payqueryPage = (data) => {
+  return axios({
+    url: 'sysAmountAuditing/queryPage',
+    method: 'post',
+    data
+  })
+}
 //可提现余额提现审核
 export const insPayApplyAudit = (data) => {
   return axios({
@@ -373,6 +380,13 @@ export const excelExport = (data) => {
   })
 }
 
+export const AmountReview = (data) => {
+  return axios({
+    url: 'sysAmountAuditing/AmountReview',
+    method: "put",
+    data
+  })
+}
 //导入excel文件
 export const uploadExcel = (data, type) => {
   return axios({

src/views/Core/KtCommonTable.vue

@@ -74,28 +74,20 @@
             @click="handleButton1(scope.$index, scope.row)"
           />
           <kt-button
-            :style="{
-              background: button2Background,
-              border: '1px solid' + button2Background,
-              color: '#fff',
-            }"
             v-if="button2Name"
             :label="button2Name"
             :perms="permsButton2"
             :size="size"
+            :type="button2Type"
             :icon="button2Icon"
             @click="handleButton2(scope.$index, scope.row)"
           />
           <kt-button
-            :style="{
-              background: button3Background,
-              border: '1px solid' + button3Background,
-              color: '#fff',
-            }"
             v-if="button3Name"
             :label="button3Name"
             :perms="permsButton3"
             :size="size"
+            :type="button3Type"
             :icon="button3Icon"
             @click="handleButton3(scope.$index, scope.row)"
           />
@@ -123,7 +115,7 @@
         v-if="showBatchDelete & showOperation" />
       <kt-button :label="settledName" :perms="permsSettled" :size="size" type="danger" @click="handleBatchSettled()"
         :disabled="selections.length === 0" style="float: left" v-if="showBatchSettled" />
-      <kt-button label="导出Excel" :perms="permsExcel" :size="size" type="danger" @click="handleBatchPrint()"
+      <kt-button label="导出Excel"  :perms="permsExcel" :size="size" type="danger" @click="handleBatchPrint()"
         style="float: left" v-if="showBatchPrint" />
       <el-pagination @size-change="handleSizeChange" layout="total, sizes, prev, pager, next, jumper"
         @current-change="refreshPageRequest" :current-page="data.pageNum" :page-size="data.pageSize"
@@ -221,16 +213,24 @@ export default {
     },
     button2Icon: {
       type: String,
-      default: "fa fa-edit",
+      default: "",
     },
     button3Icon: {
       type: String,
-      default: "fa fa-edit",
+      default: "",
     },
     button4Icon: {
       type: String,
       default: "fa fa-trash",
     },
+    button2Type: {
+      type: String,
+      default: "primary",
+    },
+    button3Type: {
+      type: String,
+      default: "primary",
+    },
     editButtonName: {
       type: String,
     },
@@ -448,6 +448,12 @@ export default {
         row: row,
       });
     },
+    handleButton: function (index, row) {
+      this.$emit("handleButton", {
+        index: index,
+        row: row,
+      });
+    },
     //删除单个
     handleDeleteFlag: function (index, row) {
       this.$emit("handleDeleteFlag", { index: index, row: row });

src/views/FinancialManagement/AcountWithdrawal/BalanceWithdrawalnotpay.vue

@@ -1,39 +1,27 @@
 <template>
   <div>
     <el-main ref="elMain" style="padding: 0px;">
-      <!-- 搜索区域Start -->
-      <div class="queryForm" title="检索区" style="padding-top:10px;padding-left:15px;">
-        <el-form size="mini" ref="queryForm" :model="queryForm" label-width="120px">
-          <el-row>
-            <el-col :span="6" style="height: 40px;">
-              <el-form-item label="业务员工号">
-                <el-input clearable placeholder="业务员工号" v-model="queryForm.userid"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6" style="height: 40px;">
-              <el-form-item label="提现单号">
-                <el-input clearable placeholder="提现单号" v-model="queryForm.applyno"></el-input>
-              </el-form-item>
-            </el-col>
-		<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="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" >
-			  <div class="u-f u-f1 u-f-ajc" style="background: #409EFF;color:#fff">查询</div>
-		  </div>
-		</el-col>
-          </el-row>
-        </el-form>
-      </div>
-
-      <kt-common-table permsDelete="sys:user:delete" :showBatchDelete="false" :showBatchPrint="true" permsButton3="sys:user:edit" :data="pageResult" :columns="columns" @findPage="findPage" button3Name="审核并支付" button3Background="#00B0F0" @handleButton3="handleButton3" @handlePrint="handlePrint">
+      <el-row>
+    <el-form :inline="true" :model="queryForm" class="demo-form-inline"  label-width="130px" size="small">
+  <el-form-item label="业务员工号">
+    <el-input v-model="queryForm.userId" placeholder="业务员工号" clearable></el-input>
+  </el-form-item>
+  <el-form-item label="提现单号">
+    <el-input v-model="queryForm.id" placeholder="提现单号" clearable></el-input>
+  </el-form-item>
+  <el-form-item label="金钱属性">
+    <el-select v-model="queryForm.amountStatus" placeholder="金钱属性" clearable>
+      <el-option  v-for="val in pay_statusoptions" :key="val.label" :label="val.dictTag" :value="val.dictValue" ></el-option>
+    </el-select>
+  </el-form-item>
+  <el-form-item>
+    <el-button type="primary"  size="small" @click="findPage">查询</el-button>
+  </el-form-item>
+</el-form>
+  </el-row>
+      <kt-common-table button2Type="text" button3Type="text" :showBatchDelete="false" :showBatchPrint="true" permsButton3="sys:balanceWithdrawalnotpay:examine" permsButton2="sys:balanceWithdrawalnotpay:examinepay"  :data="pageResult" :columns="columns" @findPage="findPage" button3Name="审核并支付"  @handleButton3="handleButton3" button2Name="审核提现" @handleButton2="handleButton2" >
       </kt-common-table>
     </el-main>
-
-
   </div>
 </template>
 <script>
@@ -41,10 +29,6 @@
   import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
   import KtButton from "@/views/Core/KtButton";
   import CommonUtil from "@/utils/comutil.js";
-  import {
-    formatWithSeperator,
-    format
-  } from "@/utils/datetime.js";
   export default {
     components: {
       KtCommonTable,
@@ -58,62 +42,34 @@
         pageRequest: { //查询的默认条件
           pageNum: 1,
           pageSize: 10,
-          columnFilters: {
-            "applystatus": {
-              "name": "applystatus",
-              "value": "0"
-            },
-            "applytype": {
-              "name": "applytype",
-              "value": "A"
-            },
-			"applyno": {
-			  "name": "applyno",
-			  "value": ""
-			},
-			"userid": {
-			  "name": "userid",
-			  "value": ""
-			},
-			"startdate": {
-			  "name": "startdate",
-			  "value": ""
-			},
-			"enddate": {
-			  "name": "enddate",
-			  "value": ""
-			}
-          }
+          auditingStatus:'2'
         },
         columns: [ //数据列
-          {prop: "applyno",label: "提现单号",minWidth: 160},
-          {prop: "userid",label: "业务员工号",minWidth: 100},
-          {prop: "username",label: "业务员姓名",minWidth: 100},
-          {prop: "deptid",label: "机构代码",minWidth: 100},
-          {prop: "deptname",label: "机构名称",minWidth: 100},
-          {prop: "accountbalance",label: "可提现账户余额",minWidth: 100},
-          {prop: "applyamount",label: "提现金额",minWidth: 100},
-          {prop: "balance",label: "账户余额",minWidth: 100},
-          {prop: "disrate",label: "服务费",minWidth: 100},
-          {prop: "bankname",label: "开户行",minWidth: 100},
-          {prop: "accountno",label: "账号",minWidth: 100},
-          {prop: "createtime",label: "提现时间",minWidth: 130}
+          {prop: "id",label: "提现单号"},
+          {prop: "userId",label: "业务员工号"},
+          {prop: "userName",label: "业务员姓名"},
+          {prop: "deptId",label: "机构代码",},
+          {prop: "deptName",label: "机构名称"},
+          {prop: "userAmount ",label: "可提现账户余额",},
+          {prop: "amount",label: "提现金额"},
+          {prop: "surplusAmount",label: "账户余额",},
+          {prop: "bankAccount",label: "开户行"},
+          {prop: "bankNumber",label: "账号",},
+          {prop: "createTime",label: "提现时间"}
         ],
-        //------------协议下拉框数据   begin-----------------
-        agreementtypeoptions: [], //协议类型
-        //------------协议下拉框数据   end-----------------
+        pay_statusoptions:[]
       };
     },
     created() {
       //获取所有下拉框数据
-      this.getDictItems("agreementtype");
+      this.getDictItems("pay_status");
     },
     mounted() {
 
     },
     methods: {
-		handlePrint(){
-			this.$api.task.excelExport(this.pageRequest).then(res=>{
+		handlePrint(index,row){
+			this.$api.task.AmountReview(this.pageRequest).then(res=>{
 				console.log(res)
 					let blob = new Blob([res], {
 						type: "application/vnd.ms-excel"
@@ -128,63 +84,16 @@
 					window.URL.revokeObjectURL(url);					
 			})
 		},
-      //-- formatter begin--
-      agreetypeFormatter(row, column) { //协议类型
-        let agreetype = row.agreetype;
-        return CommonUtil.getDataName({
-          dataList: this.agreementtypeoptions,
-          value: 'value',
-          label: 'label',
-          data: agreetype
-        })
-      },
-      inscompanyFormatter(row, column) { //协议类型
-        let inscompany = row.inscompany;
-        return CommonUtil.getDataName({
-          dataList: this.global.insCompanyList,
-          value: 'code',
-          label: 'name',
-          data: inscompany
-        })
-      },
-      totalmoenyFormatter(row, column) { //协议类型
-        let inscompany = row.inscompany;
-        return (row.feeamount + row.disamount).toFixed(2);
-      },
-      //-- formatter end--
-	  
-	  queryEsmInfo(){
-		  if(this.queryForm.date != null ){
-			var startdate =formatWithSeperator(this.queryForm.date[0],'-',':').split(' ')[0];
-			var enddate = formatWithSeperator(this.queryForm.date[1],'-',':').split(' ')[0];
-			this.pageRequest.columnFilters.startdate.value = startdate;
-			this.pageRequest.columnFilters.enddate.value = enddate;
-		  }else{
-			this.pageRequest.columnFilters.startdate.value = '';
-			this.pageRequest.columnFilters.enddate.value = '';
-		  }
-		  this.pageRequest.columnFilters.userid.value = this.queryForm.userid;
-		  this.pageRequest.columnFilters.applyno.value = this.queryForm.applyno;
-		  
-		  this.pageRequest.pageNum = 1;
-		  this.findPage();
-	  		  
-	  },
-
-
-      //--数据字典 begin --
       getDictItems: function(typeName) {
         let that = this;
-        that.$api.dict.findByLableName(typeName)
+        this.$api.insCompany.dicType(typeName)
           .then(function(res) {
-            that[typeName + "options"] = res.data; // 把获取到的数据赋给this.data
+            that[typeName + "options"] = res.data.ddList; // 把获取到的数据赋给this.data
           })
           .catch(function(error) {
             that[typeName + "options"] = [];
           });
       },
-      //--数据字典 end --
-
       // 右侧列表的方法Start
       findPage(data) {
         // 获取分页数据
@@ -193,13 +102,25 @@
           this.pageRequest.pageNum = data.pageRequest.pageNum;
           this.pageRequest.pageSize = data.pageRequest.pageSize;
         }
-        that.$api.task.payApplyFindPage(that.pageRequest)
+        that.$api.task.payqueryPage ({...this.pageRequest,...this.queryForm})
           .then(res => {
-            console.log(res.data)
-            that.pageResult = res.data;
+            if(res.code==200){
+              that.pageResult = res.data;
+            }  
           })
           .then(data != null ? data.callback : "");
       },
+      handleButton2({row,index}) {
+        this.$api.task.AmountReview(row).then(res => {
+          if(res.code==200){
+            this.$message({
+              type: 'success',
+              message: res.msg
+            });
+            this.findPage()
+          }
+        })
+      },
       handleButton3({row,index}) {
         let auditid = Cookies.get('user') // 放置token到Cookie
         let auditname = Cookies.get('name') // 放置token到Cookie
@@ -258,33 +179,4 @@
 
 
 <style scoped>
-  .el-divider {
-    margin: 10px 0px 15px !important;
-  }
-
-  .queryForm .el-row {
-    margin: 0px;
-  }
-
-  .queryForm .el-form-item {
-    margin-bottom: 0px;
-  }
-  .queryForm{
-      background: #F2F7FC;
-      position:relative;
-      border:1px solid #ddd;
-      border-radius: 10px;
-      margin-top: 15px;
-      margin-bottom: 15px;
-      padding: 10px 20px 0;
-  }
-  .queryForm:before{
-      content:attr(title);
-      position:absolute;
-      left:10%;
-      transform:translate(-50%,-120%);
-      /* -webkit-transform:translate(-50%,-50%); */
-      padding:0 10px;
-      background-color:#fff;
-  }
 </style>

src/views/FinancialManagement/AcountWithdrawal/BalanceWithdrawalpaid.vue

@@ -1,34 +1,19 @@
 <template>
 	<div>
 		<el-main ref="elMain" style="padding: 0px;">
-		  <!-- 搜索区域Start -->
-      <div class="queryForm" title="检索区" style="padding-top:10px;padding-left:15px;">
-        <el-form size="mini" ref="queryForm" :model="queryForm" label-width="120px">
-          <el-row>
-            <el-col :span="6" style="height: 40px;">
-              <el-form-item label="业务员工号">
-                <el-input clearable placeholder="业务员工号" v-model="queryForm.userid"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6" style="height: 40px;">
-              <el-form-item label="提现单号">
-                <el-input clearable placeholder="提现单号" v-model="queryForm.applyno"></el-input>
-              </el-form-item>
-            </el-col>
-      		<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="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" >
-      			  <div class="u-f u-f1 u-f-ajc" style="background: #409EFF;color:#fff">查询</div>
-      		  </div>
-      		</el-col>
-          </el-row>
-        </el-form>
-      </div>
-
+      <el-row>
+    <el-form :inline="true" :model="queryForm" class="demo-form-inline"  label-width="130px" size="small">
+  <el-form-item label="业务员工号">
+    <el-input v-model="queryForm.userId" placeholder="业务员工号" clearable></el-input>
+  </el-form-item>
+  <el-form-item label="提现单号">
+    <el-input v-model="queryForm.id" placeholder="提现单号" clearable></el-input>
+  </el-form-item>
+  <el-form-item>
+    <el-button type="primary"  size="small" @click="findPage">查询</el-button>
+  </el-form-item>
+</el-form>
+  </el-row>
        <kt-common-table permsDelete="sys:user:delete"  :showBatchDelete="false"  :showBatchPrint="true"   permsButton3="sys:user:edit" :data="pageResult" :columns="columns" @findPage="findPage" :showOperation="false" @handlePrint="handlePrint">
         </kt-common-table>
 		</el-main>
@@ -54,63 +39,26 @@
         pageRequest: {  //查询的默认条件
           pageNum: 1,
           pageSize: 10,
-          columnFilters: {
-            "applystatus": {
-              "name": "applystatus",
-              "value": "2"
-            },
-            "applytype": {
-              "name": "applytype",
-              "value": "A"
-            },
-			"applyno": {
-			  "name": "applyno",
-			  "value": ""
-			},
-			"userid": {
-			  "name": "userid",
-			  "value": ""
-			},
-			"startdate": {
-			  "name": "startdate",
-			  "value": ""
-			},
-			"enddate": {
-			  "name": "enddate",
-			  "value": ""
-			}
-          }
+          auditingStatus:'3'
         },
-        columns:[ //数据列
-          {prop: "applyno",label: "提现单号",minWidth: 120},
-          {prop: "userid",label: "业务员工号",minWidth: 100},
-          {prop: "username",label: "业务员姓名",minWidth: 100},
-          {prop: "deptid",label: "机构代码",minWidth: 100},
-          {prop: "deptname",label: "机构名称",minWidth: 100},
-          {prop: "accountbalance",label: "可提现账户余额",minWidth: 100},
-          {prop: "applyamount",label: "提现金额",minWidth: 100},
-          {prop: "balance",label: "账户余额",minWidth: 100},
-          {prop: "disrate",label: "服务费",minWidth: 100},
-
-          {prop: "bankname",label: "开户行",minWidth: 100},
-          {prop: "accountno",label: "账号",minWidth: 100},
-          {prop: "createtime",label: "提现时间",minWidth: 100},
-          {prop: "updatetime",label: "审核到账时间",minWidth: 100},
-          {prop: "auditid",label: "审核人id",minWidth: 100},
-          {prop: "auditname",label: "审核人名称",minWidth: 100},
-          {prop: "qqq",label: "提现状态",minWidth: 100,formatter:this.statusFormatter}
+        columns: [ //数据列
+          {prop: "id",label: "提现单号"},
+          {prop: "userId",label: "业务员工号"},
+          {prop: "userName",label: "业务员姓名"},
+          {prop: "deptId",label: "机构代码",},
+          {prop: "deptName",label: "机构名称"},
+          {prop: "userAmount ",label: "可提现账户余额",},
+          {prop: "amount",label: "提现金额"},
+          {prop: "surplusAmount",label: "账户余额",},
+          {prop: "bankAccount",label: "开户行"},
+          {prop: "bankNumber",label: "账号",},
+          {prop: "createTime",label: "提现时间"}
         ],
-        //------------协议下拉框数据   begin-----------------
-        agreementtypeoptions: [], //协议类型
-        //------------协议下拉框数据   end-----------------
 			};
 		},
     created() {
-        //获取所有下拉框数据
-        this.getDictItems("agreementtype");
     },
 	mounted() {
-
 	},
 	methods: {
 		handlePrint(){
@@ -133,40 +81,6 @@
       statusFormatter(row, column) { //协议类型
           return "提现成功"
       },
-      //-- formatter end--
-	  
-	  queryEsmInfo(){
-		  if(this.queryForm.date != null ){
-			var startdate =formatWithSeperator(this.queryForm.date[0],'-',':').split(' ')[0];
-			var enddate = formatWithSeperator(this.queryForm.date[1],'-',':').split(' ')[0];
-			this.pageRequest.columnFilters.startdate.value = startdate;
-			this.pageRequest.columnFilters.enddate.value = enddate;
-		  }else{
-			this.pageRequest.columnFilters.startdate.value = '';
-			this.pageRequest.columnFilters.enddate.value = '';
-		  }
-		  this.pageRequest.columnFilters.userid.value = this.queryForm.userid;
-		  this.pageRequest.columnFilters.applyno.value = this.queryForm.applyno;
-		  
-		  this.pageRequest.pageNum = 1;
-		  this.findPage();
-	  		  
-	  },
-
-
-      //--数据字典 begin --
-      getDictItems: function(typeName) {
-        let that = this;
-        that.$api.dict.findByLableName(typeName)
-          .then(function(res) {
-            that[typeName + "options"] = res.data; // 把获取到的数据赋给this.data
-          })
-          .catch(function(error) {
-            that[typeName + "options"] = [];
-          });
-      },
-      //--数据字典 end --
-
       // 右侧列表的方法Start
       findPage(data) {
         // 获取分页数据
@@ -175,10 +89,11 @@
          this.pageRequest.pageNum = data.pageRequest.pageNum;
          this.pageRequest.pageSize = data.pageRequest.pageSize;
        }
-       that.$api.task.payApplyFindPage(that.pageRequest)
+       that.$api.task.payqueryPage ({...this.pageRequest,...this.queryForm})
          .then(res => {
-           console.log(res.data)
-           that.pageResult = res.data;
+          if(res.code==200){
+            that.pageResult = res.data;
+          }         
          })
          .then(data != null ? data.callback : "");
       }
@@ -191,29 +106,4 @@
   .el-divider{
     margin: 10px 0px 15px!important;
   }
-  .queryForm .el-row {
-    margin:0px;
-  }
-
-  .queryForm .el-form-item {
-    margin-bottom: 0px;
-  }
-  .queryForm{
-      background: #F2F7FC;
-      position:relative;
-      border:1px solid #ddd;
-      border-radius: 10px;
-      margin-top: 15px;
-      margin-bottom: 15px;
-      padding: 10px 20px 0;
-  }
-  .queryForm:before{
-      content:attr(title);
-      position:absolute;
-      left:10%;
-      transform:translate(-50%,-120%);
-      /* -webkit-transform:translate(-50%,-50%); */
-      padding:0 10px;
-      background-color:#fff;
-  }
 </style>

src/views/ServiceManagement/AnnualInspection/OrderInquiry.vue

@@ -0,0 +1,67 @@
+<template>
+  <div>
+  <el-row>
+    <el-form :inline="true" :model="formInline" class="demo-form-inline"  label-width="130px" size="small">
+  <el-form-item label="车牌号">
+    <el-input v-model="formInline.licenseNo" placeholder="车牌号"></el-input>
+  </el-form-item>
+  <el-form-item label="联系人">
+    <el-input v-model="formInline.contactPerson" placeholder="联系人"></el-input>
+  </el-form-item>
+  <el-form-item>
+    <el-button type="primary" @click="findPage">查询</el-button>
+  </el-form-item>
+</el-form>
+  </el-row>
+  <kt-common-table
+    :tableHeights="700"
+    :showOperation="false"
+    :SerialShow="false"
+    :data="pageResult"
+    :columns="columns"
+    @findPage="findPage"
+  ></kt-common-table>
+</div>
+</template>
+<script>
+import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
+export default {
+  components: {
+    KtCommonTable
+  },
+  data() {
+    return {
+      pageRequest: {
+        pageNum: 1,
+        pageSize: 20
+      },
+      formInline:{},
+      pageResult: [],
+      columns: [
+        //数据列
+        { prop: "licenseNo", label: "车牌号",  },
+        { prop: "contactPerson", label: "联系人",},
+        { prop: "mobile", label: "联系人电话" },
+        { prop: "address", label: "地址" },
+        { prop: "detailAddress", label: "详细地址" },
+        { prop: "servicePrice", label: "服务价格" },
+        { prop: "testPriceNotIncluded", label: "服务价格(不包含检测费用)" },
+        { prop: "createTime", label: "创建时间" },
+      ]
+    };
+  },
+  methods: {
+    findPage(data) {
+      if (data && data.pageRequest) {
+        this.pageRequest.pageNum = data.pageRequest.pageNum;
+        this.pageRequest.pageSize = data.pageRequest.pageSize;
+      }
+      this.$api.one.annualAuditOrderPage({...this.pageRequest,...this.formInline}).then(res => {
+        if(res.code==200){
+          this.pageResult = res.data;
+        }
+      });
+    }
+  }
+};
+</script>

src/views/ServiceManagement/OneClickRescue/OrderInquiry.vue

@@ -0,0 +1,102 @@
+<template>
+  <div>
+  <el-row>
+    <el-form :inline="true" :model="formInline" class="demo-form-inline"  label-width="130px" size="small">
+  <el-form-item label="车牌号">
+    <el-input v-model="formInline.licencePlate" placeholder="车牌号" clearable></el-input>
+  </el-form-item>
+  <el-form-item label="救援起点">
+    <el-input v-model="formInline.rescueStarting" placeholder="救援起点" clearable></el-input>
+  </el-form-item>
+  <el-form-item label="救援终点">
+    <el-input v-model="formInline.rescuePosition" placeholder="救援终点" clearable></el-input>
+  </el-form-item>
+  <el-form-item label="订单状态">
+    <el-select v-model="formInline.orderState" placeholder="订单状态" clearable>
+      <el-option  v-for="val in oderStateoptions" :key="val.label" :label="val.dictTag" :value="val.dictValue" ></el-option>
+    </el-select>
+  </el-form-item>
+  <el-form-item label="服务类型">
+    <el-select v-model="formInline.serveCode" placeholder="服务类型" clearable>
+      <el-option  v-for="val in rescueTypeoptions" :key="val.label" :label="val.dictTag" :value="val.dictValue" ></el-option>
+    </el-select>
+  </el-form-item>
+  <el-form-item>
+    <el-button type="primary" @click="findPage">查询</el-button>
+  </el-form-item>
+</el-form>
+  </el-row>
+  <kt-common-table
+    :tableHeights="700"
+    :showOperation="false"
+    :SerialShow="false"
+    :data="pageResult"
+    :columns="columns"
+    @findPage="findPage"
+  ></kt-common-table>
+</div>
+</template>
+<script>
+import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
+export default {
+  components: {
+    KtCommonTable
+  },
+  data() {
+    return {
+      pageRequest: {
+        pageNum: 1,
+        pageSize: 20
+      },
+      formInline:{},
+      pageResult: [],
+      columns: [
+        //数据列
+        { prop: "id", label: "订单ID",},
+        { prop: "licencePlate", label: "车牌号",  },
+        { prop: "orderState", label: "订单状态" },
+        {
+          prop: "phoneNumber",
+          label: "联系人电话",
+        },
+        { prop: "rescueStarting", label: "救援起点" },
+        { prop: "rescuePosition", label: "救援终点" },
+        { prop: "rescueScene", label: "救援场景" },
+        { prop: "rescueSum", label: "救援金额" },
+        { prop: "rescueUser", label: "救援联系人" },
+        { prop: "serveCode", label: "服务类型" },
+      ],
+      oderStateoptions:[],
+      rescueTypeoptions:[],
+    };
+  },
+  created() {
+      //获取所有下拉框数据
+      this.getDictItems("oderState");
+      this.getDictItems("rescueType");
+    },
+  methods: {
+    getDictItems: function(typeName) {
+        let that = this;
+        this.$api.insCompany.dicType(typeName)
+          .then(function(res) {
+            that[typeName + "options"] = res.data.ddList; // 把获取到的数据赋给this.data
+          })
+          .catch(function(error) {
+            that[typeName + "options"] = [];
+          });
+      },
+    findPage(data) {
+      if (data && data.pageRequest) {
+        this.pageRequest.pageNum = data.pageRequest.pageNum;
+        this.pageRequest.pageSize = data.pageRequest.pageSize;
+      }
+      this.$api.one.rescueOrderPage({...this.pageRequest,...this.formInline}).then(res => {
+        if(res.code==200){
+          this.pageResult = res.data;
+        }
+      });
+    }
+  }
+};
+</script>