Parcourir la source

Merge branch 'pre' of http://git.bjzxtw.org.cn:3000/zxt/admin_home into pre

LiuJ il y a 1 semaine
Parent
commit
3829aa71ec
2 fichiers modifiés avec 10 ajouts et 7 suppressions
  1. 8 5
      src/views/job/creatJob.vue
  2. 2 2
      src/views/website/websiteColumn.vue

+ 8 - 5
src/views/job/creatJob.vue

@@ -216,6 +216,7 @@ export default {
       creatNews_user_type: '0',//判断用户类型'
       
       form: {
+        web_site_id: '',//站点名称
         user_type: "??",//判断用户类型'
         // cat_arr_id: 0,//导航池名称
         nav_add_pool_id: [],//导航池子级
@@ -258,10 +259,9 @@ export default {
       //1.2 表单验证规则
       formRules: {
         // 站点名称
-        // websiteName: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+        web_site_id: [{ required: true, trigger: 'blur', validator: validateEmpty }],
         //导航池名称不能为空
         cat_arr_id: [{ required: true, trigger: 'blur', validator: validateArray }],
-
         province_id: [{ required: true, trigger: 'blur', validator: validateEmpty }],
         // 招聘职位名称
         title: [{ required: true, trigger: 'blur', validator: validateEmpty }],
@@ -303,7 +303,8 @@ export default {
         // address_arr_id: [{ required: true, trigger: 'blur', validator: validateEmpty }] ,
         // 具体地址
         address: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-
+        // 邮箱
+        email: [{ required: true, trigger: 'blur', validator: validateEmpty }],
       },
 
       //获取父级导航池
@@ -807,6 +808,10 @@ export default {
   mounted() {
     this.creatNews_user_type = getUseType()
     this.websiteid = getWebSiteId()
+    if(this.creatNews_user_type !== '10000'){
+      this.form.web_site_id = this.websiteid;
+      // console.log("this.form.web_site_id==",this.form.web_site_id)
+    }
     // console.log("============================",this.creatNews_user_type)
     //1.判断是新建还是回显
     this.get_hyid()
@@ -838,8 +843,6 @@ export default {
         this.getMainData();
         console.log("添加新闻!",this.creatNews_user_type)
       }
-
-   
     }
 
     

+ 2 - 2
src/views/website/websiteColumn.vue

@@ -35,9 +35,9 @@
         <template>
           <el-table :data="tableData" style="width: 100%">
             <el-table-column fixed prop="id" label="编号" width="50"></el-table-column>
-            <el-table-column prop="website_category" label="栏目名称"></el-table-column>
+            <!-- <el-table-column prop="website_category" label="栏目名称"></el-table-column> -->
             <el-table-column prop="website_name" label="网站名称"></el-table-column>
-            <el-table-column prop="website_nav" label="展示名称"></el-table-column>
+            <!-- <el-table-column prop="website_nav" label="展示名称"></el-table-column> -->
             <el-table-column prop="created_at" label="创建时间"></el-table-column>
             <el-table-column prop="updated_at" label="修改时间"></el-table-column>
             <el-table-column fixed="right" label="操作" width="280" header-align="center">