From b6663e79388533d8ec2b44dbc920d22befbec62a Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Tue, 24 Oct 2023 10:42:57 +0800
Subject: [PATCH] group

---
 .../customerOrg/customerOrgGroupAsbitem.vue   | 295 +++++++++++++++++-
 src/components/doctorCheck/ButtonList.vue     |   2 +
 src/components/doctorCheck/CheckSumSug.vue    |   7 +-
 src/components/report/AsbitemOCX.vue          |   4 +-
 src/views/customerOrg/customerOrgGroup.vue    | 170 ++++++----
 5 files changed, 396 insertions(+), 82 deletions(-)

diff --git a/src/components/customerOrg/customerOrgGroupAsbitem.vue b/src/components/customerOrg/customerOrgGroupAsbitem.vue
index 4d91de1..1caf50e 100644
--- a/src/components/customerOrg/customerOrgGroupAsbitem.vue
+++ b/src/components/customerOrg/customerOrgGroupAsbitem.vue
@@ -112,21 +112,163 @@
     <!--批量操作按钮（复制套餐与分组）-->
     <div style="display: block;margin-left: 10px;">
       <div style="margin-top: 50px;">
-        <el-button class="btnClass">复制分组</el-button>
+        <el-button class="btnClass" @click="btnCopyGroup">复制分组</el-button>
       </div>
       <div>
-        <el-button class="btnClass">复制套餐</el-button>
+        <el-button class="btnClass" @click="btnCopyMedicalPackage">复制套餐</el-button>
       </div>
       <div>
         <el-button class="btnClass" @click="btnSave">保存</el-button>
       </div>
-    </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 @click="medicalPackageVisble = false" style="width:90px;">取消</el-button>
+        <el-button 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 @click="groupVisble = false" style="width:90px;">取消</el-button>
+        <el-button type="primary" @click="copyGroup" style="width:90px;">确定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { getapi, postapi } from "@/api/api";
+import moment from 'moment';
 import { mapState } from "vuex";
-import { arrayExistObj, tcdate, arrayFilter, arrayReduce, deepCopy } from "../../utlis/proFunc";
+import { getapi, postapi } from "@/api/api";
+import { arrayExistObj, tcdate, arrayFilter, arrayReduce, deepCopy,dddw } from "../../utlis/proFunc";
+
 
 export default {
   props:['customerOrgGroup'],
@@ -139,10 +281,18 @@ export default {
 
       asbItemChoosed: [], //勾选的  未选组合项目
       startPoint:-1,
-
       PstartPoint:-1,
 
-      saveornot: true, //保存按钮
+      medicalPackageVisble:false, //复制套餐
+      curPackageId:'',  //当前选中套餐ID
+      packageAsbitems:[], //套餐中包含的组合项目
+
+      groupVisble:false,  //复制分组
+      customerOrgGroups:[],     //历次分组
+      curGroupId:'',  //当前选中套餐ID
+      groupAsbitems:[],  //选中分组包含组合项目
+
+  
       selecteddata: [], //已选数据
       unselecteddata: [], //未选数据
       unselecteddata: [], //右边勾选中
@@ -172,6 +322,7 @@ export default {
     this.refreshTable('tableCustomerOrgGroupAsbitems')
   },
   methods: {
+    moment,dddw,
     //表格强制刷新
     refreshTable(tableRef){
       this.$nextTick(() => {
@@ -201,6 +352,13 @@ export default {
         }
       });
 
+      //套餐
+      getapi("/api/app/medical-package/in-filter").then((res) => {
+        if (res.code != -1) {
+          this.dict.medicalPackage = res.data.items;
+        }
+      });
+
     },
 
     handleRowClassName({ row, rowIndex }) {
@@ -261,15 +419,18 @@ export default {
     // 添加组合项目
     ///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("请先选中单位分组")
         return
       }
-
+      let message = []
       let checked = true      
       let lfind = -1
 
-      //勾选时不需要此操作  start
+      //oprType 不传值时，兼容勾选方式
+      //勾选时不需要此操作  start      
       if(oprType && oprType == 'all'){
         asbItemChoosed = deepCopy(this.dict.asbItem)
       }else if(oprType && oprType == 'choosed'){
@@ -294,18 +455,34 @@ export default {
       //   "forSexId": "F",
       //   "itemTypeId": "3a0b16de-75b9-c910-c61b-844709a88940",
       //   "price": 0,
-      console.log('asbItemChoosed.length', asbItemChoosed.length)
-      for (let i = 0; i < asbItemChoosed.length; i++) {
+      
+      // 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 //未选性别时，无需判断组合项目性别限制
+        console.log(`asbItemChoosed[${i}]`,asbItemChoosed[i])
         if (asbItemChoosed[i].forSexId == 'A' || asbItemChoosed[i].forSexId == 'U') continue
-        if (asbItemChoosed[i].forSexId != this.customerOrgGroup.sexId) {
-          this.$message.warning(`所选项目：${asbItemChoosed[i].displayName}，不适合当前人员性别`)
+        if (asbItemChoosed[i].forSexId != this.customerOrgGroup.forSexId) {
+          message.push(asbItemChoosed[i].displayName)   //.warning(`所选项目：${asbItemChoosed[i].displayName}，不适合当前人员性别`)
           checked = false
-          break
+          asbItemChoosed.splice(i,1)
         }
       }
       //console.log(222,checked)
-      if (!checked) return
+      if (!checked) this.$message.warning(`所选项目【${JSON.stringify(message)}】不适合当前人员性别`)
 
       for (let i = 0; i < asbItemChoosed.length; i++) {
         let pojo = {
@@ -567,7 +744,95 @@ export default {
       return sums;
     },
 
+    //复制分组
+    btnCopyGroup(){
+      if(!this.customerOrgGroup.id || this.customerOrgGroup.customerOrgId){
+        this.$message.warning("请先选中单位分组")
+        return
+      }
+      
+      getapi(
+        `/api/app/customerorggroup/getlistinfilter?CustomerOrgId=${this.customerOrgGroup.customerOrgId}`
+      ).then((res) => {
+        if (res.code != -1) {
+          this.customerOrgGroups = res.data.items;
+        }
+      });
+      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("请先选择要复制的套餐！")
+        return
+      }
+      console.log('this.packageAsbitems',this.groupAsbitems)
+      this.addAbs(deepCopy(this.groupAsbitems))
+      this.groupVisble = false
+    },
+
+
+
+    //复制套餐
+    btnCopyMedicalPackage(){
+      if(!this.customerOrgGroup.id){
+        this.$message.warning("请先选中单位分组")
+        return
+      }
+      this.medicalPackageVisble = true
+    },
+
+    //选中套餐
+    async packageRowClick(row){
+      this.curPackageId = row.id
+      this.packageAsbitems = []
+      try {
+        let res = await getapi(`/api/app/medical-package-detail/medical-package-in-asbitem?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("请先选择要复制的套餐！")
+        return
+      }
+      console.log('this.packageAsbitems',this.packageAsbitems)
+      this.addAbs(deepCopy(this.packageAsbitems))
+      this.medicalPackageVisble = false
+    },
+
+    
 
 
 
diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue
index eef631d..f1e11b9 100644
--- a/src/components/doctorCheck/ButtonList.vue
+++ b/src/components/doctorCheck/ButtonList.vue
@@ -350,11 +350,13 @@ export default {
                 return
             }
             this.doctorCheck.checkSummaryList.push({
+                id:Math.random(),
                 registerCheckId: this.doctorCheck.RegisterCheckEdit.id,
                 summary: '',
                 summaryFlag: 'N',
             })
             this.doctorCheck.checkSuggestionList.push({
+                id:Math.random(),
                 registerCheckId: this.doctorCheck.RegisterCheckEdit.id,
                 suggestion: '',
             })
diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue
index 22b8cc2..65bd82c 100644
--- a/src/components/doctorCheck/CheckSumSug.vue
+++ b/src/components/doctorCheck/CheckSumSug.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="display: flex;">
     <div :style="'width:'+Math.floor((window.pageWidth - 210 - 120 - 80)/2) + 'px;'">
-      <el-table id="tableSummary" row-key="id" :data="doctorCheck.checkSummaryList" :row-style="{ height: '30px' }"
+      <el-table id="tableSummary" row-key="id" :data="doctorCheck.checkSummaryList" 
         :height="window.pageHeight < 600 ? Math.floor((380 - 80)*2/5):Math.floor((window.pageHeight-220-80)*2/5)"
         width="100%" border @row-click="rowClick">
         <el-table-column prop="summary" label="小结" :width="Math.floor((window.pageWidth - 210 - 124 - 80)/2)" >
@@ -92,7 +92,7 @@ export default {
     rowDrop() {
       this.$nextTick(() => {
         const el = document.querySelector("#tableSummary tbody");
-        //console.log('tbody',tbody)
+        console.log('el0',el)
         const that = this;
         Sortable.create(el, {
           animation: 150, // ms, number 单位：ms，定义排序动画的时间
@@ -100,7 +100,8 @@ export default {
           onEnd({ newIndex, oldIndex }) {            
             that.isshow = false;
             const currRow = that.doctorCheck.checkSummaryList.splice(oldIndex, 1)[0];
-            that.doctorCheck.checkSummaryList.splice(newIndex, 0, currRow);           
+            that.doctorCheck.checkSummaryList.splice(newIndex, 0, currRow);    
+            console.log('el',el)       
           },
         });
       });
diff --git a/src/components/report/AsbitemOCX.vue b/src/components/report/AsbitemOCX.vue
index 795f37e..b9ba170 100644
--- a/src/components/report/AsbitemOCX.vue
+++ b/src/components/report/AsbitemOCX.vue
@@ -172,7 +172,7 @@ export default {
 
       //获取所有组合项目
       getapi("/api/app/asbitem/in-filter?Filter").then((res) => {
-        if (res.code == 1) {
+        if (res.code != -1) {
           this.dict.asbItemAll = res.data.items;
           this.parseAsbitem();
         }
@@ -180,7 +180,7 @@ export default {
 
       //套餐
       getapi("/api/app/medical-package/in-filter").then((res) => {
-        if (res.code == 1) {
+        if (res.code != -1) {
           this.dict.medicalPackage = res.data.items;
         }
       });
diff --git a/src/views/customerOrg/customerOrgGroup.vue b/src/views/customerOrg/customerOrgGroup.vue
index b344747..b62f251 100644
--- a/src/views/customerOrg/customerOrgGroup.vue
+++ b/src/views/customerOrg/customerOrgGroup.vue
@@ -11,8 +11,8 @@
               <el-select
                 v-model="customerOrgId"
                 placeholder="请选择体检单位"
-                filterable
-                clearable 
+                filterable :filter-method="filterMethod" default-first-option
+                clearable @clear="customerOrg = deepCopy(customerOrgAll)"
                 style="margin-left: 10px"
                 @change="changeCustomerOrg"
                 size="small"
@@ -35,7 +35,6 @@
                 style="width: 60px; margin-left: 10px"
                 size="small"
                 @change="changeTimes"
-
                 value-key="id"
               >
                 <el-option
@@ -139,13 +138,13 @@
             <el-button class="btnClass" @click="btnDel" >删除</el-button> 
           </div>
           <div>         
-            <el-button class="btnClass" @click="topping" >置顶</el-button> 
+            <el-button class="btnClass" @click="btnSetTop" >置顶</el-button> 
           </div>
           <div>         
-            <el-button class="btnClass" @click="bottoming" >置低</el-button>
+            <el-button class="btnClass" @click="btnSetBottom" >置低</el-button>
           </div>
           <div>
-            <el-button class="btnClass" @click="sortok" :disabled="isshow" >保存排序</el-button>
+            <el-button class="btnClass" @click="btnSort" :disabled="!isDrag" >保存排序</el-button>
           </div>
         </div>
       </div>
@@ -261,9 +260,10 @@ export default {
       customerOrgRegisterList: [], //体检次数列表
       customerOrgRegister: {}, //体检次数
 
-      isshow: true,
+      isDrag: false,
       form: {
         //体检单位分组
+        customerOrgId:'',   //复制分组时用到
         id: "",
         customerOrgRegisterId: null, //所属体检次数
         displayName: "",
@@ -284,12 +284,8 @@ export default {
         ],
       },
 
-      dialogVisible: false,
-      tableData: [],
-      initTableData: [],
-      // tableData: [
-
-      // ],
+      dialogVisible: false,      
+    
     };
   },
   computed: {
@@ -305,75 +301,103 @@ export default {
   },
   methods: {
     moment,
-    dddw,
+    dddw,deepCopy,
+    
     //确定排序
-    sortok() {
+    btnSort() {
       const result = [];
-      this.tableData.forEach((item, index) => {
-        // index 从0开始的， 你的displayOrder从大到小排
-        console.log(item.id);
-        // const currentDisplayOrder = this.tableData.length -1
-        const currentDisplayOrder = this.initTableData[index].displayOrder;
-        if (item.displayOrder != currentDisplayOrder) {
-          // 如果它的displayOrder和它当前所在的位置不同代表挪动过位置
-          result.push({ id: item.id, displayOrder: currentDisplayOrder });
-        }
+      this.customerOrgGroups.forEach((item, index) => {        
+        result.push({ id: item.id, displayOrder: index });       
       });
       putapi("/api/app/customerorggroup/updatesortmany", {
         itemList: result,
       }).then((res) => {
         this.$message.success("操作成功");
-        this.isshow = true;
+        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 tbody = document.querySelector(".el-table__body-wrapper tbody");
-        const _this = this;
-        Sortable.create(tbody, {
+        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 }) {
-            _this.isshow = false;
-            const currRow = _this.tableData.splice(oldIndex, 1)[0];
-            _this.tableData.splice(newIndex, 0, currRow);
-            _this.tableData.map((item, index) => {
-              if (index == newIndex && index == oldIndex) {
-              } else if (index == oldIndex) {
-              } else if (index == newIndex) {
-              }
-            });
-            console.log(_this.tableData.map((item) => item.displayOrder));
+          //拖拽结束
+          onEnd({ newIndex, oldIndex }) {            
+            that.isDrag = true;
+            const currRow = that.customerOrgGroups.splice(oldIndex, 1)[0];
+            that.customerOrgGroups.splice(newIndex, 0, currRow);  
+            console.log('el',el)         
           },
         });
       });
     },
 
-    //置低
-    bottoming() {
-      if (this.form.id == undefined) {
+
+    //置底
+    btnSetBottom() {
+      if (!this.form.id) {
         this.$message.warning("请选择操作的数据");
-      } else {
-        putapi(
-          `/api/app/customerorggroup/updatemanysort?id=${this.form.id}&SortType=2`
-        ).then((res) => {
-          this.$message.success("操作成功");
-        });
-      }
+        return
+      } 
+      let lfind = arrayExistObj(this.customerOrgGroups,'id',this.form.id)
+      let currentRow = {}
+
+      putapi(
+        `/api/app/customerorggroup/updatemanysort?id=${this.form.id}&SortType=2`
+      ).then((res) => {
+        this.$message.success("操作成功");
+        currentRow = this.customerOrgGroups.splice(lfind,1)[0]  //删除并赋值
+        this.customerOrgGroups.unshift(currentRow)
+        this.$refs['customerOrgGroups'].setCurrentRow(currentRow); 
+      });
+      
     },
 
     //置顶
-    topping() {
-      if (this.form.id == undefined) {
+    btnSetTop() {
+      if (!this.form.id) {
         this.$message.warning("请选择操作的数据");
-      } else {
-        putapi(
-          `/api/app/customerorggroup/updatemanysort?id=${this.form.id}&SortType=1`
-        ).then((res) => {
-          this.$message.success("操作成功");
-        });
+        return
       }
+
+      let lfind = arrayExistObj(this.customerOrgGroups,'id',this.form.id)
+      let currentRow = {}
+       
+      putapi(
+        `/api/app/customerorggroup/updatemanysort?id=${this.form.id}&SortType=1`
+      ).then((res) => {
+        this.$message.success("操作成功");
+        currentRow = this.customerOrgGroups.splice(lfind,1)[0]
+        this.customerOrgGroups.unshift(currentRow)
+        this.$refs['customerOrgGroups'].setCurrentRow(currentRow); 
+      });
+      
     },
 
     //选中颜色
@@ -394,9 +418,10 @@ export default {
       //获取单位列表
       getapi("/api/app/customer-org/parent-all").then((res) => {
         if (res.code != -1) {
-          this.customerOrg = res.data;
-          let lfind = arrayExistObj(this.customerOrg,"id",this.dict.personOrgId);
-          if (lfind > -1) this.customerOrg.splice(lfind, 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)
         }
       });
 
@@ -410,6 +435,7 @@ export default {
 
     //获取体检次数下的分组
     getCustomerOrgGroup(customerOrgRegisterId) {
+      this.isDrag = false
       this.customerOrgGroups = [];
       getapi(
         `/api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${customerOrgRegisterId}`
@@ -418,11 +444,28 @@ export default {
           this.customerOrgGroups = res.data.items;
           this.customerOrgGroups.forEach((e) => {
             e.customerOrgRegisterId = customerOrgRegisterId;
+            e.customerOrgId = this.customerOrgId;
           });
         }
       });
     },
 
+    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);
+      }
+    },
+
     //选择单位
     changeCustomerOrg(v) {
       getapi(
@@ -435,7 +478,8 @@ export default {
             this.getCustomerOrgGroup(this.customerOrgRegister.id);
           } else {
             this.customerOrgRegister = {};
-            this.customerOrgGroups = [];            
+            this.customerOrgGroups = [];    
+            this.isDrag = false        
           }
           objCopy(this.formInit,this.form)
         }
@@ -450,7 +494,7 @@ export default {
     
     //点击分组
     rowClick(row) {     
-      objCopy(row, this.form);
+      objCopy(row, this.form);      
     },
 
     //新增弹框
@@ -466,6 +510,7 @@ export default {
 
       this.form = deepCopy(this.formInit);
       this.form.customerOrgRegisterId = this.customerOrgRegister.id;
+      this.form.customerOrgId = this.customerOrgId;
       this.dialogVisible = true;
     },
 
@@ -499,6 +544,7 @@ export default {
             );
             if (lfind > -1) this.customerOrgGroups.splice(lfind, 1);
             objCopy(this.formInit,this.form)
+            this.isDrag = false
           }
         })
         .catch((err) => {