From 93bd86ba8f07d835fcaf54cfcd0d34e23d19018c Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 26 Feb 2024 18:47:58 +0800
Subject: [PATCH] menuinfo

---
 src/assets/css/global_table.css               |  2 +-
 src/components/customerOrg/ContactPerson.vue  | 12 ++---
 .../customerOrg/customerOrgEdit.vue           | 13 +++--
 .../customerOrg/customerOrgGroupAsbitem.vue   | 49 +++++++++++--------
 .../customerOrg/customerOrgRegister.vue       |  8 +--
 src/components/menuPage/MenuPageSet.vue       |  2 +-
 src/store/index.js                            |  3 ++
 src/views/customerOrg/customerOrgGroup.vue    | 46 +++++++++++------
 8 files changed, 83 insertions(+), 52 deletions(-)

diff --git a/src/assets/css/global_table.css b/src/assets/css/global_table.css
index 78ecaf7..23a2747 100644
--- a/src/assets/css/global_table.css
+++ b/src/assets/css/global_table.css
@@ -38,7 +38,7 @@
 .el-table .cell {
     padding: 0px 2px;
     /* 原始 默认 0px 10px; */
-    line-height: 20px;
+    line-height: 23px;
     /* 表格size="small"时 默认值 23px*/
 }
 
diff --git a/src/components/customerOrg/ContactPerson.vue b/src/components/customerOrg/ContactPerson.vue
index bac6676..3db9201 100644
--- a/src/components/customerOrg/ContactPerson.vue
+++ b/src/components/customerOrg/ContactPerson.vue
@@ -55,13 +55,13 @@
       </div>
       <div style="margin-left: 10px; margin-top: 20px">
         <div style="margin-top: 10px">
-          <el-button type="primary" @click="add" class="btnClass">新增</el-button>
+          <el-button type="primary" @click="add" class="commonbutton">新增</el-button>
         </div>
         <div style="margin-top: 10px">
-          <el-button type="success" @click="edit" class="btnClass">编辑</el-button>
+          <el-button type="success" @click="edit" class="commonbutton">编辑</el-button>
         </div>
         <div style="margin-top: 10px">
-          <el-button type="danger" @click="del" class="btnClass">删除</el-button>
+          <el-button type="danger" @click="del" class="commonbutton">删除</el-button>
         </div>
       </div>
     </div>
@@ -131,9 +131,9 @@
         </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('form')">确 定</el-button>
+        <el-button class="commonbutton" @click="dialogContactPerson = false">取 消</el-button>
+        <el-button type="success" class="commonbutton" @click="addMethod">新增联系方式</el-button>
+        <el-button type="primary" class="commonbutton" @click="submit('form')">确 定</el-button>
       </span>
     </el-dialog>
   </div>
diff --git a/src/components/customerOrg/customerOrgEdit.vue b/src/components/customerOrg/customerOrgEdit.vue
index cb38acf..1f199bd 100644
--- a/src/components/customerOrg/customerOrgEdit.vue
+++ b/src/components/customerOrg/customerOrgEdit.vue
@@ -183,22 +183,24 @@
     <!-- 按钮区域 -->
     <div style="width: 110px; margin-left: 10px; margin-top: 3%">
       <div class="btnList">
-        <el-button type="primary" @click="add('form', '')" class="btnClass"
+        <el-button type="primary" @click="add('form', '')" class="commonbutton"
           >新增单位</el-button
         >
       </div>
       <div class="btnList">
-        <el-button type="primary" @click="add('form', 'child')" class="btnClass"
+        <el-button type="primary" @click="add('form', 'child')" class="commonbutton"
           >新增子单位</el-button
         >
       </div>
       <div class="btnList">
-        <el-button type="success" @click="btnSubmit('form')" class="btnClass"
-          >保存</el-button
+        <el-button type="success" @click="btnSubmit('form')" class="commonbutton"
+          ><i class="el-icon-check"></i>保存</el-button
         >
       </div>
       <div class="btnList">
-        <el-button type="danger" @click="del('form')" class="btnClass">删除</el-button>
+        <el-button type="danger" @click="del('form')" class="commonbutton">
+          <i class="el-icon-delete"></i>删除
+        </el-button>
       </div>
     </div>
   </div>
@@ -592,6 +594,7 @@ export default {
 </script>
 <style scoped>
 @import "../../assets/css/global_form.css";
+@import "../../assets/css/global_button.css";
 
 
 
diff --git a/src/components/customerOrg/customerOrgGroupAsbitem.vue b/src/components/customerOrg/customerOrgGroupAsbitem.vue
index 6d7497f..a30d6ed 100644
--- a/src/components/customerOrg/customerOrgGroupAsbitem.vue
+++ b/src/components/customerOrg/customerOrgGroupAsbitem.vue
@@ -12,7 +12,7 @@
         </div>
         <div class="box">
           <el-table :data="dict.asbItem" border size="small"  highlight-current-row
-            :height="window.pageHeight < 668 ? 200:(window.pageHeight - 110 - 358)"
+            :height="window.pageHeight < 668 ? 195:(window.pageHeight - 110 - 363)"
             @row-dblclick="dbClickChoosedAsb" row-key="id"
             @selection-change="selectLeft" :row-class-name="handleRowClassName" 
             @row-click="chooseAsbItem">
@@ -30,19 +30,19 @@
 
       <!--中间操作按钮-->
       <div style="display: block;margin: 40px 10px 0 10px;">
-        <div>
-          <el-button class="btnClass" @click="addAbs(asbItemChoosed,'choosed')" >添加 <i class="el-icon-arrow-right"></i></el-button>
+        <div style="padding: 5px 0;">
+          <el-button class="commonbutton" @click="addAbs(asbItemChoosed,'choosed')" >添加 <i class="el-icon-arrow-right"></i></el-button>
         </div>
-        <div>
-          <el-button class="btnClass" @click="addAbs(asbItemChoosed,'all')">全部添加</el-button>
+        <div style="padding: 5px 0;">
+          <el-button class="difference" @click="addAbs(asbItemChoosed,'all')">全部添加</el-button>
         </div>
-        <div>
-          <el-button class="btnClass"
+        <div style="padding: 5px 0;">
+          <el-button class="commonbutton"
             @click="delAbs(customerOrgGroupAsbitemsChoosed,'choosed')">移除 <i class="el-icon-arrow-left"></i
           ></el-button>
         </div>
-        <div>
-          <el-button class="btnClass" @click="delAbs(customerOrgGroupAsbitemsChoosed,'all')">全部移除</el-button>
+        <div style="padding: 5px 0;">
+          <el-button class="difference" @click="delAbs(customerOrgGroupAsbitemsChoosed,'all')">全部移除</el-button>
         </div>        
       </div>
 
@@ -61,7 +61,7 @@
         <div class="box">
           <el-table :data="customerOrgGroupAsbitems" border size="small"
             @selection-change="selectRight" highlight-current-row 
-            :height="window.pageHeight < 668 ? 200:(window.pageHeight - 110 - 358)"
+            :height="window.pageHeight < 668 ? 195:(window.pageHeight - 110 - 363)"
             :summary-method="getSummaries" show-summary           
             :row-class-name="handleRowClassName" @row-dblclick="removeAbs" 
             @row-click="removeAsbItem" ref="tableCustomerOrgGroupAsbitems">
@@ -113,13 +113,13 @@
     <!--批量操作按钮（复制套餐与分组）-->
     <div style="display: block;margin-left: 10px;">
       <div style="margin-top: 50px;">
-        <el-button class="btnClass" @click="btnCopyGroup">复制分组</el-button>
+        <el-button class="commonbutton" @click="btnCopyGroup">复制分组</el-button>
       </div>
-      <div>
-        <el-button class="btnClass" @click="btnCopyMedicalPackage">复制套餐</el-button>
+      <div style="margin-top: 10px;">
+        <el-button class="commonbutton"  @click="btnCopyMedicalPackage">复制套餐</el-button>
       </div>
-      <div>
-        <el-button class="btnClass" @click="btnSave">保存</el-button>
+      <div style="margin-top: 10px;">
+        <el-button class="commonbutton"  @click="btnSave">保存</el-button>
       </div>
     </div>
     
@@ -308,7 +308,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(["window","dict","customerOrg"]),
+    ...mapState(["window","dict","dataTransOpts", "customerOrg"]),
   },
 
   created() {
@@ -960,10 +960,19 @@ export default {
   //监听事件
   watch: {
     //
-    "customerOrgGroup.id"(newVal, oldVal) {
-      console.log("customerOrgGroup.id ",newVal,oldVal);
-      if (newVal != oldVal) {
-        this.getCustomerOrgGroupAsbitems(newVal);
+    // "customerOrgGroup.id"(newVal, oldVal) {
+    //   console.log("customerOrgGroup.id ",newVal,oldVal);
+    //   if (newVal != oldVal) {
+    //     this.getCustomerOrgGroupAsbitems(newVal);
+    //   }
+    // },
+
+    // 体检分组ID未切换换时 也可以强制刷新数据
+    "dataTransOpts.refresh.customer_org_group_detail.M":{
+      immediate:true,
+      handler(newVal, oldVal) {
+        console.log(`watch 体检分组 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.customerOrgGroup.id}`);        
+        this.getCustomerOrgGroupAsbitems(this.customerOrgGroup.id);
       }
     },
   },
diff --git a/src/components/customerOrg/customerOrgRegister.vue b/src/components/customerOrg/customerOrgRegister.vue
index 143b620..9d5a270 100644
--- a/src/components/customerOrg/customerOrgRegister.vue
+++ b/src/components/customerOrg/customerOrgRegister.vue
@@ -39,16 +39,16 @@
     </div>
     <div style="margin-left: 10px; margin-top: 20px">
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="add" class="btnClass">增加次数</el-button>
+        <el-button type="primary" @click="add" class="commonbutton">增加次数</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="success" @click="edit" class="btnClass">体检完成</el-button>
+        <el-button type="success" @click="edit" class="commonbutton">体检完成</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="warning" @click="cansel" class="btnClass">取消完成</el-button>
+        <el-button type="warning" @click="cansel" class="commonbutton">取消完成</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="danger" @click="btnDel" class="btnClass">删除次数</el-button>
+        <el-button type="danger" @click="btnDel" class="commonbutton">删除次数</el-button>
       </div>
     </div>
   </div>
diff --git a/src/components/menuPage/MenuPageSet.vue b/src/components/menuPage/MenuPageSet.vue
index 0d8a49b..286f419 100644
--- a/src/components/menuPage/MenuPageSet.vue
+++ b/src/components/menuPage/MenuPageSet.vue
@@ -8,7 +8,7 @@
         <el-button @click="btnSubmit" size="small">提交</el-button>
       </div>
     </div>
-    <div style="overflow: scroll;height:600px;">
+    <div style="overflow: scroll;height:450px;">
       <el-tree :data="menuInfoView" :props="customerOrg.treeprops" 
         node-key="id" :filter-node-method="filterNode" show-checkbox
         default-expand-all 
diff --git a/src/store/index.js b/src/store/index.js
index 96f99b0..ec11fcb 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -276,6 +276,7 @@ export default new Vuex.Store({
         adp_users: { S: 0, M: 0 }, // 用户
         asbitem: { S: 0, M: 0 }, // 组合项目
         customer_org_group: { S: 0, M: 0 }, // 单位分组
+        customer_org_group_detail: { S: 0, M: 0 }, // 单位分组包含的组合项目明细
         menu_info: { S: 0, M: 0 }, // 菜单与页面
         patient_register: { S: 0, M: 0 },  // 体检人员记录
         register_asbitem: { S: 0, M: 0 },  // 体检人员登记的项目（合并前）
@@ -289,6 +290,7 @@ export default new Vuex.Store({
         adp_users: { id: '' }, // 用户
         asbitem: { id: '' }, // 组合项目
         customer_org_group: { id: '' }, // 单位分组
+        customer_org_group_detail: { id: '' }, // 单位分组包含的组合项目明细
         menu_info: { id: '' }, // 菜单与页面
         patient_register: { id: '' },
         register_asbitem: { id: '' },
@@ -302,6 +304,7 @@ export default new Vuex.Store({
         adp_users: [], // 用户
         asbitem: [], // 组合项目
         customer_org_group: [], // 单位分组
+        customer_org_group_detail: [], // 单位分组包含的组合项目明细
         menu_info: [], // 菜单与页面
         patient_register: [],
         register_asbitem: [],
diff --git a/src/views/customerOrg/customerOrgGroup.vue b/src/views/customerOrg/customerOrgGroup.vue
index 6e92a3c..54ab05d 100644
--- a/src/views/customerOrg/customerOrgGroup.vue
+++ b/src/views/customerOrg/customerOrgGroup.vue
@@ -128,23 +128,23 @@
         </div>
         <!--按钮-->
         <div style="display: block;margin-left: 10px;">
-          <div style="margin-top: 30px;">      
-            <el-button class="btnClass"  @click="btnAdd">新增</el-button>
+          <div style="margin-top: 35px;">      
+            <el-button class="commonbutton"  @click="btnAdd">新增</el-button>
           </div>
-          <div>
-            <el-button class="btnClass" @click="btnEdit" >编辑</el-button> 
+          <div style="margin-top: 8px;">
+            <el-button class="commonbutton" @click="btnEdit" >编辑</el-button> 
           </div>
-          <div>        
-            <el-button class="btnClass" @click="btnDel" >删除</el-button> 
+          <div style="margin-top: 8px;">
+            <el-button class="commonbutton" @click="btnDel" >删除</el-button> 
           </div>
-          <div>         
-            <el-button class="btnClass" @click="btnSetTop" >置顶</el-button> 
+          <div style="margin-top: 8px;">
+            <el-button class="commonbutton" @click="btnSetTop" >置顶</el-button> 
           </div>
-          <div>         
-            <el-button class="btnClass" @click="btnSetBottom">置低</el-button>
+          <div style="margin-top: 8px;">
+            <el-button class="commonbutton" @click="btnSetBottom">置低</el-button>
           </div>
-          <div>
-            <el-button class="btnClass" @click="btnSort" :disabled="!isDrag" >保存排序</el-button>
+          <div style="margin-top: 8px;">
+            <el-button class="commonbutton" @click="btnSort" :disabled="!isDrag" >保存排序</el-button>
           </div>
         </div>
       </div>
@@ -294,7 +294,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(["personnelUnit", "window", "dict"]),
+    ...mapState(["personnelUnit", "window", "dict", "dataTransOpts"]),
   },
   created() {
     this.rowDrop();
@@ -481,6 +481,17 @@ export default {
 
     //选择单位
     changeCustomerOrg(v) {
+      if(!v){
+        this.customerOrgRegisterList = []
+        this.customerOrgRegister = {};
+        this.customerOrgGroups = [];    
+        this.isDrag = false
+        this.form.id = '' 
+        setTimeout(() => {
+          this.dataTransOpts.refresh.customer_org_group_detail.M++
+        }, 20);
+        return
+      }
       getapi(
         `/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${v}`
       ).then((res) => {
@@ -495,6 +506,9 @@ export default {
             this.isDrag = false        
           }
           objCopy(this.formInit,this.form)
+          setTimeout(() => {
+            this.dataTransOpts.refresh.customer_org_group_detail.M++
+          }, 20);
         }
       });
     },
@@ -503,13 +517,15 @@ export default {
     changeTimes(v) {
       this.getCustomerOrgGroup(v.id);
     },
-
     
     //点击分组
     rowClick(row) {     
       objCopy(row, this.form);
       this.formOri = Object.assign({},row)
-      this.form.isComplete = this.customerOrgRegister.isComplete   
+      this.form.isComplete = this.customerOrgRegister.isComplete
+      setTimeout(() => {
+        this.dataTransOpts.refresh.customer_org_group_detail.M++
+      }, 20);
     },
 
     //新增弹框