处理附件

assets/js/controllers/incident/incidentCtrl.js

@@ -1110,30 +1110,11 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 uploader.filters.push({
                     name: "customFilter",
                     fn: function (item /*{File|FileLikeObject}*/, options) {
-                    return this.queue.length < 10;
+                        return this.queue.length < 10;
                     },
                 });
 
-                $scope.dropfile = function (
-                    APIService,
-                    processInstanceId,
-                    taskId,
-                    userId
-                ) {
-                    uploader.onBeforeUploadItem = function (item) {
-                    angular.extend(item.headers, $rootScope.getSession());
-                    item.url = APIService.addFile(
-                        processInstanceId,
-                        taskId,
-                        userId
-                    ).getRequestedUrl();
-                    item.formData.push({
-                        fileName: item.file.name,
-                    });
-                    console.info("onBeforeUploadItem", item);
-                    };
-                    uploader.uploadAll();
-                };
+
 
                 // CALLBACKS
                 uploader.onWhenAddingFileFailed = function (
@@ -1144,7 +1125,26 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                     console.info("onWhenAddingFileFailed", item, filter, options);
                 };
                 uploader.onAfterAddingFile = function (fileItem) {
+                    console.log(fileItem.file)
                     console.info("onAfterAddingFile", fileItem);
+                    if (fileItem.file.size >= 1024 * 1024 * 10) {
+                        alert("文件不能大于10MB");
+                        fileItem.uploader.queue.pop();
+                        console.log($scope);
+                    }
+
+                    if (
+                        fileItem.file.type !== 'text/plain'
+                        && fileItem.file.type !== 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+                        && fileItem.file.type !== 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+                        && fileItem.file.type !== 'application/pdf'
+                        && fileItem.file.type !== 'application/vnd.ms-excel'
+                        && fileItem.file.type !== 'application/msword'
+                    ) {
+                        alert("只能上传word，excel，pdf，txt");
+                        fileItem.uploader.queue.pop();
+                        console.log($scope);
+                    }
                 };
                 uploader.onAfterAddingAll = function (addedFileItems) {
                     console.info("onAfterAddingAll", addedFileItems);
@@ -1271,6 +1271,14 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                         console.log(response)
                         $rootScope.isMask = false;
                         if (response.state == 200) {
+                            uploader.onBeforeUploadItem = function (item) {
+                                angular.extend(item.headers, $rootScope.getSession());
+                                item.url = api_bpm_domain.uploadAttachmentJryModel("handleAttachment", response.data.id).getRequestedUrl();
+                                item.formData.push({ 'fileName': item.file.name });
+                                console.info('onBeforeUploadItem', item);
+                            };
+                            uploader.uploadAll();
+
                             Alert.swal({
                                 title: "操作成功!",
                                 confirmButtonColor: "#007AFF",

assets/views/incident/incidentDetail.html

@@ -265,6 +265,40 @@
                             </div>
                         </div>
                     </div>
+                    <div class="col-xs-12 ui-repair-photos">
+                        <div class="row  fontcolor-two margin-top-15">
+                            <div class="col-md-12 formheard_pad worknumber">
+                                <div class="pull-left  fontsizes-16 font-weight-500">
+                                    附件下载
+                                </div>
+                            </div>
+                            <div class="col-md-12" style="padding:0;">
+                                <table class="table table-striped table-hover" style="table-layout: fixed;">
+                                    <thead>
+                                        <tr>
+                                            <th class="center" style="width:40%;">名称</th>
+                                            <th class="hidden-xs" ng-show="uploader.isHTML5" style="width:20%;">大小</th>
+                                            <th class="hidden-xs" style="width:20%;">附件下载</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <!-- 已上传附件 -->
+                                        <tr ng-repeat="attachment in attachments">
+                                            <td title="{{attachment.name}}"><strong>{{ attachment.name }}</strong></td>
+                                            <td ng-show="uploader.isHTML5" nowrap>{{ attachment.size/1024/1024|number:2 }} MB</td>
+                                            <td class="center">
+                                                <div class="visible-md visible-lg hidden-sm hidden-xs">
+                                                    <a ng-click="download(attachment.id,attachment.name,attachment.token)"
+                                                        class="btn btn-transparent btn-xs" tooltip-placement="top" tooltip="下载"><i
+                                                            class="fa fa-download"></i></a>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
                 </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" 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" type="file" nv-file-select="" uploader="uploader" />
                 </div>
             </div>
             <div class="panel-body">
@@ -89,10 +89,6 @@
                         </tr>
                     </tbody>
                 </table>
-
-                <button type="button" ng-if="to.isupdata" class="btn btn-success btn-s" ng-click="dropfile(to.ApiService,to.processInstanceId, to.taskId, to.userId)" ng-disabled="!uploader.getNotUploadedItems().length">
-                    <span class="glyphicon glyphicon-upload"></span> 上传
-                </button>
             </div>
         </div>
     </div>