提交批量撤销的代码

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

@@ -425,7 +425,6 @@
                                 </template>
                                 <el-button size="mini" v-if="scope.row.membdateList.length >= 2 && scope.row.flg" @click="detailsClick(scope.row, scope.$index)">{{ $t('details') }}</el-button>
                                 <!-- <el-button size="mini" v-if="scope.row.membdateList.length >= 2 && scope.row.flg" @click="batchRevokeClick(scope.row, scope.$index)">批量撤销</el-button> -->
-                                <el-button size="mini" v-if="scope.row.membdateList.length >= 2 && scope.row.flg" @click="showBatchRevocationVisable(scope.row, scope.$index)">批量撤销</el-button>
                             </div>
                         </template>
                     </el-table-column>
@@ -491,6 +490,7 @@
                 </el-table>
             </div>
             <div slot="footer" class="dialog-footer">
+                <el-button  @click="batchRevokeClick()" size="mini">批量撤销</el-button>
                 <el-button  @click="detailsDialog = false" size="mini">{{ $t('btn.cancel') }}</el-button>
             </div>
         </el-dialog>
@@ -506,38 +506,6 @@
                 <el-button type="primary" @click="approveinfun()" v-else>{{ $t('btn.determine') }}</el-button>
             </div>
         </el-dialog>
-
-        <!-- 批量撤销 -->
-        <el-dialog title="提示" :visible.sync="batchRevocationVisable" width="800px" :before-close="handleClose">
-        <div>
-            <el-table :data="batchRevocationList" style="width: 100%">
-                <el-table-column prop="userName" :label="$t('EmployeeDate')">
-                    <template slot-scope="scope">
-                        <div>
-                            <span v-if="user.userNameNeedTranslate == '1'">
-                                <TranslationOpenDataText type='userName' :openid='scope.row.userName'></TranslationOpenDataText>
-                            </span>
-                            <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.userName}}</span>
-                            <!-- {{scope.row.userName}} -->
-                            /{{scope.row.createDate}}
-                        </div>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="date" :label="$t('operation')" width="80">
-                    <template slot-scope="scope">
-                        <div>
-                            <el-button type="warning" size="mini" @click="batchRevokeClick(scope.row)" v-if="scope.row.state == 1">{{ $t('btn.undo') }}</el-button>
-                            <!-- <div >{{scope.row.state == 2 ? '已驳回' : '已撤销'}}</div> -->
-                            <el-link type="info" v-else :underline="false">{{scope.row.state == 2 ? $t('state.rejected') : $t('state.undone')}}</el-link>
-                        </div>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="batchRevocationVisable = false">关闭</el-button>
-        </span>
-      </el-dialog>
     </div>
 </template>
 
@@ -633,9 +601,6 @@
                     reason: ''
                 },
                 undoBathFormLoading: false,
-                batchRevocationList: [],
-                batchRevocationVisable: false,
-                batchRevocationListIndex: 0,
             };
         },
         filters: {
@@ -653,16 +618,8 @@
                 this.batchRevocationVisable = true
             },
             batchRevokeClick(row, index) {
-                this.undoBathForm = {
-                    reason: '',
-                    reportAuditLogId: row.id
-                }
                 this.undoBathFormDialog = true
             },
-            reassignValue(list) {
-                console.log(list[this.batchRevocationListIndex].membdateList || [])
-                this.batchRevocationList = list[this.batchRevocationListIndex].membdateList || []
-            },
             exportListByState() {
                 let url = '/report/exportListByState';
                 this.exportLoading = true;
@@ -694,11 +651,7 @@
             },
             clickBathCancel() {
                 this.undoBathFormLoading = true
-                // this.http.post('/report/batchDenyHisReport', this.undoBathForm,
-                this.http.post('/report/denyHisReport', {
-                    reason: this.undoBathForm.reason,
-                    hisId: this.undoBathForm.reportAuditLogId
-                },
+                this.http.post('/report/batchDenyHisReport', this.undoBathForm,
                 res => {
                     this.undoBathFormLoading = false
                     if (res.code == "ok") {
@@ -761,6 +714,8 @@
             detailsClick(item, i) {
                 this.detailsDialog = true
                 this.detailsList = item.membdateList
+                this.undoBathForm.reportAuditLogId = item.id
+                this.undoBathForm.reason = ''
                 this.idx = i
             },
             // 审核记录撤销点击确定
@@ -829,7 +784,6 @@
                         if(this.recordLists.length != 0){
                             this.detailsList = this.recordLists[this.idx].membdateList
                         }
-                        this.reassignValue(res.data.records)
                     } else {
                         this.$message({
                             message: res.msg,