修改bug

src/views/news/addJobHunting.vue

@@ -34,7 +34,7 @@
                 </div>
 
               </el-upload>
-              <div class="imgBox" style="color:red;margin-left: 00px ;margin-bottom: 20px; padding-top: -20px;">
+              <div class="imgBox" style="color:red;margin-left: 00px ;margin-bottom: 0px; padding-top: 0px;">
                 请添加图片，上传格式要求jpg、gif、png，不大于500 k</div>
             </div>
           </el-form-item>
@@ -47,21 +47,21 @@
             <el-input v-model="form.name" autocomplete="off" placeholder="请输入姓名"></el-input>
           </el-form-item>
           <div v-if="creatNews_user_type != 10000">
-            <el-form-item label="导航池名称：" prop="cat_arr_id" class="custom-align-right">
-              <el-cascader :key="parentKey" v-model="form.cat_arr_id" placeholder="请选择要绑定的导航池名称" :props="parentData"
+            <el-form-item label="展示名称：" prop="cat_arr_id" class="custom-align-right">
+              <el-cascader :key="parentKey" v-model="form.cat_arr_id" placeholder="请选择要绑定的展示名称" :props="parentData"
                 filterable clearable></el-cascader>
             </el-form-item>
           </div>
           <div v-if="creatNews_user_type == 10000">
 
-            <el-form-item label="站点名称:" prop="cat_arr_id" class="custom-align-right">
+            <el-form-item label="站点名称：" prop="cat_arr_id" class="custom-align-right">
               <el-cascader :key="parentKey" v-model="form.web_site_id" placeholder="请选择站点名称"
                 :options="creatNews_nav_pool_arr" @change="creatNews_nav_pool_change_fun(form.web_site_id)" filterable
                 clearable></el-cascader>
             </el-form-item>
 
 
-            <el-form-item label="导航池名称：" prop="cat_arr_id" class="custom-align-right">
+            <el-form-item label="展示名称：" prop="cat_arr_id" class="custom-align-right">
               <el-cascader :key="parentKey_2" v-model="form.cat_arr_id" placeholder="请选择要绑定的父级导航" :props="parentData_2"
                 filterable clearable></el-cascader>
             </el-form-item>
@@ -78,11 +78,11 @@
             <el-date-picker v-model="form.jobtime" type="date" placeholder="选择参加工作时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="手机号:" prop="phone" class="custom-align-right">
+          <el-form-item label="手机号：" prop="phone" class="custom-align-right">
             <el-input v-model="form.phone" autocomplete="off" placeholder="请输入手机号"></el-input>
           </el-form-item>
-          <el-form-item label="微信号:" prop="phone" class="custom-align-right">
-            <el-input v-model="form.phone" autocomplete="off" placeholder="请输入微信号"></el-input>
+          <el-form-item label="微信号：" prop="wx" class="custom-align-right">
+            <el-input v-model="form.wx" autocomplete="off" placeholder="请输入微信号"></el-input>
           </el-form-item>
 
           <el-form-item label="出生年月：" prop="validity" class="custom-align-right">
@@ -91,7 +91,7 @@
           </el-form-item>
 
           <el-form-item label="最高学历：" class="custom-align-right" style="width: 100%;">
-            <el-select v-model="form.educational" placeholder="请选择最高学历">
+            <el-select v-model="form.educational" placeholder="请选择最高学历" @change='changeCompanyNature()'>
               <el-option v-for="item in educations" :key="item.id" :label="item.ename" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
@@ -104,30 +104,30 @@
               <el-option label="其他" :value="4"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="籍贯:" prop="origin" class="custom-align-right">
+          <el-form-item label="籍贯：" prop="origin" class="custom-align-right">
             <el-input v-model="form.origin" autocomplete="off" placeholder="请输入籍贯"></el-input>
           </el-form-item>
 
           <el-form-item label="语言能力：" class="custom-align-right" style="width: 100%; display: inline;">
-            <el-select v-model="form.language" placeholder="请选择语种" style="width: 40%;">
+            <el-select v-model="form.language" placeholder="请选择语种" style="width: 40%;" @change='changeCompanyNature()'>
               <el-option v-for="item in languages" :key="item.id" :label="item.ename" :value="item.id"></el-option>
             </el-select>
-            <el-select v-model="form.level" placeholder="请选择掌握程度" style="width: 40%;">
+            <el-select v-model="form.level" placeholder="请选择掌握程度" style="width: 40%;" @change='changeCompanyNature()'>
               <el-option v-for="item in languagetypes" :key="item.id" :label="item.ename" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
-          <el-divider content-position="right"> </el-divider>
-          <div id="jobIntentions">
+          <!-- <el-divider content-position="right"> </el-divider> -->
+          <div id="jobIntentions" style="margin: 10px 0px;">
             <tableTitle name="求职意向" />
             <!-- 求职意向表单内容 -->
           </div>
           <el-form-item label="发布地点：" prop="city_arr_id" class="custom-align-right">
-            <el-cascader :key="cascaderKey" v-model="form.city_arr_id" placeholder="发布地区：" :props="cityData" filterable
-              clearable></el-cascader>
+            <el-cascader :key="cascaderKey" v-model="form.city_arr_id" placeholder="请选择发布地区" :props="cityData"
+              filterable clearable></el-cascader>
           </el-form-item>
 
-          <el-form-item label="职位性质" class="custom-align-right" style="width: 100%;">
-            <el-select v-model="form.politic" placeholder="请选择职位性质">
+          <el-form-item label="职位性质：" class="custom-align-right" style="width: 100%;">
+            <el-select v-model="form.politic" placeholder="请选择职位性质" @change='changeCompanyNature()'>
               <el-option v-for="item in natures" :key="item.id" :label="item.ename" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
@@ -144,23 +144,23 @@
 
             </el-select>
           </el-form-item>
+          <el-form-item label="公司性质：" v-if="jobNature" prop="company_nature" class="custom-align-right">
+            <el-select v-model="form.company_nature" placeholder="请选择公司性质" @change='changeCompanyNature()'>
+              <el-option v-for="item in jobNature" :key="item.id" :label="item.nature_name" :value="item.id">
+              </el-option>
 
-          <el-form-item label="公司性质：" prop="company_nature" class="custom-align-right">
-            <el-select v-model="form.company_nature" placeholder="请选择公司性质：">
-              <el-option v-for="item in jobNature" :key="item.id" :label="item.nature_name"
-                :value="item.id"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="薪资范围：" prop="salary" class="custom-align-right">
-            <el-select v-model="form.salary" placeholder="请选择薪资范围：">
+            <el-select v-model="form.salary" placeholder="请选择薪资范围" @change='changeCompanyNature()'>
               <el-option v-for="item in incomes" :key="item.id" :label="item.ename" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="个人评价:" prop="self_evaluation" class="custom-align-right">
+          <el-form-item label="个人评价：" prop="self_evaluation" class="custom-align-right">
             <el-input v-model="form.self_evaluation" autocomplete="off" type="textarea" aria-rowspan="6"
               placeholder="请输入个人评价"></el-input>
           </el-form-item>
-          <el-divider content-position="right"> </el-divider>
+          <!-- <el-divider content-position="right"> </el-divider> -->
           <div id="professionalSkills">
             <tableTitle name="专业技能" />
             <!-- 专业技能表单内容 -->
@@ -170,21 +170,10 @@
               +
               添加</el-button>
           </el-form-item>
-
-          <!-- <el-form-item v-for="(item, index) in form.skillsList" :key="index" :label="`专业技能 ${index + 1}:`"
-            prop="skills11" class="custom-align-right">
-
-            <el-input v-model="form.skillsList[index]" autocomplete="off" placeholder="请输入专业技能"> </el-input>
-          </el-form-item> -->
-
-          <el-form-item v-for="(item, index) in form.skillList" :key="index" :label="'技能' + (index + 1)"
+          <el-form-item v-for="(item, index) in form.skillList" :key="index" :label="'技能' + (index + 1) + '：'"
             prop="skillList" class="custom-align-right">
             <el-input v-model="form.skillList[index].skill" autocomplete="off" placeholder="请输入专业技能"></el-input>
-
           </el-form-item>
-          <el-divider content-position="right"> </el-divider>
-
-
           <div id="workExperience">
             <tableTitle name="工作经历" />
           </div>
@@ -198,26 +187,28 @@
 
           <div v-for="(item, index) in form.job_experience" :key="index">
 
-            <el-form-item label="公司名称:" prop="company_name" class="custom-align-right">
+            <el-form-item label="公司名称：" prop="company_name" class="custom-align-right" style="width: 100%;">
               <el-input v-model="form.job_experience[index].company_name" autocomplete="off"
                 placeholder="请输入公司名称"></el-input>
             </el-form-item>
 
 
             <el-form-item label="所属行业：" prop="job_industry" class="custom-align-right" style="width: 100%;">
-              <el-select v-model="form.job_experience[index].job_industry" placeholder="请选择所属行业">
+              <el-select v-model="form.job_experience[index].job_industry" placeholder="请选择所属行业"
+                @change='changeCompanyNature()'>
                 <el-option v-for="item in jobIndustry" :key="item.hyid" :label="item.hyname"
                   :value="item.hyid"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="职位名称：" prop="job_name" class="custom-align-right">
-              <el-select v-model="form.job_experience[index].job_name" placeholder="请选择职位名称">
+              <el-select v-model="form.job_experience[index].job_name" placeholder="请选择职位名称"
+                @change='changeCompanyNature()'>
                 <el-option v-for="item in jobPosition" :key="item.zwid" :label="item.zwname"
                   :value="item.zwid"></el-option>
 
               </el-select>
             </el-form-item>
-            <el-form-item label="所属部门:" prop="department" class="custom-align-right">
+            <el-form-item label="所属部门：" prop="department" class="custom-align-right">
               <el-input v-model="form.job_experience[index].department" autocomplete="off"
                 placeholder="请输入所属部门"></el-input>
             </el-form-item>
@@ -227,15 +218,14 @@
                 start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="工作内容:" prop="job_content" class="custom-align-right">
+            <el-form-item label="工作内容：" prop="job_content" class="custom-align-right">
               <el-input v-model="form.job_experience[index].job_content" autocomplete="off" type="textarea"
                 aria-rowspan="6" placeholder="请输入工作内容"></el-input>
             </el-form-item>
-            <el-form-item label="工作业绩:" prop="performance" class="custom-align-right">
+            <el-form-item label="工作业绩：" prop="performance" class="custom-align-right">
               <el-input v-model="form.job_experience[index].performance" autocomplete="off" type="textarea"
                 aria-rowspan="6" placeholder="请输入工作业绩"></el-input>
             </el-form-item>
-            <el-divider content-position="right">{{ index + 1 }}</el-divider>
           </div>
 
 
@@ -255,11 +245,12 @@
                 placeholder="请输入学校名称"></el-input>
             </el-form-item>
             <el-form-item label="学历：" prop="school_education" class="custom-align-right" style="width: 100%;">
-              <el-select v-model="form.education_experience[index].school_education" placeholder="请选择学历">
+              <el-select v-model="form.education_experience[index].school_education" placeholder="请选择学历"
+                @change='changeCompanyNature()'>
                 <el-option v-for="item in educations" :key="item.id" :label="item.ename" :value="item.id"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="专业:" prop="school_major" class="custom-align-right">
+            <el-form-item label="专业：" prop="school_major" class="custom-align-right">
               <el-input v-model="form.education_experience[index].school_major" autocomplete="off"
                 placeholder="请输入专业"></el-input>
             </el-form-item>
@@ -274,7 +265,7 @@
               <el-input v-model="form.education_experience[index].school_experience" autocomplete="off" type="textarea"
                 aria-rowspan="6" placeholder="请输入在校经历"></el-input>
             </el-form-item>
-            <el-divider content-position="right"> </el-divider>
+            <!-- <el-divider content-position="right"> </el-divider> -->
           </div>
         </div>
       </el-form>
@@ -320,6 +311,7 @@ export default {
     //0.全局操作 start ------------------------------------------------------------>
     //表单验证
     const validateEmpty = (rule, value, callback) => {
+      console.log(value, '-------------value--------')
       console.log(rule, '-------------rule--------')
       if (value == '') {
         callback(new Error('该项不能为空！'))
@@ -419,7 +411,7 @@ export default {
     //0.全局操作 end ------------------------------------------------------------>
     return {
       jobIndustry: {},
-      jobNature: {},
+      jobNature: [],
       jobPosition: {},
       jobEnum: {},
       educations: [],
@@ -432,7 +424,7 @@ export default {
 
       timeList: [],
       // imgurl: "http://img.bjzxtw.org.cn/dev/image/jpeg/20250220/1740044079754901.png",
-      imgurl: "",
+      imgUrl: "",
       websiteid: 0,
       cascaderKey: 0,//弹窗用的key
       creatNews_pid_num: "0",//请求子导航用的pid
@@ -487,7 +479,6 @@ export default {
         department: [],//所属部门
         job_timeList: [],//工作时间
         job_content: [],//工作内容
-        imgUrl: "",
       },
       //1.2 表单验证规则
       formRules: {
@@ -661,6 +652,9 @@ export default {
     };
   },
   methods: {
+    changeCompanyNature(val) {
+      this.$forceUpdate();
+    },
     getJobHuntingData() {
       this.$store.dispatch('news/getJobHuntingData', {}).then(res => {
         if (res.code == 200) {
@@ -754,18 +748,16 @@ export default {
         this.$message.error('上传缩略图大小不能超过 2MB!');
         return false;
       }
-
       const formData = new FormData();
       formData.append('file', file);
       this.$store.dispatch('pool/uploadFile', formData).then(res => {
         this.imgUrl = res.data.imgUrl;//显示缩略图
-        this.form.imgurl = res.data.imgUrl;//提供表单地址
+        this.form.imgUrl = res.data.imgUrl;//提供表单地址
+        // this.$set(this, 'imgUrl', res.data.imgUrl); // 设置 imgUrl
+        // this.$set(this.form, 'imgurl', res.data.imgUrl); // 设置 form.imgurl
         console.log(res.data.imgUrl)
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '网络错误，请重试！'
-        });
+        console.log(this.imgurl, '-------------imgurl-----2---')
+        console.log(this.form.imgUrl, '-------------form.imgurl--------')
       })
       // 阻止默认的上传行为
       return false;
@@ -773,39 +765,45 @@ export default {
     //1.2 提交表单
     addToServe() {
       //先进行验证
-      console.log(this.form, '-------------form--------');
+      console.log(this.form, '-------------form1--------');
       this.$refs.form.validate(valid => {
 
         if (valid) {
-          console.log(this.form)
-          this.form.job_experience = JSON.stringify(this.form.job_experience);
-          this.form.education_experience = JSON.stringify(this.form.education_experience);
-          this.form.skillList = JSON.stringify(this.form.skillList);
-          this.form.city_arr_id = JSON.stringify(this.form.city_arr_id);
-          this.form.cat_arr_id = JSON.stringify(this.form.cat_arr_id);
-          this.form.website_id = this.form.web_site_id == 0 ? this.websiteid : this.form.web_site_id;
-          //去掉this.form.web_site_id
-          delete this.form.web_site_id;
-          if (this.form.website_id == 0) {
+          // 创建 form 对象的深拷贝
+          const formCopy = JSON.parse(JSON.stringify(this.form));
+
+          // 在副本上进行 JSON 转换
+          formCopy.job_experience = JSON.stringify(formCopy.job_experience);
+          formCopy.education_experience = JSON.stringify(formCopy.education_experience);
+          formCopy.skillList = JSON.stringify(formCopy.skillList);
+          formCopy.city_arr_id = JSON.stringify(formCopy.city_arr_id);
+          formCopy.cat_arr_id = JSON.stringify(formCopy.cat_arr_id);
+          formCopy.website_id = formCopy.web_site_id == 0 ? this.websiteid : formCopy.web_site_id;
+          // 去掉 formCopy.web_site_id
+          delete formCopy.web_site_id;
+
+          if (formCopy.website_id == 0) {
             this.$message.error('请选择站点名称');
             return;
           }
 
-          if (this.form.jobtime != '' || this.form.jobtime != null) {
-            this.form.jobtime = formatLocalDate(this.form.jobtime);
+          if (formCopy.jobtime != '' && formCopy.jobtime != null && formCopy.jobtime != undefined) {
+            formCopy.jobtime = formatLocalDate(formCopy.jobtime);
           } else {
-            this.form.jobtime = null;
+            formCopy.jobtime = null;
           }
-          if (this.form.birth != '' || this.form.birth != null) {
-            this.form.birth = formatLocalDate(this.form.birth);
+          console.log(formCopy.birth, "-----------------birth----------");
+          if (formCopy.birth != '' && formCopy.birth != null && formCopy.birth != undefined) {
+            formCopy.birth = formatLocalDate(formCopy.birth);
           } else {
-            this.form.birth = null;
+            formCopy.birth = null;
           }
-          this.form.job_timeList.forEach(item => {
+          formCopy.job_timeList.forEach(item => {
             item = formatLocalDate(item);
           });
+          console.log(new Date().getTime(), '-------------------校验结束------------------');
 
-          this.$store.dispatch('news/addJobHunting', this.form).then(res => {
+          this.$store.dispatch('news/addJobHunting', formCopy).then(res => {
             if (res.code == 200) {
               //汇报结果
               this.$message({
@@ -872,7 +870,6 @@ export default {
       this.$store.dispatch('news/getJobHuntingInfo', data).then(res => {
         console.log(res);
 
-        this.form.web_site_id = res.data.web_site_id    //站点名称
         this.form.cat_arr_id = Array.isArray(res.data.cat_arr_id) ? res.data.cat_arr_id : JSON.parse(res.data.cat_arr_id);
         this.parentKey += 1; // 触发级联选择器重新加载
         this.loadCascaderPath(this.form.cat_arr_id); // 加载路径数据
@@ -882,10 +879,26 @@ export default {
         this.form.age = res.data.age;
         this.form.phone = res.data.phone;
         this.form.email = res.data.email;
+        this.form.wx = res.data.wx;
+        this.form.company_nature = res.data.company_nature;
+        this.form.salary = res.data.salary;
+        this.form.self_evaluation = res.data.self_evaluation;
+
+        this.form.educational = res.data.educational;
+        this.form.politic = res.data.politic;
+        this.form.language = res.data.language;
+        this.form.level = res.data.level;
+
+
         this.form.address = res.data.address;
         this.form.content = res.data.content;
-        this.form.img = res.data.img;
-        this.imgUrl = res.data.img;
+        this.form.imgUrl = res.data.imgurl;
+        this.imgUrl = res.data.imgurl;
+        this.form.web_site_id = res.data.website_id;
+        this.form.jobtime = res.data.jobtime ? new Date(res.data.jobtime) : '';
+        this.form.birth = res.data.birth ? new Date(res.data.birth) : '';
+        this.form.origin = res.data.origin;
+        this.form.city_arr_id = Array.isArray(res.data.city_arr_id) ? res.data.city_arr_id : JSON.parse(res.data.city_arr_id);
         this.form.job_experience = JSON.parse(res.data.job_experience);
         this.form.education_experience = JSON.parse(res.data.education_experience);
         this.form.skillList = JSON.parse(res.data.skillList);
@@ -924,37 +937,57 @@ export default {
       //添加要修改的id
       this.form.id = this.editId;
       //先进行验证
+      let startTime = new Date().getTime();
+      console.log(startTime, '-------------------开始------------------');
       this.$refs.form.validate(valid => {
+        //记录开始时间
+        let startTime1 = new Date().getTime();
+        console.log(startTime1, '-------------------校验开始------------------');
         if (valid) {
           console.log(this.form)
-          this.form.job_experience = JSON.stringify(this.form.job_experience);
-          this.form.education_experience = JSON.stringify(this.form.education_experience);
-          this.form.skillList = JSON.stringify(this.form.skillList);
-          this.form.city_arr_id = JSON.stringify(this.form.city_arr_id);
-          this.form.cat_arr_id = JSON.stringify(this.form.cat_arr_id);
-          this.form.website_id = this.form.web_site_id == 0 ? this.websiteid : this.form.web_site_id;
-          //去掉this.form.web_site_id
-          delete this.form.web_site_id;
-          if (this.form.website_id == 0) {
+          // 创建 form 对象的深拷贝
+          const formCopy = JSON.parse(JSON.stringify(this.form));
+
+          // 在副本上进行 JSON 转换
+          formCopy.job_experience = JSON.stringify(formCopy.job_experience);
+          formCopy.education_experience = JSON.stringify(formCopy.education_experience);
+          formCopy.skillList = JSON.stringify(formCopy.skillList);
+          formCopy.city_arr_id = JSON.stringify(formCopy.city_arr_id);
+          formCopy.cat_arr_id = JSON.stringify(formCopy.cat_arr_id);
+          formCopy.website_id = formCopy.web_site_id == 0 ? this.websiteid : formCopy.web_site_id;
+          // 去掉 formCopy.web_site_id
+          delete formCopy.web_site_id;
+
+          if (formCopy.website_id == 0) {
             this.$message.error('请选择站点名称');
             return;
           }
 
-          if (this.form.jobtime != '' || this.form.jobtime != null) {
-            this.form.jobtime = formatLocalDate(this.form.jobtime);
+          if (formCopy.jobtime != '' && formCopy.jobtime != null && formCopy.jobtime != undefined) {
+            formCopy.jobtime = formatLocalDate(formCopy.jobtime);
           } else {
-            this.form.jobtime = null;
+            formCopy.jobtime = null;
           }
-          if (this.form.birth != '' || this.form.birth != null) {
-            this.form.birth = formatLocalDate(this.form.birth);
+          console.log(formCopy.birth, "-----------------birth----------");
+          if (formCopy.birth != '' && formCopy.birth != null && formCopy.birth != undefined) {
+            formCopy.birth = formatLocalDate(formCopy.birth);
           } else {
-            this.form.birth = null;
+            formCopy.birth = null;
           }
-          this.form.job_timeList.forEach(item => {
+
+
+          formCopy.job_timeList.forEach(item => {
             item = formatLocalDate(item);
           });
-
-          this.$store.dispatch('news/updateJobHunting', this.form).then(res => {
+          console.log(new Date().getTime(), '-------------------校验结束------------------');
+
+          this.$store.dispatch('news/updateJobHunting', formCopy).then(res => {
+            //记录结束时间
+            let endTime = new Date().getTime(); //计算时间差
+            console.log(endTime, '-------------------结束------------------');
+            let time = endTime - this.startTime;
+            //记录时间差
+            console.log('时间差'.time, '------------------2--------');
             if (res.code != 200) {
               this.$message.error("修改失败，请稍后再试！");
             } else {

src/views/news/creatNews.vue

@@ -62,15 +62,17 @@
                 <el-cascader :key="searchDepartmentKey" v-model="form.department_arr_id" placeholder="选择导航池所属行政区划"
                   :props="searchDepartmentData" filterable clearable></el-cascader>
               </el-form-item>
-              <el-form-item label="推荐等级：" class="custom-align-right">
-                <el-select v-model="form.level" clearable placeholder="请选择推荐等级..">
-                  <el-option label="头条" :value="1"></el-option>
-                  <el-option label="轮播图" :value="2"></el-option>
-                  <el-option label="推荐图" :value="3"></el-option>
-                  <el-option label="热点资讯" :value="4"></el-option>
-                  <el-option label="资讯推荐" :value="5"></el-option>
-                </el-select>
-              </el-form-item>
+              <div v-if="creatNews_user_type == 10000">
+                <el-form-item label="推荐等级：" class="custom-align-right">
+                  <el-select v-model="form.level" clearable placeholder="请选择推荐等级..">
+                    <el-option label="头条" :value="1"></el-option>
+                    <el-option label="轮播图" :value="2"></el-option>
+                    <el-option label="推荐图" :value="3"></el-option>
+                    <el-option label="热点资讯" :value="4"></el-option>
+                    <el-option label="资讯推荐" :value="5"></el-option>
+                  </el-select>
+                </el-form-item>
+              </div>
               <el-form-item label="缩略图：" class="custom-align-right" prop="imgUrl"
                 v-if="form.level == 2 || form.level == 3">
                 <div class="uploaderBox">
@@ -621,6 +623,8 @@ export default {
         console.log("用户身份为其他用户,提交到审核!")
         this.form.status = 0;
         this.form.web_site_id = this.websiteid;
+        //如果是普通用户 推荐等级设置为0 
+        this.form.level = 0;
       }
 
       //先进行验证

src/views/website/WebsiteList.vue

@@ -206,7 +206,8 @@
                 </el-tooltip>
               </span>
             </template>
-            <el-input v-model="form.keywords" autocomplete="off"  placeholder="请输入网站关键词"></el-input>
+            <!-- <el-input v-model="form.keywords" autocomplete="off"  placeholder="请输入网站关键词"></el-input> -->
+            <inputTag  :initialTags="tags" @tags-updated="updateTags"/> 
           </el-form-item>
           <el-form-item label="网站描述：" :label-width="formLabelWidth" prop="description" class="custom-align-right">
             <template #label>
@@ -219,6 +220,17 @@
             </template>
             <el-input type="textarea" v-model="form.description" class="custom-textarea" placeholder="请输入网站描述"></el-input>
           </el-form-item>
+          <el-form-item label="网站后缀：" :label-width="formLabelWidth" prop="suffix" class="custom-align-right">
+            <template #label>
+              <span class="askBox">
+                网站后缀：
+                <el-tooltip class="item" effect="dark" content="网站后缀，如：全国政务信息一体化应用平台" placement="top">
+                  <i class="el-icon-question"></i>
+                </el-tooltip>
+              </span>
+            </template>
+            <el-input type="textarea" v-model="form.suffix" class="custom-textarea" placeholder="请输入网站后缀"></el-input>
+          </el-form-item>
           <!-- <el-form-item label="模板：" :label-width="formLabelWidth" class="custom-align-right" prop="template_id">
             <div class="webSiteTemplate" @click="getTemplateList">
               <div class="webSiteTemplateImg">
@@ -256,11 +268,12 @@ import CityCascader from './components/CityCascader';
 import tableTitle from './components/tableTitle';
 //引入公用样式
 import '@/styles/global.less';
-
+import InputTag from '@/components/InputTag'
 export default {
   components: {
     CityCascader, //城市级联选择器
     tableTitle,//表格标题
+    InputTag
   },
   data() {
     //0.全局操作 start ------------------------------------------------------------>
@@ -289,6 +302,7 @@ export default {
     let self = this;
     //0.全局操�� end ------------------------------------------------------------>
     return {
+      tags: [],
       //1.列表和分页相关 start ------------------------------------------------------------>
       tableDivTitle:"网站列表",
       tableData:[],//内容
@@ -327,6 +341,7 @@ export default {
         title:"",//需要提交的网站标题
         keywords:"",//需要提交的网站标题
         description:"",//需要提交的网站描述
+        suffix:"",//需要提交的网站后缀
         //template_id:""//选择的网站皮肤
       },
       //3.2 表单验证规则
@@ -347,6 +362,7 @@ export default {
         description:[{required:true,trigger:'blur',validator:validateEmpty}],
         logo:[{required:true,trigger:'blur',validator:validateEmpty}],
         logoUrl:[{required:true,trigger:'blur',validator:validateEmpty}],
+        suffix:[{required:true,trigger:'blur',validator:validateEmpty}],
         //template_id:[{required:true,trigger:'blur',validator:validateEmpty}],
       },
       //3.3 通过api获的的数据 弹窗
@@ -784,7 +800,9 @@ export default {
         console.log(res.data.title,res.data.keywords,res.data.description)
         this.form.title = res.data.title;
         this.form.keywords = res.data.keywords;
+        this.tags = res.data.keywords?res.data.keywords.split(','):[];
         this.form.description = res.data.description;
+        this.form.suffix = res.data.suffix;
         //回显模板信息
         // this.form.template_id = res.data.template_id;
         // this.TemplateName = res.data.template_name;
@@ -844,7 +862,12 @@ export default {
         path: '/templateBase', 
         query: {id:id} 
       });
-    } 
+    } ,
+    updateTags(newTags) {
+            // this.foem.seo_keywords = newTags;
+            this.tags = newTags;
+            this.form.keywords = newTags.join(',');
+    },
     //编辑旧网站 end ------------------------------------------------------------>
   },
   mounted(){

src/views/website/categoryList.vue

@@ -554,7 +554,7 @@ export default {
 
     //3.添加栏目池 start ------------------------------------------------------------>
     ifUrl(value) {
-      //console.log(value)
+      console.log(value)
       if (value == true) {
         this.form.is_url = 1
       } else {
@@ -617,8 +617,8 @@ export default {
         } else if (res.data.is_url == 0 || res.data.is_url == null) {
           this.show_url = false;
         }
-
-        console.log(res.data.is_url)
+        // console.log(res.data.is_url)
+        this.form.is_url = res.data.is_url;
 
         //回显外链
         this.form.web_url = res.data.web_url;

src/views/website/editNavigation.vue

@@ -92,6 +92,11 @@
               <el-input v-model="form.seo_title" autocomplete="off"></el-input>
             </div>
           </el-form-item>
+          <el-form-item label="排序：" :label-width="formLabelWidth" prop="sort" class="custom-align-right">
+            <div class="formLabelFloatBox">
+              <el-input v-model="form.sort" autocomplete="off" ></el-input>
+            </div>
+          </el-form-item>
           <el-form-item label="栏目关键词：" :label-width="formLabelWidth" prop="seo_keywords" class="custom-align-right">
             <div class="formLabelFloatBox">
               <inputTag  :initialTags="tags" @tags-updated="updateTags"/> 
@@ -99,14 +104,10 @@
               <!-- <el-input v-model="form.seo_keywords" autocomplete="off"></el-input> -->
             </div>
           </el-form-item>
+          
           <el-form-item label="栏目描述：" :label-width="formLabelWidth" prop="seo_description" class="custom-align-right">
             <el-input type="textarea" v-model="form.seo_description" class="custom-textarea"></el-input>
           </el-form-item>
-          <el-form-item label="排序：" :label-width="formLabelWidth" prop="sort" class="custom-align-right">
-            <div class="formLabelFloatBox">
-              <el-input v-model="form.sort" autocomplete="off" ></el-input>
-            </div>
-          </el-form-item>
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/website/websiteColumn.vue

@@ -92,7 +92,12 @@
               clearable
               filterable
               :change-on-select="true"
+              collapse-tags
               >
+              <template slot-scope="{ node, data }">
+                <span>{{ data.name }}</span>
+                <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+              </template>
             </el-cascader>
           </el-form-item>
 
@@ -179,7 +184,8 @@ export default {
       props: { 
         multiple: true,
         label:"name",
-        value:"id"
+        value:"id",
+        expandTrigger: 'hover'
        },
        categoryList: []
     }