From a6cb3761c314c445d71f6ac31ffffcac7024a4a7 Mon Sep 17 00:00:00 2001
From: mch <1332099529@qq.com>
Date: Mon, 25 Sep 2023 18:08:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   | 39 ++++++---
 src/views/basic-dictionary/CommonChar.vue     | 68 ++++++++++-----
 src/views/basic-dictionary/CommonCharType.vue |  2 +-
 .../basic-dictionary/CustomerOrgType.vue      | 48 ++++++++---
 src/views/basic-dictionary/DiagnosisLevel.vue |  2 +-
 src/views/basic-dictionary/GuideType.vue      | 20 ++++-
 .../basic-dictionary/ItemDefaultResult.vue    |  2 +-
 .../basic-dictionary/SampleContainer.vue      | 50 ++++++++---
 src/views/common-settings/ItemType.vue        | 44 ++++++++--
 src/views/fee-settings/InvoiceItemType.vue    |  2 +-
 src/views/fee-settings/Item.vue               | 83 ++++++++++++-------
 src/views/fee-settings/PayMode.vue            |  2 +-
 src/views/fee-settings/cardRegister.vue       |  4 +-
 src/views/fee-settings/cardType.vue           |  2 +-
 14 files changed, 269 insertions(+), 99 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 5bc2b30..7b56d5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,17 +9,34 @@
 </template>
 
 <style lang="scss">
-.bulletcommit{
-  background: rgb(203, 236, 226)!important;
-  color: rgb(65,137,104)!important;
-  border: 1px solid rgb(65,137,104)!important;
+
+
+.el-dialog {
+  // position: fixed;
+  // z-index: 1;
+  // top: 0;
+  // left: 0;
+  // background-color: #fff !important;
+  // z-index: 999;
+  // opacity: 0.5;
+  // background-color: transparent
+}
+.el-dialog__wrapper {
+  // background: rgb(235, 235, 235);
+  // opacity: 0.3;
+  // z-index: 99;
+}
+.bulletcommit {
+  background: rgb(203, 236, 226) !important;
+  color: rgb(65, 137, 104) !important;
+  border: 1px solid rgb(65, 137, 104) !important;
 }
- .el-dialog__title{
-   color:rgb(31, 148, 96)!important;
-   font-weight: 500;
+.el-dialog__title {
+  color: rgb(31, 148, 96) !important;
+  font-weight: 500;
 }
-.bullettitle{
-  color:rgb(31, 148, 96)
+.bullettitle {
+  color: rgb(31, 148, 96);
 }
 .elcard {
   border-radius: 15px;
@@ -29,9 +46,9 @@
 .commonbutton {
   width: 100px;
   // color: #349d2f !important;
-  color: rgb(65 , 137 , 104)!important;
+  color: rgb(65, 137, 104) !important;
   // color: #fff;
-  font-weight: 700!important;
+  font-weight: 700 !important;
   height: 35px;
 }
 .publiccss {
diff --git a/src/views/basic-dictionary/CommonChar.vue b/src/views/basic-dictionary/CommonChar.vue
index b210ea0..d9593ef 100644
--- a/src/views/basic-dictionary/CommonChar.vue
+++ b/src/views/basic-dictionary/CommonChar.vue
@@ -12,14 +12,21 @@
             ></el-input>
           </el-col>
           <el-col :span="4">
-            <el-button type="" style="margin-left: 5%;background:rgb(203,240,209);color:rgb(31, 148, 96)" @click="getlist"
+            <el-button
+              type=""
+              style="
+                margin-left: 5%;
+                background: rgb(203, 240, 209);
+                color: rgb(31, 148, 96);
+              "
+              @click="getlist"
               >查询</el-button
             >
           </el-col>
         </el-row>
         <el-table
           :data="tableData"
-          style="width: 100%; height: 500px;margin-top:20px"
+          style="width: 100%; height: 500px; margin-top: 20px"
           row-key="id"
           class="el-table__body-wrapper tbody"
           @row-click="rowick"
@@ -52,12 +59,17 @@
             <template>
               <el-tag
                 class="move"
-                style="cursor: move; margin-left: 15px;background-color: rgb(245, 245, 245);border:none"
+                style="
+                  cursor: move;
+                  margin-left: 15px;
+                  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)"
+                  style="width: 1rem; height: 1rem; color: rgb(113, 113, 113)"
                 ></i>
               </el-tag>
             </template>
@@ -68,7 +80,7 @@
           :title="title == 1 ? '新增' : '编辑'"
           :visible.sync="dialogVisible"
           width="75%"
-             :close-on-click-modal="false"
+          :close-on-click-modal="false"
         >
           <el-form ref="form" :model="form" label-width="80px">
             <el-row>
@@ -143,7 +155,9 @@
           </el-form>
           <span slot="footer" class="dialog-footer">
             <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="addoredit">确 定</el-button>
+            <el-button type="primary" @click="addoredit" class="bulletcommit"
+              >确 定</el-button
+            >
           </span>
         </el-dialog>
       </el-card>
@@ -159,20 +173,34 @@
         >编辑</el-button
       >
       <div style="margin-top: 10px">
-        <el-button type="" @click="delsrts"  class="commonbutton">删除</el-button>
+        <el-button type="" @click="delsrts" class="commonbutton"
+          >删除</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="" @click="topping" class="commonbutton">置顶</el-button>
+        <el-button type="" @click="topping" class="commonbutton"
+          >置顶</el-button
+        >
         <div style="margin-top: 10px">
-          <el-button type="" @click="toppings" class="commonbutton">置底</el-button>
+          <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
+            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
+            type=""
+            :disabled="isshow"
+            @click="cancellation"
+            class="commonbutton"
             >取消</el-button
           >
         </div>
@@ -212,7 +240,7 @@ export default {
       title: 1,
       dialogVisible: false,
       isshow: true,
-      curRow:{},
+      curRow: {},
     };
   },
   created() {
@@ -224,7 +252,7 @@ export default {
   methods: {
     //删除
     delsrts() {
-      this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择删除的数据");
       } else {
@@ -303,7 +331,7 @@ export default {
     },
     //置低
     toppings() {
-       this.form={...this.curRow}
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请点击选择操作的数据");
       } else {
@@ -315,7 +343,7 @@ export default {
     },
     //置顶
     topping() {
-       this.form={...this.curRow}
+      this.form = { ...this.curRow };
       console.log(this.form.id);
       if (this.form.id == undefined) {
         this.$message.warning("请点击选择操作的数据");
@@ -328,7 +356,7 @@ export default {
     },
     //编辑弹框
     editpopup() {
-       this.form={...this.curRow}
+      this.form = { ...this.curRow };
       console.log(this.form.id);
       if (this.form.id == undefined) {
         this.$message.success("请点击选择操作的数据");
@@ -380,9 +408,9 @@ export default {
       this.title = 1;
       this.dialogVisible = true;
       this.form = {};
-      this.$nextTick(()=>{
-        this.$refs.refinput.focus()
-      })
+      this.$nextTick(() => {
+        this.$refs.refinput.focus();
+      });
       categorytype(this.pages).then((res) => {
         this.ars = res.data.items;
         console.log(res);
@@ -398,7 +426,7 @@ export default {
     //点击列表通过id查询
     rowick(row) {
       commonid(row.id).then((res) => {
-        this.curRow={...res.data}
+        this.curRow = { ...res.data };
         // console.log(res);
         // this.form = res.data;
       });
diff --git a/src/views/basic-dictionary/CommonCharType.vue b/src/views/basic-dictionary/CommonCharType.vue
index db607d2..2c23e72 100644
--- a/src/views/basic-dictionary/CommonCharType.vue
+++ b/src/views/basic-dictionary/CommonCharType.vue
@@ -131,7 +131,7 @@
           </el-form>
           <span slot="footer" class="dialog-footer">
             <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="addoredit">确 定</el-button>
+            <el-button type="primary" @click="addoredit" class="bulletcommit">确 定</el-button>
           </span>
         </el-dialog>
       </el-card>
diff --git a/src/views/basic-dictionary/CustomerOrgType.vue b/src/views/basic-dictionary/CustomerOrgType.vue
index afe570a..52038c5 100644
--- a/src/views/basic-dictionary/CustomerOrgType.vue
+++ b/src/views/basic-dictionary/CustomerOrgType.vue
@@ -12,14 +12,21 @@
             ></el-input>
           </el-col>
           <el-col :span="4">
-            <el-button type="" style="margin-left: 5%;background:rgb(203,240,209);color:rgb(31, 148, 96)" @click="getlist"
+            <el-button
+              type=""
+              style="
+                margin-left: 5%;
+                background: rgb(203, 240, 209);
+                color: rgb(31, 148, 96);
+              "
+              @click="getlist"
               >查询</el-button
             >
           </el-col>
         </el-row>
         <el-table
           :data="tableData"
-          style="width: 100%; height: 500px;margin-top:20px"
+          style="width: 100%; height: 500px; margin-top: 20px"
           row-key="id"
           class="el-table__body-wrapper tbody"
           @row-click="rowick"
@@ -52,12 +59,17 @@
             <template>
               <el-tag
                 class="move"
-                style="cursor: move; margin-left: 15px;background-color: rgb(245, 245, 245);border:none"
+                style="
+                  cursor: move;
+                  margin-left: 15px;
+                  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)"
+                  style="width: 1rem; height: 1rem; color: rgb(113, 113, 113)"
                 ></i>
               </el-tag>
             </template>
@@ -133,7 +145,9 @@
           </el-form>
           <span slot="footer" class="dialog-footer">
             <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="addoredit">确 定</el-button>
+            <el-button type="primary" @click="addoredit" class="bulletcommit"
+              >确 定</el-button
+            >
           </span>
         </el-dialog>
       </el-card>
@@ -149,21 +163,35 @@
         >编辑</el-button
       >
       <div style="margin-top: 10px">
-        <el-button type="" @click="delsrts" class="commonbutton">删除</el-button>
+        <el-button type="" @click="delsrts" class="commonbutton"
+          >删除</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="" @click="topping" class="commonbutton">置顶</el-button>
+        <el-button type="" @click="topping" class="commonbutton"
+          >置顶</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="" @click="toppings" class="commonbutton">置底</el-button>
+        <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
+          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
+          type=""
+          :disabled="isshow"
+          @click="cancellation"
+          class="commonbutton"
           >取消</el-button
         >
       </div>
diff --git a/src/views/basic-dictionary/DiagnosisLevel.vue b/src/views/basic-dictionary/DiagnosisLevel.vue
index 4e6ed19..4224ff1 100644
--- a/src/views/basic-dictionary/DiagnosisLevel.vue
+++ b/src/views/basic-dictionary/DiagnosisLevel.vue
@@ -133,7 +133,7 @@
           </el-form>
           <span slot="footer" class="dialog-footer">
             <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="addoredit">确 定</el-button>
+            <el-button type="primary" @click="addoredit" class="bulletcommit">确 定</el-button>
           </span>
         </el-dialog>
       </el-card>
diff --git a/src/views/basic-dictionary/GuideType.vue b/src/views/basic-dictionary/GuideType.vue
index 1bf6822..9f36f73 100644
--- a/src/views/basic-dictionary/GuideType.vue
+++ b/src/views/basic-dictionary/GuideType.vue
@@ -14,7 +14,12 @@
           <el-col :span="4">
             <el-button
               type=""
-              style="margin-left: 5%;background:rgb(203,240,209);color:rgb(31, 148, 96);z-index:99"
+              style="
+                margin-left: 5%;
+                background: rgb(203, 240, 209);
+                color: rgb(31, 148, 96);
+                z-index: 99;
+              "
               @click="getlists"
               >查询</el-button
             >
@@ -112,13 +117,18 @@
             > -->
                 <el-tag
                   class="move"
-                  style="cursor: move; margin-left: 15px;background-color: rgb(245, 245, 245);border:none"
+                  style="
+                    cursor: move;
+                    margin-left: 15px;
+                    background-color: rgb(245, 245, 245);
+                    border: none;
+                  "
                   @dragstart="handleEdit(scope.row)"
                   draggable="true"
                 >
                   <i
                     class="el-icon-d-caret"
-                    style="width: 1rem; height: 1rem;color: rgb(113, 113, 113);"
+                    style="width: 1rem; height: 1rem; color: rgb(113, 113, 113)"
                   ></i>
                 </el-tag>
                 <!-- <i
@@ -234,7 +244,9 @@
           </el-form>
           <span slot="footer" class="dialog-footer">
             <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="addoredit" class="bulletcommit">确 定</el-button>
+            <el-button type="primary" @click="addoredit" class="bulletcommit"
+              >确 定</el-button
+            >
           </span>
         </el-dialog>
         <!-- 查看详情弹框 -->
diff --git a/src/views/basic-dictionary/ItemDefaultResult.vue b/src/views/basic-dictionary/ItemDefaultResult.vue
index 59c7449..98cc519 100644
--- a/src/views/basic-dictionary/ItemDefaultResult.vue
+++ b/src/views/basic-dictionary/ItemDefaultResult.vue
@@ -123,7 +123,7 @@
           </el-form>
           <span slot="footer" class="dialog-footer">
             <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="addoredit">确 定</el-button>
+            <el-button type="primary" @click="addoredit" class="bulletcommit">确 定</el-button>
           </span>
         </el-dialog>
       </el-card>
diff --git a/src/views/basic-dictionary/SampleContainer.vue b/src/views/basic-dictionary/SampleContainer.vue
index 1b6d966..f79b839 100644
--- a/src/views/basic-dictionary/SampleContainer.vue
+++ b/src/views/basic-dictionary/SampleContainer.vue
@@ -12,14 +12,21 @@
             ></el-input>
           </el-col>
           <el-col :span="4">
-            <el-button type="" style="margin-left: 5%;background:rgb(203,240,209);color:rgb(31, 148, 96)" @click="getlist"
+            <el-button
+              type=""
+              style="
+                margin-left: 5%;
+                background: rgb(203, 240, 209);
+                color: rgb(31, 148, 96);
+              "
+              @click="getlist"
               >查询</el-button
             >
           </el-col>
         </el-row>
         <el-table
           :data="tableData"
-          style="width: 100%; height: 500px;margin-top:20px"
+          style="width: 100%; height: 500px; margin-top: 20px"
           row-key="id"
           class="el-table__body-wrapper tbody"
           @row-click="rowick"
@@ -53,12 +60,17 @@
             <template>
               <el-tag
                 class="move"
-                style="cursor: move; margin-left: 15px;background-color: rgb(245, 245, 245);border:none"
+                style="
+                  cursor: move;
+                  margin-left: 15px;
+                  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)"
+                  style="width: 1rem; height: 1rem; color: rgb(113, 113, 113)"
                 ></i>
               </el-tag>
             </template>
@@ -155,7 +167,9 @@
           </el-form>
           <span slot="footer" class="dialog-footer">
             <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="addoredit">确 定</el-button>
+            <el-button type="primary" @click="addoredit" class="bulletcommit"
+              >确 定</el-button
+            >
           </span>
         </el-dialog>
       </el-card>
@@ -166,27 +180,41 @@
       <el-button
         type=""
         @click="editpopup"
-         class="commonbutton"
+        class="commonbutton"
         style="margin-left: 0; margin-top: 10px"
         >编辑</el-button
       >
       <div>
         <div style="margin-top: 10px">
-          <el-button type="" @click="delsrts"   class="commonbutton">删除</el-button>
+          <el-button type="" @click="delsrts" class="commonbutton"
+            >删除</el-button
+          >
         </div>
         <div style="margin-top: 10px">
-          <el-button type="" @click="topping" class="commonbutton">置顶</el-button>
+          <el-button type="" @click="topping" class="commonbutton"
+            >置顶</el-button
+          >
         </div>
         <div style="margin-top: 10px">
-          <el-button type="" @click="toppings" class="commonbutton">置底</el-button>
+          <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
+            type=""
+            :disabled="isshow"
+            @click="assertion"
+            class="commonbutton"
             >排序</el-button
           >
         </div>
         <div style="margin-top: 5px">
-          <el-button type="" :disabled="isshow" @click="cancellation" class="commonbutton"
+          <el-button
+            type=""
+            :disabled="isshow"
+            @click="cancellation"
+            class="commonbutton"
             >取消</el-button
           >
         </div>
diff --git a/src/views/common-settings/ItemType.vue b/src/views/common-settings/ItemType.vue
index 5c76566..3b24fbc 100644
--- a/src/views/common-settings/ItemType.vue
+++ b/src/views/common-settings/ItemType.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="box">
     <div style="width: 95%">
-      <el-card style="height: 600px;border-radius: 15px" class="elcard">
+      <el-card style="height: 600px; border-radius: 15px" class="elcard">
         <div class="allC">
           <i
             class="el-icon-link"
@@ -14,6 +14,11 @@
           >
             <i class="el-icon-link" @click="append"></i><span> 项目类别</span>
           </div>
+          <div style="margin-top: 20px">
+            <el-button type="" @click="addll" class="commonbutton"
+              >新增同集</el-button
+            >
+          </div>
           <el-tree
             :default-expand-all="true"
             :expand-on-click-node="false"
@@ -32,7 +37,7 @@
                   size="mini"
                   style="padding: 5px; font-size: 15px; margin-left: 10%"
                   @click="append(node, data)"
-                  >新增</el-button
+                  >新增子集</el-button
                 >
                 <el-button
                   type="danger"
@@ -64,9 +69,20 @@
           width="40%"
           :close-on-click-modal="false"
         >
+          <span>上级部门</span>
           <el-cascader
+            ref="depref"
+            @change="cascaderchang"
+            :show-all-levels="false"
+            v-model="departmentname"
+            style="margin-left: 10px"
             :options="itemtypedata"
-            :props="{ checkStrictly: true, value: 'id', label: 'displayName' }"
+            :props="{
+              checkStrictly: true,
+              children: 'treeChildren',
+              label: 'displayName',
+              value: 'displayName',
+            }"
             clearable
           ></el-cascader>
           <el-form
@@ -181,6 +197,7 @@ import { getapi } from "@/api/api";
 export default {
   data() {
     return {
+      departmentname: "",
       itemtypedata: [],
       rules: {
         displayName: [
@@ -272,8 +289,14 @@ export default {
     },
   },
   methods: {
+    cascaderchang(v) {
+      console.log(this.departmentname);
+      this.departmentname = v[v.length - 1];
+    },
     //编辑弹框
     rena(node, data) {
+      let a = this.$refs.tree.getNode(data.id).parent.data.displayName;
+      this.departmentname=a
       this.title = 2;
       this.dialogVisible = true;
       basicsetings().then((res) => {
@@ -287,10 +310,17 @@ export default {
         this.form = res.data;
         console.log(res);
       });
-      getapi(`/api/app/item/in-item-type/${data.id}`).then((res) => {
-        this.itemtypedata = res.data;
-        console.log(res, "222222222222222222");
-      });
+      // getapi(`/api/app/item/in-item-type/${data.id}`).then((res) => {
+      //   this.itemtypedata = res.data;
+      //   console.log(res, "222222222222222222");
+      // });
+      //获取项目类别数据结构数据
+      getapi(`/api/app/itemtype/getbycodeparent?ItemTypeId=${data.id}`).then(
+        (res) => {
+          this.itemtypedata = res.data;
+          console.log(res, "qqwqqqqqqqqqqqqqqqqq");
+        }
+      );
     },
     // 删除
     deleates(node, data) {
diff --git a/src/views/fee-settings/InvoiceItemType.vue b/src/views/fee-settings/InvoiceItemType.vue
index fc3ca0d..86a14ba 100644
--- a/src/views/fee-settings/InvoiceItemType.vue
+++ b/src/views/fee-settings/InvoiceItemType.vue
@@ -125,7 +125,7 @@
           </el-form>
           <span slot="footer" class="dialog-footer">
             <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="addoredit">确 定</el-button>
+            <el-button type="primary" @click="addoredit" class="bulletcommit">确 定</el-button>
           </span>
         </el-dialog>
       </el-card>
diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue
index e167c10..08da6d2 100644
--- a/src/views/fee-settings/Item.vue
+++ b/src/views/fee-settings/Item.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="box">
     <div style="width: 90%">
-      <el-card style="height: 600px; width: 105%;border-radius: 15px" class="elcard">
+      <el-card
+        style="height: 600px; width: 105%; border-radius: 15px"
+        class="elcard"
+      >
         <div class="publiccss">项目设置</div>
         <el-row style="margin-top: 20px; margin-left: 15px">
           <el-col :span="4">
@@ -50,7 +53,7 @@
               @node-click="treeclick"
             ></el-tree>
           </div>
-          <div style="width: 85%;margin-top:15px">
+          <div style="width: 85%; margin-top: 15px">
             <el-table
               :data="tableData"
               style="width: 100%"
@@ -91,12 +94,21 @@
                 <template>
                   <el-tag
                     class="move"
-                    style="cursor: move; margin-left: 15px;background-color: rgb(245, 245, 245);border:none"
+                    style="
+                      cursor: move;
+                      margin-left: 15px;
+                      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)"
+                      style="
+                        width: 1rem;
+                        height: 1rem;
+                        color: rgb(113, 113, 113);
+                      "
                     ></i>
                   </el-tag>
                 </template>
@@ -133,17 +145,17 @@
                 :show-all-levels="false"
               >
               </el-cascader> -->
-                <el-cascader
-    v-model="form.itemTypeId"
-    :options="itemTypeId"
-     @change="onchange"
-     :props="{
-            value: 'id',
-            label: 'displayName',
-            children: 'treeChildren',
-            checkStrictly: true,
-          }"
-  ></el-cascader>
+              <el-cascader
+                v-model="form.itemTypeId"
+                :options="itemTypeId"
+                @change="onchange"
+                :props="{
+                  value: 'id',
+                  label: 'displayName',
+                  children: 'treeChildren',
+                  checkStrictly: true,
+                }"
+              ></el-cascader>
               <!-- <el-select
                 v-model="form.itemTypeId"
                 placeholder="请选择"
@@ -323,7 +335,9 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="项目结果模板" prop="resultTemplateTypeFlag">
-              <el-input v-model="form.resultTemplateTypeFlag">resulttemp</el-input>
+              <el-input v-model="form.resultTemplateTypeFlag"
+                >resulttemp</el-input
+              >
               <!-- 
               <el-select
                 v-model="form.resultTemplateTypeFlag"
@@ -415,21 +429,35 @@
         >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="" @click="delsrts" class="commonbutton">删除</el-button>
+        <el-button type="" @click="delsrts" class="commonbutton"
+          >删除</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="" @click="topping" class="commonbutton">置顶</el-button>
+        <el-button type="" @click="topping" class="commonbutton"
+          >置顶</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="" @click="toppings" class="commonbutton">置底</el-button>
+        <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
+          type=""
+          :disabled="isshow"
+          @click="assertion"
+          class="commonbutton"
           >排序</el-button
         >
       </div>
       <div style="margin-top: 5px">
-        <el-button type="" :disabled="isshow" @click="cancellation" class="commonbutton"
+        <el-button
+          type=""
+          :disabled="isshow"
+          @click="cancellation"
+          class="commonbutton"
           >取消</el-button
         >
       </div>
@@ -438,7 +466,7 @@
           type=""
           size=""
           @click="resulttemplate"
-          style="height: 35px;"
+          style="height: 35px"
           class="commonbutton"
           >结果模板</el-button
         >
@@ -448,8 +476,8 @@
           type=""
           size="mini"
           @click="referencerange"
-           class="commonbutton"
-          style="width: 100px; "
+          class="commonbutton"
+          style="width: 100px"
           >参考范围</el-button
         >
       </div>
@@ -1523,12 +1551,11 @@ export default {
     //获取项目类别列表
     getmedicalconclusionlist() {
       getapi("/api/app/item-type").then((res) => {
-    
         this.Selectacategory = res.data.items;
-        console.log(res,'11');
+        console.log(res, "11");
       });
     },
-     onchange(id) {
+    onchange(id) {
       // this.form.customerOrgId = id;
       // console.log(id);
       // this.form.customerOrgId=this.form.customerOrgId[0]
@@ -1538,7 +1565,7 @@ export default {
       });
       console.log(this.form.customerOrgId);
     },
-      gettypelist(listdata) {
+    gettypelist(listdata) {
       listdata.forEach((items) => {
         if (items.treeChildren.length > 0) {
           this.gettypelist(items.treeChildren);
diff --git a/src/views/fee-settings/PayMode.vue b/src/views/fee-settings/PayMode.vue
index 3e68a06..0a38178 100644
--- a/src/views/fee-settings/PayMode.vue
+++ b/src/views/fee-settings/PayMode.vue
@@ -56,7 +56,7 @@
           </el-form>
           <span slot="footer" class="dialog-footer">
             <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="addoredit">确 定</el-button>
+            <el-button type="primary" @click="addoredit" class="bulletcommit">确 定</el-button>
           </span>
         </el-dialog>
       </el-card>
diff --git a/src/views/fee-settings/cardRegister.vue b/src/views/fee-settings/cardRegister.vue
index 05e4d63..3605e68 100644
--- a/src/views/fee-settings/cardRegister.vue
+++ b/src/views/fee-settings/cardRegister.vue
@@ -247,7 +247,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="onSubmit('form')">确定</el-button>
+        <el-button type="primary" @click="onSubmit('form')" class="bulletcommit">确定</el-button>
         <el-button @click="dialogVisible = false">关闭</el-button>
       </div>
     </el-dialog>
@@ -272,7 +272,7 @@
         </el-col>        
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="orderSubmit('order')">确定</el-button>
+        <el-button type="primary" @click="orderSubmit('order')" class="bulletcommit">确定</el-button>
         <el-button @click="dialogOrder = false">关闭</el-button>
       </div>
     </el-dialog>
diff --git a/src/views/fee-settings/cardType.vue b/src/views/fee-settings/cardType.vue
index aeedbf4..75097f0 100644
--- a/src/views/fee-settings/cardType.vue
+++ b/src/views/fee-settings/cardType.vue
@@ -176,7 +176,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="onSubmit('form')">确定</el-button>
+        <el-button type="primary" @click="onSubmit('form')" class="bulletcommit">确定</el-button>
         <el-button @click="dialogVisible = false">关闭</el-button>
       </div>
     </el-dialog>