提交待办任务的重启调整

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

@@ -155,8 +155,8 @@
                             <span style="display: inline-block;margin-right: 55px">
                                 <span  :class="judgedate(scope.row.endDate) && searchField == '0' && scope.row.taskStatus == 0 ? 'redwarningspan autodatespan' : 'autodatespan'">{{scope.row.endDate}}</span>
                             </span>
-                            <el-button v-if="searchField == 0" size="small" type="primary" @click="completes(scope.row.id, 0)">{{ $t('wan-cheng') }}</el-button>
-                            <el-button v-if="searchField == 1" size="small" type="warning" @click="completes(scope.row.id, 1)">{{ $t('zhong-qi') }}</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>
                             </div>
                         </template>
                     </el-table-column>
@@ -170,14 +170,15 @@
                                 <el-input type="textarea" v-model.trim="causeRejectionForm.cause"></el-input>
                             </el-form-item>
                             <el-form-item label="责任人">
-                                <el-select v-if="user.userNameNeedTranslate != '1'" multiple collapse-tags v-model="causeRejectionForm.responsible" size="small" filterable clearable placeholder="请选择责任人" @change="$forceUpdate()">
-                                    <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id">
+                                <!-- <el-select v-if="user.userNameNeedTranslate != '1'" multiple collapse-tags v-model="causeRejectionForm.responsible" size="small" filterable clearable placeholder="请选择责任人" @change="$forceUpdate()">
+                                    <el-option v-for="item in causeRejectionForm.users" :key="item.id" :label="item.name" :value="item.id">
                                         <span style="float: left">{{ item.name }}</span>
                                         <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 20px;margin-right: 20px" v-if="item.jobNumber">{{ item.jobNumber }}</span>
                                     </el-option>
                                 </el-select>
 
-                                <selectCat :subject="users" :subjectId="causeRejectionForm.responsible" :multiSelect="true" :filterable="true"  @selectCal="selectCal" :size="'small'" :distinction="'5'" v-if="user.userNameNeedTranslate == '1'"></selectCat>
+                                <selectCat :subject="causeRejectionForm.users" :subjectId="causeRejectionForm.responsible" :multiSelect="true" :filterable="true"  @selectCal="selectCal" :size="'small'" :distinction="'5'" v-if="user.userNameNeedTranslate == '1'"></selectCat> -->
+                                <selectCat :subject="causeRejectionForm.users" :subjectId="causeRejectionForm.responsible" :multiSelect="true" :filterable="true"  @selectCal="selectCal" :size="'small'" :distinction="'5'"></selectCat>
                             </el-form-item>
                         </el-form>
                     </div>
@@ -1440,12 +1441,28 @@ import { error } from 'dingtalk-jsapi';
                 this.getList()
             },
             // 完成
-            completes(e, el) {
+            completes(e, el, obj) {
+                console.log(obj)
+                let arr = []
+                let userArr = []
+                if(obj.executorList) {
+                    for(let i in obj.executorList) {
+                        if(i == 0) {
+                            userArr.push(obj.executorList[0].executorId)
+                        }
+                        let oobj = {
+                            name: obj.executorList[i].executorName,
+                            id: obj.executorList[i].executorId
+                        }
+                        arr.push(oobj)
+                    }
+                }
                 this.causeRejectionForm = {
                     id: e,
                     taskStatus: el,
                     cause: '',
-                    responsible: ''
+                    responsible: userArr.length > 0 ? userArr : '',
+                    users: arr
                 }
                 if(el == 1 && this.user.timeType.restartTaskNeedReason == 1) {
                     this.causeRejectionDialog = true