耗材管理列表

assets/js/main.js

@@ -1414,6 +1414,10 @@ app.factory('api_cmdb3', ['CMDBRestangular3', function (CMDBRestangular) {
         preservation: function (pdKey, data) {
             return hcService.customPOST(data, 'updData/' + pdKey, {})
         },
+        //新增
+        addData: function (pdKey, data) {
+            return hcService.customPOST(data, 'addData/' + pdKey, {})
+        },
         // 导出数据
         exportData: function (type, data) {
             return hcService.one(type, data, {});

assets/views/consumables/list.html

@@ -1,4 +1,18 @@
 <style>
+    .tab_bdItem_tab li {
+        margin-right: 24px;
+        height: 34px;
+        line-height: 34px;
+        cursor: pointer;
+    }
+    .tab_bdItem_tabItem.active {
+        color: #005395;
+    }
+    .tab_bdItem_tabItem {
+        font-size: 14px;
+        color: #ddd;
+        cursor: pointer;
+    }
     .listbote .flleft {
         float: left;
         margin-top: 10px;
@@ -64,7 +78,7 @@
 
     .new {
         width: 340px;
-        height: 404px;
+        /* height: 600px; */
         /* margin-left: -170px;
         margin-top: -202px;
         position: absolute;
@@ -84,11 +98,12 @@
     }
 
     .new_after {
-        margin-left: -170px;
-        margin-top: -202px;
         position: absolute;
         left: 50%;
         top: 50%;
+        transform: translate(-50%,-50%);
+        display: flex;
+        flex-direction: column;
     }
 
     /* 头部 */
@@ -115,13 +130,29 @@
 
     /* 主体 */
     .new .body {
+        overflow: auto;
         width: 298px;
-        height: 302px;
+        max-height: 400px;
         background-color: #f5f5f5;
         border: 1px #d1d1d1 solid;
         margin: 0 auto;
         border-radius: 2px;
-        margin-top: 10px
+        margin-top: 10px;
+        flex:1;
+    }
+    .new .body::-webkit-scrollbar {         /*滚动条整体样式*/
+        width:3px;
+        height:3px;
+    }
+    .new .body::-webkit-scrollbar-thumb {   /*滚动条里面小方块样式*/
+        border-radius:100px;
+        box-shadow:inset 0 0 5px rgba(0,0,0,0.2);
+        background:rgba(0,0,0,0.1);;
+    } 
+    .new .body::-webkit-scrollbar-track {   /*滚动条里面轨道样式*/
+        box-shadow:inset 0 0 5px rgba(0,0,0,0.2);
+        border-radius:0;
+        background:rgba(0,0,0,0.1);
     }
 
     .new .body .xing {
@@ -154,7 +185,7 @@
     .new .body .rigt .xiala {
         margin-top: 4px;
         width: 258px !important;
-        height: 32px;
+        height: auto;
         background-color: #f5f5f5
     }
 
@@ -162,7 +193,11 @@
         margin-top: 4px;
         width: 258px !important;
         height: 32px;
-        padding-left: 24px;
+    }
+    .new .body .rigt .price {
+        margin-top: 4px;
+        width: 100px !important;
+        height: 32px;
     }
 
     .new .submi {
@@ -171,9 +206,10 @@
 
     .new .submi input {
         margin-top: 10px;
+        margin-bottom: 10px;
         width: 78px;
         height: 32px;
-        border: 0；
+        border: none；
     }
 
     /* 保存 */
@@ -218,18 +254,18 @@
         margin: 0 8px 10px 0;
     }
 </style>
-<div class="bigbox" ng-controller="hc_consumablesCtrl">
-    <section id="page-title">
-        <div class="row">
-            <div class="col-sm-8">
-                <h1 class="mainTitle">耗材列表<i tooltip='耗材列表,点击操作处理任务' tooltip-placement="right"
-                        class="fa  ti-help-alt margin-left-10 fontcolor-five pointfont"></i></h1>
-            </div>
+<section id="page-title">
+    <div class="row">
+        <div class="col-sm-8">
+            <h1 class="mainTitle">耗材列表<i tooltip='耗材列表,点击操作处理任务' tooltip-placement="right"
+                    class="fa  ti-help-alt margin-left-10 fontcolor-five pointfont"></i></h1>
         </div>
-    </section>
-    <div class="listbote">
-        <div class="row searchlistback" style="margin-left:0;padding-bottom: 5px;" id="searchid">
-            <div class="col-xs-10">
+    </div>
+</section>
+<div class="bigbox" ng-controller="hc_consumablesCtrl">
+    <div class="listbote" id="searchid">
+        <div class="row" style="margin-left:0;padding-bottom: 5px;">
+            <div class="col-xs-9">
                 <!-- <div class="flleft">
                     <span>耗材分类：</span><br>
                     <ui-select class="pull-left selectzise" ng-model="select_val.search_data" theme="bootstrap">
@@ -241,8 +277,8 @@
                         </ui-select-choices>
                     </ui-select>
                 </div> -->
-                <div class="form-group inspectlistsearch ">
-                    <div class="pull-left" style="padding-top:8px;font-size:14px">耗材分类：</div>
+                <div class="form-group inspectlistsearch col-xs-12">
+                    <div class="pull-left" style="padding-top:8px;font-size:14px">耗材名称：</div>
                     <ui-select class="pull-right iptSize" ng-model="select_val.search_data" theme="bootstrap">
                         <ui-select-match>
                             {{select_val.search_data.name}}
@@ -252,26 +288,32 @@
                         </ui-select-choices>
                     </ui-select>
                 </div>
+                <!-- <div class="form-group inspectlistsearch ">
+                    <div class="pull-left" style="padding-top:8px;font-size:14px">耗材名称：</div>
+                    <input class="form-control pull-right inputcolor iptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="select_val.search_data.name" placeholder="" />
+                </div> -->
             </div>
-            <div class="col-xs-2 searchBtnBox">
+            <div class="col-xs-3 searchBtnBox">
                 <!-- <div class="btn btn_other margin-top-20" ng-click="new_data()">刷新</div> -->
+                <!-- <div class="btn btn_search" ng-click="searchData()">搜索</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 type="button" class="btn btn_remove" ng-click="removeData()" ng-disabled="selected.items.length==0"><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 class="btn btn_other" ng-click="hc_export()">导出</div> -->
             </div>
         </div>
-        <div class="tableList" ui-i18n="{{lang}} ">
-            <div id="grid" ui-grid="gridOptions " ui-grid-pagination external-scopes="$scope " ui-grid-resize-columns
-                ui-grid-auto-resize class="grid "></div>
-            <!-- <div id="grid" ui-grid="gridOptions" ui-grid-pagination external-scopes="$scope" ui-grid-resize-columns ui-grid-pinning ui-grid-selection ui-grid-move-columns ui-grid-exporter ui-grid-auto-resize class="grid"></div> -->
-        </div>
+    </div>
+    <div class="tableList" ui-i18n="{{lang}} ">
+        <div id="grid" ui-grid="gridOptions " ui-grid-pagination external-scopes="$scope " ui-grid-resize-columns ui-grid-selection
+            ui-grid-auto-resize class="grid "></div>
+        <!-- <div id="grid" ui-grid="gridOptions" ui-grid-pagination external-scopes="$scope" ui-grid-resize-columns ui-grid-pinning ui-grid-selection ui-grid-move-columns ui-grid-exporter ui-grid-auto-resize class="grid"></div> -->
     </div>
     <!-- 编辑弹框 -->
-    <div class="big_back" ng-show="hc_eject_big">
-        <div class="new" ng-class="hc_toedit">
+    <div class="big_back" ng-if="hc_eject_big">
+        <!-- <div class="new" ng-class="hc_toedit"> -->
+        <div class="new new_after">
             <div class="head">
-                <span>修改耗材信息</span>
+                <span>{{isAdds?'新增':'修改'}}耗材信息</span>
                 <span class="jiaocha" ng-click="close()">×</span>
             </div>
             <div class="body">
@@ -280,10 +322,14 @@
                     <div>*</div>
                     <div>*</div>
                     <div>*</div>
+                    <div>*</div>
+                    <div>*</div>
+                    <div ng-show="isWarehousing == 1">*</div>
+                    <div ng-show="isWarehousing == 1">*</div>
                 </div>
                 <form class="rigt">
                     <div class="div">
-                        <span>耗材名称：</span><br>
+                        <span>耗材分类：</span><br>
                         <ui-select class="pull-left selectzise xiala" ng-model="select_updata_name.updata_name"
                             theme="bootstrap">
                             <ui-select-match placeholder="{{hc_eject_name}}">
@@ -294,10 +340,14 @@
                             </ui-select-choices>
                         </ui-select>
                     </div>
+                    <!-- <div class="div">
+                        <span>耗材名称：</span><br>
+                        <input type="text" ng-model="hc_eject_title" class="xialaipt">
+                    </div> -->
                     <div class="div">
                         <span>品牌/型号：</span><br>
                         <ui-select class="pull-left selectzise xiala" ng-model="select_updata_pinpai.updata_pinpai"
-                            theme="bootstrap" ng-disabled="true">
+                            theme="bootstrap">
                             <ui-select-match placeholder="{{hc_eject_brandModel}}">
                                 {{select_updata_pinpai.updata_pinpai.name}}
                             </ui-select-match>
@@ -309,7 +359,7 @@
                     <div class="div">
                         <span>规格：</span><br>
                         <ui-select class="pull-left selectzise xiala" ng-model="select_updata_guige.updata_guige"
-                            theme="bootstrap" ng-disabled="true">
+                            theme="bootstrap">
                             <ui-select-match placeholder="{{hc_eject_specification}}">
                                 {{select_updata_guige.updata_guige.name}}
                             </ui-select-match>
@@ -319,14 +369,50 @@
                         </ui-select>
                     </div>
                     <div class="div">
+                        <span>供货公司：</span><br>
+                        <ui-select ng-click="refreshDat_company($select.search,companyIds)" class="pull-left selectzise xiala" ng-model="companyIds"
+                            theme="bootstrap" multiple reset-search-input="false" ng-change="changeCompany(companyIds)">
+                            <ui-select-match placeholder="请选择供货公司">
+                                {{$item.name}}
+                            </ui-select-match>
+                            <ui-select-choices repeat="n in updata_company" refresh="refreshDat_company($select.search)">
+                                <div ng-bind-html="n.name"></div>
+                            </ui-select-choices>
+                        </ui-select>
+                    </div>
+                    <div class="div">
+                        <span>费用区间：</span><br>
+                        <div>
+                            <input type="number" min="0" step="0.01" ng-model="startPrice" class="price" ng-change="changePrice(startPrice,'startPrice')">
+                            -
+                            <input type="number" min="0" step="0.01" ng-model="endPrice" class="price" ng-change="changePrice(endPrice,'endPrice')">
+                        </div>
+                    </div>
+                    <div class="div">
+                        <span>是否库存：</span><br>
+                        <ul class="tab_bdItem_tab">
+                            <li class="fl" ng-click="changeWarehousing(1)">
+                                <i class="tab_bdItem_tabItem iconfont icon-icon_weizuo" ng-class="isWarehousing== 1?'active':''"></i>
+                                <span>是</span>
+                            </li>
+                            <li class="fl" ng-click="changeWarehousing(0)">
+                                <i class="tab_bdItem_tabItem iconfont icon-icon_weizuo" ng-class="isWarehousing== 0?'active':''"></i>
+                                <span>否</span>
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="div" ng-show="isWarehousing == 1">
+                        <span>入库总数量：</span><br>
+                        <input type="number" ng-model="hc_eject_inventorySum" class="xialaipt" ng-change="changePrice(hc_eject_inventorySum,'hc_eject_inventorySum')" step="1" min="0">
+                    </div>
+                    <div class="div" ng-show="isWarehousing == 1">
                         <span>在库数量：</span><br>
-                        <input type="text" ng-model="hc_eject_inventoryNum" class="xialaipt">
+                        <input type="number" ng-model="hc_eject_inventoryNum" class="xialaipt" ng-change="changePrice(hc_eject_inventoryNum,'hc_eject_inventoryNum')" step="1" min="0">
                     </div>
                 </form>
             </div>
             <div class="submi ">
-                <input type="button" value="保存" class="preservation btn" ng-click="preservation()"
-                    ng-disabled="hc_eject_name==''||hc_eject_brandModel==''||hc_eject_specification==''||hc_eject_inventoryNum==''">
+                <input type="button" value="保存" class="preservation btn" ng-click="preservation()">
                 <input type="button" value="取消" class="cancel btn" ng-click="close()">
             </div>
         </div>