Merge branch 'master' of http://ver.wh613.com:3000/shentun/peisweb

src/views/common-settings/SampleGroup.vue

@@ -4,14 +4,13 @@
       <el-card style="height: 800px">
         <el-table
           :data="tableData"
-          style="width: 100%"
+          style="width: 100%; height: 200px"
           v-loading="loading"
           row-key="id"
           class="el-table__body-wrapper tbody"
           border:stripe="true"
           @row-click="rowick"
           highlight-current-row
-          height=""
         >
           <el-table-column prop="id" label="编号" width="300">
           </el-table-column>
@@ -155,19 +154,18 @@
             >搜索选择</span
           >
           <el-select
+            value-key="id"
             filterable
             v-model="flitvalues"
             placeholder="请选择"
             style="margin-top: 5px"
-             value-key="id"
             @change="selectchange"
-           
           >
             <el-option
               v-for="item in filetelists"
               :key="item.id"
               :label="item.displayName"
-              :value="item.id"
+              :value="item"
             >
             </el-option>
           </el-select>
@@ -371,7 +369,7 @@ export default {
   methods: {
     selectchange(v) {
       console.log(v);
-      // console.log("111");
+      this.rightdata.push({ displayName: v.displayName });
       // console.log(v);
     },
     Onsubmit() {
@@ -506,8 +504,8 @@ export default {
     ischangs(v) {
       itemtypeid(v).then((res) => {
         this.ites = res.data;
-        let dq = res.data;
-        if (dq.length > 0) {
+        // let dq = res.data;
+        if (ites.length > 0) {
           dq.forEach((element) => {
             let bb = { displayName: element.displayName, id: element.id };
             this.ites.push(bb);

src/views/fee-settings/Asbitem.vue

@@ -6,7 +6,7 @@
           :data="tableData"
           style="width: 100%"
           row-key="id"
-          height="240"
+            height="300px"
           class="el-table__body-wrapper tbody"
           @row-click="rowick"
           highlight-current-row
@@ -636,7 +636,7 @@ export default {
       //   }
       // });
       this.rightdata.push({ displayName: v.displayName });
-      console.log(v,'sssssssss');
+      console.log(v, "sssssssss");
     },
     Onsubmit() {
       let sampleGroupId = this.form.id;

src/views/fee-settings/Diagnosis.vue

@@ -48,7 +48,7 @@
           </el-table-column>
         </el-table>
         <!--  -->
-        <span style="margin-top: 10px; padding: 5px; margin-left: 28.5%"
+        <!-- <span style="margin-top: 10px; padding: 5px; margin-left: 28.5%"
           >项目类别</span
         >
         <el-select
@@ -64,8 +64,8 @@
             :value="item.id"
           >
           </el-option>
-        </el-select>
-        <span style="margin-left: 10%; padding: 5px">搜索选择</span>
+        </el-select> -->
+        <!-- <span style="margin-left: 10%; padding: 5px">搜索选择</span>
         <el-select
           filterable
           v-model="flitvalues"
@@ -79,8 +79,8 @@
             :value="item.id"
           >
           </el-option>
-        </el-select>
-        <div class="mainbox">
+        </el-select> -->
+        <!-- <div class="mainbox">
           <div class="mainleftbox">
             <div class="weixuan">未选项目</div>
             <div
@@ -130,11 +130,11 @@
               <div>{{ item.displayName }}</div>
             </div>
           </div>
-        </div>
-        <div class="confirmcancellation">
+        </div> -->
+        <!-- <div class="confirmcancellation">
           <el-button :disabled="isdislob" @click="Onsubmit">确定</el-button>
           <el-button :disabled="isdislob">取消</el-button>
-        </div>
+        </div> -->
       </el-card>
       <el-dialog
         :title="title == 1 ? '新增' : '编辑'"

src/views/fee-settings/DiagnosisTemplate.vue

@@ -67,16 +67,18 @@
         </el-select>
         <span style="margin-left: 10%; padding: 5px">搜索选择</span>
         <el-select
+        value-key="id"
           filterable
           v-model="flitvalues"
           placeholder="请选择"
           style="margin-top: 5px"
+          @change="diagnosisitem"
         >
           <el-option
             v-for="item in filetelists"
             :key="item.id"
             :label="item.displayName"
-            :value="item.id"
+            :value="item"
           >
           </el-option>
         </el-select>
@@ -274,6 +276,8 @@ export default {
       ary2: [],
       nums: 0,
       curRow: {},
+      diagonsisitemtype: [], //搜索选择
+      flitvalues: "",
     };
   },
   created() {
@@ -282,8 +286,23 @@ export default {
   },
   mounted() {
     this.rowDrop();
+    this.getdiagnosisitem();
   },
   methods: {
+    diagnosisitem(v) {
+      this.rightdata.forEach(item=>{
+        
+      })
+      console.log(v);
+      this.rightdata.push({ displayName: v.displayName });
+    },
+    //获取搜索选择
+    getdiagnosisitem() {
+      getapi("/api/app/item").then((res) => {
+        this.filetelists = res.data.items;
+        console.log(res);
+      });
+    },
     Onsubmit() {
       let sampleGroupId = this.form.id;
       console.log(this.form.id);

src/views/fee-settings/ItemTemplate.vue

@@ -56,7 +56,8 @@
           ref="singleTable"
         >
         </comp-table> -->
-        <span style="margin-top: 10px; padding: 5px; margin-left: 19.8%"
+        <div class="subjecttitle">
+          <span style="margin-top: 10px; padding: 5px; margin-left: %"
             >项目类别</span
           >
           <el-select
@@ -88,6 +89,7 @@
             >
             </el-option>
           </el-select>
+        </div>
         <div class="mainbox">
           <div class="mainleftbox">
             <div class="weixuan">未选项目</div>
@@ -300,8 +302,15 @@ export default {
   },
   mounted() {
     this.rowDrop();
+    this.getdiagnosisitem()
   },
   methods: {
+    // getdiagnosisitem() {
+    //   getapi("/api/app/item").then((res) => {
+       
+    //     console.log(res);
+    //   });
+    // },
     Onsubmit() {
       let sampleGroupId = this.form.id;
       console.log(this.form.id);
@@ -589,8 +598,8 @@ export default {
       this.title = 1;
       this.form = {};
       this.$nextTick(() => {
-        this.$refs.refinput.focus()
-      })
+        this.$refs.refinput.focus();
+      });
     },
     getlist() {
       getapi("/api/app/item-template/in-filter", this.pages).then((res) => {
@@ -604,6 +613,10 @@ export default {
 };
 </script>
 <style scoped>
+.subjecttitle {
+  display: flex;
+  justify-content: center;
+}
 .confirmcancellation {
   margin-left: 45%;
 }

src/views/fee-settings/MedicalPackage.vue

@@ -169,16 +169,18 @@
       </el-select>
       <span style="margin-left: 10%; padding: 5px">搜索选择</span>
       <el-select
+        @change="chooseapackage"
+        value-key="id"
         filterable
         v-model="flitvalues"
         placeholder="请选择"
         style="margin-top: 5px"
       >
         <el-option
-          v-for="item in filetelists"
+          v-for="item in medicalpackage"
           :key="item.id"
           :label="item.displayName"
-          :value="item.id"
+          :value="item"
         >
         </el-option>
       </el-select>
@@ -365,7 +367,9 @@ export default {
       leftobj: {},
       rightobj: {},
       nums: 0,
-      curRow:{}
+      curRow: {},
+      medicalpackagevalue: "",
+      medicalpackage: [], //套餐包含的项目
     };
   },
   created() {
@@ -373,9 +377,21 @@ export default {
     this.gitprojectcategory();
   },
   mounted() {
+    this.getmedicalpackage();
     this.rowDrop();
   },
   methods: {
+    chooseapackage(v) {
+      this.rightdata.push({ displayName: v.displayName });
+      console.log(v);
+    },
+    //体检套餐需要的项目
+    getmedicalpackage() {
+      getapi("/api/app/item").then((res) => {
+        this.medicalpackage = res.data.items;
+        console.log(res);
+      });
+    },
     Onsubmit() {
       let sampleGroupId = this.form.id;
       console.log(this.form.id);
@@ -545,7 +561,7 @@ export default {
       });
     },
     toppings() {
-        this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
@@ -560,7 +576,7 @@ export default {
       }
     },
     topping() {
-        this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
@@ -576,7 +592,7 @@ export default {
     },
     //删除
     delets(row) {
-        this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择删除的数据");
       } else {
@@ -596,7 +612,7 @@ export default {
     },
     //编辑弹框
     editpopup() {
-      this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请点击选择操作的数据");
       } else {
@@ -635,7 +651,7 @@ export default {
     rowclick(val) {
       getapi(`/api/app/medical-package/${val.id}`).then((res) => {
         // this.form = res.data;
-        this.curRow={...res.data}
+        this.curRow = { ...res.data };
         console.log(res);
       });
       getapi(