提交

fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -386,13 +386,9 @@
             </el-dialog>
 
         <!-- 文件审核 -->
-        <el-dialog title="文件审核" :visible.sync="viewFilesAndReviewThemVisable" width="800px">
-            <el-table :data="viewFilesAndReviewThemRejectList" style="width: 100%" height="500px" :key="viewFilesAndReviewThemkey">
-                <el-table-column :label="$t('headerTop.serialNumber')" prop="documentType" min-width="60" align="center">
-                    <template slot-scope="scope">
-                        {{scope.$index + 1}}
-                    </template>
-                </el-table-column>
+        <el-dialog title="文件审核" :visible.sync="viewFilesAndReviewThemVisable" width="1000px">
+            <el-table :data="viewFilesAndReviewThemRejectList" style="width: 100%" height="500px" @selection-change="handleSelectionChange" :key="viewFilesAndReviewThemkey">
+                <el-table-column type="selection" width="55"></el-table-column>
                 <el-table-column :label="$t('filenames')" prop="documentName" min-width="180"></el-table-column>
                 <el-table-column :label="$t('filesize')" prop="size" min-width="80" align="center"></el-table-column>
                 <el-table-column :label="$t('founder')" prop="creatorName" min-width="60" align="center">
@@ -410,15 +406,15 @@
                         <span>{{scope.row.indate}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column :label="$t('operation')" min-width="90" fixed="right">
+                <el-table-column :label="$t('operation')" min-width="40" fixed="right">
                     <template slot-scope="scope">
                         <el-link :href="scope.row.url" :download="scope.row.documentName" type="primary" style="margin-right:7px">{{ $t('other.download') }}</el-link>
                     </template>
                 </el-table-column>
             </el-table>
             <div slot="footer" class="dialog-footer">
-                <el-button type="primary" size="small" :loading="viewFilesAndReviewThemAdoptLoading" @click="viewFilesAndReviewThemRejectCli(1)">通过</el-button>
-                <el-button type="danger" size="small" @click="viewFilesAndReviewThemReject()">驳回</el-button>
+                <el-button type="primary" size="small" :disabled="tableMultipleSelection.length == 0" :loading="viewFilesAndReviewThemAdoptLoading" @click="viewFilesAndReviewThemRejectCli(1)">通过</el-button>
+                <el-button type="danger" size="small" :disabled="tableMultipleSelection.length == 0" @click="viewFilesAndReviewThemReject()">驳回</el-button>
             </div>
         </el-dialog>
         <el-dialog title="文件驳回" :visible.sync="viewFilesAndReviewThemRejectVisable" width="800px">
@@ -796,10 +792,14 @@ import { error } from 'dingtalk-jsapi';
                 viewFilesAndReviewThemkey: 902,
 
                 tablesKey: 1,
-                tablesTwoKey: 300
+                tablesTwoKey: 300,
+                tableMultipleSelection: []
             };
         },
         methods: {
+            handleSelectionChange(val) {
+                this.tableMultipleSelection = val;
+            },
             showReasonForRejection(item) {
                 const taskId = item.id
                 this.http.post('/task/getFileRejectReason',{
@@ -817,11 +817,11 @@ import { error } from 'dingtalk-jsapi';
                     this.$message.error('请输入驳回原因')
                     return
                 }
+                const taskFileIds = this.tableMultipleSelection.map(item => item.id).join(',')
                 this.viewFilesAndReviewThemRejectValLoading = true
                 const { id, projectId } = this.viewFilesAndReviewThemRejectRow
-                this.http.post('/task/auditFile',{
-                    taskId: id, projectId,
-                    auditStatus,
+                this.http.post(auditStatus == 1 ? '/task-files/approveFile' : '/task-files/rejectFile',{
+                    taskFileIds,
                     reason: auditStatus == 1 ? '' : this.viewFilesAndReviewThemRejectVal
                 },
                 res => {
@@ -860,7 +860,8 @@ import { error } from 'dingtalk-jsapi';
             },
             getViewFilesAndReviewThemList() {
                 this.viewFilesAndReviewThemTableLoading = false
-                this.http.post('/task-files/getTaskFiles',{taskId:this.viewFilesAndReviewThemRejectRow.id},
+                // this.http.post('/task-files/getTaskFiles',{taskId:this.viewFilesAndReviewThemRejectRow.id},
+                this.http.post('/task-files/getUnChargedFilesByTaskId',{taskId:this.viewFilesAndReviewThemRejectRow.id},
                 res => {
                     if (res.code == "ok") {
                         this.viewFilesAndReviewThemkey++
@@ -1518,6 +1519,7 @@ import { error } from 'dingtalk-jsapi';
             viewFilesAndReviewThem(item) {
                 this.viewFilesAndReviewThemRejectRow = item
                 this.viewFilesAndReviewThemVisable = true
+                this.tableMultipleSelection = []
                 this.getViewFilesAndReviewThemList()
             },
             // 下拉框选择