盘盈盘亏

src/main/webapp/webpage/modules/warehouse/goods/logic.js

@@ -85,7 +85,7 @@ var pageConfig = {
     // 图片高度
     Image_h: 63,
     // 图片阈值
-    Image_Threshold: 170,
+    Image_Threshold: 220,
     // 图片打印模式
     Image_style_let: 3,
 }
@@ -154,6 +154,18 @@ function printImage (url) {
             ]
         }
         console.log(pack)
+        var str = JSON.stringify(pack, null, 2);
+        var blob = new Blob([str], {
+            type: "application/json"
+        });
+        var url = URL.createObjectURL(blob);
+
+        var a = document.createElement('a');
+        a.href = url;
+        a.download = 'a.json';
+        a.click();
+        a.remove();
+
         on_link_device(pack, onBack);
     })
 

src/main/webapp/webpage/modules/warehouse/materialloss/materialLossDetail.jsp

@@ -44,30 +44,30 @@
                     }
                 },
                 {
-                    field: 'ledgerInfo.name',
-                    title: '物资名称',
+                    field: 'ledgerInfo.code',
+                    title: '物资编码',
                     formatter: function (value, row, index) {
-                        return Mustache.render($("#ledgerInfoNameTpl").html(), {
+                        return Mustache.render($("#ledgerInfoCodeTpl").html(), {
                             row: row,
                             idx: index
                         })
                     }
                 },
                 {
-                    field: 'ledgerInfo.code',
-                    title: '物资编码',
+                    field: 'ledgerInfo.type.name',
+                    title: '品名',
                     formatter: function (value, row, index) {
-                        return Mustache.render($("#ledgerInfoCodeTpl").html(), {
+                        return Mustache.render($("#ledgerInfoTypeTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
                             row: row,
                             idx: index
                         })
                     }
                 },
                 {
-                    field: 'ledgerInfo.type.name',
-                    title: '品名代码',
+                    field: 'ledgerInfo.type.code',
+                    title: '代码',
                     formatter: function (value, row, index) {
-                        return Mustache.render($("#ledgerInfoTypeTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
+                        return Mustache.render($("#ledgerInfoTypeCodeTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
                             row: row,
                             idx: index
                         })
@@ -94,6 +94,16 @@
                     }
                 },
                 {
+                    field: 'ledgerInfo.type.unit',
+                    title: '单位',
+                    formatter: function (value, row, index) {
+                        return Mustache.render($("#ledgerInfoTypeUnitTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
+                            row: row,
+                            idx: index
+                        })
+                    }
+                },
+                {
                     field: 'ledgerInfo.batchNum',
                     title: '批次号',
                     formatter: function (value, row, index) {
@@ -246,6 +256,16 @@
     <sys:treeselect id="materialLossInfoList{{idx}}_ledgerInfoType" name="materialLossInfoList[{{idx}}].ledgerInfo.type.id" value="{{row.ledgerInfo.type.id}}" labelName="materialLossInfoList{{idx}}.ledgerInfo.type.name" labelValue="{{row.ledgerInfo.type.name}}"
 							title="品名代码" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control  " disabled="disabled" allowClear="true"/>//-->
 </script>
+<script id="ledgerInfoTypeCodeTpl" type="text/html">
+    <input id="materialLossInfoList{{idx}}_ledgerInfoTypeCode"
+           name="materialLossInfoList[{{idx}}].ledgerInfo.type.code" type="text" class="form-control" readonly
+           value="{{row.ledgerInfo.type.code}}"/>
+</script>
+<script id="ledgerInfoTypeUnitTpl" type="text/html">
+    <input id="materialLossInfoList{{idx}}_ledgerInfoTypeUnit"
+           name="materialLossInfoList[{{idx}}].ledgerInfo.type.unit" type="text" class="form-control" readonly
+           value="{{row.ledgerInfo.type.unit}}"/>
+</script>
 <script id="ledgerInfoModelTpl" type="text/html">
     <input id="materialLossInfoList{{idx}}_ledgerInfoModel"
            name="materialLossInfoList[{{idx}}].ledgerInfo.model" type="text" class="form-control" readonly

src/main/webapp/webpage/modules/warehouse/materialloss/materialLossList.js

@@ -289,11 +289,13 @@ $(document).ready(function() {
 						<table class="ani table">
 						<thead>
 							<tr>
-								<th>物资名称</th>
+
 								<th>物资编号</th>
-								<th>品名代码</th>
+								<th>品名</th>
+								<th>代码</th>
 								<th>型号</th>
 								<th>单价</th>
+								<th>单位</th>
 								<th>批次号</th>
 								<th>货架</th>
 								<th>仓库</th>
@@ -308,9 +310,7 @@ $(document).ready(function() {
 	</script>
 	<script type="text/template" id="materialLossChild1Tpl">//<!--
 				<tr>
-					<td>
-						{{row.ledgerInfo.name}}
-					</td>
+
 					<td>
 						{{row.ledgerInfo.code}}
 					</td>
@@ -318,12 +318,18 @@ $(document).ready(function() {
 						{{row.ledgerInfo.type.name}}
 					</td>
 					<td>
+						{{row.ledgerInfo.type.code}}
+					</td>
+					<td>
 						{{row.ledgerInfo.model}}
 					</td>
 					<td>
 						{{row.ledgerInfo.amount}}
 					</td>
 					<td>
+						{{row.ledgerInfo.type.unit}}
+					</td>
+					<td>
 						{{row.ledgerInfo.batchNum}}
 					</td>
 					<td>

src/main/webapp/webpage/modules/warehouse/outbound/outboundList.js

@@ -321,16 +321,16 @@ function addRow(list, idx, tpl, row){
 </script>
 <script type="text/template" id="outboundChild1Tpl">//<!--
 				<tr>
-					<td>
-						{{row.ledgerInfo.code}}
-					</td>
+
 					<td>
 						{{row.ledgerInfo.type.name}}
 					</td>
 					<td>
 						{{row.ledgerInfo.type.code}}
 					</td>
-
+<td>
+						{{row.ledgerInfo.code}}
+					</td>
 					<td>
 						{{row.ledgerInfo.type.unit}}
 					</td>

src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingList.jsp

@@ -7,6 +7,7 @@
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
 	<%@include file="/webpage/include/treeview.jsp" %>
+	<%@include file="./../goods/logic.js"%>
 	<%@include file="profitWarehousingList.js" %>
 </head>
 <body>
@@ -113,4 +114,4 @@
 	</div>
 	</div>
 </body>
-</html>
+</html>
\ No newline at end of file