From 5770c7b02cb05c928ce0bba3c576d1d08832f3d0 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Thu, 14 Mar 2024 16:49:23 +0800
Subject: [PATCH] custorg

---
 src/components/customerOrg/ContactPerson.vue  |  47 +++-
 .../customerOrg/customerOrgEdit.vue           | 232 ++++++++----------
 .../customerOrg/customerOrgRegister.vue       |  97 +++++---
 .../customerOrg/customerOrgTree.vue           |  62 +----
 src/store/index.js                            |  65 ++---
 src/views/customerOrg/customerOrg.vue         |  30 +--
 6 files changed, 248 insertions(+), 285 deletions(-)

diff --git a/src/components/customerOrg/ContactPerson.vue b/src/components/customerOrg/ContactPerson.vue
index 232f9f1..4a7b52f 100644
--- a/src/components/customerOrg/ContactPerson.vue
+++ b/src/components/customerOrg/ContactPerson.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <div style="display: flex;">
-      <div :style="'width:' + (window.pageWidth - 200 - 120 - 30) + 'px;'">
-        <el-table :data="customerOrg.contactPersonList" border :height="(window.pageHeight < 600 ? 84:window.pageHeight - 432)/2"
+      <div :style="'width:' + (window.pageWidth - 200 - 110 - 25) + 'px;'">
+        <el-table :data="customerOrg.contactPersonList" border :height="(window.pageHeight < 600 ? 100:window.pageHeight - 400)/2"
           size="small" highlight-current-row @row-click="rowClick" ref="customerOrg.contactPersonList">
           <el-table-column prop="displayName" label="姓名" min-width="70" align="center"/>
           <el-table-column prop="title" label="职务" min-width="70" align="center"/>
@@ -25,7 +25,7 @@
           </el-table-column>
         </el-table>
 
-        <el-table :data="customerOrg.contactMethodList" border :height="(window.pageHeight < 600 ? 84:window.pageHeight - 432)/2"
+        <el-table :data="customerOrg.contactMethodList" border :height="(window.pageHeight < 600 ? 100:window.pageHeight - 400)/2"
           size="small" highlight-current-row @row-click="rowClickMethod" ref="customerOrg.contactMethodList">
           <el-table-column prop="contactMethodType" label="类型" width="60" align="center">
             <template slot-scope="scope">
@@ -179,21 +179,35 @@ export default {
   },
 
   //挂载完成
-  mounted() { },
+  mounted() { 
+    this.getContactPersonList(this.dataTransOpts.tableS.customer_org.id)
+  },
 
   computed: {
-    ...mapState(["window", "customerOrg"]),
+    ...mapState(["window", "customerOrg","dataTransOpts"]),
   },
 
   methods: {
     moment,checkPagePriv,
+    
     //获取联系人列表
     getContactPersonList(customerOrgId) {
+      if(!customerOrgId){
+        this.customerOrg.contactPersonList = [];
+        this.customerOrg.contactMethodList = []
+        return
+      }
       getapi(
         `/api/app/contact-person/in-customer-org-id/${customerOrgId}`
       ).then((res) => {
-        //console.log('res.data',res.data)
-        this.customerOrg.contactPersonList = res.data;
+        if(res.code != -1){
+          this.customerOrg.contactPersonList = res.data;      
+          if (res.data.length > 0) {
+            this.getContactMethodList(res.data[0].id);
+          } else {
+            this.customerOrg.contactMethodList = [];
+          }
+        }
       });
     },
 
@@ -427,12 +441,21 @@ export default {
   },
 
   watch: {
-    'customerOrgId' (newVal,oldVal){
-      console.log('watch customerOrgId',newVal,oldVal)
-      if(newVal != oldVal){
-        this.personId = ''
+    // 单位id未变时，强制刷新
+    "dataTransOpts.refresh.contact_person.M": {
+      // immediate: true,
+      handler(newVal, oldVal) {
+        console.log(`watch 联系人 newVal:${newVal} oldVal:${oldVal} customerOrgId: ${this.dataTransOpts.tableS.customer_org.id}`);
+        this.getContactPersonList(this.dataTransOpts.tableS.customer_org.id)
       }
-    }
+    },
+
+    // 'customerOrgId' (newVal,oldVal){
+    //   console.log('watch customerOrgId',newVal,oldVal)
+    //   if(newVal != oldVal){
+    //     this.personId = ''
+    //   }
+    // }
   },
 };
 </script>
diff --git a/src/components/customerOrg/customerOrgEdit.vue b/src/components/customerOrg/customerOrgEdit.vue
index 62f9428..53d1620 100644
--- a/src/components/customerOrg/customerOrgEdit.vue
+++ b/src/components/customerOrg/customerOrgEdit.vue
@@ -1,62 +1,47 @@
 <template>
   <div style="display: flex">
-    <div :style="'margin-left: 5px;width:' + (window.pageWidth - 200 - 120 - 25) + 'px;'">
+    <div :style="'margin-left: 5px;width:' + (window.pageWidth - 200 - 110 - 20) + 'px;'">
       <!--overflow-y: scroll;height:200px;-->
       <el-form ref="form" :model="form" label-width="85px" :rules="rules" size="medium">
         <el-row>
           <el-col :span="8">
             <el-form-item label="上级单位" prop="parentId">
               <el-cascader v-model="form.parentId" :options="customerOrg.customerOrgTree"
-                :props="{checkStrictly: true,expandTrigger: 'hover',...customerOrg.treeprops,}"
+                :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }"
                 :show-all-levels="false" clearable filterable disabled
-                :style="'width:' + Math.floor((window.pageWidth - 600) / 3) + 'px;'">
+                :style="'width:' + Math.floor((window.pageWidth - 585) / 3) + 'px;'">
               </el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="单位名称" prop="displayName">
-              <el-input class="enterToTab" v-model="form.displayName" placeholder="请输入单位名称" :disabled="customerOrg.oprStatus ? false:true"/>
+              <el-input class="enterToTab" v-model="form.displayName" placeholder="请输入单位名称"
+                :disabled="customerOrg.oprStatus ? false : true" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="单位简称" prop="shortName">
-              <el-input class="enterToTab" v-model="form.shortName" placeholder="请输入单位简称" :disabled="customerOrg.oprStatus ? false:true"/>
+              <el-input class="enterToTab" v-model="form.shortName" placeholder="请输入单位简称"
+                :disabled="customerOrg.oprStatus ? false : true" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="体检中心" prop="organizationUnitId">
-              <el-select
-                v-model="form.organizationUnitId"
-                placeholder="请选择"
-                filterable
-                :disabled="peisid ? true : false"
-                :style="'width:' + Math.floor((window.pageWidth - 600) / 3) + 'px;'"
-              >
-                <el-option
-                  v-for="item in data.organizationdata"
-                  :key="item.id"
-                  :label="item.displayName"
-                  :value="item.id"
-                />
+              <el-select v-model="form.organizationUnitId" placeholder="请选择" filterable :disabled="peisid ? true : false"
+                :style="'width:' + Math.floor((window.pageWidth - 585) / 3) + 'px;'">
+                <el-option v-for="item in data.organizationdata" :key="item.id" :label="item.displayName"
+                  :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="单位性质" prop="orgTypeId">
-              <el-select class="enterToTab" 
-                v-model="form.orgTypeId"
-                placeholder="请选择"
-                filterable
-                :style="'width:' + Math.floor((window.pageWidth - 600) / 3) + 'px;'"
-              >
-                <el-option
-                  v-for="item in data.customerOrgType"
-                  :key="item.id"
-                  :label="item.displayName"
-                  :value="item.id"
-                />
+              <el-select class="enterToTab" v-model="form.orgTypeId" placeholder="请选择" filterable
+                :style="'width:' + Math.floor((window.pageWidth - 585) / 3) + 'px;'">
+                <el-option v-for="item in data.customerOrgType" :key="item.id" :label="item.displayName"
+                  :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -75,7 +60,7 @@
 
           <el-col :span="8">
             <el-form-item label="联系电话" prop="telephone">
-              <el-input class="enterToTab"  v-model="form.telephone" placeholder="请输入联系电话" />
+              <el-input class="enterToTab" v-model="form.telephone" placeholder="请输入联系电话" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -130,12 +115,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="地址" prop="address">
-              <el-input class="enterToTab" 
-                v-model="form.address"
-                placeholder="请输入地址"
-                maxlength="50"
-                show-word-limit
-              />
+              <el-input class="enterToTab" v-model="form.address" placeholder="请输入地址" maxlength="50" show-word-limit />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -152,13 +132,7 @@
           </el-col>
           <el-col :span="7">
             <el-form-item label="创建时间">
-              <el-date-picker
-                v-model="form.creationTime"
-                type="datetime"
-                size="small"
-                style="width: 100%"
-                disabled
-              />
+              <el-date-picker v-model="form.creationTime" type="datetime" size="small" style="width: 100%" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="5">
@@ -168,13 +142,8 @@
           </el-col>
           <el-col :span="7">
             <el-form-item label="修改时间">
-              <el-date-picker
-                v-model="form.lastModificationTime"
-                type="datetime"
-                size="small"
-                style="width: 100%"
-                disabled
-              />
+              <el-date-picker v-model="form.lastModificationTime" type="datetime" size="small" style="width: 100%"
+                disabled />
             </el-form-item>
           </el-col>
         </el-row>
@@ -182,22 +151,17 @@
     </div>
     <!-- 按钮区域 -->
     <div style="width: 110px; margin-left: 10px; margin-top: 3%">
-      <div v-show="checkPagePriv(pagePriv.privs,'新增单位')" class="btnList">
-        <el-button type="primary" @click="add('form', '')" class="commonbutton"
-          >新增单位</el-button
-        >
+      <div v-show="checkPagePriv(pagePriv.privs, '新增单位')" class="btnList">
+        <el-button type="primary" @click="btnAdd('form', '')" class="commonbutton">新增单位</el-button>
       </div>
-      <div v-show="checkPagePriv(pagePriv.privs,'新增子单位')" class="btnList">
-        <el-button type="primary" @click="add('form', 'child')" class="commonbutton"
-          >新增子单位</el-button
-        >
+      <div v-show="checkPagePriv(pagePriv.privs, '新增子单位')" class="btnList">
+        <el-button type="primary" @click="btnAdd('form', 'child')" class="commonbutton">新增子单位</el-button>
       </div>
-      <div v-show="checkPagePriv(pagePriv.privs,'保存')" class="btnList">
-        <el-button type="success" @click="btnSubmit('form')" class="commonbutton"
-          ><i class="el-icon-check"></i>保存</el-button
-        >
+      <div v-show="checkPagePriv(pagePriv.privs, '保存')" class="btnList">
+        <el-button type="success" @click="btnSubmit('form')" class="commonbutton"><i
+            class="el-icon-check"></i>保存</el-button>
       </div>
-      <div v-show="checkPagePriv(pagePriv.privs,'删除')" class="btnList">
+      <div v-show="checkPagePriv(pagePriv.privs, '删除')" class="btnList">
         <el-button type="danger" @click="del('form')" class="commonbutton">
           <i class="el-icon-delete"></i>删除
         </el-button>
@@ -208,7 +172,7 @@
 <script>
 import { mapState, mapMutations } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { getPagePriv,checkPagePriv,tcdate, objCopy, deepCopy, arrayExistObj } from "../../utlis/proFunc";
+import { getPagePriv, checkPagePriv, tcdate, objCopy, deepCopy, arrayExistObj } from "../../utlis/proFunc";
 import { getTreeNode, getTreePids } from "../../utlis/tree";
 
 export default {
@@ -216,10 +180,10 @@ export default {
   props: ["id"],
   data() {
     return {
-      pagePriv:{
-        routeUrlorPageName:'customerOrg', //当前页面归属路由或归属页面权限名称
-        privs:[] // 页面权限
-      }, 
+      pagePriv: {
+        routeUrlorPageName: 'customerOrg', //当前页面归属路由或归属页面权限名称
+        privs: [] // 页面权限
+      },
       isActiveBox: false,
       customerOrgEditStyle: "height:400px;",
       data: {
@@ -252,28 +216,29 @@ export default {
         lastModifierName: "",
         lastModificationTime: null,
       }, //初始化  单位 记录 目前新增与更新是一致
-
+      formInit: {},
       rules: {
         displayName: [{ required: true, message: "请输入单位名称", trigger: "blur" }],
         shortName: [{ required: true, message: "请输入单位简写", trigger: "blur" }],
+        orgTypeId: [{ required: true, message: "请输入单位性质", trigger: "blur" }],        
         organizationUnitId: [
           { required: true, message: "请输入体检中心", trigger: "blur" },
         ],
       },
-
       isshow: false,
     };
   },
 
-  created() {   
+  created() {
     //获取用户当前页面的权限
     let userPriv = window.sessionStorage.getItem('userPriv')
-    if(userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
-    
+    if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
+
     this.peisid = window.sessionStorage.getItem("peisid");
     if (!this.form.id) {
       this.form.organizationUnitId = this.peisid;
     }
+    this.formInit = deepCopy(this.form)
   },
 
   //挂载完成
@@ -281,22 +246,17 @@ export default {
     // 表单中 回车 代替 tab
     this.enterToTab();
 
-    //获取体中心字典数据
-    this.getoraniztion();
-
-    //获取单位类别列表
-    this.getOrgType();
-
-    this.getCustomerOrgRd(this.id);
-
+    // 初始化 字典数据
+    this.dictInit()
 
+    this.getCustomerOrgRd(this.dataTransOpts.tableS.customer_org.id);
   },
 
   computed: {
-    ...mapState(["customerOrg", "window"]),
+    ...mapState(["customerOrg", "window", "dataTransOpts"]),
   },
   methods: {
-    ...mapMutations(["setData"]),checkPagePriv,
+    ...mapMutations(["setData"]), checkPagePriv,
 
     changeBox(type) {
       //赋值
@@ -309,9 +269,13 @@ export default {
 
     //获取单位信息
     getCustomerOrgRd(id) {
-      if (!id) return;
+      if (!id){
+        this.form = deepCopy(this.formInit)
+        return;
+      }
       getapi(`/api/app/customer-org/${id}`).then((res) => {
         if (res.code != -1) {
+          this.dataTransOpts.tableS.customer_org.id = res.data.id
           objCopy(res.data, this.form);
 
           if (res.data.isActive == "Y") {
@@ -328,15 +292,14 @@ export default {
       });
     },
 
-    //获取组织体检中心数据
-    getoraniztion() {
+    // 初始化 字典数据
+    dictInit() {      
+      //获取组织体检中心数据   
       getapi("/api/app/organization-units/organization-unit-by-is-peis").then((res) => {
         this.data.organizationdata = res.data;
       });
-    },
 
-    //获取单位类别列表
-    getOrgType() {
+      //获取单位类别列表
       getapi("/api/app/customer-org-type/in-filter").then((res) => {
         this.data.customerOrgType = res.data.items;
       });
@@ -359,20 +322,20 @@ export default {
           };
 
           if (body.parentId) {
-            let pNode = getTreeNode(this.customerOrg.customerOrgTree,"treeChildren","id",body.parentId);
+            let pNode = getTreeNode(this.customerOrg.customerOrgTree, "treeChildren", "id", body.parentId);
             if (!pNode.treeChildren) this.$set(pNode, 'treeChildren', []);
             //pNode.treeChildren = [] 
             pNode.treeChildren.push(node);
-            
+
           } else {
             this.customerOrg.customerOrgTree.push(node);
           }
           this.customerOrg.defaultExpandedKeys = []
-          if(body.parentId){
+          if (body.parentId) {
             this.customerOrg.defaultExpandedKeys.push(body.parentId)
           }
           this.customerOrg.defaultExpandedKeys.push(body.id)
-          this.customerOrg.treeCurrentNodekey = body.id;          
+          this.customerOrg.treeCurrentNodekey = body.id;
           //console.log("this.customerOrg.treeCurrentNodekey",this.customerOrg.treeCurrentNodekey);
           break;
 
@@ -402,7 +365,7 @@ export default {
             body
           );
           //tree, childNodeName, pidName, idName, idVal  getTreeNode(this.customerOrg.customerOrgTree, "treeChildren", "id", body);
-          console.log('pids',pids,body)
+          console.log('pids', pids, body)
           if (!pids || pids.length < 2) {
             lfind = arrayExistObj(this.customerOrg.customerOrgTree, "id", body);
             if (lfind > -1) this.customerOrg.customerOrgTree.splice(lfind, 1);
@@ -423,8 +386,8 @@ export default {
       }
     },
 
-    onkeyup(e){
-      console.log('onkeyup e',e)
+    onkeyup(e) {
+      console.log('onkeyup e', e)
     },
 
     //提交
@@ -486,45 +449,42 @@ export default {
         }
       });
     },
+
     //新增弹框
-    async add(formName, child) {
+    async btnAdd(formName, child) {
       await this.$refs[formName].resetFields();
       //console.log('this.peisid',this.peisid)
-      if(!this.peisid || this.peisid == 'null'){
+      if (!this.peisid || this.peisid == 'null') {
         this.$message.warning("该用户未选归属体检中心，不能执行此操作！");
         return
       }
 
+      this.form = deepCopy(this.formInit)
       if (child) {
-        if (!this.customerOrg.customerOrgId) {
+        if (!this.dataTransOpts.tableS.customer_org.id) {
           this.$message.warning("请先选择上级单位");
           this.customerOrg.oprStatus = ''
           return;
         }
-        this.customerOrg.customerOrgRd.id = "";
-        this.customerOrg.customerOrgRd = {
-          id: "",
-          isLock: "N",
-          isActive: "Y",
-          parentId: this.customerOrg.customerOrgId,
-        };
-      } else {
-        this.customerOrg.customerOrgRd = {
-          id: "",
-          isLock: "N",
-          isActive: "Y",
-          parentId: null,
-        };
+        this.form.parentId = this.dataTransOpts.tableS.customer_org.id       
+      } else {        
+        // 新增一级单位时，清除 vuex 一级单位ID       
+        this.dataTransOpts.tableS.customer_org.parent_id = ''        
       }
       this.customerOrg.oprStatus = 'add'
-
-      objCopy(this.customerOrg.customerOrgRd, this.form);
-      this.customerOrg.customerOrgId = "";
+      // this.customerOrg.customerOrgId = "";
+
+      this.dataTransOpts.tableS.customer_org.id = ''
+      setTimeout(() => {
+          this.dataTransOpts.refresh.customer_org_register.M++
+          this.dataTransOpts.refresh.contact_person.M++
+        }, 20);
+      
     },
 
     //删除
     del(formName) {
-      if(!this.customerOrg.customerOrgRd.id){
+      if (!this.customerOrg.customerOrgRd.id) {
         this.$message.warning("请先选中要删除的节点")
         return
       }
@@ -541,11 +501,11 @@ export default {
       }).then((res) => {
         if (res.code != -1) {
           console.log("删除 操作成功");
-          this.getCustomerOrgTree("delete", this.customerOrg.customerOrgRd.id);            
-          this.customerOrg.customerOrgRegisterList = []         
+          this.getCustomerOrgTree("delete", this.customerOrg.customerOrgRd.id);
+          this.customerOrg.customerOrgRegisterList = []
           this.customerOrg.contactPersonList = []
           this.customerOrg.contactMethodList = []
-          this.setData({ key: "customerOrg.customerOrgRd", value: { id: "" } });            
+          this.setData({ key: "customerOrg.customerOrgRd", value: { id: "" } });
           this.$refs[formName].resetFields();
           this.customerOrg.oprStatus = ''
           this.customerOrg.customerOrgId = ''
@@ -558,43 +518,45 @@ export default {
         }
       });
     },
-    
+
     //回车替代tab键
     enterToTab() {
       this.$nextTick(() => {
         let inputs = document.querySelectorAll("form input"); //用数组可以读取多个标签的元素  //.inline-input
         //console.log('inputs',inputs);
         // 为每个输入框添加键盘事件监听器
-        inputs.forEach((input,i) => {
-          
+        inputs.forEach((input, i) => {
+
           input.addEventListener('keydown', (event) => {
-            
+
             // 如果按下的是回车键
             // console.log('data-ismultiline',input.getAttribute('data-ismultiline'));
 
             if (event.keyCode === 13) {
               // 阻止回车键的默认行为（换行）
-              event.preventDefault();   
-              
+              event.preventDefault();
+
               // 跳至下一个输入框
-              for(let j=i+1; j<inputs.length;j++){
-                if(inputs[j].getAttribute('disabled') != "disabled" ){
+              for (let j = i + 1; j < inputs.length; j++) {
+                if (inputs[j].getAttribute('disabled') != "disabled") {
                   inputs[j].focus();
                   break;
                 }
-              }              
+              }
             }
           });
         });
       });
-    }, 
+    },
   },
 
   watch: {
-    id(newVal, oldVal) {
-      console.log("watch getCustomerOrgRd ", newVal, oldVal);
-      if (newVal != oldVal && newVal != "") {
-        this.getCustomerOrgRd(newVal);
+    // 单位id未变时，强制刷新
+    "dataTransOpts.refresh.customer_org.S": {
+      // immediate: true,
+      handler(newVal, oldVal) {
+        console.log(`watch 体检单位 newVal:${newVal} oldVal:${oldVal} customerOrgId: ${this.dataTransOpts.tableS.customer_org.id}`);
+        this.getCustomerOrgRd(this.dataTransOpts.tableS.customer_org.id);
       }
     },
   },
diff --git a/src/components/customerOrg/customerOrgRegister.vue b/src/components/customerOrg/customerOrgRegister.vue
index 971411b..7dc9899 100644
--- a/src/components/customerOrg/customerOrgRegister.vue
+++ b/src/components/customerOrg/customerOrgRegister.vue
@@ -1,9 +1,10 @@
 <template>
   <div style="display: flex;">
-    <div :style="'width:' + (window.pageWidth - 200 - 120 - 30) + 'px;'">
-      <el-table :data="customerOrg.customerOrgRegisterList" border :height="window.pageHeight < 600 ? 168:window.pageHeight - 432" size="small"
-        highlight-current-row @row-click="rowClick" ref="customerOrg.customerOrgRegisterList">
-        <el-table-column prop="medicalTimes" label="体检次数" width="70" align="center"/>
+    <div :style="'width:' + (window.pageWidth - 200 - 110 - 25) + 'px;'">
+      <el-table :data="customerOrg.customerOrgRegisterList" border
+        :height="window.pageHeight < 600 ? 200 : window.pageHeight - 400" size="small" highlight-current-row
+        @row-click="rowClick" ref="customerOrg.customerOrgRegisterList">
+        <el-table-column prop="medicalTimes" label="体检次数" width="70" align="center" />
         <el-table-column prop="beginTime" label="开始日期" min-width="80" align="center">
           <template slot-scope="scope">
             {{ moment(scope.row.beginTime).format('yyyy-MM-DD') }}
@@ -20,34 +21,34 @@
           </template>
         </el-table-column>
         <el-table-column prop="creatorName" label="创建者" min-width="70" align="center" />
-        <el-table-column prop="creationTime" label="创建时间" min-width="120" align="center" >
+        <el-table-column prop="creationTime" label="创建时间" min-width="120" align="center">
           <template slot-scope="scope">
             <div v-if="scope.row.creationTime">
               {{ moment(scope.row.creationTime).format('yyyy-MM-DD HH:mm:ss') }}
-            </div>            
+            </div>
           </template>
         </el-table-column>
         <el-table-column prop="lastModifierName" label="修改者" min-width="70" align="center" />
-        <el-table-column prop="lastModificationTime" label="修改时间" min-width="120" align="center" >
+        <el-table-column prop="lastModificationTime" label="修改时间" min-width="120" align="center">
           <template slot-scope="scope">
             <div v-if="scope.row.lastModificationTime">
               {{ moment(scope.row.lastModificationTime).format('yyyy-MM-DD HH:mm:ss') }}
-            </div>            
+            </div>
           </template>
         </el-table-column>
       </el-table>
     </div>
     <div style="margin-left: 10px; margin-top: 20px">
-      <div v-show="checkPagePriv(pagePriv.privs,'新增次数')" style="margin-top: 10px">
+      <div v-show="checkPagePriv(pagePriv.privs, '新增次数')" style="margin-top: 10px">
         <el-button type="primary" @click="add" class="commonbutton">新增次数</el-button>
       </div>
-      <div v-show="checkPagePriv(pagePriv.privs,'体检完成')" style="margin-top: 10px">
+      <div v-show="checkPagePriv(pagePriv.privs, '体检完成')" style="margin-top: 10px">
         <el-button type="success" @click="edit" class="commonbutton">体检完成</el-button>
       </div>
-      <div v-show="checkPagePriv(pagePriv.privs,'取消完成')" style="margin-top: 10px">
+      <div v-show="checkPagePriv(pagePriv.privs, '取消完成')" style="margin-top: 10px">
         <el-button type="warning" @click="cansel" class="commonbutton">取消完成</el-button>
       </div>
-      <div v-show="checkPagePriv(pagePriv.privs,'删除次数')" style="margin-top: 10px">
+      <div v-show="checkPagePriv(pagePriv.privs, '删除次数')" style="margin-top: 10px">
         <el-button type="danger" @click="btnDel" class="commonbutton">删除次数</el-button>
       </div>
     </div>
@@ -57,51 +58,58 @@
 import moment from "moment";
 import { mapState, mapMutations } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { getPagePriv,checkPagePriv,tcdate, objCopy, deepCopy,arrayExistObj } from "../../utlis/proFunc";
+import { getPagePriv, checkPagePriv, tcdate, objCopy, deepCopy, arrayExistObj } from "../../utlis/proFunc";
 
 export default {
   components: {},
   data() {
     return {
-      pagePriv:{
-        routeUrlorPageName:'customerOrg', //当前页面归属路由或归属页面权限名称
-        privs:[] // 页面权限
-      },  
+      pagePriv: {
+        routeUrlorPageName: 'customerOrg', //当前页面归属路由或归属页面权限名称
+        privs: [] // 页面权限
+      },
       customerOrgRegisterId: "", //体检次数ID
     };
   },
 
-  created() { 
+  created() {
     //获取用户当前页面的权限
     let userPriv = window.sessionStorage.getItem('userPriv')
-    if(userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
+    if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
   },
 
   //挂载完成
-  mounted() { },
+  mounted() {
+    this.getCustomerOrgRegisterList(this.dataTransOpts.tableS.customer_org_register.pid);
+  },
 
   computed: {
-    ...mapState(["customerOrg", "window"]),
+    ...mapState(["customerOrg", "window", "dataTransOpts"]),
   },
 
   methods: {
-    moment,checkPagePriv,
+    moment, checkPagePriv,
     //点击体检次数行
     rowClick(row) {
       this.customerOrgRegisterId = row.id;
     },
 
     //获取体检次数列表
-    getCustomerOrgRegisterList(customerOrgId) {
-      getapi(
-        `/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${customerOrgId}`
-      ).then((res) => {
-        //console.log('res.data',res.data)
-        this.customerOrg.customerOrgRegisterList = res.data;
-      });
-      this.customerOrgRegisterId = "";
+    getCustomerOrgRegisterList(customerOrgPid) {
+      if (customerOrgPid) {
+        getapi(
+          `/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${customerOrgPid}`
+        ).then((res) => {
+          if (res.code != -1) {
+            this.customerOrg.customerOrgRegisterList = res.data;
+          }
+        });
+      } else {
+        this.customerOrg.customerOrgRegisterList = []
+      }
     },
 
+
     //设置体检次数状态
     setOrgRegisterState(IsComplete) {
       if (!this.customerOrg.customerOrgId || !this.customerOrgRegisterId) {
@@ -122,7 +130,7 @@ export default {
     //体检次数 相关操作
     async add() {
       //console.log("增加次数 addTimes");
-      if (!this.customerOrg.customerOrgId){
+      if (!this.customerOrg.customerOrgId) {
         this.$message.warning("单位信息未保存！");
         return;
       }
@@ -136,7 +144,7 @@ export default {
           }
         })
       } catch (error) {
-        this.$message.error("操作失败！"+err);
+        this.$message.error("操作失败！" + err);
       }
     },
 
@@ -144,13 +152,13 @@ export default {
       //console.log("体检完成 editCustomerOrgRegister");
       this.setOrgRegisterState("Y");
     },
-    
+
     cansel() {
       //console.log("体检完成 editCustomerOrgRegister");
       this.setOrgRegisterState("N");
     },
 
-    btnDel(){
+    btnDel() {
       if (!this.customerOrg.customerOrgId || !this.customerOrgRegisterId) {
         //console.log(this.customerOrg.customerOrgId, this.customerOrgRegisterId);
         this.$message.warning('请选中要操作的体检次数')
@@ -165,17 +173,28 @@ export default {
         //console.log('{patientRegisterIds}',{patientRegisterIds})
         return deletapi(`/api/app/customer-org-register/${this.customerOrgRegisterId}`);
       }).then((res) => {
-        if(res.code != -1)  {
+        if (res.code != -1) {
           console.log("删除 操作成功");
           let lfind = arrayExistObj(this.customerOrg.customerOrgRegisterList, 'id', this.customerOrgRegisterId)
-          if(lfind > - 1) this.customerOrg.customerOrgRegisterList.splice(lfind,1)
+          if (lfind > - 1) this.customerOrg.customerOrgRegisterList.splice(lfind, 1)
           this.customerOrgRegisterId = ''
-        }          
+        }
       }).catch((err) => {
         //
-      });      
+      });
     }
-    
+
+  },
+  //监听事件
+  watch: {
+    // 体检次数父ID未切换换时 也可以强制刷新数据
+    "dataTransOpts.refresh.customer_org_register.M": {
+      // immediate: true,
+      handler(newVal, oldVal) {
+        console.log(`watch 体检次数 newVal:${newVal} oldVal:${oldVal} customerOrgPid: ${this.dataTransOpts.tableS.customer_org.parent_id}`);
+        this.getCustomerOrgRegisterList(this.dataTransOpts.tableS.customer_org.parent_id);
+      }
+    },
   },
 };
 </script>
diff --git a/src/components/customerOrg/customerOrgTree.vue b/src/components/customerOrg/customerOrgTree.vue
index d65f5cf..5d854fa 100644
--- a/src/components/customerOrg/customerOrgTree.vue
+++ b/src/components/customerOrg/customerOrgTree.vue
@@ -3,9 +3,9 @@
     <div style="margin:2px 2px 2px 2px;">
       <el-input  placeholder="输入关键字进行过滤" v-model="filterText" size="small" />
     </div>
-    <div :style="'overflow: scroll;height:' +(window.pageHeight < 600 ? 432 : window.pageHeight - 168) + 'px;'">
+    <div>
       <el-tree :data="customerOrg.customerOrgTree" :props="customerOrg.treeprops" 
-        node-key="id" :filter-node-method="filterNode"
+        node-key="id" :filter-node-method="filterNode" :style="'overflow: scroll;width:200px;height:' +(window.pageHeight < 600 ? 465 : window.pageHeight - 135) + 'px;'"
         :default-expanded-keys="customerOrg.defaultExpandedKeys" 
         @node-click="treeclick" highlight-current ref="customerOrgTree">
         <span class="custom-tree-node" slot-scope="{ node, data }">
@@ -42,7 +42,7 @@ export default {
   },
   //<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>
   computed: {
-    ...mapState(["customerOrg", "window"]),
+    ...mapState(["customerOrg", "window", "dataTransOpts"]),
   },
 
   //创建组件后
@@ -83,43 +83,8 @@ export default {
         }
       });
     },
-
-    //获取单位基本信息
-    getCustomerOrgRd(id) {
-      this.customerOrg.customerOrgRd.id = id;
-      console.log('this.customerOrg.customerOrgRd.id',this.customerOrg.customerOrgRd.id)
-    },
-
-    //获取体检次数列表
-    getCustomerOrgRegisterList(customerOrgId) {
-      //api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=
-      getapi(
-        `/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${customerOrgId}`
-      ).then((res) => {
-        if(res.code != -1){
-          this.customerOrg.customerOrgRegisterList = res.data;
-        }
-      });
-    },
-
     
-
-    //获取联系人列表
-    getContactPersonList(customerOrgId) {
-      getapi(
-        `/api/app/contact-person/in-customer-org-id/${customerOrgId}`
-      ).then((res) => {
-        if(res.code != -1){
-          this.customerOrg.contactPersonList = res.data;      
-          if (res.data.length > 0) {
-            this.getContactMethodList(res.data[0].id);
-          } else {
-            this.customerOrg.contactMethodList = [];
-          }
-        }
-      });
-    },
-
+    
     //获取联系方式列表
     //api/app/contact-method/in-contact-person-id?ContactPersonId=3a0c08ad-4304-138b-d9e6-a7338739dfc4' \
     getContactMethodList(ContactPersonId) {
@@ -136,21 +101,20 @@ export default {
     treeclick(data) {
       //console.log(data.id + " 查询单位详情、体检次数、联系人等信息 " + data.displayName);//   api/app/customer-org/3a0c0439-a5ca-8a63-b2b9-e0eb24cb58b1
       this.customerOrg.oprStatus = 'edit'
-      this.customerOrg.customerOrgId = data.id;
-      this.getCustomerOrgRd(data.id);
-
-
+      
       //只有单位才有体检次数登记，部门无
-      let firstId = data.id //一级单位ID
+      this.dataTransOpts.tableS.customer_org.id = data.id //单位ID
+      this.dataTransOpts.tableS.customer_org.parent_id = data.id //一级单位ID
       if(data.parentId){
         let pids = getTreePids(this.customerOrg.customerOrgTree,"treeChildren", 'parentId', 'id', data.id)
-        console.log('pids',pids)
-        firstId = pids[pids.length - 2]
+        this.dataTransOpts.tableS.customer_org.parent_id = pids[pids.length - 2]
       }
-      this.getCustomerOrgRegisterList(firstId);
+      setTimeout(() => {
+        this.dataTransOpts.refresh.customer_org.S++
+        this.dataTransOpts.refresh.customer_org_register.M++
+        this.dataTransOpts.refresh.contact_person.M++
+      }, 20);      
 
-      //联系人
-      this.getContactPersonList(data.id);
     },
 
     //树过滤
diff --git a/src/store/index.js b/src/store/index.js
index fd42184..e9a178f 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -292,6 +292,9 @@ export default new Vuex.Store({
                 adp_roles: { S: 0, M: 0 }, // 角色
                 adp_users: { S: 0, M: 0 }, // 用户
                 asbitem: { S: 0, M: 0 }, // 组合项目
+                customer_org: { S: 0, M: 0 }, // 体检单位
+                contact_person: { S: 0, M: 0 }, // 体检单位联系人
+                customer_org_register: { S: 0, M: 0 }, // 单位体检次数
                 customer_org_group: { S: 0, M: 0 }, // 单位分组
                 customer_org_group_detail: { S: 0, M: 0 }, // 单位分组包含的组合项目明细
                 charge: { S: 0, M: 0 }, // 收费
@@ -307,6 +310,9 @@ export default new Vuex.Store({
                 adp_roles: { id: '' }, // 角色
                 adp_users: { id: '' }, // 用户
                 asbitem: { id: '' }, // 组合项目
+                customer_org: { id: '', parent_id: '' }, // 体检单位
+                contact_person: { id: '' }, // 体检单位联系人
+                customer_org_register: { id: '' }, // 单位体检次数 pid/单位一级节点
                 customer_org_group: { id: '' }, // 单位分组
                 customer_org_group_detail: { id: '' }, // 单位分组包含的组合项目明细
                 charge: { id: '' }, // 收费
@@ -322,6 +328,9 @@ export default new Vuex.Store({
                 adp_roles: [], // 角色
                 adp_users: [], // 用户
                 asbitem: [], // 组合项目
+                customer_org: [], // 体检单位
+                contact_person: [], // 体检单位联系人
+                customer_org_register: [], // 单位体检次数
                 customer_org_group: [], // 单位分组
                 customer_org_group_detail: [], // 单位分组包含的组合项目明细
                 charge: [], // 收费
@@ -332,15 +341,15 @@ export default new Vuex.Store({
                 register_check_item: [],
                 role_menu_info: [], // 角色对应的菜单
             },
-            plus:{
-                clearPatientRegisterQuery:0,
+            plus: {
+                clearPatientRegisterQuery: 0,
             }
 
         },
 
         // 弹窗控制
         dialogWin: {
-            CustomerOrgGroupEdit:false, // 单位分组 新增/编辑  
+            CustomerOrgGroupEdit: false, // 单位分组 新增/编辑  
             PatientList: false,  // 体检人员档案列表
             PatientRegisterEdit: false, // 体检人员登记 新增/编辑            
             PatientRegisterForChoose: false,  // 体检人员登记列表
@@ -377,35 +386,35 @@ export default new Vuex.Store({
 
         doctorCheckPrBaseInit(state) {
             state.doctorCheck.prBase = {
-                    id: '', //体检登记ID
-                    patientRegisterNo: '', //条码号
-                    patientNo: '', //档案号
-                    patientName: '', //姓名
-                    sexId: '', //性别
-                    medicalTimes: '', //体检次数
-                    maritalStatusId: '', //婚姻
-                    creationTime: '', //体检日期
-                    customerOrgParentName: '', //单位
-                    customerOrgName: '', //部门
-                    medicalTypeId: '', //体检类别
-                    personnelTypeId: '', //人员类别
-                    nationId: '', //民族
-                    mobileTelephone: '', //手机
-                } //人员体检登记显示基本信息
+                id: '', //体检登记ID
+                patientRegisterNo: '', //条码号
+                patientNo: '', //档案号
+                patientName: '', //姓名
+                sexId: '', //性别
+                medicalTimes: '', //体检次数
+                maritalStatusId: '', //婚姻
+                creationTime: '', //体检日期
+                customerOrgParentName: '', //单位
+                customerOrgName: '', //部门
+                medicalTypeId: '', //体检类别
+                personnelTypeId: '', //人员类别
+                nationId: '', //民族
+                mobileTelephone: '', //手机
+            } //人员体检登记显示基本信息
         },
 
         sumPREditInit(state) {
             state.sumDoctorCheck.sumPREdit = {
-                    id: '', //体检登记ID
-                    completeFlag: '', //完成状态
-                    summaryDoctor: '', //总检医生
-                    summaryDate: '', //总检日期
-                    isAudit: '', //审核状态
-                    auditDoctor: '', //审核医生
-                    auditDate: '', //审核日期
-                    isLock: '', //锁定状态
-                    patientId: '', //人员档案ID
-                } //人员体检登记显示基本信息
+                id: '', //体检登记ID
+                completeFlag: '', //完成状态
+                summaryDoctor: '', //总检医生
+                summaryDate: '', //总检日期
+                isAudit: '', //审核状态
+                auditDoctor: '', //审核医生
+                auditDate: '', //审核日期
+                isLock: '', //锁定状态
+                patientId: '', //人员档案ID
+            } //人员体检登记显示基本信息
         },
     },
 
diff --git a/src/views/customerOrg/customerOrg.vue b/src/views/customerOrg/customerOrg.vue
index 9ddddd8..b71a076 100644
--- a/src/views/customerOrg/customerOrg.vue
+++ b/src/views/customerOrg/customerOrg.vue
@@ -1,35 +1,21 @@
 <template>
   <div>
-    <el-card  class="elcard">
-      <div slot="header">
-        <span>体检单位设置</span>        
-      </div>      
+    <div>
+      <div class="contenttitle">
+        体检登记 /<span class="contenttitleBold">单位分组</span>
+      </div>    
       <div style="display: flex;">
         <!-- 单位树组件 -->
-        <div :style="'border: 0px solid #888;width:200px; height:' +
-          (window.pageHeight < 600 ? 470 : window.pageHeight - 130) +
-          'px;'
-          ">
+        <div>
           <CustomerOrgTree />
         </div>
-        <div :style="'display:block;width:' +
-          (window.pageWidth - 200 - 20) +
-          'px;height:' +
-          (window.pageHeight < 600 ? 470 : window.pageHeight - 130) +
-          'px;' +
-          (window.pageHeight < 600 ? 'overflow-y: scroll;' : '')
-          ">
+        <div>
           <!-- 单位详情  录入与编辑  -->
           <div style="height:270px;">
             <CustomerOrgEdit :id="customerOrg.customerOrgRd.id" />
           </div>
           <!-- 体检次数  联系人  -->
-          <el-tabs :style="'margin-left: 10px;width:' +
-            (window.pageWidth - 200 - 30) +
-            'px;height:' +
-            (window.pageHeight < 600 ? 202 : window.pageHeight - 398) +
-            'px;'
-            " v-model="tabChoosed">
+          <el-tabs style="margin-left: 10px;" v-model="tabChoosed">
             <!-- 体检次数 -->
             <el-tab-pane label="体检次数" name="1">
               <CustomerOrgRegister />
@@ -41,7 +27,7 @@
           </el-tabs>
         </div>
       </div>
-    </el-card>
+    </div>
   </div>
 </template>
 <script>