yusheng 1 rok pred
rodič
commit
00eb984714

+ 2 - 2
src/views/warehouseManagement/outgoingManagement/add.vue

@@ -88,7 +88,7 @@
                 :show-overflow-tooltip="true"></el-table-column>
               <el-table-column v-for="(item, index) in newColumns" :label="item.label" :align="item.align"
                 :prop="item.prop" :show-overflow-tooltip="item.showOverflowTooltip"></el-table-column>
-              <el-table-column label="批次号" prop="batchNo" align="center" :show-overflow-tooltip="true">
+              <el-table-column label="批次号" prop="batchNo" width="150" align="center" :show-overflow-tooltip="true">
               </el-table-column>
               <el-table-column label="包装数量" v-if="clientEnvironmentId == 3" prop="packingQuantity" align="center">
                 <template slot-scope="{ row, $index }">
@@ -152,7 +152,7 @@
               </el-table-column>
               <el-table-column label="编码" prop="categoryCode" :show-overflow-tooltip="true"></el-table-column>
               <el-table-column label="名称" prop="categoryName" :show-overflow-tooltip="true"></el-table-column>
-              <el-table-column label="批次号" prop="batchNo" :show-overflow-tooltip="true"></el-table-column>
+              <el-table-column label="批次号" prop="batchNo"  width="150"  :show-overflow-tooltip="true"></el-table-column>
               <el-table-column label="发货条码" prop="barcodes" :show-overflow-tooltip="true"></el-table-column>
               <el-table-column label="包装编码" prop="packageNo" :show-overflow-tooltip="true"></el-table-column>
               <el-table-column label="包装数量" prop="packingQuantity" :show-overflow-tooltip="true"></el-table-column>

+ 3 - 3
src/views/warehouseManagement/stockManagement/add.vue

@@ -100,7 +100,7 @@
                 :show-overflow-tooltip="true"></el-table-column>
               <el-table-column v-for="(item, index) in newColumns" :label="item.label" :align="item.align"
                 :prop="item.prop" :show-overflow-tooltip="item.showOverflowTooltip"></el-table-column>
-              <el-table-column label="批次号" align="center" width="100" prop="batchNo">
+              <el-table-column label="批次号" align="center" width="200" prop="batchNo">
                 <template slot-scope="{ row, $index }">
                   <template v-if="row.isSave">
                     {{ row.batchNo }}
@@ -291,7 +291,7 @@
           </el-table-column>
           <el-table-column label="序号" type="index" width="50">
           </el-table-column>
-          <el-table-column label="批次号" prop="batchNo" width="80" :show-overflow-tooltip="true"></el-table-column>
+          <el-table-column label="批次号" prop="batchNo" width="150" :show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="包装编码" prop="packageNo" width="130" :show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="名称" prop="categoryName" width="120" :show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="编码" prop="categoryCode" width="120" :show-overflow-tooltip="true"></el-table-column>
@@ -401,7 +401,7 @@
           </el-table-column>
           <el-table-column label="编码" prop="categoryCode" width="130" :show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="名称" prop="categoryName" width="150" :show-overflow-tooltip="true"></el-table-column>
-          <el-table-column label="批次号" prop="batchNo" width="70"></el-table-column>
+          <el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
           <el-table-column label="物料编码" prop="materialCode" width="200" :show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="计量数量" prop="measureQuantity" width="90"
             :show-overflow-tooltip="true"></el-table-column>

+ 4 - 3
src/views/warehouseManagement/stockManagement/components/selectType.vue

@@ -5,17 +5,18 @@
       <div class="search_box">
         <el-row :gutter="15">
           <el-col :span="6">
-            <el-form label-width="80px" class="ele-form-search">
+            <el-form label-width="80px" class="ele-form-search" >
               <el-form-item label="所属工厂" prop="factoryId">
-                <el-select filterable placeholder="请选择" v-model="factoryId" clearable class="w100">
+                <el-select @keyup.enter.native="handleSearch" filterable placeholder="请选择" v-model="factoryId" clearable class="w100">
                   <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                 </el-select>
               </el-form-item>
             </el-form>
           </el-col>
           <el-col :span="8">
-            <el-input v-model="value" placeholder="搜索物品编码、名称、规格等">
+            <el-input v-model="value" placeholder="搜索物品编码、名称、规格等" @keyup.enter.native="handleSearch" >
               <el-button slot="append" type="primary" icon="el-icon-search" size="small"
+                 
                 @click="handleSearch">搜索</el-button>
             </el-input>
           </el-col>