From 58c0ed3798b6385034627dc7e694e175d61e3ea0 Mon Sep 17 00:00:00 2001
From: mch <1332099529@qq.com>
Date: Mon, 7 Aug 2023 18:05:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic-dictionary/ResultStatus.vue |  1 +
 src/views/common-settings/SampleGroup.vue   | 88 +++++++++++++--------
 src/views/fee-settings/Asbitem.vue          | 44 +++++++----
 src/views/fee-settings/Item.vue             |  6 +-
 4 files changed, 91 insertions(+), 48 deletions(-)

diff --git a/src/views/basic-dictionary/ResultStatus.vue b/src/views/basic-dictionary/ResultStatus.vue
index 1afbf6d..0a7a538 100644
--- a/src/views/basic-dictionary/ResultStatus.vue
+++ b/src/views/basic-dictionary/ResultStatus.vue
@@ -313,6 +313,7 @@ export default {
     },
     dataInputFontColor1(v) {
       this.form.dataInputFontColor16 = "#" + v;
+      console.log(v);
     },
     //报告单字体色
     reportFontColor1(v) {
diff --git a/src/views/common-settings/SampleGroup.vue b/src/views/common-settings/SampleGroup.vue
index 523ef33..f257c8e 100644
--- a/src/views/common-settings/SampleGroup.vue
+++ b/src/views/common-settings/SampleGroup.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="box">
     <div style="width: 95%">
-      <el-card style="height: ">
+      <el-card style="height: 800px">
         <el-table
           :data="tableData"
           style="width: 100%"
@@ -54,7 +54,7 @@
           :title="title == 1 ? '新增' : '修改'"
           :visible.sync="dialogVisible"
           width="53%"
-            :close-on-click-modal="false"
+          :close-on-click-modal="false"
         >
           <el-form ref="form" :model="form" label-width="80px" :rules="rules">
             <el-row>
@@ -132,31 +132,35 @@
             <el-button type="primary" @click="addoredit">确 定</el-button>
           </span>
         </el-dialog>
-        <div style="margin-top: 20px">
-          <span style="margin-top: 10px; padding: 5px; margin-left: 15%"
-            >项目类别</span
-          >
-          <el-select
-            v-model="values"
-            placeholder="请选择"
-            @change="ischangs"
-            style="margin-top: 5px"
-          >
-            <el-option
-              v-for="item in projectid"
-              :key="item.id"
-              :label="item.displayName"
-              :value="item.id"
+        <div style="margin-top: 20px" class="intermediatesubject">
+          <div>
+            <span style="margin-top: 10px; padding: 5px">项目类别</span>
+            <el-select
+              v-model="values"
+              placeholder="请选择"
+              @change="ischangs"
+              style="margin-top: 5px"
             >
-            </el-option>
-          </el-select>
+              <el-option
+                v-for="item in projectid"
+                :key="item.id"
+                :label="item.displayName"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </div>
           <!--  -->
-          <span style="margin-left: 10%; padding: 5px">搜索选择</span>
+          <span style="margin-left: 10%; padding: 5px; margin-top: 10px"
+            >搜索选择</span
+          >
           <el-select
             filterable
             v-model="flitvalues"
             placeholder="请选择"
             style="margin-top: 5px"
+            @change="selectchange"
+            value-key="id"
           >
             <el-option
               v-for="item in filetelists"
@@ -208,7 +212,7 @@
                 </el-button>
               </div>
             </div>
-            <div class="leftbox" style="margin-left: 7%">
+            <div class="leftbox" style="margin-left: 5%">
               <div class="weixuan">已选项目</div>
               <div
                 v-for="(item, index) in rightdata"
@@ -338,7 +342,7 @@ export default {
       ary1: [],
       ary2: [],
       sdate: [],
-      curRow:{}
+      curRow: {},
     };
   },
   created() {
@@ -364,6 +368,11 @@ export default {
     // },
   },
   methods: {
+    selectchange(v) {
+      console.log(v);
+      // console.log("111");
+      // console.log(v);
+    },
     Onsubmit() {
       let sampleGroupId = this.form.id;
       console.log(this.form.id);
@@ -382,7 +391,10 @@ export default {
         this.$message.warning("请选择列表");
       } else {
         batchcreaion(sdate).then((res) => {
-          this.$message.success("操作成功");
+          if (res.code == 0) {
+            this.$message.success("操作成功");
+          }
+
           this.isdislob = true;
         });
       }
@@ -454,12 +466,14 @@ export default {
     rightindex(item, index) {
       this.nums = index;
       this.leftobj = item;
+      this.isdislob = false;
       console.log(this.leftobj);
     },
     //左侧双击事件
     shuanji(item, index) {
       this.ites.splice(index, 1);
       this.rightdata.push(item);
+      this.isdislob = false;
     },
     //右移动
     removeright() {
@@ -485,6 +499,7 @@ export default {
       console.log(this.allid);
       this.ischank = 2;
       this.num = index;
+      this.isdislob = false;
     },
     //科室选择
     ischangs(v) {
@@ -566,7 +581,7 @@ export default {
     },
     //置底
     setlow() {
-        this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
@@ -579,7 +594,7 @@ export default {
     },
     //置顶
     topping() {
-        this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
@@ -591,7 +606,7 @@ export default {
     },
     //删除
     deleteid() {
-        this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
@@ -604,7 +619,7 @@ export default {
     },
     //编辑弹框
     editreport() {
-      this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
@@ -673,8 +688,8 @@ export default {
     },
     rowick(row) {
       samplegropid(row.id).then((res) => {
-        this.curRow={...res.data}
-        // this.form = res.data;
+        this.curRow = { ...res.data };
+        this.form = res.data;
       });
       sampleasbitemid(row.id).then((res) => {
         let dq = res.data;
@@ -718,8 +733,13 @@ export default {
 };
 </script>
 <style scoped>
+.intermediatesubject {
+  /* width: 100%; */
+  display: flex;
+  justify-content: center;
+}
 .confirmcancellation {
-  margin-left: 40%;
+  margin-left: 50%;
 }
 .Selectbutton {
   margin-left: 3%;
@@ -737,11 +757,17 @@ export default {
   height: 240px;
   border: 1px solid #ccc;
   margin-left: 6%;
+  overflow-x: hidden;
+  overflow-y: scroll;
 }
 .instrumentcategory {
   width: 100%;
   display: flex;
-  margin-left: 15%;
+  justify-content: center;
+  /* margin-left: 15%; */
+}
+.el-card__body {
+  height: 700px;
 }
 .box {
   display: flex;
diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue
index 5c0e277..78c6d6c 100644
--- a/src/views/fee-settings/Asbitem.vue
+++ b/src/views/fee-settings/Asbitem.vue
@@ -55,7 +55,7 @@
           :visible.sync="dialogVisible"
           width="50%"
           @close="bindidclose"
-            :close-on-click-modal="false"
+          :close-on-click-modal="false"
         >
           <el-form
             :model="form"
@@ -66,7 +66,10 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="名称" prop="displayName">
-                  <el-input v-model="form.displayName" ref="refinput"></el-input>
+                  <el-input
+                    v-model="form.displayName"
+                    ref="refinput"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -297,6 +300,7 @@
           </el-select>
           <span style="margin-left: 10%; padding: 5px">搜索选择</span>
           <el-select
+            value-key="id"
             @change="selectitem"
             filterable
             v-model="flitvalues"
@@ -307,7 +311,7 @@
               v-for="item in filetelists"
               :key="item.id"
               :label="item.displayName"
-              :value="item.id"
+              :value="item"
             >
             </el-option>
           </el-select>
@@ -604,7 +608,7 @@ export default {
       rightobj: {},
       nums: 0,
       itemid: "", //项目id
-      curRow:{}
+      curRow: {},
     };
   },
   created() {
@@ -624,7 +628,15 @@ export default {
     },
     //搜索选择
     selectitem(v) {
-      this.itemid = v;
+      this.itemid = v.id;
+      // this.rightdata.forEach((item) => {
+      //   if (v.id != item.id) {
+      //   } else {
+      //     this.rightdata.push({ displayName: v.displayName });
+      //   }
+      // });
+      this.rightdata.push({ displayName: v.displayName });
+      console.log(v);
     },
     Onsubmit() {
       let sampleGroupId = this.form.id;
@@ -659,13 +671,14 @@ export default {
       this.isdislob = false;
       this.rightdata.splice(this.num, 1);
       this.leftdata.push(item);
-      this.isdislob = true;
+      this.isdislob = false;
       this.updatedate();
     },
     //右侧点击选中
     rightindex(item, index) {
       this.nums = index;
       this.leftobj = item;
+
       console.log(this.leftobj);
     },
     //左侧添加按钮
@@ -681,7 +694,7 @@ export default {
       if (this.rightdata.length > 0) {
         this.rightdata.splice(this.num, 1);
         this.leftdata.push(this.leftobj);
-        this.isdislob = true;
+        this.isdislob = false;
         // this.isdislob=false
         this.updatedate();
       }
@@ -711,6 +724,7 @@ export default {
       console.log(item);
       this.leftdata.splice(index, 1);
       this.rightdata.push(item);
+      this.isdislob = false;
     },
     clickPaixu(item, index) {
       this.rightobj = item;
@@ -797,7 +811,7 @@ export default {
     },
     //置底
     setlow() {
-       this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
@@ -810,7 +824,7 @@ export default {
     },
     //置顶
     topping() {
-       this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
@@ -822,7 +836,7 @@ export default {
     },
     //删除
     deleteid() {
-       this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
@@ -834,7 +848,7 @@ export default {
     },
     //编辑弹框
     editpopup() {
-      this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请点击选择操作的数据");
       } else {
@@ -931,9 +945,9 @@ export default {
     addll() {
       this.dialogVisible = true;
       this.title = 1;
-this.$nextTick(()=>{
-        this.$refs.refinput.focus()
-      })
+      this.$nextTick(() => {
+        this.$refs.refinput.focus();
+      });
 
       //性别
       examinationgender().then((res) => {
@@ -956,7 +970,7 @@ this.$nextTick(()=>{
     },
     rowick(row) {
       asbitemgetid(row.id).then((res) => {
-        this.curRow={...res.data}
+        this.curRow = { ...res.data };
         // this.form = res.data;
       });
       getapi(
diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue
index 8f85cc2..035c9a3 100644
--- a/src/views/fee-settings/Item.vue
+++ b/src/views/fee-settings/Item.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="box">
     <div style="width: 150%">
-      <el-card>
+      <el-card style="height:600px">
         <el-row style="margin-top: 20px; margin-left: 15px">
           <el-col :span="4">
             <el-autocomplete
@@ -52,8 +52,9 @@
           <div style="width: 85%">
             <el-table
               :data="tableData"
-              style="width: 95%; height: 500px"
+              style="width: 95%; "
               row-key="id"
+              height="500"
               class="el-table__body-wrapper tbody"
               highlight-current-row
               @row-click="rowick"
@@ -1774,5 +1775,6 @@ export default {
 <style scoped>
 .box {
   display: flex;
+  width: 100%;
 }
 </style>