Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

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

@@ -363,7 +363,7 @@
                 </el-table-column>
                 <el-table-column :label="$t('creationtime')" prop="indate" min-width="140" align="center">
                     <template slot-scope="scope">
-                        <span>{{scope.row.indate[0] + '-' + scope.row.indate[1] + '-' + scope.row.indate[2] + '\u0020\u0020' + scope.row.indate[3] + ':' + scope.row.indate[4] + ':' + scope.row.indate[5]}}</span>
+                        <span>{{scope.row.indate}}</span>
                     </template>
                 </el-table-column>
                 <el-table-column :label="$t('operation')" min-width="90" fixed="right">

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

@@ -96,8 +96,8 @@
                     </div>
                 </el-form-item>
                 <el-form-item style="float: right;" v-if="user.companyId != '3092'">
-                     <el-link type="primary" icon="el-icon-circle-plus-outline" :underline="false" @click="addTask()">{{ $t('xinJianRenWu') }}</el-link>
-                     <el-link type="primary" :underline="false" @click="exportTaskList()" style="margin-left: 20px;" v-loading="exportTaskLoading">{{ $t('export.export') }}</el-link>
+                     <el-link type="primary" icon="el-icon-circle-plus-outline" :underline="false" @click="addTask()" v-if="idx != 3">{{ $t('xinJianRenWu') }}</el-link>
+                     <el-link type="primary" :underline="false" @click="exportTaskList()" style="margin-left: 20px;" v-loading="exportTaskLoading" v-if="idx != 3">{{ $t('export.export') }}</el-link>
                 </el-form-item>
             </el-form>
         </el-col>
@@ -407,7 +407,7 @@
                 </el-table-column>
                 <el-table-column :label="$t('creationtime')" prop="indate" min-width="140" align="center">
                     <template slot-scope="scope">
-                        <span>{{scope.row.indate[0] + '-' + scope.row.indate[1] + '-' + scope.row.indate[2] + '\u0020\u0020' + scope.row.indate[3] + ':' + scope.row.indate[4] + ':' + scope.row.indate[5]}}</span>
+                        <span>{{scope.row.indate}}</span>
                     </template>
                 </el-table-column>
                 <el-table-column :label="$t('operation')" min-width="90" fixed="right">

fhKeeper/formulahousekeeper/timesheet_h5/src/views/task/editask.vue

@@ -570,6 +570,7 @@ export default {
             delete this.taskform.subTaskList;
             delete this.taskform.refTaskList;
             delete this.taskform.progress;
+            delete this.taskform.userList;
 
             this.submitTaskBtn = true
             // return