任务分配

src/components/system/AssignTasks.vue

@@ -208,7 +208,7 @@ export default {
             this.contents = editor.text;
         },
         riqi(){
-           console.log(this.transferdate(this.taskform.schedulerules[0]));
+           console.log(this.datetime(this.taskform.schedulerules[0]));
         },
         selectchg(){
             
@@ -305,17 +305,26 @@ export default {
         goback(){
             this.$router.go(-1);
         },
+        //处理日期
+        datetime(val){
+            var date=new Date(val);
+            var y=date.getFullYear();
+            var m=date.getMonth()+1>=10?date.getMonth()+1:'0'+(date.getMonth()+1).toString();
+            var d=date.getDate()>=10?date.getDate():'0'+(date.getDate()).toString();
+            var s=date.getHours()>=10?date.getHours():'0'+(date.getHours()).toString();
+            var f=date.getMinutes()>=10?date.getMinutes():'0'+(date.getMinutes()).toString();
+            var mm=date.getSeconds()>=10?date.getSeconds():'0'+(date.getSeconds()).toString();
+            return y+'-'+m+'-'+d+" "+s+':'+f+':'+mm
+        },
         //转换日期
         transferdate(val){
             var today = new Date(val);
-
             var DD = String(today.getDate()).padStart(2, '0'); // 获取日
             var MM = String(today.getMonth() + 1).padStart(2, '0'); //获取月份，1 月为 0
             var yyyy = today.getFullYear(); // 获取年
             var Hours=today.getHours()<10 ? '0'+today.getHours() : new Date().getHours();;
             var Minutes=today.getMinutes()<10 ? '0'+today.getMinutes() : new Date().getMinutes();
             var Seconds=today.getSeconds()<10 ? '0'+today.getSeconds() : new Date().getSeconds();
-
             return yyyy+'-'+MM+'-'+DD+' '+Hours+':'+Minutes+':'+Seconds
         },
         //新增api
@@ -347,8 +356,8 @@ export default {
                     taskName:that.taskform.taskname,
                     taskContent: that.contents,
                     userIds: that.taskform.staff,
-                    predictBeginTime: that.transferdate(that.taskform.schedulerules[0]),
-                    predictEndTime: that.transferdate(that.taskform.schedulerules[1]),
+                    predictBeginTime: that.datetime(that.taskform.schedulerules[0]),
+                    predictEndTime: that.datetime(that.taskform.schedulerules[1]),
                     isIntoPerformance: that.taskform.staff?1:0,
                 }
             }).then(function (res) {

src/components/system/TaskList.vue

@@ -221,7 +221,7 @@
                     </el-table-column> -->
                     <el-table-column prop="depName" label="归属部门" width="100">
                     </el-table-column>
-                    <el-table-column prop="tasktypename" label="类型" width="100">
+                    <el-table-column prop="taskTypeName" label="类型" width="100">
                     </el-table-column>
                     <el-table-column prop="date" label="预计起止时间" width="170">
                         <template slot-scope="scopeTime">
@@ -510,7 +510,7 @@ export default {
             });
         },
         deleteRow(index,row,rows) {
-            this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+            this.$confirm('此操作将永久删除, 是否继续?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'