From 5f752aca5ccfb26fd3afa68091f82ed4d1bcd44c Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 28 Aug 2023 11:51:09 +0800
Subject: [PATCH] card

---
 src/router/index.js                     |  20 +-
 src/views/Home.vue                      |   3 +
 src/views/fee-settings/cardBill.vue     | 307 ++++++++++++++++++++++++
 src/views/fee-settings/cardRegister.vue | 307 ++++++++++++++++++++++++
 src/views/fee-settings/cardType.vue     | 307 ++++++++++++++++++++++++
 5 files changed, 943 insertions(+), 1 deletion(-)
 create mode 100644 src/views/fee-settings/cardBill.vue
 create mode 100644 src/views/fee-settings/cardRegister.vue
 create mode 100644 src/views/fee-settings/cardType.vue

diff --git a/src/router/index.js b/src/router/index.js
index c5b87f1..72aaa05 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -132,14 +132,32 @@ const routes = [
         path: "/diagnosis-level",
         component: () => import("../views/basic-dictionary/DiagnosisLevel.vue"),
       },
+      //----------------------  收费设置 start ----------------------
       {
         path: "/invoice-item-type",
         component: () => import("../views/fee-settings/InvoiceItemType.vue"),
-      },
+      },      
       {
         path: "/pay-mode",
         component: () => import("../views/fee-settings/PayMode.vue"),
       },
+      {
+        path: "/cardType",
+        name:"会员卡类别",
+        component: () => import("../views/fee-settings/cardType.vue"),
+      },
+      {
+        path: "/cardRegister",
+        name:"会员卡登记",
+        component: () => import("../views/fee-settings/cardRegister.vue"),
+      },
+      {
+        path: "/cardBill",
+        name:"会员卡记账",
+        component: () => import("../views/fee-settings/cardBill.vue"),
+      },
+      //----------------------  收费设置 start ----------------------
+
       {
         path: "/item-type",
         component: () => import("../views/common-settings/ItemType.vue"),
diff --git a/src/views/Home.vue b/src/views/Home.vue
index d370abb..2662fd5 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -51,6 +51,9 @@
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="invoice-item-type">发票项目类别</el-dropdown-item>
                 <el-dropdown-item command="pay-mode">支付方式</el-dropdown-item>
+                <el-dropdown-item command="cardType">会员卡类别</el-dropdown-item>
+                <el-dropdown-item command="cardRegister">会员卡登记</el-dropdown-item>
+                <el-dropdown-item command="cardBill">会员卡记账</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
diff --git a/src/views/fee-settings/cardBill.vue b/src/views/fee-settings/cardBill.vue
new file mode 100644
index 0000000..116479c
--- /dev/null
+++ b/src/views/fee-settings/cardBill.vue
@@ -0,0 +1,307 @@
+<template>
+  <div style="display: flex">
+    <div :style="'width:' + (window.pageWidth - 200 - 120 - 70) + 'px;'">
+      <el-table :data="dataList" border 
+        width="100%" 
+        :height="window.pageHeight < 600 ? 350:window.pageHeight-250" 
+        row-key="id" size="small" highlight-current-row ref="dataList"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="40"/>
+        <el-table-column prop="isMedicalStart" label="签到" width="50">
+          <template slot-scope="scope">
+            <el-checkbox :value="scope.row.isMedicalStart == 'Y'" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="medicalStartDate" label="签到日期" width="90">
+          <template slot-scope="scope">
+            <div>{{ lmoment(scope.row.medicalStartDate, "yyyy-MM-DD") }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="completeFlag" label="体检进度">
+          <template slot-scope="scope">
+            <div>{{ ldddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="isLock" label="锁住" width="50">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="customerOrgParentName" label="单位" width="180">
+          <template slot-scope="scope">
+            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="customerOrgName" label="部门" width="180">
+          <template slot-scope="scope">
+            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="patientName" label="姓名" />
+        <el-table-column prop="sexId" label="性别">
+          <template slot-scope="scope">
+            <div>{{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="age" label="年龄" />
+        <el-table-column prop="patientRegisterNo" label="条码号" width="150" />
+        <el-table-column prop="patientNo" label="档案号" />
+        <el-table-column prop="medicalTimes" label="体检次数"></el-table-column>
+        <el-table-column label="分组/套餐" width="150">
+          <template slot-scope="scope">
+            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
+              {{ ldddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
+            </div>
+            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
+              {{ ldddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="nationId" label="民族">
+          <template slot-scope="scope">
+            <div>
+              {{ ldddw(dict.nation, "id", scope.row.nationId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="idNo" label="身份证" width="150" />
+        <el-table-column prop="birthDate" label="出生日期" width="100">
+          <template slot-scope="scope">
+            <div v-if="scope.row.birthDate">
+              {{ lmoment(scope.row.birthDate, "yyyy-MM-DD") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="email" label="邮箱" width="100" />
+        <el-table-column prop="mobileTelephone" label="手机" width="100" />
+        <el-table-column prop="telephone" label="电话" width="100" />
+        <el-table-column prop="address" label="地址" width="300" />
+        <el-table-column prop="medicalCardNo" label="体检卡号" />
+        <el-table-column prop="jobCardNo" label="工卡号" />
+        <el-table-column prop="maritalStatusId" label="婚姻状况">
+          <template slot-scope="scope">
+            <div>
+              {{ ldddw(dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="medicalTypeId" label="体检类别">
+          <template slot-scope="scope">
+            <div v-if="scope.row.medicalTypeId !== dict.personOrgId">
+              {{ ldddw(dict.medicalType, "id", scope.row.medicalTypeId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="personnelTypeId" label="人员类别">
+          <template slot-scope="scope">
+            <div v-if="scope.row.personnelTypeId !== dict.personOrgId">
+              {{ ldddw(dict.personnelType, "id", scope.row.personnelTypeId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="jobPost" label="职务" />
+        <el-table-column prop="jobTitle" label="职称" />
+        <el-table-column prop="salesman" label="介绍人" />
+        <el-table-column prop="isVip" label="是否VIP">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isVip == "Y" ? "是" : "否" }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="creatorName" label="登记人" />
+        <el-table-column prop="creationTime" label="登记日期" width="100">
+          <template slot-scope="scope">
+            <div>{{ lmoment(scope.row.creationTime, "yyyy-MM-DD") }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="isUpload" label="是否上传">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isUpload == "Y" ? "是" : "否" }}</div>
+          </template>
+        </el-table-column>
+
+      </el-table>      
+    </div> 
+    <div style="margin-left: 10px;width:110px;">
+        <div class="listBtn">
+          <el-button type="success" class="btnClass" @click="sign">签到</el-button>
+        </div>
+        <div class="listBtn">
+          <el-button type="primary" class="btnClass" @click="scanSign">扫码签到</el-button>
+        </div>        
+      </div>
+    <el-dialog title="扫/输入条码签到" :visible.sync="dialogVisible">
+      <el-form :model="form">
+        <el-form-item label="条码" label-width="100px">
+          <el-input v-model="form.patientRegisterNo" @change="signByPatientRegisterNo"></el-input>
+        </el-form-item>        
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">关闭</el-button>
+        <el-button type="primary" @click="signByPatientRegisterNo">确定</el-button>
+      </div>
+    </el-dialog>   
+  </div>
+</template>
+<script>
+import moment from "moment";
+import { mapState, mapActions } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { dddw, objCopy, arrayReduce } from "@/utlis/proFunc";
+
+import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
+import Camera from "../../components/patientRegister/Camera.vue";
+
+export default {
+  components: {
+    PatientRegisterEdit,
+    Camera,
+  },
+  data() {
+    return {
+      dataList: [], //列表数据
+      multipleSelection: [], //选中的数据列表
+      dialogVisible: false, 
+      form:{
+        patientRegisterNo:''
+      }   
+    };
+  },
+
+  created() { },
+
+  //挂载完成
+  mounted() { },
+  computed: {
+    ...mapState(["window","dict", "patientRegister", "customerOrg"]),
+  },
+  methods: {
+    ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
+
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+
+    signCore(body){
+      postapi(`/api/app/patientregister/updatesigninmany`, body)
+        .then((res) => {
+          if (res.code != -1){
+            this.$message.success("操作成功");             
+          }                   
+        })
+        .catch(() => {
+          this.$message({type: "error",message: "已取消删除",});
+        });   
+    },
+
+    //选中人员签到 
+    sign() {
+      if (!this.multipleSelection || this.multipleSelection.length < 1 ) {
+        alert("请选择体检人员，再进行此操作");
+        return;
+      }
+      let body = []
+      this.multipleSelection.forEach(e =>{
+        body.push(e.id)
+      });
+      
+      this.signCore(body)
+        
+    },
+
+    scanSign(){
+      this.dialogVisible = true
+    },
+
+    //按条码号查个人数据
+    signByPatientRegisterNo() {
+      let val = this.form.patientRegisterNo
+      console.log(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
+      getapi(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
+      .then((res) => {
+        if (res.code != -1) {
+          if(res.data){
+            this.signCore([res.data.id])
+            this.form.patientRegisterNo = ''
+          }          
+        }
+      });
+    },
+
+    ldddw(arrayData, key, value, display) {
+      return dddw(arrayData, key, value, display);
+    },
+
+    lmoment(date, forMat) {
+      return moment(new Date(date)).format(forMat);
+    },
+
+    //查询
+    query() {
+      let body = {}
+      
+      console.log(`this.patientRegister.query`, this.patientRegister.query)
+      if (this.patientRegister.query.customerOrgFlag) {
+        if (this.patientRegister.query.CustomerOrgParentId) {
+          body.customerOrgId = this.patientRegister.query.CustomerOrgParentId
+        } else{
+          if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId
+        } 
+      }
+
+      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
+
+      if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
+
+      if (this.patientRegister.query.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
+
+      //StartDate EndDate
+      if (this.patientRegister.query.dateRange) {
+        body.startDate = moment(new Date(this.patientRegister.query.dateRange[0])).format("yyyy-MM-DD")
+        body.endDate = moment(new Date(this.patientRegister.query.dateRange[1])).format("yyyy-MM-DD")
+      }
+
+
+      if (this.patientRegister.query.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
+
+      if (this.patientRegister.query.patientNo) body = { patientNo: this.patientRegister.query.patientNo }
+
+      if (this.patientRegister.query.patientRegisterNo) body = { patientRegisterNo: this.patientRegister.query.patientRegisterNo }
+
+
+      console.log('/api/app/patientregister/getlistinfilter', body)
+      postapi('/api/app/patientregister/getlistinfilter', body)
+        .then((res) => {
+          this.dataList = res.data;
+        });
+    },
+  },
+
+  //监听事件
+  watch: {
+    //触发查询事件
+    "patientRegister.query.times"(newVal, oldVal) {
+      if (newVal != oldVal) {
+        //alert('触发查询事件')
+        this.query();
+      }
+    },
+   
+  },
+};
+</script>
+<style scoped>
+.box {
+  display: flex;
+}
+
+.listBtn {
+  margin-top: 10px;
+}
+.btnClass{
+  width:110px;
+  text-align: center;
+}
+.btnClass{
+  width:110px;
+}
+</style>
diff --git a/src/views/fee-settings/cardRegister.vue b/src/views/fee-settings/cardRegister.vue
new file mode 100644
index 0000000..116479c
--- /dev/null
+++ b/src/views/fee-settings/cardRegister.vue
@@ -0,0 +1,307 @@
+<template>
+  <div style="display: flex">
+    <div :style="'width:' + (window.pageWidth - 200 - 120 - 70) + 'px;'">
+      <el-table :data="dataList" border 
+        width="100%" 
+        :height="window.pageHeight < 600 ? 350:window.pageHeight-250" 
+        row-key="id" size="small" highlight-current-row ref="dataList"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="40"/>
+        <el-table-column prop="isMedicalStart" label="签到" width="50">
+          <template slot-scope="scope">
+            <el-checkbox :value="scope.row.isMedicalStart == 'Y'" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="medicalStartDate" label="签到日期" width="90">
+          <template slot-scope="scope">
+            <div>{{ lmoment(scope.row.medicalStartDate, "yyyy-MM-DD") }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="completeFlag" label="体检进度">
+          <template slot-scope="scope">
+            <div>{{ ldddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="isLock" label="锁住" width="50">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="customerOrgParentName" label="单位" width="180">
+          <template slot-scope="scope">
+            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="customerOrgName" label="部门" width="180">
+          <template slot-scope="scope">
+            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="patientName" label="姓名" />
+        <el-table-column prop="sexId" label="性别">
+          <template slot-scope="scope">
+            <div>{{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="age" label="年龄" />
+        <el-table-column prop="patientRegisterNo" label="条码号" width="150" />
+        <el-table-column prop="patientNo" label="档案号" />
+        <el-table-column prop="medicalTimes" label="体检次数"></el-table-column>
+        <el-table-column label="分组/套餐" width="150">
+          <template slot-scope="scope">
+            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
+              {{ ldddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
+            </div>
+            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
+              {{ ldddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="nationId" label="民族">
+          <template slot-scope="scope">
+            <div>
+              {{ ldddw(dict.nation, "id", scope.row.nationId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="idNo" label="身份证" width="150" />
+        <el-table-column prop="birthDate" label="出生日期" width="100">
+          <template slot-scope="scope">
+            <div v-if="scope.row.birthDate">
+              {{ lmoment(scope.row.birthDate, "yyyy-MM-DD") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="email" label="邮箱" width="100" />
+        <el-table-column prop="mobileTelephone" label="手机" width="100" />
+        <el-table-column prop="telephone" label="电话" width="100" />
+        <el-table-column prop="address" label="地址" width="300" />
+        <el-table-column prop="medicalCardNo" label="体检卡号" />
+        <el-table-column prop="jobCardNo" label="工卡号" />
+        <el-table-column prop="maritalStatusId" label="婚姻状况">
+          <template slot-scope="scope">
+            <div>
+              {{ ldddw(dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="medicalTypeId" label="体检类别">
+          <template slot-scope="scope">
+            <div v-if="scope.row.medicalTypeId !== dict.personOrgId">
+              {{ ldddw(dict.medicalType, "id", scope.row.medicalTypeId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="personnelTypeId" label="人员类别">
+          <template slot-scope="scope">
+            <div v-if="scope.row.personnelTypeId !== dict.personOrgId">
+              {{ ldddw(dict.personnelType, "id", scope.row.personnelTypeId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="jobPost" label="职务" />
+        <el-table-column prop="jobTitle" label="职称" />
+        <el-table-column prop="salesman" label="介绍人" />
+        <el-table-column prop="isVip" label="是否VIP">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isVip == "Y" ? "是" : "否" }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="creatorName" label="登记人" />
+        <el-table-column prop="creationTime" label="登记日期" width="100">
+          <template slot-scope="scope">
+            <div>{{ lmoment(scope.row.creationTime, "yyyy-MM-DD") }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="isUpload" label="是否上传">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isUpload == "Y" ? "是" : "否" }}</div>
+          </template>
+        </el-table-column>
+
+      </el-table>      
+    </div> 
+    <div style="margin-left: 10px;width:110px;">
+        <div class="listBtn">
+          <el-button type="success" class="btnClass" @click="sign">签到</el-button>
+        </div>
+        <div class="listBtn">
+          <el-button type="primary" class="btnClass" @click="scanSign">扫码签到</el-button>
+        </div>        
+      </div>
+    <el-dialog title="扫/输入条码签到" :visible.sync="dialogVisible">
+      <el-form :model="form">
+        <el-form-item label="条码" label-width="100px">
+          <el-input v-model="form.patientRegisterNo" @change="signByPatientRegisterNo"></el-input>
+        </el-form-item>        
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">关闭</el-button>
+        <el-button type="primary" @click="signByPatientRegisterNo">确定</el-button>
+      </div>
+    </el-dialog>   
+  </div>
+</template>
+<script>
+import moment from "moment";
+import { mapState, mapActions } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { dddw, objCopy, arrayReduce } from "@/utlis/proFunc";
+
+import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
+import Camera from "../../components/patientRegister/Camera.vue";
+
+export default {
+  components: {
+    PatientRegisterEdit,
+    Camera,
+  },
+  data() {
+    return {
+      dataList: [], //列表数据
+      multipleSelection: [], //选中的数据列表
+      dialogVisible: false, 
+      form:{
+        patientRegisterNo:''
+      }   
+    };
+  },
+
+  created() { },
+
+  //挂载完成
+  mounted() { },
+  computed: {
+    ...mapState(["window","dict", "patientRegister", "customerOrg"]),
+  },
+  methods: {
+    ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
+
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+
+    signCore(body){
+      postapi(`/api/app/patientregister/updatesigninmany`, body)
+        .then((res) => {
+          if (res.code != -1){
+            this.$message.success("操作成功");             
+          }                   
+        })
+        .catch(() => {
+          this.$message({type: "error",message: "已取消删除",});
+        });   
+    },
+
+    //选中人员签到 
+    sign() {
+      if (!this.multipleSelection || this.multipleSelection.length < 1 ) {
+        alert("请选择体检人员，再进行此操作");
+        return;
+      }
+      let body = []
+      this.multipleSelection.forEach(e =>{
+        body.push(e.id)
+      });
+      
+      this.signCore(body)
+        
+    },
+
+    scanSign(){
+      this.dialogVisible = true
+    },
+
+    //按条码号查个人数据
+    signByPatientRegisterNo() {
+      let val = this.form.patientRegisterNo
+      console.log(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
+      getapi(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
+      .then((res) => {
+        if (res.code != -1) {
+          if(res.data){
+            this.signCore([res.data.id])
+            this.form.patientRegisterNo = ''
+          }          
+        }
+      });
+    },
+
+    ldddw(arrayData, key, value, display) {
+      return dddw(arrayData, key, value, display);
+    },
+
+    lmoment(date, forMat) {
+      return moment(new Date(date)).format(forMat);
+    },
+
+    //查询
+    query() {
+      let body = {}
+      
+      console.log(`this.patientRegister.query`, this.patientRegister.query)
+      if (this.patientRegister.query.customerOrgFlag) {
+        if (this.patientRegister.query.CustomerOrgParentId) {
+          body.customerOrgId = this.patientRegister.query.CustomerOrgParentId
+        } else{
+          if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId
+        } 
+      }
+
+      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
+
+      if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
+
+      if (this.patientRegister.query.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
+
+      //StartDate EndDate
+      if (this.patientRegister.query.dateRange) {
+        body.startDate = moment(new Date(this.patientRegister.query.dateRange[0])).format("yyyy-MM-DD")
+        body.endDate = moment(new Date(this.patientRegister.query.dateRange[1])).format("yyyy-MM-DD")
+      }
+
+
+      if (this.patientRegister.query.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
+
+      if (this.patientRegister.query.patientNo) body = { patientNo: this.patientRegister.query.patientNo }
+
+      if (this.patientRegister.query.patientRegisterNo) body = { patientRegisterNo: this.patientRegister.query.patientRegisterNo }
+
+
+      console.log('/api/app/patientregister/getlistinfilter', body)
+      postapi('/api/app/patientregister/getlistinfilter', body)
+        .then((res) => {
+          this.dataList = res.data;
+        });
+    },
+  },
+
+  //监听事件
+  watch: {
+    //触发查询事件
+    "patientRegister.query.times"(newVal, oldVal) {
+      if (newVal != oldVal) {
+        //alert('触发查询事件')
+        this.query();
+      }
+    },
+   
+  },
+};
+</script>
+<style scoped>
+.box {
+  display: flex;
+}
+
+.listBtn {
+  margin-top: 10px;
+}
+.btnClass{
+  width:110px;
+  text-align: center;
+}
+.btnClass{
+  width:110px;
+}
+</style>
diff --git a/src/views/fee-settings/cardType.vue b/src/views/fee-settings/cardType.vue
new file mode 100644
index 0000000..116479c
--- /dev/null
+++ b/src/views/fee-settings/cardType.vue
@@ -0,0 +1,307 @@
+<template>
+  <div style="display: flex">
+    <div :style="'width:' + (window.pageWidth - 200 - 120 - 70) + 'px;'">
+      <el-table :data="dataList" border 
+        width="100%" 
+        :height="window.pageHeight < 600 ? 350:window.pageHeight-250" 
+        row-key="id" size="small" highlight-current-row ref="dataList"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="40"/>
+        <el-table-column prop="isMedicalStart" label="签到" width="50">
+          <template slot-scope="scope">
+            <el-checkbox :value="scope.row.isMedicalStart == 'Y'" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="medicalStartDate" label="签到日期" width="90">
+          <template slot-scope="scope">
+            <div>{{ lmoment(scope.row.medicalStartDate, "yyyy-MM-DD") }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="completeFlag" label="体检进度">
+          <template slot-scope="scope">
+            <div>{{ ldddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="isLock" label="锁住" width="50">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="customerOrgParentName" label="单位" width="180">
+          <template slot-scope="scope">
+            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="customerOrgName" label="部门" width="180">
+          <template slot-scope="scope">
+            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="patientName" label="姓名" />
+        <el-table-column prop="sexId" label="性别">
+          <template slot-scope="scope">
+            <div>{{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="age" label="年龄" />
+        <el-table-column prop="patientRegisterNo" label="条码号" width="150" />
+        <el-table-column prop="patientNo" label="档案号" />
+        <el-table-column prop="medicalTimes" label="体检次数"></el-table-column>
+        <el-table-column label="分组/套餐" width="150">
+          <template slot-scope="scope">
+            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
+              {{ ldddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
+            </div>
+            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
+              {{ ldddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="nationId" label="民族">
+          <template slot-scope="scope">
+            <div>
+              {{ ldddw(dict.nation, "id", scope.row.nationId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="idNo" label="身份证" width="150" />
+        <el-table-column prop="birthDate" label="出生日期" width="100">
+          <template slot-scope="scope">
+            <div v-if="scope.row.birthDate">
+              {{ lmoment(scope.row.birthDate, "yyyy-MM-DD") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="email" label="邮箱" width="100" />
+        <el-table-column prop="mobileTelephone" label="手机" width="100" />
+        <el-table-column prop="telephone" label="电话" width="100" />
+        <el-table-column prop="address" label="地址" width="300" />
+        <el-table-column prop="medicalCardNo" label="体检卡号" />
+        <el-table-column prop="jobCardNo" label="工卡号" />
+        <el-table-column prop="maritalStatusId" label="婚姻状况">
+          <template slot-scope="scope">
+            <div>
+              {{ ldddw(dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="medicalTypeId" label="体检类别">
+          <template slot-scope="scope">
+            <div v-if="scope.row.medicalTypeId !== dict.personOrgId">
+              {{ ldddw(dict.medicalType, "id", scope.row.medicalTypeId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="personnelTypeId" label="人员类别">
+          <template slot-scope="scope">
+            <div v-if="scope.row.personnelTypeId !== dict.personOrgId">
+              {{ ldddw(dict.personnelType, "id", scope.row.personnelTypeId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="jobPost" label="职务" />
+        <el-table-column prop="jobTitle" label="职称" />
+        <el-table-column prop="salesman" label="介绍人" />
+        <el-table-column prop="isVip" label="是否VIP">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isVip == "Y" ? "是" : "否" }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="creatorName" label="登记人" />
+        <el-table-column prop="creationTime" label="登记日期" width="100">
+          <template slot-scope="scope">
+            <div>{{ lmoment(scope.row.creationTime, "yyyy-MM-DD") }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="isUpload" label="是否上传">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isUpload == "Y" ? "是" : "否" }}</div>
+          </template>
+        </el-table-column>
+
+      </el-table>      
+    </div> 
+    <div style="margin-left: 10px;width:110px;">
+        <div class="listBtn">
+          <el-button type="success" class="btnClass" @click="sign">签到</el-button>
+        </div>
+        <div class="listBtn">
+          <el-button type="primary" class="btnClass" @click="scanSign">扫码签到</el-button>
+        </div>        
+      </div>
+    <el-dialog title="扫/输入条码签到" :visible.sync="dialogVisible">
+      <el-form :model="form">
+        <el-form-item label="条码" label-width="100px">
+          <el-input v-model="form.patientRegisterNo" @change="signByPatientRegisterNo"></el-input>
+        </el-form-item>        
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">关闭</el-button>
+        <el-button type="primary" @click="signByPatientRegisterNo">确定</el-button>
+      </div>
+    </el-dialog>   
+  </div>
+</template>
+<script>
+import moment from "moment";
+import { mapState, mapActions } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { dddw, objCopy, arrayReduce } from "@/utlis/proFunc";
+
+import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
+import Camera from "../../components/patientRegister/Camera.vue";
+
+export default {
+  components: {
+    PatientRegisterEdit,
+    Camera,
+  },
+  data() {
+    return {
+      dataList: [], //列表数据
+      multipleSelection: [], //选中的数据列表
+      dialogVisible: false, 
+      form:{
+        patientRegisterNo:''
+      }   
+    };
+  },
+
+  created() { },
+
+  //挂载完成
+  mounted() { },
+  computed: {
+    ...mapState(["window","dict", "patientRegister", "customerOrg"]),
+  },
+  methods: {
+    ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
+
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+
+    signCore(body){
+      postapi(`/api/app/patientregister/updatesigninmany`, body)
+        .then((res) => {
+          if (res.code != -1){
+            this.$message.success("操作成功");             
+          }                   
+        })
+        .catch(() => {
+          this.$message({type: "error",message: "已取消删除",});
+        });   
+    },
+
+    //选中人员签到 
+    sign() {
+      if (!this.multipleSelection || this.multipleSelection.length < 1 ) {
+        alert("请选择体检人员，再进行此操作");
+        return;
+      }
+      let body = []
+      this.multipleSelection.forEach(e =>{
+        body.push(e.id)
+      });
+      
+      this.signCore(body)
+        
+    },
+
+    scanSign(){
+      this.dialogVisible = true
+    },
+
+    //按条码号查个人数据
+    signByPatientRegisterNo() {
+      let val = this.form.patientRegisterNo
+      console.log(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
+      getapi(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
+      .then((res) => {
+        if (res.code != -1) {
+          if(res.data){
+            this.signCore([res.data.id])
+            this.form.patientRegisterNo = ''
+          }          
+        }
+      });
+    },
+
+    ldddw(arrayData, key, value, display) {
+      return dddw(arrayData, key, value, display);
+    },
+
+    lmoment(date, forMat) {
+      return moment(new Date(date)).format(forMat);
+    },
+
+    //查询
+    query() {
+      let body = {}
+      
+      console.log(`this.patientRegister.query`, this.patientRegister.query)
+      if (this.patientRegister.query.customerOrgFlag) {
+        if (this.patientRegister.query.CustomerOrgParentId) {
+          body.customerOrgId = this.patientRegister.query.CustomerOrgParentId
+        } else{
+          if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId
+        } 
+      }
+
+      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
+
+      if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
+
+      if (this.patientRegister.query.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
+
+      //StartDate EndDate
+      if (this.patientRegister.query.dateRange) {
+        body.startDate = moment(new Date(this.patientRegister.query.dateRange[0])).format("yyyy-MM-DD")
+        body.endDate = moment(new Date(this.patientRegister.query.dateRange[1])).format("yyyy-MM-DD")
+      }
+
+
+      if (this.patientRegister.query.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
+
+      if (this.patientRegister.query.patientNo) body = { patientNo: this.patientRegister.query.patientNo }
+
+      if (this.patientRegister.query.patientRegisterNo) body = { patientRegisterNo: this.patientRegister.query.patientRegisterNo }
+
+
+      console.log('/api/app/patientregister/getlistinfilter', body)
+      postapi('/api/app/patientregister/getlistinfilter', body)
+        .then((res) => {
+          this.dataList = res.data;
+        });
+    },
+  },
+
+  //监听事件
+  watch: {
+    //触发查询事件
+    "patientRegister.query.times"(newVal, oldVal) {
+      if (newVal != oldVal) {
+        //alert('触发查询事件')
+        this.query();
+      }
+    },
+   
+  },
+};
+</script>
+<style scoped>
+.box {
+  display: flex;
+}
+
+.listBtn {
+  margin-top: 10px;
+}
+.btnClass{
+  width:110px;
+  text-align: center;
+}
+.btnClass{
+  width:110px;
+}
+</style>