Home Explore Help
Register Sign In
depot-tianjin
/
depot-web-tianjin
Watch 6
Star 0
Fork 0
Files Issues 0 Pull Requests 1 Wiki
Browse Source

.

fanxw 4 years ago
parent
ff07be3feb
commit
b5d7ac03d6
2 changed files with 9 additions and 348 deletions
Split View Show Diff Stats
  1. 9 3
      src/main/resources/static/app/storage/product/controller/productCtrl.js
  2. 0 345
      src/main/resources/static/app/storage/product/views/inventoryQuantity-edit.html

+ 9 - 3
src/main/resources/static/app/storage/product/controller/productCtrl.js
View File 

@@ -112,10 +112,12 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
112 112 
 			var nums = parseFloat($scope.productEdit.specifications);//规格
113 113 
 			if($scope.productEdit.storage == "1"){//只有分件这样计算
114 114 
 				if($scope.productEdit.storageQuantity !== undefined && $scope.productEdit.storageQuantity !== ""){//入库
115 
-					$scope.storage = ((parseFloat($scope.productEdit.storageQuantity)*100) / (parseFloat(nums)*100));
115 
+					var storageQuantity = parseFloat($scope.productEdit.storageQuantity);
116 
+					$scope.storage = (storageQuantity*1000) / (nums*1000);
116 117 
 				}
117 118 
 				if($scope.productEdit.outboundQuantity !== undefined || $scope.productEdit.outboundQuantity !== ""){//出库
118 
-					$scope.outbound = ((parseFloat($scope.productEdit.outboundQuantity)*100) / (parseFloat(nums)*100));
119 
+					var outboundQuantity = parseFloat($scope.productEdit.outboundQuantity);
120 
+					$scope.outbound = (outboundQuantity*1000) / (nums*1000);
119 121 
 				}
120 122 
 			}
121 123 
 
@@ -256,7 +258,11 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
256 258
257 259 
 	// 计算库存数量
258 260 
 	$scope.calculate = function() {
259 
-		var nums = parseFloat($scope.productEdit.specifications);//规格
261 
+		var nums = $scope.productEdit.specifications;//规格
262 
+		var re = /^([0-9]+.[0-9]{3})[0-9]*/;
263 
+		nums = nums.toString().replace(re,"$1");
264 
+		nums = parseFloat(nums);
265 
+		$scope.productEdit.specifications = nums;
260 266 
 		if($scope.storage !== undefined && $scope.storage !== ""){//入库
261 267 
 			var storageQuantity = parseFloat($scope.storage);
262 268 
 			$scope.productEdit.storageQuantity = (storageQuantity * (nums*1000))/1000;

+ 0 - 345
src/main/resources/static/app/storage/product/views/inventoryQuantity-edit.html
View File 

@@ -1,345 +0,0 @@
1 
-<!-- MAIN CONTENT -->
2 
-<div id="content">
3 
-
4 
-	<!-- widget grid -->
5 
-	<section id="widget-grid" widget-grid>
6 
-
7 
-		<!-- START ROW -->
8 
-		<div class="row">
9 
-
10 
-			<!-- NEW COL START -->
11 
-			<article class="col-sm-12 col-md-12 col-lg-12">
12 
-
13 
-				<!-- Widget ID (each widget will need unique ID)-->
14 
-				<div jarvis-widget id="form-grid-widget"
15 
-					 data-widget-colorbutton="false" data-widget-editbutton="false"
16 
-					 data-widget-custombutton="false">
17 
-
18 
-					<!-- widget div-->
19 
-					<div>
20 
-
21 
-						<!-- widget content -->
22 
-						<div class="widget-body no-padding">
23 
-							<form id="product-form" class="smart-form ng-pristine ng-valid" data-validator-option="validateOptions" novalidate="novalidate">
24 
-								<button type="submit" class="bv-hidden-submit" style="display: none; width: 0px; height: 0px;"></button>
25 
-								<header>
26 
-									<a href-void class="btn btn-default btn-xs" ng-click="back()"><i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;</a>
27 
-								</header>
28 
-								<header>基础信息</header>
29 
-								<fieldset>
30 
-									<table style="width:70%; border-width:5px; margin-left:15%;position:relative;margin-right:15%;">
31 
-										<table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
32 
-											<!--第一个tr开始 -->
33 
-											<tr>
34 
-												<th width='15%'>
35 
-													<label class="label">仓房/油罐名称：<span style="color: red;">*</span></label>
36 
-												</th>
37 
-												<th width='15%'>
38 
-													<label class="select" ng-hide="edits">
39 
-														<select ng-model="productEdit.houseId" name="houseId" class="form-control input-sm"
40 
-																ng-options="store.storehouseId as store.storehouseName for store in productHouse"
41 
-																ng-change="loadWare(productEdit.houseId)" required>
42 
-															<option value="">--请选择--</option>
43 
-														</select> <i></i>
44 
-													</label>
45 
-													<label class="input" ng-show="edits">
46 
-														<i class="input"></i>
47 
-														<input type="text" name="houseId" ng-model="storehouseName" readonly="readonly"/>
48 
-													</label>
49 
-												</th>
50 
-												<th width='15%'>
51 
-													<label class="label">货位名称：<span style="color: red;">*</span></label>
52 
-												</th>
53 
-												<th width='15%'>
54 
-													<label class="select">
55 
-														<select ng-model="productEdit.warehouseId" name="warehouseId" class="form-control input-sm"
56 
-																ng-options="ware.warehouseId as ware.warehouseName for ware in warelist" ng-disabled="isWrite" required>
57 
-															<option value="">--请选择--</option>
58 
-														</select> <i></i>
59 
-													</label>
60 
-												</th>
61 
-												<th width='15%'>
62 
-													<label class="label">仓房/油罐类型：</label>
63 
-												</th>
64 
-												<th width='15%'>
65 
-													<label class="select">
66 
-														<select ng-model="productEdit.storehouseType"
67 
-																name="storehouseType" ng-options="enum.enumid as enum.enumname for enum in styleType">
68 
-															<option value="">--请选择--</option>
69 
-														</select> <i></i>
70 
-													</label>
71 
-												</th>
72 
-											</tr>
73 
-											<tr>
74 
-												<th width='15%'>
75 
-													<label class="label">粮油品种：<span style="color: red;">*</span></label>
76 
-												</th>
77 
-												<th width='15%'>
78 
-													<label class="select">
79 
-														<select name="lspz" ng-model="productEdit.lspz" ng-change="getGrainDetailKind()" required>
80 
-															<option value="">--请选择--</option>
81 
-															<option value="7038">小麦粉</option>
82 
-															<option value="7051">混合小麦粉</option>
83 
-															<option value="7052">压榨成品油</option>
84 
-															<option value="7050">浸出成品油</option>
85 
-															<option value="7107">大米及优质大米</option>
86 
-														</select> <i></i>
87 
-													</label>
88 
-												</th>
89 
-												<th width='15%'>
90 
-													<label class="label">明细品种：<span style="color: red;">*</span></label>
91 
-												</th>
92 
-												<th width='15%'>
93 
-													<label class="select" id="grainDetailKind-label">
94 
-														<multi-select-tree
95 
-																disabled-tree="disabled"
96 
-																data-input-model="grainDetailKindTreeData"
97 
-																data-output-model="productEdit.lsmxpz"
98 
-																data-default-label="--请选择--" name="lsmxpz"
99 
-																multi-select="false"
100 
-																select-only-leafs="false">
101 
-														</multi-select-tree>
102 
-														<em><span style="color: #D56161;margin-top:6px;padding:0 1px;font-style:normal;font-size:11px;line-height:15px;" id="grainDetailKind-error"></span></em>
103 
-													</label>
104 
-												</th>
105 
-												<th width='15%'>
106 
-													<label class="label">粮油性质：<span style="color: red;">*</span></label>
107 
-												</th>
108 
-												<th width='15%'>
109 
-													<label class="select">
110 
-														<multi-select-tree
111 
-																disabled-tree="disabled"
112 
-																data-input-model="grainAttributeTreeData"
113 
-																data-output-model="productEdit.nature"
114 
-																data-default-label="--请选择--"
115 
-																name="nature"
116 
-																select-only-leafs="true"
117 
-																multi-select="false">
118 
-														</multi-select-tree>
119 
-														<em><span style="color: #D56161;margin-top:6px;padding:0 1px;font-style:normal;font-size:11px;
120 
-													 line-height:15px;" id="grainAttribute-error"></span></em>
121 
-													</label>
122 
-												</th>
123 
-											</tr>
124 
-											<tr>
125 
-												<th width='15%'>
126 
-													<label class="label">粮油等级：<span style="color: red;">*</span></label>
127 
-												</th>
128 
-												<th width='15%'>
129 
-													<label class="select">
130 
-														<select ng-model="productEdit.levels" name="levels"
131 
-																ng-options="enum.enumid as enum.enumname for enum in dicDataList[1002]" required>
132 
-															<option value="">--请选择--</option>
133 
-														</select><i></i>
134 
-													</label>
135 
-												</th>
136 
-												<th width='15%'>
137 
-													<label class="label">产地：</label>
138 
-												</th>
139 
-												<th width='15%'>
140 
-													<label class="select"  id="grainProducingArea-label">
141 
-														<multi-select-tree
142 
-																disabled-tree="disabled"
143 
-																data-input-model="grainProducingAreaTreeData"
144 
-																data-default-label="--请选择--" name="grainProducingArea"
145 
-																multi-select="false"
146 
-																select-only-leafs="false"
147 
-																data-output-model="productEdit.places"
148 
-																name="places"
149 
-																data-callback="selectOnly1Or2(item, selectedItems)">
150 
-														</multi-select-tree>
151 
-														<em><span style="color: #D56161;margin-top:6px;padding:0 1px;font-style:normal;font-size:11px;
152 
-					 line-height:15px;" id="grainProducingArea-error"></span></em>
153 
-													</label>
154 
-												</th>
155 
-												<th width='15%'>
156 
-													<label class="label txt-bg-red">入库日期：</label>
157 
-												</th>
158 
-												<th width='15%'>
159 
-													<label class="input">
160 
-														<label class="input">
161 
-															<input type="text" name="productionDate" ng-model="productEdit.productionDate"
162 
-																   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})">
163 
-														</label>
164 
-													</label>
165 
-												</th>
166 
-											</tr>
167 
-											<tr>
168 
-												<th width='15%'>
169 
-													<label class="label txt-bg-red">存储方式：<span style="color: red;">*</span></label>
170 
-												</th>
171 
-												<th width='15%'>
172 
-													<label class="select">
173 
-														<select name="storage" ng-model="productEdit.storage" required>
174 
-															<option value="">--请选择--</option>
175 
-															<option value="1">分件</option>
176 
-															<option value="2">油罐</option>
177 
-														</select> <i></i>
178 
-													</label>
179 
-												</th>
180 
-												<th></th>
181 
-												<th></th>
182 
-												<th></th>
183 
-												<th></th>
184 
-											</tr>
185 
-										</table>
186 
-
187 
-										<!--存储方式切换--><!--分件-->
188 
-										<table ng-show="productEdit.storage==1" class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
189 
-											<tr>
190 
-												<th style="height:20px;" colspan="6"></th>
191 
-											</tr>
192 
-											<tr>
193 
-												<th width='15%'>
194 
-													<label class="label txt-bg-red">规格（吨）：<span style="color: red;">*</span></label>
195 
-												</th>
196 
-												<th width='15%'>
197 
-													<label class="input">
198 
-														<i class="input"></i>
199 
-														<input type="text" name="specifications" ng-model="productEdit.specifications"
200 
-															   ng-blur="calculate()" onkeyup="this.value=this.value.match(/\d+(\.\d{0,5})?/) ? this.value.match(/\d+(\.\d{0,5})?/)[0] : '' " required/>
201 
-													</label>
202 
-												</th>
203 
-												<th></th>
204 
-												<th></th>
205 
-												<th></th>
206 
-												<th></th>
207 
-											</tr>
208 
-											<tr>
209 
-												<th width='15%'>
210 
-													<label class="label txt-bg-red">件数：<span style="color: red;">*</span></label>
211 
-												</th>
212 
-												<th width='15%'>
213 
-													<label class="input">
214 
-														<i class="input"></i>
215 
-														<input type="text" name="storage" ng-model="storage"
216 
-															   ng-blur="calculate()" onkeyup="this.value=this.value.match(/^\+?[1-9]\d*$/) ? this.value.match(/\d+(\d{0,5})?/)[0] : '' " required/>
217 
-													</label>
218 
-												</th>
219 
-												<th width='15%'>
220 
-													<label class="label txt-bg-red">库存数量（吨）：</label>
221 
-												</th>
222 
-												<th width='15%'>
223 
-													<label class="input">
224 
-														<i class="input"></i>
225 
-														<input type="text" name="inventoryQuantity" ng-model="productEdit.inventoryQuantity" ng-readonly="true"/>
226 
-													</label>
227 
-												</th>
228 
-												<th width='15%'>
229 
-													<label class="label txt-bg-red">记录日期：</label>
230 
-												</th>
231 
-												<th width='15%'>
232 
-													<label class="input">
233 
-														<i class="input"></i>
234 
-														<input type="text" name="recordDateJJ" ng-model="productEdit.recordDate"
235 
-															   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})"/>
236 
-													</label>
237 
-												</th>
238 
-											</tr>
239 
-											<tr>
240 
-												<th width='15%'>
241 
-													<label class="label txt-bg-red">记录人：</label>
242 
-												</th>
243 
-												<th width='15%'>
244 
-													<label class="input">
245 
-														<i class="input"></i>
246 
-														<input type="text" name="creater" ng-model="productEdit.creater" ng-readonly="true"/>
247 
-													</label>
248 
-												</th>
249 
-												<th width='15%'>
250 
-													<label class="label txt-bg-red">审核人：</label>
251 
-												</th>
252 
-												<th width='15%'>
253 
-													<label class="input">
254 
-														<i class="input"></i>
255 
-														<input type="text" name="approvePeople" ng-model="productEdit.approvePeople"/>
256 
-													</label>
257 
-												</th>
258 
-												<th></th>
259 
-												<th></th>
260 
-											</tr>
261 
-										</table>
262 
-
263 
-										<!--存储方式切换--><!--油罐-->
264 
-										<table ng-show="productEdit.storage==2" class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
265 
-											<tr>
266 
-												<th style="height:20px;" colspan="6"></th>
267 
-											</tr>
268 
-											<tr>
269 
-												<th width='15%'>
270 
-													<label class="label txt-bg-red">库存数量（吨）：<span style="color: red;">*</span></label>
271 
-												</th>
272 
-												<th width='15%'>
273 
-													<label class="input">
274 
-														<i class="input"></i>
275 
-														<input type="text" name="inventoryQuantity" ng-model="productEdit.inventoryQuantity"
276 
-															   required/>
277 
-													</label>
278 
-												</th>
279 
-												<th width='15%'>
280 
-													<label class="label txt-bg-red">液位高度（m）：</label>
281 
-												</th>
282 
-												<th width='15%'>
283 
-													<label class="input">
284 
-														<i class="input"></i>
285 
-														<input type="text" name="liquidLevel" ng-model="productEdit.liquidLevel"/>
286 
-													</label>
287 
-												</th>
288 
-											</tr>
289 
-											<tr>
290 
-												<th width='15%'>
291 
-													<label class="label txt-bg-red">记录日期：</label>
292 
-												</th>
293 
-												<th width='15%'>
294 
-													<label class="input">
295 
-														<i class="input"></i>
296 
-														<input type="text" name="recordDateYG" ng-model="productEdit.recordDate"
297 
-															   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})"/>
298 
-													</label>
299 
-												</th>
300 
-												<th width='15%'>
301 
-													<label class="label txt-bg-red">记录人：</label>
302 
-												</th>
303 
-												<th width='15%'>
304 
-													<label class="input">
305 
-														<i class="input"></i>
306 
-														<input type="text" name="creater" ng-model="productEdit.creater" ng-readonly="true"/>
307 
-													</label>
308 
-												</th>
309 
-												<th width='15%'>
310 
-													<label class="label txt-bg-red">审核人：</label>
311 
-												</th>
312 
-												<th width='15%'>
313 
-													<label class="input">
314 
-														<i class="input"></i>
315 
-														<input type="text" name="approvePeople" ng-model="productEdit.approvePeople"/>
316 
-													</label>
317 
-												</th>
318 
-											</tr>
319 
-											<tr>
320 
-												<th width='15%'>
321 
-													<label class="label txt-bg-red">其他：</label>
322 
-												</th>
323 
-												<th colspan="5">
324 
-													<label class="input">
325 
-														<i class="input"></i>
326 
-														<input type="text" name="others" ng-model="productEdit.others"/>
327 
-													</label>
328 
-												</th>
329 
-											</tr>
330 
-										</table>
331 
-									</table>
332 
-								</fieldset>
333 
-
334 
-								<footer class="text-align-center">
335 
-									<button type="button" class="btn btn-default" ng-click="retList()">取消</button>
336 
-									<button type="button" ng-hide="disabled" class="btn btn-primary" ng-click="saveData()">保存</button>
337 
-								</footer>
338 
-							</form>
339 
-						</div>
340 
-					</div>
341 
-				</div>
342 
-			</article>
343 
-		</div>
344 
-	</section>
345 
-</div>