From 097dc01ad049e556c923d87da704f85f3443848f Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Tue, 16 Jul 2024 15:59:20 +0800
Subject: [PATCH] room

---
 .../patientRegister/PatientRegisterList.vue   |    2 +-
 src/components/room/RoomAsbitem.vue           | 1013 +++++++++++++++++
 src/components/room/RoomEdit.vue              |  400 +++++++
 src/components/room/room.vue                  |  630 ++++++++++
 src/router/index.js                           |    6 +
 src/store/index.js                            |   13 +-
 6 files changed, 2059 insertions(+), 5 deletions(-)
 create mode 100644 src/components/room/RoomAsbitem.vue
 create mode 100644 src/components/room/RoomEdit.vue
 create mode 100644 src/components/room/room.vue

diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 16d27b8..3c98810 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -1398,7 +1398,7 @@ export default {
               reject(err);
             });
         } else {
-          this.$peisAPI.print('this.$peisAPI.print', JSON.stringify(toOutShell))
+          this.$peisAPI.print(JSON.stringify(toOutShell))
             .then(res => {
               console.log('this.$peisAPI.print', res)
               let lres = JSON.parse(res)
diff --git a/src/components/room/RoomAsbitem.vue b/src/components/room/RoomAsbitem.vue
new file mode 100644
index 0000000..3f8f630
--- /dev/null
+++ b/src/components/room/RoomAsbitem.vue
@@ -0,0 +1,1013 @@
+<template>
+  <div style="display: flex; margin-top:5px;">
+    <div :style="'display: flex;width:' + (window.pageWidth - window.pageMarginWidth - 110 - 5) + 'px;font-size:14px;'">
+      <!--未选组合项目-->
+      <div style="display: block; width:300px;">
+        <div>
+          <span>项目类别</span>
+          <el-cascader :options="dict.itemTypeTree" v-model="itemTypeIds" popper-class="example" style="margin-left: 3px;width:240px;" 
+            :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }" 
+            clearable filterable @change="getAsbItemByItemType" size="small">
+          </el-cascader>
+        </div>
+        <div class="box">
+          <el-table :data="dict.asbItem" border size="small"  highlight-current-row
+            :height="tableHeight"
+            @row-dblclick="dbClickChoosedAsb" row-key="id"
+            @selection-change="selectLeft" :row-class-name="handleRowClassName" 
+            @row-click="chooseAsbItem">
+            <!--
+            <el-table-column type="selection" align="center" ></el-table-column>
+            -->
+            <el-table-column type="index" align="center" width="40"/>
+            <el-table-column
+              label="未选组合项目" min-width="170"
+              prop="displayName" align="center"
+            ></el-table-column>
+          </el-table>
+        </div>
+      </div>
+
+      <!--中间操作按钮-->
+      <div style="display: block;margin: 40px 10px 0 15px;width:110px;">
+        <div v-show="checkPagePriv(pagePriv.privs,'添加')" style="padding: 5px 0;">
+          <el-button class="commonbutton" @click="addAbs(asbItemChoosed,'choosed')" >添加 <i class="el-icon-arrow-right"></i></el-button>
+        </div>
+        <div v-show="checkPagePriv(pagePriv.privs,'全部添加')" style="padding: 5px 0;">
+          <el-button class="difference" @click="addAbs(asbItemChoosed,'all')">全部添加</el-button>
+        </div>
+        <div v-show="checkPagePriv(pagePriv.privs,'移除')" style="padding: 5px 0;">
+          <el-button class="commonbutton"
+            @click="delAbs(customerOrgGroupAsbitemsChoosed,'choosed')">移除 <i class="el-icon-arrow-left"></i
+          ></el-button>
+        </div>
+        <div v-show="checkPagePriv(pagePriv.privs,'全部移除')" style="padding: 5px 0;">
+          <el-button class="difference" @click="delAbs(customerOrgGroupAsbitemsChoosed,'all')">全部移除</el-button>
+        </div>        
+      </div>
+
+      <!--已选组合项目-->
+      <div :style="'display: block; width:' + (window.pageWidth - 300 - 120 - window.pageMarginWidth - 110 - 5) + 'px;'">
+        <div style="height:32px;">
+          <div v-show="checkPagePriv(pagePriv.privs,'快速选择')">
+            <span>快速选择</span>
+            <el-select v-model="asbItemId" placeholder="快速选择组合项目" size="small" 
+              filterable  default-first-option :filter-method="filterMethod"
+              clearable @clear="quickAsb = deepCopy(dict.asbItemQuick)"
+              @change="quickChoosedAsb" ref="quickAsbOCX"
+              style="margin-left: 3px;width:240px;">
+              <el-option v-for="item in quickAsb" :key="item.id" :value="item.id" :label="item.displayName" />
+            </el-select>
+          </div>
+        </div>
+        <div class="box">
+          <el-table :data="customerOrgGroupAsbitems" border size="small"
+            @selection-change="selectRight" highlight-current-row 
+            :height="tableHeight"
+            :summary-method="getSummaries" show-summary           
+            :row-class-name="handleRowClassName" @row-dblclick="removeAbs" 
+            @row-click="removeAsbItem" ref="tableCustomerOrgGroupAsbitems">
+            <!--
+            <el-table-column type="selection"></el-table-column>
+            -->
+            <el-table-column type="index" width="40" align="center"/>
+            <el-table-column
+              label="已选组合项目"
+              min-width="140"
+              prop="displayName"
+            ></el-table-column>
+            <el-table-column label="标准价格" prop="price" min-width="60" align="center"/>
+            <el-table-column label="折扣" min-width="40" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  @input="changeDiscount(scope.$index)"
+                  type="number" size="small"
+                  v-model="scope.row.discount"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="应收价格" prop="customerOrgGroupDetailPrice" min-width="60" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  @input="changePrices(scope.$index)"
+                  type="number" size="small"
+                  v-model="scope.row.customerOrgGroupDetailPrice"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="数量" prop="customerOrgGroupDetailAmount" width="50" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  @input="changePrices(scope.$index)"
+                  type="number" size="small" 
+                  v-model="scope.row.customerOrgGroupDetailAmount" 
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="标准金额" prop="asbitemMoney" min-width="60" align="center">
+            </el-table-column>
+            <el-table-column label="应收金额" prop="customerOrgGroupDetailMoney" min-width="60" align="center">
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+    </div>
+    <!--批量操作按钮（复制套餐与分组）-->
+    <div style="display: block;margin-left: 5px;">
+      <div v-show="checkPagePriv(pagePriv.privs,'复制分组')" style="margin-top: 50px;">
+        <el-button class="commonbutton" @click="btnCopyGroup">复制分组</el-button>
+      </div>
+      <div v-show="checkPagePriv(pagePriv.privs,'复制套餐')" style="margin-top: 10px;">
+        <el-button class="commonbutton"  @click="btnCopyMedicalPackage">复制套餐</el-button>
+      </div>
+      <div v-show="checkPagePriv(pagePriv.privs,'保存')" style="margin-top: 10px;">
+        <el-button class="commonbutton"  @click="btnSave">保存</el-button>
+      </div>
+    </div>
+    
+    <!--复制套餐-->
+    <el-dialog title="体检套餐" :visible.sync="medicalPackageVisble" width="600px" height="400"
+      :show-close="false" :close-on-click-modal="false" :append-to-body="true">
+      <el-table :data="dict.medicalPackage" border height="350" row-key="id" size="small"
+        highlight-current-row @row-click="packageRowClick" @row-dblclick="rowDblclick" ref="patientList" >
+        
+        <!-- "displayName": "健康体检套餐",
+        "price": 20.00,
+        "forSexId": "0",
+        "isActive": "Y",
+        "remark": "2",
+        "displayOrder": 1,
+        "simpleCode": "JKTJTC",
+        "creatorName": "admin",
+        "lastModifierName": "users",
+        "lastModificationTime": "2023-08-04T16:34:02.94408",
+        "lastModifierId": "3a0ca83b-3116-da05-3916-dfd4c0c548cb",
+        "creationTime": "2023-07-10T19:53:30.210553",
+        "creatorId": "3a0c4180-107c-0c89-b25b-0bd34666dcec",
+        "id": "3a0c51d3-2345-38df-ba0b-1862a3c3606f" -->
+        <el-table-column type="index" width="50" />
+        <el-table-column prop="displayName" label="套餐名称" width="180"/>
+        <el-table-column prop="price" label="价格" width="80"/>
+        <el-table-column prop="forSexId" label="适用性别" width="80">
+          <template slot-scope="scope">
+            <div>
+              {{ dddw(dict.forSex, "id", scope.row.forSexId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" width="100"/>
+        <el-table-column prop="creatorName" label="创建人员" width="80"/>
+        <el-table-column prop="creationTime" label="创建日期" width="100">
+          <template slot-scope="scope">
+            <div v-if="scope.row.creationTime">
+              {{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="lastModifierName" label="修改人员" width="80"/>
+        <el-table-column prop="lastModificationTime" label="修改日期" width="100">
+          <template slot-scope="scope">
+            <div v-if="scope.row.lastModificationTime">
+              {{ moment(scope.row.lastModificationTime).format("yyyy-MM-DD") }}
+            </div>
+          </template>
+        </el-table-column>        
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button class="commonbutton" @click="medicalPackageVisble = false" style="width:90px;">取消</el-button>
+        <el-button class="commonbutton" type="primary" @click="copyMedicalPackage" style="width:90px;">确定</el-button>
+      </span>
+    </el-dialog>
+
+    <!--复制分组-->
+    <el-dialog title="单位分组" :visible.sync="groupVisble" width="700px" height="500"
+      :show-close="false" :close-on-click-modal="false" :append-to-body="true">
+      <el-table
+        :data="customerOrgGroups" ref="customerOrgGroups"
+        style="margin-top: 2px"
+        row-key="id"
+        border
+        height="240px"
+        size="small" 
+        highlight-current-row :row-class-name="handleRowClassName" 
+        @row-click="groupRowClick" @row-dblclick="groupRowDblclick" >
+      >
+        <el-table-column
+          type="index"
+          label="序号"
+          min-width="50"
+          align="center"
+        />
+        <el-table-column prop="displayName" label="名称" min-width="150" />
+        <el-table-column
+          prop="price"
+          label="价格"
+          min-width="60"
+          align="center"
+        />
+        <el-table-column
+          prop="forSexId"
+          label="适用性别"
+          min-width="60"
+          align="center"
+        >
+          <template slot-scope="scope">
+            {{ dddw(dict.forSex, "id", scope.row.forSexId, "displayName") }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="maritalStatusId"
+          label="适用婚姻状况"
+          min-width="80"
+          align="center"
+        >
+          <template slot-scope="scope">
+            {{
+              dddw(
+                dict.forMaritalStatus,
+                "id",
+                scope.row.maritalStatusId,
+                "displayName"
+              )
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="creatorName"
+          label="创建者"
+          min-width="60"
+          align="center"
+        />
+        <el-table-column label="创建时间" min-width="150" align="center">
+          <template slot-scope="scope">
+            {{
+              scope.row.creationTime
+                ? moment(scope.row.creationTime).format("yyyy-MM-DD HH:mm:ss")
+                : ""
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template>
+            <el-tag
+              class="move"
+              style="cursor: move; margin-left: 15px"
+              draggable="true"
+            >
+              <i class="el-icon-d-caret" style="width: 1rem; height: 1rem"></i>
+            </el-tag>
+          </template>
+        </el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button class="commonbutton" @click="groupVisble = false" style="width:90px;">取消</el-button>
+        <el-button class="commonbutton" type="primary" @click="copyGroup" style="width:90px;">确定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import moment from 'moment';
+import { mapState } from "vuex";
+import { getapi, postapi, putapi } from "@/api/api";
+import { getPagePriv,checkPagePriv, arrayExistObj, tcdate, arrayFilter, arrayReduce, deepCopy,dddw } from "../../utlis/proFunc";
+
+
+export default {
+  props:['customerOrgGroup','refreshMoney'],
+  data() {
+    return {
+      pagePriv:{
+        routeUrlorPageName:'customerOrgGroup', //当前页面归属路由或归属页面权限名称
+        privs:[] // 页面权限
+      }, 
+      groupPrice:0,               //分组总价
+      customerOrgGroupAsbitems:[], //分组包含组合项目(显示)
+      customerOrgGroupAsbitemsChoosed:[], //分组包含组合项目(显示) 被选中
+      itemTypeIds:[], //项目类别
+      asbItemId:'',   //当前快速选到的给合项目ID
+      quickAsb:[],    //过滤显示的组合项目
+
+      asbItemChoosed: [], //勾选的  未选组合项目
+      startPoint:-1,
+      PstartPoint:-1,
+
+      medicalPackageVisble:false, //复制套餐
+      curPackageId:'',  //当前选中套餐ID
+      packageAsbitems:[], //套餐中包含的组合项目
+
+      groupVisble:false,  //复制分组
+      customerOrgGroups:[],     //历次分组
+      curGroupId:'',  //当前选中套餐ID
+      groupAsbitems:[],  //选中分组包含组合项目
+ 
+
+      dialogVisible: false,
+      copyGroupdialogVisible: false,
+      packagelist: [],
+      tabledata: [],
+      temporaryselection: [], //已选组合项目table
+      copegroupdata: [], //复制分组
+      addrulst: [], //添加保存的Id
+      price: "", //价格
+      title: 1,
+    };
+  },
+  computed: {
+    ...mapState(["window","dict","dataTransOpts", "customerOrg"]),
+
+    tableHeight(){
+      let height = 600 
+      if(this.window.pageHeight > 600){
+        height = this.window.pageHeight
+      }    
+      // console.log(height - this.window.pageHeaderHeight - this.window.pageMarginHeight - 240 - 96 - 10)  
+      return height - this.window.pageHeaderHeight - this.window.pageMarginHeight - 240 - 96 - 16
+    }    
+  },
+
+
+
+  created() {
+    //获取用户当前页面的权限
+    let userPriv = window.sessionStorage.getItem('userPriv')
+    if(userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
+
+    this.dictInit()
+  },
+  mounted() {
+    this.getCustomerOrgGroupAsbitems(this.customerOrgGroup.id);
+  }, 
+
+  updated () {
+    this.refreshTable('tableCustomerOrgGroupAsbitems')
+  },
+  methods: {
+    moment,dddw,deepCopy,checkPagePriv,
+    //表格强制刷新
+    refreshTable(tableRef){
+      this.$nextTick(() => {
+        this.$refs[tableRef].doLayout()
+      })
+    },
+
+    //初始数据
+    dictInit(){
+      //体检类别 树结构
+      getapi("/api/app/item-type/by-code-all").then((res) => {
+        if (res.code != -1) {
+          this.dict.itemTypeTree = res.data;
+          tcdate(this.dict.itemTypeTree);
+        }
+      });
+
+      //获取所有组合项目 api/app/asbitem/GetBasicList
+      postapi("/api/app/asbitem/GetBasicList",{isFilterActive:'Y'}).then((res) => {
+        if (res.code != -1) {
+          this.dict.asbItemAll = res.data;
+          this.dict.asbItemAll.forEach(e => {
+            e.choosed = false
+          })
+          this.dict.asbItem = deepCopy(this.dict.asbItemAll);
+          this.dict.asbItemQuick = deepCopy(res.data);
+          this.quickAsb = deepCopy(res.data);
+        }
+      });
+
+      //套餐 ()
+      postapi("/api/app/medicalpackage/getmedicalpackagelist",{}).then((res) => {
+        if (res.code != -1) {
+          this.dict.medicalPackage = res.data;
+        }
+      });
+
+    },
+
+    handleRowClassName({ row, rowIndex }) {
+      // highLightBg 为 'selected'的高亮 
+      //console.log(rowIndex, row)
+      //return row.highLightBg == 'selected' ? 'high-light-bg' : '';
+      if (row.choosed) {
+        return 'current-row';
+      } else {
+        return '';
+      }
+
+    },
+
+    //项目类别过滤 组合项目，未过滤已选择的组合项目
+    getAsbItemByItemTypeAll() {
+      //console.log('getAsbItemByItemType', typeof this.itemTypeIds, this.itemTypeIds)
+      let lv = "";
+      if (typeof this.itemTypeIds === "object") {
+        lv = this.itemTypeIds[this.itemTypeIds.length - 1];
+      }
+
+      if (lv) {
+        this.dict.asbItem = arrayFilter(this.dict.asbItemAll, "itemTypeId", lv);
+      } else {
+        this.dict.asbItem = deepCopy(this.dict.asbItemAll);
+      }
+      //console.log('lv,this.dict.asbItem', lv, this.dict.asbItem)
+      this.dict.asbItemQuick = deepCopy(this.dict.asbItemAll);
+
+    },
+
+    //按项目类别显示组合项目，并过滤已选择的组合项目
+    getAsbItemByItemType() {
+      this.getAsbItemByItemTypeAll()
+      //刷新显示 未选组合项目
+      arrayReduce(this.dict.asbItem, [...this.customerOrgGroupAsbitems], "id=asbitemId");
+      arrayReduce(this.dict.asbItemQuick, [...this.customerOrgGroupAsbitems], "id=asbitemId");
+      this.quickAsb = Object.assign(this.dict.asbItemQuick)
+    },
+
+    //快速选择组合项目时，调整可按拼间简码及简称查找
+    filterMethod(keyWords) {
+      //console.log('filterMethod',this.dict.asbItemQuick)  
+      if (keyWords) {
+        this.quickAsb = [];
+        this.dict.asbItemQuick.forEach(item => {
+          if (item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
+            || item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
+            || item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1) {
+            this.quickAsb.push(item);
+          }
+        });
+      } else {
+        this.quickAsb = deepCopy(this.dict.asbItemQuick);
+      }
+    },
+
+    // 添加组合项目
+    ///api/app/register-asbitem/many/3fa85f64-5717-4562-b3fc-2c963f66afa6'
+    async addAbs(asbItemChoosed,oprType) {
+      // console.log('this.customerOrgGroup',this.customerOrgGroup)
+      // console.log('asbItemChoosed', asbItemChoosed)      
+      if(!this.customerOrgGroup.id){
+        this.$message.warning({ showClose: true, message: "请先选中单位分组"})
+        return
+      }
+      if(this.customerOrgGroup.isComplete && this.customerOrgGroup.isComplete.toUpperCase() == 'Y'){
+        this.$message.warning({ showClose: true, message: "体检次数已完成，不允许操作"})
+        return
+      }
+      let message = []
+      let checked = true      
+      let lfind = -1
+
+      //oprType 不传值时，兼容勾选方式
+      //勾选时不需要此操作  start      
+      if(oprType && oprType == 'all'){
+        asbItemChoosed = deepCopy(this.dict.asbItem)
+      }else if(oprType && oprType == 'choosed'){
+        asbItemChoosed = [] 
+        this.dict.asbItem.forEach(e =>{
+          if(e.choosed){
+            asbItemChoosed.push(e)
+            e.choosed = false
+          }
+        })
+      }
+      //勾选时不需要此操作  end 
+
+      if (asbItemChoosed.length < 1) {
+        this.$message.warning({ showClose: true, message: "请选择要添加的组合项目"})
+        return
+      }
+
+      //性别、年龄判断 
+      // "displayName": "身高体重",
+      //   "shortName": "哈f哈",
+      //   "forSexId": "F",
+      //   "itemTypeId": "3a0b16de-75b9-c910-c61b-844709a88940",
+      //   "price": 0,
+      
+      // for (let i = 0; i < asbItemChoosed.length; i++) {
+      //   if (this.customerOrgGroup.forSexId == 'A') break //未选性别时，无需判断组合项目性别限制
+      //   if (asbItemChoosed[i].forSexId == 'A' || asbItemChoosed[i].forSexId == 'U') continue
+      //   if (asbItemChoosed[i].forSexId != this.customerOrgGroup.sexId) {
+      //     this.$message.warning(`所选项目：${asbItemChoosed[i].displayName}，不适合当前人员性别`)
+      //     checked = false
+      //     break
+      //   }
+      // }
+      // //console.log(222,checked)
+      // if (!checked) return
+
+      // 去掉重复的项目
+      arrayReduce(asbItemChoosed, this.customerOrgGroupAsbitems, "id=asbitemId")
+
+      for (let i = asbItemChoosed.length - 1; i > - 1; i--) {
+        if (this.customerOrgGroup.forSexId == 'A') break //未选性别时，无需判断组合项目性别限制 
+        if (asbItemChoosed[i].forSexId == 'A' || asbItemChoosed[i].forSexId == 'U') continue
+        if (asbItemChoosed[i].forSexId != this.customerOrgGroup.forSexId) {
+          message.push(asbItemChoosed[i].displayName)   //.warning(`所选项目：${asbItemChoosed[i].displayName}，不适合当前人员性别`)
+          checked = false
+          asbItemChoosed.splice(i,1)
+        }
+      }
+      //console.log(222,checked)
+      if (!checked) this.$message.warning(`所选项目【${JSON.stringify(message)}】不适合当前人员性别`)
+
+      for (let i = 0; i < asbItemChoosed.length; i++) {
+        let pojo = {
+          asbitemId: asbItemChoosed[i].id,
+          displayName:asbItemChoosed[i].displayName,
+          discount:100,
+          customerOrgGroupDetailAmount:1,
+          price:asbItemChoosed[i].price,
+          customerOrgGroupDetailPrice:asbItemChoosed[i].price,
+          customerOrgGroupDetailMoney: asbItemChoosed[i].price,
+          asbitemMoney: asbItemChoosed[i].price,
+        }
+        
+
+        this.customerOrgGroupAsbitems.push(pojo)
+        //this.customerOrgGroupAsbitems.push({ ...pojo, asbitemName: asbItemChoosed[i].displayName })
+        
+        lfind = arrayExistObj(this.dict.asbItem, 'id', asbItemChoosed[i].id)
+        if (lfind > -1) this.dict.asbItem.splice(lfind, 1)
+
+        lfind = arrayExistObj(this.dict.asbItemQuick, 'id', asbItemChoosed[i].id)
+        if (lfind > -1) this.dict.asbItemQuick.splice(lfind, 1)
+
+      }
+
+      
+    },
+
+    //双击选择组合项目
+    dbClickChoosedAsb(row) {
+      this.addAbs([row]);
+    },
+    //快速选择组合项目
+    quickChoosedAsb(v) {
+      //远程查询时，设置了 value-key 也不管用，只能取到value console.log('quickChoosedAsb',v)
+      let lfind = -1
+      if (v) {
+        lfind = arrayExistObj(this.dict.asbItemQuick, 'id', v)
+        if (lfind > -1) {
+          this.addAbs([this.dict.asbItemQuick[lfind]])
+        }
+      }    
+
+      this.$nextTick(() => {        
+        this.$refs['quickAsbOCX'].blur(); //total  asbItemId
+        this.asbItemId = ''
+        this.quickAsb = deepCopy(this.dict.asbItemQuick)        
+        this.$refs['quickAsbOCX'].focus(); //total  asbItemId       
+      });
+
+    },
+
+    //选择 未选的组合项目
+    chooseAsbItem(row){
+      this.dict.asbItem.forEach((e,index) => {
+        e.index = index; 
+        return e
+      });
+      // 按住了shift键
+      if (this.window.shift) {         
+        //清除所有选择
+        this.dict.asbItem.forEach(e => {
+          e.choosed = false;  
+          return e
+        });
+
+        if (this.startPoint == - 1) {
+          this.dict.asbItem[row.index].choosed = true;
+          this.startPoint = row.index;
+          return
+        }
+
+        if (this.startPoint > row.index) {
+          for (let i = row.index; i <= this.startPoint; i++) {
+            this.dict.asbItem[i].choosed = true
+          }
+        } else if (this.startPoint <= row.index) {
+          for (let i = this.startPoint; i <= row.index; i++) {
+            this.dict.asbItem[i].choosed = true
+          }
+        }
+        return
+      }
+
+      // 按住了ctrl 键
+      if (this.window.ctrl) {   
+        console.log('this.window.ctrl',this.window.ctrl,this.dict.asbItem)      
+        this.dict.asbItem[row.index].choosed = true;
+        this.startPoint = row.index;
+        return        
+      }
+
+      // 未按住了ctrl 、shift 键
+      //清除所有选择
+      //console.log('清除所有选择')
+      this.dict.asbItem.forEach(e => {
+        e.choosed = false;  
+        return e
+      });
+      this.dict.asbItem[row.index].choosed = true;
+      this.startPoint = row.index;   
+
+    },
+
+    //删除 人员已选中的组合项目
+    ///api/app/register-asbitem/many?RegisterAsbitemIds=3fa85f64-5717-4562-b3fc-2c963f66afa6
+    delAbs(absForDel,oprType) {
+      if(!this.customerOrgGroup.id){
+        this.$message.warning({ showClose: true, message: "请先选中单位分组"})
+        return
+      }
+      if(this.customerOrgGroup.isComplete && this.customerOrgGroup.isComplete.toUpperCase() == 'Y'){
+        this.$message.warning({ showClose: true, message: "体检次数已完成，不允许操作"})
+        return
+      }
+
+
+      let lfind = -1
+
+      //勾选时不需要此操作  start
+      if(oprType && oprType == 'all'){
+        absForDel = deepCopy(this.customerOrgGroupAsbitems)
+      }else if(oprType && oprType == 'choosed'){
+        absForDel = [] 
+        this.customerOrgGroupAsbitems.forEach(e =>{
+          if(e.choosed){
+            absForDel.push(deepCopy(e))
+            e.choosed = false
+          }
+        })
+      }
+      //勾选时不需要此操作  end 
+
+      if (absForDel.length < 1) {
+        this.$message.warning({ showClose: true, message: "请选择要移除的组合项目"})
+        return
+      }
+
+      for (let i = 0; i < absForDel.length; i++) {
+        
+        lfind = arrayExistObj(this.customerOrgGroupAsbitems, 'asbitemId', absForDel[i].asbitemId)
+        if (lfind > -1) this.customerOrgGroupAsbitems.splice(lfind, 1)
+
+        absForDel.splice(i, 1)
+        i--
+        continue
+        
+      }
+
+      //刷新
+      this.getAsbItemByItemType()     
+
+    },
+
+    //双击删除已选项目
+    removeAbs(row) {
+      this.delAbs([row]);
+    },
+
+    //选择 已选的组合项目
+    removeAsbItem(row){
+      this.customerOrgGroupAsbitems.forEach((e,index) => {
+        e.index = index; 
+        return e
+      });
+      // 按住了shift键
+      if (this.window.shift) {         
+        //清除所有选择
+        this.customerOrgGroupAsbitems.forEach(e => {
+          e.choosed = false;  
+          return e
+        });
+
+        if (this.PstartPoint == - 1) {
+          this.customerOrgGroupAsbitems[row.index].choosed = true;
+          this.PstartPoint = row.index;
+          return
+        }
+
+        if (this.PstartPoint > row.index) {
+          for (let i = row.index; i <= this.PstartPoint; i++) {
+            this.customerOrgGroupAsbitems[i].choosed = true
+          }
+        } else if (this.PstartPoint <= row.index) {
+          for (let i = this.PstartPoint; i <= row.index; i++) {
+            this.customerOrgGroupAsbitems[i].choosed = true
+          }
+        }
+        return
+      }
+
+      // 按住了ctrl 键
+      if (this.window.ctrl) {   
+        console.log('this.window.ctrl',this.window.ctrl,this.customerOrgGroupAsbitems)      
+        this.customerOrgGroupAsbitems[row.index].choosed = true;
+        this.PstartPoint = row.index;
+        return        
+      }
+
+      // 未按住了ctrl 、shift 键
+      //清除所有选择
+      //console.log('清除所有选择')
+      this.customerOrgGroupAsbitems.forEach(e => {
+        e.choosed = false;  
+        return e
+      });
+      this.customerOrgGroupAsbitems[row.index].choosed = true;
+      this.PstartPoint = row.index;   
+
+    },
+
+    changeDiscount(index){
+
+      this.customerOrgGroupAsbitems[index].customerOrgGroupDetailPrice = 
+      (this.customerOrgGroupAsbitems[index].discount *  this.customerOrgGroupAsbitems[index].price/100).toFixed(2)
+      
+
+      this.customerOrgGroupAsbitems[index].customerOrgGroupDetailMoney = 
+      (this.customerOrgGroupAsbitems[index].customerOrgGroupDetailPrice * this.customerOrgGroupAsbitems[index].customerOrgGroupDetailAmount).toFixed(2)
+
+      //this.getSummaries()
+      
+    },
+
+    //修改价格或数量
+    changePrices(index){
+      this.customerOrgGroupAsbitems[index].customerOrgGroupDetailMoney = 
+      (this.customerOrgGroupAsbitems[index].customerOrgGroupDetailPrice * this.customerOrgGroupAsbitems[index].customerOrgGroupDetailAmount).toFixed(2)
+
+      this.customerOrgGroupAsbitems[index].asbitemMoney = 
+      (this.customerOrgGroupAsbitems[index].price * this.customerOrgGroupAsbitems[index].customerOrgGroupDetailAmount).toFixed(2)
+
+      this.customerOrgGroupAsbitems[index].discount = (this.customerOrgGroupAsbitems[index].customerOrgGroupDetailPrice * 100 / this.customerOrgGroupAsbitems[index].price).toFixed(2)
+      //this.getSummaries()
+    },
+    
+
+    //合计
+    getSummaries(param) {
+      console.log('getSummaries param',param)
+      // if(!param){
+      //   param = {
+      //     columns:[{}, {}, {}, {}, {}, {}, {property: 'asbitemMoney'},{property: 'customerOrgGroupDetailMoney'}],
+      //     data:this.customerOrgGroupAsbitems
+      //   }
+      // }
+     
+      const { columns, data } = param;
+      const sumCol = [6, 7]  //需合计的列
+      const sums = [];
+      columns.forEach((column, index) => {
+        //console.log('column, index,data',column, index,data)
+        //显示合计列
+        if (index === 1) {
+          sums[index] = '合计';
+          return;
+        }
+
+        //不合计的列
+        if (sumCol.indexOf(index) == -1) {
+          sums[index] = '';
+          return;
+        }
+
+        sums[index] = 0
+        data.forEach(e => {
+          if (!isNaN(e[column.property])) sums[index] += Number(e[column.property])// * e['amount']
+        })
+        sums[index] = sums[index].toFixed(2) //+ ' 元';
+
+      });
+      this.groupPrice = sums[7];
+      // console.log('getSummaries',sums)
+      // if (!this.totalFoucs) this.total = sums[5];
+      // if (!this.discountFoucs) this.discount = Number(this.total * 100 / this.totalStand).toFixed(2);
+      return sums;
+    },
+
+    //复制分组
+    btnCopyGroup(){
+      console.log('this.customerOrgGroup',this.customerOrgGroup)
+      if(!this.customerOrgGroup.id){
+        this.$message.warning({ showClose: true, message: "请先选中单位分组"})
+        return
+      }      
+      if(this.customerOrgGroup.isComplete && this.customerOrgGroup.isComplete.toUpperCase() == 'Y'){
+        this.$message.warning({ showClose: true, message: "体检次数已完成，不允许操作"})
+        return
+      }
+      
+      getapi(
+        `/api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${this.customerOrgGroup.customerOrgRegisterId}`
+      ).then((res) => {
+        if (res.code != -1) {
+          this.customerOrgGroups = res.data;
+          if(this.customerOrgGroups.length <2){
+            this.$message.warning({ showClose: true, message: "暂无其他分组可供复制"})
+          }else{
+            this.groupVisble = true
+          }          
+        }
+      });
+      
+    },
+
+    //选中分组
+    async groupRowClick(row){
+      this.curGroupId = row.id
+      this.groupAsbitems = []
+      try {
+        let res = await getapi(`/api/app/customerorggroupdetail/getcustomerorggroupdetailinasbitem?CustomerOrgGroupId=${row.id}`)
+        if(res.code != -1) this.groupAsbitems = res.data
+      } catch (error) {
+        console.log(error)
+      }         
+    },
+
+    
+
+    //双击选分组，并确认复制
+    async groupRowDblclick(row){
+      await this.groupRowClick(row)
+      this.copyGroup()
+    },
+
+    //复制分组(确认选中分组)
+    copyGroup(){
+      if(!this.curGroupId){
+        this.$message.warning({ showClose: true, message: "请先选择要复制的套餐！"})
+        return
+      }
+      console.log('this.packageAsbitems',this.groupAsbitems)
+      this.addAbs(deepCopy(this.groupAsbitems))
+      this.groupVisble = false
+    },
+
+
+
+    //复制套餐
+    btnCopyMedicalPackage(){
+      // console.log('this.customerOrgGroup',this.customerOrgGroup)
+      if(!this.customerOrgGroup.id){
+        this.$message.warning({ showClose: true, message: "请先选中单位分组"})
+        return
+      }      
+      if(this.customerOrgGroup.isComplete && this.customerOrgGroup.isComplete.toUpperCase() == 'Y'){
+        this.$message.warning({ showClose: true, message: "体检次数已完成，不允许操作"})
+        return
+      }
+      this.medicalPackageVisble = true
+    },
+
+    //选中套餐
+    async packageRowClick(row){
+      this.curPackageId = row.id
+      this.packageAsbitems = []
+      try {
+        let res = await postapi('/api/app/medicalpackagedetail/getmedicalpackageinasbitem',{medicalPackageId:row.id})
+        this.packageAsbitems = res.data
+      } catch (error) {
+        console.log(error)
+      }         
+    },
+
+    //双击选套餐，并确认复制
+    async rowDblclick(row){
+      await this.packageRowClick(row)
+      this.copyMedicalPackage()
+    },
+
+    //复制套餐(确认选中套餐)
+    copyMedicalPackage(){
+      if(!this.curPackageId){
+        this.$message.warning({ showClose: true, message: "请先选择要复制的套餐！"})
+        return
+      }
+      console.log('this.packageAsbitems',this.packageAsbitems)
+      this.addAbs(deepCopy(this.packageAsbitems))
+      this.medicalPackageVisble = false
+    },
+
+    
+
+
+
+    //保存按钮
+    btnSave() {
+      if(!this.customerOrgGroup.id){
+        this.$message.warning({ showClose: true, message: "请先选中单位分组"})
+        return
+      }      
+      if(this.customerOrgGroup.isComplete && this.customerOrgGroup.isComplete.toUpperCase() == 'Y'){
+        this.$message.warning({ showClose: true, message: "体检次数已完成，不允许操作"})
+        return
+      }
+      let body = {
+        customerOrgGroupId:this.customerOrgGroup.id,
+        details:[]
+      }
+      // {
+      //   "customerOrgGroupId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+      //   "details": [
+      //     {
+      //       "customerOrgGroupId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+      //       "asbitemId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+      //       "price": 0,
+      //       "amount": 0
+      //     }
+      //   ]
+      // }
+      this.customerOrgGroupAsbitems.forEach(e =>{
+        body.details.push({
+          customerOrgGroupId:this.customerOrgGroup.id,
+          asbitemId:e.asbitemId,
+          price:e.customerOrgGroupDetailPrice,
+          amount:e.customerOrgGroupDetailAmount
+        })
+      })
+      
+      let group = deepCopy(this.customerOrgGroup);
+      postapi('/api/app/customerorggroupdetail/createcustomerorggroupdetailmany',body
+       )
+      //  .then(res => {
+      //   if(res.code != -1){
+      //     delete group.id;
+      //     delete group.customerOrgId;
+      //     delete group.isComplete; 
+      //     group.price = this.groupPrice
+      //     // console.log('this.customerOrgGroup',this.customerOrgGroup)
+      //     // console.log('group',group)
+      //     return putapi(`/api/app/customer-org-group/${this.customerOrgGroup.id}`, group)
+      //   }
+      // })   后台合并事务
+      .then(res =>{
+        if(res && res.code != -1){
+          console.log("操作成功");
+          group.price = this.groupPrice
+          group.id = this.customerOrgGroup.id
+          this.refreshMoney(group)
+        }
+      })
+   
+    },
+
+   
+    //右侧勾选按钮
+    selectRight(val) {
+      this.customerOrgGroupAsbitemsChoosed = val;
+    },
+
+  
+    // 左侧未选
+    selectLeft(val) {
+      this.asbItemChoosed = val;
+    },
+   
+
+    //获取当前列列表数据
+    getCustomerOrgGroupAsbitems(customerOrgGroupId) {
+      if(customerOrgGroupId){
+        getapi(
+          `/api/app/customerorggroupdetail/getcustomerorggroupdetailinasbitem?CustomerOrgGroupId=${customerOrgGroupId}`
+        ).then((res) => {    
+          if(res.code != -1){
+            this.customerOrgGroupAsbitems = res.data;
+            this.getAsbItemByItemType()
+          }           
+        });
+      }else{
+        this.customerOrgGroupAsbitems = []
+        this.getAsbItemByItemType()
+      }  
+    },
+    
+  },
+
+  //监听事件
+  watch: {
+    // 体检分组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);
+      }
+    },
+  },
+};
+</script>
+<style scoped>
+
+.box {  
+  margin-top: 5px;
+  /* border: 1px solid #000; */
+}
+
+.btnClass {
+  width:100px;
+  margin-bottom: 5px
+}
+
+</style>
diff --git a/src/components/room/RoomEdit.vue b/src/components/room/RoomEdit.vue
new file mode 100644
index 0000000..8ff039d
--- /dev/null
+++ b/src/components/room/RoomEdit.vue
@@ -0,0 +1,400 @@
+<template>
+  <div>
+    <el-form :model="form" label-width="80px" :rules="rules" ref="form">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item prop="displayName" label="分组名称">
+            <el-input v-model="form.displayName" size="small" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="金额">
+            <el-input v-model="form.price" type="number" size="small" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="适用性别">
+            <el-select v-model="form.forSexId" placeholder="请选择" size="small">
+              <el-option v-for="item in dict.forSex" :key="item.id" :label="item.displayName" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="婚姻状况">
+            <el-select v-model="form.maritalStatusId" placeholder="请选择" style="width: 100%" size="small">
+              <el-option v-for="item in dict.forMaritalStatus" :key="item.id" :label="item.displayName" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="年龄下限">
+            <el-input v-model="form.ageLowerLimit" type="number" min="1" max="200" size="small" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="年龄上限">
+            <el-input v-model="form.ageUpperLimit" type="number" min="1" max="200" size="small" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="适用职务">
+            <el-input v-model="form.jobPost" size="small" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="适用职称">
+            <el-input v-model="form.jobTitle" size="small" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="可自选金额">
+            <el-input type="number" v-model="form.canAddMoney" size="small" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <el-input v-model="form.remark" size="small" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div style="display: flex;margin-top: 5px;justify-content:space-between;">
+      <div></div>
+      <div style="display: flex;">
+        <el-button class="commonbutton" @click="dialogWin.CustomerOrgGroupEdit = false">关闭</el-button>
+        <!--
+        <el-button type="success" @click="computePrice">同比折算组合项目价格</el-button>
+        -->
+        <el-button class="commonbutton" type="primary" @click="onSubmit('form')">确定</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import moment from "moment";
+
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { mapState } from "vuex";
+import {
+  dddw,
+  deepCopy,
+  objCopy,
+  arrayExistObj,
+} from "../../utlis/proFunc";
+
+import CustomerOrgGroupAsbitem from "../../components/customerOrg/customerOrgGroupAsbitem.vue";
+
+export default {
+  components: {
+    CustomerOrgGroupAsbitem,
+  },
+  props: ["params"],
+  data() {
+    return {
+      form: {
+        //体检单位分组
+        customerOrgId: "", //复制分组时用到(预留查历次分组)
+        isComplete: "N", //体检次数是否完成，如完成不允许调整分组项目
+        id: "",
+        customerOrgRegisterId: null, //所属体检次数
+        displayName: "",
+        price: 0,
+        forSexId: "A",
+        maritalStatusId: "A",
+        ageLowerLimit: 0,
+        ageUpperLimit: 200,
+        canAddMoney:0,
+        jobPost: "",
+        jobTitle: "",
+        remark: "",
+        isMaxMedicalTimes: "N",
+      },
+      formOri: {}, //用于对比分析哪些信息更改了（主要是价格）
+      formInit: {}, //表单初始值
+      rules: {
+        displayName: [{ required: true, message: "请填写分组名称", trigger: "blur" }],
+      },
+    };
+  },
+  computed: {
+    ...mapState(["dict", "dialogWin", "dataTransOpts"]),
+  },
+  created() {
+    this.formInit = deepCopy(this.form);
+    this.form.customerOrgId = this.params.customerOrgId
+    this.form.customerOrgRegisterId = this.params.customerOrgRegisterId
+  },
+  mounted() {
+    // 获取初始数据（单位、适用性别） 
+    this.dictInit();
+    this.getFormData(this.dataTransOpts.tableS.customer_org_group.id);
+  },
+  methods: {
+    moment, dddw, deepCopy,
+
+    // 获取初始数据
+    dictInit() {
+      //获取单位列表
+      getapi("/api/app/customer-org/parent-all").then((res) => {
+        if (res.code != -1) {
+          this.customerOrgAll = res.data;
+          let lfind = arrayExistObj(this.customerOrgAll, "id", this.dict.personOrgId);
+          if (lfind > -1) this.customerOrgAll.splice(lfind, 1);
+          this.customerOrg = deepCopy(this.customerOrgAll);
+        }
+      });
+
+      //获取适用性别
+      getapi("/api/app/for-sex").then((res) => {
+        if (res.code != -1) {
+          this.dict.forSex = res.data;
+        }
+      });
+    },
+
+    // 生成表单数据
+    getFormData(id) {
+      if (id) {
+        getapi(`/api/app/customer-org-group/${id}`)
+          .then(res => {
+            if (res.code != -1) {
+              this.formOri = deepCopy(res.data)
+              this.form = deepCopy(res.data)
+            }
+          })
+      } else {
+        console.log('this.formInit',this.formInit)
+        this.form = deepCopy(this.formInit)
+        this.form.customerOrgId = this.params.customerOrgId
+        this.form.customerOrgRegisterId = this.params.customerOrgRegisterId
+      }
+    },
+
+
+    onSubmit(formName) {
+      this.$refs[formName].validate((valid, fields) => {
+        if (!valid) {
+          this.$message.warning(fields[Object.keys(fields)[0]][0].message);
+          return false;
+        }
+
+        if (!this.form.id && !this.form.customerOrgRegisterId) {
+          this.$message.warning("请选择单位体检次数！");
+          return false;
+        }
+
+        let body = deepCopy(this.form);
+        delete body.id;
+        delete body.customerOrgId;
+        delete body.isComplete;
+
+        if (this.form.id) {
+          let customerOrgGroupId = this.form.id;
+          let customerOrgGroupAsbitems = []; //分组包含的套餐
+
+          //编辑
+          /*
+          putapi(`/api/app/customer-org-group/${this.form.id}`, body)
+            .then((res) => {
+              // console.log(res)
+              if (res.code != -1) {
+                console.log("保存分组成功！");                
+                // 价格是否有调整
+                if (this.formOri.price != this.form.price) {
+                  return getapi(`/api/app/customerorggroupdetail/getcustomerorggroupdetailinasbitem?CustomerOrgGroupId=${customerOrgGroupId}`);
+                } else {
+                  this.dialogWin.CustomerOrgGroupEdit = false;
+                }
+              }
+            })
+            .then((res) => {
+              if (res && res.code != -1) {
+                customerOrgGroupAsbitems = res.data;
+                if (customerOrgGroupAsbitems.length < 1) {
+                  console.log("该分组暂没有组合项目！");
+                  this.dialogWin.CustomerOrgGroupEdit = false;
+                } else {
+                  let detailsBody = {
+                    customerOrgGroupId,
+                    details: this.madeNewGroupAsbitems(customerOrgGroupAsbitems, this.form.price),
+                  };
+                  return postapi("/api/app/customerorggroupdetail/createcustomerorggroupdetailmany", detailsBody);
+                }
+              }
+            })
+            .then((res) => {
+              if (res && res.code != -1) {
+                console.log("操作成功！并自动按总价同比折算组合项目价格！");
+                this.dialogWin.CustomerOrgGroupEdit = false;
+                // 刷新明细
+                let id = this.form.id;
+                this.form.id = "";
+                setTimeout(() => {
+                  this.form.id = id;
+                }, 100);
+              }
+            });
+          */
+          // 合并事务更新明细金额
+          putapi(`/api/app/customer-org-group/${this.form.id}`, body)
+            .then((res) => {
+              // console.log(res)
+              if (res.code != -1) {
+                console.log("保存分组成功！");   
+                this.dataTransOpts.refresh.customer_org_group_detail.M
+              }
+            })
+            
+        } else {
+          //新增
+          postapi("/api/customerorggroup/createcustomerorggroupincustomerorgregister", body)
+            .then(res => {
+              if (res.code != -1) {
+                console.log("操作成功！");
+                this.dataTransOpts.tableS.customer_org_group.id = res.data.id                
+                this.dialogWin.CustomerOrgGroupEdit = false;
+              }
+            });
+        }
+      });
+    },
+
+    //
+    computePrice() {
+      if (!this.form.id) {
+        this.$message.warning("尚未保存信息，不可执行此操作！");
+        return;
+      }
+      let customerOrgGroupId = this.form.id;
+      let customerOrgGroupAsbitems = []; //分组包含的套餐
+
+      getapi(`/api/app/customerorggroupdetail/getcustomerorggroupdetailinasbitem?CustomerOrgGroupId=${customerOrgGroupId}`)
+        .then((res) => {
+          if (res.code != -1) {
+            customerOrgGroupAsbitems = res.data;
+
+            if (customerOrgGroupAsbitems.length < 1) {
+              this.$message.warning("当前分组尚未设置组合项目，不可执行此操作！");
+            } else {
+              let body = {
+                customerOrgGroupId,
+                details: this.madeNewGroupAsbitems(
+                  customerOrgGroupAsbitems,
+                  this.form.price
+                ),
+              };
+              console.log("body", body);
+              return postapi("/api/app/customerorggroupdetail/createcustomerorggroupdetailmany", body);
+            }
+          }
+        })
+        .then((res) => {
+          if (res.code != -1) {
+            //console.log("操作成功");
+            //触发分组明细刷新
+            this.form.id = "";
+            //要做延时处理，否则不会触发监听
+            setTimeout(() => {
+              this.form.id = customerOrgGroupId;
+              this.onSubmit("form");
+            }, 100);
+          }
+        });
+    },
+
+    madeNewGroupAsbitems(oldGroupAsbitems, newTotal) {
+      newTotal = Math.round(Number(newTotal) * 100) / 100;
+      let newGroupAsbitems = [];
+      let oldTotal = Number(0);
+      oldGroupAsbitems.forEach((e) => {
+        oldTotal += Number(e.asbitemMoney); //customerOrgGroupDetailMoney
+      });
+      oldTotal = Math.round(Number(oldTotal) * 100) / 100;
+
+      let discount = 0;
+      if (oldTotal != 0) discount = Math.round((newTotal * 10000) / oldTotal) / 100;
+
+      oldTotal = Number(0);
+      oldGroupAsbitems.forEach((e) => {
+        e.customerOrgGroupDetailPrice = Math.round(e.price * discount) / 100;
+        e.customerOrgGroupDetailMoney =
+          Math.round(
+            e.customerOrgGroupDetailPrice * e.customerOrgGroupDetailAmount * 100
+          ) / 100;
+        oldTotal += Number(e.customerOrgGroupDetailMoney);
+      });
+      oldTotal = Math.round(Number(oldTotal) * 100) / 100;
+
+      //console.log('discount,oldTotal',discount,oldTotal)
+
+      let didTotal = Math.round(Number(newTotal - oldTotal) * 100) / 100;
+      if (didTotal != 0) {
+        for (let i = 0; i < oldGroupAsbitems.length; i++) {
+          if (oldGroupAsbitems[i].customerOrgGroupDetailAmount == 1) {
+            oldGroupAsbitems[i].customerOrgGroupDetailPrice =
+              Math.round(
+                (Number(oldGroupAsbitems[i].customerOrgGroupDetailPrice) +
+                  Number(didTotal)) *
+                100
+              ) / 100;
+            break;
+          }
+        }
+      }
+
+      oldGroupAsbitems.forEach((e) => {
+        newGroupAsbitems.push({
+          customerOrgGroupId: e.customerOrgGroupId,
+          asbitemId: e.asbitemId,
+          price: e.customerOrgGroupDetailPrice,
+          amount: e.customerOrgGroupDetailAmount,
+        });
+      });
+
+      return newGroupAsbitems;
+    },
+
+
+  },
+  //监听事件
+  watch: {
+    //
+    // "customerOrgGroup.id"(newVal, oldVal) {
+    //   console.log("customerOrgGroup.id ",newVal,oldVal);
+    //   if (newVal != oldVal) {
+    //     this.getCustomerOrgGroupAsbitems(newVal);
+    //   }
+    // },
+
+    // 体检分组ID未切换换时 也可以强制刷新数据
+    "dataTransOpts.refresh.customer_org_group.S": {
+      // immediate: true,
+      handler(newVal, oldVal) {
+        console.log(`watch 体检分组 newVal:${newVal} oldVal:${oldVal} customerOrgGroupId: ${this.dataTransOpts.tableS.customer_org_group.id}`);
+        this.getFormData(this.dataTransOpts.tableS.customer_org_group.id);
+      }
+    },
+  },
+};
+</script>
+<style scoped>
+@import "../../assets/css/global_button.css";
+@import "../../assets/css/global_dialog.css";
+@import "../../assets/css/global_table.css";
+@import "../../assets/css/global_form.css";
+@import "../../assets/css/global_input.css";
+@import "../../assets/css/global.css";
+
+.btnClass {
+  width: 100px;
+  margin-bottom: 5px;
+}
+</style>
diff --git a/src/components/room/room.vue b/src/components/room/room.vue
new file mode 100644
index 0000000..70cea37
--- /dev/null
+++ b/src/components/room/room.vue
@@ -0,0 +1,630 @@
+<template>
+  <div>
+    <div>
+      <div class="contenttitle">
+        基础资料 /<span class="contenttitleBold">分诊叫号房间设置</span>
+      </div>
+      <!--分组信息-->
+      <div style="display: flex; font-size: 14px">
+        <div :style="'display: block;width:' + (window.pageWidth - window.pageMarginWidth - 110 - 5) + 'px;'">
+          <div style="display: flex">
+            <div>
+              <span>体检中心：</span>
+              <el-select v-model="customerOrgId" placeholder="请选择体检中心" :filter-method="filterMethod" default-first-option
+                clearable filterable style="margin-left: 10px" @change="changeMedicalCenter" size="small">
+                <el-option v-for="item in dict.medicalCenter" :key="item.id" :label="item.displayName" :value="item.id">
+                  {{ item.displayName }}
+                </el-option>
+              </el-select>
+            </div>            
+          </div>
+          <div>
+            <el-table :data="customerOrgGroups" ref="customerOrgGroups" style="margin-top: 2px" row-key="id" border
+              height="240px" size="small" highlight-current-row :row-class-name="handleRowClassName"
+              @row-click="rowClick">
+              <el-table-column type="index" label="序号" width="50" align="center" />
+              <el-table-column label="id" prop="id" min-width="200" align="center" />              
+              <el-table-column prop="displayName" label="名称" min-width="150" />    
+              <el-table-column prop="itemTypeId" label="项目类别" min-width="100">
+                <template slot-scope="scope">
+                  {{ dddw(dict.itemTypeTree, "id", scope.row.itemTypeId, "displayName") }}
+                </template>
+              </el-table-column>                        
+              <el-table-column prop="forSexId" label="适用性别" min-width="80" align="center">
+                <template slot-scope="scope">
+                  {{ dddw(dict.forSex, "id", scope.row.forSexId, "displayName") }}
+                </template>
+              </el-table-column>  
+              <el-table-column prop="roomTypeFlag" label="房间类别" min-width="80" align="center">
+                <template slot-scope="scope">
+                  {{ dddw(dict.roomType, "id", scope.row.roomTypeFlag, "displayName") }}
+                </template>
+              </el-table-column>  
+              <el-table-column prop="queueTime" label="候诊时间" min-width="80" align="center"/> 
+              <el-table-column prop="isActive" label="是否启用" min-width="80" align="center"> 
+                <template slot-scope="scope">
+                  {{ isActive == 'Y' ? '':'' }}
+                </template>
+              </el-table-column>                                   
+              <el-table-column prop="creatorName" label="创建者" min-width="60" align="center" />
+              <el-table-column label="创建时间" min-width="150" align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.creationTime ? moment(scope.row.creationTime).format("yyyy-MM-DD HH:mm:ss") : "" }}
+                </template>
+              </el-table-column>
+
+	number($double)
+
+
+	string
+              <el-table-column label="操作" align="center">
+                <template>
+                  <el-tag class="move" style="
+                      cursor: move;
+                      background-color: rgb(245, 245, 245);
+                      border: none;
+                    " draggable="true">
+                    <i class="el-icon-d-caret" style="width: 1rem; height: 1rem; color: rgb(113, 113, 113)"></i>
+                  </el-tag>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+        <!--按钮-->
+        <div style="display: block; margin-left: 5px">
+          <div v-show="checkPagePriv(pagePriv.privs, '复制上次分组')" style="margin-top: 0px">
+            <el-button class="commonbutton" @click="btnCopyPreGroup">复制上次分组</el-button>
+          </div>
+          <div v-show="checkPagePriv(pagePriv.privs, '新增')" style="margin-top: 5px">
+            <el-button class="commonbutton" @click="btnAdd('')">新增</el-button>
+          </div>
+          <div v-show="checkPagePriv(pagePriv.privs, '编辑')" style="margin-top: 5px">
+            <el-button class="commonbutton" @click="btnEdit">编辑</el-button>
+          </div>
+          <div v-show="checkPagePriv(pagePriv.privs, '删除')" style="margin-top: 5px">
+            <el-button class="deleteButton" @click="btnDel">删除</el-button>
+          </div>
+          <div v-show="checkPagePriv(pagePriv.privs, '置顶')" style="margin-top: 5px">
+            <el-button class="commonbutton" @click="btnSetTop">置顶</el-button>
+          </div>
+          <div v-show="checkPagePriv(pagePriv.privs, '置底')" style="margin-top: 5px">
+            <el-button class="commonbutton" @click="btnSetBottom">置底</el-button>
+          </div>
+          <div v-show="checkPagePriv(pagePriv.privs, '保存排序')" style="margin-top: 5px">
+            <el-button class="commonbutton" @click="btnSort" :disabled="!isDrag">保存排序</el-button>
+          </div>
+        </div>
+      </div>
+
+      <!--分组项目信息 -->
+      <div>
+        <RoomAsbitem :customerOrgGroup="curCustomerOrgGroup" :refreshMoney="refreshMoney" />
+      </div>
+    </div>
+
+    <!-- 新增或者编辑弹框 -->
+    <el-dialog :title="dataTransOpts.tableS.customer_org_group.id ? '编辑' : '新增'" :close-on-click-modal="false"
+      :visible.sync="dialogWin.RoomEdit" width="800px" @close="close_dialogWinRoomEdit">
+      <RoomEdit :params="RoomEditParams" />
+    </el-dialog>
+    <!--  -->
+  </div>
+</template>
+<script>
+import moment from "moment";
+import Sortable from "sortablejs";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { mapState } from "vuex";
+import {
+  getPagePriv,
+  checkPagePriv,
+  dddw,
+  deepCopy,
+  objCopy,
+  arrayExistObj,
+} from "../../utlis/proFunc";
+
+import RoomAsbitem from "./RoomAsbitem.vue";
+import RoomEdit from "./RoomEdit.vue";
+
+export default {
+  components: {
+    RoomAsbitem, RoomEdit
+  },
+  data() {
+    return {
+      pagePriv: {
+        routeUrlorPageName: "customerOrgGroup", //当前页面归属路由或归属页面权限名称
+        privs: [], // 页面权限
+      },
+      customerOrg: [], //体检单位
+      customerOrgGroups: [], //体检单位分组
+      customerOrgId: "", //当前选中的体检单位id
+      customerOrgRegisterList: [], //体检次数列表
+      customerOrgRegister: {}, //体检次数
+
+      curCustomerOrgGroup: {}, // 当前选中分组
+      RoomEditParams: {}, //分组 新增时 用到参数 
+
+      isDrag: false,
+      form: {
+        //体检单位分组
+        customerOrgId: "", //复制分组时用到(预留查历次分组)
+        isComplete: "N", //体检次数是否完成，如完成不允许调整分组项目
+        id: "",
+        customerOrgRegisterId: null, //所属体检次数
+        displayName: "",
+        price: 0,
+        forSexId: "A",
+        maritalStatusId: "A",
+        ageLowerLimit: 0,
+        ageUpperLimit: 200,
+        jobPost: "",
+        jobTitle: "",
+        remark: "",
+        isMaxMedicalTimes: "N",
+      },
+      formOri: {}, //用于对比分析哪些信息更改了
+      formInit: {}, //表单初始值
+      rules: {
+        displayName: [{ required: true, message: "请填写分组名称", trigger: "blur" }],
+      },
+
+    };
+  },
+  computed: {
+    ...mapState(["personnelUnit", "window", "dict", "dialogWin", "dataTransOpts"]),
+  },
+  created() {
+    //获取用户当前页面的权限
+    let userPriv = window.sessionStorage.getItem("userPriv");
+    if (userPriv)
+      this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName));
+
+    // 清除当前选中的分组ID
+    this.dataTransOpts.tableS.customer_org_group.id = ''
+
+    this.rowDrop();
+    this.formInit = deepCopy(this.form);
+  },
+  mounted() {
+    //获取初始数据（单位、适用性别）
+    this.dictInit();
+  },
+  methods: {
+    moment,
+    checkPagePriv,
+    dddw,
+    deepCopy,
+
+    // 复制上一次分组
+    btnCopyPreGroup() {
+      if (!this.customerOrgRegister.id) {
+        this.$message.warning("请选择体检次数");
+        return;
+      }
+
+      postapi('/api/app/CustomerOrgGroup/CopyLastGrouping', { customerOrgRegisterId: this.customerOrgRegister.id })
+        .then(res => {
+          if (res.code > -1) {
+            // 刷新体检次数的分组
+            this.getCustomerOrgGroup(this.customerOrgRegister.id);
+          }
+        })
+    },
+
+    //刷新分组价格（供子组件调用）
+    refreshMoney(formData) {
+      //console.log('this is parent')
+      let lfind = arrayExistObj(this.customerOrgGroups, "id", formData.id);
+      if (lfind > -1) this.customerOrgGroups[lfind].price = formData.price;
+    },
+
+    //确定排序
+    btnSort() {
+      const result = [];
+      this.customerOrgGroups.forEach((item, index) => {
+        result.push({ id: item.id, displayOrder: index });
+      });
+      putapi("/api/app/customerorggroup/updatesortmany", {
+        itemList: result,
+      }).then((res) => {
+        console.log("操作成功");
+        this.isDrag = false;
+      });
+    },
+
+    //初始化Sortable组件
+    rowDrop() {
+      // this.$nextTick(() => {
+      //   const tbody = document.querySelector(".el-table__body-wrapper tbody");
+      //   const _this = this;
+      //   Sortable.create(tbody, {
+      //     handle: ".move",
+      //     animation: 300,
+      //     onEnd({ newIndex, oldIndex }) {
+      //       _this.isDrag = false;
+      //       const currRow = _this.customerOrgGroups.splice(oldIndex, 1)[0];
+      //       _this.customerOrgGroups.splice(newIndex, 0, currRow);
+      //       _this.customerOrgGroups.map((item, index) => {
+      //         if (index == newIndex && index == oldIndex) {
+      //         } else if (index == oldIndex) {
+      //         } else if (index == newIndex) {
+      //         }
+      //       });
+      //       console.log(_this.customerOrgGroups.map((item) => item.displayOrder));
+      //     },
+      //   });
+      // });
+
+      this.$nextTick(() => {
+        const el = document.querySelector(".el-table__body-wrapper tbody");
+        //console.log('el0',el)
+        const that = this;
+        Sortable.create(el, {
+          handle: ".move",
+          animation: 300,
+          //拖拽结束
+          onEnd({ newIndex, oldIndex }) {
+            that.isDrag = true;
+            const currRow = that.customerOrgGroups.splice(oldIndex, 1)[0];
+            that.customerOrgGroups.splice(newIndex, 0, currRow);
+            console.log("el", el);
+          },
+        });
+      });
+    },
+
+    //置底
+    btnSetBottom() {
+      if (!this.dataTransOpts.tableS.customer_org_group.id) {
+        this.$message.warning("请选择操作的数据");
+        return;
+      }
+      let lfind = arrayExistObj(this.customerOrgGroups, "id", this.dataTransOpts.tableS.customer_org_group.id);
+      let currentRow = {};
+
+      putapi(
+        `/api/app/customerorggroup/updatemanysort?id=${this.dataTransOpts.tableS.customer_org_group.id}&SortType=2`
+      ).then((res) => {
+        console.log("操作成功");
+        currentRow = this.customerOrgGroups.splice(lfind, 1)[0]; //删除并赋值
+        this.customerOrgGroups.push(currentRow);
+        this.$refs["customerOrgGroups"].setCurrentRow(currentRow);
+      });
+    },
+
+    //置顶
+    btnSetTop() {
+      if (!this.dataTransOpts.tableS.customer_org_group.id) {
+        this.$message.warning("请选择操作的数据");
+        return;
+      }
+
+      let lfind = arrayExistObj(this.customerOrgGroups, "id", this.dataTransOpts.tableS.customer_org_group.id);
+      let currentRow = {};
+
+      putapi(
+        `/api/app/customerorggroup/updatemanysort?id=${this.dataTransOpts.tableS.customer_org_group.id}&SortType=1`
+      ).then((res) => {
+        console.log("操作成功");
+        currentRow = this.customerOrgGroups.splice(lfind, 1)[0];
+        this.customerOrgGroups.unshift(currentRow);
+        this.$refs["customerOrgGroups"].setCurrentRow(currentRow);
+      });
+    },
+
+    //选中颜色
+    handleRowClassName({ row, rowIndex }) {
+      // highLightBg 为 'selected'的高亮
+      //console.log(rowIndex, row)
+      //return row.highLightBg == 'selected' ? 'high-light-bg' : '';
+      if (row.choosed) {
+        return "current-row";
+      } else {
+        return "";
+      }
+    },
+
+    //获取初始数据
+    dictInit() {
+      //获取体检中心
+      getapi("/api/app/organization-units/by-code-all").then((res) => {
+        if (res.code > -1) {
+          this.dict.medicalCenter = 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/for-sex").then((res) => {
+        if (res.code != -1) {
+          this.dict.forSex = res.data;
+        }
+      });
+      
+    },
+
+    //获取体检次数下的分组
+    getCustomerOrgGroup(customerOrgRegisterId) {
+      this.isDrag = false;
+      objCopy(this.formInit, this.form);
+      this.form.customerOrgRegisterId = customerOrgRegisterId;
+      this.customerOrgGroups = [];
+      getapi(
+        `/api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${customerOrgRegisterId}`
+      ).then((res) => {
+        if (res.code != -1) {
+          this.customerOrgGroups = res.data;
+          this.customerOrgGroups.forEach((e) => {
+            e.customerOrgRegisterId = customerOrgRegisterId;
+          });
+        }
+      });
+    },
+
+    filterMethod(keyWords) {
+      if (keyWords) {
+        this.customerOrg = [];
+        this.customerOrgAll.forEach((item) => {
+          if (
+            item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > -1 ||
+            item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
+            // || item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
+          ) {
+            this.customerOrg.push(item);
+          }
+        });
+      } else {
+        this.customerOrg = deepCopy(this.customerOrgAll);
+      }
+    },
+
+    //选择体检中心
+    changeMedicalCenter(v) {
+      console.log('changeMedicalCenter',v)
+    },
+
+    //选择体检次数
+    changeTimes(v) {
+      this.getCustomerOrgGroup(v.id);
+    },
+
+    //点击分组
+    rowClick(row) {
+      this.dataTransOpts.tableS.customer_org_group.id = row.id
+      this.curCustomerOrgGroup = deepCopy(row);
+      this.curCustomerOrgGroup.isComplete = this.customerOrgRegister.isComplete;
+      setTimeout(() => {
+        this.dataTransOpts.refresh.customer_org_group_detail.M++;
+      }, 20);
+    },
+
+    // 新增(编辑调用时，传入id值) 弹框
+    btnAdd(id) {
+      if (!this.customerOrgRegister.id) {
+        this.$message.warning("请选择体检次数");
+        return;
+      }
+
+      if (this.customerOrgRegister.isComplete.toUpperCase() == "Y") {
+        this.$message.warning(`该单位的该次体检次数已完成，不能再${id ? '编辑' : '新增'}分组！`);
+        return;
+      }
+      if (!id) this.dataTransOpts.tableS.customer_org_group.id = ''
+      setTimeout(() => {
+        this.dataTransOpts.refresh.customer_org_group.S++
+        if (!id) this.dataTransOpts.refresh.customer_org_group_detail.M++; //新增则清掉已选组合项目
+      }, 20);
+
+      this.RoomEditParams = {
+        customerOrgRegisterId: this.customerOrgRegister.id,
+        customerOrgId: this.customerOrgId
+      }
+
+      this.dialogWin.RoomEdit = true;
+    },
+
+    //编辑弹框
+    btnEdit() {
+      if (!this.dataTransOpts.tableS.customer_org_group.id) {
+        this.$message.warning("请先选择体检分组");
+        return;
+      }
+      this.btnAdd(this.dataTransOpts.tableS.customer_org_group.id)
+    },
+
+    //删除
+    btnDel() {
+      if (!this.dataTransOpts.tableS.customer_org_group.id) {
+        this.$message.warning("请选择需要操作的数据");
+        return;
+      }
+      if (this.customerOrgRegister.isComplete.toUpperCase() == "Y") {
+        this.$message.warning("该单位体检次数已完成，不允许删除分组");
+        return;
+      }
+
+      this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
+        confirmButtonText: "是",
+        cancelButtonText: "  否  ",
+        type: "warning",
+      })
+        .then(() => {
+          return deletapi(`/api/app/customer-org-group/${this.dataTransOpts.tableS.customer_org_group.id}`);
+        })
+        .then((res) => {
+          if (res.code != -1) {
+            console.log("删除成功");
+            let lfind = arrayExistObj(this.customerOrgGroups, "id", this.dataTransOpts.tableS.customer_org_group.id);
+            if (lfind > -1) this.customerOrgGroups.splice(lfind, 1);
+            this.dataTransOpts.tableS.customer_org_group.id = ''
+            setTimeout(() => {
+              this.dataTransOpts.refresh.customer_org_group_detail.M++
+            }, 20);
+          }
+        })
+        .catch((err) => {
+          if (err == "cancel") {
+            console.log("已取消删除");
+            // this.$message.info("已取消删除");
+          }
+        });
+    },
+
+    //计算总价
+    computePrice() {
+      if (!this.form.id) {
+        this.$message.warning("尚未保存信息，不可执行此操作！");
+        return;
+      }
+      let customerOrgGroupId = this.form.id;
+      let RoomAsbitems = []; //分组包含的套餐
+
+      getapi(`/api/app/customerorggroupdetail/getcustomerorggroupdetailinasbitem?CustomerOrgGroupId=${customerOrgGroupId}
+      `)
+        .then((res) => {
+          if (res.code != -1) {
+            RoomAsbitems = res.data;
+
+            if (RoomAsbitems.length < 1) {
+              this.$message.warning("当前分组尚未设置组合项目，不可执行此操作！");
+            } else {
+              let body = {
+                customerOrgGroupId,
+                details: this.madeNewGroupAsbitems(
+                  RoomAsbitems,
+                  this.form.price
+                ),
+              };
+              console.log("body", body);
+              return postapi(
+                "/api/app/customerorggroupdetail/createcustomerorggroupdetailmany",
+                body
+              );
+            }
+          }
+        })
+        .then((res) => {
+          if (res.code != -1) {
+            //console.log("操作成功");
+            //触发分组明细刷新
+            this.form.id = "";
+            //要做延时处理，否则不会触发监听
+            setTimeout(() => {
+              this.form.id = customerOrgGroupId;
+              this.onSubmit("form");
+            }, 100);
+          }
+        });
+    },
+
+    madeNewGroupAsbitems(oldGroupAsbitems, newTotal) {
+      newTotal = Math.round(Number(newTotal) * 100) / 100;
+      let newGroupAsbitems = [];
+      let oldTotal = Number(0);
+      oldGroupAsbitems.forEach((e) => {
+        oldTotal += Number(e.asbitemMoney); //customerOrgGroupDetailMoney
+      });
+      oldTotal = Math.round(Number(oldTotal) * 100) / 100;
+
+      let discount = 0;
+      if (oldTotal != 0) discount = Math.round((newTotal * 10000) / oldTotal) / 100;
+
+      oldTotal = Number(0);
+      oldGroupAsbitems.forEach((e) => {
+        e.customerOrgGroupDetailPrice = Math.round(e.price * discount) / 100;
+        e.customerOrgGroupDetailMoney =
+          Math.round(
+            e.customerOrgGroupDetailPrice * e.customerOrgGroupDetailAmount * 100
+          ) / 100;
+        oldTotal += Number(e.customerOrgGroupDetailMoney);
+      });
+      oldTotal = Math.round(Number(oldTotal) * 100) / 100;
+
+      //console.log('discount,oldTotal',discount,oldTotal)
+
+      let didTotal = Math.round(Number(newTotal - oldTotal) * 100) / 100;
+      if (didTotal != 0) {
+        for (let i = 0; i < oldGroupAsbitems.length; i++) {
+          if (oldGroupAsbitems[i].customerOrgGroupDetailAmount == 1) {
+            oldGroupAsbitems[i].customerOrgGroupDetailPrice =
+              Math.round(
+                (Number(oldGroupAsbitems[i].customerOrgGroupDetailPrice) +
+                  Number(didTotal)) *
+                100
+              ) / 100;
+            break;
+          }
+        }
+      }
+
+      oldGroupAsbitems.forEach((e) => {
+        newGroupAsbitems.push({
+          customerOrgGroupId: e.customerOrgGroupId,
+          asbitemId: e.asbitemId,
+          price: e.customerOrgGroupDetailPrice,
+          amount: e.customerOrgGroupDetailAmount,
+        });
+      });
+
+      return newGroupAsbitems;
+    },
+
+    // 关闭 分组 新增/编辑
+    close_dialogWinRoomEdit() {
+      let id = this.dataTransOpts.tableS.customer_org_group.id
+      if (id) {
+        // 点编辑 或 新增有提交
+        getapi(`/api/app/customer-org-group/${id}`)
+          .then(res => {
+            if (res.code != -1) {
+              let lfind = -1
+              lfind = arrayExistObj(this.customerOrgGroups, 'id', id)
+              if (lfind > -1) {
+                objCopy(res.data, this.customerOrgGroups[lfind])
+              } else {
+                lfind = this.customerOrgGroups.length
+                this.customerOrgGroups.push(res.data)
+              }
+
+              // 选中当前操作的列
+              this.$refs["customerOrgGroups"].setCurrentRow(); //清除选择
+              this.$refs["customerOrgGroups"].setCurrentRow(this.customerOrgGroups[lfind]);
+
+              // 更新 customer_org_group_detail 参数
+              this.curCustomerOrgGroup = deepCopy(res.data);
+              this.curCustomerOrgGroup.isComplete = this.customerOrgRegister.isComplete;
+            }
+          })
+      } else {
+        // 点 新增 但未提交
+        this.dataTransOpts.tableS.customer_org_group.id = this.curCustomerOrgGroup.id || ''
+      }
+
+      this.dataTransOpts.refresh.customer_org_group_detail.M++;
+    },
+  },
+};
+</script>
+<style scoped>
+@import "../../assets/css/global_button.css";
+@import "../../assets/css/global_dialog.css";
+@import "../../assets/css/global_table.css";
+@import "../../assets/css/global_form.css";
+@import "../../assets/css/global_input.css";
+@import "../../assets/css/global.css";
+
+.btnClass {
+  width: 100px;
+  margin-bottom: 5px;
+}
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index 00b1ee6..1cabf1d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -230,6 +230,12 @@ const routes = [{
                 component: () =>
                     import ("../views/basic-dictionary/SummaryItems.vue"),
             },
+            {
+                path: "/room",
+                name: '分诊叫号房间设置',
+                component: () =>
+                    import ("../components/room/room.vue"),
+            },
             //----------------------  收费设置 start ----------------------
             {
                 path: "/invoice-item-type",
diff --git a/src/store/index.js b/src/store/index.js
index 8d0d498..ab9f73c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -298,6 +298,11 @@ export default new Vuex.Store({
             asbItem: [], //显示的  未选组合项目
             asbItemQuick: [], //显示的  未选组合项目(供快速选择)
             diagnosisLevel: [], //诊断级别
+            medicalCenter: [], // 体检中心
+            roomType: [
+                { id: "0", displayName: "普通" },
+                { id: "1", displayName: "采血室" }
+            ],
         },
 
         // 项目特有的对象数据 project private 
@@ -377,7 +382,7 @@ export default new Vuex.Store({
                     isPatientSymptomsUpdate: "N", // 症状
                     isOccSummary: 'N', // 修改总检结论 
                 },
-                appoint_patient_register:{},  // 预约登记数据 
+                appoint_patient_register: {},  // 预约登记数据 
 
             },
             //表当前数据（多条记录 M--more）
@@ -406,7 +411,7 @@ export default new Vuex.Store({
                 patient_symptom: [], // 病人症状
                 patient_past_medical_history: [], // 既往病史
                 patient_occupational_medical_history: [], // 职业病史
-                appoint_register_asbitem:[], // 预约所选组合项目
+                appoint_register_asbitem: [], // 预约所选组合项目
             },
             plus: {
                 PatientRegisterEditQuery: 0,         // 更新查询条件        
@@ -416,7 +421,7 @@ export default new Vuex.Store({
                 PatientRegisterForChoose: 0,         // 体检人员查询窗口  
                 OccDisease: 0,  // 职业病
                 WebBooking: 0,  // 网上预约
-                ImportOrgData:0, // 导入企业（青藏公司）数据
+                ImportOrgData: 0, // 导入企业（青藏公司）数据
             }
 
         },
@@ -437,7 +442,7 @@ export default new Vuex.Store({
             OccDisease: false, // 职业病
             Label: false, // 补打条码
             WebBooking: false, // 网上预约
-            ImportOrgData:false, // 导入企业（青藏公司）数据
+            ImportOrgData: false, // 导入企业（青藏公司）数据
         }
 
     },