Merge branch 'master' into lmm

assets/js/controllers/consumables/consumablesCtrl.js

@@ -40,9 +40,9 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
         $rootScope.hc_eject_companyIds_caozuo = [];
         $rootScope.hc_eject_startPrice_caozuo = '';
         $rootScope.hc_eject_endPrice_caozuo = '';
-        $rootScope.hc_eject_isWarehousing_caozuo = 0;
+        // $rootScope.hc_eject_isWarehousing_caozuo = 0;
         $rootScope.hc_eject_inventoryNum_caozuo = '';
-        $rootScope.hc_eject_inventorySum_caozuo = '';
+        // $rootScope.hc_eject_inventorySum_caozuo = '';
         delete $rootScope.hc_eject_id_caozuo;
         // -------------------
         $scope.hc.unit = ''
@@ -50,8 +50,8 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
         $scope.select_updata_pinpai.updata_pinpai = {name:''};
         $scope.select_updata_guige.updata_guige = {name:''};
         $scope.hc_eject_inventoryNum = '';
-        $scope.hc_eject_inventorySum = '';
-        $scope.isWarehousing = 0;
+        // $scope.hc_eject_inventorySum = '';
+        // $scope.isWarehousing = 0;
         $scope.startPrice = '';
         $scope.endPrice = '';
         $scope.companyIds = null;
@@ -89,9 +89,9 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
         $rootScope.hc_eject_companyIds_caozuo = [];
         $rootScope.hc_eject_startPrice_caozuo = '';
         $rootScope.hc_eject_endPrice_caozuo = '';
-        $rootScope.hc_eject_isWarehousing_caozuo = 0;
+        // $rootScope.hc_eject_isWarehousing_caozuo = 0;
         $rootScope.hc_eject_inventoryNum_caozuo = '';
-        $rootScope.hc_eject_inventorySum_caozuo = '';
+        // $rootScope.hc_eject_inventorySum_caozuo = '';
         delete $rootScope.hc_eject_id_caozuo;
         // ----------------------------------
         $rootScope.hc_eject_big = false; //编辑弹出框
@@ -338,17 +338,17 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
         $scope.endPrice = val;
     })
     // 是否库存hc_eject_isWarehousing_caozuo
-    $scope.$watch('hc_eject_isWarehousing_caozuo', function (val) {
-        $scope.isWarehousing = val;
-    })
+    // $scope.$watch('hc_eject_isWarehousing_caozuo', function (val) {
+    //     $scope.isWarehousing = val;
+    // })
     // 在库数量
     $scope.$watch('hc_eject_inventoryNum_caozuo', function (val) {
         $scope.hc_eject_inventoryNum = val;
     })
     // 入库数量
-    $scope.$watch('hc_eject_inventorySum_caozuo', function (val) {
-        $scope.hc_eject_inventorySum = val;
-    })
+    // $scope.$watch('hc_eject_inventorySum_caozuo', function (val) {
+    //     $scope.hc_eject_inventorySum = val;
+    // })
     $scope.reset = function () {
         $scope.select_val = {};
         $scope.fileData.consumable = {};
@@ -356,16 +356,16 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
     }
 
     // 是否库存
-    $scope.changeWarehousing = function(type){
-        $scope.isWarehousing = type;
-    }
+    // $scope.changeWarehousing = function(type){
+    //     $scope.isWarehousing = type;
+    // }
 
     // 编辑保存按钮
     $scope.companyIds = null;
     $scope.startPrice = '';
     $scope.endPrice = '';
-    $scope.isWarehousing = 0;
-    $scope.hc_eject_inventorySum = '';
+    // $scope.isWarehousing = 0;
+    // $scope.hc_eject_inventorySum = '';
     $scope.updata_company = [];
     $scope.hc = {
         unit: '',//单位
@@ -378,7 +378,8 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
             ||!$scope.companyIds
             ||(!$scope.startPrice&&$scope.startPrice!==0)
             ||(!$scope.endPrice&&$scope.endPrice!==0)
-            ||($scope.isWarehousing == 1&&($scope.hc_eject_inventorySum===null||$scope.hc_eject_inventoryNum===null))
+            // ||($scope.isWarehousing == 1&&($scope.hc_eject_inventorySum===null||$scope.hc_eject_inventoryNum===null))
+            ||($scope.hc_eject_inventoryNum===null)
             ) {
             SweetAlert.swal({
                 title: "保存失败",
@@ -393,16 +394,17 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
                     "unit": $scope.hc.unit,
                     "brandModel": $scope.select_updata_pinpai.updata_pinpai.name,
                     "specification": $scope.select_updata_guige.updata_guige.name,
-                    isInventory:$scope.isWarehousing,
+                    // isInventory:$scope.isWarehousing,
                     startPrice:$scope.startPrice,
                     endPrice:$scope.endPrice,
                     companyIds:$scope.companyIds.map(v=>v.id).toString()
                 }
             };
-            if($scope.isWarehousing == 1){
-                edit_data.consumable.inventoryNum = $scope.hc_eject_inventoryNum;
-                edit_data.consumable.inventorySum = $scope.hc_eject_inventorySum;
-            }
+            // if($scope.isWarehousing == 1){
+            //     edit_data.consumable.inventoryNum = $scope.hc_eject_inventoryNum;
+            //     edit_data.consumable.inventorySum = $scope.hc_eject_inventorySum;
+            // }
+            edit_data.consumable.inventoryNum = $scope.hc_eject_inventoryNum;
             if($rootScope.isAdds){
                 edit_data.consumable.inOutInventory = 1;//入库1，出库2
             }else{
@@ -981,9 +983,9 @@ app.controller('hc_caozuoCtrl', ['$rootScope', '$http', '$scope', '$modal', '$st
         $rootScope.hc_eject_companyIds_caozuo = $scope.item.companyIds ? $scope.item.companyIds.split(',') : []; //供货公司
         $rootScope.hc_eject_startPrice_caozuo = $scope.item.startPrice; //费用区间开始
         $rootScope.hc_eject_endPrice_caozuo = $scope.item.endPrice; //费用区间结束
-        $rootScope.hc_eject_isWarehousing_caozuo = $scope.item.isInventory || 0; //是否库存
+        // $rootScope.hc_eject_isWarehousing_caozuo = $scope.item.isInventory || 0; //是否库存
         $rootScope.hc_eject_inventoryNum_caozuo = $scope.item.inventoryNum; //耗材在库数量
-        $rootScope.hc_eject_inventorySum_caozuo = $scope.item.inventorySum; //耗材入库数量
+        // $rootScope.hc_eject_inventorySum_caozuo = $scope.item.inventorySum; //耗材入库数量
         $rootScope.hc_eject_id_caozuo = $scope.item.id; //耗材id
 
     };

assets/js/controllers/incident/incidentCtrl.js

@@ -1228,8 +1228,9 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                         && fileItem.file.type !== 'application/pdf'
                         && fileItem.file.type !== 'application/vnd.ms-excel'
                         && fileItem.file.type !== 'application/msword'
+                        && fileItem.file.type !== 'application/vnd.openxmlformats-officedocument.presentationml.presentation'
                     ) {
-                        alert("只能上传word，excel，pdf，txt");
+                        alert("只能上传word，excel，pdf，txt，.ppt");
                         fileItem.uploader.queue.pop();
                         console.log($scope);
                     }

assets/views/consumables/list.html

@@ -325,8 +325,8 @@
                     <div>*</div>
                     <div>*</div>
                     <div>*</div>
-                    <div ng-show="isWarehousing == 1">*</div>
-                    <div ng-show="isWarehousing == 1">*</div>
+                    <!-- <div ng-show="isWarehousing == 1">*</div> -->
+                    <!-- <div ng-show="isWarehousing == 1">*</div> -->
                 </div>
                 <form class="rigt">
                     <div class="div">
@@ -390,7 +390,7 @@
                             </ui-select-choices>
                         </ui-select>
                     </div>
-                    <div class="div">
+                    <!-- <div class="div">
                         <span>是否库存：</span><br>
                         <ul class="tab_bdItem_tab">
                             <li class="fl" ng-click="changeWarehousing(1)">
@@ -402,12 +402,13 @@
                                 <span>否</span>
                             </li>
                         </ul>
-                    </div>
-                    <div class="div" ng-show="isWarehousing == 1">
+                    </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">
+                    </div> -->
+                    <!-- <div class="div" ng-show="isWarehousing == 1"> -->
+                    <div class="div">
                         <span>在库数量：</span><br>
                         <input type="number" ng-model="hc_eject_inventoryNum" class="xialaipt" ng-change="changePrice(hc_eject_inventoryNum,'hc_eject_inventoryNum')" step="1" min="0">
                     </div>

assets/views/incident/incidentDetail.html

@@ -221,7 +221,7 @@
                                         <div class="control-label col-xs-6  fontsizes-14 formheardpad">
                                             <div class="row pull-left ">报修地址:</div>
                                         </div>
-                                        <div class="control-label col-xs-6 col-0   fontsizes-14 formheardpad">
+                                        <div class="control-label col-xs-6 col-0   fontsizes-14 formheardpad" style="word-break: break-all;">
                                             <div>{{model.place ? (model.place.area.area + model.place.place) : ''}}{{model.houseNumber || ''}}</div>
                                         </div>
                                     </div>
@@ -387,12 +387,12 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-xs-4 ui-label">
+                <div class="col-xs-12 ui-label">
                     <div class="form-group">
                         <div class="padding-top-5">
                             <label>故障描述:</label>
                             <div>
-                                <input class="form-control" ng-value="model.description" type="text" disabled="disabled" />
+                                <textarea class="form-control autosize msd-elastic: \n;" data-ng-model="model.description" ng-disabled="{{true}}"></textarea>
                             </div>
                         </div>
                     </div>

assets/views/incident/tpl/doing.tpl.html

@@ -65,7 +65,7 @@
     <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;">
         <div class="panel panel-white">
             <div class="panel-heading">
-                <div style="width: 120px;" class="btn btn-blue btn-o btn-file col-md-2"><i class="fa fa-plus"></i><span translate="form.button.SELECTFILE"></span><input name="uploadedFile" accept=".pdf,.xlsx,.xls,.doc,.docx,.txt" type="file" nv-file-select="" uploader="uploader" />
+                <div style="width: 120px;" class="btn btn-blue btn-o btn-file col-md-2"><i class="fa fa-plus"></i><span translate="form.button.SELECTFILE"></span><input name="uploadedFile" accept=".pdf,.xlsx,.xls,.doc,.docx,.txt,.ppt,.pptx" type="file" nv-file-select="" uploader="uploader" />
                 </div>
             </div>
             <div class="panel-body">

assets/views/system/tpl/faultConsumableschange.html

@@ -33,7 +33,7 @@
               repeat="item in consumableList"
               refresh="searchConsumable($select.search)"
             >
-              <div ng-bind-html="item.name + '(' + item.brandModel + ')' + '(' + item.unit + ')' | highlight: $select.search"></div>
+              <div ng-bind-html="item.name + '(' + item.brandModel + ')' + '(' + item.unit + ')' + '(' + item.inventoryNum + ')' | highlight: $select.search"></div>
             </ui-select-choices>
           </ui-select>
         </div>