Merge branch 'gcl' of http://gitlab.yiboshi.com/ynby/folacin-front into gcl

src/views/indexComponent/inStockManage/inStockManage.vue

@@ -32,44 +32,11 @@
                  </a-button>
              </div>-->
         </a-form>
-<<<<<<< HEAD
          <div style="display: flex;justify-content: space-between;align-items: center">
         <div style="margin-bottom: 10px">
-            <a-button type="primary" class="search_btn btn_space" @click="openModal">库存录入</a-button>
-=======
-        <div style="clear: both"></div>
-        <div style="float: right;line-height: 32px;background-color: #E6F7FF;margin-top: 16px;cursor: pointer"
-             @click="showSelectedMedical"
-             v-if="selectedRowKeys.length > 0"
-        >
-            <a-popover v-model="selectedVisible" trigger="click" placement="bottomRight">
-                <div slot="content" style="min-width: 300px">
-                    <div>
-                        <span style="padding: 5px 16px;color: #FF4D80">已选择叶酸({{selectedRowKeys.length}})</span>
-                    </div>
-                    <div style="margin-top: 10px">
-                        <a-list
-                                item-layout="horizontal"
-                                :data-source="selectedRowList"
-                        >
-                            <a-list-item slot="renderItem" slot-scope="item, index">
-                                <a slot="actions" @click="delSelectedKey(index)">删除</a>
-                                <a-list-item-meta
-                                        :description="item.brandName"
-                                >
-                                </a-list-item-meta>
-                            </a-list-item>
-                        </a-list>
-                    </div>
-                </div>
-                <span style="padding: 5px 16px;color: #FF4D80">已选择叶酸{{selectedRowKeys.length}}条<a-icon type="down"
-                                                                                                       style="margin-left:10px;font-size: 10px"/> </span>
-            </a-popover>
-        </div>
-        <div style="margin-top: 16px;margin-bottom: 10px">
-            <a-button type="primary" class="search_btn btn_space " @click="openModal" v-if="unitInfo.level==3">库存录入
+            <a-button type="primary" class="search_btn btn_space " @click="openModal" v-if="unitInfo.level==3">
+                库存录入
             </a-button>
->>>>>>> fbd12a958098f3e382d31073b40fdabcff46e375
             <a-button type="primary" class="search_btn btn_space" :disabled="selectedRowKeys.length <= 0"
                       v-if="unitInfo.level==3||unitInfo.level==4"
                       @click="toAdd">调拨分配
@@ -108,7 +75,7 @@
         <a-button type="primary" icon="search" class="search_btn" @click="searchList">搜索</a-button>
         <a-button class="search_btn" icon="sync" style="margin-left: 10px" @click="restSearchForm">清空</a-button>
         </div>
-         </div>
+        </div>
         <div style="clear: both"></div>
         <a-table :dataSource="tableData"
                  :columns="columns"
@@ -141,6 +108,7 @@
                 :showTotal="() => `共 ${pagination.total} 条`"
         />
     </div>
+
 </template>
 <script>
     import {isNotBlank, isEmptyParams, getEnumByFlag} from "../../utils/common";