lrf402788946 5 years ago
parent
commit
796b7042fb

+ 15 - 1
src/layout/duijiehui/duijiedetail.vue

@@ -9,9 +9,23 @@
         </el-col>
         <el-col :span="24" class="messgae">
           <el-form ref="form" :model="form" label-width="120px">
-            <el-form-item label=" 对接会标题">
+            <el-form-item label="对接会标题">
               <el-input v-model="form.title"></el-input>
             </el-form-item>
+            <el-form-item label="开始时间">
+              <el-date-picker v-model="form.start_time" type="datetime" placeholder="请选择开始时间" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="报名截止时间">
+              <el-date-picker
+                v-model="form.join_end"
+                type="datetime"
+                placeholder="请选择报名截止时间"
+                format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm"
+              >
+              </el-date-picker>
+            </el-form-item>
             <el-form-item label="简介">
               <el-input type="textarea" v-model="form.desc"></el-input>
             </el-form-item>

+ 4 - 0
src/layout/layout-part/newmenu.vue

@@ -45,6 +45,10 @@ export default {
     ...mapActions(['fetch', 'create', 'update', 'query']),
     async serrch() {
       const res = await this.query();
+      if (this.user.role == '1') {
+        this.menu.push(system, personnel, government, record, serve, enterprise, duijiehui, site, user, links, permission, dictionary);
+        return;
+      }
       for (const val of this.user.columnid) {
         var result = res.data.filter(item => item.id == val);
         for (const acc of result) {

+ 1 - 1
src/views/duijiehui/index.vue

@@ -66,7 +66,7 @@ export default {
     async search({ skip = 0, limit = 10, ...info } = {}) {
       const res = await this.query({ skip, limit, ...info });
       if (this.$checkRes(res)) {
-        this.$set(this, `list`, res.data);
+        this.$set(this, `list`, res.data || []);
         this.$set(this, `total`, res.total);
       }
     },

+ 1 - 1
vue.config.js

@@ -69,7 +69,7 @@ module.exports = {
         // pathRewrite: { '^/api/affairs': '/api' },
       },
       '/api/live': {
-        target: 'http://10.16.10.72:9009',
+        target: 'http://free.liaoningdoupo.com',
         changeOrigin: true,
         ws: true,
         // pathRewrite: { '^/api/affairs': '/api' },