diff --git a/src/components/patientRegister/PatientRegisterRecoverList.vue b/src/components/patientRegister/PatientRegisterRecoverList.vue
index 5b6421c..7db4a98 100644
--- a/src/components/patientRegister/PatientRegisterRecoverList.vue
+++ b/src/components/patientRegister/PatientRegisterRecoverList.vue
@@ -31,12 +31,12 @@
             <div>{{ scope.row.customerOrgParentName == scope.row.customerOrgName ? "" : scope.row.customerOrgName }}</div>
           </template>
         </u-table-column>
-        <u-table-column prop="patientName" label="姓名" />
-        <u-table-column prop="sexName" label="性别">
+        <u-table-column prop="patientName" label="姓名" sortable/>
+        <u-table-column prop="sexName" label="性别" sortable>
         </u-table-column>
-        <u-table-column prop="age" label="年龄" />
-        <u-table-column prop="patientRegisterNo" label="条码号" width="150" />
-        <u-table-column prop="patientNo" label="档案号" />
+        <u-table-column prop="age" label="年龄" sortable/>
+        <u-table-column prop="patientRegisterNo" label="条码号" width="150" sortable/>
+        <u-table-column prop="patientNo" label="档案号" sortable/>
         <u-table-column prop="medicalTimes" label="体检次数"></u-table-column>
         <u-table-column label="分组/套餐" width="150">
           <template slot-scope="scope">
@@ -48,43 +48,43 @@
             </div>
           </template>
         </u-table-column>
-        <u-table-column prop="nationName" label="民族">
+        <u-table-column prop="nationName" label="民族" sortable>
         </u-table-column>
-        <u-table-column prop="idNo" label="身份证" width="150" />
-        <u-table-column prop="birthDate" label="出生日期" width="100">
+        <u-table-column prop="idNo" label="身份证" width="150" sortable/>
+        <u-table-column prop="birthDate" label="出生日期" width="100" sortable>
           <template slot-scope="scope">
             <div v-if="scope.row.birthDate">
               {{ lmoment(scope.row.birthDate, "yyyy-MM-DD") }}
             </div>
           </template>
         </u-table-column>
-        <u-table-column prop="email" label="邮箱" width="100" />
-        <u-table-column prop="mobileTelephone" label="手机" width="100" />
-        <u-table-column prop="telephone" label="电话" width="100" />
-        <u-table-column prop="address" label="地址" width="300" />
-        <u-table-column prop="medicalCardNo" label="体检卡号" />
-        <u-table-column prop="jobCardNo" label="工卡号" />
-        <u-table-column prop="maritalStatusName" label="婚姻状况">
+        <u-table-column prop="email" label="邮箱" width="100" sortable/>
+        <u-table-column prop="mobileTelephone" label="手机" width="100" sortable/>
+        <u-table-column prop="telephone" label="电话" width="100" sortable/>
+        <u-table-column prop="address" label="地址" width="300" sortable/>
+        <u-table-column prop="medicalCardNo" label="体检卡号" sortable/>
+        <u-table-column prop="jobCardNo" label="工卡号" sortable/>
+        <u-table-column prop="maritalStatusName" label="婚姻状况" sortable>
         </u-table-column>
-        <u-table-column prop="medicalTypeName" label="体检类别">
+        <u-table-column prop="medicalTypeName" label="体检类别" sortable>
         </u-table-column>
-        <u-table-column prop="personnelTypeName" label="人员类别">
+        <u-table-column prop="personnelTypeName" label="人员类别" sortable>
         </u-table-column>
-        <u-table-column prop="jobPost" label="职务" />
-        <u-table-column prop="jobTitle" label="职称" />
-        <u-table-column prop="salesman" label="介绍人" />
-        <u-table-column prop="isVip" label="VIP">
+        <u-table-column prop="jobPost" label="职务" sortable/>
+        <u-table-column prop="jobTitle" label="职称" sortable/>
+        <u-table-column prop="salesman" label="介绍人" sortable/>
+        <u-table-column prop="isVip" label="VIP" sortable>
           <template slot-scope="scope">
             <el-checkbox :value="scope.row.isVip == 'Y'" />
           </template>
         </u-table-column>
-        <u-table-column prop="creatorName" label="登记人" />
-        <u-table-column prop="creationTime" label="登记日期" width="100">
+        <u-table-column prop="creatorName" label="登记人" sortable/>
+        <u-table-column prop="creationTime" label="登记日期" width="100" sortable>
           <template slot-scope="scope">
             <div>{{ lmoment(scope.row.creationTime, "yyyy-MM-DD") }}</div>
           </template>
         </u-table-column>
-        <u-table-column prop="isUpload" label="上传">
+        <u-table-column prop="isUpload" label="上传" sortable>
           <template slot-scope="scope">
             <el-checkbox :value="scope.row.isUpload == 'Y'" />
           </template>
diff --git a/src/components/report/TurnoverReportReal.vue b/src/components/report/TurnoverReportReal.vue
index 1d1244f..9d3eca6 100644
--- a/src/components/report/TurnoverReportReal.vue
+++ b/src/components/report/TurnoverReportReal.vue
@@ -239,6 +239,14 @@ export default {
           }
         })
 
+      // 获取收费员
+      postapi('/api/identity/users/GetUserListBySaleRole', { roleSysParmId: "fee_role_id" })
+        .then(res => {
+          if (res.code > -1) {
+            this.users = res.data
+          }
+        })
+
       //支付方式
       getapi("/api/app/pay-mode").then((res) => {
         if (res.code == 1) {
@@ -246,13 +254,7 @@ export default {
         }
       });
 
-      // 获取用户信息
-      postapi('/api/identity/users/GetListByOperatorType', { operatorTypes: ["0"] })
-        .then(res => {
-          if (res.code > -1) {
-            this.users = res.data
-          }
-        })
+      
 
     },
 
diff --git a/src/views/doctorCheck/sumDoctorCheck.vue b/src/views/doctorCheck/sumDoctorCheck.vue
index 2629f82..559deb7 100644
--- a/src/views/doctorCheck/sumDoctorCheck.vue
+++ b/src/views/doctorCheck/sumDoctorCheck.vue
@@ -438,20 +438,20 @@
         -->
           <div v-show="checkPagePriv(pagePriv.privs, '体检报告')" class="listBtn">
             <el-button type="primary" class="commonbutton" @click="btnReport"
-              :disabled="sumBtnDisabled">体检报告</el-button>
+              :disabled="manBtnDisabled">体检报告</el-button>
           </div>
           <div v-show="checkPagePriv(pagePriv.privs, '复查')" class="listBtn">
-            <el-button type="primary" class="commonbutton" @click="btnReCheck" :disabled="sumBtnDisabled">复查</el-button>
+            <el-button type="primary" class="commonbutton" @click="btnReCheck" :disabled="manBtnDisabled">复查</el-button>
           </div>
           <div v-show="checkPagePriv(pagePriv.privs, '随访')" class="listBtn">
-            <el-button type="primary" class="commonbutton" @click="btnReCall" :disabled="sumBtnDisabled">随访</el-button>
+            <el-button type="primary" class="commonbutton" @click="btnReCall" :disabled="manBtnDisabled">随访</el-button>
           </div>
           <div v-show="false" class="listBtn">
             <el-button type="primary" class="commonbutton" @click="btnIntervene"
-              :disabled="sumBtnDisabled">干预措施</el-button>
+              :disabled="manBtnDisabled">干预措施</el-button>
           </div>
           <div v-show="checkPagePriv(pagePriv.privs, '职业病')" class="listBtn">
-            <el-button type="primary" class="commonbutton" @click="btnOcc" :disabled="sumBtnDisabled">职业病</el-button>
+            <el-button type="primary" class="commonbutton" @click="btnOcc" :disabled="manBtnDisabled">职业病</el-button>
           </div>
           <div class="listBtn">
             <el-button type="primary" class="commonbutton" @click="btnReset">重置</el-button>
@@ -796,7 +796,21 @@ export default {
       }
     },
 
-    // 有人员，无总检
+    // 有人员信息，即可显示的信息
+    manBtnDisabled(){
+      let ret = true
+
+      //' 请选择体检人员'
+      if (!this.patient_register.id) return ret
+      // '人员已锁定，不可执行此操作'
+      if (this.patient_register?.isLock == 'Y') return ret
+
+      ret = false
+
+      return ret
+    },
+    
+    // 有人员，未总检
     sumBtnDisabled() {
       let ret = true
 
diff --git a/src/views/fee-settings/cardBill.vue b/src/views/fee-settings/cardBill.vue
index 8969dfd..58c1389 100644
--- a/src/views/fee-settings/cardBill.vue
+++ b/src/views/fee-settings/cardBill.vue
@@ -4,64 +4,74 @@
       <div class="middlebox">
         <div class="contenttitle">
           收费 /
-          <span class="contenttitleBold"
-            >会员卡记账记录</span
-          >
+          <span class="contenttitleBold">会员卡记账记录</span>
         </div>
       </div>
       <div style="margin-top:7px">
-        <div style="background-color: #fff; padding: 15px; border-radius: 8px;display: flex;flex-wrap: wrap;    margin-bottom: 10px;height:80px;margin-top: 7px;">
-            <div class="query">
-              <span>记账日期：</span>
-              <el-date-picker v-model="query.startDate" type="date" placeholder="起始日期" size="small" value-format="yyyy-MM-dd"/>
-              <span>--</span>
-              <el-date-picker v-model="query.endDate" type="date" placeholder="截止日期" size="small" value-format="yyyy-MM-dd"/>
-            </div>
-            <div class="query">
-              <span>记账标志：</span>
-              <el-select v-model="query.billFlag" placeholder="请选择" filterable clearable size="small">
-                <el-option v-for="item in dict.billFlag" :key="item.id" :label="item.displayName" :value="item.id" />
-              </el-select>
-            </div>
-            <div class="query">
-              <span>支付方式：</span>
-              <el-select v-model="query.payModeIds" placeholder="请选择" filterable clearable size="small" multiple collapse-tags>
-                <el-option v-for="item in dict.payMode" :key="item.id" :label="item.displayName" :value="item.id" />
-              </el-select>
-            </div>
-            <div class="query">
-              <span>卡号：</span>
-              <el-input placeholder="卡号" v-model="query.cardNo" size="small" clearable style="width: 190px"/>
-            </div>
-            <div class="query">
-              <span>卡主姓名：</span>
-              <el-input placeholder="卡主姓名" v-model="query.customerName" size="small" clearable style="width: 190px"/>
-            </div>
-            <div class="query">
-              <span>身份证号：</span>
-              <el-input placeholder="身份证号" v-model="query.idNo" size="small" clearable style="width: 190px"/>
-            </div>
-            <div class="query">
-              <span>电话：</span>
-              <el-input placeholder="手机号/电话" v-model="query.mobileTelephone" size="small" clearable style="width: 190px"/>
-            </div>
-            <div class="query">
+        <div
+          style="background-color: #fff; padding: 15px; border-radius: 8px;display: flex;flex-wrap: wrap;    margin-bottom: 10px;height:80px;margin-top: 7px;">
+          <div class="query">
+            <span>记账日期：</span>
+            <el-date-picker v-model="query.startDate" type="date" placeholder="起始日期" size="small"
+              value-format="yyyy-MM-dd" />
+            <span>--</span>
+            <el-date-picker v-model="query.endDate" type="date" placeholder="截止日期" size="small"
+              value-format="yyyy-MM-dd" />
+          </div>
+          <div class="query">
+            <span>记账标志：</span>
+            <el-select v-model="query.billFlag" placeholder="请选择" filterable clearable size="small">
+              <el-option v-for="item in dict.billFlag" :key="item.id" :label="item.displayName" :value="item.id" />
+            </el-select>
+          </div>
+          <div class="query">
+            <span>支付方式：</span>
+            <el-select v-model="query.payModeIds" placeholder="请选择" filterable clearable size="small" multiple
+              collapse-tags>
+              <el-option v-for="item in dict.payMode" :key="item.id" :label="item.displayName" :value="item.id" />
+            </el-select>
+          </div>
+          <div class="query">
+            <span>卡号：</span>
+            <el-input placeholder="卡号" v-model="query.cardNo" size="small" clearable style="width: 190px" />
+          </div>
+          <div class="query">
+            <span>卡主姓名：</span>
+            <el-input placeholder="卡主姓名" v-model="query.customerName" size="small" clearable style="width: 190px" />
+          </div>
+          <div class="query">
+            <span>身份证号：</span>
+            <el-input placeholder="身份证号" v-model="query.idNo" size="small" clearable style="width: 190px" />
+          </div>
+          <div class="query">
+            <span>电话：</span>
+            <el-input placeholder="手机号/电话" v-model="query.mobileTelephone" size="small" clearable
+              style="width: 190px" />
+          </div>
+          <div class="query">
+            <span>充值员</span>
+            <el-select v-model="query.feeUserIds" placeholder="请选择" style="margin-left: 10px;width: 170px;" filterable
+              clearable size="small" multiple collapse-tags>
+              <el-option v-for="item in users" :key="item.id" :label="item.surname" :value="item.id" />
+            </el-select>
+          </div>
+          <div class="query">
             <el-button class="commonbutton" @click="btnQuery">查询</el-button>
           </div>
         </div>
         <div style="background-color: #fff; padding: 15px; border-radius: 8px;">
           <el-table :data="dataList" width="100%" :height="window.pageHeight < 600 ? 330 : window.pageHeight - 250"
-            row-key="id" highlight-current-row ref="dataList" border show-summary :summary-method="getSummaries">  
-            <el-table-column type="index" label="序号" width="50" align="center"/>           
-            <el-table-column prop="cardNo" label="会员卡号" width="150" align="center"/>            
-            <el-table-column prop="customerName" label="卡主姓名" />            
-            <el-table-column prop="mobileTelephone" label="手机号" align="center"/>
+            row-key="id" highlight-current-row ref="dataList" border show-summary :summary-method="getSummaries">
+            <el-table-column type="index" label="序号" width="50" align="center" />
+            <el-table-column prop="cardNo" label="会员卡号" width="150" align="center" />
+            <el-table-column prop="customerName" label="卡主姓名" />
+            <el-table-column prop="mobileTelephone" label="手机号" align="center" />
             <el-table-column prop="payModeId" label="支付方式" align="center">
               <template slot-scope="scope">
                 <div>{{ dddw(dict.payMode, "id", scope.row.payModeId, "displayName") }}</div>
               </template>
             </el-table-column>
-            <el-table-column prop="billMoney" label="记账金额" align="center"/>
+            <el-table-column prop="billMoney" label="记账金额" align="center" />
             <el-table-column prop="billFlag" label="记账标志" align="center">
               <template slot-scope="scope">
                 <div>{{ dddw(dict.billFlag, "id", scope.row.billFlag, "displayName") }}</div>
@@ -77,13 +87,13 @@
               </template>
             </el-table-column>
             -->
-            <el-table-column prop="lastModifierName" label="修改人员" align="center"/>
-            <el-table-column prop="lastModificationTime" label="修改日期" width="150" align="center">              
+            <el-table-column prop="lastModifierName" label="修改人员" align="center" />
+            <el-table-column prop="lastModificationTime" label="修改日期" width="150" align="center">
             </el-table-column>
           </el-table>
         </div>
       </div>
-    </div>    
+    </div>
   </div>
 </template>
 <script>
@@ -100,26 +110,28 @@ export default {
   data() {
     return {
       query: {
-        startDate:'',
-        endDate:'',
-        billFlag:'',
-        payModeIds:[],
-        cardNo:'',
-        customerName:'',
-        idNo:'',
-        mobileTelephone:''
+        startDate: '',
+        endDate: '',
+        billFlag: '',
+        payModeIds: [],
+        cardNo: '',
+        customerName: '',
+        idNo: '',
+        mobileTelephone: '',
+        feeUserIds: []
       },  //查询条件
-      dataList: [], //列表数据      
+      dataList: [], //列表数据   
+      users: [],
     };
   },
 
   created() {
-    this.query.startDate = moment(new Date()).format("yyyy-MM-DD");  
+    this.query.startDate = moment(new Date()).format("yyyy-MM-DD");
     this.query.endDate = this.query.startDate;
   },
 
   //挂载完成
-  mounted() { 
+  mounted() {
     this.dicInit();
     this.enterToQuery()
   },
@@ -137,38 +149,38 @@ export default {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
     dddw, moment,
 
-       
+
     //查询
     btnQuery(queryType) {
       let body = deepCopy(this.query)
 
       switch (queryType) {
         case 'idNo':
-          if(!this.query.idNo) return;
+          if (!this.query.idNo) return;
           body = { idNo: this.query.idNo };
           break;
         case 'cardNo':
-        if(!this.query.cardNo) return;
+          if (!this.query.cardNo) return;
           body = { cardNo: this.query.cardNo };
           break;
         default:
-          if(this.query.idNo){
+          if (this.query.idNo) {
             body = { idNo: this.query.idNo };
-          }else if(this.query.cardNo){
+          } else if (this.query.cardNo) {
             body = { cardNo: this.query.cardNo };
-          }else{
+          } else {
             // if(!this.query.startDate) this.query.startDate = moment(new Date()).format('yyyy-MM-DD');
             // if(!this.query.endDate) this.query.endDate = moment(new Date()).format('yyyy-MM-DD');
-            if(this.query.startDate > this.query.endDate){
+            if (this.query.startDate > this.query.endDate) {
               this.$message.error("数据不合法，起始日期不能大于截止日期！");
               return;
             }
-            if(!body.cardNo) delete body.cardNo
-            if(!body.billFlag) delete body.billFlag
-            if(!body.customerName) delete body.customerName
-            if(!body.idNo) delete body.idNo
-            if(!body.mobileTelephone) delete body.mobileTelephone
-            if(body?.payModeIds.length == 0) delete body.payModeIds
+            if (!body.cardNo) delete body.cardNo
+            if (!body.billFlag) delete body.billFlag
+            if (!body.customerName) delete body.customerName
+            if (!body.idNo) delete body.idNo
+            if (!body.mobileTelephone) delete body.mobileTelephone
+            if (body?.payModeIds.length == 0) delete body.payModeIds
           }
           break;
       }
@@ -232,13 +244,21 @@ export default {
       return sums;
     },
 
-    dicInit(){
+    dicInit() {
       //支付方式
       getapi("/api/app/pay-mode").then((res) => {
         if (res.code == 1) {
-          this.dict.payMode = res.data;          
+          this.dict.payMode = res.data;
         }
       });
+
+      // 获取收费员
+      postapi('/api/identity/users/GetUserListBySaleRole', { roleSysParmId: "fee_role_id" })
+        .then(res => {
+          if (res.code > -1) {
+            this.users = res.data
+          }
+        })
     },
     //回车替代查询
     enterToQuery() {
@@ -306,48 +326,58 @@ export default {
 @import "../../assets/css/global_form.css";
 @import "../../assets/css/global_input.css";
 @import "../../assets/css/global.css";
+
 ::v-deep .el-input__inner {
   /*text-align: center;*/
   padding-left: 5px;
   padding-right: 25px;
 }
+
 ::v-deep .el-icon-date:before {
-    content: ""
+  content: ""
 }
-.query{
-    margin-right: 15px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    font-size: 14px;
-    color: #232748;
-    font-size: 400;
-    font-family: "NotoSansSC-Regular";
+
+.query {
+  margin-right: 15px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 14px;
+  color: #232748;
+  font-size: 400;
+  font-family: "NotoSansSC-Regular";
 }
+
 .box {
   display: flex;
   flex-direction: column;
 }
+
 :deep .el-form-item {
   margin-bottom: 14px;
 }
+
 /* el-dialog的头部样式 */
 :deep .el-dialog__header {
   padding: 11px 20px 11px;
 }
+
 /* el-dialog的主体样式 */
 :deep .el-dialog__body {
   padding: 0px 20px 0px;
 }
+
 /* el-divider样式 */
 :deep .el-divider--horizontal {
   margin: 0px 0 12px;
 }
+
 /* el-dialog的底部样式 */
 :deep .el-dialog__footer {
   padding: 0px 20px 14px;
 }
-.query:last-child{
+
+.query:last-child {
   margin-right: 0;
 }
 </style>
diff --git a/src/views/fee-settings/cardBillSum.vue b/src/views/fee-settings/cardBillSum.vue
index 86a08e5..f5827cc 100644
--- a/src/views/fee-settings/cardBillSum.vue
+++ b/src/views/fee-settings/cardBillSum.vue
@@ -4,67 +4,77 @@
       <div class="middlebox">
         <div class="contenttitle">
           收费 /
-          <span class="contenttitleBold"
-            >会员卡记账统计</span
-          >
+          <span class="contenttitleBold">会员卡记账统计</span>
         </div>
       </div>
       <div style="margin-top:7px">
-        <div style="background-color: #fff; padding: 15px; border-radius: 8px;display: flex;flex-wrap: wrap;    margin-bottom: 10px;height:80px;margin-top: 7px;">
-            <div class="query">
-              <span>记账日期：</span>
-              <el-date-picker v-model="query.startDate" type="date" placeholder="起始日期" size="small" value-format="yyyy-MM-dd"/>
-              <span>--</span>
-              <el-date-picker v-model="query.endDate" type="date" placeholder="截止日期" size="small" value-format="yyyy-MM-dd"/>
-            </div>
-            <div class="query">
-              <span>记账标志：</span>
-              <el-select v-model="query.billFlag" placeholder="请选择" filterable clearable size="small">
-                <el-option v-for="item in dict.billFlag" :key="item.id" :label="item.displayName" :value="item.id" />
-              </el-select>
-            </div>
-            <div class="query">
-              <span>支付方式：</span>
-              <el-select v-model="query.payModeIds" placeholder="请选择" filterable clearable size="small" multiple collapse-tags>
-                <el-option v-for="item in dict.payMode" :key="item.id" :label="item.displayName" :value="item.id" />
-              </el-select>
-            </div>
-            <div class="query">
-              <span>卡号：</span>
-              <el-input placeholder="卡号" v-model="query.cardNo" size="small" clearable style="width: 190px"/>
-            </div>
-            <div class="query">
-              <span>卡主姓名：</span>
-              <el-input placeholder="卡主姓名" v-model="query.customerName" size="small" clearable style="width: 190px"/>
-            </div>
-            <div class="query">
-              <span>身份证号：</span>
-              <el-input placeholder="身份证号" v-model="query.idNo" size="small" clearable style="width: 190px"/>
-            </div>
-            <div class="query">
-              <span>电话：</span>
-              <el-input placeholder="手机号/电话" v-model="query.mobileTelephone" size="small" clearable style="width: 190px"/>
-            </div>
-            <div class="query">
+        <div
+          style="background-color: #fff; padding: 15px; border-radius: 8px;display: flex;flex-wrap: wrap;    margin-bottom: 10px;height:80px;margin-top: 7px;">
+          <div class="query">
+            <span>记账日期：</span>
+            <el-date-picker v-model="query.startDate" type="date" placeholder="起始日期" size="small"
+              value-format="yyyy-MM-dd" />
+            <span>--</span>
+            <el-date-picker v-model="query.endDate" type="date" placeholder="截止日期" size="small"
+              value-format="yyyy-MM-dd" />
+          </div>
+          <div class="query">
+            <span>记账标志：</span>
+            <el-select v-model="query.billFlag" placeholder="请选择" filterable clearable size="small">
+              <el-option v-for="item in dict.billFlag" :key="item.id" :label="item.displayName" :value="item.id" />
+            </el-select>
+          </div>
+          <div class="query">
+            <span>支付方式：</span>
+            <el-select v-model="query.payModeIds" placeholder="请选择" filterable clearable size="small" multiple
+              collapse-tags>
+              <el-option v-for="item in dict.payMode" :key="item.id" :label="item.displayName" :value="item.id" />
+            </el-select>
+          </div>
+          <div class="query">
+            <span>卡号：</span>
+            <el-input placeholder="卡号" v-model="query.cardNo" size="small" clearable style="width: 190px" />
+          </div>
+          <div class="query">
+            <span>卡主姓名：</span>
+            <el-input placeholder="卡主姓名" v-model="query.customerName" size="small" clearable style="width: 190px" />
+          </div>
+          <div class="query">
+            <span>身份证号：</span>
+            <el-input placeholder="身份证号" v-model="query.idNo" size="small" clearable style="width: 190px" />
+          </div>
+          <div class="query">
+            <span>电话：</span>
+            <el-input placeholder="手机号/电话" v-model="query.mobileTelephone" size="small" clearable
+              style="width: 190px" />
+          </div>
+          <div class="query">
+            <span>充值员</span>
+            <el-select v-model="query.feeUserIds" placeholder="请选择" style="margin-left: 10px;width: 170px;" filterable
+              clearable size="small" multiple collapse-tags>
+              <el-option v-for="item in users" :key="item.id" :label="item.surname" :value="item.id" />
+            </el-select>
+          </div>
+          <div class="query">
             <el-button class="commonbutton" @click="btnQuery">查询</el-button>
           </div>
         </div>
         <div style="background-color: #fff; padding: 15px; border-radius: 8px;">
           <el-table :data="dataList" width="100%" :height="window.pageHeight < 600 ? 330 : window.pageHeight - 250"
-            row-key="id" highlight-current-row ref="dataList" border show-summary :summary-method="getSummaries">  
-            <el-table-column type="index" label="序号" width="50" align="center"/>           
-            <el-table-column prop="cardNo" label="会员卡号" width="150" align="center"/>            
-            <el-table-column prop="customerName" label="卡主姓名" />            
-            <el-table-column prop="mobileTelephone" label="手机号" align="center"/>
-            <el-table-column prop="remark" label="备注" align="center"/>
+            row-key="id" highlight-current-row ref="dataList" border show-summary :summary-method="getSummaries">
+            <el-table-column type="index" label="序号" width="50" align="center" />
+            <el-table-column prop="cardNo" label="会员卡号" width="150" align="center" />
+            <el-table-column prop="customerName" label="卡主姓名" />
+            <el-table-column prop="mobileTelephone" label="手机号" align="center" />
+            <el-table-column prop="remark" label="备注" align="center" />
             <el-table-column prop="payModeName" label="支付方式" align="center" />
-            <el-table-column prop="sumChargeMoney" label="充值金额" align="center"/>
-            <el-table-column prop="sumDeductionMoney" label="扣费金额" align="center"/>
-            <el-table-column prop="sumRefundMoney" label="退费金额" align="center"/>
+            <el-table-column prop="sumChargeMoney" label="充值金额" align="center" />
+            <el-table-column prop="sumDeductionMoney" label="扣费金额" align="center" />
+            <el-table-column prop="sumRefundMoney" label="退费金额" align="center" />
           </el-table>
         </div>
       </div>
-    </div>    
+    </div>
   </div>
 </template>
 <script>
@@ -81,26 +91,28 @@ export default {
   data() {
     return {
       query: {
-        startDate:'',
-        endDate:'',
-        billFlag:'',
-        payModeIds:[],
-        cardNo:'',
-        customerName:'',
-        idNo:'',
-        mobileTelephone:''
+        startDate: '',
+        endDate: '',
+        billFlag: '',
+        payModeIds: [],
+        cardNo: '',
+        customerName: '',
+        idNo: '',
+        mobileTelephone: '',
+        feeUserIds: []
       },  //查询条件
-      dataList: [], //列表数据      
+      dataList: [], //列表数据  
+      users: [],
     };
   },
 
   created() {
-    this.query.startDate = moment(new Date()).format("yyyy-MM-DD");  
+    this.query.startDate = moment(new Date()).format("yyyy-MM-DD");
     this.query.endDate = this.query.startDate;
   },
 
   //挂载完成
-  mounted() { 
+  mounted() {
     this.dicInit();
     this.enterToQuery()
   },
@@ -116,38 +128,38 @@ export default {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
     dddw, moment,
 
-       
+
     //查询
     btnQuery(queryType) {
       let body = deepCopy(this.query)
 
       switch (queryType) {
         case 'idNo':
-          if(!this.query.idNo) return;
+          if (!this.query.idNo) return;
           body = { idNo: this.query.idNo };
           break;
         case 'cardNo':
-        if(!this.query.cardNo) return;
+          if (!this.query.cardNo) return;
           body = { cardNo: this.query.cardNo };
           break;
         default:
-          if(this.query.idNo){
+          if (this.query.idNo) {
             body = { idNo: this.query.idNo };
-          }else if(this.query.cardNo){
+          } else if (this.query.cardNo) {
             body = { cardNo: this.query.cardNo };
-          }else{
+          } else {
             // if(!this.query.startDate) this.query.startDate = moment(new Date()).format('yyyy-MM-DD');
             // if(!this.query.endDate) this.query.endDate = moment(new Date()).format('yyyy-MM-DD');
-            if(this.query.startDate > this.query.endDate){
+            if (this.query.startDate > this.query.endDate) {
               this.$message.error("数据不合法，起始日期不能大于截止日期！");
               return;
             }
-            if(!body.cardNo) delete body.cardNo
-            if(!body.billFlag) delete body.billFlag
-            if(!body.customerName) delete body.customerName
-            if(!body.idNo) delete body.idNo
-            if(!body.mobileTelephone) delete body.mobileTelephone
-            if(body?.payModeIds.length == 0) delete body.payModeIds
+            if (!body.cardNo) delete body.cardNo
+            if (!body.billFlag) delete body.billFlag
+            if (!body.customerName) delete body.customerName
+            if (!body.idNo) delete body.idNo
+            if (!body.mobileTelephone) delete body.mobileTelephone
+            if (body?.payModeIds.length == 0) delete body.payModeIds
           }
           break;
       }
@@ -180,7 +192,7 @@ export default {
       // }
 
       const { columns, data } = param;
-      const sumCol = [6,7,8]  //需合计的列
+      const sumCol = [6, 7, 8]  //需合计的列
       const sums = [];
       columns.forEach((column, index) => {
         //console.log('column, index,data',column, index,data)
@@ -211,13 +223,21 @@ export default {
     },
 
 
-    dicInit(){
+    dicInit() {
       //支付方式
       getapi("/api/app/pay-mode").then((res) => {
         if (res.code == 1) {
-          this.dict.payMode = res.data;          
+          this.dict.payMode = res.data;
         }
       });
+
+      // 获取收费员
+      postapi('/api/identity/users/GetUserListBySaleRole', { roleSysParmId: "fee_role_id" })
+        .then(res => {
+          if (res.code > -1) {
+            this.users = res.data
+          }
+        })
     },
     //回车替代查询
     enterToQuery() {
@@ -285,48 +305,58 @@ export default {
 @import "../../assets/css/global_form.css";
 @import "../../assets/css/global_input.css";
 @import "../../assets/css/global.css";
+
 ::v-deep .el-input__inner {
   /*text-align: center;*/
   padding-left: 5px;
   padding-right: 25px;
 }
+
 ::v-deep .el-icon-date:before {
-    content: ""
+  content: ""
 }
-.query{
-    margin-right: 15px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    font-size: 14px;
-    color: #232748;
-    font-size: 400;
-    font-family: "NotoSansSC-Regular";
+
+.query {
+  margin-right: 15px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 14px;
+  color: #232748;
+  font-size: 400;
+  font-family: "NotoSansSC-Regular";
 }
+
 .box {
   display: flex;
   flex-direction: column;
 }
+
 :deep .el-form-item {
   margin-bottom: 14px;
 }
+
 /* el-dialog的头部样式 */
 :deep .el-dialog__header {
   padding: 11px 20px 11px;
 }
+
 /* el-dialog的主体样式 */
 :deep .el-dialog__body {
   padding: 0px 20px 0px;
 }
+
 /* el-divider样式 */
 :deep .el-divider--horizontal {
   margin: 0px 0 12px;
 }
+
 /* el-dialog的底部样式 */
 :deep .el-dialog__footer {
   padding: 0px 20px 14px;
 }
-.query:last-child{
+
+.query:last-child {
   margin-right: 0;
 }
 </style>