Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue

@@ -65,6 +65,22 @@
               @change="hand"
             />
           </el-form-item>
+          <el-form-item label="生产位置">
+            <el-select
+              v-model="query.point_location"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 185px;"
+            >
+              <el-option
+                v-for="item in dict.point_location"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="入箱时间">
             <el-date-picker
               v-model="query.createTime"
@@ -137,7 +153,7 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="point_code" width="100" label="点位编码" />
+        <el-table-column prop="point_code" width="160px" show-overflow-tooltip label="点位编码" />
         <el-table-column prop="point_status" label="点位状态">
           <template slot-scope="scope">
             {{ dict.label.sch_hot_point_status[scope.row.point_status] }}
@@ -148,11 +164,11 @@
             {{ dict.label.is_used[scope.row.is_used] }}
           </template>
         </el-table-column>
-        <el-table-column prop="container_name" label="母卷号" />
+        <el-table-column prop="container_name" label="母卷号" width="150px" show-overflow-tooltip />
         <el-table-column prop="full_vehicle_code" label="母卷轴编码" min-width="100" show-overflow-tooltip />
         <el-table-column prop="pcsn" label="批次" />
         <el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" />
-        <el-table-column prop="instorage_time" label="入箱时间" />
+        <el-table-column prop="instorage_time" label="入箱时间" width="150px" show-overflow-tooltip />
         <el-table-column prop="product_area" label="生产区域">
           <template slot-scope="scope">
             {{ dict.label.product_area[scope.row.product_area] }}