From 346db7a73f9f0730bad8504581debb4c8dceca15 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Tue, 25 Jul 2023 18:33:58 +0800
Subject: [PATCH] sign

---
 .../doctorCheck/PatientRegisterList.vue       |   6 +-
 .../doctorCheck/RegisterCheckList.vue         |   6 +-
 .../patientRegister/ContactPerson.vue         | 385 ------------------
 .../PatientRegisterSignList.vue               | 299 ++++++++++++++
 .../patientRegisterAsbItem.vue                |  13 +-
 .../customerOrg/patientRegisterRecover.vue    |   6 +-
 src/views/customerOrg/patientRegisterSign.vue | 189 +++++++--
 7 files changed, 479 insertions(+), 425 deletions(-)
 delete mode 100644 src/components/patientRegister/ContactPerson.vue
 create mode 100644 src/components/patientRegister/PatientRegisterSignList.vue

diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue
index ab5dd46..f116c27 100644
--- a/src/components/doctorCheck/PatientRegisterList.vue
+++ b/src/components/doctorCheck/PatientRegisterList.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 查询条件 -->  
-    <div style="display: flex; flex-wrap: wrap; width: 90%">
+    <div style="display: flex; flex-wrap: wrap; width: 100%">
       <div class="block query">
         <span class="demonstration">登记日期：</span>
         <el-date-picker
@@ -375,6 +375,10 @@ export default {
 .box {
   display: flex;
 }
+.query{
+  margin-left: 5px;  
+  margin-bottom: 2px; 
+}
 
 .listBtn {
   margin-top: 10px;
diff --git a/src/components/doctorCheck/RegisterCheckList.vue b/src/components/doctorCheck/RegisterCheckList.vue
index 542206c..dde125a 100644
--- a/src/components/doctorCheck/RegisterCheckList.vue
+++ b/src/components/doctorCheck/RegisterCheckList.vue
@@ -56,8 +56,10 @@ export default {
           if (res.code != -1) {
             this.doctorCheck.RegisterCheckList = res.data;
             //查询出来 默认显示第1条记录明细、小结等
-            if(res.data.length > 0) this.doctorCheck.RegisterCheckId = res.data[0].id
-            this.doctorCheck.RegisterCheckEdit = res.data[0]
+            if(res.data.length > 0) {
+              this.doctorCheck.RegisterCheckId = res.data[0].id
+              this.doctorCheck.RegisterCheckEdit = res.data[0]
+            }
           }
       })
       .catch((err) => {
diff --git a/src/components/patientRegister/ContactPerson.vue b/src/components/patientRegister/ContactPerson.vue
deleted file mode 100644
index ba63e05..0000000
--- a/src/components/patientRegister/ContactPerson.vue
+++ /dev/null
@@ -1,385 +0,0 @@
-<template>
-  <div>
-    <div style="display: flex">
-      <div style="width: 95%">
-        <el-table
-          :data="customerOrg.contactPersonList"
-          border
-          height="150"
-          row-key="id"
-          size="small"
-          class="el-table__body-wrapper tbody"
-          highlight-current-row
-          @row-click="rowClick"
-          ref="customerOrg.contactPersonList"
-        >
-          <el-table-column prop="displayName" label="姓名" />
-          <el-table-column prop="title" label="职务" />
-          <el-table-column prop="remark" label="备注" />
-          <el-table-column prop="creatorName" label="创建者" width="" />
-          <el-table-column prop="creationTime" label="创建时间" width="200">
-            <template slot-scope="scope">
-              {{ scope.row.creationTime | dateFormat }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="lastModifierName" label="修改者" />
-          <el-table-column
-            prop="lastModificationTime"
-            label="修改时间"
-            width="200"
-          >
-            <template slot-scope="scope">
-              {{ scope.row.lastModificationTime | dateFormat }}
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <el-table
-          :data="customerOrg.contactMethodList"
-          border
-          height="150"
-          row-key="id"
-          size="small"
-          class="el-table__body-wrapper tbody"
-          highlight-current-row
-          @row-click="rowClickMethod"
-          ref="customerOrg.contactMethodList"
-        >
-          <el-table-column prop="contactMethodType" label="类型">
-            <template slot-scope="scope">
-              <div>
-                {{ scope.row.contactMethodType === "0" ? "手机" : "邮箱" }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="contactMethodValue" label="联系方式" />
-          <el-table-column prop="creatorName" label="创建者" width="" />
-          <el-table-column prop="creationTime" label="创建时间" width="200">
-            <template slot-scope="scope">
-              {{ scope.row.creationTime | dateFormat }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="lastModifierName" label="修改者" />
-          <el-table-column
-            prop="lastModificationTime"
-            label="修改时间"
-            width="200"
-          >
-            <template slot-scope="scope">
-              {{ scope.row.lastModificationTime | dateFormat }}
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div style="margin-left: 10px; margin-top: 5%">
-        <div style="margin-top: 10px">
-          <el-button type="primary" @click="add">新增</el-button>
-        </div>
-        <div style="margin-top: 10px">
-          <el-button type="success" @click="edit">编辑</el-button>
-        </div>
-        <div style="margin-top: 10px">
-          <el-button type="danger" @click="del">删除</el-button>
-        </div>
-      </div>
-    </div>
-    <!-- 联系人 -->
-    <el-dialog
-      :title="formTitle"
-      :visible.sync="dialogContactPerson"
-      width="480"
-    >
-      <el-form :model="form" ref="form" label-width="100px" :rules="rules">
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="联系人">
-              <el-input v-model="form.displayName"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="职务">
-              <el-input v-model="form.title"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="备注">
-              <el-input v-model="form.remark"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="5">
-            <el-form-item label="创建者">
-              <el-input v-model="form.creatorName" disabled></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="创建时间" style="margin-left: -5%">
-              <el-input
-                :value="form.creationTime | dateFormat"
-                disabled
-                style="width: 90%"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="5">
-            <el-form-item label="修改者" style="margin-left: -25%">
-              <el-input v-model="form.creatorName" disabled></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="修改时间" style="margin-left: -5%">
-              <el-input
-                :value="form.lastModificationTime | dateFormat"
-                disabled
-                style="width: 90%"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-divider />
-        <el-table
-          :data="customerOrg.contactMethodList"
-          border
-          height="300"
-          row-key="id"
-          size="small"
-          class="el-table__body-wrapper tbody"
-          highlight-current-row
-          ref="contactMethod"
-        >
-          <el-table-column prop="contactMethodType" label="类型">
-            <template slot-scope="scope">
-              <el-select
-                v-model="
-                  customerOrg.contactMethodList[scope.$index].contactMethodType
-                "
-              >
-                <el-option
-                  v-for="item in Methodtypes"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column prop="contactMethodValue" label="联系方式">
-            <template slot-scope="scope">
-              <el-input
-                v-model="
-                  customerOrg.contactMethodList[scope.$index].contactMethodValue
-                "
-                required
-              />
-            </template>
-          </el-table-column>
-          <el-table-column fixed="right" label="操作" width="60">
-            <template slot-scope="scope">
-              <i
-                class="el-icon-delete"
-                @click="deleteRow(scope.$index)"
-                size="medium"
-              ></i>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogContactPerson = false">取 消</el-button>
-        <el-button type="success" @click="addMethod">新增联系方式</el-button>
-        <el-button type="primary" @click="submit">确 定</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import { mapState } from "vuex";
-import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { objCopy } from "../../utlis/proFunc";
-export default {
-  components: {},
-  data() {
-    return {
-      personId: "",
-      form: {}, //联系人表单信息
-      formTitle: "新增",
-      dialogContactPerson: false, //联系人弹窗 显示控制
-
-      Methodtypes: [
-        //{ value: '',label: '所有订单状态' },
-        { value: "0", label: "电话" },
-        { value: "1", label: "邮箱" },
-      ],
-
-      rules: {
-        displayName: [
-          { required: true, message: "请输入名称", trigger: "blur" },
-        ],
-      },
-    };
-  },
-
-  created() {},
-
-  //挂载完成
-  mounted() {},
-
-  computed: {
-    ...mapState(["customerOrg"]),
-  },
-
-  methods: {
-    //获取联系人列表
-    getContactPersonList(customerOrgId) {
-      getapi(
-        `/api/app/contact-person/in-customer-org-id/${customerOrgId}`
-      ).then((res) => {
-        //console.log('res.data',res.data)
-        this.customerOrg.contactPersonList = res.data;
-      });
-    },
-
-    //获取联系方式列表
-    //api/app/contact-method/in-contact-person-id?ContactPersonId=3a0c08ad-4304-138b-d9e6-a7338739dfc4' \
-    getContactMethodList(ContactPersonId) {
-      getapi("/api/app/contact-method/in-contact-person-id", {
-        ContactPersonId,
-      }).then((res) => {
-        //console.log('res.data',res.data)
-        this.customerOrg.contactMethodList = res.data;
-      });
-    },
-
-    //联系人 相关操作
-    add() {
-      //this.$message.success("新增 addContactPerson");
-      if (!this.customerOrg.customerOrgId) {
-        alert("没有体检单位信息");
-        return;
-      }
-      this.form = { customerOrgId: this.customerOrg.customerOrgId };
-      this.dialogContactPerson = true;
-      this.formTitle = "新增";
-      this.personId = "";
-      this.customerOrg.contactMethodList = [];
-    },
-
-    edit() {
-      //this.$message.success("编辑 editContactPerson");
-      if (!this.customerOrg.customerOrgId) {
-        alert("没有体检单位信息");
-        return;
-      } else if (!this.personId) {
-        alert("请先选择要编辑的联系人");
-        return;
-      }
-      this.dialogContactPerson = true;
-      this.formTitle = "编辑";
-    },
-
-    //删除联系人行
-    del() {
-      //this.$message.success("删除 delContactPerson");
-      if (!this.personId) {
-        alert("请先选择要编辑的联系人");
-        return;
-      }
-      deletapi(`/api/app/contact-person/${this.personId}`).then((res) => {
-        this.personId = "";
-        this.getContactPersonList(this.customerOrg.customerOrgId);
-        this.customerOrg.contactMethodList = [];
-        this.$message.success("操作成功！");
-      });
-    },
-
-    //删除联系方式行
-    deleteRow(index) {
-      this.customerOrg.contactMethodList.splice(index, 1);
-    },
-
-    //联系人信息提交
-    submit() {
-      let body = {
-        customerOrgId: "",
-        displayName: "",
-        title: "",
-        remark: "",
-      };
-      objCopy(this.form, body);
-      console.log("body", body);
-      if (this.formTitle === "新增") {
-        postapi("/api/app/contact-person", body)
-          .then((res) => {
-            //console.log('api/app/contact-person')
-            this.personId = res.data.id;
-            this.formTitle = "编辑";
-            return deletapi(`/api/app/contact-method/many/${this.personId}`);
-          })
-          .then((res) => {
-            //console.log(`deletapi api/app/contact-method/${this.personId}`)
-            let contactMethod = []; //联系方式form表单数据
-            this.customerOrg.contactMethodList.forEach((item, index) => {
-              contactMethod.push({
-                contactMethodValue: item.contactMethodValue,
-                contactMethodType: item.contactMethodType,
-                contactPersonId: this.personId,
-              });
-            });
-            return postapi("/api/app/contact-method/many", contactMethod);
-          })
-          .then((res) => {
-            //console.log('api/app/contact-method/many')
-            this.getContactPersonList(this.customerOrg.customerOrgId);
-            this.$message.success("操作成功！");
-          });
-      } else {
-        putapi(`/api/app/contact-person/${this.personId}`, body)
-          .then((res) => {
-            //console.log(`/api/app/contact-person/${this.personId}`)
-            return deletapi(`/api/app/contact-method/many/${this.personId}`);
-          })
-          .then((res) => {
-            console.log(`deletapi api/app/contact-method/${this.personId}`);
-            let contactMethod = []; //联系方式form表单数据
-            this.customerOrg.contactMethodList.forEach((item, index) => {
-              contactMethod.push({
-                contactMethodValue: item.contactMethodValue,
-                contactMethodType: item.contactMethodType,
-                contactPersonId: this.personId,
-              });
-            });
-            return postapi("/api/app/contact-method/many", contactMethod);
-          })
-          .then((res) => {
-            //console.log('api/app/contact-method/many')
-            this.getContactPersonList(this.customerOrg.customerOrgId);
-            this.$message.success("操作成功！");
-          });
-      }
-    },
-
-    //新增联系方式
-    addMethod() {
-      this.customerOrg.contactMethodList.push({
-        contactMethodValue: "",
-        contactMethodType: "0",
-        contactPersonId: this.personId,
-      });
-    },
-
-    rowClick(row) {
-      console.log("row", row);
-      // this.$message.success("rowClick");
-      this.form = row;
-      this.personId = row.id;
-      this.getContactMethodList(row.id);
-    },
-
-    rowClickMethod(row) {
-      this.$message.success("rowClickMethod");
-    },
-  },
-};
-</script>
-<style scoped></style>
diff --git a/src/components/patientRegister/PatientRegisterSignList.vue b/src/components/patientRegister/PatientRegisterSignList.vue
new file mode 100644
index 0000000..e7c7913
--- /dev/null
+++ b/src/components/patientRegister/PatientRegisterSignList.vue
@@ -0,0 +1,299 @@
+<template>
+  <div>
+    <div style="display: flex">
+      <el-table :data="dataList" border width="100%" height="700" 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 style="margin-left: 10px">
+        <div class="listBtn">
+          <el-button type="success" @click="sign">签到</el-button>
+        </div>
+        <div class="listBtn">
+          <el-button type="primary" @click="scanSign">扫码签到</el-button>
+        </div>        
+      </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(["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;
+}
+</style>
diff --git a/src/components/patientRegister/patientRegisterAsbItem.vue b/src/components/patientRegister/patientRegisterAsbItem.vue
index 63ad735..6661db3 100644
--- a/src/components/patientRegister/patientRegisterAsbItem.vue
+++ b/src/components/patientRegister/patientRegisterAsbItem.vue
@@ -9,15 +9,16 @@
         <el-table-column prop="asbitemName" label="已选组合项目" width="120" />
         <el-table-column prop="standardPrice" label="标准价" />
         <el-table-column prop="discount" label="折扣" />
+        <el-table-column prop="amount" label="数量" width="50"/>
         <el-table-column prop="chargePrice" label="价格" />
         <el-table-column prop="payTypeFlag" label="支付方式">
           <template slot-scope="scope">
             <div>{{ ldddw(dict.payType, "id", scope.row.payTypeFlag, "displayName") }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="isCharge" label="收费">
+        <el-table-column prop="isCharge" label="收费" width="50">
           <template slot-scope="scope">
-            <el-checkbox :value="scope.row.isCharge == 'Y'" disabled />
+            <el-checkbox :value="scope.row.isCharge == 'Y'" />
           </template>
         </el-table-column>
         <el-table-column prop="checkCompleteFlag" label="状态">
@@ -25,13 +26,13 @@
             <div>{{ ldddw(dict.checkCompleteFlag, "id", scope.row.checkCompleteFlag, "displayName") }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="isLock" label="锁">
+        <el-table-column prop="isLock" label="锁" width="50">
           <template slot-scope="scope">
-            <el-checkbox :value="scope.row.isLock == 'Y'" disabled />
+            <el-checkbox :value="scope.row.isLock == 'Y'" />
           </template>
         </el-table-column>
         <el-table-column prop="creatorName" label="登记人"></el-table-column>
-        <el-table-column prop="creationTime" label="登记日期">
+        <el-table-column prop="creationTime" label="登记日期" width="90">
           <template slot-scope="scope">
             <div>{{ lmoment(scope.row.creationTime,'yyyy-MM-DD') }}</div>
           </template>
@@ -73,7 +74,7 @@ export default {
     //自定义计算列
     getSummaries(param) {
       const { columns, data } = param;
-      const sumCol = [2,4]  //需合计的列
+      const sumCol = [2,5]  //需合计的列
       const sums = [];
       columns.forEach((column, index) => {
         //显示合计列
diff --git a/src/views/customerOrg/patientRegisterRecover.vue b/src/views/customerOrg/patientRegisterRecover.vue
index 54609a6..01cdcdc 100644
--- a/src/views/customerOrg/patientRegisterRecover.vue
+++ b/src/views/customerOrg/patientRegisterRecover.vue
@@ -18,7 +18,7 @@
               </el-tab-pane>
               <!-- 联系人 -->
               <el-tab-pane label="基本信息" name="second">
-                <ContactPerson />
+       
               </el-tab-pane>
             </el-tabs>
           </div>
@@ -31,13 +31,13 @@
 import CustomerOrgTreeAll from "../../components/patientRegister/customerOrgTreeAll.vue";
 import CustomerOrgEdit from "../../components/patientRegisterSign/customerOrgEdit.vue";
 import PatientRegisterAsbItem from "../../components/patientRegister/patientRegisterAsbItem.vue";
-import ContactPerson from "../../components/patientRegister/ContactPerson.vue";
+
 export default {
   components: {
     CustomerOrgTreeAll,
     CustomerOrgEdit,
     PatientRegisterAsbItem,
-    ContactPerson,
+
   },
   data() {
     return {};
diff --git a/src/views/customerOrg/patientRegisterSign.vue b/src/views/customerOrg/patientRegisterSign.vue
index 67ba402..8d76f89 100644
--- a/src/views/customerOrg/patientRegisterSign.vue
+++ b/src/views/customerOrg/patientRegisterSign.vue
@@ -1,26 +1,19 @@
 <template>
   <div class="box">
-    <div>
-      <el-card style="width: 98%">
+    <div style="width: 100%">
+      <el-card>
         <div style="display: flex">
           <!-- 单位树组件 -->
           <div style="width: 15%; border: 1px solid">
-            <customerOrgTreeAll />
+            <CustomerOrgTreeAll />
           </div>
-          <div style="width: 85%">
-            <!-- 单位详情  录入与编辑  -->
-            <CustomerOrgEdit />
-            <!-- 体检次数  联系人  -->
-            <el-tabs style="margin-left: 10px">
-              <!-- 体检次数 -->
-              <el-tab-pane label="组合项目" name="first">
-                <PatientRegisterAsbItem />
-              </el-tab-pane>
-              <!-- 联系人 -->
-              <el-tab-pane label="基本信息" name="second">
-                <ContactPerson />
-              </el-tab-pane>
-            </el-tabs>
+          <div style="margin-left: 10px; width: 85%">
+            <!-- 查询条件  -->
+            <PatientRegisterQuery />
+
+            <!-- 人员列表信息  -->
+            <PatientRegisterSignList />
+
           </div>
         </div>
       </el-card>
@@ -28,27 +21,167 @@
   </div>
 </template>
 <script>
-import customerOrgTreeAll from "../../components/patientRegister/customerOrgTreeAll.vue";
-import CustomerOrgEdit from "../../components/patientRegisterSign/customerOrgEdit.vue";
-import PatientRegisterAsbItem from "../../components/patientRegister/patientRegisterAsbItem.vue";
-import ContactPerson from "../../components/patientRegister/ContactPerson.vue";
+import { mapState, mapActions } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { tcdate } from "../../utlis/proFunc";
+
+import CustomerOrgTreeAll from "../../components/patientRegister/customerOrgTreeAll.vue";
+import PatientRegisterQuery from "../../components/patientRegister/patientRegisterQuery.vue";
+import PatientRegisterSignList from "../../components/patientRegister/PatientRegisterSignList.vue";
+
 export default {
   components: {
-    customerOrgTreeAll,
-    CustomerOrgEdit,
-    PatientRegisterAsbItem,
-    ContactPerson,
+    CustomerOrgTreeAll,
+    PatientRegisterQuery,
+    PatientRegisterSignList,
   },
   data() {
-    return {};
+    return {
+      tabChoosed: "1",
+    };
   },
 
   created() {},
 
   //挂载完成
-  mounted() {},
+  mounted() {
+    this.dictInit();
+  },
+
+  computed: {
+    ...mapState(["dict", "patientRegister", "customerOrg"]),
+  },
+
+  methods: {
+    ...mapActions(["getCustomerOrgGroup"]),
+    //数据初始化
+    dictInit() {
+      //性别（仅档案用）
+      getapi("/api/app/sex").then((res) => {
+        if (res.code == 1) {
+          this.dict.sex = res.data;
+        }
+      });
+
+      //性别（查询）
+      getapi("/api/app/for-sex").then((res) => {
+        if (res.code == 1) {
+          this.dict.forSex = res.data;
+        }
+      });      
+
+      //体检中心
+      getapi("/api/app/organization-units/organization-unit-by-is-peis").then(
+        (res) => {
+          if (res.code == 1) {
+            this.dict.organization = res.data;
+          }
+        }
+      );
+
+      //体检单位
+      getapi("/api/app/customer-org/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.customerOrg = res.data.items;
+        }
+      });
+
+      //体检类别
+      getapi("/api/app/medical-type/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.medicalType = res.data.items;
+        }
+      });
+
+      //人员类别
+      getapi("/api/app/personnel-type/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.personnelType = res.data.items;
+        }
+      });
 
-  methods: {},
+      //婚姻状况
+      getapi("/api/app/marital-statuses").then((res) => {
+        if (res.code == 1) {
+          this.dict.maritalStatus = res.data.items;
+        }
+      });
+
+      //性激素期
+      getapi("/api/app/sex-hormone-term/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.sexHormoneTerm = res.data.items;
+        }
+      });
+
+      //民族
+      getapi("/api/app/nation/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.nation = res.data.items;
+        }
+      });
+
+      //籍惯 ，出生地
+      getapi("/api/app/birth-place/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.birthPlace = res.data.items;
+        }
+      });
+
+      //套餐
+      getapi("/api/app/medical-package/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.medicalPackage = res.data.items;
+        }
+      });
+
+      //分组，所有分组，不限单位，不限次数
+      getapi("/api/app/customer-org-group").then((res) => {
+        if (res.code == 1) {
+          this.dict.customerOrgGroupAll = res.data.items;
+        }
+      });
+
+      //支付方式
+      getapi("/api/app/pay-mode").then((res) => {
+        if (res.code == 1) {
+          this.dict.payMode = res.data;
+        }
+      });
+
+      //体检类别 树结构
+      getapi("/api/app/item-type/by-code-all").then((res) => {
+        if (res.code == 1) {
+          this.dict.itemTypeTree = res.data;
+          tcdate(this.dict.itemTypeTree);
+        }
+      });
+
+      getapi("/api/app/asbitem/in-filter?Filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.asbItemAll = res.data.items;
+        }
+      });
+
+      console.log("dict", this.dict);
+    },
+  },
+
+  //监听事件()
+  watch: {
+    //1级单位值改变，分组改变
+    "patientRegister.query.CustomerOrgParentId"(newVal, oldVal) {
+      console.log(
+        "watch patientRegister.query.CustomerOrgParentId newVal：",
+        newVal,
+        " oldVal：",
+        oldVal
+      );
+      if (newVal != oldVal && newVal !== this.dict.personOrgId) {
+        this.getCustomerOrgGroup(newVal);
+      }
+    },
+  },
 };
 </script>
 <style scoped>