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

src/views/Home.vue

@@ -5,7 +5,7 @@
         <div class="navs">
           <!-- <div class="maintitle">神豚医疗信息系统</div> -->
           <div>
-            <el-dropdown>
+            <el-dropdown  style="width:120px;display:">
               <span class="el-dropdown-link">
                 用户权限管理<i class="el-icon-arrow-down el-icon--right"></i>
               </span>
@@ -30,7 +30,7 @@
             </el-dropdown>
           </div>
           <!-- 基础字典 -->
-          <div style="margin-left: 1%" class="basicdictionany">
+          <div style="margin-left: 1%;width:120px" class="basicdictionany" >
             <el-dropdown>
               <span class="el-dropdown-link">
                 基础字典<i class="el-icon-arrow-down el-icon--right"></i>
@@ -125,7 +125,7 @@
             </el-dropdown>
           </div>
           <!-- 收费设置 -->
-          <div class="feesettings">
+          <div class="feesettings" style="width:120px">
             <el-dropdown>
               <span class="el-dropdown-link">
                 收费设置<i class="el-icon-arrow-down el-icon--right"></i>
@@ -143,7 +143,7 @@
             </el-dropdown>
           </div>
           <!--常用设置  -->
-          <div class="commonsettings">
+          <div class="commonsettings" style="width:120px">
             <el-dropdown>
               <span class="el-dropdown-link">
                 常用设置<i class="el-icon-arrow-down el-icon--right"></i>
@@ -209,7 +209,7 @@
             </el-dropdown>
           </div>
           <!-- 体检登记 -->
-          <div class="examinationregistration" style="margin-left: 1%">
+          <div class="examinationregistration" style="margin-left: 1%;width:120px">
             <el-dropdown>
               <span class="el-dropdown-link">
                 体检登记<i class="el-icon-arrow-down el-icon--right"></i>
@@ -247,7 +247,7 @@
             </el-dropdown>
           </div>
           <!-- 体检 -->
-          <div class="physicalexamination" style="margin-left: 1%">
+          <div class="physicalexamination" style="margin-left: 1%;width:100px">
             <el-dropdown>
               <span class="el-dropdown-link">
                 体检<i class="el-icon-arrow-down el-icon--right"></i>
@@ -266,9 +266,10 @@
           </div>
           <div class="btn">
             当前用户{{ user }}
+             <!-- <i class="el-icon-arrow-down el-icon--right"></i> -->
             <el-dropdown>
               <span class="el-dropdown-link">
-                操作<i class="el-icon-arrow-down el-icon--right"></i>
+                操作  
               </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item @click.native="logout"
@@ -525,6 +526,11 @@ export default {
 };
 </script>
 <style scoped>
+.el-dropdown-link{
+  width: 100%;
+  display: block;
+  position: relative;
+}
 .commonsettings {
   margin-left: 1%;
 }
@@ -543,7 +549,8 @@ export default {
 .navs {
   display: flex;
   align-items: center;
-  justify-content: space-between;
+  /* justify-content: space-between; */
+  flex-flow: 1;
 }
 
 .maintitle {
@@ -574,7 +581,7 @@ export default {
 }
 
 .btn {
-  margin-left: 60%;
+  margin-left: 45%;
 }
 
 .collapseandunfoled {

src/views/fee-settings/Asbitem.vue

@@ -275,41 +275,41 @@
             <el-button type="primary" @click="addoredit">确 定</el-button>
           </span>
         </el-dialog>
-        <div style="margin-top:30px">
-        <span style="margin-top: 10px; padding: 5px; margin-left: 25.8%"
-          >项目类别</span
-        >
-        <!-- <el-cascader :options="projectid" :show-all-levels="false" props="{label:''}"></el-cascader> -->
-        <el-select
-          v-model="values"
-          placeholder="请选择"
-          @change="ischangs"
-          style="margin-top: 5px"
-        >
-          <el-option
-            v-for="item in projectid"
-            :key="item.id"
-            :label="item.displayName"
-            :value="item.id"
+        <div style="margin-top: 30px">
+          <span style="margin-top: 10px; padding: 5px; margin-left: 28.8%"
+            >项目类别</span
           >
-          </el-option>
-        </el-select>
-        <span style="margin-left: 10%; padding: 5px">搜索选择</span>
-        <el-select
-          @change="selectitem"
-          filterable
-          v-model="flitvalues"
-          placeholder="请选择"
-          style="margin-top: 5px"
-        >
-          <el-option
-            v-for="item in filetelists"
-            :key="item.id"
-            :label="item.displayName"
-            :value="item.id"
+          <!-- <el-cascader :options="projectid" :show-all-levels="false" props="{label:''}"></el-cascader> -->
+          <el-select
+            v-model="values"
+            placeholder="请选择"
+            @change="ischangs"
+            style="margin-top: 5px"
           >
-          </el-option>
-        </el-select>
+            <el-option
+              v-for="item in projectid"
+              :key="item.id"
+              :label="item.displayName"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+          <span style="margin-left: 10%; padding: 5px">搜索选择</span>
+          <el-select
+            @change="selectitem"
+            filterable
+            v-model="flitvalues"
+            placeholder="请选择"
+            style="margin-top: 5px"
+          >
+            <el-option
+              v-for="item in filetelists"
+              :key="item.id"
+              :label="item.displayName"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
         </div>
         <!--表单穿梭区域 -->
         <div class="mainbox">
@@ -1011,7 +1011,7 @@ export default {
   display: flex;
 }
 .confirmcancellation {
-  margin-left: 45%;
+  margin-left: 48%;
 }
 .activetext {
   background: rgb(185, 203, 235);