Merge branch 'dev-1.1.4' into 'dev-1.1.4'

药品退库优化

See merge request lihong/thmz_system!51

src/main/resources/templates/yk/drug_return.html

@@ -57,19 +57,19 @@
                                     class="confirmDate"></span></td>
                         </tr>
                         <tr id="base_tr">
-                            <td class="xtd" style="text-align: center;width: 80px;">编码</td>
-                            <td class="xtd" style="text-align: center;width: 80px;">货位号</td>
-                            <td class="xtd" style="text-align: center;width: 140px;">药品名称</td>
-                            <td class="xtd" style="text-align: center;width: 100px;">规格</td>
-                            <td class="xtd" style="text-align: center;width: 80px;">数量</td>
-                            <td class="xtd" style="text-align: center;width: 80px;">购入价</td>
-                            <td class="xtd" style="text-align: center;width: 80px;">零售价</td>
-                            <td class="xtd" style="text-align: center;width: 100px;">购入金额</td>
-                            <td class="xtd" style="text-align: center;width: 100px;">零售金额</td>
-                            <td class="xtd" style="text-align: center;width: 120px;">生产批号</td>
+                            <td class="xtd" style="text-align: center;width: 7%;">编码</td>
+                            <td class="xtd" style="text-align: center;width: 8%;">货位号</td>
+                            <td class="xtd" style="text-align: center;width: 20%;">药品名称</td>
+                            <td class="xtd" style="text-align: center;width: 8%;">规格</td>
+                            <td class="xtd" style="text-align: center;width: 7%;">数量</td>
+                            <td class="xtd" style="text-align: center;width: 8%;">购入价</td>
+                            <td class="xtd" style="text-align: center;width: 8%;">零售价</td>
+                            <td class="xtd" style="text-align: center;width: 8%;">购入金额</td>
+                            <td class="xtd" style="text-align: center;width: 8%;">零售金额</td>
+                            <td class="xtd" style="text-align: center;width: 10%;">生产批号</td>
 <!--                            <td class="xtd" style="text-align: center;width: 100px;">生产厂家</td>-->
 <!--                            <td class="xtd" style="text-align: center;width: 100px;">有效期</td>-->
-                            <td class="xtd" style="text-align: center;width: 120px;">库存</td>
+                            <td class="xtd" style="text-align: center;width: 8%;">库存</td>
                         </tr>
                         <tr style="border: transparent !important;"></tr>
                         <tr>