diff --git a/src/views/charge-query/index.vue b/src/views/charge-query/index.vue
index dbbd9f4d18279feffdbc07d8ad5da6d5748d3262..0b72cfb387395303b43072b65e4bcdcb636182a8 100644
--- a/src/views/charge-query/index.vue
+++ b/src/views/charge-query/index.vue
@@ -2,27 +2,30 @@
   <!-- 收费查询-账单查询 -->
   <div class="white_bg burt-container custom-info">
     <!-- form -->
+    {{form}}
     <a-form-model ref="form" layout="vertical" :model="form">
       <a-row :gutter="30">
-        <a-col :xl="6" :lg="6" :sm="12">
+        <a-col :xl="4" :lg="6" :sm="12">
           <a-form-model-item label="病历号">
             <a-input
-              v-model="form.patientno"
+              v-model="form.patientNo"
               placeholder="请输入病历号"
+              allow-clear
             ></a-input>
           </a-form-model-item>
         </a-col>
-        <a-col :xl="6" :lg="6" :sm="12">
+        <a-col :xl="4" :lg="6" :sm="12">
           <a-form-model-item label="客户姓名">
             <a-input
-              v-model="form.patientname"
+              v-model="form.patientName"
               placeholder="请输入客户姓名"
+               allow-clear
             ></a-input>
           </a-form-model-item>
         </a-col>
         <a-col :xl="4" :lg="6" :sm="12">
           <a-form-model-item label="客户类型">
-            <a-select v-model="form.patientType" placeholder="请选择客户类型">
+            <a-select v-model="form.patientType" placeholder="请选择客户类型" allowClear>
               <a-select-option
                 v-for="item in patientTypeOptions"
                 :key="item.code"
@@ -35,7 +38,7 @@
         </a-col>
         <a-col :xl="4" :lg="6" :sm="12">
           <a-form-model-item label="保险公司">
-            <a-select v-model="form.payorId" placeholder="请选择保险公司">
+            <a-select v-model="form.payorId" placeholder="请选择保险公司" allowClear>
               <a-select-option
                 v-for="item in companyOptions"
                 :key="item.corpCode"
@@ -48,7 +51,7 @@
         </a-col>
         <a-col :xl="4" :lg="6" :sm="12">
           <a-form-model-item label="看诊医生">
-            <a-select v-model="form.doctorCode" placeholder="请选择看诊医生">
+            <a-select v-model="form.doctorCode" placeholder="请选择看诊医生" allowClear>
               <a-select-option
                 v-for="item in doctorOptions"
                 :key="item.code"
@@ -61,25 +64,27 @@
         </a-col>
         <a-col :xl="5" :lg="6" :sm="12">
           <a-form-model-item label="就诊时间">
-            <a-range-picker @change="onSelectVisitTime" />
+            <a-range-picker format="YYYY-MM-DD" v-model="form.dateRange" :placeholder="['开始时间','结束时间']"  @change="onSelectVisitTime" />
           </a-form-model-item>
         </a-col>
         <a-col :xl="3" :lg="6" :sm="12">
           <a-form-model-item label="支付方式">
-            <a-select v-model="form.paymentCode" placeholder="请选择支付方式">
+            <a-select v-model="form.paymentCode" placeholder="请选择支付方式" allowClear>
               <a-select-option
                 v-for="item in paymentOptions"
                 :key="item.code"
                 :value="item.code"
+                 allow-clear
               >
                 {{ item.name }}
               </a-select-option>
             </a-select>
           </a-form-model-item>
         </a-col>
-        <a-col :xl="18" :lg="18" :sm="12" class="none-label">
+        <a-col :xl="12" :lg="12" :sm="12" class="none-label">
           <a-form-model-item label="button">
-            <a-button type="primary" @click="addNewCharge">
+            <a-button>更新数据</a-button>
+            <a-button class="mar-left10" type="primary" @click="addNewCharge">
               <Icon name="ssiadd" :size="14" />新建预授权</a-button
             >
             <a-button class="mar-left10" type="primary" @click="handlerReset">
@@ -97,7 +102,7 @@
     <a-table
       :columns="columns"
       :data-source="dataList"
-      row-key="patientno"
+      row-key="patientNo"
       :scroll="{ x: true }"
       :pagination="false"
       :customRow="handlerRowClick"
@@ -138,26 +143,25 @@ export default {
         dataIndex: "id",
         width: 120,
       },
-      { title: "就诊状态", dataIndex: "", width: 180 },
-      { title: "收费时间", dataIndex: "", width: 180 },
+      { title: "收费时间", dataIndex: "receiptDate", width: 180 },
       {
         title: "病历号",
-        dataIndex: "patientno",
+        dataIndex: "patientNo",
         width: 180,
         customRender: (val, row) => {
           if (row.isEdit) {
-            return <a-input v-model={row.patientno}></a-input>;
+            return <a-input v-model={row.patientNo}></a-input>;
           }
           return val;
         },
       },
       {
         title: "客户姓名",
-        dataIndex: "patientname",
+        dataIndex: "patientName",
         width: 120,
         customRender: (val, row) => {
           if (row.isEdit) {
-            return <a-input v-model={row.patientname}></a-input>;
+            return <a-input v-model={row.patientName}></a-input>;
           }
           return val;
         },
@@ -167,17 +171,17 @@ export default {
       { title: "就诊时间", dataIndex: "visitTime", width: 180 },
       { title: "就诊医生", dataIndex: "doctorName", width: 180 },
       { title: "账单金额", dataIndex: "actualamount", width: 180 },
-      { title: "折扣（%）", dataIndex: "", width: 180 },
+      { title: "折扣（%）", dataIndex: "discountAmount", width: 180 },
 
       { title: "折后金额", dataIndex: "discountamount", width: 180 },
       { title: "客户自付", dataIndex: "chargeamount", width: 180 },
       { title: "减免金额", dataIndex: "reduceamount", width: 180 },
       { title: "理赔金额", dataIndex: "paidamount", width: 180 },
-      { title: "保险已支付", dataIndex: "", width: 180 },
-      { title: "未清余额", dataIndex: "", width: 180 },
-      { title: "保险欠费", dataIndex: "", width: 180 },
-      { title: "个人欠费", dataIndex: "", width: 180 },
-      { title: "发票号码", dataIndex: "receiptno", width: 180 },
+      { title: "保险已支付", dataIndex: "insurancePaidAmount", width: 180 },
+      { title: "未清余额", dataIndex: "outstandAmount", width: 180 },
+      { title: "保险欠费", dataIndex: "insuranceArrearsAmount", width: 180 },
+      { title: "个人欠费", dataIndex: "personalArrearsAmount", width: 180 },
+      { title: "发票号码", dataIndex: "receiptNo", width: 180 },
       {
         title: "操作",
         key: "operation",
@@ -191,8 +195,8 @@ export default {
       form: {},
       pageForm: {
         doctorCode: "",
-        patientname: "",
-        patientno: "",
+        patientName: "",
+        patientNo: "",
         paymentCode: "",
         payorId: 0,
         visitTimeEnd: "",
@@ -204,7 +208,9 @@ export default {
           code: 1,
         },
       ], //客户类型
-      companyOptions: [], //保险公司
+      companyOptions: [
+
+      ], //保险公司
       doctorOptions: [
         {
           name: "医生1",