修改截止时间显示格式

src/components/InstitutionRank.vue

@@ -1,17 +1,17 @@
 <template>
   <div>
-    <el-table :data="tableData" :showHeader="false" border style="width: 100%">
-      <el-table-column type="index" width="50"></el-table-column>
-      <el-table-column prop="logo" width="120">
-        <template slot-scope="scope">
+    <el-table :data="tableData" :showHeader="true" border style="width: 100%">
+      <el-table-column type="index" width="50" label="排名"></el-table-column>
+      <el-table-column prop="logo" width="120" label="机构logo">
+        <template slot-scope="scope" >
           <img class="logo-img" :src="scope.row.logo==null?defaultValue.image:scope.row.logo"/>
         </template>
       </el-table-column>
-      <el-table-column prop="name">
+      <el-table-column prop="name" label="机构名称">
         <template slot-scope="scope"><span class="institution-name" style="font-size: 12px">{{scope.row.name}}</span></template>
       </el-table-column>
-      <el-table-column prop="name">
-        <template slot-scope="scope"><span class="institution-name" style="font-size: 12px">总任务金额：{{scope.row.allTaskPrice}}</span></template>
+      <el-table-column prop="name" label="积分">
+        <template slot-scope="scope"><span class="institution-name" style="font-size: 12px"><el-tag type="primary">{{scope.row.allTaskPrice}}</el-tag></span></template>
       </el-table-column>
     </el-table>
   </div>

src/components/Mine.vue

@@ -55,7 +55,6 @@
       <el-tabs  v-loading="loading" style="width: 90%;margin-left: 5%">
         <el-tab-pane label="未完成任务">
           <el-row v-if="unFinishedTaskList != null && unFinishedTaskList.length != 0" type="flex" align="middle" justify="center"  style="font-size: 14px;">
-
             <el-col :span="6">任务封面</el-col>
             <el-col :span="5">任务名称</el-col>
             <el-col :span="5">任务类型</el-col>

src/components/PersonRank.vue

@@ -1,17 +1,17 @@
 <template>
   <div>
-    <el-table :data="tableData" :showHeader="false" border style="width: 100%">
-      <el-table-column type="index" width="50"></el-table-column>
-      <el-table-column prop="logo" width="70">
+    <el-table :data="tableData" showHeader="true" border style="width: 100%">
+      <el-table-column type="index" width="50" label="排名"></el-table-column>
+      <el-table-column prop="logo" width="70" label="头像">
         <template slot-scope="scope">
           <img class="user-img" :src="scope.row.logo==null?defaultValue.image:scope.row.logo"/>
         </template>
       </el-table-column>
-      <el-table-column prop="name">
+      <el-table-column prop="name" label="用户名">
         <template slot-scope="scope"><span class="institution-style" style="font-size: 12px">{{scope.row.name}}</span></template>
       </el-table-column>
-      <el-table-column prop="number">
-        <template slot-scope="scope"><span class="institution-style" style="font-size: 12px">总项目金额：{{scope.row.allProjectPrice}}</span></template>
+      <el-table-column prop="number" label="积分">
+        <template slot-scope="scope"><span class="institution-style" style="font-size: 12px"><el-tag type="primary">{{scope.row.allProjectPrice}}</el-tag></span></template>
       </el-table-column>
     </el-table>
   </div>

src/components/cheat/AgencyAdd.vue

@@ -3,34 +3,23 @@
     <div class="create-body">
       <div class="title">添加机构</div>
       <el-form v-loading="loading" :model="agency" :rules="rules" ref="agency" label-width="12%" class="demo-report">
-        <!--<el-form-item prop="file" label="头像">-->
-        <!--<el-row class="demo-avatar demo-basic">-->
-        <!--<el-col :span="12">-->
-        <!--<div class="demo-basic&#45;&#45;circle">-->
-        <!--<div class="block">-->
-        <!--<el-avatar :size="200" src="https://www.baidu.com/img/bd_logo1.png"></el-avatar>-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--</el-col>-->
-        <!--</el-row>- -->
-        <!--</el-form-item>-->
         <el-form-item label="机构名称" prop="name">
-          <el-input v-if="isModifyMode" v-model="agency.name"></el-input>
+          <el-input size="small" v-if="isModifyMode" v-model="agency.name"></el-input>
           <!--<span v-if="!isModifyMode">{{agency.name}}</span>-->
         </el-form-item>
-        <el-form-item label="机构电话" prop="mobile">
+        <el-form-item size="small" label="机构电话" prop="mobile">
           <el-input v-if="isModifyMode" v-model="agency.mobile"></el-input>
           <!--<span v-if="!isModifyMode">{{agency.name}}</span>-->
         </el-form-item>
-        <el-form-item label="机构邮箱" prop="email">
+        <el-form-item size="small" label="机构邮箱" prop="email">
           <el-input v-if="isModifyMode" v-model="agency.email"></el-input>
           <!--<span v-if="!isModifyMode">{{agency.name}}</span>-->
         </el-form-item>
-        <el-form-item label="银行卡账户" prop="bankAccount">
+        <el-form-item size="small" label="银行卡账户" prop="bankAccount">
           <el-input v-if="isModifyMode" v-model="agency.bankAccount"></el-input>
           <!--<span v-if="!isModifyMode">{{agency.bankAccount}}</span>-->
         </el-form-item>
-        <el-form-item label="地址" prop="address">
+        <el-form-item size="small" label="地址" prop="address">
           <el-input v-if="isModifyMode" v-model="agency.address"></el-input>
           <!--<span v-if="!isModifyMode">{{agency.address}}</span>-->
         </el-form-item>
@@ -45,7 +34,7 @@
         </el-form-item>
         <el-form-item label="测评机构资源" prop="resource">
           <span v-for="item in agency.evaluationAgencyResourceList" :key="item.id">
-            资源类型：&nbsp;<el-select v-model="item.type" placeholder="请选择" style="width: 15%;margin-bottom: 10px"
+            资源类型：&nbsp;<el-select size="small" v-model="item.type" placeholder="请选择" style="width: 15%;margin-bottom: 10px"
                                   :value="item.type">
               <el-option
                 v-for="item in resourceTypes"
@@ -54,49 +43,14 @@
                 :value="item">
               </el-option>
             </el-select>
-            资源名称：&nbsp;<el-input v-model="item.name" style="width: 15%"></el-input>
-            总量：&nbsp;<el-input-number :min="0" v-model="item.totalNum"></el-input-number>
-            可用数量：&nbsp;<el-input-number :min="0" :max="item.totalNum" v-model="item.availableNum"></el-input-number>
-            <el-button type="danger" icon="el-icon-delete" @click="removeAgencyResource(item.id)"></el-button>
+            资源名称：&nbsp;<el-input size="small" v-model="item.name" style="width: 15%"></el-input>
+            总量：&nbsp;<el-input-number size="small" :min="0" v-model="item.totalNum"></el-input-number>
+            可用数量：&nbsp;<el-input-number size="small" :min="0" :max="item.totalNum" v-model="item.availableNum"></el-input-number>
+            <el-button size="small" type="danger" icon="el-icon-delete" @click="removeAgencyResource(item.id)"></el-button>
             <br/>
           </span>
-          <el-button type="primary" icon="el-icon-circle-plus" plain size="small" @click="addAgencyResource">添加资源
+          <el-button  type="primary" icon="el-icon-circle-plus" plain size="mini" @click="addAgencyResource">添加资源
           </el-button>
-          <!--<div>-->
-          <!--<el-row>-->
-          <!--<el-col :span="2">-->
-          <!--<span>专家数量</span>-->
-          <!--</el-col>-->
-          <!--<el-col :span="10">-->
-          <!--共&nbsp;&nbsp;<el-input-number :min="0" v-model="agency.professionalsCount"-->
-          <!--placeholder="0"></el-input-number>&nbsp;&nbsp;人，-->
-          <!--可用&nbsp;&nbsp;<el-input-number :min="0" v-model="agency.professionalsFreeCount"-->
-          <!--placeholder="0"></el-input-number>&nbsp;&nbsp;人；-->
-          <!--</el-col>-->
-          <!--</el-row>-->
-          <!--<el-row>-->
-          <!--<el-col :span="2">-->
-          <!--<span>服务器数量</span>-->
-          <!--</el-col>-->
-          <!--<el-col :span="10">-->
-          <!--共&nbsp;&nbsp;<el-input-number :min="0" v-model="agency.serversCount" placeholder="0"></el-input-number>&nbsp;&nbsp;台，-->
-          <!--可用&nbsp;&nbsp;<el-input-number :min="0" v-model="agency.serversFreeCount"-->
-          <!--placeholder="0"></el-input-number>&nbsp;&nbsp;台；-->
-          <!--</el-col>-->
-          <!--</el-row>-->
-          <!--<el-row>-->
-          <!--<el-col :span="2">-->
-          <!--<span>专用设备数量</span>-->
-          <!--</el-col>-->
-          <!--<el-col :span="10">-->
-          <!--共&nbsp;&nbsp;<el-input-number :min="0" v-model="agency.devicesCount" placeholder="0"></el-input-number>&nbsp;&nbsp;台，-->
-          <!--可用&nbsp;&nbsp;<el-input-number :min="0" v-model="agency.devicesFreeCount"-->
-          <!--placeholder="0"></el-input-number>&nbsp;&nbsp;台。-->
-          <!--</el-col>-->
-          <!--</el-row>-->
-          <!--</div>-->
-          <!--<el-input v-if="isModifyMode" v-model="agency.resource"></el-input>-->
-          <!--<span v-if="!isModifyMode">{{agency.resource}}</span>-->
         </el-form-item>
         <el-form-item prop="file" label="机构logo">
           <el-upload
@@ -243,6 +197,18 @@ export default {
           {type: 'array', required: true, message: '请至少选择一个机构能力', trigger: 'change'}
           // { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
         ],
+        evaluationAgencyResourceList:[
+          {
+            validator: (rule, value, callback) => {
+              console.log(value)
+              if (true) {
+                callback(new Error('定向发布至少要选择一个区域管理员'))
+              } else {
+                callback()
+              }
+            }, trigger: 'change'
+          },
+        ]
       },
       tableData: [{
         date: '2016-05-02',

src/components/commons/TaskItem.vue

@@ -55,7 +55,7 @@ export default {
     padding-top: 10px;
     padding-bottom: 10px;
     border: 1px solid #eee;
-    margin: 15px 5px;
+    /*margin: 15px 5px;*/
     span {
       display: inline-block;
     }
@@ -72,6 +72,6 @@ export default {
   }
 
   .task-td {
-    padding: 15px;
+    /*padding: 15px;*/
   }
 </style>

src/components/project/Project.vue

@@ -161,7 +161,7 @@
               :picker-options="pickerOptions"
             ></el-date-picker>
           </div>
-          <span v-if="!isModifyMode">{{new Date(project.datetime)}}</span>
+          <span v-if="!isModifyMode">{{reformDate(new Date(project.datetime))}}</span>
         </el-form-item>
         <el-form-item v-if="isModifyMode">
           <div class="btn btn-small btn-info" @click="submitForm('project')">确认修改</div>
@@ -252,7 +252,8 @@ import {
   receiveProjectRequest,
   rejectProject,
   storageGet,
-  submitProjectRequest
+  submitProjectRequest,
+  getFormalTimeFromDate
 } from '@/js/index'
 
 export default {
@@ -457,6 +458,7 @@ export default {
       this.setInstitutions()
       this.setUserInfo()
       this.loadData()
+      //this.reformDate(123)
       // this.project.platform.map(item => {
       //   this.platformType.push(PlatformType[item])
       // })
@@ -796,6 +798,9 @@ export default {
     hideLoading () {
       this.loading = false
     },
+    reformDate(date){
+      return getFormalTimeFromDate(date)
+    }
   }
 }
 </script>

src/components/project/ProjectCreate.vue

@@ -18,7 +18,7 @@
           </el-input>
         </el-form-item>
         <el-form-item label="需求描述" prop="desc">
-          <el-input autosize type="textarea" style="width: 400px" v-model="project.desc"
+          <el-input type="textarea" style="width: 400px" v-model="project.desc"
                     placeholder="请输入对项目的描述"></el-input>
         </el-form-item>
 

src/components/task/Task.vue

@@ -107,7 +107,7 @@
               :picker-options="pickerOptions"
             ></el-date-picker>
           </div>
-          <span v-if="!isModifyMode">{{task.datetime}}</span>
+          <span v-if="!isModifyMode">{{reformDate(new Date(task.datetime))}}</span>
         </el-form-item>
         <el-form-item v-if="isModifyMode">
           <div class="btn btn-small btn-info" @click="updateTask()">确认修改</div>
@@ -155,7 +155,8 @@ import {
   rejectTask,
   storageGet,
   submitTaskRequest,
-  updateTask
+  updateTask,
+  getFormalTimeFromDate
 } from '@/js/index'
 
 export default {
@@ -577,6 +578,9 @@ export default {
         }
       })
     },
+    reformDate(date){
+      return getFormalTimeFromDate(date)
+    }
   },
 }
 //回收站

src/js/generalService.js

@@ -42,7 +42,7 @@ export const getAllServiceTypes = () => {
 
 //获取所有报告类型
 export const getAllReportTypes = () => {
-  const data = ['项目可行性报告', '项目测试方案', '项目测试报告', '项目缺陷报告', '项目用例报告', '其他']
+  const data = ['可行性报告', '测试方案', '测试报告', '缺陷报告', '用例报告', '其他']
   return new Promise((resolve) => {
     resolve(data)
   })
@@ -132,4 +132,23 @@ export const getGreenChannelAddProjectExcelTemplateFile = (getTemplateExcelSucce
   //   getTemplateExcelFail(error)
   // })
 }
+Date.prototype.Format = function (fmt) {
+  var o = {
+    'M+': this.getMonth() + 1, //月份
+    'd+': this.getDate(), //日
+    'h+': this.getHours(), //小时
+    'm+': this.getMinutes(), //分
+    's+': this.getSeconds(), //秒
+    'q+': Math.floor((this.getMonth() + 3) / 3), //季度
+    'S': this.getMilliseconds() //毫秒
+  }
+  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
+  for (var k in o) {
+    if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+  }
+  return fmt
+}
+export const getFormalTimeFromDate = (date) => {
+  return date.Format("yyyy-MM-dd hh:mm:ss");
+}
 

src/js/index.js

@@ -52,6 +52,7 @@ import {
   getAllPlatformTypes,
   getAllReportTypes,
   getAllServiceTypes,
+  getFormalTimeFromDate,
   getGreenChannelAddProjectExcelTemplateFile,
   getProvinceCodeByProvinceName,
   getProvinceNameByProvinceCode,
@@ -202,6 +203,7 @@ export {
   storageGet,
   //保存数据到本地
   storageSave,
+  getFormalTimeFromDate,
 }
 
 export const defaultValue = {