00001

src/components/customerOrg/customerOrgGroupAsbitem.vue

@@ -335,6 +335,9 @@ export default {
 
     this.dictInit()
   },
+  mounted() {
+    this.getCustomerOrgGroupAsbitems(this.customerOrgGroup.id);
+  }, 
 
   updated () {
     this.refreshTable('tableCustomerOrgGroupAsbitems')
@@ -372,7 +375,7 @@ export default {
       });
 
       //套餐
-      postapi("/api/app/medicalpackage/GetBasicList",{}).then((res) => {
+      postapi("/api/app/asbitem/getasbitemlist",{}).then((res) => {
         if (res.code != -1) {
           this.dict.medicalPackage = res.data;
         }
@@ -926,19 +929,22 @@ export default {
       
       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 =>{
+       )
+      //  .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)
         }
@@ -982,7 +988,7 @@ export default {
   watch: {
     // 体检分组ID未切换换时 也可以强制刷新数据
     "dataTransOpts.refresh.customer_org_group_detail.M":{
-      immediate:true,
+      // immediate:true,
       handler(newVal, oldVal) {
         console.log(`watch 体检分组 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.customerOrgGroup.id}`);        
         this.getCustomerOrgGroupAsbitems(this.customerOrgGroup.id);

src/components/doctorCheck/ButtonList.vue

@@ -186,7 +186,7 @@ export default {
                 photo:'', //照片
                 patientId: "00000000-0000-0000-0000-000000000000", //档案号ID 选择了档案就传档案号，未选就传00000-0000...
                 patientNo: "", //档案号
-                customerOrgId: ["00000000-0000-0000-0000-000000000000"], //单位编号 默认个人 
+                customerOrgId: ["00000000-0000-0000-0000-000000000001"], //单位编号 默认个人 
                 customerOrgGroupId: null, //分组
                 medicalPackageId: null, //套餐
                 patientName: "", //姓名

src/store/index.js

@@ -202,7 +202,7 @@ export default new Vuex.Store({
 
         //公共字典数据(量大的数据字典推荐用 indexedDB )  add by pengjun
         dict: {
-            personOrgId: "00000000-0000-0000-0000-000000000000", //个人体检单位ID
+            personOrgId: "00000000-0000-0000-0000-000000000001", //个人体检单位ID
             organization: [], //体检中心
             sex: [], //性别(人员档案用)
             forSex: [], //适用性别

src/views/customerOrg/CustomerOrgGroupEdit.vue

@@ -189,6 +189,7 @@ export default {
           let customerOrgGroupAsbitems = []; //分组包含的套餐
 
           //编辑
+          /*
           putapi(`/api/app/customer-org-group/${this.form.id}`, body)
             .then((res) => {
               // console.log(res)
@@ -229,6 +230,17 @@ export default {
                 }, 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)