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

src/views/Home.vue

@@ -13,14 +13,39 @@
           />
           <div class="maintitle">神豚体检管理系统</div>
           <div style="margin-left: 5%">
+            <!-- <el-menu
+              router=""
+              :default-active="activeIndex"
+              class="el-menu-demo"
+              mode="horizontal"
+              @select="handleSelect"
+              style="
+                color: rgb(114, 105, 105);
+                font-weight: 700;
+                font-size: 18px;
+              "
+            >
+              <el-submenu index="2">
+                <img
+                  class="iconimg"
+                     style="width: 20px; line-height: 150px; padding-top: 5px"
+                  src="@/assets/images/usericon.png"
+                  alt=""
+                />
+                <template slot="title">用户权限管理</template>
+                <el-menu-item index="organization-units">科室设置</el-menu-item>
+                <el-menu-item index="2-2">选项2</el-menu-item>
+                <el-menu-item index="2-3">选项3</el-menu-item>
+              </el-submenu>
+            </el-menu> -->
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
             >
               <span class="el-dropdown-link">
                 <span style="margin-top: 10px">
                   <img
-                    class="iconimg"
+                    class="iconimg titleimg"
                     src="@/assets/images/usericon.png"
                     alt=""
                     style="width: 20px; line-height: 150px; padding-top: 5px"
@@ -28,16 +53,15 @@
                 </span>
                 用用户权限管理</span
               >
-              <!-- <span>     <img src="@/assets/images/users.png" alt="" style="width:20px;height:20px"></span> -->
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="organization-units"
+                <el-dropdown-item command="organization-units" class="dropdownmain"
                   >科室设置</el-dropdown-item
                 >
-                <el-dropdown-item command="role">角色管理</el-dropdown-item>
-                <el-dropdown-item command="user-list"
+                <el-dropdown-item command="role" class="dropdownmain">角色管理</el-dropdown-item>
+                <el-dropdown-item command="user-list" class="dropdownmain"
                   >用户管理</el-dropdown-item
                 >
-                <el-dropdown-item command="audit-log"
+                <el-dropdown-item command="audit-log" class="dropdownmain"
                   >安全日志</el-dropdown-item
                 >
               </el-dropdown-menu>
@@ -50,71 +74,71 @@
           >
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
             >
               <span class="el-dropdown-link" style="margin-left: 10px">
                 <img
                   src="@/assets/images/feesettings.png"
                   alt=""
                   style="width: 20px; height: 20px"
-                  class="basicimg"
+                  class="basicimg titleimg"
                 />
                 基础字典</span
               >
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="guide-type"
+                <el-dropdown-item command="guide-type" class="dropdownmain"
                   >导引类别</el-dropdown-item
                 >
-                <el-dropdown-item command="medical-report-type"
+                <el-dropdown-item command="medical-report-type" class="dropdownmain"
                   >体检报告类别</el-dropdown-item
                 >
-                <el-dropdown-item command="sex">性别</el-dropdown-item>
-                <el-dropdown-item command="marital-status"
+                <el-dropdown-item command="sex" class="dropdownmain">性别</el-dropdown-item>
+                <el-dropdown-item command="marital-status" class="dropdownmain"
                   >婚姻状况</el-dropdown-item
                 >
-                <el-dropdown-item command="nation">民族</el-dropdown-item>
-                <el-dropdown-item command="birth-place">籍贯</el-dropdown-item>
-                <el-dropdown-item command="result-status"
+                <el-dropdown-item command="nation" class="dropdownmain">民族</el-dropdown-item>
+                <el-dropdown-item command="birth-place" class="dropdownmain">籍贯</el-dropdown-item>
+                <el-dropdown-item command="result-status" class="dropdownmain"
                   >结果状态</el-dropdown-item
                 >
-                <el-dropdown-item command="medical-type"
+                <el-dropdown-item command="medical-type" class="dropdownmain"
                   >体检类别</el-dropdown-item
                 >
-                <el-dropdown-item command="personnel-type"
+                <el-dropdown-item command="personnel-type" class="dropdownmain"
                   >人员类别</el-dropdown-item
                 >
-                <el-dropdown-item command="device-type"
+                <el-dropdown-item command="device-type" class="dropdownmain"
                   >仪器类别</el-dropdown-item
                 >
-                <el-dropdown-item command="sample-type"
+                <el-dropdown-item command="sample-type" class="dropdownmain"
                   >标本类型</el-dropdown-item
                 >
-                <el-dropdown-item command="unit">计量单位</el-dropdown-item>
-                <el-dropdown-item command="diagnosis-postfix"
+                <el-dropdown-item command="unit" class="dropdownmain">计量单位</el-dropdown-item>
+                <el-dropdown-item command="diagnosis-postfix" class="dropdownmain"
                   >诊断后缀</el-dropdown-item
                 >
-                <el-dropdown-item command="medical-conclusion-type"
+                <el-dropdown-item command="medical-conclusion-type" class="dropdownmain"
                   >体检结论类别</el-dropdown-item
                 >
-                <el-dropdown-item command="medical-conclusion"
+                <el-dropdown-item command="medical-conclusion" class="dropdownmain"
                   >体检结论</el-dropdown-item
                 >
-                <el-dropdown-item command="sample-container"
+                <el-dropdown-item command="sample-container" class="dropdownmain"
                   >标本容器</el-dropdown-item
                 >
-                <el-dropdown-item command="common-char-type"
+                <el-dropdown-item command="common-char-type" class="dropdownmain"
                   >常用字符类别</el-dropdown-item
                 >
-                <el-dropdown-item command="common-char"
+                <el-dropdown-item command="common-char" class="dropdownmain"
                   >常用字符</el-dropdown-item
                 >
-                <el-dropdown-item command="customer-org-type"
+                <el-dropdown-item command="customer-org-type" class="dropdownmain"
                   >客户单位类别</el-dropdown-item
                 >
-                <el-dropdown-item command="item-default-result"
+                <el-dropdown-item command="item-default-result" class="dropdownmain"
                   >项目默认结果</el-dropdown-item
                 >
-                <el-dropdown-item command="diagnosis-level"
+                <el-dropdown-item command="diagnosis-level" class="dropdownmain"
                   >诊断级别</el-dropdown-item
                 >
               </el-dropdown-menu>
@@ -124,29 +148,29 @@
           <div class="feesettings" style="margin-left: 20px">
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
             >
               <span class="el-dropdown-link">
                 <img
                   src="@/assets/images/chargeimg.png"
                   alt=""
                   style="width: 20px; height: 20px"
-                  class="chargeimg"
+                  class="chargeimg titleimg"
                 />
                 收费设置</span
               >
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="invoice-item-type"
+                <el-dropdown-item command="invoice-item-type" class="dropdownmain"
                   >发票项目类别</el-dropdown-item
                 >
-                <el-dropdown-item command="pay-mode">支付方式</el-dropdown-item>
-                <el-dropdown-item command="cardType"
+                <el-dropdown-item command="pay-mode" class="dropdownmain">支付方式</el-dropdown-item>
+                <el-dropdown-item command="cardType" class="dropdownmain"
                   >会员卡类别</el-dropdown-item
                 >
-                <el-dropdown-item command="cardRegister"
+                <el-dropdown-item command="cardRegister" class="dropdownmain"
                   >会员卡管理</el-dropdown-item
                 >
-                <el-dropdown-item command="cardBill"
+                <el-dropdown-item command="cardBill" class="dropdownmain"
                   >会员卡记账</el-dropdown-item
                 >
               </el-dropdown-menu>
@@ -156,23 +180,23 @@
           <div class="commonsettings" style="margin-left: 20px">
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
             >
               <span class="el-dropdown-link">
                 <img
                   src="@/assets/images/commonsetting.png"
                   alt=""
-                  class="commonsettingimg"
+                  class="commonsettingimg titleimg"
                 />
                 常用设置</span
               >
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="item-type"
+                <el-dropdown-item command="item-type" class="dropdownmain"
                   >项目类别</el-dropdown-item
                 >
-                <el-dropdown-item command="item">项目设置</el-dropdown-item>
-                <el-dropdown-item command="asbitem">组合项目</el-dropdown-item>
-                <el-dropdown-item command="sample-group"
+                <el-dropdown-item command="item" class="dropdownmain">项目设置</el-dropdown-item>
+                <el-dropdown-item command="asbitem" class="dropdownmain">组合项目</el-dropdown-item>
+                <el-dropdown-item command="sample-group" class="dropdownmain"
                   >条码分组</el-dropdown-item
                 >
                 <!-- <el-dropdown-item
@@ -185,23 +209,23 @@
                   "
                   >性激素参考范围</el-dropdown-item
                 > -->
-                <el-dropdown-item command="diagnosis">诊断</el-dropdown-item>
-                <el-dropdown-item command="diagnosis-template"
+                <el-dropdown-item command="diagnosis" class="dropdownmain">诊断</el-dropdown-item>
+                <el-dropdown-item command="diagnosis-template" class="dropdownmain"
                   >诊断模板</el-dropdown-item
                 >
-                <el-dropdown-item command="item-result-template"
+                <el-dropdown-item command="item-result-template" class="dropdownmain"
                   >项目结果模板</el-dropdown-item
                 >
-                <el-dropdown-item command="item-result-match"
+                <el-dropdown-item command="item-result-match" class="dropdownmain"
                   >项目结果匹配</el-dropdown-item
                 >
-                <el-dropdown-item command="item-template"
+                <el-dropdown-item command="item-template" class="dropdownmain"
                   >项目模板</el-dropdown-item
                 >
-                <el-dropdown-item command="medical-package"
+                <el-dropdown-item command="medical-package" class="dropdownmain"
                   >套餐</el-dropdown-item
                 >
-                <el-dropdown-item command="sys-parm-type"
+                <el-dropdown-item command="sys-parm-type" class="dropdownmain"
                   >系统参数</el-dropdown-item
                 >
               </el-dropdown-menu>
@@ -211,7 +235,7 @@
           <div class="examinationregistration" style="margin-left: 20px">
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
               class="dropdowncolor"
             >
               <span class="el-dropdown-link">
@@ -223,28 +247,28 @@
                 体检登记</span
               >
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="customerOrg"
+                <el-dropdown-item command="customerOrg" class="dropdownmain"
                   >体检单位设置</el-dropdown-item
                 >
-                <el-dropdown-item command="customerOrgGroup"
+                <el-dropdown-item command="customerOrgGroup" class="dropdownmain"
                   >单位分组设置</el-dropdown-item
                 >
-                <el-dropdown-item command="patientRegister"
+                <el-dropdown-item command="patientRegister" class="dropdownmain"
                   >体检人员登记</el-dropdown-item
                 >
-                <el-dropdown-item command="personnelBatch"
+                <el-dropdown-item command="personnelBatch" class="dropdownmain"
                   >人员批量登记</el-dropdown-item
                 >
-                <el-dropdown-item command="patientRegisterSign"
+                <el-dropdown-item command="patientRegisterSign" class="dropdownmain"
                   >体检人员签到</el-dropdown-item
                 >
-                <el-dropdown-item command="patientRegisterRecover"
+                <el-dropdown-item command="patientRegisterRecover" class="dropdownmain"
                   >体检表回收</el-dropdown-item
                 > 
-                <el-dropdown-item command="patientRegisterRefuse"
+                <el-dropdown-item command="patientRegisterRefuse" class="dropdownmain"
                   >弃检登记</el-dropdown-item
                 >
-                <el-dropdown-item command="charge">体检收费</el-dropdown-item>
+                <el-dropdown-item command="charge" class="dropdownmain">体检收费</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
@@ -252,14 +276,14 @@
           <div class="physicalexamination" style="margin-left: 10px">
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
             >
               <span class="el-dropdown-link">体检</span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="doctorCheck"
+                <el-dropdown-item command="doctorCheck" class="dropdownmain"
                   >体检医生诊台</el-dropdown-item
                 >
-                <el-dropdown-item command="sumDoctorCheck"
+                <el-dropdown-item command="sumDoctorCheck" class="dropdownmain"
                   >总检医生诊台</el-dropdown-item
                 >
               </el-dropdown-menu>
@@ -269,21 +293,21 @@
           <div style="margin-left: 10px">
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
             >
               <span class="el-dropdown-link">体检查询</span>
               <el-dropdown-menu slot="dropdown" style="width: 170px">
-                <el-dropdown-item command="report">体检报告</el-dropdown-item>
-                <el-dropdown-item command="checkStatus"
+                <el-dropdown-item command="report" class="dropdownmain">体检报告</el-dropdown-item>
+                <el-dropdown-item command="checkStatus" class="dropdownmain"
                   >组合项目检查状态</el-dropdown-item
                 >
-                <el-dropdown-item command="chargeAsbitem"
+                <el-dropdown-item command="chargeAsbitem" class="dropdownmain"
                   >人员费用组合项目</el-dropdown-item
                 >
-                <el-dropdown-item command="unCheckAsbitem"
+                <el-dropdown-item command="unCheckAsbitem" class="dropdownmain"
                   >人员未检组合项目</el-dropdown-item
                 >
-                <el-dropdown-item command="patientRegisterRecover"
+                <el-dropdown-item command="patientRegisterRecover" class="dropdownmain"
                   >回收表格查询</el-dropdown-item
                 >
               </el-dropdown-menu>
@@ -293,17 +317,17 @@
           <div class="physicalexamination" style="margin-left: 15px">
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
             >
               <span class="el-dropdown-link"> 客户报表 </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="diseaseStatistics"
+                <el-dropdown-item command="diseaseStatistics" class="dropdownmain"
                   >疾病人数统计</el-dropdown-item
                 > 
-                <el-dropdown-item command="positiveresults"
+                <el-dropdown-item command="positiveresults" class="dropdownmain"
                   >阳性结果人员</el-dropdown-item
                 >
-                <el-dropdown-item command="unitphysicalexamination"
+                <el-dropdown-item command="unitphysicalexamination" class="dropdownmain"
                   >单位体检报表</el-dropdown-item
                 >
               </el-dropdown-menu>
@@ -334,20 +358,20 @@
           <div class="physicalexamination" style="margin-left: 15px">
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
             >
               <span class="el-dropdown-link"> 工作量统计 </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="registrar"
+                <el-dropdown-item command="registrar" class="dropdownmain"
                   >登记员工作量</el-dropdown-item
                 >
-                <el-dropdown-item command="doctorstaionworkload"
+                <el-dropdown-item command="doctorstaionworkload" class="dropdownmain"
                   >医生站工作量</el-dropdown-item
                 >
-                <el-dropdown-item command="directordoctor"
+                <el-dropdown-item command="directordoctor" class="dropdownmain"
                   >总检工作量</el-dropdown-item
                 >
-                <el-dropdown-item command="deskwork"
+                <el-dropdown-item command="deskwork" class="dropdownmain"
                   >科室工作量</el-dropdown-item
                 >
               </el-dropdown-menu>
@@ -358,17 +382,17 @@
           <div class="physicalexamination" style="margin-left: 15px">
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
             >
               <span class="el-dropdown-link"> 收费 </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="tollcollector"
+                <el-dropdown-item command="tollcollector" class="dropdownmain"
                   >收费员报表</el-dropdown-item
                 >
-                <el-dropdown-item command="individualfeedetails"
+                <el-dropdown-item command="individualfeedetails" class="dropdownmain"
                   >个人收费明细</el-dropdown-item
                 >
-                <el-dropdown-item command="membershipcard"
+                <el-dropdown-item command="membershipcard" class="dropdownmain"
                   >会员卡分类</el-dropdown-item
                 >
               </el-dropdown-menu>
@@ -751,6 +775,25 @@ export default {
 };
 </script>
 <style scoped>
+
+.dropdownmain:hover{
+    background-color: rgb(204, 249, 203);
+  color: rgb(30, 150, 63);
+  font-weight: 700;
+}
+.titleimg :hover{
+  width: 30px;
+   background-color:  rgb(34, 149, 98);
+}
+.el-dropdown-link:hover {
+  /* background-color: rgb(202, 249, 203); */
+  color: rgb(34, 149, 98);
+  border-top-left-radius: 5px;
+  border-top-right-radius: 5px;
+}
+::v-deep .el-menu--horizontal > .el-submenu .el-submenu__title {
+  font-size: 16px;
+}
 .dropdowncolor {
   font-size: 12px;
 }
@@ -868,10 +911,15 @@ export default {
   font-weight: 700;
   color: #000;
 }
-
+::v-deep .el-dropdown-menu item:not(.is-disabled) {
+  color: #fff;
+}
 .el-header {
   height: 70px;
 }
+::v-deep .el-select-dropdown {
+  background: #ccc;
+}
 .operateimg {
   position: relative;
   left: 0;

src/views/basic-dictionary/GuideType.vue

@@ -285,32 +285,59 @@
     </div>
     <!-- 按钮区域 -->
     <div style="margin-left: 10px; margin-top: 7%">
-      <el-button type="" @click="guideadd" style="width: 100px;color:#2BCA84;font-weight: 700;">新增</el-button>
+      <el-button
+        type=""
+        @click="guideadd"
+        style="width: 100px; color: #349d2f; font-weight: 700; height: 35px"
+        >新增</el-button
+      >
       <div style="margin-top: 10px">
-        <el-button type="" @click="editandmofin" style="width: 100px;color:#2BCA84;font-weight: 700;"
+        <el-button
+          type=""
+          @click="editandmofin"
+          style="width: 100px; color: #349d2f; font-weight: 700; height: 35px"
           >编辑</el-button
         >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="" @click="confirmdeltion" style="width: 100px;color:#2BCA84;font-weight: 700;"
+        <el-button
+          type=""
+          @click="confirmdeltion"
+          style="width: 100px; color: #349d2f; font-weight: 700; height: 35px"
           >删除</el-button
         >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="" @click="topping" style="width: 100px;color:#2BCA84;font-weight: 700;"
+        <el-button
+          type=""
+          @click="topping"
+          style="width: 100px; color: #349d2f; font-weight: 700; height: 35px"
           >置顶</el-button
         >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="" @click="setlow" style="width: 100px;color:#2BCA84;font-weight: 700;">置底</el-button>
+        <el-button
+          type=""
+          @click="setlow"
+          style="width: 100px; color: #349d2f; font-weight: 700; height: 35px"
+          >置底</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="" :disabled="isshow" @click="assertion"
-         style="width: 100px;color:#2BCA84;font-weight: 700;" >排序</el-button
+        <el-button
+          type=""
+          :disabled="isshow"
+          @click="assertion"
+          style="width: 100px; color: #349d2f; font-weight: 700; height: 35px"
+          >排序</el-button
         >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="" :disabled="isshow" @click="cancellation" style="width: 100px;color:#2BCA84;font-weight: 700;"
+        <el-button
+          type=""
+          :disabled="isshow"
+          @click="cancellation"
+          style="width: 100px; color: #349d2f; font-weight: 700; height: 35px"
           >取消</el-button
         >
       </div>
@@ -322,14 +349,24 @@
           name="用户信息"
           style="width: 100px; margin-left: 0px"
         >
-          <el-button type="" style="width: 100px;color:#2BCA84;font-weight: 700;">导出</el-button>
+          <el-button
+            type=""
+            style="width: 100px; color: #349d2f; font-weight: 700; height: 35px"
+            >导出</el-button
+          >
         </download-excel>
       </div>
       <div style="margin-top: 10px">
         <el-button
           type=""
           v-print="{ id: 'printTest', extraHead: '用户信息' }"
-          style="margin-left: 0px;width: 100px;color:#2BCA84;font-weight: 700;"
+          style="
+            margin-left: 0px;
+            width: 100px;
+            color:#349D2F;
+            font-weight: 700;
+            height: 35px;
+          "
           >打印</el-button
         >
       </div>
@@ -795,6 +832,7 @@ export default {
 </script>
 <style scoped>
 .cardboder {
+  margin-left: -12px;
   margin-top: -15px;
   border-radius: 12px;
 }

src/views/common-settings/ItemType.vue

@@ -65,8 +65,8 @@
           :close-on-click-modal="false"
         >
           <el-cascader
-            :options="options"
-            :props="{ checkStrictly: true }"
+            :options="itemtypedata"
+            :props="{ checkStrictly: true, value: 'id', label: 'displayName' }"
             clearable
           ></el-cascader>
           <el-form
@@ -181,6 +181,7 @@ import { getapi } from "@/api/api";
 export default {
   data() {
     return {
+      itemtypedata: [],
       rules: {
         displayName: [
           { required: true, message: "请输入名称", trigger: "blur" },
@@ -286,6 +287,10 @@ 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");
+      });
     },
     // 删除
     deleates(node, data) {

src/views/user-list/UserList.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card>
+    <el-card class="orgindcard">
       <div class="publiccss">用户管理</div>
       <el-button type="primary" @click="newlyincreased" style="margin-top: 20px"
         >新增</el-button
@@ -1031,4 +1031,15 @@ export default {
   },
 };
 </script>
-<style lang="less" scoped></style>
+<style  scoped>
+::v-deep .el-card {
+  margin-top: -15px;
+  /* background-color: #000; */
+  border-radius: 15px;
+}
+/* ::v-deep .el-card__body {
+ 
+  margin-top: -15px;
+  border-radius: 15px;
+} */
+</style>