From e265a14b28d7f4206e149cbb2b357e92093229e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=96=8C=E6=9D=B0?= <>
Date: Fri, 1 Nov 2024 16:29:24 +0800
Subject: [PATCH] ui

---
 src/components/doctorCheck/CheckItemList.vue |   7 +-
 src/views/fee-settings/CriticalValue.vue     | 753 +++++++++++--------
 src/views/fee-settings/Item.vue              |   2 +-
 3 files changed, 456 insertions(+), 306 deletions(-)

diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue
index 6b2600e..d3e6359 100644
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@@ -44,10 +44,7 @@
               size="small"
               >P</el-button
             >
-            <!-- <el-button style="min-width:23px;padding:2px;margin-left: 2px;"
-              @click="btnPacsResulst(scope.row, scope.$index)" :disabled="rowResultDisabled(scope.row)"
-              size="small">S</el-button> -->
-            <el-popover placement="top-end" width="500" trigger="click" :title="scope.row.itemName">
+            <!-- <el-popover placement="top-end" width="500" trigger="click" :title="scope.row.itemName">
               <el-tabs v-model="activeName">
                 <el-tab-pane label="文字结果" name="first">
                   <el-table :data="gridData">
@@ -78,7 +75,7 @@
                 size="small"
                 >S</el-button
               >
-            </el-popover>
+            </el-popover> -->
           </div>
         </template>
       </el-table-column>
diff --git a/src/views/fee-settings/CriticalValue.vue b/src/views/fee-settings/CriticalValue.vue
index f842c17..97a5515 100644
--- a/src/views/fee-settings/CriticalValue.vue
+++ b/src/views/fee-settings/CriticalValue.vue
@@ -6,136 +6,220 @@
           基础资料 /
           <span class="contenttitleBold">危急值</span>
         </div>
+        <div class="seachinput">
+          <el-select
+            v-model="department"
+            placeholder="请选择危急值"
+            filterable
+            :filter-method="remoteMethodes"
+            default-first-option
+            @change="quckDepartments"
+            clearable
+            size="small"
+          >
+            <el-option
+              v-for="item in quckDepartment"
+              :key="item.id"
+              :label="item.displayName"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
       </div>
-      <div style="display: block; margin-top: 7px; margin-right: 110px">
-        <div style="background-color: #fff; padding: 15px; border-radius: 8px">
-          <div id="printTest">
-            <el-table
-              :data="tableData"
-              :height="window.pageHeight < 600 ? 480 : window.pageHeight - 130"
-              row-key="id"
-              class="el-table__body-wrapper tbody"
-              @row-click="rowclick"
-              highlight-current-row
-              ref="tableData"
+      <div style="display: flex; margin-top: 7px">
+        <div
+          :style="
+            'width: 208px;overflow: scroll;height:' +
+            (window.pageHeight < 600 ? 480 : window.pageHeight - 100) +
+            'px;background-color: #fff; border-radius: 8px'
+          "
+        >
+          <div style="margin-top: 10px">
+            <el-tree
+              :data="criticalFollowValueTypeId"
+              :props="treeprops"
+              @node-click="treeclick"
+              node-key="criticalFollowValueTypeId"
+              ref="itemType"
+              highlight-current
+              auto-expand-parent
             >
-              <el-table-column prop="id" label="编号" width="300">
-              </el-table-column>
-              <el-table-column prop="displayName" label="名称" width="">
-              </el-table-column>
-              <el-table-column prop="criticalFollowValueTypeId" label="危急值类别" width="">
-                <template slot-scope="scope">
-            <div>
-                    {{
-                      getTreeName(
-                        criticalFollowValueTypeId,
-                        scope.row.criticalFollowValueTypeId
-                      )
-                    }}
-                  </div>
-          </template>
-              </el-table-column>
-              <el-table-column prop="criticalFollowValueFlag" label="危急随访值标志" width="">
-                <template slot-scope="scope">
-            <div>
-              {{ dddw(criticalFollowValueFlag, "id", scope.row.criticalFollowValueFlag, "displayName") }}
+              <span class="custom-tree-node" slot-scope="{ node, data }">
+                <div>
+                  <span class="treeicons">
+                    <!-- <i
+                        class="el-icon-document-remove"
+                        v-if="data.parentId == null"
+                      ></i> -->
+                    <img
+                      style="width: 20px; height: 20px; vertical-align: sub"
+                      src="@/assets/images/order.png"
+                      v-if="!data.parentId"
+                    />
+                  </span>
+                  <span :class="!data.parentId ? 'maxtitle' : 'mintitle'">{{
+                    node.label
+                  }}</span>
+                </div>
+              </span>
+            </el-tree>
+          </div>
+        </div>
+        <div style="display: block">
+          <div style="margin-left: 15px; display: flex">
+            <div :style="'width:' +
+              (window.pageWidth - 200 - 110 - 50 - 14) +
+              'px;padding: 15px;background-color: #fff;border-radius: 8px;'
+              ">
+              <div>
+                <el-table
+                  :data="tableData"
+                  :height="
+                    window.pageHeight < 600 ? 450 : window.pageHeight - 130
+                  "
+                  row-key="id"
+                  class="el-table__body-wrapper tbody"
+                  @row-click="rowclick"
+                  highlight-current-row
+                  ref="tableData"
+                >
+                  <el-table-column prop="id" label="编号" width="300">
+                  </el-table-column>
+                  <el-table-column prop="displayName" label="名称" width="">
+                  </el-table-column>
+                  <el-table-column
+                    prop="criticalFollowValueTypeId"
+                    label="危急值类别"
+                    width=""
+                  >
+                    <template slot-scope="scope">
+                      <div>
+                        {{
+                          getTreeName(
+                            criticalFollowValueTypeId,
+                            scope.row.criticalFollowValueTypeId
+                          )
+                        }}
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    prop="criticalFollowValueFlag"
+                    label="危急随访值标志"
+                    width="120"
+                  >
+                    <template slot-scope="scope">
+                      <div>
+                        {{
+                          dddw(
+                            criticalFollowValueFlag,
+                            "id",
+                            scope.row.criticalFollowValueFlag,
+                            "displayName"
+                          )
+                        }}
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="creatorName" label="创建者" width="">
+                  </el-table-column>
+                  <el-table-column
+                    prop="creationTime"
+                    label="创建时间"
+                    width="200"
+                  >
+                    <template slot-scope="scope">
+                      {{ scope.row.creationTime | dateFormat }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    prop="lastModifierName"
+                    label="修改者"
+                    width=""
+                  >
+                  </el-table-column>
+                  <el-table-column
+                    prop="lastModificationTime"
+                    label="修改时间"
+                    width="200"
+                  >
+                    <template slot-scope="scope">
+                      {{ scope.row.lastModificationTime | dateFormat }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" align="center">
+                    <template>
+                      <el-tag
+                        class="move"
+                        style="
+                          cursor: move;
+                          background-color: rgb(245, 245, 245);
+                          border: none;
+                        "
+                        draggable="true"
+                      >
+                        <i
+                          class="el-icon-d-caret"
+                          style="
+                            width: 1rem;
+                            height: 1rem;
+                            color: rgb(113, 113, 113);
+                          "
+                        ></i>
+                      </el-tag>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
             </div>
-          </template>
-              </el-table-column>
-              <el-table-column prop="creatorName" label="创建者" width="">
-              </el-table-column>
-              <el-table-column prop="creationTime" label="创建时间" width="200">
-                <template slot-scope="scope">
-                  {{ scope.row.creationTime | dateFormat }}
-                </template>
-              </el-table-column>
-              <el-table-column prop="lastModifierName" label="修改者" width="">
-              </el-table-column>
-              <el-table-column
-                prop="lastModificationTime"
-                label="修改时间"
-                width="200"
-              >
-                <template slot-scope="scope">
-                  {{ scope.row.lastModificationTime | dateFormat }}
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" align="center">
-                <template>
-                  <el-tag
-                    class="move"
-                    style="
-                      cursor: move;
-                      background-color: rgb(245, 245, 245);
-                      border: none;
-                    "
-                    draggable="true"
+                          <!-- 按钮区域 -->
+              <div style="margin-left: 10px">
+                <el-button type="" @click="add" class="commonbutton"
+                  >新增</el-button
+                >
+                <div style="margin-top: 10px">
+                  <el-button type="" @click="editpopup" class="commonbutton"
+                    >编辑</el-button
+                  >
+                </div>
+                <div style="margin-top: 10px">
+                  <el-button type="" @click="delsrts" class="deleteButton"
+                    >删除</el-button
+                  >
+                </div>
+                <div style="margin-top: 10px">
+                  <el-button type="" @click="topping" class="commonbutton"
+                    >置顶</el-button
                   >
-                    <i
-                      class="el-icon-d-caret"
-                      style="
-                        width: 1rem;
-                        height: 1rem;
-                        color: rgb(113, 113, 113);
-                      "
-                    ></i>
-                  </el-tag>
-                </template>
-              </el-table-column>
-            </el-table>
+                </div>
+                <div style="margin-top: 10px">
+                  <el-button type="" @click="toppings" class="commonbutton"
+                    >置底</el-button
+                  >
+                </div>
+                <div style="margin-top: 10px">
+                  <el-button
+                    type=""
+                    :disabled="isshow"
+                    @click="assertion"
+                    class="commonbutton"
+                    >排序</el-button
+                  >
+                </div>
+                <div style="margin-top: 10px">
+                  <el-button
+                    type=""
+                    :disabled="isshow"
+                    @click="cancellation"
+                    class="commonbutton"
+                    >取消</el-button
+                  >
+                </div>
+              </div>
           </div>
         </div>
       </div>
-      <!-- 按钮区域 -->
-      <div
-        style="
-          margin-left: 10px;
-          margin-top: 3%;
-          position: absolute;
-          top: 0;
-          right: 0;
-        "
-      >
-        <el-button type="" @click="add" class="commonbutton">新增</el-button>
-        <div style="margin-top: 10px">
-          <el-button type="" @click="editpopup" class="commonbutton"
-            >编辑</el-button
-          >
-        </div>
-        <div style="margin-top: 10px">
-          <el-button type="" @click="delsrts" class="deleteButton"
-            >删除</el-button
-          >
-        </div>
-        <div style="margin-top: 10px">
-          <el-button type="" @click="topping" class="commonbutton"
-            >置顶</el-button
-          >
-        </div>
-        <div style="margin-top: 10px">
-          <el-button type="" @click="toppings" class="commonbutton"
-            >置底</el-button
-          >
-        </div>
-        <div style="margin-top: 10px">
-          <el-button
-            type=""
-            :disabled="isshow"
-            @click="assertion"
-            class="commonbutton"
-            >排序</el-button
-          >
-        </div>
-        <div style="margin-top: 10px">
-          <el-button
-            type=""
-            :disabled="isshow"
-            @click="cancellation"
-            class="commonbutton"
-            >取消</el-button
-          >
-        </div>
-      </div>
     </div>
     <!-- 新增或者编辑弹框 -->
     <el-dialog
@@ -168,14 +252,21 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="危急值类别" prop="criticalFollowValueTypeId">
-              <el-cascader v-model="form.criticalFollowValueTypeId" :options="criticalFollowValueTypeId" popper-class="example" ref="criticalFollowValueTypeId"
-                @change="onchange" :props="{
+              <el-cascader
+                v-model="form.criticalFollowValueTypeId"
+                :options="criticalFollowValueTypeId"
+                popper-class="example"
+                ref="criticalFollowValueTypeId"
+                @change="onchange"
+                :props="{
                   value: 'criticalFollowValueTypeId',
                   label: 'displayName',
                   children: 'treeChildren',
                   checkStrictly: true,
                   expandTrigger: 'hover',
-                }" size="small"></el-cascader>
+                }"
+                size="small"
+              ></el-cascader>
               <!-- <el-select
                 v-model="form.itemTypeId"
                 placeholder="请选择"
@@ -193,57 +284,69 @@
           </el-col>
         </el-row>
         <el-row>
-                      <el-col :span="8">
-              <el-form-item label="危急随访值标志">
-                <el-select
-                  v-model="form.criticalFollowValueFlag"
-                  placeholder="危急随访值标志"
-                  size="small"
-                >
-                  <el-option v-for="item in criticalFollowValueFlag"
-                    :key="item.id"
-                    :label="item.displayName"
-                    :value="item.id"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+          <el-col :span="8">
+            <el-form-item label="危急随访值标志">
+              <el-select
+                v-model="form.criticalFollowValueFlag"
+                placeholder="危急随访值标志"
+                size="small"
+              >
+                <el-option
+                  v-for="item in criticalFollowValueFlag"
+                  :key="item.id"
+                  :label="item.displayName"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
-              <el-divider></el-divider>
-              <el-col :span="4" style="margin-left: 15px">
-                <el-form-item label="创建者">
-                  <el-input v-model="form.creatorName" disabled size="small"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="创建时间">
-                  <el-input
-                    :value="form.creationTime | dateFormat"
-                    disabled
-                    style="width: 95%"
-                    size="small"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="4">
-                <el-form-item label="修改者">
-                  <el-input v-model="form.lastModifierName" disabled size="small"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="修改时间">
-                  <el-input
-                    :value="form.lastModificationTime | dateFormat"
-                    disabled
-                    style="width: 95%"
-                    size="small"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
+          <el-divider></el-divider>
+          <el-col :span="4" style="margin-left: 15px">
+            <el-form-item label="创建者">
+              <el-input
+                v-model="form.creatorName"
+                disabled
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建时间">
+              <el-input
+                :value="form.creationTime | dateFormat"
+                disabled
+                style="width: 95%"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="修改者">
+              <el-input
+                v-model="form.lastModifierName"
+                disabled
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="修改时间">
+              <el-input
+                :value="form.lastModificationTime | dateFormat"
+                disabled
+                style="width: 95%"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false" class="difference">取 消</el-button>
+        <el-button @click="dialogVisible = false" class="difference"
+          >取 消</el-button
+        >
         <el-button type="primary" @click="addoredit" class="commonbutton"
           >确 定</el-button
         >
@@ -256,7 +359,7 @@ import { rowDrop, assertions } from "@/components/publicjs/public";
 import Sortable from "sortablejs";
 import { getapi, postapi, putapi } from "@/api/api";
 import { mapState } from "vuex";
-import {dddw } from "../../utlis/proFunc";
+import { dddw } from "../../utlis/proFunc";
 import {
   physicallist,
   medicalconclusionlist,
@@ -268,11 +371,9 @@ import {
   tijiandetid,
   diagnosticediting,
   xiugaijielun,
-  conclusionacquisition
+  conclusionacquisition,
 } from "../../request/systemapi";
-import {
-  criticalFollowValueType
-} from "@/request/commonapi";
+import { criticalFollowValueType } from "@/request/commonapi";
 export default {
   data() {
     return {
@@ -288,13 +389,16 @@ export default {
       selars: "",
       value: "",
       criticalFollowValueTypeId: [],
-      criticalFollowValueFlag:[{
-        id:"0",
-        displayName:"危急值"
-      },{
-        id:"1",
-        displayName:"随访值"
-      }],
+      criticalFollowValueFlag: [
+        {
+          id: "0",
+          displayName: "危急值",
+        },
+        {
+          id: "1",
+          displayName: "随访值",
+        },
+      ],
       title: 1,
       pages: {
         TypeId: "",
@@ -312,11 +416,18 @@ export default {
       initTableData: [],
       item: {},
       curRow: {},
+      treeprops: {
+        label: "displayName",
+        value: "id",
+        children: "treeChildren",
+      },
+      criticalFollowTypeId:"",
+      department:"",
+      quckDepartment:""
     };
   },
   created() {
     this.getlist();
-    // this.getmedicalconclusionlist();
   },
   computed: {
     ...mapState(["window"]),
@@ -328,6 +439,102 @@ export default {
 
   methods: {
     dddw,
+    treeclick(data) {
+      if(data){
+        this.criticalFollowTypeId = data.criticalFollowValueTypeId;
+      }
+      postapi("/api/app/CriticalFollowValue/GetList",{
+        criticalFollowValueTypeId:this.criticalFollowTypeId
+      }).then((res) => {
+        if (res.code != -1) {
+          this.tableData = res.data;
+        }
+      });
+    },
+    remoteMethodes(keyWords) {
+      if (keyWords) {
+        this.quckDepartment = [];
+        this.initTableData.forEach((item) => {
+          if (
+            item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) >
+            -1 
+            // ||
+            // item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
+            // || item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
+          ) {
+            this.quckDepartment.push(item);
+          }
+        });
+      } else {
+        this.quckDepartment = deepCopy(this.initTableData);
+      }
+    },
+    quckDepartments(e) {
+      if (e) {
+        let currentKey = "";
+        this.quckDepartment.forEach((item) => {
+          if (e == item.id) {
+            currentKey = item.criticalFollowValueTypeId;
+            this.initItemTypeId = item.criticalFollowValueTypeId;
+          }
+        });
+        this.$refs["itemType"].setCurrentKey(currentKey);
+        let selected = this.$refs["itemType"].getCurrentNode();
+        if (
+          this.$refs["itemType"].getNode(selected) &&
+          this.$refs["itemType"].getNode(selected).parent
+        ) {
+          this.expandParents(this.$refs["itemType"].getNode(selected).parent);
+        }
+        postapi("/api/app/CriticalFollowValue/GetList",{
+        criticalFollowValueTypeId:currentKey
+      }).then((res) => {
+          if (res.code != -1) {
+            this.tableData = res.data;
+            this.tableData.forEach((item, index) => {
+              if (e == item.id) {
+                this.$refs["tableData"].setCurrentRow(item);
+                this.rowclick(item);
+                this.tableScrollToRow(this.$refs.tableData, index);
+                this.searchup(item, index)
+              }
+            });
+          }
+        });
+      } else {
+        this.remoteMethodes();
+      }
+    },
+    tableScrollToRow(tableElement, rowIndex) {
+      let theTableRows = tableElement.bodyWrapper.querySelectorAll(
+        ".el-table__body tbody .el-table__row"
+      );
+      let scrollTop = 0;
+      for (let i = 0; i < theTableRows.length; i++) {
+        if (i === rowIndex) {
+          break;
+        }
+        scrollTop += theTableRows[i].offsetHeight;
+      }
+      tableElement.bodyWrapper.scrollTop = scrollTop;
+    },
+    searchup(data, index) {
+      this.$nextTick(() => {
+        if (index == 0) {
+          index = 1
+        }
+        const targetTop = this.$refs["tableData"].$el.querySelectorAll('.el-table__body tr')[index - 1].getBoundingClientRect().top
+        const containerTop = this.$refs["tableData"].$el.querySelector('.el-table__body').getBoundingClientRect().top
+        const scrollParent = this.$refs["tableData"].$el.querySelector('.el-table__body-wrapper')
+        scrollParent.scrollTop = targetTop - containerTop
+      })
+    },
+    expandParents(node) {
+      node.expanded = true;
+      if (node.parent) {
+        this.expandParents(node.parent);
+      }
+    },
     getTreeName(list, id) {
       for (let i = 0; i < list.length; i++) {
         if (list[i].criticalFollowValueTypeId === id) {
@@ -344,8 +551,10 @@ export default {
       criticalFollowValueType().then((res) => {
         if (res.code != -1) {
           this.criticalFollowValueTypeId = res.data;
-          this.criticalFollowValueTypeId = this.formatData(this.criticalFollowValueTypeId);
-          console.log(this.criticalFollowValueTypeId)
+          this.criticalFollowValueTypeId = this.formatData(
+            this.criticalFollowValueTypeId
+          );
+          console.log(this.criticalFollowValueTypeId);
         }
       });
     },
@@ -361,53 +570,14 @@ export default {
     },
     onchange(v) {
       if (v.length > 1) {
-        this.form.criticalFollowValueTypeId = this.form.criticalFollowValueTypeId.slice(-1)[0];
+        this.form.criticalFollowValueTypeId =
+          this.form.criticalFollowValueTypeId.slice(-1)[0];
       } else {
-        this.form.criticalFollowValueTypeId = this.form.criticalFollowValueTypeId[0];
+        this.form.criticalFollowValueTypeId =
+          this.form.criticalFollowValueTypeId[0];
       }
       this.$refs.criticalFollowValueTypeId.toggleDropDownVisible();
     },
-    createFilter(queryString) {
-      return (tableData) => {
-        return (
-          tableData.displayName
-            .toLowerCase()
-            .indexOf(queryString.toLowerCase()) != -1
-        );
-      };
-    },
-    handleSelect(item) {
-      this.page.Filter = item.displayName;
-      this.item = item;
-      this.formid = item.id;
-      //console.log(item);
-      //    quersmedicalid(item.id).then((res) => {
-      //   console.log(res);
-      //   this.form = res.data;
-      // });
-    },
-    querySearch(queryString, cb) {
-      var tableData = this.tableData;
-      var tableDatas = queryString
-        ? tableData.filter(this.createFilter(queryString))
-        : tableData;
-      // 调用 callback 返回建议列表的数据
-      cb(tableDatas);
-    },
-
-    isselctvalue(v) {
-      this.form.medicalConclusionTypeId = v;
-      this.pages.TypeId = v;
-      this.getlist();
-    },
-    getmedicalconclusionlist() {
-      medicalconclusionlist().then((res) => {
-        if(res.code!=-1){
-          this.Selectacategory = res.data;
-        }
-      });
-    },
-    // this.medicalconclusionlist()
     //删除
     delsrts() {
       this.form = { ...this.curRow };
@@ -418,17 +588,17 @@ export default {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
-          cancelButtonClass:"difference",
-        confirmButtonClass:"commonbutton"
+          cancelButtonClass: "difference",
+          confirmButtonClass: "commonbutton",
         })
           .then(() => {
-            postapi("/api/app/CriticalFollowValue/Delete",{
-                criticalFollowValueId:this.form.id
+            postapi("/api/app/CriticalFollowValue/Delete", {
+              criticalFollowValueId: this.form.id,
             }).then((res) => {
-              if(res.code!=-1){
+              if (res.code != -1) {
                 //this.$message.success('删除成功')
-              this.getlist();
-              this.curRow=this.$options.data().curRow
+                this.treeclick();
+                this.curRow = this.$options.data().curRow;
               }
             });
           })
@@ -439,7 +609,7 @@ export default {
     cancellation() {
       this.$message.info("取消操作");
       this.isshow = true;
-      this.getlist();
+      this.treeclick();
     },
 
     assertiona() {
@@ -453,16 +623,18 @@ export default {
         // const currentDisplayOrder = this.tableData.length -1
         // const currentDisplayOrder = this.initTableData[index].displayOrder;
         // if (item.displayOrder != currentDisplayOrder) {
-          // 如果它的displayOrder和它当前所在的位置不同代表挪动过位置
-          // result.push({ id: item.id, displayOrder: currentDisplayOrder });
+        // 如果它的displayOrder和它当前所在的位置不同代表挪动过位置
+        // result.push({ id: item.id, displayOrder: currentDisplayOrder });
         // }
-        result.push({ id: item.id, displayOrder: index+1 });
+        result.push({ id: item.id, displayOrder: index + 1 });
       });
-      postapi("/api/app/CriticalFollowValue/UpdateSortMany",{ itemList: result }).then((res) => {
-        if(res.code!=-1){
+      postapi("/api/app/CriticalFollowValue/UpdateSortMany", {
+        itemList: result,
+      }).then((res) => {
+        if (res.code != -1) {
           this.isshow = true;
-        this.getlist();
-        //this.$message.success('操作成功')
+          this.treeclick();
+          //this.$message.success('操作成功')
         }
       });
     },
@@ -476,7 +648,7 @@ export default {
           animation: 300,
           onChoose({ oldIndex }) {
             _this.$refs["tableData"].setCurrentRow(_this.tableData[oldIndex]);
-            _this.rowclick(_this.tableData[oldIndex],false);
+            _this.rowclick(_this.tableData[oldIndex], false);
           },
           onEnd({ newIndex, oldIndex }) {
             _this.isshow = false;
@@ -499,13 +671,13 @@ export default {
       if (this.form.id == undefined) {
         this.$message.error("请点击选择操作的数据");
       } else {
-        postapi("/api/app/CriticalFollowValue/UpdateManySort",{
-            criticalFollowValueId:this.form.id,
-            sortType:2
+        postapi("/api/app/CriticalFollowValue/UpdateManySort", {
+          criticalFollowValueId: this.form.id,
+          sortType: 2,
         }).then((res) => {
-          if(res.code!=-1){
-            this.getlist();
-          //this.$message.success('操作成功')
+          if (res.code != -1) {
+            this.treeclick();
+            //this.$message.success('操作成功')
           }
         });
       }
@@ -516,13 +688,13 @@ export default {
       if (this.form.id == undefined) {
         this.$message.error("请点击选择操作的数据");
       } else {
-        postapi("/api/app/CriticalFollowValue/UpdateManySort",{
-            criticalFollowValueId:this.form.id, 
-            sortType:1
+        postapi("/api/app/CriticalFollowValue/UpdateManySort", {
+          criticalFollowValueId: this.form.id,
+          sortType: 1,
         }).then((res) => {
-          if(res.code!=-1){
-            this.getlist();
-          //this.$message.success('操作成功')
+          if (res.code != -1) {
+            this.treeclick();
+            //this.$message.success('操作成功')
           }
         });
       }
@@ -541,12 +713,6 @@ export default {
         this.$nextTick(() => {
           this.$refs.refinput.focus();
         });
-        medicalconclusionlist().then((res) => {
-          if(res.code!=-1){
-            this.ars = res.data;
-          this.selars = this.form.medicalConclusionTypeId;
-          }
-        });
       }
     },
     //点击列表通过id查询
@@ -568,29 +734,29 @@ export default {
         this.$message.warning("危急随访值标志");
       } else {
         if (this.title == 1) {
-          postapi("/api/app/CriticalFollowValue/Create",{
+          postapi("/api/app/CriticalFollowValue/Create", {
             displayName: this.form.displayName,
             criticalFollowValueTypeId: this.form.criticalFollowValueTypeId,
-            criticalFollowValueFlag: this.form.criticalFollowValueFlag
+            criticalFollowValueFlag: this.form.criticalFollowValueFlag,
           }).then((res) => {
-            if(res.code!=-1){
-              this.getlist();
-            this.dialogVisible = false;
-            //this.$message.success('新增成功')
+            if (res.code != -1) {
+              this.treeclick();
+              this.dialogVisible = false;
+              //this.$message.success('新增成功')
             }
           });
         } else if (this.title == 2) {
           //diagnosticediting updateconlus
           postapi("/api/app/CriticalFollowValue/Update", {
-            criticalFollowValueId:this.form.id,
+            criticalFollowValueId: this.form.id,
             displayName: this.form.displayName,
             criticalFollowValueTypeId: this.form.criticalFollowValueTypeId,
-            criticalFollowValueFlag: this.form.criticalFollowValueFlag
+            criticalFollowValueFlag: this.form.criticalFollowValueFlag,
           }).then((res) => {
-            if(res.code!=-1){
-              this.getlist();
-            this.dialogVisible = false;
-            //this.$message.success('修改成功')
+            if (res.code != -1) {
+              this.treeclick();
+              this.dialogVisible = false;
+              //this.$message.success('修改成功')
             }
           });
         }
@@ -598,21 +764,20 @@ export default {
     },
     //新增弹框
     add() {
+      if (this.criticalFollowTypeId == undefined || this.criticalFollowTypeId == "") {
+        this.$message.warning("请选择危急类别");
+      } else {
       this.title = 1;
       this.dialogVisible = true;
       if (this.$refs.form !== undefined) {
-          this.$refs.form.resetFields();
-        }
-      this.form=this.$options.data().form
-      this.selars = "";
+        this.$refs.form.resetFields();
+      }
+      this.form = this.$options.data().form;
+      this.form.criticalFollowValueTypeId = this.criticalFollowTypeId;
       this.$nextTick(() => {
         this.$refs.refinput.focus();
       });
-      medicalconclusionlist().then((res) => {
-        if(res.code!=-1){
-          this.ars = res.data;
-        }
-      });
+      }
     },
     getlist() {
       // conclusionacquisition(this.pages).then((res) => {
@@ -625,24 +790,12 @@ export default {
     },
     getlistM(rowsid) {
       postapi("/api/app/CriticalFollowValue/GetList").then((res) => {
-        if(res.code!=-1){
+        if (res.code != -1) {
           this.initTableData = [...res.data];
-        this.tableData = res.data;
-        if (rowsid != null && rowsid != "") {
-          var row = this.tableData.filter((item) => item.id == rowsid);
-          this.$refs.tableData.setCurrentRow(row[0]);
-          quersmedicalid(rowsid).then((res) => {
-            this.form = res.data;
-          });
-        }
+          this.quckDepartment = res.data;
         }
       });
     },
-    selsearch(id, typeid) {
-      this.Selectvalue = typeid;
-      this.pages.TypeId = typeid;
-      this.getlistM(id);
-    },
   },
 };
 </script>
diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue
index d2f4462..68a312c 100644
--- a/src/views/fee-settings/Item.vue
+++ b/src/views/fee-settings/Item.vue
@@ -7,7 +7,7 @@
           <span class="contenttitleBold">项目设置</span>
         </div>
         <div class="seachinput">
-          <el-select v-model="department" placeholder="请选择项目类别" filterable :filter-method="remoteMethodes"
+          <el-select v-model="department" placeholder="请选择项目" filterable :filter-method="remoteMethodes"
             default-first-option @change="quckDepartments" clearable size="small">
             <el-option v-for="item in quckDepartment" :key="item.id" :label="item.displayName" :value="item.id">
             </el-option>