diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 9fce327..6356dcd 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -614,7 +614,13 @@
       <MergeAsbitem :id="form.id" :organizationUnitId="form.organizationUnitId" :brushTimes="brushTimes" />
     </el-dialog>
 
-
+    <!-- 收费 -->
+    <el-dialog title="" :visible.sync="chargeVisible" :close-on-click-modal="false"
+      :append-to-body="true" fullscreen @close="closeDialogCharge">
+      <div style="margin-top: -30px;">
+        <Charge :patientRegisterNo="chargePatientRegisterNo"/>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -628,6 +634,7 @@ import Camera from "./Camera.vue";
 import PatientRegisterItem from "./PatientRegisterItem.vue";
 import LisRequest from "./LisRequest.vue";
 import MergeAsbitem from "./MergeAsbitem.vue";
+import Charge from "../../views/charge/charge.vue";
 
 export default {
   components: {
@@ -635,6 +642,7 @@ export default {
     LisRequest,
     MergeAsbitem,
     PatientRegisterItem,
+    Charge,
   },
   props: ['formInitData', 'editTimes'],
   data() {
@@ -735,6 +743,9 @@ export default {
       registerChoosed:{},
 
       dialogCamera: false, //拍照组件
+
+      chargeVisible:false, //用于收费
+      chargePatientRegisterNo:'',  //对哪个条码客户收费 
     };
   },
 
@@ -1288,7 +1299,7 @@ export default {
                 objCopy(res.data, this.form);
 
                 // this.patientRegister.prList.push(res.data);  //列表添加记录
-                this.patientRegister.patientRegisterId = res.data.id;     
+                this.patientRegister.patientRegisterId = res.data.id;
                 objCopy(this.form, this.patientRegister.patientRegisterRd); 
 
                 //this.patientRegister.query.times++; 不在触发列表查询（换成局部刷新）放在窗口关闭事件中去
@@ -1318,7 +1329,7 @@ export default {
               // let lfind = arrayExistObj(this.patientRegister.prList, 'id', this.form.id)
               // if(lfind > - 1) objCopy(this.form,this.patientRegister.prList[lfind])
 
-              //this.patientRegister.saveTimes++;  //更新保存时，无需触发组合项目保存
+              this.patientRegister.saveTimes++;  //更新保存时，无需触发组合项目保存
             }
           });
         }
@@ -1624,8 +1635,25 @@ export default {
     },
 
     toCharge(patientRegisterNo) {
-      this.patientRegister.patientRegisterRd.patientRegisterNo = patientRegisterNo;
-      this.$router.push({ path: "/charge" });
+      if(!patientRegisterNo){
+        this.$message.warning("请先保存人员信息！")
+        return
+      }
+
+      //多次重复点击时，刷新处理
+      this.chargePatientRegisterNo = ''
+      setTimeout(() => { 
+        this.chargePatientRegisterNo = patientRegisterNo
+      }, 100)
+            
+      //this.$router.push({ path: "/charge" });
+      this.chargeVisible = true
+
+    },
+
+    //关闭收费窗口时，刷新收费状态信息
+    closeDialogCharge(){
+      this.getPatientRegisterAbs(this.form.id)
     },
 
   },
diff --git a/src/views/charge/charge.vue b/src/views/charge/charge.vue
index 29cb703..a36043d 100644
--- a/src/views/charge/charge.vue
+++ b/src/views/charge/charge.vue
@@ -24,7 +24,7 @@
                 <el-radio label="Y">已收费</el-radio>
                 <el-radio label="B">已退费</el-radio>
               </el-radio-group>
-              <div style="margin-left:20px;">
+              <div v-if="query.chargeFlag != 'N'" style="margin-left:20px;">
                 <span>发票号</span>
                 <el-input placeholder="发票/收据号" v-model="query.invoiceNo" size="small" style="width: 100px;" clearable
                   @change="Query('invoiceNo')" />
@@ -33,7 +33,7 @@
           </div>
           <!-- 列表 -->
           <div class="prListDivClass">
-            <el-table :data="patientList" border highlight-current-row
+            <el-table :data="patientList" border highlight-current-row ref="patientList"
               :height="(window.pageHeight > 600 ? (window.pageHeight - 230) : 370)" @row-click="rowClick" size="small">
               <!--  
                 <el-table-column prop="patientRegisterId" label="体检记录ID" />
@@ -96,7 +96,7 @@
           <!-- 收费信息  -->
           <div class="prListDivClass">
             <!-- charge  -->
-            <div style="height:103px;">
+            <div style="height:148px;">
               <el-form ref="form" :model="form" label-width="80px" :rules="rules" size="small"
                 :disabled="query.chargeFlag != 'N'">
                 <el-row>
@@ -247,10 +247,11 @@ export default {
     PatientRegisterQuery,
     PatientRegisterRefuseList,
   },
+  props:["patientRegisterNo"],
   data() {
     return {
       query: {
-        chargeFlag: 'N',
+        chargeFlag: 'N',  // N:未收费，Y：已收费，B：已退费
         dateRange: null,
         startDate: null,
         endDate: null,
@@ -280,37 +281,37 @@ export default {
         ],
       },
 
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "最近一周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-        ],
-      },
+      // pickerOptions: {
+      //   shortcuts: [
+      //     {
+      //       text: "最近一周",
+      //       onClick(picker) {
+      //         const end = new Date();
+      //         const start = new Date();
+      //         start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+      //         picker.$emit("pick", [start, end]);
+      //       },
+      //     },
+      //     {
+      //       text: "最近一个月",
+      //       onClick(picker) {
+      //         const end = new Date();
+      //         const start = new Date();
+      //         start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+      //         picker.$emit("pick", [start, end]);
+      //       },
+      //     },
+      //     {
+      //       text: "最近三个月",
+      //       onClick(picker) {
+      //         const end = new Date();
+      //         const start = new Date();
+      //         start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+      //         picker.$emit("pick", [start, end]);
+      //       },
+      //     },
+      //   ],
+      // },
       chargePays: [],  //收支方式
       chargePaysInit: [],  //收支方式(初始状态)
       asbItemsForFee: [],  //待收费项目
@@ -321,18 +322,16 @@ export default {
   },
 
   created() {
-    this.dictInit();
-    this.query.patientRegisterNo = this.patientRegister.patientRegisterRd.patientRegisterNo;    
+    this.dictInit();    
   },
 
   //挂载完成
   mounted() {
-    if(this.query.patientRegisterNo){
+    if(this.patientRegisterNo){
       this.Query('patientRegisterNo');
     }else{
       this.Query();
-    }
-    
+    }    
   },
 
   computed: {
@@ -346,8 +345,8 @@ export default {
 
     //查询人员列表数据
     Query(type) {
-      let url = '', body = {};
-      console.log('query', type, this.query);
+      let url = '', ltype = type,body = {};
+      
 
       // {
       //   "skipCount": 2147483647,
@@ -360,13 +359,22 @@ export default {
       //   "endDate": "string",
       //   "maxResultCount": 0
       // }
-      if (type == 'patientRegisterNo') {
+              
+      if(this.patientRegisterNo){
+        this.query.patientRegisterNo = this.patientRegisterNo
+        ltype = 'patientRegisterNo'
+      }
+      
+
+      console.log('query', ltype, this.query,this.patientRegisterNo);
+
+      if (ltype == 'patientRegisterNo') {
         if (!this.query.patientRegisterNo) return;
         body = { patientRegisterNo: this.query.patientRegisterNo };
-      } else if (type == 'patientNo') {
+      } else if (ltype == 'patientNo') {
         if (!this.query.patientNo) return;
         body = { patientNo: this.query.patientNo };
-      } else if (type == 'invoiceNo' && this.query.chargeFlag != 'N') {
+      } else if (ltype == 'invoiceNo' && this.query.chargeFlag != 'N') {
         if (!this.query.invoiceNo) return;
         body = { invoiceNo: this.query.invoiceNo };
       } else {
@@ -402,12 +410,17 @@ export default {
         background: 'rgba(0, 0, 0, 0.7)'
       });
       postapi(url, body).then(res => {
+        console.log(url,body,res)
         if (res.code != - 1) {
           this.patientList = res.data.items;
-          if (this.patientList.length > 0) {
-            this.query.patientRegisterNo = this.patientList[0].patientRegisterNo;
-            this.query.patientName = this.patientList[0].patientName;
-            this.query.patientNo = this.patientList[0].patientNo;
+          if (this.patientList.length == 1 && this.query.chargeFlag == 'N') {
+            // this.query.patientRegisterNo = this.patientList[0].patientRegisterNo;
+            // this.query.patientName = this.patientList[0].patientName;
+            // this.query.patientNo = this.patientList[0].patientNo;
+            this.rowClick(this.patientList[0])
+            setTimeout(() => { 
+              this.$refs['patientList'].setCurrentRow(this.patientList[0]) 
+            }, 100)
           }
         }
         loading.close();
@@ -425,7 +438,7 @@ export default {
       this.query.patientNo = row.patientNo;
 
       this.chargePays = deepCopy(this.chargePaysInit);
-      //console.log(this.chargePays, this.chargePaysInit);
+      console.log(this.chargePays, this.chargePaysInit);
 
       if (this.query.chargeFlag == 'B') {
         this.form.chargeFlag = '1';
@@ -524,7 +537,7 @@ export default {
     //获取收费单包含的组合项目
     getChargeAsbByChargeid(ChargeId) {
       this.asbItemsForFee = [];
-      getapi(`/api/app/chargeasbitem/getchargeasbiteminchargeid?ChargeId=${ChargeId}`).then(res => {
+      getapi(`/api/app/chargeasbitem/getchargeasbiteminchargeid?ChargeId=${ChargeId}`).then(res => { 
         if (res.code != - 1) {
           res.data.forEach(e => {
             this.asbItemsForFee.push({
@@ -946,6 +959,9 @@ export default {
 
     //数据初始化
     dictInit() {
+      
+      this.query.startDate = new Date()
+      this.query.endDate = this.query.startDate
 
       //性别（仅档案用）
       getapi("/api/app/sex").then((res) => {
@@ -1073,7 +1089,19 @@ export default {
 
   //监听事件()
   watch: {
-
+    "patientRegisterNo":{
+      immediate: true, // 立即执行
+      // deep: true, // 深度监听复杂类型内变化
+      handler(newVal,oldVal){
+        console.log('watch:patientRegisterNo:',newVal,oldVal)
+        if(newVal != oldVal){
+          if(newVal){
+            this.query.patientRegisterNo = newVal
+            this.Query("patientRegisterNo")
+          }         
+        }
+      }
+    },
   },
 };
 </script>