前端gjy

src/views/warehouse/warehouseManagementAdd.vue

@@ -1,4 +1,4 @@
-npm install vue-amap --save// 仓库添加
+
 <template>
   <div class="container">
     <el-row>

src/views/warehouse/warehouseManagementDelete.vue

@@ -1,11 +1,6 @@
 //删除仓库
 <template>
-<<<<<<< HEAD
   <div class="homepage">
-=======
-
-  <div class="homepage"> 
->>>>>>> d4735dcb0df4848656d61f1789e8f8d7efc5fd5a
     <el-row>
       <el-col :span="20">
         <h2 class="bg-left title">删除库房</h2>
@@ -76,10 +71,22 @@
               >删除</ws-button
             >
           </template> -->
-           <template slot-scope="scope">
-            <div class="record" v-if="scope.row.showFlag == 0" @click="handleHide(scope.row)">显示</div>
-            <div class="record" v-if="scope.row.showFlag == 1" @click="handleHide(scope.row)">隐藏</div>
-            <div class="adjustment"  @click="handleDelete(scope.row)">删除</div>
+          <template slot-scope="scope">
+            <div
+              class="record"
+              v-if="scope.row.showFlag == 0"
+              @click="handleHide(scope.row)"
+            >
+              显示
+            </div>
+            <div
+              class="record"
+              v-if="scope.row.showFlag == 1"
+              @click="handleHide(scope.row)"
+            >
+              隐藏
+            </div>
+            <div class="adjustment" @click="handleDelete(scope.row)">删除</div>
           </template>
         </el-table-column>
       </el-table>