From 53c4000ecb15fe3addfbedaca4ee6bc4d0383f1c Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Fri, 1 Dec 2023 18:17:50 +0800
Subject: [PATCH] djdd

---
 src/api/request.js                            |   5 +-
 .../common/MedicalPackageAsbitem.vue          |  26 +-
 .../customerOrg/customerOrgGroupAsbitem.vue   |  29 +-
 .../patientRegister/PatientRegisterEdit.vue   | 184 ++++---
 .../patientRegister/PatientRegisterItem.vue   | 516 ++++++++----------
 .../patientRegisterSign/customerOrgEdit.vue   |  17 +-
 6 files changed, 356 insertions(+), 421 deletions(-)

diff --git a/src/api/request.js b/src/api/request.js
index ce67a31..71ebec6 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -26,8 +26,7 @@ instance.interceptors.request.use(
     config.headers.Authorization = `${tokentype} ${token}`;
     return config;
   },
-  function (err) {
-    console.log("666");
+  function (err) {    
     return Promise.reject(err);
   }
 );
@@ -35,7 +34,7 @@ instance.interceptors.request.use(
 //响应拦截
 instance.interceptors.response.use(
   (res) => {
-    console.log(res);
+    // console.log(res);
     if (res.data.code == -1) {
       Message.error(res.data.message);
     }
diff --git a/src/components/common/MedicalPackageAsbitem.vue b/src/components/common/MedicalPackageAsbitem.vue
index ba2ad11..48ce496 100644
--- a/src/components/common/MedicalPackageAsbitem.vue
+++ b/src/components/common/MedicalPackageAsbitem.vue
@@ -14,7 +14,7 @@
           <el-table :data="dict.asbItem" border size="small"  highlight-current-row
             :height="window.pageHeight < 635 ? 200:(window.pageHeight - 110 - 325)"
             @row-dblclick="dbClickChoosedAsb" row-key="id"
-            @selection-change="handleSelectionChange" :row-class-name="handleRowClassName" 
+            @selection-change=" selectLeft" :row-class-name="handleRowClassName" 
             @row-click="chooseAsbItem">
             <!--
             <el-table-column type="selection" align="center" ></el-table-column>
@@ -38,11 +38,11 @@
         </div>
         <div>
           <el-button class="btnClass"
-            @click="delAbs(patientRegisterAbsChoosed,'choosed')">移除 <i class="el-icon-arrow-left"></i
+            @click="delAbs(medicalPackageAsbitemsChoosed,'choosed')">移除 <i class="el-icon-arrow-left"></i
           ></el-button>
         </div>
         <div>
-          <el-button class="btnClass" @click="delAbs(patientRegisterAbsChoosed,'all')">全部移除</el-button>
+          <el-button class="btnClass" @click="delAbs(medicalPackageAsbitemsChoosed,'all')">全部移除</el-button>
         </div>        
       </div>
 
@@ -60,7 +60,7 @@
         </div>
         <div class="box">
           <el-table :data="medicalPackageAsbitems" border size="small"
-            @selection-change="selecteditems" highlight-current-row 
+            @selection-change="selectRight" highlight-current-row 
             :height="window.pageHeight < 635 ? 200:(window.pageHeight - 110 - 325)"
             :summary-method="getSummaries" show-summary           
             :row-class-name="handleRowClassName" @row-dblclick="removeAbs" 
@@ -190,6 +190,7 @@ export default {
     return {
       packagePrice:0,               //分组总价
       medicalPackageAsbitems:[], //分组包含组合项目
+      medicalPackageAsbitemsChoosed:[], //分组包含组合项目(选中的)
       itemTypeIds:[], //项目类别
       asbItemId:'',   //当前快速选到的给合项目ID
       quickAsb:[],    //过滤显示的组合项目
@@ -305,8 +306,8 @@ export default {
     getAsbItemByItemType() {
       this.getAsbItemByItemTypeAll()
       //刷新显示 未选组合项目
-      arrayReduce(this.dict.asbItem, [...this.medicalPackageAsbitems], "id=asbitemId");
-      arrayReduce(this.dict.asbItemQuick, [...this.medicalPackageAsbitems], "id=asbitemId");
+      arrayReduce(this.dict.asbItem, [...this.medicalPackageAsbitems], "id=id");
+      arrayReduce(this.dict.asbItemQuick, [...this.medicalPackageAsbitems], "id=id");
       this.quickAsb = Object.assign(this.dict.asbItemQuick)
     },
 
@@ -774,17 +775,14 @@ export default {
 
    
     //右侧勾选按钮
-    selecteditems(val) {
-      this.rightselctedata = val;
-      console.log(this.rightselctedata);
+    selectRight(val) {
+      this.medicalPackageAsbitemsChoosed = val;
     },
 
   
-    // 左侧未选
-    handleSelectionChange(val) {
-      // this.selecteddata = val;
-      this.unselecteddata = val;
-      console.log(this.unselecteddata);
+    // 左侧勾选
+     selectLeft(val) {      
+      this.asbItemChoosed = val;
     },
    
 
diff --git a/src/components/customerOrg/customerOrgGroupAsbitem.vue b/src/components/customerOrg/customerOrgGroupAsbitem.vue
index cb33da8..c203b99 100644
--- a/src/components/customerOrg/customerOrgGroupAsbitem.vue
+++ b/src/components/customerOrg/customerOrgGroupAsbitem.vue
@@ -14,7 +14,7 @@
           <el-table :data="dict.asbItem" border size="small"  highlight-current-row
             :height="window.pageHeight < 668 ? 200:(window.pageHeight - 110 - 358)"
             @row-dblclick="dbClickChoosedAsb" row-key="id"
-            @selection-change="handleSelectionChange" :row-class-name="handleRowClassName" 
+            @selection-change="selectLeft" :row-class-name="handleRowClassName" 
             @row-click="chooseAsbItem">
             <!--
             <el-table-column type="selection" align="center" ></el-table-column>
@@ -38,11 +38,11 @@
         </div>
         <div>
           <el-button class="btnClass"
-            @click="delAbs(patientRegisterAbsChoosed,'choosed')">移除 <i class="el-icon-arrow-left"></i
+            @click="delAbs(customerOrgGroupAsbitemsChoosed,'choosed')">移除 <i class="el-icon-arrow-left"></i
           ></el-button>
         </div>
         <div>
-          <el-button class="btnClass" @click="delAbs(patientRegisterAbsChoosed,'all')">全部移除</el-button>
+          <el-button class="btnClass" @click="delAbs(customerOrgGroupAsbitemsChoosed,'all')">全部移除</el-button>
         </div>        
       </div>
 
@@ -60,7 +60,7 @@
         </div>
         <div class="box">
           <el-table :data="customerOrgGroupAsbitems" border size="small"
-            @selection-change="selecteditems" highlight-current-row 
+            @selection-change="selectRight" highlight-current-row 
             :height="window.pageHeight < 668 ? 200:(window.pageHeight - 110 - 358)"
             :summary-method="getSummaries" show-summary           
             :row-class-name="handleRowClassName" @row-dblclick="removeAbs" 
@@ -276,7 +276,8 @@ export default {
   data() {
     return {
       groupPrice:0,               //分组总价
-      customerOrgGroupAsbitems:[], //分组包含组合项目
+      customerOrgGroupAsbitems:[], //分组包含组合项目(显示)
+      customerOrgGroupAsbitemsChoosed:[], //分组包含组合项目(显示) 被选中
       itemTypeIds:[], //项目类别
       asbItemId:'',   //当前快速选到的给合项目ID
       quickAsb:[],    //过滤显示的组合项目
@@ -293,13 +294,8 @@ export default {
       customerOrgGroups:[],     //历次分组
       curGroupId:'',  //当前选中套餐ID
       groupAsbitems:[],  //选中分组包含组合项目
+ 
 
-  
-      selecteddata: [], //已选数据
-      unselecteddata: [], //未选数据      
-      rightselctedata: [], //右侧已选
-      options: [],
-      value: "",
       dialogVisible: false,
       copyGroupdialogVisible: false,
       packagelist: [],
@@ -931,17 +927,14 @@ export default {
 
    
     //右侧勾选按钮
-    selecteditems(val) {
-      this.rightselctedata = val;
-      console.log(this.rightselctedata);
+    selectRight(val) {
+      this.customerOrgGroupAsbitemsChoosed = val;
     },
 
   
     // 左侧未选
-    handleSelectionChange(val) {
-      // this.selecteddata = val;
-      this.unselecteddata = val;
-      console.log(this.unselecteddata);
+    selectLeft(val) {
+      this.asbItemChoosed = val;
     },
    
 
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 3bbe0c0..e9cef7d 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -719,6 +719,7 @@ export default {
         "medicalPackageId",
         "birthDate",
         "age",
+        "maritalStatusId",
         "medicalTypeId",
         "personnelTypeId",
         "sexHormoneTermId",
@@ -755,6 +756,7 @@ export default {
       //人员登记，组合项目明细操作相关参数
       prAsbOpraOpts:{
         formId:'',      //form.id为空时，明细保存取此formId
+        copyNew:0,      //触发复制新增
         payTypeFlag:'', //触发调整支付方式
         prAsbSave:0, //触发组合项目明细保存
         prAsbQuery:0,//触发组合项目明细查询，比如收费后，刷新收费状态
@@ -770,7 +772,7 @@ export default {
 
   //挂载完成
   mounted() {
-    this.initFormData()
+    // this.initFormData()
   },
 
   computed: {
@@ -1202,6 +1204,45 @@ export default {
       }
     },
 
+    // 组装基本信息保存的参数体
+    madePrBody(){
+      //赋值
+      let body = deepCopy(this.form);
+
+      if (this.form.birthDate && this.form.birthDate != "Invalid date") {
+        body.birthDate = moment(this.form.birthDate).format("yyyy-MM-DD")
+      }else{
+        body.birthDate = null
+      }
+
+      delete body.id;
+      delete body.patientRegisterNo;
+      delete body.medicalTimes;
+      delete body.completeFlag;
+      delete body.isMedicalStart;
+      delete body.patientNo;
+      delete body.creatorId;
+      delete body.creationTime;
+      delete body.lastModificationTime;
+      delete body.lastModifierId;
+      delete body.isVipBox;
+      delete body.isNameHideBox;
+      delete body.isPhoneFollowBox;
+      delete body.isLockBox;
+      delete body.photo;
+
+      setNull(body, this.defaultNull);
+
+      //日期转换 日期控件增加格式
+      // console.log("body.birthDate", body.birthDate);
+      // if (body.birthDate) {
+      //   body.birthDate = moment(new Date(body.birthDate)).format(
+      //     "yyyy-MM-DD"
+      //   );
+      // }
+      return body
+    },
+
     //提交
     btnSubmit(formName, msgTip) {
       this.$refs[formName].validate((valid,fields) => {
@@ -1223,89 +1264,49 @@ export default {
           return false
         }        
                 
-        //赋值
-        let body = deepCopy(this.form);
-
-        if (this.form.birthDate && this.form.birthDate != "Invalid date") {
-          body.birthDate = moment(this.form.birthDate).format("yyyy-MM-DD")
-        }else{
-          body.birthDate = null
-        }
-
-
-        delete body.id;
-        delete body.patientRegisterNo;
-        delete body.medicalTimes;
-        delete body.completeFlag;
-        delete body.isMedicalStart;
-        delete body.patientNo;
-        delete body.creatorId;
-        delete body.creationTime;
-        delete body.lastModificationTime;
-        delete body.lastModifierId;
-        delete body.isVipBox;
-        delete body.isNameHideBox;
-        delete body.isPhoneFollowBox;
-        delete body.isLockBox;
-        delete body.photo;
-        
-        setNull(body, this.defaultNull);
         
-        //日期转换 日期控件增加格式
-        // console.log("body.birthDate", body.birthDate);
-        // if (body.birthDate) {
-        //   body.birthDate = moment(new Date(body.birthDate)).format(
-        //     "yyyy-MM-DD"
-        //   );
-        // }
-
-        if (this.form.id.length < 1) {
+
+        if (this.form.id){
+          // 更新时，先保存明细，再更新主表
+          this.prAsbOpraOpts.prAsbSave++  //触发组合项目保存
+        }else {
+          let body = this.madePrBody()
           //id为空则新增
           console.log(`/api/patientregister/createreturninfo`, body);
           postapi(`/api/patientregister/createreturninfo`, body).then(
             (res) => {
               if (res.code == 1) {
                 //console.log('res',res)
-                if (msgTip) this.$message.success("创健 操作成功");
+                if (msgTip) this.$message.success("操作成功");
+
+                //触发已选组合项目保存
+                this.prAsbOpraOpts.formId = res.data.id
+                // 稍作延时，否则 this.prAsbOpraOpts.formId 尚未更新
+                setTimeout(() =>{
+                  this.prAsbOpraOpts.prAsbSave++
+                },100)
+
                 //一般读身份证照片时，会出现这种情况
                 if (this.patientRegister.photo.indexOf("data:image") > -1) savePeoplePhoto(res.data.id, this.patientRegister.photo);
 
-                objCopy(res.data, this.form);
-
+                objCopy(Object.assign({},res.data,{id:''}), this.form);  //新增在未保存明细的时候，暂不要更新form.id
+                
+                /**/
                 // this.patientRegister.prList.push(res.data);  //列表添加记录
                 this.patientRegister.patientRegisterId = res.data.id;
-                objCopy(this.form, this.patientRegister.patientRegisterRd); 
+                objCopy(res.data, this.patientRegister.patientRegisterRd); 
 
                 //this.patientRegister.query.times++; 不在触发列表查询（换成局部刷新）放在窗口关闭事件中去
                 let curRow = deepCopy(this.patientRegister.patientRegisterRd)
                 curRow.index = this.patientRegister.prList.length
                 this.patientRegister.prList.push(curRow)
+                
 
-                //触发已选组合项目保存
-                this.patientRegister.patientRegisterAbs.forEach(e => {
-                  e.patientRegisterId = res.data.id;
-                  return e;
-                });
-                this.patientRegister.saveTimes++;
+                console.log('新增this.form.id',this.form.id)
+                
               }
             }
           );
-        } else {
-          //id不为空则编辑 api/patientregister/updatepatientregister
-          console.log(`/api/patientregister/updatepatientregister?PatientRegisterId=${this.form.id}`, body);
-          postapi(`/api/patientregister/updatepatientregister?PatientRegisterId=${this.form.id}`, body).then((res) => {
-            if (res.code == 1) {
-              if (msgTip) this.$message.success("更新 操作成功");
-              //一般读身份证照片时，会出现这种情况
-              if (this.patientRegister.photo.indexOf("data:image") > -1) savePeoplePhoto(this.form.id, this.patientRegister.photo);
-              objCopy(this.form, this.patientRegister.patientRegisterRd);
-              // this.patientRegister.query.times++; 不在触发列表查询（换成局部刷新） 放在窗口关闭事件中去               
-              // let lfind = arrayExistObj(this.patientRegister.prList, 'id', this.form.id)
-              // if(lfind > - 1) objCopy(this.form,this.patientRegister.prList[lfind])
-
-              this.patientRegister.saveTimes++;  //更新保存时，无需触发组合项目保存
-            }
-          });
         }
         
       });
@@ -1313,10 +1314,11 @@ export default {
 
     //将现有的数据，复制并展现，但未保存
     rdCopy() {
-      if (!this.patientRegister.patientRegisterId) {
+      if (!this.form.id) {
         this.$message.info("该信息尚未保存，不可执行此操作！");
         return;
       }
+
       this.patientRegister.photo = '/pic/Photo.jpg'
       this.patientRegister.patientRegisterId = '';
       this.form.id = '';
@@ -1327,13 +1329,21 @@ export default {
       this.form.patientName = '';
       this.form.photo = '';
 
-      this.patientRegister.patientRegisterAbs.forEach(e => {
-        e.patientRegisterId = '';
-        e.id = '';
-        return e;
-      });
+      // this.patientRegister.patientRegisterAbs.forEach(e => {
+      //   e.id = '';
+      //   e.patientRegisterId = '';
+      //   e.isCharge = 'N';
+      //   e.checkCompleteFlag = '0'
+      //   e.isLock = 'N'
+      // });
+      // 触发明细项目复制
+      setTimeout(() => {
+        this.prAsbOpraOpts.copyNew++
+      }, 100);
+
       // console.log('this.patientRegister.patientRegisterAbs',this.patientRegister.patientRegisterAbs)
-      this.$message.info("操作成功，确定请记得点保存");
+      this.$message.info("操作成功，请记得点保存");
+      this
 
     },
 
@@ -1631,14 +1641,28 @@ export default {
       this.prAsbOpraOpts.prAsbQuery++
     },
 
-    //触发人员信息保存
+    //触发人员信息保存（更新）
     triggerHeadSave(){
-      this.btnSubmit('form', true)
+      //id不为空则编辑 api/patientregister/updatepatientregister
+      let body = this.madePrBody()
+      console.log(`/api/patientregister/updatepatientregister?PatientRegisterId=${this.form.id}`, body);
+      postapi(`/api/patientregister/updatepatientregister?PatientRegisterId=${this.form.id}`, body).then((res) => {
+        if (res.code != -1) {
+          this.$message.success("操作成功");
+          //一般读身份证照片时，会出现这种情况
+          if (this.patientRegister.photo.indexOf("data:image") > -1) savePeoplePhoto(this.form.id, this.patientRegister.photo);
+          objCopy(this.form, this.patientRegister.patientRegisterRd);
+        }
+      });
+      
     },
 
     // 新增保存基本信息产生新的ID，等明细保存后，再更新表单form.id
     refreshFormId(){
+      console.log('refreshFormId',this.prAsbOpraOpts.formId)
       this.form.id = this.prAsbOpraOpts.formId
+      this.prAsbOpraOpts.formId = '' //清空
+      this.prAsbOpraOpts.prAsbQuery++
     }
 
   },
@@ -1646,12 +1670,16 @@ export default {
   //监听事件
   watch: {
 
-    // "form.customerOrgId"(newVal, oldVal) {
-    //   //console.log('editTimes newVal：',newVal,' oldVal：',oldVal)
-    //   if (newVal != oldVal) {
-    //     this.getCustomerOrgRegisterList()
-    //   }
-    // },
+    "formInitData.id":{
+      immediate:true,
+      deep:true,
+      handler(newVal, oldVal) {
+        //console.log('editTimes newVal：',newVal,' oldVal：',oldVal)
+        if (newVal != oldVal) {
+          this.initFormData()
+        }
+      }
+    },
 
     //新增或编辑
     "editTimes"(newVal, oldVal) {
diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue
index 754ed14..6b9aab8 100644
--- a/src/components/patientRegister/PatientRegisterItem.vue
+++ b/src/components/patientRegister/PatientRegisterItem.vue
@@ -160,10 +160,10 @@ import { arrayFilter, arrayReduce, arrayExistObj, dddw, deepCopy, tcdate} from "
 import proApi from "../../utlis/proApi";
 
 export default {
-  props: ["prForm","prAsbOpraOpts","triggerHeadSave"],
+  props: ["prForm","prAsbOpraOpts","triggerHeadSave","refreshFormId"],
   data() {
     return {
-
+      oldFormId:'',     //配合登记人员复制新增使用
       itemType: [],     //项目类别
       itemTypeIds: '', //被选中的项目类别ID
       asbItem:[],      //左侧显示的未选组合项目
@@ -241,6 +241,7 @@ export default {
     async getPrAsb(id){
       // debugger
       // 清空待删除、分组、套餐
+      console.log('getPrAsb(id)',`getPrAsb(${id})`)
       this.prAsbDels = []
       this.groupAsbs = []
       this.packageAsbs = []
@@ -250,16 +251,31 @@ export default {
       this.refreshAsbitem()  
     },
 
+    // 复制新增 拷贝明细项目
+    async copyNew(){
+      if(this.oldFormId){
+        let result = await proApi.getPrAsb(this.oldFormId)
+        this.prAsb = result.data
+        this.prAsb.forEach(e => {
+          e.id = '';
+          e.patientRegisterId = '';
+          e.isCharge = 'N';
+          e.checkCompleteFlag = '0'
+          e.isLock = 'N'
+        })
+        this.refreshAsbitem()
+      }
+    },
+
     // 刷新未选组合项目
     refreshAsbitem(){
-      arrayReduce(this.asbItemAll, this.prAsb, "id=asbitemId");
-      this.changeItemType(); // arrayReduce(this.asbItem, this.prAsb, "id=asbitemId");
-      this.asbItemQuick = deepCopy(this.asbItemAll);      
-      this.quickAsb = deepCopy(this.asbItemQuick);
+      let asbItemAll = deepCopy(this.asbItemAll)
+      arrayReduce(asbItemAll, this.prAsb, "id=asbitemId");
+      this.changeItemType();       
+      this.asbItemQuick = deepCopy(asbItemAll);      
+      this.quickAsb = deepCopy(asbItemAll);
     },
     
-
-
     handleRowClassName({ row, rowIndex }) {
       if (row.choosed) {
         return 'current-row';
@@ -372,90 +388,36 @@ export default {
 
     },
 
-    //保存按钮
-    // [
-    //   {
-    //     "registerAsbitemId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
-    //     "input": {
-    //       "chargePrice": 0,
-    //       "payTypeFlag": "string",
-    //       "isCharge": "string",
-    //       "amount": 0,
-    //       "groupPackageId": "3fa85f64-5717-4562-b3fc-2c963f66afa6"
-    //     }
-    //   }
-    // ]
-
-    //批量更新组合项目
-    async batchEditAsb(body, msg) {
-      console.log(`/api/app/registerasbitem/updatemany`, body)
-      await postapi(`/api/app/registerasbitem/updatemany`, body)
-        .then((res) => {
-          console.log("batchEditAsb", res);
-          if (res.code == 1) {
-            if (msg) {
-              //未选项目中移除，已选项中添加
-              this.getPatientRegisterAbs(this.prForm.id)
-              this.$message.success(`${msg}操作成功`);
-            }
-          }
-        })
-        .catch((err) => {
-          this.$message({ type: "error", message: `${msg}操作失败，原因：${err}` });
-        });
-    },
-
     //更新所选组合项目
     async onSubmit(msg) {
-      let body = [], insBody = []
-      if (!this.prForm.id) {
-        //this.$message.warning("请先保存人员体检基本信息！")
+      let ret = false
+
+      ret = await this.batchAddAsb()
+      if(!ret){
+        if(msg) this.$message.warning(`组合项目 ${msg} 失败！`)
         return
       }
-      if (this.prAsb.length < 1) {
-        //this.$message.warning("暂无可操作的数据")
+
+      ret = await this.batchDelAsb()
+      if(!ret){
+        if(msg) this.$message.warning(`组合项目 ${msg} 失败！`)
         return
       }
-      for (let i = 0; i < this.prAsb.length; i++) {
-        if (this.prAsb[i].id) {
-          body.push({
-            registerAsbitemId: this.prAsb[i].id,
-            input: {
-              chargePrice: this.prAsb[i].chargePrice,
-              payTypeFlag: this.prAsb[i].payTypeFlag,
-              isCharge: this.prAsb[i].isCharge,
-              amount: this.prAsb[i].amount,
-              groupPackageId: this.prAsb[i].groupPackageId
-            }
-          })
-        } else {
-          insBody.push({
-            asbitemId: this.prAsb[i].asbitemId,
-            patientRegisterId: this.prForm.id,
-            standardPrice: this.prAsb[i].standardPrice,
-            chargePrice: this.prAsb[i].chargePrice,
-            payTypeFlag: this.prAsb[i].payTypeFlag,
-            isCharge: this.prAsb[i].isCharge,
-            amount: this.prAsb[i].amount,
-            groupPackageId: this.prAsb[i].groupPackageId
-          })
-        }
-      }
 
-      //if (body.length > 0 ) await this.batchEditAsb(body, msg);
-      //console.log('111111', msg, body.length, body, insBody.length, insBody);
-      if (body.length > 0 && insBody.length > 0) {
-        await this.batchEditAsb(body, '');
-        await this.batchAddAsb(insBody, msg);
-      } else if (body.length > 0 && insBody.length < 1) {
-        await this.batchEditAsb(body, msg);
-      } else if (body.length < 1 && insBody.length > 0) {
-        await this.batchAddAsb(insBody, msg);
+      ret = await this.batchEditAsb()
+      if(!ret){
+        if(msg) this.$message.warning(`组合项目 ${msg} 失败！`)
+        return
+      }
+      
+      console.log('this.prAsbOpraOpts.formId',this.prAsbOpraOpts.formId)
+      if(this.prAsbOpraOpts.formId){
+        this.refreshFormId()        
+      }else{ 
+        //触发保存人员基本信息        
+        this.triggerHeadSave()
+        this.getPrAsb(this.prForm.id)
       }
-
-      //触发保存人员基本信息
-      this.triggerHeadSave()
-
     },
 
     //未选组合项目 勾选情况
@@ -465,39 +427,14 @@ export default {
       //console.log(this.asbItemChoosed);
     },
 
-    //批量添加组合项目    
-    async batchAddAsb(registerAsbitems, msg) {
-      let body = {
-        organizationUnitId:this.prForm.organizationUnitId,
-        registerAsbitems
-      }
-
-      if(this.prForm.organizationUnitId.id){
-        body.isAutoMerger = 'N'
-      }
-      //console.log(`/api/app/registerasbitem/createregisterasbitemmany`, body)
-      await postapi('/api/app/registerasbitem/createregisterasbitemmany', body)
-        .then((res) => {
-          console.log("batchAddAsb", res);
-          if (res.code == 1) {
-            //未选项目中移除，已选项中添加
-            this.getPatientRegisterAbs(this.prForm.id)
-
-            if (msg) this.$message.success(`${msg}操作成功`);
-          }
-        })
-        .catch((err) => {
-          this.$message({ type: "error", message: `${msg}操作失败，原因：${err}` });
-        });
-    },
+    
 
     // 添加组合项目
     ///api/app/register-asbitem/many/3fa85f64-5717-4562-b3fc-2c963f66afa6'
-    async addAbs(asbItemChoosed,oprType) {
-      let body = []
+    addAbs(asbItemChoosed,oprType) {      
       let checked = true
       let payTypeFlag = '0' //默认个人支付
-      let lfind = -1
+      
 
       //勾选时不需要此操作  start
       if(oprType && oprType == 'all'){
@@ -541,6 +478,7 @@ export default {
       for (let i = 0; i < asbItemChoosed.length; i++) {
         let pojo = {
           asbitemId: asbItemChoosed[i].id,
+          asbitemName: asbItemChoosed[i].displayName,
           patientRegisterId: this.prForm.id,
           standardPrice: asbItemChoosed[i].price,
           chargePrice: asbItemChoosed[i].price,
@@ -549,19 +487,11 @@ export default {
           discount:100,
           amount: 1,
           total: asbItemChoosed[i].price,
-        }
-        body.push(pojo)
-        this.prAsb.push({ ...pojo, asbitemName: asbItemChoosed[i].displayName })
-        lfind = arrayExistObj(this.asbItem, 'id', asbItemChoosed[i].id)
-        if (lfind > -1) this.asbItem.splice(lfind, 1)
-
-        lfind = arrayExistObj(this.asbItemQuick, 'id', asbItemChoosed[i].id)
-        if (lfind > -1) this.asbItemQuick.splice(lfind, 1)
-        this.quickAsb = deepCopy(this.asbItemQuick)
-
+        }        
+        this.prAsb.push(pojo)
       }
 
-      if (this.prForm.id) await this.batchAddAsb(body, '添加组合项目');
+      this.refreshAsbitem()
 
     },
 
@@ -570,36 +500,111 @@ export default {
       this.patientRegisterAbsChoosed = val
     },
 
-    //批量删除组合项目
-    async batchDelAsb(body, msg) {
-      console.log(`/api/app/registerasbitem/deletemany`, body)
-      await postapi(`/api/app/registerasbitem/deletemany`, body)
-        .then((res) => {
-          console.log("delAbs", res);
-          if (res.code != -1) {
-            //项目类别过滤 组合项目，未过滤已选择的组合项目
-            this.refreshAsbitem()
-
-            if (msg) {
-              //未选项目中移除，已选项中添加
-              this.getPatientRegisterAbs(this.prForm.id)
-              this.$message.success(`${msg}操作成功`);
+    //批量提交添加组合项目
+    async batchAddAsb() {
+      let ret = false
+      let patientRegisterId = this.prForm.id || this.prAsbOpraOpts.formId
+      if(!patientRegisterId){
+        this.$message.warning("人员基本信息未保存");
+        return ret
+      }
+
+      let registerAsbitems = []
+
+      this.prAsb.forEach(e => {
+        if(!e.id){
+          registerAsbitems.push({
+            asbitemId: e.asbitemId,
+            patientRegisterId,
+            standardPrice: e.standardPrice,
+            chargePrice: e.chargePrice,
+            payTypeFlag: e.payTypeFlag,
+            isCharge: e.isCharge,
+            amount: e.amount,
+            groupPackageId: e.groupPackageId
+          })
+        }
+      })
+
+      if(registerAsbitems.length == 0) return true
+
+      let body = {
+        organizationUnitId:this.prForm.organizationUnitId,
+        registerAsbitems,
+        isAutoMerger:'Y'
+      }
+
+      try {
+        let res = await postapi('/api/app/registerasbitem/createregisterasbitemmany', body)
+        if(res.code != -1) ret = true
+      } catch (error) {
+        console.log('批量添加组合项目失败',error)
+      }
+
+      return ret
+      
+    },
+
+    //批量提交更新组合项目
+    async batchEditAsb() {
+      let ret = false
+      let body = []
+
+
+      this.prAsb.forEach(e => {
+        if(e.id){
+          body.push({
+            registerAsbitemId:e.id,
+            input: {
+              chargePrice: e.chargePrice,
+              payTypeFlag: e.payTypeFlag,
+              isCharge: e.isCharge,
+              amount: e.amount,
+              groupPackageId: e.groupPackageId
             }
+          })          
+        }
+      })
+      if(body.length == 0) return true
 
-          }
-        })
-        .catch((err) => {
-          this.$message({ type: "error", message: `${msg}操作失败，原因：${err}` });
-        });
+      try {
+        let res = await postapi(`/api/app/registerasbitem/updatemany`, body)
+        if(res.code != -1) ret = true
+      } catch (error) {
+        console.log('批量提交更新组合项目失败',error)
+      }
+      return ret
+    },
+
+    //批量提交删除组合项目
+    async batchDelAsb() {
+      let ret = false
+      if(this.prAsbDels.length == 0) return true
+
+      let registerAsbitemIds=[]
+
+      this.prAsbDels.forEach(e => {
+        registerAsbitemIds.push(e.id)
+      })
+
+      console.log(`/api/app/registerasbitem/deletemany`, {registerAsbitemIds})
+
+      try {
+        let res = await postapi(`/api/app/registerasbitem/deletemany`, {registerAsbitemIds})
+        if(res.code != -1) ret = true
+      } catch (error) {
+        console.log('批量删除组合项目失败',error)
+      }
+
+      return ret
     },
 
     //删除 人员已选中的组合项目
     ///api/app/register-asbitem/many?RegisterAsbitemIds=3fa85f64-5717-4562-b3fc-2c963f66afa6
-    delAbs(absForDel,oprType) {
-      let body = {}
-      let registerAsbitemIds = []
+    delAbs(absForDel,oprType) {      
       let chargeComplete = ''
       let lfind = -1
+      let tempRd = {}
 
       //勾选时不需要此操作  start
       if(oprType && oprType == 'all'){
@@ -620,39 +625,26 @@ export default {
         return
       }
 
-      for (let i = 0; i < absForDel.length; i++) {
-        //未在数据库中，直接删除
-        if (!absForDel[i].id) {
-          lfind = arrayExistObj(this.prAsb, 'asbitemId', absForDel[i].asbitemId)
-          if (lfind > -1) this.prAsb.splice(lfind, 1)
-
-          absForDel.splice(i, 1)
-          i--
-          continue
-        }
-
-        if (absForDel[i].isCharge == 'Y' || absForDel[i].checkCompleteFlag != '0') {
-          chargeComplete += absForDel[i].asbitemName + '，'
-          absForDel.splice(i, 1)
-          i--
-        }
-      }
+      absForDel.forEach(e => {
+        // 如果已经收费 或 体检，则不允许删除
+        if (e.isCharge == 'Y' || (e.checkCompleteFlag && e.checkCompleteFlag != '0')) {
+          chargeComplete += e.asbitemName + '，'   
+        }else{
+          lfind = arrayExistObj(this.prAsb, 'asbitemId', e.asbitemId)
+          if(lfind > -1){
+            tempRd = Object.assign({},this.prAsb.splice(lfind,1)[0])
+            if(e.id) this.prAsbDels.push(tempRd)
+          }    
+        }            
+      })
 
       //刷新
       this.refreshAsbitem()
 
       if (chargeComplete) {
         this.$message({ type: "info", message: `所选项目：${chargeComplete}已收费或已检，不可删除！` });
-        if (absForDel.length < 1) return
-      }
-
-      for (let i = 0; i < absForDel.length; i++) {
-        registerAsbitemIds.push(absForDel[i].id)
       }
 
-      body = { registerAsbitemIds }
-      if (registerAsbitemIds.length > 0 && this.prForm.id) this.batchDelAsb(body, '删除组合项目');
-
     },
 
     //双击删除已选项目
@@ -663,51 +655,21 @@ export default {
     //项目类别过滤 组合项目，未过滤已选择的组合项目
     changeItemType() {
       //console.log('getAsbItemByItemType', typeof this.itemTypeIds, this.itemTypeIds)
+      let asbItemAll = deepCopy(this.asbItemAll)
       let lv = "";
       if (typeof this.itemTypeIds == "object") {
         if(this.itemTypeIds.length > 0) lv = this.itemTypeIds[this.itemTypeIds.length - 1];
       }
 
       if (lv) {
-        this.asbItem = arrayFilter(this.asbItemAll, "itemTypeId", lv);
+        this.asbItem = arrayFilter(asbItemAll, "itemTypeId", lv);
       } else {
-        this.asbItem = deepCopy(this.asbItemAll);
-      }     
-      
+        this.asbItem = deepCopy(asbItemAll);
+      }
+      arrayReduce(this.asbItem, this.prAsb, "id=asbitemId");
     },
 
-    
-
-    //体检登记的组合项目创建
-    // registerAsbitem(body) {
-    //   console.log("registerAsbitem");
-    //   postapi(
-    //     `/api/app/register-asbitem?CustomerOrgId=${this.prForm.customerOrgId}`,
-    //     body
-    //   ).then((res) => {
-    //     console.log("medicalPackageAsb", res);
-    //     if (res.code == 1) {
-    //       //未选项目中移除，已选项中添加
-    //     }
-    //   });
-    // },
-
-    //选中分组所包含的组合项目
-    // async getCustomerOrgGroupAsb(customerOrgGroupId) {
-    //   console.log(`getCustomerOrgGroupAsb /api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem/${customerOrgGroupId}`);
-    //   getapi(`/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem/${customerOrgGroupId}`)
-    //     .then((res) => {
-    //       console.log("getCustomerOrgGroupAsb", res);
-    //       if (res.code == 1) {
-    //         this.patientRegister.customerOrgGroupAsb = res.data;
-    //         //移除旧分组或套餐的组合项目
-    //         this.removeGroupPackageAsb();
-
-    //         //添加新分组的组合项目;
-    //         this.addCustomerOrgGroupAsb(customerOrgGroupId);
-    //       }
-    //     });
-    // },
+     
 
     //选中 分组 所包含的组合项目
     getGroupAsbs(id){
@@ -773,7 +735,7 @@ export default {
           }
         }else{
           //没找到则移除此项目
-          if(this.prAsb[i].isCharge == 'Y'){
+          if(this.prAsb[i].isCharge == 'Y' || (this.prAsb[i].checkCompleteFlag && this.prAsb[i].checkCompleteFlag != '0')){
             this.prAsb[i].groupPackageId = null
           }else{
             tempRd = Object.assign({},this.prAsb.splice(i,1)[0])
@@ -789,6 +751,7 @@ export default {
         if(lfind > -1){
           tempRd = Object.assign(this.prAsbDels.splice(lfind,1)[0],
             {
+              groupPackageId:newId,
               standardPrice:e.price,
               chargePrice:e.customerOrgGroupDetailPrice,
               payTypeFlag,
@@ -848,7 +811,7 @@ export default {
           }
         }else{
           //没找到则移除此项目
-          if(this.prAsb[i].isCharge == 'Y'){
+          if(this.prAsb[i].isCharge == 'Y' || (this.prAsb[i].checkCompleteFlag && this.prAsb[i].checkCompleteFlag != '0')){
             this.prAsb[i].groupPackageId = null
           }else{
             tempRd = Object.assign({},this.prAsb.splice(i,1)[0])
@@ -863,6 +826,7 @@ export default {
         if(lfind > -1){
           tempRd = Object.assign(this.prAsbDels.splice(lfind,1)[0],
             {
+              groupPackageId:newId,
               standardPrice:e.price,
               chargePrice:e.medicalPackageDetailPrice,
               payTypeFlag,
@@ -874,7 +838,9 @@ export default {
           )
         }else{
           tempRd = {
+            groupPackageId:newId,
             asbitemId:e.id,
+            asbitemName:e.displayName,
             patientRegisterId:this.prForm.id,
             standardPrice:e.price,
             chargePrice:e.medicalPackageDetailPrice,
@@ -902,6 +868,7 @@ export default {
     dbClickChoosedAsb(row) {
       this.addAbs([row]);
     },
+
     //快速选择组合项目
     quickChoosedAsb(v) {
       //远程查询时，设置了 value-key 也不管用，只能取到value console.log('quickChoosedAsb',v)
@@ -938,81 +905,7 @@ export default {
       } else {
         this.quickAsb = deepCopy(this.asbItemQuick);
       }
-    },
-
-    //修改 套餐/分组 所包含的组合项目 获取 套餐/分组 的组合项目
-    getGroupPackageAsb(typeFlag, groupPackageId) {
-      let delBody = {};      
-      
-
-      console.log(`${url}${groupPackageId}`);
-      if(typeFlag == 'group'){
-        getapi(`/api/app/customerorggroupdetail/getcustomerorggroupdetailinasbitem?CustomerOrgGroupId=${groupPackageId}`)
-          .then((res) => {
-            console.log("getGroupPackageAsb", res);
-            if (res.code != -1) {
-              
-              //移除旧分组或套餐的组合项目
-              delBody = this.removeGroupPackageAsb();
-
-              //添加或更新已选组合项目
-              this.addGroupPackageAsb(res.data, typeFlag,groupPackageId);
-
-              arrayReduce(this.dict.asbItem, [...this.patientRegister.patientRegisterAbs], "id=asbitemId");
-              arrayReduce(this.dict.asbItemQuick, [...this.patientRegister.patientRegisterAbs], "id=asbitemId");
-
-              //console.log('delBody', delBody,delBody['registerAsbitemIds'].length);
-              if (delBody['registerAsbitemIds'].length > 0) {
-                return postapi(`/api/app/registerasbitem/deletemany`, delBody)
-              } else {              
-                typeFlag == 'group' ? this.patientRegister.customerOrgGroupChange++ : this.patientRegister.medicalPackageChange++;      
-                if (this.form.id) this.btnSubmit('form', false);
-              }
-            }
-          })
-          .then(res => {
-            //console.log('res', res);
-            if (res && res.code != -1) {
-              //添加新套餐的组合项目
-              typeFlag == 'group' ? this.patientRegister.customerOrgGroupChange++ : this.patientRegister.medicalPackageChange++;      
-              if (this.form.id) this.btnSubmit('form', false);
-            }
-          });
-      }else{
-        postapi('/api/app/medicalpackagedetail/getmedicalpackageinasbitem',{medicalPackageId:groupPackageId})
-          .then((res) => {
-            console.log("getGroupPackageAsb", res);
-            if (res.code != -1) {
-              
-              //移除旧分组或套餐的组合项目
-              delBody = this.removeGroupPackageAsb();
-
-              //添加或更新已选组合项目
-              this.addGroupPackageAsb(res.data, typeFlag,groupPackageId);
-
-              arrayReduce(this.dict.asbItem, [...this.patientRegister.patientRegisterAbs], "id=asbitemId");
-              arrayReduce(this.dict.asbItemQuick, [...this.patientRegister.patientRegisterAbs], "id=asbitemId");
-
-              //console.log('delBody', delBody,delBody['registerAsbitemIds'].length);
-              if (delBody['registerAsbitemIds'].length > 0) {
-                return postapi(`/api/app/registerasbitem/deletemany`, delBody)
-              } else {              
-                typeFlag == 'group' ? this.patientRegister.customerOrgGroupChange++ : this.patientRegister.medicalPackageChange++;      
-                if (this.form.id) this.btnSubmit('form', false);
-              }
-            }
-          })
-          .then(res => {
-            //console.log('res', res);
-            if (res && res.code != -1) {
-              //添加新套餐的组合项目
-              typeFlag == 'group' ? this.patientRegister.customerOrgGroupChange++ : this.patientRegister.medicalPackageChange++;      
-              if (this.form.id) this.btnSubmit('form', false);
-            }
-          });
-      }
-    },
-
+    },    
 
     //修改总折扣
     changeAllDiscount() {
@@ -1025,7 +918,7 @@ export default {
         e.chargePrice = Math.round(e.standardPrice * this.discount) / 100
         e.total = Math.round(e.standardPrice * this.discount * e.amount) / 100
       });
-      this.onSubmit('')
+      // this.onSubmit('')
 
     },
 
@@ -1073,7 +966,7 @@ export default {
       //console.log(this.prAsb[index].chargePrice,this.prAsb[index].standardPrice)
       this.prAsb[index].chargePrice = Math.round(this.prAsb[index].standardPrice * this.prAsb[index].discount)/100
       this.prAsb[index].total = this.prAsb[index].chargePrice * this.prAsb[index].amount
-      this.onSubmit('')
+      // this.onSubmit('')
     },
 
     //修改单价
@@ -1083,7 +976,7 @@ export default {
       if (!this.prAsb[index].chargePrice) return
       //console.log(this.prAsb[index].chargePrice,this.prAsb[index].standardPrice)
       this.prAsb[index].discount = Math.round(this.prAsb[index].chargePrice * 10000 / this.prAsb[index].standardPrice)/100
-      this.onSubmit('')
+      // this.onSubmit('')
     },
 
     //自定义计算列
@@ -1145,24 +1038,30 @@ export default {
   //监听事件
   watch: {
 
-    //体检信息保存，触发已选组合项目保存
-    "patientRegister.saveTimes"(newVal, oldVal) {
-      console.log("patientRegister.saveTimes newVal：", newVal, " oldVal：", oldVal);
-      if (newVal != oldVal) {
-        this.onSubmit('');
+    //配合复制新增使用 查询人员下的组合项目
+    "prForm.id":{
+      immediate: true, // 立即执行
+      deep: true, // 深度监听复杂类型内变化
+      handler(newVal,oldVal){
+        this.oldFormId = oldVal   
+        if(newVal != oldVal){
+          if(newVal == ''){
+            this.getPrAsb(newVal)
+          }else if(newVal != this.prAsbOpraOpts.formId){
+            this.getPrAsb(newVal)
+          }          
+        }     
       }
     },
 
-    
-
-    //查询人员下的组合项目
-    "prForm.id":{
-      immediate: true, // 立即执行
+    //人员 id 未变的情况下，触发刷新，主要针对收费
+    "prAsbOpraOpts.prAsbQuery":{
+      // immediate: true, // 立即执行
       deep: true, // 深度监听复杂类型内变化
       handler(newVal,oldVal){        
-        console.log('watch:prForm.id:',newVal,oldVal)
+        console.log('watch:prAsbOpraOpts.prAsbQuery:',newVal,oldVal)
         if(newVal != oldVal){
-          this.getPrAsb(newVal)
+          this.getPrAsb(this.prForm.id)
         }
       }
     },
@@ -1186,7 +1085,7 @@ export default {
     "prAsbOpraOpts.prAsbGroup":{
       // immediate: true, // 立即执行
       deep: true, // 深度监听复杂类型内变化
-      handler(newVal, oldVal) {
+      handler(newVal, oldVal) {        
         if (newVal != oldVal) {
           this.getGroupAsbs(this.prForm.customerOrgGroupId)
         }
@@ -1204,7 +1103,24 @@ export default {
       }
     },
 
-    
+    //复制新增 拷贝明细项目
+    "prAsbOpraOpts.copyNew":{
+      // immediate: true, // 立即执行
+      deep: true, // 深度监听复杂类型内变化
+      handler(newVal, oldVal) {
+        if (newVal != oldVal) {
+          this.copyNew()
+        }
+      }
+    },
+
+    //体检信息保存，触发已选组合项目保存
+    "prAsbOpraOpts.prAsbSave"(newVal, oldVal) {
+      console.log("patientRegister.saveTimes newVal：", newVal, " oldVal：", oldVal);
+      if (newVal != oldVal) {
+        this.onSubmit('');
+      }
+    },
 
   },
 };
diff --git a/src/components/patientRegisterSign/customerOrgEdit.vue b/src/components/patientRegisterSign/customerOrgEdit.vue
index 2b87d37..cb4d863 100644
--- a/src/components/patientRegisterSign/customerOrgEdit.vue
+++ b/src/components/patientRegisterSign/customerOrgEdit.vue
@@ -123,11 +123,15 @@
           </el-col>
           <el-col :span="7">
             <el-form-item label="创建时间" style="margin-left: -5%">
-              <el-input
+              <el-date-picker v-model="customerOrg.customerOrgRd.creationTime" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"                
+                prefix-icon="" size="small" disabled/>
+              <!--
+              <el-input 
                 :value="customerOrg.customerOrgRd.creationTime | dateFormat"
                 disabled
                 style="width: 90%"
               ></el-input>
+              -->
             </el-form-item>
           </el-col>
           <el-col :span="5">
@@ -141,13 +145,8 @@
           </el-col>
           <el-col :span="7">
             <el-form-item label="修改时间" style="margin-left: -90px">
-              <el-input
-                :value="
-                  customerOrg.customerOrgRd.lastModificationTime | dateFormat
-                "
-                disabled
-                style="width: 70%"
-              ></el-input>
+              <el-date-picker v-model="customerOrg.customerOrgRd.lastModificationTime" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"                
+                prefix-icon="" size="small" disabled/>              
             </el-form-item>
           </el-col>
         </el-row>
@@ -203,6 +202,7 @@
 import { mapState, mapMutations } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { tcdate } from "../../utlis/proFunc";
+// import moment from 'moment';
 
 export default {
   components: {},
@@ -269,6 +269,7 @@ export default {
     ...mapState(["customerOrg"]),
   },
   methods: {
+    // moment,
     //获取性别
     getsex() {
       getapi("/api/app/sex").then((res) => {