From 13c3a5e8b60348e3d89c4e32e396ed24ecd7ffdc Mon Sep 17 00:00:00 2001
From: mch <1332099529@qq.com>
Date: Fri, 30 Jun 2023 11:43:16 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=A2=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unitGrouping/unitGroupCategory.vue        | 20 +++++++++++++++++--
 .../unitGrouping/unitGroupingTable.vue        |  3 ++-
 src/store/index.js                            |  1 +
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/components/unitGrouping/unitGroupCategory.vue b/src/components/unitGrouping/unitGroupCategory.vue
index e919967..e14e291 100644
--- a/src/components/unitGrouping/unitGroupCategory.vue
+++ b/src/components/unitGrouping/unitGroupCategory.vue
@@ -7,6 +7,7 @@
         placeholder="请选择"
         style="margin-left: 20px"
         @change="getprojectgroups"
+        clearable
       >
         <el-option
           v-for="item in options"
@@ -45,12 +46,17 @@
             >移去 <i class="el-icon-arrow-right"></i
           ></el-button>
         </div>
+         <div>
+          <el-button style="margin-top: 10px" :disabled="saveornot"
+            >保存
+          </el-button>
+        </div>
       </div>
       <!--  -->
       <div class="mainarearightbox">
         <el-table
           :header-cell-style="{ background: '#eef1f6' }"
-          :data="selecteddata"
+          :data="personnelUnit.nogroupselected"
           @selection-change="selecteditems"
         >
           <el-table-column type="selection"></el-table-column>
@@ -131,6 +137,7 @@ import { mapState } from "vuex";
 export default {
   data() {
     return {
+      saveornot:true,//保存按钮
       selecteddata: [], //已选数据
       unselecteddata: [], //未选数据
       unselecteddata: [], //右边勾选中
@@ -175,12 +182,19 @@ export default {
       if (this.unselecteddata.length == 0) {
         this.$message.warning("未选数据为空无法移动");
       } else {
+        this.saveornot=false
         let count = this.unselecteddata.length - 1;
         for (var i = count; i >= 0; i--) {
           this.tabledata.splice(i, 1);
-          this.selecteddata.push(this.unselecteddata[i]);
+          this.personnelUnit.nogroupselected.push(this.unselecteddata[i]);
         }
         // this.selecteddata = this.unselecteddata;
+        // 复制
+        //  let count = this.unselecteddata.length - 1;
+        // for (var i = count; i >= 0; i--) {
+        //   this.tabledata.splice(i, 1);
+        //   this.selecteddata.push(this.unselecteddata[i]);
+        // }
       }
     },
     // 左侧未选
@@ -197,6 +211,7 @@ export default {
     },
     //项目类别选择
     getprojectgroups(v) {
+      this.getportfolioitems();
       getapi(`/api/app/asbitem/in-item-type/${v}`).then((res) => {
         this.tabledata = res.data;
         console.log(res);
@@ -212,6 +227,7 @@ export default {
           `/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem?CustomerOrgGroupId=${this.personnelUnit.form.id}`
         ).then((res) => {
           console.log(res);
+          this.personnelUnit.form = res.data;
         });
       }
     },
diff --git a/src/components/unitGrouping/unitGroupingTable.vue b/src/components/unitGrouping/unitGroupingTable.vue
index 362cf02..06c3427 100644
--- a/src/components/unitGrouping/unitGroupingTable.vue
+++ b/src/components/unitGrouping/unitGroupingTable.vue
@@ -277,7 +277,8 @@ export default {
      
       //
       getapi(`/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem?CustomerOrgGroupId=${this.personnelUnit.id}`).then(res=>{
-        console.log(res,'我是分组');
+       this.personnelUnit.nogroupselected=res.data
+       console.log(res,'我是分组');
       })
     },
     //编辑弹框
diff --git a/src/store/index.js b/src/store/index.js
index 060199e..aee8aec 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -24,6 +24,7 @@ export default new Vuex.Store({
       personnelgrouping:[], //人员分组
       id:'',//根据Id选择的数据
       form:'',//列表每一项
+      nogroupselected:[],//已选分组
     },
 
     patientRegister:{//人员登记

From 7610071b113f74c4940b565e385ac694b3184817 Mon Sep 17 00:00:00 2001
From: mch <1332099529@qq.com>
Date: Fri, 30 Jun 2023 16:21:20 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unitGrouping/unitGroupCategory.vue        | 78 +++++++++++++------
 .../unitGrouping/unitGroupingTable.vue        | 14 ++--
 2 files changed, 64 insertions(+), 28 deletions(-)

diff --git a/src/components/unitGrouping/unitGroupCategory.vue b/src/components/unitGrouping/unitGroupCategory.vue
index e14e291..18946a7 100644
--- a/src/components/unitGrouping/unitGroupCategory.vue
+++ b/src/components/unitGrouping/unitGroupCategory.vue
@@ -38,16 +38,19 @@
             type="primary"
             style="margin-top: 10px"
             @click="addselecteditems"
-            >添加 <i class="el-icon-arrow-left"></i
+            >移除 <i class="el-icon-arrow-left"></i
           ></el-button>
         </div>
         <div>
           <el-button type="primary" style="margin-top: 10px" @click="removedata"
-            >移去 <i class="el-icon-arrow-right"></i
+            >添加 <i class="el-icon-arrow-right"></i
           ></el-button>
         </div>
-         <div>
-          <el-button style="margin-top: 10px" :disabled="saveornot"
+        <div>
+          <el-button
+            style="margin-top: 10px"
+            :disabled="saveornot"
+            @click="Onsubmit"
             >保存
           </el-button>
         </div>
@@ -59,6 +62,7 @@
           :data="personnelUnit.nogroupselected"
           @selection-change="selecteditems"
         >
+          <!-- temporaryselection   personnelUnit.nogroupselected-->
           <el-table-column type="selection"></el-table-column>
           <el-table-column
             label="已选组合项目"
@@ -132,23 +136,25 @@
   </div>
 </template>
 <script>
-import { getapi } from "@/api/api";
+import { getapi, postapi } from "@/api/api";
 import { mapState } from "vuex";
 export default {
   data() {
     return {
-      saveornot:true,//保存按钮
+      saveornot: true, //保存按钮
       selecteddata: [], //已选数据
       unselecteddata: [], //未选数据
       unselecteddata: [], //右边勾选中
+      rightselctedata: [], //右侧已选
       options: [],
       value: "",
       dialogVisible: false,
       copyGroupdialogVisible: false,
       packagelist: [],
       tabledata: [],
-      temporaryselection: [],
+      temporaryselection: [], //已选组合项目table
       copegroupdata: [], //复制分组
+      addrulst: [], //添加保存的Id
     };
   },
   computed: {
@@ -159,35 +165,58 @@ export default {
     this.getportfolioitems();
   },
   methods: {
-    //添加按钮
+    //保存按钮
+    Onsubmit() {
+      console.log(this.personnelUnit.form.id);
+      if (this.personnelUnit.form.id === "") {
+        this.$message.success("请选择单位分组");
+      } else {
+        postapi("/api/app/customer-org-group-detail/many", this.addrulst).then(
+          (res) => {
+            this.$message.success("操作成功");
+          }
+        );
+      }
+    },
+    //移除按钮
     addselecteditems() {
-      console.log(this.temporaryselection);
-      if (this.temporaryselection.length == 0) {
+      //personnelUnit.nogroupselected
+
+      if (this.rightselctedata.length == 0) {
         this.$message.warning("已选数据为空无法移动");
       } else {
-        let count = this.temporaryselection.length - 1;
+        let count = this.rightselctedata.length - 1;
         for (var i = count; i >= 0; i--) {
-          this.temporaryselection.splice(i, 1);
-          this.tabledata.push(this.temporaryselection[i]);
+          this.personnelUnit.nogroupselected.splice(i, 1);
+          this.tabledata.push(this.rightselctedata[i]);
         }
       }
     },
     //右侧勾选按钮
     selecteditems(val) {
-      this.temporaryselection = val;
-      console.log(this.temporaryselection);
+      this.rightselctedata = val;
+      // this.personnelUnit.nogroupselected = val;
+      console.log(this.rightselctedata);
     },
-    // 移去按钮
+    // 添加按钮
     removedata() {
       if (this.unselecteddata.length == 0) {
         this.$message.warning("未选数据为空无法移动");
       } else {
-        this.saveornot=false
+        this.saveornot = false;
         let count = this.unselecteddata.length - 1;
         for (var i = count; i >= 0; i--) {
           this.tabledata.splice(i, 1);
           this.personnelUnit.nogroupselected.push(this.unselecteddata[i]);
         }
+        this.unselecteddata.forEach((item) => {
+          this.addrulst.push({
+            asbitemId: item.id,
+            price: item.price,
+            customerOrgGroupId: this.personnelUnit.form.id,
+          });
+        });
+        console.log(this.addrulst, "hhhhhhh");
         // this.selecteddata = this.unselecteddata;
         // 复制
         //  let count = this.unselecteddata.length - 1;
@@ -211,11 +240,16 @@ export default {
     },
     //项目类别选择
     getprojectgroups(v) {
-      this.getportfolioitems();
-      getapi(`/api/app/asbitem/in-item-type/${v}`).then((res) => {
-        this.tabledata = res.data;
-        console.log(res);
-      });
+      if (v !== "") {
+        getapi(`/api/app/asbitem/in-item-type/${v}`).then((res) => {
+          console.log(res);
+          this.tabledata = res.data;
+        });
+      } else {
+        getapi("/api/app/asbitem/in-filter?Filter").then((res) => {
+          this.tabledata = res.data.items;
+        });
+      }
     },
     //复制分组弹框
     copygroup() {
diff --git a/src/components/unitGrouping/unitGroupingTable.vue b/src/components/unitGrouping/unitGroupingTable.vue
index 06c3427..0597d18 100644
--- a/src/components/unitGrouping/unitGroupingTable.vue
+++ b/src/components/unitGrouping/unitGroupingTable.vue
@@ -272,14 +272,16 @@ export default {
     clickoncolumn(row) {
       getapi(`/api/app/customer-org-group/${row.id}`).then((res) => {
         this.form = res.data;
-        this.personnelUnit.form=res.data
+        this.personnelUnit.form = res.data;
       });
-     
       //
-      getapi(`/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem?CustomerOrgGroupId=${this.personnelUnit.id}`).then(res=>{
-       this.personnelUnit.nogroupselected=res.data
-       console.log(res,'我是分组');
-      })
+      getapi(
+        `/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem?CustomerOrgGroupId=${this.personnelUnit.id}`
+      ).then((res) => {
+        console.log(res.data,'当前列');
+        this.personnelUnit.nogroupselected = res.data;
+        console.log(this.personnelUnit.nogroupselected, "我是分组");
+      });
     },
     //编辑弹框
     editgroup() {

From 3b95ef762a6aa57fc25538c060bd17a6c4d7eb77 Mon Sep 17 00:00:00 2001
From: mch <1332099529@qq.com>
Date: Fri, 30 Jun 2023 20:05:41 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unitGrouping/unitGroupCategory.vue        | 29 ++++++++++++++-----
 .../unitGrouping/unitGroupingTable.vue        |  4 +--
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/components/unitGrouping/unitGroupCategory.vue b/src/components/unitGrouping/unitGroupCategory.vue
index 18946a7..3955db1 100644
--- a/src/components/unitGrouping/unitGroupCategory.vue
+++ b/src/components/unitGrouping/unitGroupCategory.vue
@@ -167,9 +167,9 @@ export default {
   methods: {
     //保存按钮
     Onsubmit() {
-      console.log(this.personnelUnit.form.id);
-      if (this.personnelUnit.form.id === "") {
-        this.$message.success("请选择单位分组");
+      console.log(this.personnelUnit.id);
+      if (this.personnelUnit.id === "") {
+        this.$message.warning("请先选择单位分组");
       } else {
         postapi("/api/app/customer-org-group-detail/many", this.addrulst).then(
           (res) => {
@@ -181,15 +181,22 @@ export default {
     //移除按钮
     addselecteditems() {
       //personnelUnit.nogroupselected
-
       if (this.rightselctedata.length == 0) {
         this.$message.warning("已选数据为空无法移动");
       } else {
         let count = this.rightselctedata.length - 1;
         for (var i = count; i >= 0; i--) {
-          this.personnelUnit.nogroupselected.splice(i, 1);
-          this.tabledata.push(this.rightselctedata[i]);
+          // this.personnelUnit.nogroupselected.splice(i, 1);
+          if (
+            !this.rightselctedata.includes(this.rightselctedata[i].displayName)
+          ) {
+            this.tabledata.push(this.rightselctedata[i]);
+            this.personnelUnit.nogroupselected.splice(i, 1);
+            console.log(this.rightselctedata[i]);
+          }
+          // this.tabledata.push(this.rightselctedata[i]);
         }
+        // this.
       }
     },
     //右侧勾选按钮
@@ -206,8 +213,14 @@ export default {
         this.saveornot = false;
         let count = this.unselecteddata.length - 1;
         for (var i = count; i >= 0; i--) {
-          this.tabledata.splice(i, 1);
-          this.personnelUnit.nogroupselected.push(this.unselecteddata[i]);
+          // this.tabledata.splice(i, 1);
+          // this.personnelUnit.nogroupselected.push(this.unselecteddata[i]);
+          if (
+            [...new Set(this.unselecteddata)]
+          ) {
+            this.tabledata.splice(i, 1);
+            this.personnelUnit.nogroupselected.push(this.unselecteddata[i]);
+          }
         }
         this.unselecteddata.forEach((item) => {
           this.addrulst.push({
diff --git a/src/components/unitGrouping/unitGroupingTable.vue b/src/components/unitGrouping/unitGroupingTable.vue
index 0597d18..4c5fb9a 100644
--- a/src/components/unitGrouping/unitGroupingTable.vue
+++ b/src/components/unitGrouping/unitGroupingTable.vue
@@ -276,9 +276,9 @@ export default {
       });
       //
       getapi(
-        `/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem?CustomerOrgGroupId=${this.personnelUnit.id}`
+        `/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem?CustomerOrgGroupId=${this.personnelUnit.form.id}`
       ).then((res) => {
-        console.log(res.data,'当前列');
+        console.log(res.data, "当前列");
         this.personnelUnit.nogroupselected = res.data;
         console.log(this.personnelUnit.nogroupselected, "我是分组");
       });