设备器材入库中器材入库添加单价(万元),入库日期两个字段

src/main/resources/static/app/business/device/controller/deviceStorageCtrl.js

@@ -222,7 +222,7 @@ angular.module('app.business').controller("deviceStorageCtrl", function ($scope,
         $scope.dSbxxsjy.sbbm = sbyqdm; // 设备编码(编号)
         $scope.dSbxxsjy.szdwdm = $rootScope.orgInfo.orgId;// 所在单位代码
         $scope.dSbxxsjy.sbdwmc = '1'; // 设备单位名称（平方米/立方米/米吨）
-        $scope.dSbxxsjy.rkrq = $("#disablerkrq").val();
+        $scope.dSbxxsjy.rkrq = $("#disableQcrkrq").val();
         $scope.dSbxxsjy.scrq = $("#disablescrq").val();
         $scope.dSbxxsjy.jdsj = $("#jdsjqc").val();
         $scope.dSbxxsjy.createDate = $("#createDate").val();

src/main/resources/static/app/business/device/views/deviceStorage-edit.html

@@ -250,12 +250,29 @@
                                                 </label>
                                             </section>
                                             <section class="col col-3">
+                                                <label class="label">单价(万元)：</label>
+                                                <label class="input">
+                                                    <input type="text" ng-model="dSbxxsjy.cgjg"
+                                                           ng-readonly="isNotEdit"
+                                                           placeholder="单价" validInteger="true">
+                                                </label>
+                                            </section>
+                                            <section class="col col-3">
                                                 <label class="label">数量：<span style="color: red;">*</span></label>
                                                 <label class="input">
                                                     <input type="number" ng-model="dSbxxsjy.sbsl" name="sbsl"
                                                            ng-readonly="isNotEdit" required placeholder="数量" validInteger="true">
                                                 </label>
                                             </section>
+                                        </div>
+                                        <div class="row">
+                                            <section class="col col-3">
+                                                <label class="label">入库日期：</label>
+                                                <label class="input">
+                                                    <input type="text" ng-model="dSbxxsjy.rkrq" name="rkrq" class="Wdate" id="disableQcrkrq"
+                                                           ng-readonly="true" ng-disabled="isNotEdit" required onClick="WdatePicker({lang:'zh-cn'})">
+                                                </label>
+                                            </section>
                                             <section class="col col-3">
                                                 <label class="label">存放位置：</label>
                                                 <label class="select">
@@ -266,8 +283,6 @@
                                                     </select>
                                                 </label>
                                             </section>
-                                        </div>
-                                        <div class="row">
                                             <section class="col col-3">
                                                 <label class="label">货架：</label>
                                                 <label class="select">
@@ -278,16 +293,18 @@
                                                     </select>
                                                 </label>
                                             </section>
-                                            <section class="col col-3">
-                                                <label class="label">设备状态：</label>
-                                                <label class="select">
-                                                    <select ng-model="dSbxxsjy.status" name="status" ng-disabled="isNotEdit" required>
-                                                        <option value="">--请选择--</option>
-                                                        <option value="1" ng-selected="1">正常</option>
-                                                        <option value="0">已作废</option>
-                                                    </select>
-                                                </label>
-                                            </section>
+<!--                                             <section class="col col-3"> -->
+<!--                                                 <label class="label">设备状态：</label> -->
+<!--                                                 <label class="select"> -->
+<!--                                                     <select ng-model="dSbxxsjy.status" name="status" ng-disabled="isNotEdit" required> -->
+<!--                                                         <option value="">--请选择--</option> -->
+<!--                                                         <option value="1" ng-selected="1">正常</option> -->
+<!--                                                         <option value="0">已作废</option> -->
+<!--                                                     </select> -->
+<!--                                                 </label> -->
+<!--                                             </section> -->
+                                        </div>
+                                        <div class="row">
                                             <section class="col col-3">
                                                 <label class="input">
                                                     <label class="label">操作人：</label>
@@ -304,8 +321,6 @@
                                                            placeholder="操作时间">
                                                 </label>
                                             </section>
-                                        </div>
-                                        <div class="row">
                                             <section class="col col-6">
                                                 <label class="label">设备描述：</label>
                                                 <label class="input">
@@ -313,6 +328,8 @@
                                                            ng-readonly="isNotEdit">
                                                 </label>
                                             </section>
+                                        </div>
+                                        <div class="row">
                                             <section class="col col-3">
                                                 <label class="input">
                                                     <label class="label">检定单位：</label>