瀏覽代碼

Merge branch 'lmm'

seimin 1 年之前
父節點
當前提交
ddc4a0d575

+ 1 - 1
assets/js/controllers/desk/chartCtrl.js

@@ -505,7 +505,7 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
505
     };
505
     };
506
     // 生成工单
506
     // 生成工单
507
     $scope.buildFn = function(model){
507
     $scope.buildFn = function(model){
508
-        $rootScope.newOrder({incident: model});
508
+        $rootScope.newOrder({incident: model}, 'wx');
509
     }
509
     }
510
     //重置
510
     //重置
511
     $scope.cleanItem = function () {
511
     $scope.cleanItem = function () {

+ 1 - 1
assets/js/controllers/incident/incidentCtrl.js

@@ -2032,7 +2032,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
2032
     // 继续创建
2032
     // 继续创建
2033
     $scope.storageSj = function(model){
2033
     $scope.storageSj = function(model){
2034
         console.log(model);
2034
         console.log(model);
2035
-        $rootScope.newOrder({incident: model});
2035
+        $rootScope.newOrder({incident: model}, 'storage');
2036
     }
2036
     }
2037
     // 新增延期处理弹窗
2037
     // 新增延期处理弹窗
2038
     $scope.toHandlerLog = function (model) {
2038
     $scope.toHandlerLog = function (model) {

+ 1 - 1
assets/views/newOrderSeimin.html

@@ -511,8 +511,8 @@
511
     </div>
511
     </div>
512
   </div>
512
   </div>
513
   <div class="modal-footer">
513
   <div class="modal-footer">
514
+    <label ng-if="!newOrderType || newOrderType === 'incomingCall'" style="display: inline-flex;align-items:center;cursor: pointer;position: relative;top: 3px;right: 16px;"><input style="margin:0;" type="checkbox" ng-model="btns.isBuildOrderAgagin">是否连续建单</label>
514
     <ng-container ng-if="newOrderType !== 'edit'">
515
     <ng-container ng-if="newOrderType !== 'edit'">
515
-      <label style="display: inline-flex;align-items:center;cursor: pointer;position: relative;top: 3px;right: 16px;"><input style="margin:0;" type="checkbox" ng-model="btns.isBuildOrderAgagin">是否连续建单</label>
516
       <button class="btn btn-primary" ng-click="build()">直接解决</button>
516
       <button class="btn btn-primary" ng-click="build()">直接解决</button>
517
       <button class="btn btn-primary" ng-click="buildAndAssign()">建单并派单</button>
517
       <button class="btn btn-primary" ng-click="buildAndAssign()">建单并派单</button>
518
       <button class="btn btn-primary" ng-click="temporaryStorage()">暂存</button>
518
       <button class="btn btn-primary" ng-click="temporaryStorage()">暂存</button>