fanxw 5 년 전
부모
커밋
dfc3b92bd7

+ 8 - 0
src/main/resources/static/app/basic/warehouse/controller/warehouseCtrl.js

@@ -315,4 +315,12 @@ angular.module('app.basic')
315
 	$scope.cancel = function() {
315
 	$scope.cancel = function() {
316
 		$uibModalInstance.close();
316
 		$uibModalInstance.close();
317
 	}
317
 	}
318
+
319
+	//出入库状态
320
+	$scope.crkzt = [
321
+                    {"id":"1","name":"空仓"},
322
+                    {"id":"2","name":"入库中"},
323
+                    {"id":"3","name":"封仓"},
324
+                    {"id":"4","name":"出库中"}
325
+                    ];
318
 })
326
 })

+ 10 - 10
src/main/resources/static/app/basic/warehouse/views/warehouse-edit.html

@@ -74,16 +74,16 @@
74
 							oninput="if(value.length>8) value=value.slice(0,8)" />
74
 							oninput="if(value.length>8) value=value.slice(0,8)" />
75
 						</label>
75
 						</label>
76
 					</section>
76
 					</section>
77
-<!-- 					<section class="col col-4"> -->
78
-<!-- 						<label class="label">货位使用状态</label> <label class="select"> -->
79
-<!-- 							<select ng-model="warehouse.warehouseStatus" ng-disabled="true" placeholder="空仓" -->
80
-<!-- 								ng-options="enum.enumid as enum.enumname for enum in dicDataList[1055]" -->
81
-<!-- 								class="form-control"> -->
82
-<!-- 								<option value="">空仓</option> -->
83
-<!-- 							</select> -->
84
-<!-- 						</label> -->
85
-<!-- 					</section> -->
86
-					<section class="col col-8">
77
+					<section class="col col-4">
78
+						<label class="label">出入库状态<span style="color: red;margin-left: 5px;text-align: center;">*</span></label> 
79
+						<label class="select">
80
+							<select ng-model="warehouse.crkStatus" ng-disabled="isNotEdit" name="crkStatus"
81
+								ng-options="enum.id as enum.name for enum in crkzt"
82
+								class="form-control" required>
83
+							</select>
84
+						</label>
85
+					</section>
86
+					<section class="col col-4">
87
 						<label class="label">货位图片</label>
87
 						<label class="label">货位图片</label>
88
 						<div class="input input-file">
88
 						<div class="input input-file">
89
 				            <span class="button">
89
 				            <span class="button">

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1866 - 1858
src/main/resources/static/build/app.js