From 748628b1d99f0a33349ad4c3795693825bb387a0 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 10 Jul 2023 16:27:33 +0800
Subject: [PATCH] test

---
 .../customerOrg/customerOrgEdit.vue           |  2 +-
 .../patientRegister/PatientRegisterEdit.vue   | 35 ++++----------
 .../patientRegister/PatientRegisterItem.vue   | 46 +++++++++++++------
 src/store/index.js                            |  3 +-
 src/utlis/mm.js                               |  2 +-
 src/utlis/proFunc.js                          | 12 +++++
 src/views/login/Login.vue                     |  2 +-
 7 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/src/components/customerOrg/customerOrgEdit.vue b/src/components/customerOrg/customerOrgEdit.vue
index 87d4a22..1775661 100644
--- a/src/components/customerOrg/customerOrgEdit.vue
+++ b/src/components/customerOrg/customerOrgEdit.vue
@@ -172,7 +172,7 @@
             <el-form-item label="创建时间" style="margin-left: -5%">
               <el-input
                 :value="customerOrg.customerOrgRd.creationTime | dateFormat"
-                disabled
+                disabled 
                 style="width: 90%"
               ></el-input>
             </el-form-item>
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 7e86856..eaaf87c 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -364,14 +364,7 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="创建时间">
-                  <el-input
-                    :value="
-                      form.creationTime
-                        ? lmoment(form.creationTime, 'yyyy-MM-DD')
-                        : ''
-                    "
-                    disabled
-                  ></el-input>
+                  <el-input :value="form.creationTime ? lmoment(form.creationTime, 'yyyy-MM-DD') :''" disabled></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -381,14 +374,7 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="修改时间">
-                  <el-input
-                    :value="
-                      form.lastModificationTime
-                        ? lmoment(form.lastModificationTime, 'yyyy-MM-DD')
-                        : ''
-                    "
-                    disabled
-                  ></el-input>
+                  <el-input :value="form.lastModificationTime ? lmoment(form.lastModificationTime, 'yyyy-MM-DD') : ''" disabled></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -706,9 +692,7 @@ export default {
           //日期转换
           console.log("body.birthDate", body.birthDate);
           if (body.birthDate) {
-            body.birthDate = moment(new Date(body.birthDate)).format(
-              "yyyy-MM-DD"
-            );
+            body.birthDate = moment(new Date(body.birthDate)).format("yyyy-MM-DD");
           }
 
           if (this.form.id.length < 1) {
@@ -724,22 +708,19 @@ export default {
                   this.patientRegister.patientRegisterId = res.data.id;
                   this.patientRegister.patientRegisterRd = res.data;
                   this.patientRegister.query.times++;
+                  this.patientRegister.saveTimes++
                 }
               }
             );
           } else {
             //id不为空则编辑
-            console.log(
-              `/api/app/patient-register?PatientRegisterId=${this.form.id}`,
-              body
-            );
-            putapi(
-              `/api/app/patient-register?PatientRegisterId=${this.form.id}`,
-              body
-            ).then((res) => {
+            console.log(`/api/app/patient-register?PatientRegisterId=${this.form.id}`,body);
+            putapi(`/api/app/patient-register?PatientRegisterId=${this.form.id}`,body)
+            .then((res) => {
               if (res.code == 1) {
                 this.$message.success("更新 操作成功");
                 this.patientRegister.query.times++;
+                this.patientRegister.saveTimes++
               }
             });
           }
diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue
index c71b950..94947ae 100644
--- a/src/components/patientRegister/PatientRegisterItem.vue
+++ b/src/components/patientRegister/PatientRegisterItem.vue
@@ -62,7 +62,7 @@
 <script>
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { arrayFilter, arrayReduce } from "../../utlis/proFunc";
+import { arrayFilter, arrayReduce ,arrayExistObj} from "../../utlis/proFunc";
 export default {
   props: ["patientRegisterForm"],
   data() {
@@ -73,9 +73,6 @@ export default {
 
       //patientRegisterAbs:[],         //体检人员所选组合项目 放vuex
       patientRegisterAbsChoosed: [], //勾选的 体检人员所选组合项目
-
-      patientRegisterAbsAdd: [], //体检人员 待新增的组合项目
-      patientRegisterAbsEdit: [], //体检人员 待编辑的组合项目
       patientRegisterAbsDel: [], //体检人员 待删除的组合项目
 
       patientRegisterAbsRd: {
@@ -102,7 +99,9 @@ export default {
   methods: {
     //...mapActions(['getMedicalPackageAsb','getMedicalPackageAsb']),
     //保存按钮
-    Onsubmit() { },
+    onSubmit(val) { 
+      
+    },
     //移除按钮
     addselecteditems() { },
     //右侧勾选按钮
@@ -200,12 +199,11 @@ export default {
       console.log('addCustomerOrgGroupAsb')
       let finded = false;
       for (let i = 0; i < this.patientRegister.customerOrgGroupAsb.length; i++) {
-        finded = false;
-        console.log('i',i,finded)
+        finded = false;        
         for (let j = 0; j < this.patientRegister.patientRegisterAbs.length; j++) {
           if (this.patientRegister.customerOrgGroupAsb[i].asbitemId == this.patientRegister.patientRegisterAbs[j].asbitemId) {
             this.patientRegister.patientRegisterAbs[j].groupPackageId = groupPackageId
-            this.patientRegisterAbsEdit.push({ ...this.patientRegister.patientRegisterAbs[j], })
+            this.patientRegisterAbsEdit.push({ ...this.patientRegister.patientRegisterAbs[j] })
             finded = true
           }
         }
@@ -223,8 +221,15 @@ export default {
             groupPackageId: groupPackageId, //	string($uuid) 分组或者套餐ID
           };
           console.log('i',i,asbItem)
-          this.patientRegister.patientRegisterAbs.push(asbItem);
-          this.patientRegisterAbsAdd.push(asbItem);
+
+          //待添加的项目在 删除缓存中 存在，则将移至已选中后，删除缓存中的数据
+          let exist = arrayExistObj(this.patientRegisterAbsDel,'asbitemId',asbItem.asbitemId)
+          if(exist > -1){
+            this.patientRegister.patientRegisterAbs.push({...this.patientRegisterAbsDel[exist]})
+            this.patientRegisterAbsDel.splice(exist,1)
+          }else{
+            this.patientRegister.patientRegisterAbs.push(asbItem);
+          }          
         }
       }
     },
@@ -254,8 +259,15 @@ export default {
             amount: 1, //	integer($int32) 数量
             groupPackageId: groupPackageId, //	string($uuid) 分组或者套餐ID
           };
-          this.patientRegister.patientRegisterAbs.push(asbItem);
-          this.patientRegisterAbsAdd.push(asbItem);
+
+          //待添加的项目在 删除缓存中 存在，则将移至已选中后，删除缓存中的数据
+          let exist = arrayExistObj(this.patientRegisterAbsDel,'asbitemId',asbItem.asbitemId)
+          if(exist > -1){
+            this.patientRegister.patientRegisterAbs.push({...this.patientRegisterAbsDel[exist]})
+            this.patientRegisterAbsDel.splice(exist,1)
+          }else{
+            this.patientRegisterAbsAdd.push(asbItem);
+          }
         }
       }
     },
@@ -264,7 +276,10 @@ export default {
     removeGroupPackageAsb(groupPackageId) {
       for (let i = 0; i < this.patientRegister.patientRegisterAbs.length; i++) {
         if (this.patientRegister.patientRegisterAbs[i].groupPackageId == groupPackageId) {
-          this.patientRegisterAbsDel.push({id: this.patientRegister.patientRegisterAbs[i].id,});
+          //要移除的分组 尚未保存时，则不需要添加至删除缓冲中
+          if(!this.patientRegister.patientRegisterAbs[i].id){
+            this.patientRegisterAbsDel.push({id: this.patientRegister.patientRegisterAbs[i].id});
+          }
           this.patientRegister.patientRegisterAbs.splice(i, 1);
           i--;
         }
@@ -289,6 +304,11 @@ export default {
         this.getMedicalPackageAsb(newVal,oldVal);
       }
     },
+
+    //体检信息触发分组的保存
+    "patientRegister.saveTimes"(newVal, oldVal){
+      this.onSubmit('')
+    },
   },
 };
 </script>
diff --git a/src/store/index.js b/src/store/index.js
index 7689035..e32fb9b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -36,8 +36,9 @@ export default new Vuex.Store({
       customerOrgTreeAll: [], //体检单位列表（含个人）
       patientRegisterId: "", //当前单位ID（可根据此值是否为空，判断是新增还是编辑）
       patientRegisterRd: { id: "" }, //体检人员记录
-      patientRegisterTimes: 0, //体检人员登记窗口显示次数
+      patientRegisterTimes: 0, //体检人员登记窗口显示次数(弃用)
       addTimes: 0, //用于触发新增时初始化赋值
+      saveTimes:0,  //用于体检登记时，触发分组调整保存
       photo:
         "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg", //单独抽出，拍照时会更新
       cameraVisble: false, //拍照控件显示
diff --git a/src/utlis/mm.js b/src/utlis/mm.js
index 462bb3e..28fe7d6 100644
--- a/src/utlis/mm.js
+++ b/src/utlis/mm.js
@@ -1,3 +1,3 @@
 export default {
-  apiurl: "http://81.70.217.145:9529",
+  apiurl: "http://192.168.1.108:9529",
 };
diff --git a/src/utlis/proFunc.js b/src/utlis/proFunc.js
index 13fb9c7..05aeea6 100644
--- a/src/utlis/proFunc.js
+++ b/src/utlis/proFunc.js
@@ -107,3 +107,15 @@ exports.arrayReduce = function (arrFront, reduceArr, key) {
   }
   return arrFront;
 };
+
+//判断数组中 是否存在 某个值的对象记录 如不存在返回 - 1，存在返回相应的 序列
+exports.arrayExistObj = function (arrFront, key, value) {
+  let ret = - 1
+  for(let i = 0;i<arrFront.length;i++){
+    if(arrFront[i][key] == value){
+      ret = i
+      break
+    }
+  }
+  return ret
+}
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index 8bd923a..6379407 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -81,7 +81,7 @@ export default {
           // });
           this.$axios
             .post(
-              "http://81.70.217.145:9529/connect/token",
+              "http://192.168.1.108:9529/connect/token",
               {
                 client_id: "Peis_App",
                 grant_type: "password",