tanyanfei 4 anni fa
parent
commit
1036c8c91f

+ 2 - 1
src/views/conference/AddConference.vue

@@ -620,7 +620,8 @@ export default {
                 this.form.is_popular=Boolean(this.form.is_popular)
                 this.form.is_recommend=Boolean(this.form.is_recommend)
                 this.form.citys=this.form.city.split(' ')
-                this.form.time=[this.form.begin_time,this.form.end_time]
+                this.$set(this.form,'time',[res.data.data.begin_time,res.data.data.end_time])
+                // this.form.time=[res.data.data.begin_time,res.data.data.end_time]
             })
         }
     },

+ 2 - 2
src/views/journalQun/SubjectDetail.vue

@@ -52,7 +52,7 @@
                 <el-table-column prop="zip" width="150" align="center"  label="操作" fixed="right">
                 <template slot-scope="scope">
                     <el-button class="edit" type="text" @click="edit(scope.row)">编辑</el-button>
-                    <el-button class="del" @click="del" type="text">删除</el-button>
+                    <el-button class="del" @click="del(scope.row.id)" type="text">删除</el-button>
                 </template>
                 </el-table-column>
             </el-table>
@@ -112,7 +112,7 @@ export default {
             this.$confirm("确定删除吗", "提示", {
                 type: "warning",
             }).then(() => {
-                this.$api.deleteEnterprise({ id: id }).then((res) => {
+                this.$api.delJournal({ id: id }).then((res) => {
                 this.$message({
                     message: "删除成功",
                     type: "success",

+ 1 - 3
src/views/system/Oplog.vue

@@ -20,9 +20,7 @@
                     <el-form-item>
                         <el-button  type="primary" @click="search">搜索</el-button>
                     </el-form-item>
-                    <el-form-item style="float:right" >
-                        <el-button @click="dialogVisible=true,dialogTitle='新增角色'" type="primary">新增角色</el-button>
-                    </el-form-item>
+                   
                 </el-form>
             </div>
             <el-table