Explorar o código

投票样式已完成

Jing hai 3 semanas
pai
achega
107c709ad6

+ 1 - 1
src/api/advertise.js

@@ -124,7 +124,7 @@ export const getAdPlaceInfo=(params)=> {
 // 获取广告位尺寸
 export const getSize=(data)=> {
   return request({
-    url: '/order/getAD',
+    url: '/order/getAdSize',
     method: 'post',
     data
   })

+ 166 - 0
src/api/job.js

@@ -0,0 +1,166 @@
+import request from '@/utils/request'
+
+//招聘列表 start   ------------------------------------->
+
+//1.1 获取招聘列表
+export function getJobRecruitingList(params) {
+    return request({
+        url: '/news/getJobRecruitingList',
+        method: 'get',
+        params
+    })
+}
+
+//1.2 获取职位分类 
+export function getPositionList(params) {
+    return request({
+        url: '/news/getPositionList',
+        method: 'get',
+        params
+    })
+}
+
+//1.3 获取地区_省_市
+export function getJobRecruitingArea(params) {
+    return request({
+        url: '/news/getJobRecruitingArea',
+        method: 'get',
+        params
+    })
+}
+
+//1.3.1省市区
+export function selectWebsiteArea(params) {
+    return request({
+        url: '/web/selectWebsiteArea',
+        method: 'get',
+        params
+    })
+}
+
+//1.4 获取行业分类
+export function getIndustry(params) {
+    return request({
+        url: '/news/getIndustry',
+        method: 'get',
+        params
+    })
+}
+
+//1.5 职位性质
+export function getJobNature(params) {
+    return request({
+        url: '/news/getJobNature',
+        method: 'get',
+        params
+    })
+}
+
+//1.6 工作经验
+export function getExperience(params) {
+    return request({
+        url: '/news/getExperience',
+        method: 'get',
+        params
+    })
+}
+
+//1.7 学历
+export function getEducation(params) {
+    return request({
+        url: '/news/getEducation',
+        method: 'get',
+        params
+    })
+}
+
+//1.8 薪资
+export function getSalary(params) {
+    return request({
+        url: '/news/getSalary',
+        method: 'get',
+        params
+    })
+}
+
+//1.9 语言能力
+export function getLanguage(params) {
+    return request({
+        url: '/news/getLanguage',
+        method: 'get',
+        params
+    })
+}
+
+//1.10 语言能力_掌握程度
+export function getLevel(params) {
+    return request({
+        url: '/news/getLevel',
+        method: 'get',
+        params
+    })
+}
+
+//1.11 公司规模
+export function getCompanySize(params) {
+    return request({
+        url: '/news/getCompanySize',
+        method: 'get',
+        params
+    })
+}
+
+//1.12 公司性质
+export function getCompanyNature(params) {
+    return request({
+        url: '/news/getCompanyNature',
+        method: 'get',
+        params
+    })
+}
+
+//1.13 添加职位
+export function addJobRecruiting(data) {
+    return request({
+        url: '/news/addJobRecruiting',
+        method: 'post',
+        data
+    })
+}
+
+//1.14 职位详情
+export function getJobRecruitingInfo(params) {
+    return request({
+        url: '/news/getJobRecruitingInfo',
+        method: 'get',
+        params
+    })
+}
+
+//1.15 删除职位
+export function delJobRecruiting(data) {
+    return request({
+        url: '/news/delJobRecruiting',
+        method: 'post',
+        data
+    })
+}
+
+//1.16 修改职位
+export function upJobRecruiting(data) {
+    return request({
+        url: '/news/upJobRecruiting',
+        method: 'post',
+        data
+    })
+}
+
+//
+
+
+
+
+
+
+
+

+ 204 - 0
src/store/modules/job.js

@@ -0,0 +1,204 @@
+import {
+    getJobRecruitingList, getPositionList, getJobRecruitingArea, getIndustry, getJobNature,
+    getExperience, getEducation, getSalary, getLanguage, getLevel, getCompanySize, getCompanyNature,
+    addJobRecruiting, getJobRecruitingInfo, delJobRecruiting, upJobRecruiting,selectWebsiteArea,
+} from '@/api/job'
+
+const state = {
+
+}
+
+const mutations = {
+
+}
+
+const actions = {
+
+    //1. 招聘列表 start  fr ---------------------------------------->
+    //1.1 获取招聘列表
+    getJobRecruitingList({ commit }, data) {
+        return new Promise((resolve, reject) => {
+            getJobRecruitingList(data).then(response => {
+                resolve(response)
+            }).catch(error => {
+                reject(error)
+            })
+        })
+    },
+    //1.2 获取招聘详情
+    getJobRecruitingInfo({ commit }, data) {
+        return new Promise((resolve, reject) => {
+            getJobRecruitingInfo(data).then(response => {
+                resolve(response)
+            }).catch(error => {
+                reject(error)
+            })
+        })
+    },
+
+    //1. 招聘列表 end ---------------------------------------->
+
+
+
+    // 获取职位分类
+    getPositionList({ commit }, data) {
+        return new Promise((resolve, reject) => {
+            getPositionList(data).then(response => {
+                resolve(response)
+            }).catch(error => {
+                reject(error)
+            })
+        })
+    },
+
+    // 获取地区_省_市
+    getJobRecruitingArea({ commit }, data) {
+        return new Promise((resolve, reject) => {
+            getJobRecruitingArea(data).then(response => {
+                resolve(response)
+            }).catch(error => {
+                reject(error)
+            })
+        })
+    },
+
+    // 省市区
+    selectWebsiteArea({ commit }, data) {
+        return new Promise((resolve, reject) => {
+            selectWebsiteArea(data).then(response => {
+                resolve(response)
+            }).catch(error => {
+                reject(error)
+            })
+        })
+    },
+
+    //获取行业分类
+    getIndustry({ commit }, data) {
+        return new Promise((resolve, reject) => {
+            getIndustry(data).then(response => {
+                resolve(response)
+            }).catch(error => {
+                reject(error)
+            })
+        })
+    },
+    //职位性质
+    getJobNature({ commit }, data) {
+        return new Promise((resolve, reject) => {
+            getJobNature(data).then(response => {
+                resolve(response)
+            }).catch(error => {
+                reject(error)
+            })
+        })
+    },
+    //工作经验
+    getExperience({ commit }, data) {
+        return new Promise((resolve, reject) => {
+            getExperience(data).then(response => {
+                resolve(response)
+            }).catch(error => {
+                reject(error)
+            })
+        })
+    },
+    //学历
+    getEducation({ commit }, data) {
+        return new Promise((resolve, reject) => {
+            getEducation(data).then(response => {
+                resolve(response)
+            }).catch(error => {
+                reject(error)
+            })
+        })
+    },
+    //薪资
+    getSalary({ commit }, data) {
+        return new Promise((resolve, reject) => {
+            getSalary(data).then(response => {
+                resolve(response)
+            }).catch(error => {
+                reject(error)
+            })
+        })
+    },
+    //语言能力
+    getLanguage({ commit }, data) {
+        return new Promise((resolve, reject) => {
+            getLanguage(data).then(response => {
+                resolve(response)
+            }).catch(error => {
+                reject(error)
+            })
+        })
+    },
+    //语言能力_掌握程度
+    getLevel({ commit }, data) {
+        return new Promise((resolve, reject) => {
+            getLevel(data).then(response => {
+                resolve(response)
+            }).catch(error => {
+                reject(error)
+            })
+        })
+    },
+    //公司规模
+    getCompanySize({ commit }, data) {
+        return new Promise((resolve, reject) => {
+            getCompanySize(data).then(response => {
+                resolve(response) 
+            }).catch(error => {
+                reject(error)
+            }) 
+        }) 
+    },
+    //公司性质
+    getCompanyNature({ commit }, data) {
+        return new Promise((resolve, reject) => {
+            getCompanyNature(data).then(response => {
+                resolve(response)
+            }).catch(error => {
+                reject(error)
+            })
+        })
+    },
+    //添加职位
+    addJobRecruiting({ commit }, data) {
+        return new Promise((resolve, reject) => {
+            addJobRecruiting(data).then(response => {
+                resolve(response)
+            }).catch(error => {
+                reject(error)
+            })
+        })
+    },
+    //删除职位
+    delJobRecruiting({ commit }, data) {
+        return new Promise((resolve, reject) => {
+            delJobRecruiting(data).then(response => {
+                resolve(response)
+            }).catch(error => {
+                reject(error)
+            })
+        })
+    },
+    //修改职位
+    upJobRecruiting({ commit }, data) {
+        return new Promise((resolve, reject) => {
+            upJobRecruiting(data).then(response => {
+                resolve(response)
+            }).catch(error => {
+                reject(error)
+            })
+        })
+    },
+}
+
+
+export default {
+    namespaced: true,
+    state,
+    mutations,
+    actions
+}

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 481 - 476
src/views/job/creatJob.vue


+ 325 - 157
src/views/profile/index.vue

@@ -1,25 +1,22 @@
 <template>
   <div>
     <div class="userInfoBox">
-      <tableTitle :name="tableDivTitle"/>
+      <tableTitle :name="tableDivTitle" />
       <div class="userInfoTabs">
-        <el-tabs :tab-position="tabPosition" style="height:350px" class="demo-tabs">
+        <el-tabs :tab-position="tabPosition" style="height:550px" class="demo-tabs">
           <el-tab-pane label="用户信息">
             <el-form :model="infoform" ref="infoform" :rules="infoFormRules" autocomplete="off" label-position="left">
               <div class="infoBox">
                 <div>
                   <!-- <img :src="user.avatar" class="avatar"> -->
-                  <el-form-item label="头像:" prop="avatar" :label-width="formLabelWidth" :class="['custom-form-item']" class="custom-align-right">
+                  <el-form-item label="头像:" prop="avatar" :label-width="formLabelWidth" :class="['custom-form-item']"
+                    class="custom-align-right">
                     <div class="uploaderBox">
                       <!--图片上传组件 start ------------------------------------------------------------>
                       <div class="avatar-upload-container" @mouseenter="hovering = true" @mouseleave="hovering = false">
                         <!-- 上传组件 -->
-                        <el-upload
-                          class="avatar-uploader"
-                          action="#"
-                          :show-file-list="false"
-                          :before-upload="beforeAvatarUpload"
-                        >
+                        <el-upload class="avatar-uploader" action="#" :show-file-list="false"
+                          :before-upload="beforeAvatarUpload">
                           <!-- 预览图片 -->
                           <img v-if="avatarUrl" :src="avatarUrl" class="avatar">
                           <!-- 上传图标 -->
@@ -52,24 +49,17 @@
           </el-tab-pane>
 
           <el-tab-pane label="修改密码">
-            <el-form ref="form" :model="form" :rules="loginRules" class="login-form" autocomplete="on" label-position="left">
+            <el-form ref="form" :model="form" :rules="loginRules" class="login-form" autocomplete="on"
+              label-position="left">
               <!--现有密码 start------------------------------------------>
               <el-tooltip v-model="capsTooltip1" content="大小写已开启!" placement="right" manual>
                 <div class="PasswordBox">
                   <div class="PasswordTitle">现有密码:</div>
                   <el-form-item prop="password">
                     <div class="PasswordBody">
-                      <el-input
-                        :key="passwordType1"
-                        ref="password1"
-                        v-model="form.password"
-                        :type="passwordType1"
-                        placeholder="请输入密码"
-                        name="password"
-                        tabindex="2"
-                        autocomplete="off"
-                        @blur="capsTooltip1 = false"
-                      />
+                      <el-input :key="passwordType1" ref="password1" v-model="form.password" :type="passwordType1"
+                        placeholder="请输入密码" name="password" tabindex="2" autocomplete="off"
+                        @blur="capsTooltip1 = false" />
                       <span class="show-pwd" @click="showPwd(1)">
                         <svg-icon :icon-class="passwordType1 === 'password' ? 'eye' : 'eye-open'" />
                       </span>
@@ -84,17 +74,9 @@
                   <div class="PasswordTitle">新密码:</div>
                   <el-form-item prop="new_password">
                     <div class="PasswordBody">
-                      <el-input
-                        :key="passwordType2"
-                        ref="password2"
-                        v-model="form.new_password"
-                        :type="passwordType2"
-                        placeholder="请输入密码"
-                        name="password"
-                        tabindex="2"
-                        autocomplete="off"
-                        @blur="capsTooltip2 = false"
-                      />
+                      <el-input :key="passwordType2" ref="password2" v-model="form.new_password" :type="passwordType2"
+                        placeholder="请输入密码" name="password" tabindex="2" autocomplete="off"
+                        @blur="capsTooltip2 = false" />
                       <span class="show-pwd" @click="showPwd(2)">
                         <svg-icon :icon-class="passwordType2 === 'password' ? 'eye' : 'eye-open'" />
                       </span>
@@ -109,17 +91,9 @@
                   <div class="PasswordTitle">确认新密码:</div>
                   <el-form-item prop="new_password1">
                     <div class="PasswordBody">
-                      <el-input
-                        :key="passwordType3"
-                        ref="password3"
-                        v-model="form.new_password1"
-                        :type="passwordType3"
-                        placeholder="请输入密码"
-                        name="password"
-                        tabindex="2"
-                        autocomplete="off"
-                        @blur="capsTooltip3 = false"
-                      />
+                      <el-input :key="passwordType3" ref="password3" v-model="form.new_password1" :type="passwordType3"
+                        placeholder="请输入密码" name="password" tabindex="2" autocomplete="off"
+                        @blur="capsTooltip3 = false" />
                       <span class="show-pwd" @click="showPwd(3)">
                         <svg-icon :icon-class="passwordType3 === 'password' ? 'eye' : 'eye-open'" />
                       </span>
@@ -134,6 +108,67 @@
               <el-button type="primary" @click="changePassword">保存</el-button>
             </div>
           </el-tab-pane>
+
+          <el-tab-pane label="公司信息">
+            <el-form ref="companyInfo" :model="companyInfo" :rules="companyInfoRules" class="login-form"
+              autocomplete="on" label-position="left">
+              <el-form-item label="企业名称: " :label-width="formLabelWidth" prop="companyName" class="custom-align-right">
+                <el-input v-model="companyInfo.companyName" autocomplete="off" placeholder="请输入企业名称"></el-input>
+              </el-form-item>
+              <el-form-item label="所属行业: " :label-width="formLabelWidth" prop="companyType" class="custom-align-right">
+                <el-select v-model="companyInfo.companyType" placeholder="请选择所属行业">
+                  <el-option v-for="item in companyTypeList" :key="item.zwid" :label="item.zwname" :value="item.zwid">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="公司规模: " :label-width="formLabelWidth" prop="companyScale" class="custom-align-right">
+                <el-select v-model="companyInfo.companyScale" placeholder="请选择公司规模">
+                  <el-option v-for="item in companyScaleList" :key="item.id" :label="item.ename" :value="item.id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="公司性质: " :label-width="formLabelWidth" prop="" class="custom-align-right">
+                <el-select v-model="companyInfo.companyNature" placeholder="请选择公司性质">
+                  <el-option v-for="item in companyNatureList" :key="item.id" :label="item.nature_name"
+                    :value="item.id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="公司简介: " :label-width="formLabelWidth" prop="companyIntroduce"
+                class="custom-align-right">
+                <el-input v-model="companyInfo.companyIntroduce" type="textarea" resize="none" :rows="2"
+                  placeholder="请填写公司简介...">
+                </el-input>
+              </el-form-item>
+              <el-form-item label="公司网址: " :label-width="formLabelWidth" prop="nickname" class="custom-align-right">
+                <el-input v-model="companyInfo.companyUrl" autocomplete="off" placeholder="请输入公司网址..."></el-input>
+              </el-form-item>
+              <el-form-item label="详细地址: " :label-width="formLabelWidth" prop="companyAddress"
+                class="custom-align-right">
+                <el-select v-model="companyInfo.companyAddress_province" placeholder="请选择省" style="width: 34%"
+                  @change="change_province">
+                  <el-option v-for="item in provinceList" :key="item.id" :label="item.name" :value="item.id">
+                  </el-option>
+                </el-select>
+                <el-select v-model="companyInfo.companyAddress_city" placeholder="请选择市" style="width: 33%"
+                  @change="change_city">
+                  <el-option v-for="item in cityList" :key="item.id" :label="item.name" :value="item.id">
+                  </el-option>
+                </el-select>
+                <el-select v-model="companyInfo.companyAddress_county" placeholder="请选择县" style="width: 33%">
+                  <el-option v-for="item in countyList" :key="item.id" :label="item.name" :value="item.id">
+                  </el-option>
+                </el-select>
+                <el-input v-model="companyInfo.companyAddress" autocomplete="off" placeholder="请输入具体地址"
+                  class="detailadd"></el-input>
+              </el-form-item>
+
+            </el-form>
+            <div class="infoBtnBox">
+              <!-- <el-button type="info" @click="clearInput">重置</el-button> -->
+              <el-button type="primary" @click="changePassword">保存</el-button>
+            </div>
+          </el-tab-pane>
         </el-tabs>
       </div>
     </div>
@@ -145,6 +180,7 @@
 import '@/styles/global.less';
 //表格标题
 import tableTitle from './components/tableTitle';
+import { compare } from 'pinyin';
 
 export default {
   components: {
@@ -159,7 +195,7 @@ export default {
         callback()
       }
     }
-    const validateEmpty = (rule,value,callback) => {
+    const validateEmpty = (rule, value, callback) => {
       if (!value || value.trim() === "") {
         callback(new Error('该项不能为空!'));
       } else {
@@ -167,25 +203,25 @@ export default {
       }
     }
     return {
-      tableDivTitle:"修改个人信息",
-      tabPosition:"left",
-      formLabelWidth:"120px",
+      tableDivTitle: "修改个人信息",
+      tabPosition: "left",
+      formLabelWidth: "120px",
       //修改用户信息
-      infoform:{
-        avatar:"",
-        nickname:""
+      infoform: {
+        avatar: "",
+        nickname: ""
       },
-      avatarUrl:"",//头像缩略图
-      hovering:false,//鼠标悬浮状态
-      infoFormRules:{
+      avatarUrl: "",//头像缩略图
+      hovering: false,//鼠标悬浮状态
+      infoFormRules: {
         avatar: [{ required: true, trigger: 'blur', validator: validateEmpty }],
         nickname: [{ required: true, trigger: 'blur', validator: validateEmpty }]
       },
       //修改密码
-      form:{
-        password:"",
-        new_password:"",
-        new_password1:""
+      form: {
+        password: "",
+        new_password: "",
+        new_password1: ""
       },
       capsTooltip1: false,//显示大小写提示
       capsTooltip2: false,
@@ -197,17 +233,58 @@ export default {
         password: [{ required: true, trigger: 'blur', validator: validatePassword }],
         new_password: [{ required: true, trigger: 'blur', validator: validatePassword }],
         new_password1: [{ required: true, trigger: 'blur', validator: validatePassword }]
+      },
+
+      value: "",
+      options: [
+        { value: '1', label: '选项1' },
+        { value: '2', label: '选项2' },
+        { value: '3', label: '选项3' },
+        // 其他选项...
+      ],
+      companyTypeList: "", //所属行业列表
+      companyScaleList: "", //公司规模列表
+      companyNatureList: "", //公司性质列表
+      provinceList: "", //省列表
+      cityList: "", //市列表
+      countyList: "", //县列表
+      //企业信息
+      companyInfo: {
+        companyName: "", //企业名称
+        companyType: "", //所属行业
+        companyScale: "", //公司规模
+        companyNature: "", //公司性质
+        companyIntroduce: "", //公司简介
+        companyUrl: "", //公司网址
+        companyAddress_province: "", //省
+        companyAddress_city: "", //市
+        companyAddress_county: "", //县
+        companyAddress: "", //详细地址
+      },
+      companyInfoRules: {
+        companyName: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+        companyType: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+        companyScale: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+        companyNature: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+        companyIntroduce: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+        companyUrl: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+        companyAddress: [{ required: true, trigger: 'blur', validator: validateEmpty }],
       }
     }
   },
   mounted() {
     this.getUserInfo();
+    this.getPositionList(); //所属行业
+    this.getCompanySize(); //公司规模
+    this.getCompanyNature(); //公司性质
+    this.selectWebsiteArea(); //省市区/县
+
   },
   methods: {
     //0.全局操作 start ---------------------------------------->
     //获取用户身份信息
-    getUserInfo(){
-      this.$store.dispatch('public/getInfo').then(res=> {
+    getUserInfo() {
+      this.$store.dispatch('public/getInfo').then(res => {
         console.log(res)
         this.avatarUrl = res.data.avatar;
         this.infoform.avatar = res.data.avatar;
@@ -222,30 +299,30 @@ export default {
     //0.全局操作 end ---------------------------------------->
     //1.修改密码 start ---------------------------------------->
     //1.1 修改用户密码
-    changePassword(){
+    changePassword() {
       this.$refs.form.validate(valid => {
         if (valid) {
-          this.$store.dispatch('public/changePassword',this.form).then(res=> {
+          this.$store.dispatch('public/changePassword', this.form).then(res => {
             //console.log(res)
-            if(res.code == 200){
+            if (res.code == 200) {
               this.$message({
                 type: 'success',
                 message: "密码修改成功!"
               });
               this.clearInput();
-            }else{
+            } else {
               this.$message({
                 type: 'warning',
                 message: res.message
               });
-            } 
+            }
           }).catch(() => {
             this.$message({
               type: 'info',
               message: '网络错误,请重试!'
             });
           })
-        }else{
+        } else {
           this.$message.error('请填写完整信息!');
         }
       })
@@ -268,11 +345,11 @@ export default {
       });
     },
     //清空输入列表
-    clearInput(){
+    clearInput() {
       this.form = {
-        password:"",
-        new_password:"",
-        new_password1:""
+        password: "",
+        new_password: "",
+        new_password1: ""
       }
     },
     //1.修改密码 end ---------------------------------------->
@@ -295,7 +372,7 @@ export default {
       const formData = new FormData();
       formData.append('file', file);
 
-      this.$store.dispatch('pool/uploadFile',formData).then(res=> {
+      this.$store.dispatch('pool/uploadFile', formData).then(res => {
         this.avatarUrl = res.data.imgUrl;//显示缩略图
         this.infoform.avatar = res.data.imgUrl;//提供表单地址
         console.log(res.data.imgUrl)
@@ -316,120 +393,211 @@ export default {
       this.avatarUrl = ''; // 清空图片 URL
     },
     //2.3 修改用户信息
-    changeInfo(){
+    changeInfo() {
       console.log(this.infoform)
       this.$refs.infoform.validate(valid => {
         if (valid) {
-          this.$store.dispatch('user/updateUserAvatarNickname',this.infoform).then(res=> {
-            if(res.code == 200){
+          this.$store.dispatch('user/updateUserAvatarNickname', this.infoform).then(res => {
+            if (res.code == 200) {
               this.$message.success("修改成功!");
               //更新store中的头像和昵称
               this.$store.commit('user/SET_AVATAR', this.infoform.avatar);
               this.$store.commit('user/SET_NAME', this.infoform.nickname);
             }
-          }).catch(() => {  
+          }).catch(() => {
             this.$message.error('网络错误,请重试!');
           })
-        }else{
+        } else {
           this.$message.error('请填写完整信息!');
         }
       })
-    }
+    },
     //2.修改头像和昵称 end ---------------------------------------->
+
+    //3.企业信息 start ---------------------------------------->
+    // 3.1 所属行业列表
+    getPositionList() {
+      this.$store.dispatch('job/getPositionList').then(res => {
+        // console.log(res) 
+        this.companyTypeList = res.data;
+      })
+    },
+    // 3.2 公司规模列表
+    getCompanySize() {
+      this.$store.dispatch('job/getCompanySize').then(res => {
+        console.log(res)
+        this.companyScaleList = res.data;
+      })
+    },
+    // 3.3 公司性质列表
+    getCompanyNature() {
+      this.$store.dispatch('job/getCompanyNature').then(res => {
+        console.log(res)
+        this.companyNatureList = res.data;
+      })
+    },
+    //省
+    selectWebsiteArea() {
+      this.$store.dispatch('job/selectWebsiteArea').then(res => {
+        console.log(res)
+        this.provinceList = res.data;
+      })
+    },
+    //省被选择后,市列表
+    change_province(val) {
+      console.log(val);
+      this.$store.dispatch('job/selectWebsiteArea', {
+        province: val
+      }).then(res => {
+        console.log(res)
+        this.cityList = res.data.city;
+      })
+    },
+    //市被选择后,县列表
+    change_city(val) {
+      console.log(val);
+      this.$store.dispatch('job/selectWebsiteArea', {
+        province: this.companyInfo.companyAddress_province,
+        city: val
+      }).then(res => {
+        console.log(res)
+        this.countyList = res.data.region;
+      })
+    },
+
+    // selectWebsiteArea2() {
+    //   this.$store.dispatch('job/selectWebsiteArea', {
+    //     province: this.companyInfo.companyAddress_province,
+    //     city: this.companyInfo.companyAddress_city
+    //   }).then(res => {
+    //     console.log(res)
+    //     this.countyList = res.data.county;
+    //   })
+    // }
+
+
+
+
+
+    //3.企业信息 end ---------------------------------------->
   }
 }
 </script>
 
 <style scoped lang="less">
-  @avatarBorderColor:#E1E2E9;
-  @spacingPx:30px;
-
-  .userInfoBox {
-    margin: @spacingPx;
-    border-radius: 20px;
-    background: #fff;
-    border: 1px solid #E9EDF7;
-    padding: @spacingPx - 10px;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    padding-bottom: @spacingPx;
-    .userInfoTabs {
-      padding: 20px 40px 20px 0;
-      background: #F5F7FB
-    }
-    .avatar {
-      border-radius: 50%;
-      width: 140px;
-      height: 140px;
-      border: 1px solid @avatarBorderColor;
-      border-radius: 12px;
-      padding:15px;
-    }
-    .show-pwd{
-      margin-left: @spacingPx;
-    }
-    .infoBox {
-      margin-top: @spacingPx;
-    }
-    
-    .infoInput {
-      flex: 1;
-    }
-    .infoPassword {
-      display: flex;
-      align-items: center;
-    }
+@avatarBorderColor: #E1E2E9;
+@spacingPx: 30px;
+
+.userInfoBox {
+  margin: @spacingPx;
+  border-radius: 20px;
+  background: #fff;
+  border: 1px solid #E9EDF7;
+  padding: @spacingPx - 10px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  padding-bottom: @spacingPx;
+
+  .userInfoTabs {
+    padding: 20px 40px 20px 0;
+    background: #F5F7FB
   }
 
-  .inputBox {
-    margin-bottom: @spacingPx;
-    .inputIcon {
-      width: 24px;
-      height: 24px;
-      margin: 0 @spacingPx - 10px;
-    }
-    .inputIconSmall {
-      width: 18px;
-      height: 18px;
-    }
+  .avatar {
+    border-radius: 50%;
+    width: 140px;
+    height: 140px;
+    border: 1px solid @avatarBorderColor;
+    border-radius: 12px;
+    padding: 15px;
+  }
+
+  .show-pwd {
+    margin-left: @spacingPx;
+  }
+
+  .infoBox {
+    margin-top: @spacingPx;
   }
-  .PasswordBox {
+
+  .infoInput {
+    flex: 1;
+  }
+
+  .infoPassword {
     display: flex;
     align-items: center;
-    margin-top: @spacingPx;
-    .el-form-item {
-      flex: 1;
-    }
-    .PasswordTitle {
-      width:120px;
-      text-align: right;
-      margin-right: 10px;
-      margin-bottom:22px;
-      font-size: 14px;
-      color: #666;
-      font-weight: bold;
-    }
-    .PasswordBody {
-      flex: 1;
-      display: flex;
-      align-items: center;
-    }
   }
-  .infoBtnBox {
-    margin-top: @spacingPx;
-    padding-bottom: @spacingPx;
-    text-align: center;
+}
+
+.inputBox {
+  margin-bottom: @spacingPx;
+
+  .inputIcon {
+    width: 24px;
+    height: 24px;
+    margin: 0 @spacingPx - 10px;
   }
 
-  //执行v-deep穿透scope选择器 start------------------------------------------------------------>*/
-  ::v-deep .custom-form-item > .el-form-item__label {
-    line-height: 140px !important;
+  .inputIconSmall {
+    width: 18px;
+    height: 18px;
   }
-  ::v-deep .custom-textarea .el-textarea__inner {
-    resize: none; /* 禁止用户拖拽调整大小 */
+}
+
+.PasswordBox {
+  display: flex;
+  align-items: center;
+  margin-top: @spacingPx;
+
+  .el-form-item {
+    flex: 1;
   }
-  ::v-deep .custom-align-right .el-form-item__label {
-    text-align: right; /* 设置标签文字右对齐 */
+
+  .PasswordTitle {
+    width: 120px;
+    text-align: right;
+    margin-right: 10px;
+    margin-bottom: 22px;
+    font-size: 14px;
+    color: #666;
+    font-weight: bold;
   }
-  //执行v-deep穿透scope选择器 end------------------------------------------------------------>*/
-</style>
+
+  .PasswordBody {
+    flex: 1;
+    display: flex;
+    align-items: center;
+  }
+}
+
+.infoBtnBox {
+  margin-top: @spacingPx;
+  padding-bottom: @spacingPx;
+  text-align: center;
+}
+
+.detailadd {
+  margin-top: 20px;
+}
+
+//执行v-deep穿透scope选择器 start------------------------------------------------------------>*/
+::v-deep .custom-form-item>.el-form-item__label {
+  line-height: 140px !important;
+}
+
+::v-deep .custom-textarea .el-textarea__inner {
+  resize: none;
+  /* 禁止用户拖拽调整大小 */
+}
+
+::v-deep .custom-align-right .el-form-item__label {
+  text-align: right;
+  /* 设置标签文字右对齐 */
+}
+
+::v-deep .el-select {
+  width: 100%;
+}
+
+//执行v-deep穿透scope选择器 end------------------------------------------------------------>*/</style>

+ 271 - 243
src/views/role/components/userEnterprise.vue

@@ -1,17 +1,14 @@
 <template>
   <div class="mainBox">
     <div class="layerBox">
-      <el-form ref="form" :model="form" :rules="loginRules" class="login-form" autocomplete="on" label-position="left" label-width="120px">
+      <el-form ref="form" :model="form" :rules="loginRules" class="login-form" autocomplete="on" label-position="left"
+        label-width="120px">
         <div class="formDiv">
           <!--选择角色 start------------------------------------------>
           <el-form-item label="所属角色:" :label-width="formLabelWidth" prop="role_id" class="custom-align-right">
             <div class="formLabelFloatBox">
               <el-select v-model="form.role_id" placeholder="请选择..">
-                <el-option
-                  v-for="item in role_idArr"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
+                <el-option v-for="item in role_idArr" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </div>
@@ -20,22 +17,13 @@
           <el-form-item label="登录账号:" :label-width="formLabelWidth" prop="user_name" class="custom-align-right">
             <el-input v-model="form.user_name" autocomplete="off" placeholder="请输入登录账号.."></el-input>
           </el-form-item>
-          <div v-if="editId==''">
+          <div v-if="editId == ''">
             <!--新密码 start------------------------------------------>
             <div class="PasswordBox">
-              <el-form-item prop="password" label="登录密码:"  class="custom-align-right">
+              <el-form-item prop="password" label="登录密码:" class="custom-align-right">
                 <div class="PasswordBody">
-                  <el-input
-                    :key="passwordType1"
-                    ref="password1"
-                    v-model="form.password"
-                    :type="passwordType1"
-                    placeholder="请输入密码"
-                    name="password"
-                    tabindex="2"
-                    autocomplete="off"
-                    @blur="capsTooltip2 = false"
-                  />
+                  <el-input :key="passwordType1" ref="password1" v-model="form.password" :type="passwordType1"
+                    placeholder="请输入密码" name="password" tabindex="2" autocomplete="off" @blur="capsTooltip2 = false" />
                   <span class="show-pwd" @click="showPwd(1)">
                     <svg-icon :icon-class="passwordType1 === 'password' ? 'eye' : 'eye-open'" />
                   </span>
@@ -45,19 +33,10 @@
             <!--新密码 end------------------------------------------>
             <!--新密码 start------------------------------------------>
             <div class="PasswordBox">
-              <el-form-item prop="confirm_password" label="确认密码:"  class="custom-align-right">
+              <el-form-item prop="confirm_password" label="确认密码:" class="custom-align-right">
                 <div class="PasswordBody">
-                  <el-input
-                    :key="passwordType2"
-                    ref="password2"
-                    v-model="form.confirm_password"
-                    :type="passwordType2"
-                    placeholder="请输入密码"
-                    name="password"
-                    tabindex="2"
-                    autocomplete="off"
-                    @blur="capsTooltip2 = false"
-                  />
+                  <el-input :key="passwordType2" ref="password2" v-model="form.confirm_password" :type="passwordType2"
+                    placeholder="请输入密码" name="password" tabindex="2" autocomplete="off" @blur="capsTooltip2 = false" />
                   <span class="show-pwd" @click="showPwd(2)">
                     <svg-icon :icon-class="passwordType2 === 'password' ? 'eye' : 'eye-open'" />
                   </span>
@@ -69,6 +48,35 @@
           <el-form-item label="企业名称:" :label-width="formLabelWidth" prop="business_name" class="custom-align-right">
             <el-input v-model="form.business_name" autocomplete="off" placeholder="请输入企业名称.."></el-input>
           </el-form-item>
+
+
+          <el-form-item label="所属行业:" :label-width="formLabelWidth" prop="hy_id" class="custom-align-right">
+            <el-select v-model="form.hy_id" placeholder="请选择所属行业">
+              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="公司规模:" :label-width="formLabelWidth" prop="company_size" class="custom-align-right">
+            <el-select v-model="form.company_size" placeholder="请选择公司规模">
+              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="公司性质:" :label-width="formLabelWidth" prop="" class="custom-align-right">
+            <el-select v-model="form.company_nature" placeholder="请选择公司性质">
+              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="公司简介:" :label-width="formLabelWidth" prop="introduction" class="custom-align-right">
+            <el-input v-model="form.introduction" type="textarea" :rows="2" placeholder="请填写公司简介..."></el-input>
+          </el-form-item>
+          <el-form-item label="公司网址:" :label-width="formLabelWidth" prop="" class="custom-align-right">
+            <el-input v-model="form.company_url" placeholder="请输入公司网址"></el-input>
+          </el-form-item>
+
+
+
           <el-form-item label="详细地址:" :label-width="formLabelWidth" prop="address_arr_id" class="custom-align-right">
             <CityCascader v-model="form.address_arr_id" @update-city-id="update_address_arr_id"></CityCascader>
           </el-form-item>
@@ -87,46 +95,44 @@
           <el-form-item label="负责人身份证:" :label-width="formLabelWidth" prop="id_card" class="custom-align-right">
             <el-input v-model="form.id_card" autocomplete="off" placeholder="请输入负责人身份证号.."></el-input>
           </el-form-item>
-          <el-form-item label="法人:" :label-width="formLabelWidth" prop="legal_person_real_name" class="custom-align-right">
+          <el-form-item label="法人:" :label-width="formLabelWidth" prop="legal_person_real_name"
+            class="custom-align-right">
             <el-input v-model="form.legal_person_real_name" autocomplete="off" placeholder="请输入法人姓名.."></el-input>
           </el-form-item>
-          <el-form-item label="法人电话:" :label-width="formLabelWidth" prop="legal_person_mobile" class="custom-align-right">
+          <el-form-item label="法人电话:" :label-width="formLabelWidth" prop="legal_person_mobile"
+            class="custom-align-right">
             <el-input v-model="form.legal_person_mobile" autocomplete="off" placeholder="请输入法人联系电话.."></el-input>
           </el-form-item>
-          <el-form-item label="法人身份证:" :label-width="formLabelWidth" prop="legal_person_id_card" class="custom-align-right">
+          <el-form-item label="法人身份证:" :label-width="formLabelWidth" prop="legal_person_id_card"
+            class="custom-align-right">
             <el-input v-model="form.legal_person_id_card" autocomplete="off" placeholder="请输入法人身份证号.."></el-input>
           </el-form-item>
           <el-form-item label="有效期:" :label-width="formLabelWidth" prop="timeList" class="custom-align-right">
-            <el-date-picker
-              v-model="timeList"
-              type="daterange"
-              :disabled="form.long_time === 1"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :picker-options="pickerOptions">
+            <el-date-picker v-model="timeList" type="daterange" :disabled="form.long_time === 1" range-separator="至"
+              start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
             </el-date-picker>
-            <el-checkbox v-model="form.long_time" :true-label="1" :false-label="0" class="longTimeCheckbox">无限期</el-checkbox>
+            <el-checkbox v-model="form.long_time" :true-label="1" :false-label="0"
+              class="longTimeCheckbox">无限期</el-checkbox>
           </el-form-item>
 
 
 
 
-           <!-- <el-form-item label="站点标识:" :label-width="formLabelWidth" prop="city_arr_id" class="custom-align-right"> -->
-            <el-form-item label="站点标识:" :label-width="formLabelWidth" prop="websiteTag_arr_id" class="custom-align-right">
+          <!-- <el-form-item label="站点标识:" :label-width="formLabelWidth" prop="city_arr_id" class="custom-align-right"> -->
+          <el-form-item label="站点标识:" :label-width="formLabelWidth" prop="websiteTag_arr_id" class="custom-align-right">
             <!-- 级联选择器 xx-->
             <!-- websiteTag_ -->
             <!-- <el-cascader v-model="form.website_column_arr_id" :props="props_1" :options="website_column_arr" filterable clearable ></el-cascader> -->
-            
+
             <el-cascader v-model="form.websiteTag_arr_id" :options="options_arr" filterable clearable></el-cascader>
- 
+
           </el-form-item>
 
 
 
 
 
-          
+
           <el-form-item label="传真:" :label-width="formLabelWidth" prop="fax" class="custom-align-right">
             <el-input v-model="form.fax" autocomplete="off" placeholder="请输入传真号码.."></el-input>
           </el-form-item>
@@ -140,18 +146,9 @@
             <el-input v-model="form.email" autocomplete="off" placeholder="请输入电子邮箱.."></el-input>
           </el-form-item>
           <el-form-item label="相关资料:" :label-width="formLabelWidth" prop="" class="custom-align-right">
-            <el-upload
-              class="upload-demo"
-              :action="uploadFileUrl"
-              :headers="headers"
-              :on-preview="handlePreview"
-              :on-remove="handleRemove"
-              :before-remove="beforeRemove"
-              :on-success="handleUploadSuccess"
-              multiple
-              :limit="30"
-              :on-exceed="handleExceed"
-              :file-list="otherList">
+            <el-upload class="upload-demo" :action="uploadFileUrl" :headers="headers" :on-preview="handlePreview"
+              :on-remove="handleRemove" :before-remove="beforeRemove" :on-success="handleUploadSuccess" multiple
+              :limit="30" :on-exceed="handleExceed" :file-list="otherList">
               <el-button size="small" type="primary">点击上传</el-button>
               <div slot="tip" class="el-upload__tip">每张图片最大1MB,最多上传30张图片。</div>
             </el-upload>
@@ -173,12 +170,12 @@
 
         </div>
       </el-form>
-    </div>  
+    </div>
     <div class="bottomBtnBox">
       <el-button type="info" @click="goList">返回</el-button>
-      <el-button type="primary" @click="addData" v-if="editId==''">提交</el-button>
-      <el-button type="primary" @click="editData" v-if="editId!=''">修改</el-button>
-      <el-button type="warning" @click="resetPassword" v-if="editId!=''">重置密码</el-button>
+      <el-button type="primary" @click="addData" v-if="editId == ''">提交</el-button>
+      <el-button type="primary" @click="editData" v-if="editId != ''">修改</el-button>
+      <el-button type="warning" @click="resetPassword" v-if="editId != ''">重置密码</el-button>
     </div>
   </div>
 </template>
@@ -208,28 +205,28 @@ export default {
         callback()
       }
     }
-    const validateEmpty = (rule,value,callback) => {
+    const validateEmpty = (rule, value, callback) => {
       if (!value || value.trim() === "") {
         callback(new Error('该项不能为空!'));
       } else {
         callback();
       }
     }
-    const validateArray = (rule,value,callback) => {
+    const validateArray = (rule, value, callback) => {
       if (value.length == 0) {
         callback(new Error('该项不能为空!'))
       } else {
         callback()
       }
     }
-    const validateTimeTo = (rule,value,callback) => {
-      if(self.timeList.length == 0&&self.form.long_time==0){
+    const validateTimeTo = (rule, value, callback) => {
+      if (self.timeList.length == 0 && self.form.long_time == 0) {
         callback(new Error('该项不能为空!'))
-      }else{
+      } else {
         callback()
       }
     }
-    const validateIdcard = (rule,value,callback) => {
+    const validateIdcard = (rule, value, callback) => {
       const idCardRegex = /^(?:\d{15}|\d{18}|\d{17}[\dXx])$/; // 正则表达式验证身份证号
       if (!value || value.trim() === "") {
         callback(new Error('该项不能为空!'));
@@ -242,62 +239,69 @@ export default {
       }
     }
     return {
-      formLabelWidth:"120px",
-      editId:"",
-      uploadFileUrl:URL.testUrl+"/public/uploadFile",//获得上传地址
+      formLabelWidth: "120px",
+      editId: "",
+      uploadFileUrl: URL.testUrl + "/public/uploadFile",//获得上传地址
       headers: {},
 
-      options_arr:[],
-
-
-      website_tag_params:{//xx
-            keyword:"",//网站名称查询
-            website_column_id:[],//使用网系id查询
-            city_id:[],//使用城市id查询
-
-            page:1,//当前是第几页
-            pageSize:666666,//一共多少条
-            name:"",
-       },
-
-
-
-      form:{
-
-            websiteTag_arr_id:[],    //站点标识下拉id only
-        websiteTag_reg:[],    
-        sszq:"", //站点标识下拉id
-           
-
-        type_id:3,//企业会员
-        role_id:"",//角色id 
-        user_name:"",//登录账号
-        password:"",//密码
-        confirm_password:"",//确认密码
-        real_name:"",//真实姓名
-        id_card:"",//身份证号
-        mobile:"",//手机号
-        city_arr_id:[],//工作区域 
-        address_arr_id:[],//详细地址
-        from_time:"",//有效期开始时间
-        to_time:"",//有效期结束时间
-        long_time:0,//是否为长期 //长期1:长期 0:非长期
-        qq:"",//QQ
-        email:"",//电子邮箱
-        other:[],//相关资料
-        remark:"",//提示词
+      options_arr: [],
+
+
+      website_tag_params: {//xx
+        keyword: "",//网站名称查询
+        website_column_id: [],//使用网系id查询
+        city_id: [],//使用城市id查询
+
+        page: 1,//当前是第几页
+        pageSize: 666666,//一共多少条
+        name: "",
+      },
+
+
+
+      form: {
+
+        websiteTag_arr_id: [],    //站点标识下拉id only
+        websiteTag_reg: [],
+        sszq: "", //站点标识下拉id
+
+
+        type_id: 3,//企业会员
+        role_id: "",//角色id 
+        user_name: "",//登录账号
+        password: "",//密码
+        confirm_password: "",//确认密码
+        real_name: "",//真实姓名
+        id_card: "",//身份证号
+        mobile: "",//手机号
+        city_arr_id: [],//工作区域 
+        address_arr_id: [],//详细地址
+        from_time: "",//有效期开始时间
+        to_time: "",//有效期结束时间
+        long_time: 0,//是否为长期 //长期1:长期 0:非长期
+        qq: "",//QQ
+        email: "",//电子邮箱
+        other: [],//相关资料
+        remark: "",//提示词
         //企业相关字段
-        fax:"",//传真
-        business_name:"",//企业名称
-        position:"",//负责人职务
-        legal_person_real_name:"",//法人姓名
-        legal_person_mobile:"",//法人手机号
-        legal_person_id_card:"",//法人身份证号
-        sszq:[]//网站选择
+        fax: "",//传真
+        business_name: "",//企业名称
+
+        hy_id: "",//所属行业
+        company_size: "",//公司规模
+        company_nature: "",//公司性质
+        introduction: "",//公司简介
+        company_url: "",//公司网址
+
+        position: "",//负责人职务
+        legal_person_real_name: "",//法人姓名
+        legal_person_mobile: "",//法人手机号
+        legal_person_id_card: "",//法人身份证号
+        sszq: []//网站选择
       },
-      timeList:[],//时间段
-      otherList:[],//相关资料列表
-      role_idArr:[],//角色id池
+      timeList: [],//时间段
+      otherList: [],//相关资料列表
+      role_idArr: [],//角色id池
       //网站列表
       webSiteList: [],
       //密码验证
@@ -306,10 +310,10 @@ export default {
       passwordType1: 'password',
       passwordType2: 'password',
       //配置from表单验证规则
-      loginRules: { 
+      loginRules: {
 
-      //   站点标识xx
-      websiteTag_arr_id: [{ type:'array',required: true, trigger: 'blur', validator: validateArray }],
+        //   站点标识xx
+        websiteTag_arr_id: [{ type: 'array', required: true, trigger: 'blur', validator: validateArray }],
 
 
 
@@ -337,17 +341,29 @@ export default {
         address_arr_id: [{ required: true, trigger: 'blur', validator: validateArray }],
         //11.企业名称
         business_name: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        //12.负责人职务
+
+        //12.所属行业
+        hy_id: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+        //13.公司规模
+        company_size: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+        //14.公司性质
+        company_nature: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+        //15.公司简介
+        introduction: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+        //16.公司网址
+        company_url: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+
+        //17.负责人职务
         position: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        //12.法人姓名
+        //18.法人姓名
         legal_person_real_name: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        //13.法人电话
+        //19.法人电话
         legal_person_mobile: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        //14.法人身份证号
+        //20.法人身份证号
         legal_person_id_card: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        //15.有效期
-        timeList:[{ required: true, trigger: 'blur', validator: validateTimeTo }],
-        //16.网站选择
+        //21.有效期
+        timeList: [{ required: true, trigger: 'blur', validator: validateTimeTo }],
+        //22.网站选择
         sszq: [{ required: true, trigger: 'blur', validator: validateArray }]
       },
       //时间跨度
@@ -377,17 +393,17 @@ export default {
       });
     },
     //1.2获得角色列表池
-    getRoleList(){
+    getRoleList() {
       let data = {
-        page:1,
-        pageSize:100
+        page: 1,
+        pageSize: 100
       }
-      this.$store.dispatch('userRole/roleList',data).then(res=>{
+      this.$store.dispatch('userRole/roleList', data).then(res => {
         this.role_idArr = res.data.rows.map(item => ({
           value: item.id,
-          label: item.role_name 
+          label: item.role_name
         }));
-      }).catch(error=>{
+      }).catch(error => {
         this.$message({
           type: 'warning',
           message: '网络错误,请重试!'
@@ -395,18 +411,18 @@ export default {
       })
     },
     //1.3更新工作区域
-    update_city_arr_id(value){
+    update_city_arr_id(value) {
       console.log("工作区域ID已更新:", value);
       this.form.city_arr_id = value;
     },
     //1.5更新详细地址
-    update_address_arr_id(value){
+    update_address_arr_id(value) {
       console.log("详细地址ID已更新:", value);
       this.form.address_arr_id = value;
     },
     //1.5重置表单
-    clearData(){
-      
+    clearData() {
+
     },
     //表单收集 end ------------------------------------------------------------>
     //2.提交表单 start ------------------------------------------------------------>
@@ -421,7 +437,7 @@ export default {
       this.$message.warning(`当前限制选择 30 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`);
     },
     beforeRemove(file, fileList) {
-      return this.$confirm(`确定移除 ${ file.name }?`);
+      return this.$confirm(`确定移除 ${file.name}?`);
     },
     //获取token
     getTokenFromCookie() {
@@ -449,24 +465,24 @@ export default {
       console.log(this.form.other);
     },
     //提交表单
-    addData(){
-      this.form.sszq=this.form.sszq[0]
-      
+    addData() {
+      this.form.sszq = this.form.sszq[0]
+
       console.log(this.timeList)
       //1.格式化时间戳
       this.form.birthday = formatLocalDate(this.form.birthday);
-      if(this.form.long_time==0){
-      this.form.from_time = formatLocalDate(this.timeList[0]);
-      this.form.to_time = formatLocalDate(this.timeList[1]);
-      }else{
-      // this.form.from_time = "";
-      // this.form.to_time = "";
-      delete this.form.from_time;
-      delete this.form.to_time;
+      if (this.form.long_time == 0) {
+        this.form.from_time = formatLocalDate(this.timeList[0]);
+        this.form.to_time = formatLocalDate(this.timeList[1]);
+      } else {
+        // this.form.from_time = "";
+        // this.form.to_time = "";
+        delete this.form.from_time;
+        delete this.form.to_time;
       }
       //判断用户工作区域是否为全国
-      if(this.isNational==1){
-      this.form.city_arr_id = [0];
+      if (this.isNational == 1) {
+        this.form.city_arr_id = [0];
       }
       console.log(this.form)
 
@@ -474,32 +490,32 @@ export default {
       this.$refs.form.validate(valid => {
         if (valid) {
           //3.验证用户是否已经存在
-          this.$store.dispatch('userMember/verifyUserInfo',{user_name:this.form.user_name}).then(res=>{
-            if(res.code==0){
+          this.$store.dispatch('userMember/verifyUserInfo', { user_name: this.form.user_name }).then(res => {
+            if (res.code == 0) {
               //如果code为0表示用户不存在,提交表单
-              this.$store.dispatch('userMember/createUser',this.form).then(res=>{
-                if(res.code==200){
+              this.$store.dispatch('userMember/createUser', this.form).then(res => {
+                if (res.code == 200) {
                   console.log(res);
                   this.$message({
                     type: 'success',
                     message: '用户添加成功!'
                   });
                   this.goList();
-                }else{
+                } else {
                   this.$message({
                     type: 'warning',
                     message: res.message
                   });
                 }
               })
-            }else if(res.code==200){
+            } else if (res.code == 200) {
               //如果code==200 表示用户存在,阻止进一步提交
               this.$message({
                 type: 'warning',
                 message: '该账号已被注册,请更换其他账号!'
               });
             }
-          }).catch(error=>{
+          }).catch(error => {
             this.$message({
               type: 'warning',
               message: '网络错误,请重试!'
@@ -511,15 +527,15 @@ export default {
     //提交表单 start ------------------------------------------------------------>
     //3.编辑表单 start ------------------------------------------------------------>
     //获得网站列表
-    getWebsiteList(){
-      this.$store.dispatch('pool/getWebList',{page:1,pageSize:1000}).then(res=>{
-        if(res.code!=200){
+    getWebsiteList() {
+      this.$store.dispatch('pool/getWebList', { page: 1, pageSize: 1000 }).then(res => {
+        if (res.code != 200) {
           this.$message.error(res.message)
-        }else{
-          for(let item of res.data.rows){
+        } else {
+          for (let item of res.data.rows) {
             let data = {
-              value:item.id,
-              label:item.website_name
+              value: item.id,
+              label: item.website_name
             }
             this.webSiteList.push(data)
           }
@@ -527,8 +543,8 @@ export default {
       })
     },
     //获得用户信息
-    getUserInfo(){
-      this.$store.dispatch('userMember/getUser',{id:this.editId}).then(res=>{
+    getUserInfo() {
+      this.$store.dispatch('userMember/getUser', { id: this.editId }).then(res => {
         console.log(res);
         //回显数据
         this.form.type_id = res.data.type_id;
@@ -546,7 +562,7 @@ export default {
         this.form.legal_person_real_name = res.data.legal_person_real_name;
         this.form.position = res.data.position;
         //还原有效期
-        if(res.data.long_time==0){
+        if (res.data.long_time == 0) {
           this.timeList = [
             res.data.from_time,
             res.data.to_time
@@ -554,7 +570,7 @@ export default {
           this.form.from_time = res.data.from_time;
           this.form.to_time = res.data.to_time;
           this.form.long_time = 0;
-        }else{
+        } else {
           this.form.from_time = "";
           this.form.to_time = "";
           this.form.long_time = 1;
@@ -564,7 +580,7 @@ export default {
         this.form.zip_code = res.data.zip_code;
         this.form.remark = res.data.remark;
         this.form.address_arr_id = res.data.address_arr_id;
-        
+
         // 处理文件列表
         const fileArrayString = res.data.other; // 假设这是一个字符串格式的数组
         const fileArray = JSON.parse(fileArrayString); // 解析为数组
@@ -575,7 +591,7 @@ export default {
           url: url,                // 文件的 URL
           status: 'success'        // 设置状态为 success
         }));
-      }).catch(error=>{
+      }).catch(error => {
         this.$message({
           type: 'warning',
           message: '网络错误,请重试!'
@@ -583,27 +599,27 @@ export default {
       })
     },
     //修改用户
-    editData(){
+    editData() {
       //1.格式化时间戳
-      if(this.form.long_time==0){
+      if (this.form.long_time == 0) {
         this.form.from_time = formatLocalDate(this.timeList[0]);
         this.form.to_time = formatLocalDate(this.timeList[1]);
-      }else{
+      } else {
         this.form.from_time = "";
         this.form.to_time = "";
       }
       this.$refs.form.validate(valid => {
         if (valid) {
           //1.验证用户是否存在
-          this.$store.dispatch('userMember/verifyUserInfo',{id:this.editId,user_name:this.form.user_name}).then(res=>{
-            if(res.code==0){
+          this.$store.dispatch('userMember/verifyUserInfo', { id: this.editId, user_name: this.form.user_name }).then(res => {
+            if (res.code == 0) {
               console.log(this.form);
               this.form.address_arr_id = JSON.parse(this.form.address_arr_id);
               //2.设置修改的用户id
               this.form.id = this.editId;
               //3.提交用户修改
               //如果code为0表示用户不存在,提交表单
-              this.$store.dispatch('userMember/updateUser',this.form).then(res=>{
+              this.$store.dispatch('userMember/updateUser', this.form).then(res => {
                 console.log(res);
                 this.$message({
                   type: 'success',
@@ -611,14 +627,14 @@ export default {
                 });
                 this.goList();
               })
-            }else if(res.code==200){
+            } else if (res.code == 200) {
               //如果code==200 表示用户存在,阻止进一步提交
               this.$message({
                 type: 'warning',
                 message: '该账号已被注册,请更换其他账号!'
               });
             }
-          }).catch(error=>{
+          }).catch(error => {
             this.$message({
               type: 'warning',
               message: '网络错误,请重试!'
@@ -628,11 +644,11 @@ export default {
       })
     },
     //重置密码
-    resetPassword(){
+    resetPassword() {
       let password = Math.random().toString(36).slice(-6); // 随机生成6个字母的组合
 
-      this.$store.dispatch('userMember/resetPassword',{id:this.editId,password:password}).then(res=> {
-        if(res.code==200){
+      this.$store.dispatch('userMember/resetPassword', { id: this.editId, password: password }).then(res => {
+        if (res.code == 200) {
           this.$message({
             type: 'success',
             message: '密码重置为:' + password
@@ -646,50 +662,50 @@ export default {
       })
     },
     //编辑表单 end ------------------------------------------------------------>
-    goList(){
+    goList() {
       this.$router.push({
         path: '/userList',
       });
     },
 
 
-  
-  get_website_tag_arr_fun(){ //得到站点标识所有内容xx
-             
-            this.$store.dispatch('pool/get_website_tag_arr_actions',this.website_tag_params).then(res=> {
-                  console.log("res.data.listres.data.list",res.data.list)
-                  res.data.list.forEach(( per_obj ) => { 
 
-                        let new_per = {
-                              label: per_obj.name,
-                              value: per_obj.id,
-                        }
+    get_website_tag_arr_fun() { //得到站点标识所有内容xx
+
+      this.$store.dispatch('pool/get_website_tag_arr_actions', this.website_tag_params).then(res => {
+        console.log("res.data.listres.data.list", res.data.list)
+        res.data.list.forEach((per_obj) => {
+
+          let new_per = {
+            label: per_obj.name,
+            value: per_obj.id,
+          }
+
+          this.options_arr.push(new_per)
 
-                        this.options_arr.push( new_per )
-                  
-                  })
-                  // console.log("get_website_tag_arr_funget_website_tag_arr_fun")
-                  // console.log("get_website_tag_arr_funget_website_tag_arr_fun",this.options_arr)
-            })
+        })
+        // console.log("get_website_tag_arr_funget_website_tag_arr_fun")
+        // console.log("get_website_tag_arr_funget_website_tag_arr_fun",this.options_arr)
+      })
 
-     },
+    },
 
 
 
   },
 
-  mounted(){
+  mounted() {
 
 
-      this.get_website_tag_arr_fun()//得到站点标识所有内容xx
+    this.get_website_tag_arr_fun()//得到站点标识所有内容xx
 
     this.getRoleList();
     //判断是新建还是回显
-    if(this.$route.query.id!=undefined){
+    if (this.$route.query.id != undefined) {
       this.editId = this.$route.query.id;
       console.log("编辑用户!")
       this.getUserInfo();
-    }else{
+    } else {
       console.log("添加用户!")
     }
     //设置token
@@ -701,42 +717,54 @@ export default {
 </script>
 
 <style scoped lang="less">
-  .PasswordBox {
+.PasswordBox {
+  display: flex;
+  align-items: center;
+
+  .el-form-item {
+    flex: 1;
+  }
+
+  .PasswordTitle {
+    width: 120px;
+    text-align: right;
+    margin-right: 10px;
+    margin-bottom: 22px;
+  }
+
+  .PasswordBody {
+    flex: 1;
     display: flex;
     align-items: center;
-    .el-form-item {
-      flex: 1;
-    }
-    .PasswordTitle {
-      width:120px;
-      text-align: right;
-      margin-right: 10px;
-      margin-bottom:22px;
-    }
-    .PasswordBody {
-      flex: 1;
-      display: flex;
-      align-items: center;
-    }
-    .show-pwd {
-      margin-left: 10px;
-    }
   }
-  .longTimeCheckbox {
+
+  .show-pwd {
     margin-left: 10px;
   }
-  //执行v-deep穿透scope选择器 start------------------------------------------------------------>*/
-  ::v-deep .custom-form-item > .el-form-item__label {
-    line-height: 140px !important;
-  }
-  ::v-deep .custom-textarea .el-textarea__inner {
-    resize: none; /* 禁止用户拖拽调整大小 */
-  }
-  ::v-deep .custom-align-right .el-form-item__label {
-    text-align: right; /* 设置标签文字右对齐 */
-  }
-  ::v-deep .el-select {
-    width: 100%; /* 禁止用户拖拽调整大小 */
-  }
-  //执行v-deep穿透scope选择器 end------------------------------------------------------------>*/
-</style>
+}
+
+.longTimeCheckbox {
+  margin-left: 10px;
+}
+
+//执行v-deep穿透scope选择器 start------------------------------------------------------------>*/
+::v-deep .custom-form-item>.el-form-item__label {
+  line-height: 140px !important;
+}
+
+::v-deep .custom-textarea .el-textarea__inner {
+  resize: none;
+  /* 禁止用户拖拽调整大小 */
+}
+
+::v-deep .custom-align-right .el-form-item__label {
+  text-align: right;
+  /* 设置标签文字右对齐 */
+}
+
+::v-deep .el-select {
+  width: 100%;
+  /* 禁止用户拖拽调整大小 */
+}
+
+//执行v-deep穿透scope选择器 end------------------------------------------------------------>*/</style>

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio