Merge branch 'master' of http://81.70.217.145:3000/shentun/peisweb

src/components/patientRegister/PatientRegisterList.vue

@@ -144,16 +144,16 @@
           <el-button type="primary" @click="openCamera" icon="el-icon-camera">拍照</el-button>
         </div>
         <div class="listBtn">
-          <el-button type="primary" @click="">健康档案</el-button>
+          <el-button type="primary" >健康档案</el-button>
         </div>
         <div class="listBtn">
-          <el-button type="primary" @click="">调整分组</el-button>
+          <el-button type="primary" >调整分组</el-button>
         </div>
         <div class="listBtn">
-          <el-button type="primary" @click="">调整项目</el-button>
+          <el-button type="primary" >调整项目</el-button>
         </div>
         <div class="listBtn">
-          <el-button type="primary" @click="">打指引单</el-button>
+          <el-button type="primary" >打指引单</el-button>
         </div>
       </div>
     </div>

src/components/unitGrouping/unitGroupCategory.vue

@@ -72,10 +72,10 @@
 
           <el-table-column label="价格" prop="price">
             <template slot-scope="scope">
-              <input
+              <el-input
                 type="text"
                 v-model="scope.row.price"
-                @blur="inputchang(scope.row)"
+                @change="inputchang(scope.row, $event.target.value)"
               />
             </template>
           </el-table-column>
@@ -174,9 +174,11 @@ export default {
     this.getportfolioitems();
   },
   methods: {
-    inputchang(v) {
-      this.price = v.price;
-      console.log(this.price);
+    inputchang(row, newVal) {
+      console.log(row);
+      console.log(newVal);
+      // this.price = v.price;
+      // console.log(this.price);
     },
     //保存按钮
     Onsubmit() {
@@ -218,20 +220,22 @@ export default {
           let count = this.rightselctedata.length - 1;
           for (var i = count; i >= 0; i--) {
             // this.personnelUnit.nogroupselected.splice(i, 1);
-            if (
-              // !this.rightselctedata.includes(this.rightselctedata[i].displayName)
-              [...new Set(this.rightselctedata)]
-            ) {
-              this.tabledata.push(this.rightselctedata[i]);
-              this.personnelUnit.nogroupselected.splice(i, 1);
-            }
+
+            // !this.rightselctedata.includes(this.rightselctedata[i].displayName)
+            [...new Set(this.rightselctedata)];
+
+            this.tabledata.push(this.rightselctedata[i]);
+            this.personnelUnit.nogroupselected.splice(i, 1);
+
             // this.tabledata.push(this.rightselctedata[i]);
           }
           // this.
           this.rightselctedata.forEach((item) => {
+            console.log(this.personnelUnit.customerOrgGroupId);
             this.addrulst.push({
               asbitemId: item.id,
               price: item.price,
+              // price: this.price,
               customerOrgGroupId: this.personnelUnit.customerOrgGroupId,
             });
           });
@@ -254,21 +258,21 @@ export default {
         } else {
           this.saveornot = false;
           let count = this.unselecteddata.length - 1;
+          let uniqueSet = [...new Set(this.unselecteddata, ...this.tabledata)];
+          const filteredArray = [];
           for (var i = count; i >= 0; i--) {
             // this.tabledata.splice(i, 1);
+            this.unselecteddata.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]);
-            }
           }
-          console.log(this.price);
+          console.log(this.personnelUnit.customerOrgGroupId);
           this.unselecteddata.forEach((item) => {
-           this.price=item.price
+            this.price = item.price;
             this.addrulst.push({
               asbitemId: item.id,
               price: item.price,
-              // price: this.price,
+              // price: this.psrice,
               customerOrgGroupId: this.personnelUnit.customerOrgGroupId,
             });
           });
@@ -348,7 +352,7 @@ export default {
       getapi(
         `/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem?CustomerOrgGroupId=${this.personnelUnit.form.id}`
       ).then((res) => {
-        console.log(res);
+        console.log(res, "res");
         this.personnelUnit.nogroupselected = res.data;
       });
     },

src/views/fee-settings/Asbitem.vue

@@ -292,6 +292,7 @@
         </el-select>
         <span style="margin-left: 10%; padding: 5px">搜索选择</span>
         <el-select
+          @change="selectitem"
           filterable
           v-model="flitvalues"
           placeholder="请选择"
@@ -596,6 +597,7 @@ export default {
       rightdata: [],
       rightobj: {},
       nums: 0,
+      itemid: "", //项目id
     };
   },
   created() {
@@ -604,24 +606,36 @@ export default {
   },
   mounted() {
     this.rowDrop();
+    this.gitfleslist();
   },
   methods: {
+    gitfleslist() {
+      getapi("/api/app/item").then((res) => {
+        this.filetelists = res.data.items;
+        console.log(res, "我是项目");
+      });
+    },
+    //搜索选择
+    selectitem(v) {
+      this.itemid = v;
+    },
     Onsubmit() {
       let sampleGroupId = this.form.id;
       console.log(sampleGroupId);
       let sdate = [];
-      console.log(this.rightdata,'2222');
-      this.rightdata.forEach((element) => {
-        console.log('项目元素id',element.id);
-        console.log('组合项目id',sampleGroupId);    
-        let sss = { itemId: element.id, asbitemId: sampleGroupId };
-        sdate.push(sss);
-      });
+      console.log(this.rightdata, "2222");
+      let sss = { itemId: this.itemid, asbitemId: sampleGroupId };
+      sdate.push(sss)
+      // this.rightdata.forEach((element) => {
+      //   console.log('项目元素id',element.id);
+      //   console.log('组合项目id',sampleGroupId);
+      //   sdate.push(sss);
+      // });
       // this.leftdata.forEach((element) => {
       //   let sss = { sampleGroupId: sampleGroupId, asbitemId: element.id };
       //   sdate.push(sss);
       // });
-      console.log(sdate);
+      // console.log(sdate);
       if (sampleGroupId == undefined) {
         this.$message.warning("请选择列表");
       } else {
@@ -650,6 +664,7 @@ export default {
       if (this.leftdata.length > 0) {
         this.leftdata.splice(this.num, 1);
         this.rightdata.push(this.rightobj);
+        this.isdislob = false;
       }
     },
     //右移动
@@ -820,7 +835,6 @@ export default {
         //项目类别
         projectlist().then((res) => {
           this.itemTypeId = res.data.items;
-         
         });
         //仪器类别
         instrumentlist().then((res) => {
@@ -901,15 +915,13 @@ export default {
 
       //性别
       examinationgender().then((res) => {
-           console.log(res);
+        console.log(res);
         this.forSexId = res.data;
-         console.log(this.forSexId);
+        console.log(this.forSexId);
       });
       //项目类别
       projectlist().then((res) => {
-     
         this.itemTypeId = res.data;
-        
       });
       //仪器类别
       instrumentlist().then((res) => {
@@ -923,12 +935,12 @@ export default {
     rowick(row) {
       asbitemgetid(row.id).then((res) => {
         this.form = res.data;
-       
       });
       getapi(
         `/api/app/asbitem-detail/asbitem-detail-in-item?AsbitemId=${row.id}`
       ).then((res) => {
-        console.log(res,'右侧');
+        this.rightdata = res.data;
+        console.log(res, "右侧");
         let dq = res.data;
         if (dq.length > 0) {
           this.rightdata = [];

src/views/fee-settings/MedicalPackage.vue

@@ -379,7 +379,7 @@ export default {
       console.log(this.rightdata);
       let sdate = [];
       this.rightdata.forEach((element) => {
-        let sss = { sampleGroupId: sampleGroupId, asbitemId: element.id };
+        let sss = { medicalPackageId: sampleGroupId, asbitemId: element.id };
         sdate.push(sss);
       });
       this.leftdata.forEach((element) => {
@@ -427,6 +427,7 @@ export default {
     //左侧添加按钮
     addobj() {
       if (this.leftdata.length > 0) {
+        this.isdislob = false;
         this.leftdata.splice(this.num, 1);
         this.rightdata.push(this.rightobj);
       }
@@ -632,7 +633,9 @@ export default {
         `/api/app/medical-package-detail/medical-package-in-asbitem?MedicalPackageId=${val.id}`
       ).then((res) => {
         console.log(res);
+        this.rightdata = res.data;
         let dq = res.data;
+
         if (dq.length > 0) {
           this.rightdata = [];
           dq.forEach((element) => {