Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/views/report/project/components/managementRuleEdit.vue

@@ -67,7 +67,7 @@
       </a-col>
       <a-col :span="4">
         <a-form-model-item :prop="'managementRuleList.' + index + '.mainContent'" :rules="{ required: true, message: '*', trigger: 'blur',}">
-          <a-input-number v-model="item.mainContent" placeholder="主要内容" :min="0" :step="0.01" style="width:85%" />
+          <a-input v-model="item.mainContent" placeholder="主要内容" :maxLength="100" style="width:85%" />
         </a-form-model-item>
       </a-col>
       <a-col :span="8">

src/views/report/project/components/managementRuleInfo.vue

@@ -62,7 +62,7 @@
       <a-col :span="2">
         <div class="special-middle">
           <div>
-            {{ item.releaseDate }}
+            {{ moment(item.releaseDate).format('YYYY-MM-DD') }}
           </div>
         </div>
       </a-col>
@@ -76,7 +76,7 @@
       <a-col :span="2">
         <div class="special-middle">
           <div>
-            {{ item.validityPeriod }}
+            {{ moment(item.validityPeriod).format('YYYY-MM-DD') }}
           </div>
         </div>
       </a-col>
@@ -102,7 +102,7 @@
 <script>
 
 import documentView from '@/views/components/common/documentView'
-
+import moment from 'moment'
 
 export default {
   name: "managementRuleInfo",
@@ -129,7 +129,7 @@ export default {
 
   },
   methods: {
-
+    moment,
   },
 };
 </script>

src/views/report/project/components/projectEdit.vue

@@ -492,8 +492,8 @@
           </div>
         </a-col>
         <a-col :span="20">
-          <a-form-model-item prop="researchContent">
-            <a-textarea placeholder="项目的意义、必要性" v-model="formData.researchContent" :maxLength="5000" style="width: 80%; height: 160px; margin-top: 12px" />
+          <a-form-model-item prop="projContent">
+            <a-textarea placeholder="项目的意义、必要性" v-model="formData.projContent" :maxLength="5000" style="width: 80%; height: 160px; margin-top: 12px" />
           </a-form-model-item>
         </a-col>
       </a-row>
@@ -692,7 +692,7 @@ export default {
         linkEmail: null,
         projAbstract: null,
         projKeywords: null,
-        researchContent: null,
+        projContent: null,
         memResume: null,
         researchProgress: null,
         researchContent: null,
@@ -742,7 +742,7 @@ export default {
         linkEmail: [{ required: true, message: '请填写电子邮箱', trigger: 'blur' },],
         projAbstract: [{ required: true, message: '请填写项目摘要', trigger: 'blur' },],
         projKeywords: [{ required: true, message: '请填写关键词', trigger: 'blur' },],
-        researchContent: { required: true, message: '请填写项目的意义、必要性', trigger: 'blur' },
+        projContent: { required: true, message: '请填写项目的意义、必要性', trigger: 'blur' },
         memResume: { required: true, message: '请填写项目现有工作基础和支撑条件', trigger: 'blur' },
         researchProgress: { required: true, message: '请填写与项目相关的国内外技术发展现状', trigger: 'blur' },
         researchContent: { required: true, message: '请填写项目实施目标', trigger: 'blur' },

src/views/report/project/components/projectInfo.vue

@@ -435,7 +435,7 @@
         </div>
       </a-col>
       <a-col :span="20">
-        <div v-html="toTextarea(value.researchContent)"></div>
+        <div v-html="toTextarea(value.projContent)"></div>
       </a-col>
     </a-row>
     <a-row type="flex">

src/views/report/project/components/projectMemberEdit.vue

@@ -130,7 +130,7 @@
         <a-col :span="1">
           <div class="special-middle">
             <div>
-              {{ item.birthday }}
+              {{ moment(item.birthday).format('YYYY-MM-DD') }}
             </div>
           </div>
         </a-col>
@@ -257,6 +257,7 @@
 //用法 <proj-group-member :members.sync="formData.members" />
 
 import memberEdit from '@/views/report/project/components/memberEdit'
+import moment from 'moment'
 
 const Member = {
   name: null,
@@ -307,6 +308,7 @@ export default {
   created () {
   },
   methods: {
+    moment,
     closeWindow (value) {
       if (!this.isEdit) {
         this.memObject = {}

src/views/report/project/components/projectMemberInfo.vue

@@ -125,7 +125,7 @@
         <a-col :span="1">
           <div class="special-middle">
             <div>
-              {{ item.birthday }}
+              {{ moment(item.birthday).format('YYYY-MM-DD') }}
             </div>
           </div>
         </a-col>
@@ -234,6 +234,7 @@
 
 <script>
 //用法 <proj-group-member :members.sync="formData.members" />
+import moment from 'moment'
 
 export default {
   name: 'projectMemberInfo',
@@ -255,7 +256,7 @@ export default {
   created () {
   },
   methods: {
-    
+    moment,
   }
 }
 </script>