药剂去除货位号

src/main/resources/static/app/storage/drug/drugCheck/views/drugCheck-edit.html

@@ -63,8 +63,8 @@
 					                        	<th class="col-sm-1"> 药剂形态</th>
 					                        	<th class="col-sm-1"> 药剂包装</th>
 					                            <th class="col-sm-1"> 规格</th>
-					                            <th class="col-sm-1"> 生产厂家</th>
-					                            <th class="col-sm-1"> 货位号</th>
+					                            <th class="col-sm-2"> 生产厂家</th>
+					                            <!-- <th class="col-sm-1"> 货位号</th> -->
 					                            <th class="col-sm-1"> 剩余数量(袋或瓶)</th>
 					                            <th class="col-sm-1"> 剩余总量(L或kg)</th>
 					                            <th class="col-sm-1"> 盘点数量(袋或瓶)</th>
@@ -80,7 +80,7 @@
 				                                <td>{{ dicData[detailInfo.drugPacking] }}</td>
 				                                <td>{{ detailInfo.drugSpecification }}{{ dicData[detailInfo.drugSpecificationUnit]}}</td>
 				                                <td>{{ detailInfo.manufacturer }}</td>
-				                                <td>{{ shelfMap[detailInfo.shelfId].shelfName }}</td>
+				                                <!-- <td>{{ shelfMap[detailInfo.shelfId].shelfName }}</td> -->
 				                                <td>{{ detailInfo.shelfAmount }}</td>
 				                                <td>{{ detailInfo.shelfAmount * detailInfo.drugSpecification | number:3}}</td>
 				                                <td>

src/main/resources/static/app/storage/drug/drugRestore/views/drugRestore-edit.html

@@ -66,7 +66,7 @@
                                             <th ng-hide="isNotEdit" class="col-sm-1"> 领用数量(袋或瓶)</th>
                                             <th class="col-sm-2"> 归还数量(袋或瓶)<span style="color: red;">*</span></th>
                                             <th class="col-sm-2">归还总量(L或kg)</th>
-                                            <th class="col-sm-2"> 货位号</th>
+                                            <!-- <th class="col-sm-2"> 货位号</th> -->
                                         </tr>
                                         </thead>
 
@@ -85,14 +85,14 @@
                                             </td>
                                             <td ng-if="drugRestoredetail.restoreNumber != null">{{drugRestoredetail.restoreNumber * drugRestoredetail.drugSpecification | number:3}}</td>
                                             <td ng-if="drugRestoredetail.restoreNumber == null"></td>
-                                            <td>
+                                            <!-- <td>
                                                 <select ng-model="drugRestoredetail.shelfId" name="shelfId"
                                                         ng-options="shelf.id as shelf.shelfName for shelf in drugShelfList.list"
                                                         ng-disabled="isNotEdit" class="form-control"
                                                         required>
                                                     <option value="">--请选择--</option>
                                                 </select>
-                                            </td>
+                                            </td> -->
                                         </tr>
                                         </tbody>
                                     </table>

src/main/resources/static/app/storage/drug/drugUse/views/drugUse-edit.html

@@ -63,7 +63,7 @@
 					                        	<th class="col-sm-1"> 药剂包装</th>
 					                            <th class="col-sm-1"> 规格型号</th>
 					                            <th class="col-sm-1"> 生产厂家</th>
-					                            <th class="col-sm-1"> 货位号</th>
+					                            <!-- <th class="col-sm-1"> 货位号</th> -->
 					                            <th class="col-sm-1"> 库存数量(袋或瓶)</th>
 					                            <th class="col-sm-1"> 申请数量(袋或瓶)</th>
 					                            <th class="col-sm-1"> 领用数量(袋或瓶)</th>
@@ -78,7 +78,7 @@
 				                                <td>{{ dicData[detailInfo.drugPacking] }}</td>
 				                                <td>{{ detailInfo.drugSpecification }}{{dicData[detailInfo.drugSpecificationUnit]}}</td>
 				                                <td>{{ detailInfo.manufacturer }}</td>
-                                                <td>{{ shelfMap[detailInfo.shelfId].shelfName }}</td><!--货架号-->
+                                                <!-- <td>{{ shelfMap[detailInfo.shelfId].shelfName }}</td> --><!--货架号-->
                                                 <td>{{ detailInfo.shelfAmount}}</td>
 				                                <td>{{ detailInfo.useCount }}</td>
 				                                <td>