Merge branch 'http_mock' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_mock

src/views/projectManage/projectList/projectViewDetails.vue

@@ -218,7 +218,7 @@
                     {{ item.title | ellipsis_title }}
                     <!-- </el-tooltip> -->
                     <br>
-                    {{ item.mtime | dateStr }}
+                    {{ item.date | dateStr }}
                   </div>
                 </li>
               </ul>
@@ -353,13 +353,14 @@
           <el-date-picker
             v-model="form.mtime"
             type="date"
-            format="yyyy 年 MM 月 dd 日"
+            value-format="yyyy-MM-dd"
             placeholder="请选择日期"
           />
         </el-form-item>
         <el-form-item label="详情">
           <el-input
             v-model="form.description"
+            class="details"
             rows="3"
             maxlength="200"
             type="textarea"
@@ -797,8 +798,14 @@ export default {
       projectBizList({}).then(res => {
         this.all_bizId = res.data
       })
-      mileStoneList({ projectId: this.projectId[1] }).then(res => {
+      mileStoneList({ projectId: this.projectId[1] }).then(res => { // 里程碑时间排序
+        res.data.map(item => {
+          item.date = item.mtime
+        })
         this.project_Milepost = res.data
+        this.project_Milepost.sort(function(a, b) {
+          return Date.parse(a.mtime) - Date.parse(b.mtime)// 时间正序
+        })
       })
     },
     delete_project() {
@@ -876,6 +883,7 @@ export default {
       })
     },
     Milepost_Submission(e) {
+      console.log(e)
       // 里程碑(提交)
       this.$refs['form'].validate(valid => {
         if (valid) {
@@ -901,6 +909,7 @@ export default {
               this.dialogFormVisible = false
             })
           } else if (this.title_name === '编辑里程碑') {
+            console.log(milestone, 'ds')
             mileStoneUpdate({ milestone, user }).then(res => {
               this.$message({
                 message: res.msg,
@@ -1223,4 +1232,7 @@ export default {
     white-space:pre-line;
     overflow-y: auto;
 }
+.details .el-input__count{
+  display: none;
+}
 </style>

src/views/projectManage/taskList/taskIndex.vue

@@ -334,7 +334,6 @@ export default {
     },
     get_taskList(e) {
       // 查询
-      console.log(e, 'f')
       this.table_loading = true
       var task = { pageSize: 15, curIndex: 1 }
       if (e !== undefined) {