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

src/views/fee-settings/ItemResultMatch.vue

@@ -1,14 +1,15 @@
 <template>
   <div class="box">
     <div style="width: 150%">
-      <el-card>
+      <el-card class="elcard" style="border-radius: 15px">
         <div class="publiccss">项目结果匹配</div>
         <el-table
           :data="tableData"
-          style="width: 100%;margin-top:20px"
+          style="width: 100%; margin-top: 20px"
           row-key="id"
           class="el-table__body-wrapper tbody"
           @row-click="rowclick"
+          height="500"
           highlight-current-row
         >
           <el-table-column prop="id" label="编号" width="300">
@@ -114,29 +115,34 @@
     </div>
     <!-- 按钮区域 -->
     <div style="margin-left: 10px; margin-top: 5%">
-      <el-button type="primary" @click="add">新增</el-button>
+      <el-button type="" @click="add" class="commonbutton"
+        >新增</el-button
+      >
       <el-button
-        type="primary"
+        type=""
         @click="editpopup"
         style="margin-left: 0; margin-top: 10px"
+        class="commonbutton"
         >编辑</el-button
       >
       <div style="margin-top: 10px">
-        <el-button type="danger" @click="delets">删除</el-button>
+        <el-button type="" @click="delets" class="commonbutton"
+          >删除</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="topping">置顶</el-button>
+        <el-button type="" @click="topping" class="commonbutton">置顶</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="toppings">置底</el-button>
+        <el-button type="" @click="toppings" class="commonbutton">置底</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" :disabled="isshow" @click="assertion"
+        <el-button type="" :disabled="isshow" @click="assertion" class="commonbutton"
           >排序</el-button
         >
       </div>
-      <div style="margin-top: 5px">
-        <el-button type="primary" :disabled="isshow" @click="cancellation"
+      <div style="margin-top: 10px">
+        <el-button type="" :disabled="isshow" @click="cancellation" class="commonbutton"
           >取消</el-button
         >
       </div>
@@ -416,6 +422,11 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-table__header th {
+  /* font-size: px; */
+  background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
+  color: rgb(113, 113, 113); /* 设置表头文字颜色 */
+}
 .box {
   display: flex;
 }

src/views/fee-settings/ItemResultTemplate.vue

@@ -173,29 +173,42 @@
     </div>
     <!-- 按钮区域 -->
     <div style="margin-left: 10px; margin-top: 5%">
-      <el-button type="primary" @click="add">新增</el-button>
+      <el-button type="" @click="add" class="commonbutton">新增</el-button>
       <el-button
-        type="primary"
+        type=""
         @click="editpopup"
         style="margin-left: 0; margin-top: 10px"
+        class="commonbutton"
         >编辑</el-button
       >
       <div style="margin-top: 10px">
-        <el-button type="danger" @click="delets">删除</el-button>
+        <el-button type="" @click="delets" class="commonbutton">删除</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="topping">置顶</el-button>
+        <el-button type="" @click="topping" class="commonbutton"
+          >置顶</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="toppings">置底</el-button>
+        <el-button type="" @click="toppings" class="commonbutton"
+          >置底</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" :disabled="isshow" @click="assertion"
+        <el-button
+          type=""
+          :disabled="isshow"
+          @click="assertion"
+          class="commonbutton"
           >排序</el-button
         >
       </div>
       <div style="margin-top: 5px">
-        <el-button type="primary" :disabled="isshow" @click="cancellation"
+        <el-button
+          type=""
+          :disabled="isshow"
+          @click="cancellation"
+          class="commonbutton"
           >取消</el-button
         >
       </div>
@@ -483,6 +496,11 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-table__header th {
+  /* font-size: px; */
+  background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
+  color: rgb(113, 113, 113); /* 设置表头文字颜色 */
+}
 .box {
   display: flex;
 }

src/views/fee-settings/ItemTemplate.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="box">
     <div style="width: 100%">
-      <el-card>
+      <el-card class="elcard" style="border-radius: 15px">
         <div class="publiccss">项目模板</div>
         <el-table
           :data="tableData"
-          style="width: 100%;margin-top:20px"
+          style="width: 100%; margin-top: 20px"
           row-key="id"
           class="el-table__body-wrapper tbody"
           @row-click="rowclick"
@@ -204,31 +204,37 @@
         > -->
       </div>
       <div>
-        <el-button type="primary" @click="add">新增</el-button>
+        <el-button type="" @click="add" class="commonbutton">新增</el-button>
       </div>
       <el-button
-        type="primary"
+        type=""
         @click="editpopup"
         style="margin-left: 0; margin-top: 10px"
+        class="commonbutton"
         >编辑</el-button
       >
       <!-- <input type="file" accept=".xlsx" @change="onFileChange" /> -->
       <div style="margin-top: 10px">
-        <el-button type="danger" @click="delets">删除</el-button>
+        <el-button type="" @click="delets" class="commonbutton">删除</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="topping">置顶</el-button>
+        <el-button type="" @click="topping" class="commonbutton"
+          >置顶</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="toppings">置底</el-button>
+        <el-button type="" @click="toppings" class="commonbutton"
+          >置底</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" :disabled="isshow" @click="assertion"
+        <el-button type="" :disabled="isshow" @click="assertion"
+        class="commonbutton"
           >排序</el-button
         >
       </div>
       <div style="margin-top: 5px">
-        <el-button type="primary" :disabled="isshow" @click="cancellation"
+        <el-button type="" :disabled="isshow" @click="cancellation"  class="commonbutton"
           >取消</el-button
         >
       </div>
@@ -806,6 +812,11 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-table__header th {
+  /* font-size: px; */
+  background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
+  color: rgb(113, 113, 113); /* 设置表头文字颜色 */
+}
 .subjecttitle {
   display: flex;
   justify-content: center;

src/views/fee-settings/MedicalPackage.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="box">
-    <div style="width: 95%">
-      <el-card>
+    <div style="width: 160%">
+      <el-card class="elcard" style="border-radius: 15px">
         <div class="publiccss">项目套餐</div>
         <el-table
           :data="tableData"
-          style="width: 100%;margin-top:20px"
+          style="width: 100%; margin-top: 20px"
           row-key="id"
           class="el-table__body-wrapper tbody"
           @row-click="rowclick"
@@ -56,7 +56,7 @@
           ref="singleTable"
         >
         </comp-table> -->
-      </el-card>
+
         <!-- 弹框 -->
         <el-dialog
           :title="title == 1 ? '新增' : '编辑'"
@@ -151,6 +151,7 @@
           </span>
         </el-dialog>
         <!--  -->
+
         <span style="margin-top: 10px; padding: 5px; margin-left: 28.5%"
           >项目类别</span
         >
@@ -240,33 +241,47 @@
           <el-button :disabled="isdislob" @click="Onsubmit">确定</el-button>
           <el-button :disabled="isdislob">取消</el-button>
         </div>
+      </el-card>
     </div>
 
     <!-- 按钮区域 -->
     <div style="margin-left: 10px; margin-top: 5%">
-      <el-button type="primary" @click="add">新增</el-button>
+      <el-button type="" @click="add" class="commonbutton">新增</el-button>
       <el-button
-        type="primary"
+        type=""
         @click="editpopup"
         style="margin-left: 0; margin-top: 10px"
+        class="commonbutton"
         >编辑</el-button
       >
       <div style="margin-top: 10px">
-        <el-button type="danger" @click="delets">删除</el-button>
+        <el-button type="" @click="delets" class="commonbutton">删除</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="topping">置顶</el-button>
+        <el-button type="" @click="topping" class="commonbutton"
+          >置顶</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="toppings">置底</el-button>
+        <el-button type="" @click="toppings" class="commonbutton"
+          >置底</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" :disabled="isshow" @click="assertion"
+        <el-button
+          type=""
+          :disabled="isshow"
+          @click="assertion"
+          class="commonbutton"
           >排序</el-button
         >
       </div>
-      <div style="margin-top: 5px">
-        <el-button type="primary" :disabled="isshow" @click="cancellation"
+      <div style="margin-top: 10px">
+        <el-button
+          type=""
+          :disabled="isshow"
+          @click="cancellation"
+          class="commonbutton"
           >取消</el-button
         >
       </div>
@@ -703,6 +718,11 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-table__header th {
+  /* font-size: px; */ 
+  background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
+  color: rgb(113, 113, 113); /* 设置表头文字颜色 */
+}
 .Selectbutton {
   margin-left: 3%;
 }

src/views/fee-settings/SysParmSet.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card>
+    <el-card class="elcard" style="border-radius: 15px">
       <div class="publiccss">系统参数</div>
       <div style="display: flex; margin-top: 20px">
         <div class="leftTree">
@@ -105,7 +105,6 @@
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { tcdate, objCopy } from "../../utlis/proFunc";
-
 export default {
   components: {},
   data() {
@@ -218,6 +217,11 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-table__header th {
+  /* font-size: px; */
+  background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
+  color: rgb(113, 113, 113); /* 设置表头文字颜色 */
+}
 .leftTree {
   overflow: scroll;
   border: 1px solid;

src/views/fee-settings/SysParmType.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="box">
     <div style="width: 95%">
-      <el-card>
+      <el-card >
      
-        <!--  -->
+        <!--  11-->
         <el-row>
           <el-col :span="8">
             <span>组织选择</span>