Merge branch 'dev_oracle_neo' into 'dev_oracle'

[dev] fixed uigrid to dxgrid and view active menu

See merge request root/atms!161

atms-web/src/main/webapp/app/framework/app-approve/app-approve.html

@@ -88,7 +88,7 @@
             </div>
             <div class="vat-preview-input-invoice" id="mainPreviewDiv">
                 <div id="mainAreaDiv" class="main-area">
-                    <div class="inputInvoiceGrid" ui-grid-expandable ui-grid="gridOptions">
+                    <div class="inputInvoiceGrid" id="grid" dx-data-grid="gridOptions">
                         <div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span>
                         </div>
                     </div>
@@ -96,4 +96,71 @@
             </div>
         </div>
     </div>
+    <script type="text/ng-template" id="addNewProduct.html">
+        <div class="modal-header">
+            <div class="modal-title" id="modal-title">新增产品</div>
+        </div>
+        <div class="modal-body" id="modal-body">
+            <div class="content">
+                <form name="add-product-form" id="add-product-form" class="form-horizontal">
+                    <div class="form-group" style="margin-bottom:5px">
+                        <label for="year" class="col-sm-3 control-label">年份</label>
+                        <div class="col-sm-8 input-group">
+                            <input class="form-control" name="year" id="year" ng-model="product.fYear" maxlength="50">
+                        </div>
+                    </div>
+
+                    <div class="form-group" style="margin-bottom:5px">
+                        <label for="setId" class="col-sm-3 control-label">产品标识</label>
+                        <div class="col-sm-8 input-group">
+                            <input class="form-control" name="setId" id="setId" ng-model="product.fSetId" maxlength="50">
+                        </div>
+                    </div>
+                    <div class="form-group" style="margin-bottom:5px">
+                        <label for="setCode" class="col-sm-3 control-label">产品编号</label>
+                        <div class="col-sm-8 input-group">
+                            <input class="form-control" name="setCode" id="setCode" ng-model="product.fSetCode" maxlength="50">
+                        </div>
+                    </div>
+                    <div class="form-group" style="margin-bottom:5px">
+                        <label for="aliaSetCode" class="col-sm-3 control-label">关联产品</label>
+                        <div class="col-sm-8 input-group">
+                            <div class="dx-field-value" style="width:265px">
+                                <div dx-drop-down-box="treeBoxOptions">
+                                    <div data-options="dxTemplate: { name: 'content' }">
+                                        <div dx-tree-view="treeBoxOptions.treeView"></div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="form-group" style="margin-bottom:5px">
+                        <label for="setName" class="col-sm-3 control-label">产品描述</label>
+                        <div class="col-sm-8 input-group">
+                            <input class="form-control" name="setName" id="setName" ng-model="product.fSetName" maxlength="50">
+                        </div>
+                    </div>
+
+                    <div class="form-group" style="margin-bottom:5px">
+                        <label for="manager" class="col-sm-3 control-label">财务主管</label>
+                        <div class="col-sm-8 input-group">
+                            <input class="form-control" name="manager" id="manager" ng-model="product.fManager" maxlength="50">
+                        </div>
+                    </div>
+
+                    <div class="form-group" style="margin-bottom:5px">
+                        <label for="startDate" class="col-sm-3 control-label">启用日期</label>
+                        <div class="overview-picker">
+                            <input type="text" id="productStartDate" class="datepicker vat-subheader" style="width:200px;" readonly="readonly" />
+                            <i class="fa fa-calendar vat-subheader red-color" style="width:20px;"></i>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancel()">{{'Cancel' | translate }}</button>
+        </div>
+    </script>
 </div>
\ No newline at end of file