tree seo

src/components/patientRegister/PatientRegisterEdit.vue

@@ -133,7 +133,7 @@
               </el-col>
               <el-col :span="3">
                 <el-form-item label="性激素期" prop="sexHormoneTermId">
-                  <el-select v-model="form.sexHormoneTermId" placeholder="请选择" filterable clearable size="small">
+                  <el-select v-model="form.sexHormoneTermId" placeholder="请选择" filterable clearable size="small" :disabled="isComplete">
                     <el-option v-for="item in dict.sexHormoneTerm" :key="item.id" :label="item.displayName"
                       :value="item.id">
                     </el-option>
@@ -636,7 +636,7 @@ export default {
       return this.form.completeFlag == '3' ? true:false;
     },
 
-    // 显示套餐
+    // 套餐 disabled 如完成体检亦不允许编辑
     displayPackage(){      
       let isPersonOrgId = true
       if(!this.isComplete){
@@ -650,7 +650,7 @@ export default {
       return isPersonOrgId      
     },
 
-    // 显示分组
+    // 分组 disabled 如完成体检亦不允许编辑
     displayGroup(){      
       let isPersonOrgId = true
       if(!this.isComplete){
@@ -782,7 +782,7 @@ export default {
       if (!patientRegisterId) { //添加
         objCopy(this.formInit, this.form);
         this.form.organizationUnitId = this.peisid; //体检中收
-        this.form.customerOrgId = this.patientRegister.query.customerOrgId //体检单位
+        this.form.customerOrgId = this.patientRegister.query.customerOrgId||this.dict.personOrgId //体检单位
         this.form.customerOrgParentId = await this.getParentCustomerOrgId(this.form.customerOrgId) //体检父单位
 
       }else{
@@ -796,13 +796,23 @@ export default {
       // 单位/个人 的分组与套餐处理
       await this.changeCustomerOrgId(this.form.customerOrgId)
       this.dataTransOpts.refresh.register_asbitem.M++ //触发所选组合项目刷新  
+      
+
     },
 
     //选择单位
     async changeCustomerOrgId(v){
-      let  customerOrgParentId = await this.getParentCustomerOrgId(v)
+      let customerOrgId = ""
+      if(Array.isArray(v) && v.length > 0){
+        customerOrgId = v[v.length - 1]
+      }else{
+        customerOrgId = v
+      }
+      let  customerOrgParentId = await this.getParentCustomerOrgId(customerOrgId)
 
       if(customerOrgParentId){
+        if (customerOrgParentId != this.dict.personOrgId) this.getCustomerOrgRegisterList(customerOrgParentId)
+          
         // 父单位被更改时，需要触发 修改 分组/套餐
         if(this.form.customerOrgParentId != customerOrgParentId){             
           if (customerOrgParentId == this.dict.personOrgId) {          
@@ -815,7 +825,7 @@ export default {
             this.form.customerOrgGroupId = null
             this.form.medicalPackageId = null
             //获取单位体检次数
-            this.getCustomerOrgRegisterList(customerOrgParentId)
+            // this.getCustomerOrgRegisterList(customerOrgParentId)
           }
 
           if(this.form.customerOrgParentId == this.dict.personOrgId){
@@ -851,14 +861,21 @@ export default {
       getapi(`/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${customerOrgParentId}`)
       .then(res =>{
         if(res.code != - 1){
+          console.log('获取单位体检次数',this.form.customerOrgRegisterId,res.data)
+          if(this.form.customerOrgRegisterId){
+            let lfind = arrayExistObj(res.data,"id",this.form.customerOrgRegisterId)
+            if(lfind == -1) this.form.customerOrgRegisterId = ''
+          }
+          if(!this.form.customerOrgRegisterId){
             this.customerOrgRegisterList = arrayFilter(res.data, 'isComplete', 'N')  //不显示已完成的体检次数
             if(this.customerOrgRegisterList.length > 0){
               this.form.customerOrgRegisterId = this.customerOrgRegisterList[this.customerOrgRegisterList.length - 1].id              
-            return getapi(`/api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${this.form.customerOrgRegisterId}`) //获取单位分组
             }
           }
+          if(this.form.customerOrgRegisterId) return getapi(`/api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${this.form.customerOrgRegisterId}`) //获取单位分组
+        }
       }).then(res =>{
-        if(res.code != -1){
+        if(res && res.code != -1){
           this.patientRegister.customerOrgGroup = res.data.items;
         }
       })     

src/router/index.js

@@ -15,8 +15,7 @@ const routes = [{
 {
     path: "/login",
     name: "login",
-        component: () =>
-            import ("../views/login/Login.vue"),
+    component: login,
 },
 {
     path: "/home",

src/views/customerOrg/customerOrg.vue

@@ -6,7 +6,7 @@
       </div>      
       <div style="display: flex;">
         <!-- 单位树组件 -->
-        <div :style="'border: 1px solid;width:200px; height:' +
+        <div :style="'border: 0px solid #888;width:200px; height:' +
           (window.pageHeight < 600 ? 470 : window.pageHeight - 130) +
           'px;'
           ">

src/views/customerOrg/customerOrgGroup.vue

@@ -116,10 +116,10 @@
                 <template>
                   <el-tag
                     class="move"
-                    style="cursor: move;"
+                    style="cursor: move;background-color: rgb(245, 245, 245);border: none;"
                     draggable="true"
                   >
-                    <i class="el-icon-d-caret"></i>
+                    <i class="el-icon-d-caret" style="width: 1rem; height: 1rem; color: rgb(113, 113, 113)"></i>
                   </el-tag>
                 </template>
               </el-table-column>

src/views/customerOrg/patientRegister.vue

@@ -8,7 +8,7 @@
         <!-- 单位树组件 -->
         <div
           :style="
-            'border: 1px solid;width:200px; height:' +
+            'border: 0px solid #888;width:200px; height:' +
             (window.pageHeight < 600 ? 470 : window.pageHeight - 130) +
             'px;'
           "