22.快速建单的图片没有了 放在报修图片里面

assets/js/controllers/incident/incidentDetailCtrl.js

@@ -21,13 +21,13 @@ app.controller('incidentDetailCtrl', ["$scope", "$http", "i18nService", "$rootSc
         api_simple.fetchData('incident', incidentId).then(res => {
             if(res.status == 200){
                 $scope.model = res.data || {};
-                if ($scope.model.wxIncidentId) {
-                    api_wechatfile.listAttachment("wechatRequesterIncident", $scope.model.wxIncidentId).then( (res) => {
+                if ($scope.model.id) {
+                    api_wechatfile.listAttachment("wechatRequesterIncident", $scope.model.id).then( (res) => {
                         $scope.requestImgs = res.data || [];
                     });
                 }
-                if ($scope.model.processInstanceId) {
-                    api_wechatfile.listAttachment("incident", $scope.model.processInstanceId).then( (res) => {
+                if ($scope.model.id) {
+                    api_wechatfile.listAttachment("incident", $scope.model.id).then( (res) => {
                         $scope.userImgs = res.data || [];
                     });
                 }

assets/js/controllers/mainCtrl.js

@@ -3752,6 +3752,8 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
         ) {
           // -------------------start----------------------
           $scope.modelData = modelData;
+          // 事件报修图片
+          $scope.requestImgs = [];
           // 当前所属院区处理
           console.log(modelData);
           // if(modelData){
@@ -3795,6 +3797,13 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
             //报修生成事件，数据回显
             //来电生成事件，数据回显
             //暂存生成事件，数据回显
+            // 报修图片
+            if (modelData.incident) {
+              api_wechatfile.listAttachment("wechatRequesterIncident", modelData.incident.id).then( (res) => {
+                  $scope.requestImgs = res.data || [];
+              });
+            }
+
             $scope.categorySelect = modelData.incident.category;
             $scope.jry_modelLeft = modelData.incident.category?modelData.incident.category.mutiCategory:'';
             console.log($scope.jry_deptData)
@@ -3820,6 +3829,27 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
             };
           }
           $scope.minYYtime = new Date();
+          // 预览图片
+          $scope.previewNew = function (type, url, idx) {
+            let title = $scope[type][idx].title;
+            $modal.open({
+              backdrop: false,
+              size: "sm",
+              templateUrl: "assets/views/customform/tpl/ui-showimage.html",
+              controller: function ($scope, $rootScope, scope, $modalInstance) {
+                $scope.title = title;
+                $scope.imageurl = $rootScope.attachmentAddressSplicing(url);
+                $scope.cancel = function () {
+                  $modalInstance.dismiss("cancel");
+                };
+              },
+              resolve: {
+                scope: function () {
+                  return $scope;
+                },
+              },
+            });
+        };
           // 建单并派单
           $scope.buildAndAssign = function(){
             if(!$scope.categorySelectId){
@@ -3974,7 +4004,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                   // 有图片
                     $scope.uploader.onBeforeUploadItem = function(item) {
                         angular.extend(item.headers, $rootScope.getSession());
-                        item.url = api_bpm_domain.uploadAttachment(response.id).getRequestedUrl();
+                        item.url = api_bpm_domain.uploadAttachmentJryModel("wechatRequesterIncident", response.data.id).getRequestedUrl();
                         item.formData.push({ 'fileName': item.file.name });
                     };
                     $scope.uploader.uploadAll();
@@ -4059,7 +4089,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                   // 有图片
                     $scope.uploader.onBeforeUploadItem = function(item) {
                         angular.extend(item.headers, $rootScope.getSession());
-                        item.url = api_bpm_domain.uploadAttachment(response.id).getRequestedUrl();
+                        item.url = api_bpm_domain.uploadAttachmentJryModel("wechatRequesterIncident", response.data.id).getRequestedUrl();
                         item.formData.push({ 'fileName': item.file.name });
                     };
                     $scope.uploader.uploadAll();
@@ -4471,7 +4501,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                         // 有图片
                           scope.uploader.onBeforeUploadItem = function(item) {
                               angular.extend(item.headers, $rootScope.getSession());
-                              item.url = api_bpm_domain.uploadAttachment(resData.id).getRequestedUrl();
+                              item.url = api_bpm_domain.uploadAttachmentJryModel("wechatRequesterIncident", resData.data.id).getRequestedUrl();
                               item.formData.push({ 'fileName': item.file.name });
                           };
                           scope.uploader.uploadAll();

assets/views/newOrderSeimin.html

@@ -252,7 +252,28 @@
             placeholder="请填写故障描述"
           ></textarea>
         </div>
-        <div class="c_item clearfix" style="width: 400px; height: 100px">
+        <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>
+        </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