审核人：无

fhKeeper/formulahousekeeper/timesheet_mld/src/components/taskComponent.vue

@@ -466,7 +466,7 @@
         </template>
         
         <template>
-            <el-button type="primary" @click="submitInsert(0)" :loading="addLoading" v-if="addForm.id == null || canEditTask">
+            <el-button type="primary" @click="submitInsert()" :loading="addLoading" v-if="addForm.id == null || canEditTask">
                 提交
             </el-button>
             <!--对于需要审核的情况-->
@@ -1516,7 +1516,7 @@ export default {
                 } else {
                     this.addForm.aheadTidList = [];
                 }
-                
+                this.selectType = {id:this.addForm.taskPlanType, needAudit: this.addForm.needAudit};
                 this.addForm.createDate = null;
                 this.addForm.indate = null;
                 this.addLoading = false;
@@ -1837,7 +1837,7 @@ export default {
         console.log(this.times, '时间')
     },
     // 提交按钮
-    submitInsert(isSubmit) {
+    submitInsert() {
         if (this.textContent !== true) return  this.$message({
             showClose: true,
             message: this.$t('pictureistoolargepleaseuploaditagain'),
@@ -1900,12 +1900,12 @@ export default {
                 }
 
                 let addFormData = { ...this.addForm }
-                if (isSubmit) {
-                    addFormData.auditPass = true;
-                }
-                if(this.addForm.taskPlanType == 3) {
+                //不需要审核，简化字段
+                if(!this.selectType.needAudit) {
                     addFormData = {
-                        taskPlanType: 3,
+                        id: this.addForm.id,
+                        name: this.addForm.name,
+                        taskPlanType: this.addForm.taskPlanType,
                         startDate: this.addForm.startDate,
                         endDate: this.addForm.endDate,
                         executorListStr: this.addForm.executorListStr

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

@@ -143,28 +143,10 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="finalChargeStatusText" label="文件审核状态" width="210" sortable v-if="(user.timeType.taskFileCharge == 1 || user.timeType.taskFileCharge == 2) && [0, 1, 2].includes(idx)">
+                    <el-table-column label="审核人" sortable width="150" >
                         <template slot-scope="scope">
-                            <template v-if="scope.row.fileChargeStatus != 2">
-                                <el-link :type="{'0': 'warning', '1': 'info', '2': 'danger'}[scope.row.fileChargeStatus]" :underline="false">
-                                    {{ scope.row.finalChargeStatusTextList[0] || '' }}
-                                    <template v-if="(scope.row.finalChargeStatusTextList || []).length > 1">
-                                        <TranslationOpenDataText :openid='scope.row.finalChargeStatusTextList[1]'></TranslationOpenDataText>
-                                        {{ scope.row.finalChargeStatusTextList[2] || '' }}
-                                    </template>
-                                </el-link>
-                            </template>
-                            <template v-else>
-                                <el-tooltip class="item" effect="dark" content="点击查看" placement="top">
-                                    <el-link :type="'danger'" :underline="false" @click="showReasonForRejection(scope.row)">
-                                        {{ scope.row.finalChargeStatusTextList[0] || '' }}
-                                        <template v-if="(scope.row.finalChargeStatusTextList || []).length > 1">
-                                            <TranslationOpenDataText :openid='scope.row.finalChargeStatusTextList[1]'></TranslationOpenDataText>
-                                            {{ scope.row.finalChargeStatusTextList[2] || '' }}
-                                        </template>
-                                    </el-link>
-                                </el-tooltip>
-                            </template>
+                            <span v-if="scope.row.firstAuditorName">{{scope.row.firstAuditorName}}->{{scope.row.secondAuditorName}}</span>
+                            <span v-else>无</span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="taskStatus" label="状态" sortable width="150" >
@@ -207,8 +189,8 @@
                             <!--我创建的，对于创建人在待第一审核状态下，可以进行撤回操作-->
                             <el-button v-if="(scope.row.taskStatus == 0 && ((scope.row.secondAuditorId && scope.row.secondAuditorId.indexOf(user.id) != -1) || user.roleName.indexOf('管理员') >= 0)) 
                             || (scope.row.creatorId == user.id && scope.row.taskStatus == 3)" size="small" type="primary" @click="cancelTask(scope.row)">撤销</el-button>
-                            <el-button v-if="searchField == 0" size="small" type="primary" @click="completes(scope.row.id, 0, scope.row)">{{ $t('wan-cheng') }}</el-button>
-                            <el-button v-if="searchField == 1" size="small" type="warning" @click="completes(scope.row.id, 1, scope.row)">{{ $t('zhong-qi') }}</el-button>
+                            <el-button v-if="scope.row.taskStatus == 0" size="small" type="primary" @click="completes(scope.row.id, 0, scope.row)">{{ $t('wan-cheng') }}</el-button>
+                            <el-button v-if="scope.row.taskStatus == 1" size="small" type="warning" @click="completes(scope.row.id, 1, scope.row)">{{ $t('zhong-qi') }}</el-button>
                             <el-button v-if="idx == 3" size="small" type="primary" @click="handleAuditTask(scope.row, true)">通过</el-button>
                             <el-button v-if="idx == 3" size="small" type="danger" @click="handleAuditTask(scope.row, false)">驳回</el-button>
                             </div>