Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep into master

src/components/empower/deliveryQuery.vue

@@ -155,8 +155,8 @@
           </el-col>
         </el-row>
         <div class="row" style="margin-top: 10px" v-if="x.InventoryNum != x.Number">
-          <span>扫码出库</span>
-          <el-input v-model="x.input" @input="$forceUpdate(),payCode(x,y)" placeholder="商品出库条码" style="display:inline-block;width:300px;height:30px"></el-input>
+          <span>扫码入库</span>
+          <el-input v-model="x.input" @input="$forceUpdate()" @keyup.enter.native="$forceUpdate(),payCode(x,y)" placeholder="商品出库条码" style="display:inline-block;width:300px;height:30px"></el-input>
         </div>
         <el-table :data="x.list" v-if="x.InventoryNum != x.Number" border style="width: 100%;margin-Top:20px" >
           <el-table-column prop="SuppliesNum" label="编号" ></el-table-column>