Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/pages/financial/Kingdee/LemonCloudSubjects.vue

@@ -130,24 +130,25 @@
   </style>
   <template>
     <div class="flexOne currentManage page-body">
-      <div class="query-box" style="padding: 0;">
-        校区：
-        <el-select filterable v-model='msg.BranchId' @change="getList">
-          <el-option label="不限" value="0"></el-option>
-          <el-option v-for="(item,index) in TheAliasList" :label="item.Name" :value='item.Id' :key="index">
-          </el-option>
-        </el-select>
+      <div class="query-box" style="display: flex;justify-content: space-between;border-bottom:0">
+        <div>
+          校区：
+          <el-select filterable v-model='msg.BranchId' @change="getList">
+            <el-option label="不限" value="0"></el-option>
+            <el-option v-for="(item,index) in TheAliasList" :label="item.Name" :value='item.Id' :key="index">
+            </el-option>
+          </el-select>
+        </div>
         <ul>
           
           <li>
-            <q-btn color="primary" size="11px" label="导入"   @click="outerVisible=true" style="marginRight:10px"/>
+            <q-btn color="primary" size="11px" label="导入"   @click="outerVisible=true" style="margin-right:10px"/>
           </li>
         </ul>
       </div>
-      <div class="cm_content _scrollbar" style="position: absolute;top:117px;bottom: 100px;left: 15px;right:15px;overflow-y: scroll;">
+      <div class="cm_content _scrollbar" style="position: absolute;top:98px;bottom: 100px;left: 15px;right:15px;overflow-y: scroll;padding: 0 20px;">
   
-        <table class="po_content singeRowTable"
-        style="border:1px solid #E6E6E6;" cellspacing="0"
+        <table class="po_content singeRowTable" cellspacing="0"
         cellpadding="0" v-loading="loading">
           <tr>
               <th>科目名称</th>

src/pages/financial/Kingdee/currency.vue

@@ -58,7 +58,7 @@
   </style>
   <template>
     <div class="flexOne currentManage page-body" style="position: relative;">
-      <div class="query-box">
+      <div class="query-box" style="border-bottom:0">
         <ul>
             
           <li>

src/pages/financial/Kingdee/project.vue

@@ -59,7 +59,7 @@
 </style>
 <template>
   <div class="flexOne currentManage page-body" style="position: relative;">
-    <div class="query-box">
+    <div class="query-box" style="border-bottom:0">
       <ul>
           
         <li>