编辑工单

assets/js/controllers/incident/incidentCtrl.js

@@ -1232,13 +1232,16 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
 
     //修改
     $scope.changeClick = function (data) {
-        $state.go('app.incident.detail', {
-            formKey: 'incident_change',
-            pdKey: 'incident',
-            dataId: data.id,
-            taskId: data.taskId,
-            processInstanceId: data.processInstanceId
-        });
+        // $state.go('app.incident.detail', {
+        //     formKey: 'incident_change',
+        //     pdKey: 'incident',
+        //     dataId: data.id,
+        //     taskId: data.taskId,
+        //     processInstanceId: data.processInstanceId
+        // });
+        $rootScope.newOrder({
+            incident: data,
+        },'edit')
     };
     //回访
     $scope.visit = function (model) {
@@ -2322,6 +2325,7 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$scope', '$state', function (
     var loginUser = $rootScope.user;
     $scope.user = $rootScope.user;
     $scope.chuli = false;
+    $scope.allFlag = false;
     $scope.qiangdan = false;
     $scope.huifang = false;
     $scope.delFlag = false;
@@ -2332,6 +2336,9 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$scope', '$state', function (
     $scope.shijianliebiao_duty = false;//设置责任科室
 
     for (var i = 0; i < loginUser.menu.length; i++) {
+        if (loginUser.menu[i].link == "shijianliebiao_all") {
+            $scope.allFlag = true
+        }
         if (loginUser.menu[i].link == "shijianliebiao_chuli") {
             $scope.chuli = true
         }
@@ -2386,10 +2393,14 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$scope', '$state', function (
     })
 
     //修改页面显示判断
-    $scope.jry_modify = function (item) {
-        var arrFlag = ['pending','handler'];
-        var stateFlag = arrFlag.includes(item.state.value)
-        return stateFlag && $scope.editFlag;
+    $scope.jry_modify = function (item, user) {
+        // 待接单的时候，处理人或处理组
+        let flag1 = item.state && item.state.value == 'pending' && ((item.currentLog && item.currentLog.workerId == user.id) || item.tiquPower);
+        // 处理中的时候，处理人或处理组
+        let flag2 = item.state && item.state.value == 'handler' && item.handlingPersonnelUser && item.handlingPersonnelUser.id == user.id;
+        // 已关闭，且不是已删除
+        let flag3 = item.deleteFlag !== 1 && item.state.value !== 'close';
+        return flag3 && (($scope.editFlag && $scope.allFlag) || flag1 || flag2 || (item.acceptUser ? item.acceptUser.id == user.id : false));
     }
     // 回访操作权限
     for (var obj in $rootScope.user.role) {
@@ -2466,7 +2477,7 @@ app.directive('incidentoperator', function () {
         controller: 'IncidentOperCtrl',
         template: '<div><div class="cl-effect-1 ui-grid-cell-contents pull-left" style="text-align:left;">' +
             '<a ng-click="toDetail(item)" class="bianjifont" >查看</a>' +
-            // '<a ng-click="changeCenter()"  ng-show="jry_modify(item)"  class="luyinfont">编辑</a>' +
+            '<a ng-click="changeCenter()" ng-show="jry_modify(item, user)" class="luyinfont">编辑</a>' +
             '<a ng-click="delSj()" ng-show="{{delFlag && item.deleteFlag !== 1}}" class="assign" >删除</a>' +
             '<a ng-click="storageSj()" ng-show="{{storageFlag && item.state.value === \'storage\' && item.deleteFlag !== 1}}" class="assign" >继续创建</a><br>' +
             '<a ng-click="edit()"  ng-show="{{item.state.value == \'handler\' && item.handlingPersonnelUser && item.handlingPersonnelUser.id == user.id && chuli && item.deleteFlag !== 1}}"  class="bianjifont">处理</a>' +

assets/js/controllers/mainCtrl.js

@@ -3763,6 +3763,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
     // 快速建单
     $rootScope.newOrder = function (model1, type = '') {
       $rootScope.newOrderShowOpen = true;
+      $rootScope.newOrderType = type;
       //进入弹窗,强制示忙
       if (localStorage.getItem('fenjiNumber')) {
         setTimeout(()=>{
@@ -3887,7 +3888,125 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                 },
               },
             });
-        };
+          };
+          // 编辑后保存
+          $scope.editSave = function(){
+            if(!$scope.categorySelectId){
+              SweetAlert.swal({
+                  title: "提示",
+                  text: "请选择故障现象!",
+                  type: "error",
+                  confirmButtonColor: "#DD6B55"
+              });
+              return;
+            }
+            if(!$scope.selectedDuty){
+              SweetAlert.swal({
+                  title: "提示",
+                  text: "故障现象【"+ $scope.categorySelect.category +"】没有设置责任科室!",
+                  type: "error",
+                  confirmButtonColor: "#DD6B55"
+              });
+              return;
+            }
+            if(!$scope.incidentModel.department){
+              SweetAlert.swal({
+                  title: "提示",
+                  text: "请选择报修科室!",
+                  type: "error",
+                  confirmButtonColor: "#DD6B55"
+              });
+              return;
+            }
+            if(!$scope.incidentModel.contactsInformation){
+              SweetAlert.swal({
+                  title: "提示",
+                  text: "请填写联系电话!",
+                  type: "error",
+                  confirmButtonColor: "#DD6B55"
+              });
+              return;
+            }
+            if(!$scope.incidentModel.priority){
+              SweetAlert.swal({
+                  title: "提示",
+                  text: "请选择优先级!",
+                  type: "error",
+                  confirmButtonColor: "#DD6B55"
+              });
+              return;
+            }
+            if(!$scope.incidentModel.description){
+              SweetAlert.swal({
+                  title: "提示",
+                  text: "请选择故障描述!",
+                  type: "error",
+                  confirmButtonColor: "#DD6B55"
+              });
+              return;
+            }
+            $rootScope.isMask = true;
+            var repair_main = JSON.parse(sessionStorage.getItem('repair_main'));
+            var postData = {
+              "incident": {
+                "id": $scope.incidentModel.id || undefined,
+                "deleteFlag": 0,
+                "duty":$scope.selectedDuty?$scope.selectedDuty:undefined,
+                "department": $scope.incidentModel.department||undefined,
+                "contactsInformation": $scope.incidentModel.contactsInformation,
+                "contacts": $scope.incidentModel.contacts,
+                "branch": $scope.incidentModel.branch?$scope.incidentModel.branch.id:undefined,
+                "area": $scope.incidentModel.area||undefined,
+                "place": $scope.incidentModel.place||undefined,
+                "houseNumber": $scope.incidentModel.address,
+                "category": $scope.categorySelect||undefined,
+                "priority": $scope.incidentModel.priority||undefined,
+                "source": $scope.incidentModel.source||undefined,
+                "title": $scope.categorySelect.category,
+                "description": $scope.incidentModel.description,
+                "yyTime": $scope.incidentModel.yyTime ? moment($scope.incidentModel.yyTime).format('YYYY-MM-DD HH:mm:ss') : undefined,
+                "repairType": repair_main?repair_main.valueconfig:undefined,
+                "requester":$scope.incidentModel.requester||undefined,
+                "acceptUser": $rootScope.user||undefined,
+                "callID": $scope.incidentModel.callID||undefined,
+                "incomingPhone": $scope.incidentModel.incomingPhone||undefined,
+              }
+            };
+            $scope.modelData && (postData.incident = Object.assign({}, $scope.modelData.incident, postData.incident));
+            api_flow.accept("edit", postData).then(function (response) {
+              // if ($scope.uploader != null) {
+              //   // 有图片
+              //     $scope.uploader.onBeforeUploadItem = function(item) {
+              //         angular.extend(item.headers, $rootScope.getSession());
+              //         item.url = api_bpm_domain.uploadAttachmentJryModel("wechatRequesterIncident", response.data.id).getRequestedUrl();
+              //         item.formData.push({ 'fileName': item.file.name });
+              //     };
+              //     $scope.uploader.uploadAll();
+              // }
+              $rootScope.isMask = false;
+              SweetAlert.swal(
+                {
+                  title: "保存成功!",
+                  type: "success",
+                  confirmButtonColor: "#007AFF",
+                },
+                function (isConfirm) {
+                  if(isConfirm){
+                    if (localStorage.getItem('fenjiNumber')) {
+                      $rootScope.jry_shixian();
+                    }
+                    $modalInstance.dismiss("cancel");
+                    $rootScope.newOrderShowOpen = false;
+                    if($state.current.name === 'app.incident.list'){
+                      $state.reload();
+                    }else{
+                      $state.go("app.incident.list");
+                    }
+                  }
+                }
+              );
+            });
+          }
           // 建单并派单
           $scope.buildAndAssign = function(){
             if(!$scope.categorySelectId){

assets/views/newOrderSeimin.html

@@ -252,153 +252,155 @@
             placeholder="请填写故障描述"
           ></textarea>
         </div>
-        <div class="c_item clearfix" style="width: 400px; height: 100px" ng-if="requestImgs.length">
-          <div class="col-xs-12 ui-repair-photos">
-            <div class="row  fontcolor-two margin-top-15">
-              <label><span class="colorRed">&nbsp;&nbsp;</span>图片上传：</label>
-              <div class="imgsBox">
-                <div class="fileupload pos-rlt" ng-repeat="(idx,img) in requestImgs" style="position: relative;">
-                  <img ng-src="{{attachmentAddressSplicing(img.relativeFilePath)}}"  style="max-height:300px;object-fit: contain;"
-                      class="pos-rlt" width=100%; height=100%; ng-click="previewNew('requestImgs', img.relativeFilePath, idx)" />
+        <ng-container ng-if="newOrderType !== 'edit'">
+          <div class="c_item clearfix" style="width: 400px; height: 100px" ng-if="requestImgs.length">
+            <div class="col-xs-12 ui-repair-photos">
+              <div class="row  fontcolor-two margin-top-15">
+                <label><span class="colorRed">&nbsp;&nbsp;</span>图片上传：</label>
+                <div class="imgsBox">
+                  <div class="fileupload pos-rlt" ng-repeat="(idx,img) in requestImgs" style="position: relative;">
+                    <img ng-src="{{attachmentAddressSplicing(img.relativeFilePath)}}"  style="max-height:300px;object-fit: contain;"
+                        class="pos-rlt" width=100%; height=100%; ng-click="previewNew('requestImgs', img.relativeFilePath, idx)" />
+                  </div>
                 </div>
+                <!-- <div class="col-md-12" style="padding:0;">
+                    <div class="imgsBox">
+                        <div class="fileupload pos-rlt" ng-repeat="(idx,img) in requestImgs" style="position: relative;">
+                            <img ng-src="{{attachmentAddressSplicing(img.relativeFilePath)}}"  style="max-height:300px;object-fit: contain;"
+                                class="pos-rlt" width=100%; height=100%; ng-click="preview('requestImgs', img.relativeFilePath, idx)" />
+                        </div>
+                    </div>
+                </div> -->
               </div>
-              <!-- <div class="col-md-12" style="padding:0;">
-                  <div class="imgsBox">
-                      <div class="fileupload pos-rlt" ng-repeat="(idx,img) in requestImgs" style="position: relative;">
-                          <img ng-src="{{attachmentAddressSplicing(img.relativeFilePath)}}"  style="max-height:300px;object-fit: contain;"
-                              class="pos-rlt" width=100%; height=100%; ng-click="preview('requestImgs', img.relativeFilePath, idx)" />
-                      </div>
-                  </div>
-              </div> -->
-            </div>
-        </div>
-        </div>
-        <div class="c_item clearfix" style="width: 400px; height: 100px" ng-if="!requestImgs.length">
-          <label><span class="colorRed">&nbsp;&nbsp;</span>图片上传：</label>
-          <div class="imgsBox">
-            <div
-              class="fileupload pos-rlt"
-              ng-repeat="(idx,imageSrc) in imgshows"
-              style="position: relative"
-            >
+          </div>
+          </div>
+          <div class="c_item clearfix" style="width: 400px; height: 100px" ng-if="!requestImgs.length">
+            <label><span class="colorRed">&nbsp;&nbsp;</span>图片上传：</label>
+            <div class="imgsBox">
               <div
-                style="
-                  border-radius: 5px;
-                  overflow: hidden;
-                  width: 100%;
-                  height: 100%;
-                "
+                class="fileupload pos-rlt"
+                ng-repeat="(idx,imageSrc) in imgshows"
+                style="position: relative"
               >
-                <img
-                  ng-src="{{imageSrc}}"
+                <div
                   style="
-                    max-width: 200px;
-                    max-height: 300px;
-                    margin: 0 auto;
-                    display: block;
+                    border-radius: 5px;
+                    overflow: hidden;
+                    width: 100%;
+                    height: 100%;
                   "
-                  class="pos-rlt"
-                  width="100%;"
-                  height="100%;"
-                  ng-click="preview(imageSrc,idx)"
-                />
+                >
+                  <img
+                    ng-src="{{imageSrc}}"
+                    style="
+                      max-width: 200px;
+                      max-height: 300px;
+                      margin: 0 auto;
+                      display: block;
+                    "
+                    class="pos-rlt"
+                    width="100%;"
+                    height="100%;"
+                    ng-click="preview(imageSrc,idx)"
+                  />
+                </div>
+                <i class="icon close" ng-click="uploadimg_del($index, imgshows)"
+                  >×</i
+                >
               </div>
-              <i class="icon close" ng-click="uploadimg_del($index, imgshows)"
-                >×</i
+              <div
+                id="upupgogo"
+                class="fileupload pos-rlt clear"
+                style="position: relative"
               >
+                <span class="icon ion-plus-round fileupload-icon">+</span>
+                <input
+                  type="file"
+                  onchange="angular.element(this).scope().change(this)"
+                  style="
+                    display: inline-block;
+                    width: 100%;
+                    height: 100%;
+                    opacity: 0;
+                  "
+                  class="upinp"
+                  uploader="uploader"
+                  accept="image/png,image/gif,image/jpeg,image/jpg"
+                  name="uploadedFile"
+                  nv-file-select=""
+                />
+              </div>
             </div>
-            <div
-              id="upupgogo"
-              class="fileupload pos-rlt clear"
-              style="position: relative"
-            >
-              <span class="icon ion-plus-round fileupload-icon">+</span>
+          </div>
+          <div class="c_item" style="width: 100%">
+            <label style="margin-right: 8px; cursor: pointer">
               <input
-                type="file"
-                onchange="angular.element(this).scope().change(this)"
-                style="
-                  display: inline-block;
-                  width: 100%;
-                  height: 100%;
-                  opacity: 0;
-                "
-                class="upinp"
-                uploader="uploader"
-                accept="image/png,image/gif,image/jpeg,image/jpg"
-                name="uploadedFile"
-                nv-file-select=""
+                type="radio"
+                name="assign"
+                ng-value="1"
+                ng-model="incidentModel.assign"
+                ng-change="assginChange()"
               />
-            </div>
+              派单给人
+            </label>
+            <label>
+              <input
+                type="radio"
+                name="assign"
+                ng-value="2"
+                ng-model="incidentModel.assign"
+                ng-change="assginChange()"
+              />
+              派单给组
+            </label>
           </div>
-        </div>
-        <div class="c_item" style="width: 100%">
-          <label style="margin-right: 8px; cursor: pointer">
-            <input
-              type="radio"
-              name="assign"
-              ng-value="1"
-              ng-model="incidentModel.assign"
-              ng-change="assginChange()"
-            />
-            派单给人
-          </label>
-          <label>
-            <input
-              type="radio"
-              name="assign"
-              ng-value="2"
-              ng-model="incidentModel.assign"
-              ng-change="assginChange()"
-            />
-            派单给组
-          </label>
-        </div>
-        <div class="c_item clearfix" ng-show="incidentModel.assign==1">
-          <label><span class="colorRed">*</span>处理人：</label>
-          <ui-select
-            class="c_item_value"
-            style="min-width: 300px"
-            ng-model="incidentModel.user"
-            theme="bootstrap"
-            ng-required="true"
-            reset-search-input="false"
-          >
-            <ui-select-match placeholder="请选择处理人">
-              <span ng-bind="$select.selected.name"></span>
-            </ui-select-match>
-            <ui-select-choices
-              repeat="item in jry_userData| filter:{$:$select.search}"
-              refresh="jry_userSearch($select.search)"
+          <div class="c_item clearfix" ng-show="incidentModel.assign==1">
+            <label><span class="colorRed">*</span>处理人：</label>
+            <ui-select
+              class="c_item_value"
+              style="min-width: 300px"
+              ng-model="incidentModel.user"
+              theme="bootstrap"
+              ng-required="true"
+              reset-search-input="false"
             >
-              <div
-                ng-bind-html="item.name | highlight: $select.search"
-              ></div>
-            </ui-select-choices>
-          </ui-select>
-        </div>
-        <div class="c_item clearfix" ng-show="incidentModel.assign==2">
-          <label><span class="colorRed">*</span>处理组：</label>
-          <ui-select
-            class="c_item_value"
-            style="min-width: 300px"
-            ng-model="incidentModel.group"
-            theme="bootstrap"
-            ng-required="true"
-            reset-search-input="false"
-          >
-            <ui-select-match placeholder="处理组">
-              <span ng-bind="$select.selected.groupName"></span>
-            </ui-select-match>
-            <ui-select-choices
-              repeat="item in jry_groupData| filter:{$:$select.search}"
-              refresh="jry_groupSearch($select.search)"
+              <ui-select-match placeholder="请选择处理人">
+                <span ng-bind="$select.selected.name"></span>
+              </ui-select-match>
+              <ui-select-choices
+                repeat="item in jry_userData| filter:{$:$select.search}"
+                refresh="jry_userSearch($select.search)"
+              >
+                <div
+                  ng-bind-html="item.name | highlight: $select.search"
+                ></div>
+              </ui-select-choices>
+            </ui-select>
+          </div>
+          <div class="c_item clearfix" ng-show="incidentModel.assign==2">
+            <label><span class="colorRed">*</span>处理组：</label>
+            <ui-select
+              class="c_item_value"
+              style="min-width: 300px"
+              ng-model="incidentModel.group"
+              theme="bootstrap"
+              ng-required="true"
+              reset-search-input="false"
             >
-              <div
-                ng-bind-html="item.groupName | highlight: $select.search"
-              ></div>
-            </ui-select-choices>
-          </ui-select>
-        </div>
+              <ui-select-match placeholder="处理组">
+                <span ng-bind="$select.selected.groupName"></span>
+              </ui-select-match>
+              <ui-select-choices
+                repeat="item in jry_groupData| filter:{$:$select.search}"
+                refresh="jry_groupSearch($select.search)"
+              >
+                <div
+                  ng-bind-html="item.groupName | highlight: $select.search"
+                ></div>
+              </ui-select-choices>
+            </ui-select>
+          </div>
+        </ng-container>
       </div>
     </div>
     <div class="rightList">
@@ -508,10 +510,15 @@
     </div>
   </div>
   <div class="modal-footer">
-    <label style="display: inline-flex;align-items:center;cursor: pointer;position: relative;top: 3px;right: 16px;"><input style="margin:0;" type="checkbox" ng-model="isBuildOrderAgagin">是否连续建单</label>
-    <button class="btn btn-primary" ng-click="build()">直接解决</button>
-    <button class="btn btn-primary" ng-click="buildAndAssign()">建单并派单</button>
-    <button class="btn btn-primary" ng-click="temporaryStorage()">暂存</button>
+    <ng-container ng-if="newOrderType !== 'edit'">
+      <label style="display: inline-flex;align-items:center;cursor: pointer;position: relative;top: 3px;right: 16px;"><input style="margin:0;" type="checkbox" ng-model="isBuildOrderAgagin">是否连续建单</label>
+      <button class="btn btn-primary" ng-click="build()">直接解决</button>
+      <button class="btn btn-primary" ng-click="buildAndAssign()">建单并派单</button>
+      <button class="btn btn-primary" ng-click="temporaryStorage()">暂存</button>
+    </ng-container>
+    <ng-container ng-if="newOrderType === 'edit'">
+      <button class="btn btn-primary" ng-click="editSave()">保存</button>
+    </ng-container>
     <button class="btn btn-primary btn-o" ng-click="cancel()">取消</button>
   </div>
 </div>