耗材分类设置

assets/js/controllers/consumables/consumablesCtrl.js

@@ -18,6 +18,12 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
         "sum":10,
         "consumable":{}
     }
+    //新增
+    $scope.addData = function(){
+        $rootScope.hc_eject_big = true; //编辑弹出框
+        $rootScope.hc_eject_sma = true; //编辑弹出框
+        $rootScope.hc_toedit = "new_after";
+    }
     // 监听下拉框搜索
     $scope.$watch('select_val.search_data', function(val) {
         // if (val == undefined) {
@@ -413,6 +419,35 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
                 '<div class="ui-grid-cell-contents">{{row.entity.specification}}</div>' +
                 '</div>'
         },
+        
+        {
+            name: 'price',
+            displayName: '费用区间',
+            width: '12%',
+            minWidth: '120',
+            cellTemplate: '<div>' +
+                '<div class="ui-grid-cell-contents">{{row.entity.start_price}}-{{row.entity.end_price}}</div>' +
+                '</div>'
+        },
+        
+        {
+            name: 'company_ids',
+            displayName: '供货公司',
+            width: '14%',
+            minWidth: '120',
+            cellTemplate: '<div>' +
+                '<div class="ui-grid-cell-contents">{{row.entity.company_ids}}</div>' +
+                '</div>'
+        },
+        {
+            name: 'is_inventory',
+            displayName: '是否库存',
+            width: '14%',
+            minWidth: '120',
+            cellTemplate: '<div>' +
+                '<div class="ui-grid-cell-contents">{{row.entity.is_inventory}}</div>' +
+                '</div>'
+        },
         {
             name: 'inventoryNum',
             displayName: '在库数量',
@@ -771,6 +806,7 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
         $interval.cancel($scope.timer)
     });
 }]);
+
 //操作按钮权限控制
 app.controller('hc_caozuoCtrl', ['$rootScope', '$http', '$scope', '$modal', '$state', function($rootScope, $http, $scope, $modal, $state) {
     // 编辑按钮

assets/views/consumables/list.html

@@ -255,6 +255,8 @@
             </div>
             <div class="col-xs-2 searchBtnBox">
                 <!-- <div class="btn btn_other margin-top-20" ng-click="new_data()">刷新</div> -->
+                <div class="btn btn_search" ng-click="addData()"><span translate="list.button.CREATE">Add Data</span></div>
+                <div type="button" class="btn btn_remove" ng-click="removeData()" ng-disabled="selected.items.length==0" ng-mousedown="changeRemoveClass()"><span translate="list.button.REMOVE">Remove First Row</span></div>
                 <div class="btn btn_clean" ng-click="reset()">重置</div>
                 <div class="btn btn_other" ng-click="hc_export()">导出</div>
             </div>

assets/views/system/organization/hc_flwh.html

@@ -204,7 +204,7 @@
     .shouxing{
         cursor: pointer;
         display: inline-block;
-        width: 54px;
+        width: 100px;
         height: 51px;
         overflow: hidden;
         white-space: nowrap;
@@ -267,7 +267,7 @@
         <!-- 品牌型号 -->
         <div class="mainDivRight">
             <div class="mainDiv-head">
-                <span>{{tit}} 品牌型号</span>
+                <span>品牌型号</span>
                 <div class="mainDiv-head-right">
                     <span class="mainDivLeft-span span-3 pointfont" ng-click="add_xinghao()">新增</span>
                 </div>
@@ -311,7 +311,7 @@
         <!-- 规格 -->
         <div class="mainDivRight">
             <div class="mainDiv-head">
-                <span>{{tit}} 规格</span>
+                <span>规格</span>
                 <div class="mainDiv-head-right">
                     <span class="mainDivLeft-span span-3 pointfont" ng-click="add_guige()">新增</span>
                 </div>