xjc před 4 roky
rodič
revize
f09432a4b5

+ 5 - 1
src/views/activity/Activity.vue

@@ -128,7 +128,11 @@ a {
         <el-table-column prop="journal_name" label="发布单位" width="150"></el-table-column>
         <el-table-column prop="the_host" label="主办方" width="150"></el-table-column>
         <el-table-column prop="to_undertake" label="承办方" width="150"></el-table-column>
-        <el-table-column prop="begin_time" label="活动时间"  width="170"></el-table-column>
+        <el-table-column prop="begin_time" label="活动时间"  width="170">
+          <template slot-scope="scope">
+              <span>{{scope.row.begin_time}},{{scope.row.end_time}}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="address" label="活动地址" width="200"></el-table-column>
         <el-table-column prop="desc" label="活动简介" width="500">
                     <template slot-scope="scope">

+ 1 - 1
src/views/activity/AddActivity.vue

@@ -156,7 +156,7 @@
                         <el-form-item label="会议时间:" prop='time'>
                             <el-date-picker
                                 v-model="form.time"
-                                type="daterange" value-format="yyyy-MM-dd"
+                                type="datetimerange" value-format="yyyy-MM-dd"
                                 range-separator="至"
                                 start-placeholder="开始日期"
                                 end-placeholder="结束日期"

+ 5 - 1
src/views/activity/OldActivity.vue

@@ -131,7 +131,11 @@ a {
         <el-table-column prop="journal_name" label="发布单位"  width="150"></el-table-column>
         <el-table-column prop="the_host" label="主办方" width="150"></el-table-column>
         <el-table-column prop="to_undertake" label="承办方" width="150"></el-table-column>
-        <el-table-column prop="begin_time" label="活动时间"  width="170"></el-table-column>
+        <el-table-column prop="begin_time" label="活动时间"  width="170">
+          <template slot-scope="scope">
+              <span>{{scope.row.begin_time}},{{scope.row.end_time}}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="address" label="活动地址"  width="200"></el-table-column>
         <el-table-column prop="desc" label="活动简介" width="500">
                     <template slot-scope="scope">

+ 16 - 1
src/views/article/AddArticle.vue

@@ -154,7 +154,12 @@
               <el-input v-model="form.author" placeholder=""> </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" >
+          <el-col :span="8">
+            <el-form-item label="作者单位:" prop="">
+              <el-input v-model="form.author_unit" placeholder=""> </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" >
             <el-form-item label="出版时间:" prop="publish_time">
               <el-date-picker
                 v-model="form.publish_time"
@@ -167,6 +172,16 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="出版信息:" prop="">
+              <el-input v-model="form.publish_info" placeholder=""> </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="DOI信息:" prop="">
+              <el-input v-model="form.doi" placeholder=""> </el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-form-item label="文章简介:">
           <el-input

+ 22 - 22
src/views/conference/AddConference.vue

@@ -507,28 +507,28 @@ export default {
                 })
                 return
             }
-            if(form.speaker.length<=0){
-                this.$message({
-                    message: '请添加主讲人',
-                    type: 'error'
-                })
-                return
-            }else{
-                if(!form.speaker[0].name){
-                    this.$message({
-                        message: '请输入主讲人姓名',
-                        type: 'error'
-                    })
-                    return
-                }
-                if(!form.speaker[0].img){
-                    this.$message({
-                        message: '请上传主讲人头像',
-                        type: 'error'
-                    })
-                    return
-                }
-            }
+            // if(form.speaker.length<=0){
+            //     this.$message({
+            //         message: '请添加主讲人',
+            //         type: 'error'
+            //     })
+            //     return
+            // }else{
+            //     if(!form.speaker[0].name){
+            //         this.$message({
+            //             message: '请输入主讲人姓名',
+            //             type: 'error'
+            //         })
+            //         return
+            //     }
+            //     if(!form.speaker[0].img){
+            //         this.$message({
+            //             message: '请上传主讲人头像',
+            //             type: 'error'
+            //         })
+            //         return
+            //     }
+            // }
             // form.organizer_name=this.organizerList.filter(item=>item.id==form.organizer_id)[0].name
             
             if(this.id){