feat: 耗材增加单位

assets/js/controllers/consumables/consumablesCtrl.js

@@ -6,10 +6,9 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
     i18nService.setCurrentLang($scope.lang);
     $scope.myData = [];
     var loginUser = $rootScope.user;
-    // $scope.searchData = function(){
-    //     $scope.fileData.consumable["name"] = $scope.select_val.search_data.name;
-    //     $scope.refreshData('expand-right', $scope.fileData);
-    // }
+    $scope.searchData = function(){
+        $scope.refreshData('expand-right', $scope.fileData);
+    }
 
     // 修改供货公司
     $scope.changeCompany = function(e){
@@ -34,6 +33,7 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
     }
     // 清空表单
     $scope.clearForm = function(){
+        $rootScope.hc_eject_unit = '';
         $rootScope.hc_eject_name_caozuo = '';
         $rootScope.hc_eject_brandModel_caozuo = '';
         $rootScope.hc_eject_specification_caozuo = '';
@@ -45,6 +45,7 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
         $rootScope.hc_eject_inventorySum_caozuo = '';
         delete $rootScope.hc_eject_id_caozuo;
         // -------------------
+        $scope.hc.unit = ''
         $scope.select_updata_name.updata_name = {name:''};
         $scope.select_updata_pinpai.updata_pinpai = {name:''};
         $scope.select_updata_guige.updata_guige = {name:''};
@@ -65,92 +66,12 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
         // $rootScope.hc_toedit = "new_after";
     }
     // 监听下拉框搜索
-    $scope.$watch('select_val.search_data', function (val) {
-        // if (val == undefined) {
-        //     $scope.wt_data_display = true;
-        // } else if (val.name == '全部') {
-        //     wt_data = { consumable: {} };
-        //     $scope.wt_data_display = false;
-        //     if ($scope.fenye == undefined) {
-        //         $scope.fenye = 0
-        //     };
-        //     $scope.memoryfilterData = {
-        //             idx: $scope.fenye,
-        //             sum: 10
-        //         }
-        //         //获取列表数据
-        //     $scope.refreshData = function(style, filterData) {
-        //         // var data1={idx: 0, sum: 10};
-        //         var pdKey = "consumable";
-        //         $scope.myData = [];
-        //         api_cmdb3.fetchDataList(pdKey, filterData).then(function(data) {
-        //             // console.log(data.list);
-        //             if (data.list) {
-        //                 var myData = Restangular.stripRestangular(data);
-        //                 var list = [];
-        //                 $scope.gridOptions['totalItems'] = myData.totalNum;
-        //                 $scope.myData = myData.list;
-        //                 for (var i = 0; i < $scope.myData.length; i++) {
-        //                     $scope.myData[i]['item'] = i + 1 + filterData.idx * filterData.sum
-        //                 }
-        //             } else {
-        //                 SweetAlert.swal({
-        //                     title: "系统错误",
-        //                     text: "请稍后再试!",
-        //                     type: "error"
-        //                 });
-        //             }
-        //             $scope.ldloading[style.replace('-', '_')] = false;
-        //         }, function() {
-        //             $scope.ldloading[style.replace('-', '_')] = false;
-        //         });
-        //     };
-        //     $scope.refreshData('expand-right', $scope.memoryfilterData);
-        // } else {
-        //     wt_data = { consumable: { "name": val.name } };
-        //     $scope.wt_data_display = false;
-        //     if ($scope.fenye == undefined) {
-        //         $scope.fenye = 0
-        //     };
-        //     $scope.memoryfilterData = {
-        //             idx: $scope.fenye,
-        //             sum: 10,
-        //             consumable: { "name": val.name }
-        //         }
-        //         //获取列表数据
-        //     $scope.refreshData = function(style, filterData) {
-        //         var pdKey = "consumable";
-        //         $scope.myData = [];
-        //         // $scope.gridOptions['sum'] = filterData.sum;
-        //         api_cmdb3.fetchDataList(pdKey, filterData).then(function(data) {
-        //             // console.log(data.list);
-        //             if (data.list) {
-        //                 var myData = Restangular.stripRestangular(data);
-        //                 var list = [];
-        //                 $scope.gridOptions['totalItems'] = myData.totalNum;
-        //                 $scope.myData = myData.list;
-        //                 for (var i = 0; i < $scope.myData.length; i++) {
-        //                     $scope.myData[i]['item'] = i + 1 + filterData.idx * filterData.sum
-        //                 }
-        //             } else {
-        //                 SweetAlert.swal({
-        //                     title: "系统错误",
-        //                     text: "请稍后再试!",
-        //                     type: "error"
-        //                 });
-        //             }
-        //             $scope.ldloading[style.replace('-', '_')] = false;
-        //         }, function() {
-        //             $scope.ldloading[style.replace('-', '_')] = false;
-        //         });
-        //     };
-        //     $scope.refreshData('expand-right', $scope.memoryfilterData);
-        // }
-        if (val) {
-            $scope.fileData.consumable["keyWord"] = val.name;
-            $scope.refreshData('expand-right', $scope.fileData);
-        }
-    })
+    // $scope.$watch('select_val.search_data', function (val) {
+    //     if (val) {
+    //         $scope.fileData.consumable["keyWord"] = val.name;
+    //         $scope.refreshData('expand-right', $scope.fileData);
+    //     }
+    // })
     $scope.new_data = function () {
         $scope.myData = [];
         $scope.refreshData('expand-right', $scope.memoryfilterData);
@@ -161,6 +82,7 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
     // $rootScope.hc_toedit = "new_top";
     // 关闭编辑弹出框
     $scope.close = function () {
+        $rootScope.hc_eject_unit = '';
         $rootScope.hc_eject_name_caozuo = '';
         $rootScope.hc_eject_brandModel_caozuo = '';
         $rootScope.hc_eject_specification_caozuo = '';
@@ -197,7 +119,7 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
             });
         }
     })
-    // $scope.hc_eject_title = '';//耗材名称
+
     // 下拉框名称
     $scope.$watch('select_updata_name.updata_name', function (val) {
         // console.log(val);
@@ -205,31 +127,7 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
         if (!val.name) {
 
         } else {
-            // $scope.hc_eject_name = val.name;
-            // // 耗材查询品牌
-            // $scope.refreshDat_pinpai = function() {
-            //     var dat = {
-            //         "key": "pinpai",
-            //         parent: val.id
-            //     }
-            //     api_cmdb4.fetchDataList(dat).then(function(data) {
-            //         $scope.updata_pinpai = data;
-            //     });
-            // }
-            // $scope.refreshDat_pinpai();
-            // // 耗材查询规格
-            // $scope.refreshDat_guige = function() {
-            //     var dat = {
-            //         "key": "guige",
-            //         parent: val.id
-            //     }
-            //     api_cmdb4.fetchDataList(dat).then(function(data) {
-            //         $scope.updata_guige = data;
-            //     });
-            // }
-            // $scope.refreshDat_guige();
             $scope.hc_eject_name = val.name;
-            // $scope.hc_eject_title = val.name;
             // 耗材查询品牌
             $scope.refreshDat_pinpai = function () {
                 var dat = {
@@ -427,6 +325,10 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
             }
         });
     })
+    // 单位hc_eject_unit
+    $scope.$watch('hc_eject_unit', function (val) {
+        $scope.hc.unit = val;
+    })
     // 费用区间开始hc_eject_startPrice_caozuo
     $scope.$watch('hc_eject_startPrice_caozuo', function (val) {
         $scope.startPrice = val;
@@ -465,6 +367,9 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
     $scope.isWarehousing = 0;
     $scope.hc_eject_inventorySum = '';
     $scope.updata_company = [];
+    $scope.hc = {
+        unit: '',//单位
+    }
 
     $scope.preservation = function () {
         if (!$scope.select_updata_name.updata_name.name
@@ -485,6 +390,7 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
             var edit_data = {
                 "consumable": {
                     "name": $scope.select_updata_name.updata_name.name,
+                    "unit": $scope.hc.unit,
                     "brandModel": $scope.select_updata_pinpai.updata_pinpai.name,
                     "specification": $scope.select_updata_guige.updata_guige.name,
                     isInventory:$scope.isWarehousing,
@@ -504,32 +410,6 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
             }
             api_cmdb3[$rootScope.isAdds?'addData':'preservation'](pdKey, edit_data).then(function (data) {
                 if (data.status == 200) {
-                    // $scope.refreshData = function(style, filterData) {
-                    //     var pdKey = "consumable";
-                    //     $scope.myData = [];
-                    //     $scope.gridOptions['sum'] = filterData.sum;
-                    //     api_cmdb3.fetchDataList(pdKey, filterData).then(function(data) {
-                    //         // console.log(data.list);
-                    //         if (data.list) {
-                    //             var myData = Restangular.stripRestangular(data);
-                    //             var list = [];
-                    //             $scope.gridOptions['totalItems'] = myData.totalNum;
-                    //             $scope.myData = myData.list;
-                    //             for (var i = 0; i < $scope.myData.length; i++) {
-                    //                 $scope.myData[i]['item'] = i + 1 + filterData.idx * filterData.sum
-                    //             }
-                    //         } else {
-                    //             SweetAlert.swal({
-                    //                 title: "系统错误",
-                    //                 text: "请稍后再试!",
-                    //                 type: "error"
-                    //             });
-                    //         }
-                    //         $scope.ldloading[style.replace('-', '_')] = false;
-                    //     }, function() {
-                    //         $scope.ldloading[style.replace('-', '_')] = false;
-                    //     });
-                    // };
                     $scope.refreshData('expand-right', $scope.fileData);
                     SweetAlert.swal({
                         title: ($rootScope.isAdds?'新增':'修改')+"成功",
@@ -629,22 +509,23 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
             '</div>'
     },
     {
-        name: 'pdCode',
-        displayName: 'SPDCODE',
-        width: '14%',
+        name: 'spdCode',
+        displayName: '耗材编码',
+        minWidth: '120',
     },
     {
         name: 'name',
         displayName: '耗材名称',
-        width: '14%',
+        minWidth: '120',
         cellTemplate: '<div>' +
             '<div class="ui-grid-cell-contents">{{row.entity.name}}</div>' +
             '</div>'
     },
+
     {
         name: 'brandModel',
         displayName: '品牌型号',
-        width: '14%',
+        minWidth: '120',
         cellTemplate: '<div>' +
             '<div class="ui-grid-cell-contents">{{row.entity.brandModel}}</div>' +
             '</div>'
@@ -652,16 +533,19 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
     {
         name: 'specification',
         displayName: '规格',
-        width: '14%',
+        minWidth: '120',
         cellTemplate: '<div>' +
             '<div class="ui-grid-cell-contents">{{row.entity.specification}}</div>' +
             '</div>'
     },
-
+    {
+        name: 'unit',
+        displayName: '单位',
+        minWidth: '120',
+    },
     {
         name: 'price',
-        displayName: '费用区间',
-        width: '12%',
+        displayName: '价格区间',
         minWidth: '120',
         cellTemplate: '<div>' +
             '<div class="ui-grid-cell-contents">{{row.entity.startPrice}} ~ {{row.entity.endPrice}}</div>' +
@@ -671,48 +555,46 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
     {
         name: 'companyIds',
         displayName: '供货公司',
-        width: '14%',
         minWidth: '120',
         cellTemplate: '<div>' +
             '<div class="ui-grid-cell-contents">{{row.entity.companyNames}}</div>' +
             '</div>'
     },
-    {
-        name: 'isInventory',
-        displayName: '是否库存',
-        width: '14%',
-        minWidth: '120',
-        cellTemplate: '<div>' +
-            '<div class="ui-grid-cell-contents">{{row.entity.isInventory == 1 ? "是" : "否"}}</div>' +
-            '</div>'
-    },
-    {
-        name: 'inventorySum',
-        displayName: '入库总数量',
-        width: '14%',
-        minWidth: '120',
-        cellTemplate: '<div>' +
-            '<div class="ui-grid-cell-contents">{{row.entity.inventorySum}}</div>' +
-            '</div>'
-    },
+    // {
+    //     name: 'isInventory',
+    //     displayName: '是否库存',
+    //     width: '10%',
+    //     minWidth: '120',
+    //     cellTemplate: '<div>' +
+    //         '<div class="ui-grid-cell-contents">{{row.entity.isInventory == 1 ? "是" : "否"}}</div>' +
+    //         '</div>'
+    // },
+    // {
+    //     name: 'inventorySum',
+    //     displayName: '入库总数量',
+    //     width: '11%',
+    //     minWidth: '120',
+    //     cellTemplate: '<div>' +
+    //         '<div class="ui-grid-cell-contents">{{row.entity.inventorySum}}</div>' +
+    //         '</div>'
+    // },
     {
         name: 'inventoryNum',
         displayName: '在库数量',
-        width: '12%',
         minWidth: '120',
         cellTemplate: '<div>' +
             '<div class="ui-grid-cell-contents">{{row.entity.inventoryNum}}</div>' +
             '</div>'
     },
-    {
-        name: 'updateTime',
-        displayName: '最后更新时间',
-        width: '14%',
-        minWidth: '160',
-        cellTemplate: '<div>' +
-            '<div class="ui-grid-cell-contents">{{grid.appScope.transferTime(row.entity.updateTime)}}</div>' +
-            '</div>'
-    },
+    // {
+    //     name: 'updateTime',
+    //     displayName: '最后更新时间',
+    //     width: '14%',
+    //     minWidth: '160',
+    //     cellTemplate: '<div>' +
+    //         '<div class="ui-grid-cell-contents">{{grid.appScope.transferTime(row.entity.updateTime)}}</div>' +
+    //         '</div>'
+    // },
     {
         name: '操作',
         enableSorting: false,
@@ -1042,23 +924,23 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
         });
     };
     // 耗材查询分类
-    $scope.refreshDat_name = function () {
-        // var dat = {
-        //     "key": "haocaifenlei",
-        // }
-        // api_cmdb4.fetchDataList(dat).then(function(data) {
-        //     $scope.search_data = data;
-        //     $scope.search_data.unshift({ 'name': '全部' });
-        // });
-        var dat = {
-            "key": "haocaifenlei",
-            "type": "tree"
-        }
-        api_wechatfile.getDictionary(dat).then(function (data) {
-            $scope.search_data = data;
-            // $scope.search_data.unshift({ 'name': '全部' });
-        });
-    };
+    // $scope.refreshDat_name = function () {
+    //     // var dat = {
+    //     //     "key": "haocaifenlei",
+    //     // }
+    //     // api_cmdb4.fetchDataList(dat).then(function(data) {
+    //     //     $scope.search_data = data;
+    //     //     $scope.search_data.unshift({ 'name': '全部' });
+    //     // });
+    //     var dat = {
+    //         "key": "haocaifenlei",
+    //         "type": "tree"
+    //     }
+    //     api_wechatfile.getDictionary(dat).then(function (data) {
+    //         $scope.search_data = data;
+    //         // $scope.search_data.unshift({ 'name': '全部' });
+    //     });
+    // };
     // 耗材查询分类修改
     $scope.refreshDat_name_updata = function () {
         var dat = {
@@ -1069,7 +951,7 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
             $scope.updata_name = data;
         });
     };
-    $scope.refreshDat_name();
+    // $scope.refreshDat_name();
     $scope.refreshDat_name_updata();
     // $scope.refreshDat_pinpai();
     // $scope.refreshDat_guige();
@@ -1092,7 +974,7 @@ app.controller('hc_caozuoCtrl', ['$rootScope', '$http', '$scope', '$modal', '$st
         $rootScope.isAdds = false;
         $rootScope.hc_eject_big = true; //编辑弹出框
         $rootScope.hc_eject_sma = true; //编辑弹出框
-        // $rootScope.hc_toedit = "new_after";
+        $rootScope.hc_eject_unit = $scope.item.unit;//单位
         $rootScope.hc_eject_name_caozuo = $scope.item.name; //耗材名称
         $rootScope.hc_eject_brandModel_caozuo = $scope.item.brandModel; //耗材品牌型号
         $rootScope.hc_eject_specification_caozuo = $scope.item.specification; //耗材规格

assets/views/consumables/list.html

@@ -148,7 +148,7 @@
         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;
@@ -277,7 +277,7 @@
                         </ui-select-choices>
                     </ui-select>
                 </div> -->
-                <div class="form-group inspectlistsearch col-xs-12">
+                <!-- <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>
@@ -287,15 +287,15 @@
                             <div ng-bind-html="n.name"></div>
                         </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 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="fileData.consumable.keyWord" placeholder="请输入耗材名称/品牌" />
+                </div>
             </div>
             <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="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"><span translate="list.button.REMOVE">Remove First Row</span></div>
                 <div class="btn btn_clean" ng-click="reset()">重置</div>
@@ -321,6 +321,7 @@
                     <div>*</div>
                     <div>*</div>
                     <div>*</div>
+                    <div></div>
                     <div>*</div>
                     <div>*</div>
                     <div>*</div>
@@ -329,7 +330,7 @@
                 </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}}">
@@ -340,10 +341,6 @@
                             </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"
@@ -369,6 +366,19 @@
                         </ui-select>
                     </div>
                     <div class="div">
+                        <span>单位：</span><br>
+                        <input type="text" ng-model="hc.unit" class="xialaipt">
+                    </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>
                         <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)">
@@ -381,14 +391,6 @@
                         </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)">