jiangping
2023-10-26 ea87c908fb6cdfc3e227a584a53e6730efb8262a
minipro_standard/pages_adjust/components/Warehouse.vue
@@ -1,4 +1,5 @@
<template>
<<<<<<< HEAD
   <u-popup :show="show" mode="bottom" :closeable="true" :round="10" @open="open" @close="close">
      <view class="title">
         <text>选择仓库</text>
@@ -27,10 +28,17 @@
            </u-list> -->
         </scroll-view>
      </view>
=======
   <u-popup :show="show" mode="bottom" :closeable="true" :round="10" @close="close">
      <view class="title">
         <text>选择仓库</text>
      </view>
>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
   </u-popup>
</template>
<script>
<<<<<<< HEAD
   import { warehouseList } from '@/util/api/WorkOrderAPI'
   
   export default {
@@ -108,6 +116,19 @@
               })
            }
         },
=======
   export default {
      name:"Warehouse",
      props: {
         show: Boolean
      },
      data() {
         return {
         };
      },
      methods: {
>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
         close() {
            this.$emit('close')
         }
@@ -128,6 +149,7 @@
         color: #222222;
      }
    }
<<<<<<< HEAD
   .content {
      width: 100%;
      .content_search {
@@ -182,4 +204,6 @@
         }
      }
   }
=======
>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
</style>