diff --git a/src/components/customerOrg/customerOrgGroupAsbitem.vue b/src/components/customerOrg/customerOrgGroupAsbitem.vue
index dcb866c..5980e11 100644
--- a/src/components/customerOrg/customerOrgGroupAsbitem.vue
+++ b/src/components/customerOrg/customerOrgGroupAsbitem.vue
@@ -29,7 +29,7 @@
       </div>
 
       <!--中间操作按钮-->
-      <div style="display: block;margin: 40px 10px 0 10px;width:110px;">
+      <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>
@@ -77,7 +77,7 @@
               prop="displayName"
             ></el-table-column>
             <el-table-column label="标准价格" prop="price" min-width="60" align="center"/>
-            <el-table-column label="折扣" min-width="60" align="center">
+            <el-table-column label="折扣" min-width="40" align="center">
               <template slot-scope="scope">
                 <el-input
                   @input="changeDiscount(scope.$index)"
@@ -113,7 +113,7 @@
       </div>
     </div>
     <!--批量操作按钮（复制套餐与分组）-->
-    <div style="display: block;margin-left: 10px;">
+    <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>
@@ -980,14 +980,6 @@ export default {
 
   //监听事件
   watch: {
-    //
-    // "customerOrgGroup.id"(newVal, oldVal) {
-    //   console.log("customerOrgGroup.id ",newVal,oldVal);
-    //   if (newVal != oldVal) {
-    //     this.getCustomerOrgGroupAsbitems(newVal);
-    //   }
-    // },
-
     // 体检分组ID未切换换时 也可以强制刷新数据
     "dataTransOpts.refresh.customer_org_group_detail.M":{
       immediate:true,
diff --git a/src/store/index.js b/src/store/index.js
index ca8ec96..fd42184 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -340,6 +340,7 @@ export default new Vuex.Store({
 
         // 弹窗控制
         dialogWin: {
+            CustomerOrgGroupEdit:false, // 单位分组 新增/编辑  
             PatientList: false,  // 体检人员档案列表
             PatientRegisterEdit: false, // 体检人员登记 新增/编辑            
             PatientRegisterForChoose: false,  // 体检人员登记列表
diff --git a/src/views/customerOrg/CustomerOrgGroupEdit.vue b/src/views/customerOrg/CustomerOrgGroupEdit.vue
new file mode 100644
index 0000000..fd1c6cf
--- /dev/null
+++ b/src/views/customerOrg/CustomerOrgGroupEdit.vue
@@ -0,0 +1,376 @@
+<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-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-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 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,
+        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);
+              }
+            });
+        } 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/views/customerOrg/customerOrgGroup.vue b/src/views/customerOrg/customerOrgGroup.vue
index 9e83510..b0f5b96 100644
--- a/src/views/customerOrg/customerOrgGroup.vue
+++ b/src/views/customerOrg/customerOrgGroup.vue
@@ -72,9 +72,9 @@
           </div>
         </div>
         <!--按钮-->
-        <div style="display: block; margin-left: 10px">
+        <div style="display: block; margin-left: 5px">
           <div v-show="checkPagePriv(pagePriv.privs, '新增')" style="margin-top: 35px">
-            <el-button class="commonbutton" @click="btnAdd">新增</el-button>
+            <el-button class="commonbutton" @click="btnAdd('')">新增</el-button>
           </div>
           <div v-show="checkPagePriv(pagePriv.privs, '编辑')" style="margin-top: 8px">
             <el-button class="commonbutton" @click="btnEdit">编辑</el-button>
@@ -96,75 +96,14 @@
 
       <!--分组项目信息 -->
       <div>
-        <CustomerOrgGroupAsbitem :customerOrgGroup="form" :refreshMoney="refreshMoney" />
+        <CustomerOrgGroupAsbitem :customerOrgGroup="curCustomerOrgGroup" :refreshMoney="refreshMoney" />
       </div>
     </div>
 
     <!-- 新增或者编辑弹框 -->
-    <el-dialog :title="form.id ? '编辑' : '新增'" :close-on-click-modal="false" :visible.sync="dialogVisible" width="800px">
-      <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-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-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 v-model="form.remark" size="small" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button class="commonbutton" @click="dialogVisible = false">关闭</el-button>
-        <!--
-        <el-button type="success" @click="computePrice">同比折算组合项目价格</el-button>
-        -->
-        <el-button class="commonbutton" type="primary" @click="onSubmit('form')">确定</el-button>
-      </span>
+    <el-dialog :title="dataTransOpts.tableS.customer_org_group.id ? '编辑' : '新增'" :close-on-click-modal="false"
+      :visible.sync="dialogWin.CustomerOrgGroupEdit" width="800px" @close="close_dialogWinCustomerOrgGroupEdit">
+      <CustomerOrgGroupEdit :params="CustomerOrgGroupEditParams"/>
     </el-dialog>
     <!--  -->
   </div>
@@ -184,10 +123,11 @@ import {
 } from "../../utlis/proFunc";
 
 import CustomerOrgGroupAsbitem from "../../components/customerOrg/customerOrgGroupAsbitem.vue";
+import CustomerOrgGroupEdit from "./CustomerOrgGroupEdit.vue";
 
 export default {
   components: {
-    CustomerOrgGroupAsbitem,
+    CustomerOrgGroupAsbitem,CustomerOrgGroupEdit
   },
   data() {
     return {
@@ -201,6 +141,9 @@ export default {
       customerOrgRegisterList: [], //体检次数列表
       customerOrgRegister: {}, //体检次数
 
+      curCustomerOrgGroup: {}, // 当前选中分组
+      CustomerOrgGroupEditParams:{}, //分组 新增时 用到参数 
+
       isDrag: false,
       form: {
         //体检单位分组
@@ -225,11 +168,10 @@ export default {
         displayName: [{ required: true, message: "请填写分组名称", trigger: "blur" }],
       },
 
-      dialogVisible: false,
     };
   },
   computed: {
-    ...mapState(["personnelUnit", "window", "dict", "dataTransOpts"]),
+    ...mapState(["personnelUnit", "window", "dict", "dialogWin", "dataTransOpts"]),
   },
   created() {
     //获取用户当前页面的权限
@@ -237,6 +179,9 @@ export default {
     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);
   },
@@ -459,52 +404,51 @@ export default {
 
     //点击分组
     rowClick(row) {
-      objCopy(row, this.form);
-      this.formOri = Object.assign({}, row);
-      this.form.isComplete = this.customerOrgRegister.isComplete;
+      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);
     },
 
-    //新增弹框
-    btnAdd() {
+    // 新增(编辑调用时，传入id值) 弹框
+    btnAdd(id) {
       if (!this.customerOrgRegister.id) {
         this.$message.warning("请选择体检次数");
         return;
       }
+
       if (this.customerOrgRegister.isComplete.toUpperCase() == "Y") {
-        this.$message.warning("该单位体检次数已完成，不允许新增分组");
+        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);
 
-      if (this.customerOrgRegister.isComplete.toUpperCase() == "Y") {
-        this.$message.warning("该单位的该次体检次数已完成，不能再添加分组！");
-        return;
+      this.CustomerOrgGroupEditParams = {
+        customerOrgRegisterId: this.customerOrgRegister.id,
+        customerOrgId: this.customerOrgId
       }
 
-      this.form = deepCopy(this.formInit);
-      this.form.customerOrgRegisterId = this.customerOrgRegister.id;
-      this.form.customerOrgId = this.customerOrgId;
-      this.dialogVisible = true;
+      this.dialogWin.CustomerOrgGroupEdit = true;
     },
 
     //编辑弹框
     btnEdit() {
-      if (!this.form.id) {
-        this.$message.warning("请选择需要操作的数据");
-        return;
-      }
-      if (this.customerOrgRegister.isComplete.toUpperCase() == "Y") {
-        this.$message.warning("该单位体检次数已完成，不允许编辑分组");
+      if (!this.dataTransOpts.tableS.customer_org_group.id) {
+        this.$message.warning("请先选择体检分组");
         return;
       }
-      this.dialogVisible = true;
+      this.btnAdd(this.dataTransOpts.tableS.customer_org_group.id)
     },
 
     //删除
     btnDel() {
-      if (!this.form.id) {
+      if (!this.dataTransOpts.tableS.customer_org_group.id) {
         this.$message.warning("请选择需要操作的数据");
         return;
       }
@@ -519,120 +463,28 @@ export default {
         type: "warning",
       })
         .then(() => {
-          return deletapi(`/api/app/customer-org-group/${this.form.id}`);
+          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.form.id);
+            let lfind = arrayExistObj(this.customerOrgGroups, "id", this.dataTransOpts.tableS.customer_org_group.id);
             if (lfind > -1) this.customerOrgGroups.splice(lfind, 1);
-            objCopy(this.formInit, this.form);
-            this.isDrag = false;
+            this.dataTransOpts.tableS.customer_org_group.id = ''
+            setTimeout(() => {
+              this.dataTransOpts.refresh.customer_org_group_detail.M++
+            }, 20);
           }
         })
         .catch((err) => {
           if (err == "cancel") {
-            this.$message.info("已取消删除");
+            console.log("已取消删除");
+            // this.$message.info("已取消删除");
           }
         });
     },
 
-    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.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("保存分组成功！");
-                let lfind = arrayExistObj(this.customerOrgGroups, "id", this.form.id);
-                if (lfind > -1) objCopy(this.form, this.customerOrgGroups[lfind]);
-                console.log(
-                  "this.formOri.price != this.form.price",
-                  this.formOri.price,
-                  this.form.price
-                );
-                if (this.formOri.price != this.form.price) {
-                  return getapi(
-                    `/api/app/customerorggroupdetail/getcustomerorggroupdetailinasbitem?CustomerOrgGroupId=${customerOrgGroupId}`
-                  );
-                } else {
-                  this.dialogVisible = false;
-                }
-              }
-            })
-            .then((res) => {
-              if (res && res.code != -1) {
-                customerOrgGroupAsbitems = res.data;
-                if (customerOrgGroupAsbitems.length < 1) {
-                  console.log("该分组暂没有组合项目！");
-                  this.dialogVisible = 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.dialogVisible = false;
-                // 刷新明细
-                let id = this.form.id;
-                this.form.id = "";
-                setTimeout(() => {
-                  this.form.id = id;
-                }, 100);
-              }
-            });
-        } else {
-          //新增
-          postapi(
-            "/api/customerorggroup/createcustomerorggroupincustomerorgregister",
-            body
-          ).then((res) => {
-            if (res.code != -1) {
-              console.log("操作成功！");
-              this.form.id = res.data.id;
-              this.customerOrgGroups.push(deepCopy(res.data));
-              this.$refs["customerOrgGroups"].setCurrentRow(
-                this.customerOrgGroups[this.customerOrgGroups.length - 1]
-              );
-              this.dialogVisible = false;
-            }
-          });
-        }
-      });
-    },
-
+    //计算总价
     computePrice() {
       if (!this.form.id) {
         this.$message.warning("尚未保存信息，不可执行此操作！");
@@ -730,6 +582,40 @@ export default {
 
       return newGroupAsbitems;
     },
+
+    // 关闭 分组 新增/编辑
+    close_dialogWinCustomerOrgGroupEdit() {
+      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>