Merge branch 'dev-1.1.1' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.1

src/main/java/cn/hnthyy/thmz/mapper/his/yf/YfInventoryListMapper.java

@@ -103,11 +103,11 @@ public interface YfInventoryListMapper {
             "               specification=min(e.specification)," +
             "               a.manu_code," +
             "               stock_amount_mz= case when b.group_no=71 then sum(case when a.serial=e.serial_min then isnull(b.stock_amount,0) else isnull(b.stock_amount,0)*e.pack_size end) else NULL end," +
-            "               stock_amount_zy= case when b.group_no=72 then sum(case when a.serial=e.serial_min then isnull(b.stock_amount,0) else isnull(b.stock_amount,0)*e.pack_size end) else NULL end," +
+            "               stock_amount_zy= case when b.group_no=73 then sum(case when a.serial=e.serial_min then isnull(b.stock_amount,0) else isnull(b.stock_amount,0)*e.pack_size end) else NULL end," +
             "               stock_amount_dz= case when b.group_no=91 then sum(case when a.serial=e.serial_min then isnull(b.stock_amount,0) else isnull(b.stock_amount,0)*e.pack_size end) else NULL end," +
             "               stock_amount_yk= NULL," +
             "               visible_flag_mz = case when b.group_no=71 then max(case when b.visible_flag_zy='1' and b.visible_flag_mz='1' then 0 else 1 end) else NULL end," +
-            "               visible_flag_zy = case when b.group_no=72 then max(case when b.visible_flag_zy='1' and b.visible_flag_mz='1' then 0 else 1 end) else NULL end," +
+            "               visible_flag_zy = case when b.group_no=73 then max(case when b.visible_flag_zy='1' and b.visible_flag_mz='1' then 0 else 1 end) else NULL end," +
             "               visible_flag_dz = case when b.group_no=91 then max(case when b.visible_flag_zy='1' and b.visible_flag_mz='1' then 0 else 1 end) else NULL end," +
             "               visible_flag_yk = NULL" +
             "       FROM yp_zd_dict a WITH(NOLOCK),yp_base_yf b WITH(NOLOCK),(select code,name,serial,pack_size,'01' as serial_min ,specification from yp_zd_dict WITH(NOLOCK)) e" +
@@ -115,7 +115,7 @@ public interface YfInventoryListMapper {
             "           a.serial=b.serial and" +
             "           a.serial=e.serial and" +
             "           a.code=e.code and" +
-            "           b.group_no in (71,72,91)" +
+            "           b.group_no in (71,73,91)" +
             "       group by   e.code,   a.name,   e.serial_min,a.manu_code,a.class_code ,a.drug_flag,b.group_no" +
             "       union" +
             "       SELECT e.code," +

src/main/resources/static/js/yf/yf_inventory_list.js

@@ -139,8 +139,8 @@ function initTable(classCode) {
         },           //传递参数（*）
         sidePagination: "server",           //分页方式：client客户端分页，server服务端分页（*）
         pageNumber: 1,                       //初始化加载第一页，默认第一页
-        pageSize: 20,                       //每页的记录行数（*）
-        pageList: [20, 40, 50, 100],        //可供选择的每页的行数（*）
+        pageSize: 15,                       //每页的记录行数（*）
+        pageList: [15, 20, 30, 50],        //可供选择的每页的行数（*）
         search: false,                       //是否显示表格搜索，此搜索是客户端搜索，不会进服务端，所以，个人感觉意义不大
         strictSearch: true,
         showColumns: false,                  //是否显示所有的列
@@ -168,24 +168,28 @@ function initTable(classCode) {
                 field: 'location',
                 title: '货位号',
                 align: "center",
+                width: 80,
                 valign: 'middle',
                 visible: isMultiple==1?false:true
             }, {
                 field: 'code',
                 title: '药品编码',
                 align: "center",
+                width: 50,
                 valign: 'middle'
             }, {
                 field: 'name',
                 title: '药品名',
-                align: "center",
+                align: "left",
+                width: 150,
                 valign: 'middle'
             },
             {
                 field: 'stockAmountMz',
-                title: '西药房存量',
+                title: '门诊西药房存量',
                 align: "center",
                 valign: 'middle',
+                width: 80,
                 visible: isMultiple==0?false:true,
                 formatter: function (value, row, index) {
                     return Math.floor(value * 100) / 100;
@@ -195,13 +199,31 @@ function initTable(classCode) {
                         return {css:{background:'red'}};
                     }
                     return {css:{}};
+                }
+            },
+            {
+                field: 'stockAmountZy',
+                title: '住院药房存量',
+                align: "center",
+                valign: 'middle',
+                width: 80,
+                visible: isMultiple==0?false:true,
+                formatter: function (value, row, index) {
+                    return Math.floor(value * 100) / 100;
                 },
+                cellStyle:function (value, row, index) {
+                    if(row.visibleFlagMz == 0){
+                        return {css:{background:'red'}};
+                    }
+                    return {css:{}};
+                }
             },
             {
                 field: 'stockAmountDz',
                 title: '呆账药房存量',
                 align: "center",
                 valign: 'middle',
+                width: 80,
                 visible: isMultiple==0?false:true,
                 formatter: function (value, row, index) {
                     return Math.floor(value * 100) / 100;
@@ -212,6 +234,7 @@ function initTable(classCode) {
                 title: '药库存量',
                 align: "center",
                 valign: 'middle',
+                width: 50,
                 visible: isMultiple==0?false:true,
                 formatter: function (value, row, index) {
                     return Math.floor(value * 100) / 100;
@@ -226,15 +249,34 @@ function initTable(classCode) {
             {
                 field: 'specificationMin',
                 title: '小规格',
-                align: "center",
+                width: 80,
+                align: "left",
                 valign: 'middle',
                 visible: isMultiple==0?false:true
             },
             {
                 field: 'stockAmountLargeMz',
-                title: '西药房大规格存量',
+                title: '门诊西药大存量',
                 align: "center",
                 valign: 'middle',
+                width: 80,
+                visible: isMultiple==0?false:true,
+                formatter: function (value, row, index) {
+                    return Math.floor(value * 100) / 100;
+                },
+                cellStyle:function (value, row, index) {
+                    if(row.visibleFlagMz == 0){
+                        return {css:{background:'red'}};
+                    }
+                    return {css:{}};
+                },
+            },
+            {
+                field: 'stockAmountLargeZy',
+                title: '住院西药大存量',
+                align: "center",
+                valign: 'middle',
+                width: 80,
                 visible: isMultiple==0?false:true,
                 formatter: function (value, row, index) {
                     return Math.floor(value * 100) / 100;
@@ -248,9 +290,10 @@ function initTable(classCode) {
             },
             {
                 field: 'stockAmountLargeDz',
-                title: '呆账药房大规格存量',
+                title: '呆账药房大存量',
                 align: "center",
                 valign: 'middle',
+                width: 80,
                 visible: isMultiple==0?false:true,
                 formatter: function (value, row, index) {
                     return Math.floor(value * 100) / 100;
@@ -258,9 +301,10 @@ function initTable(classCode) {
             },
             {
                 field: 'stockAmountLargeYk',
-                title: '药库大规格存量',
+                title: '药库大存量',
                 align: "center",
                 valign: 'middle',
+                width: 80,
                 visible: isMultiple==0?false:true,
                 formatter: function (value, row, index) {
                     return Math.floor(value * 100) / 100;
@@ -275,14 +319,16 @@ function initTable(classCode) {
             {
                 field: 'specificationMax',
                 title: '大规格',
-                align: "center",
+                align: "left",
+                width: 80,
                 valign: 'middle',
                 visible: isMultiple==0?false:true
             },
             {
                 field: 'specification',
                 title: '规格',
-                align: "center",
+                align: "left",
+                width: 100,
                 valign: 'middle',
                 visible: isMultiple==1?false:true
             },
@@ -291,6 +337,7 @@ function initTable(classCode) {
                 title: '零售价',
                 align: "center",
                 valign: 'middle',
+                width: 50,
                 visible: isMultiple==1?false:true,
                 formatter: function (value, row, index) {
                     return value.toFixed(2);
@@ -300,6 +347,7 @@ function initTable(classCode) {
                 title: '库存量',
                 align: "center",
                 valign: 'middle',
+                width: 50,
                 visible: isMultiple==1?false:true,
                 formatter: function (value, row, index) {
                     return Math.floor(value * 100) / 100;
@@ -309,6 +357,7 @@ function initTable(classCode) {
                 title: '库存金额',
                 align: "center",
                 valign: 'middle',
+                width: 50,
                 visible: isMultiple==1?false:true,
                 formatter: function (value, row, index) {
                     return value.toFixed(2);
@@ -318,11 +367,13 @@ function initTable(classCode) {
                 title: '当前虚存',
                 align: "center",
                 valign: 'middle',
+                width: 50,
                 visible: isMultiple==1?false:true
             }, {
                 field: 'manufactoryName',
                 title: '生产厂家',
-                align: "center",
+                align: "left",
+                width: 150,
                 valign: 'middle'
             }
         ],

src/main/resources/templates/yf/yf_inventory_list.html

@@ -48,7 +48,7 @@
                 </div>
             </div>
             <div class="col-md-10 col-sm-10 col-xs-12">
-                <table id="tb_table"></table>
+                <table id="tb_table" class="table text-nowrap"></table>
             </div>
         </div>
     </div>