sdz/cmanager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flat: cityId 合并

Browse Source
This commit is contained in:
Apcallover
2024-04-23 19:42:48 +08:00
parent 381f2273b3
commit 90258f3179
8 changed files with 660 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/tenant/mission/Dialog/CopyMission.vue
View File

@@ -18,12 +18,12 @@
@submit="submit"
>
<template slot="cityId" slot-scope="{ disabled }">
<jl-city-cascader
<jl-cityLabel-cascader
:disabled="disabled"
filterable
v-model="obj.cityId"
placeholder="请选择 工作地址"
></jl-city-cascader>
></jl-cityLabel-cascader>
</template>
<template slot-scope="{ disabled }" slot="skillIds">

512
src/views/tenant/works/Dialog/CopyMission.vue
View File

@@ -17,11 +17,11 @@
ref="form"
@submit="submit"
>
<!-- <template slot="userNature">
<el-select v-model="obj.userNature">
<el-option v-for="(item,index) in userNatureList" :key="index" :label="item.label" :value="item.value">{{item.label}}</el-option>
</el-select>
</template> -->
<!-- <template slot="userNature">
<el-select v-model="obj.userNature">
<el-option v-for="(item,index) in userNatureList" :key="index" :label="item.label" :value="item.value">{{item.label}}</el-option>
</el-select>
</template> -->
<!-- <template slot-scope="{ disabled }" slot="wage">
<el-input
placeholder="请输入 参考工资"
@@ -48,18 +48,19 @@
</el-input>
</template> -->
<template slot="city" slot-scope="{ disabled }">
<jl-city-cascader
<template slot="cityId" slot-scope="{ disabled }">
<jl-cityLabel-cascader
:disabled="disabled"
filterable
v-model="obj.city"
v-model="obj.cityId"
placeholder="请选择 工作地址"
></jl-city-cascader>
></jl-cityLabel-cascader>
</template>
<template slot-scope="{ row }" slot="wage">
<el-input placeholder="请输入工资" type="number" v-model="obj.wage" class="input-with-select">
<el-input placeholder="请输入工资" type="number" v-model="obj.wage" class="input-with-select">
<el-select v-model="obj.wageUnitCategory" slot="append" placeholder="请选择" @change="getMaxAndMin">
<el-option :label="item.label" v-for="item in wageUnitCategory" :key="item.value" :value="item.value"></el-option>
<el-option :label="item.label" v-for="item in wageUnitCategory" :key="item.value"
:value="item.value"></el-option>
</el-select>
</el-input>
</template>
@@ -78,7 +79,7 @@
<select-map
ref="selectMap"
@addAddress="addAddress"
@addressDel = "addressDel"
@addressDel="addressDel"
@input="inputAddress"
:isCanEdit="!disabled"
:lng="obj.lon"
@@ -108,27 +109,27 @@
<!-- 工种 -->
<template slot="worktypeIds">
<div class="tradeId">
<el-autocomplete
popper-class="my-autocomplete"
v-model.trim="workTypeState"
:fetch-suggestions="querySearchAsyncWorkType"
placeholder="请选择工种"
@select="handleSelectWorkType"
show-word-limit
:disabled = "worktypeDisabled"
>
<!-- <el-button
type="primary"
:disabled = "workTypeBtnState"
slot="suffix"
@click="handleIconClickWorkType"
size="mini"
>+添加</el-button> -->
<!-- <i class="el-icon-arrow-down" slot="suffix" @click="handleIconClickArrowDown"></i> -->
<template slot-scope="{ item }">
<div class="name">{{item.value}}</div>
</template>
</el-autocomplete>
<el-autocomplete
popper-class="my-autocomplete"
v-model.trim="workTypeState"
:fetch-suggestions="querySearchAsyncWorkType"
placeholder="请选择工种"
@select="handleSelectWorkType"
show-word-limit
:disabled="worktypeDisabled"
>
<!-- <el-button
type="primary"
:disabled = "workTypeBtnState"
slot="suffix"
@click="handleIconClickWorkType"
size="mini"
>+添加</el-button> -->
<!-- <i class="el-icon-arrow-down" slot="suffix" @click="handleIconClickArrowDown"></i> -->
<template slot-scope="{ item }">
<div class="name">{{ item.value }}</div>
</template>
</el-autocomplete>
</div>
</template>
<!--/自定义表单-->
@@ -138,7 +139,8 @@
icon="el-icon-circle-close"
@click="drawer = false"
:loading="disabled"
>取消</el-button
>取消
</el-button
>
</template>
</avue-form>
@@ -146,12 +148,12 @@
</template>
<script>
import { add, detail, update, tradeListAdd,getMounthDays, getDictionary} from "@/api/tenant/postzp";
import { getTrade, getWork, getSkillList, getWorkTypes} from "@/api/tenant/common";
import {add, detail, update, tradeListAdd, getMounthDays, getDictionary} from "@/api/tenant/postzp";
import {getTrade, getWork, getSkillList, getWorkTypes} from "@/api/tenant/common";
import SkillSelect from "../Dialog/Skill";
import SelectMap from "@/components/map/selectLocation";
import { isvalidatemobile } from "@/util/validate";
import { mapGetters } from "vuex";
import {isvalidatemobile} from "@/util/validate";
import {mapGetters} from "vuex";
import {
wageUnitCategoryState,
wageOptionsMonth,
@@ -175,19 +177,19 @@ export default {
id: "",
title: "",
type: "",
tradeBtnState:true,
workTypeBtnState:true,
worktypeDisabled:true,
tradeBtnState: true,
workTypeBtnState: true,
worktypeDisabled: true,
selectedSkillIds: [],
selectedName: [],
selectedSkills: [],
tradeData: [],
tradeNameAttr:[],
tradeIdAttr:[],
tradeNameAttr: [],
tradeIdAttr: [],
workData: [],
workDataNameAttr:[],
workDataIdAttr:[],
skillIdAttr:[],
workDataNameAttr: [],
workDataIdAttr: [],
skillIdAttr: [],
obj: {
wage: 0,
wageUnitCategory: 3,
@@ -195,20 +197,20 @@ export default {
ageDesc: "不限年龄",
education: 7,
experienceDesc: "不限经验",
tradeId:null,
tradeId: null,
tradeNames: null,
userNature:"灵活用工",
userNature: "灵活用工",
},
loading: false,
drawer: false,
wageUnitCategory: wageUnitCategoryState,
restaurants: [],
tradeState: '',
workTypeState:'',
timeout: null,
days:null,//某个月份的天数
endTimeFlag:true,
stimeDate:null,
workTypeState: '',
timeout: null,
days: null,//某个月份的天数
endTimeFlag: true,
stimeDate: null,
workTypesNameList: [],
wallMaxAndMin: []
};
@@ -227,12 +229,12 @@ export default {
if (val) {
getWork(val).then((res) => {
this.workData = res;
this.workDataNameAttr = res.map((ele)=>{
return ele.name
})
this.workDataIdAttr = res.map((ele)=>{
return ele.id
})
this.workDataNameAttr = res.map((ele) => {
return ele.name
})
this.workDataIdAttr = res.map((ele) => {
return ele.id
})
this.worktypeDisabled = false;
if (val !== oldval && oldval) {
this.obj.worktypeIds = "";
@@ -245,15 +247,17 @@ export default {
// "obj.wageUnitCategory": function () {
// if (this.$refs.form) this.$refs.form.$refs.form.validateField("wage");
// },
"stimeDate":function(n){
if(n){
getMounthDays(n).then(res=>{
this.days=res.data.data;
})
"stimeDate": function (n) {
if (n) {
getMounthDays(n).then(res => {
this.days = res.data.data;
})
}
},
wallMaxAndMin(val) {
if(!val.length) {return;}
if (!val.length) {
return;
}
switch (true) {
case this.obj.wage < Math.min(...val):
this.obj.wage = Math.min(...val)
@@ -390,7 +394,7 @@ export default {
// }
// }
// }
const validatePass = (rule, value, callback)=>{
const validatePass = (rule, value, callback) => {
let specialKey = "[`~#$^&*()=|{}\\[\\]<>/~#￥……&*（）——|{}【】《》%@‘”“']‘'";
let flagValue = true;
for (var i = 0; i < value.length; i++) {
@@ -398,14 +402,14 @@ export default {
flagValue = false;
}
}
if( flagValue){
if (flagValue) {
callback();
}else{
} else {
callback(new Error('岗位名称不能输入特殊字符'));
}
};
};
return {
emptyBtn: false,
menuPosition: "right",
@@ -433,7 +437,7 @@ export default {
message: "长度在 3到 30 个字",
trigger: "blur",
},
{ validator: validatePass, trigger: 'blur' }
{validator: validatePass, trigger: 'blur'}
],
},
{
@@ -454,14 +458,13 @@ export default {
);
},
},
blur:({value})=>{
self.obj.etime='';
if(value){
self.stimeDate=value.split(' ')[0]
self.endTimeFlag=false
}
else{
self.endTimeFlag=true
blur: ({value}) => {
self.obj.etime = '';
if (value) {
self.stimeDate = value.split(' ')[0]
self.endTimeFlag = false
} else {
self.endTimeFlag = true
}
},
@@ -483,12 +486,12 @@ export default {
valueFormat: "yyyy-MM-dd 00:00:00",
pickerOptions: {
disabledDate(time) {
if(!self.obj.stime){
if (!self.obj.stime) {
return true
}
if(self.days){
if (self.days) {
// let mutiply=1000*60*60*24;
return !( time.getTime() > Date.now() && (!self.startTime || (time.getTime() > self.startTime )))
return !(time.getTime() > Date.now() && (!self.startTime || (time.getTime() > self.startTime)))
}
},
},
@@ -811,7 +814,7 @@ export default {
{
label: "工作地址",
type: "input",
prop: "city",
prop: "cityId",
rules: [
{
required: true,
@@ -849,7 +852,9 @@ export default {
wageBlur(e) {
const value = e.target.value
const val = this.wallMaxAndMin
if(!val.length) {return;}
if (!val.length) {
return;
}
switch (true) {
case this.obj.wage < Math.min(...val):
this.obj.wage = Math.min(...val)
@@ -863,9 +868,9 @@ export default {
let params = {
code: `wages_limit_${this.obj.wageUnitCategory}`
}
const arr = []
const arr = []
const resData = await getDictionary(params)
if(resData.data.code === 200) {
if (resData.data.code === 200) {
resData.data.data.map((item) => {
arr.push(Number(item.dictKey))
})
@@ -878,12 +883,12 @@ export default {
workSkillList(res) {
this.workTypesNameList = res.data
const Deliver = (children, obj = {}) => {
children.forEach((item) => {
obj[item.id] = item.name
if (item.child) {
return Deliver(item.child, obj)
}
})
children.forEach((item) => {
obj[item.id] = item.name
if (item.child) {
return Deliver(item.child, obj)
}
})
return obj
}
this.workTypesNameObj = Deliver(res.data)
@@ -893,127 +898,127 @@ export default {
querySearchAsync(queryString, cb) {
let results = [];
let tradeNameState = this.tradeNameAttr.indexOf(queryString);
if(tradeNameState == -1){
if (tradeNameState == -1) {
this.tradeBtnState = false;
}else{
} else {
this.tradeBtnState = true;
}
for(let i of this.tradeData){
i.value = i.name;
}
results = queryString ? this.tradeData.filter(this.createStateFilter(queryString)) : this.tradeData;
cb(results);
},
//工种筛选
querySearchAsyncWorkType(queryString, cb){
for (let i of this.tradeData) {
i.value = i.name;
}
results = queryString ? this.tradeData.filter(this.createStateFilter(queryString)) : this.tradeData;
cb(results);
},
//工种筛选
querySearchAsyncWorkType(queryString, cb) {
let results = [];
let workDataNameState = this.workDataNameAttr.indexOf(queryString);
if(workDataNameState == -1){
this.workTypeBtnState = false;
}else{
this.workTypeBtnState = true;
}
for(let i of this.workData){
i.value = i.name;
}
results = queryString ? this.workData.filter(this.createStateFilter(queryString)) : this.workData;
cb(results);
},
createStateFilter(queryString) {
return (state) => {
return (state.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
};
},
//行业类型
handleSelect(item) {
this.tradeBtnState = true;
this.obj.tradeId = item.id;
this.obj.tradeNames = item.name;
},
//工种
handleSelectWorkType(item){
let results = [];
let workDataNameState = this.workDataNameAttr.indexOf(queryString);
if (workDataNameState == -1) {
this.workTypeBtnState = false;
} else {
this.workTypeBtnState = true;
this.obj.worktypeIds = item.id;
},
//点击行业类型添加按钮
handleIconClick() {
this.$message.closeAll();
let nameState = this.tradeNameAttr.indexOf(this.tradeState)
if(this.tradeState == ""){
this.$message({
type: "error",
message: "请输入要添加的行业类型！",
})
}else if(nameState != -1){
}
for (let i of this.workData) {
i.value = i.name;
}
results = queryString ? this.workData.filter(this.createStateFilter(queryString)) : this.workData;
cb(results);
},
createStateFilter(queryString) {
return (state) => {
return (state.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
};
},
//行业类型
handleSelect(item) {
this.tradeBtnState = true;
this.obj.tradeId = item.id;
this.obj.tradeNames = item.name;
},
//工种
handleSelectWorkType(item) {
this.workTypeBtnState = true;
this.obj.worktypeIds = item.id;
},
//点击行业类型添加按钮
handleIconClick() {
this.$message.closeAll();
let nameState = this.tradeNameAttr.indexOf(this.tradeState)
if (this.tradeState == "") {
this.$message({
type: "error",
message: "请输入要添加的行业类型！",
})
} else if (nameState != -1) {
this.$message({
type: "error",
message: "此行业类型已存在，请在列表中选择！",
})
} else {
tradeListAdd(this.tradeState).then((res) => {
if (res.data.code == 200) {
this.obj.tradeId = res.data.data;
this.$message({
type: "success",
message: res.data.msg,
})
this.tradeBtnState = true;
this.initData();
//this.$refs.form.clearValidate('tradeId');
this.clearValidator('tradeId');
} else {
this.$message({
type: "error",
message: "此行业类型已存在，请在列表中选择！",
})
}else{
tradeListAdd(this.tradeState).then((res) =>{
if(res.data.code == 200){
this.obj.tradeId = res.data.data;
this.$message({
type: "success",
message: res.data.msg,
})
this.tradeBtnState = true;
this.initData();
//this.$refs.form.clearValidate('tradeId');
this.clearValidator('tradeId');
}else{
this.$message({
type: "error",
message: res.data.msg,
})
}
message: res.data.msg,
})
}
});
}
}
},
//点击工种添加按钮
// handleIconClickWorkType() {
// this.$message.closeAll();
// let nameState = this.workDataNameAttr.indexOf(this.workTypeState)
// if(this.workTypeState == ""){
// this.$message({
// type: "error",
// message: "请输入要添加的工种！",
// })
// }else if(nameState != -1){
// this.$message({
// type: "error",
// message: "此工种已存在，请在列表中选择！",
// })
// }else{
// workListAdd(this.obj.tradeId,this.workTypeState).then((res) =>{
// if(res.data.code == 200){
// this.obj.worktypeIds = res.data.data;
// this.$message({
// type: "success",
// message: res.data.msg,
// })
// this.workTypeBtnState = true;
// this.clearValidator('worktypeIds');
// getWork(this.obj.tradeId).then((res) => {
// this.workData = res;
// this.workDataNameAttr = res.map((ele)=>{
// return ele.name
// })
// })
// }else{
// this.$message({
// type: "error",
// message: res.data.msg,
// })
// }
// });
// }
},
//点击工种添加按钮
// handleIconClickWorkType() {
// this.$message.closeAll();
// let nameState = this.workDataNameAttr.indexOf(this.workTypeState)
// if(this.workTypeState == ""){
// this.$message({
// type: "error",
// message: "请输入要添加的工种！",
// })
// }else if(nameState != -1){
// this.$message({
// type: "error",
// message: "此工种已存在，请在列表中选择！",
// })
// }else{
// workListAdd(this.obj.tradeId,this.workTypeState).then((res) =>{
// if(res.data.code == 200){
// this.obj.worktypeIds = res.data.data;
// this.$message({
// type: "success",
// message: res.data.msg,
// })
// this.workTypeBtnState = true;
// this.clearValidator('worktypeIds');
// getWork(this.obj.tradeId).then((res) => {
// this.workData = res;
// this.workDataNameAttr = res.map((ele)=>{
// return ele.name
// })
// })
// }else{
// this.$message({
// type: "error",
// message: res.data.msg,
// })
// }
// });
// }
// },
// },
//
addressDel(){
addressDel() {
this.obj.address = "";
},
initData() {
@@ -1021,10 +1026,10 @@ export default {
this.loading = true;
getTrade(this.userInfo.company_id).then((res) => {
this.tradeData = res;
this.tradeNameAttr = res.map((ele)=>{
this.tradeNameAttr = res.map((ele) => {
return ele.name
})
this.tradeIdAttr = res.map((ele)=>{
this.tradeIdAttr = res.map((ele) => {
return ele.id
})
this.loading = false;
@@ -1047,7 +1052,7 @@ export default {
ageDesc: "不限年龄",
education: 7,
experienceDesc: "不限经验",
userNature:"灵活用工",
userNature: "灵活用工",
};
},
@@ -1066,7 +1071,7 @@ export default {
}
},
submit(row, done) {
if(this.$refs.selectMap.addressLocation == ""){
if (this.$refs.selectMap.addressLocation == "") {
return this.$message({
type: "error",
message: "请选择详细地址!",
@@ -1081,13 +1086,13 @@ export default {
// });
// let skillIds = ids.join(",");
// let skillNames = name.join(",");
if(this.skillArr && this.skillArr.length > 0) {
if (this.skillArr && this.skillArr.length > 0) {
this.skillArr.forEach(item => {
if(item.id == row.workSkills[0]) {
if (item.id == row.workSkills[0]) {
row.worktypeNames = item.name
if(item.child && item.child.length > 0) {
if (item.child && item.child.length > 0) {
item.child.forEach(item2 => {
if(item2.id == row.workSkills[1]) {
if (item2.id == row.workSkills[1]) {
row.skillNames = item2.name;
}
})
@@ -1096,9 +1101,9 @@ export default {
})
}
if(this.tradeData && this.tradeData.length > 0) {
if (this.tradeData && this.tradeData.length > 0) {
this.tradeData.forEach(item => {
if(row.tradeId == item.id) {
if (row.tradeId == item.id) {
row.tradeNames = item.name
}
})
@@ -1141,7 +1146,7 @@ export default {
callName: row.callName,
callTel: row.callTel,
callNumber: row.callNumber,
city: row.city,
cityId: row.cityId,
address: row.address,
lat: row.lat,
lon: row.lon,
@@ -1190,7 +1195,7 @@ export default {
callName: row.callName,
callTel: row.callTel,
callNumber: row.callNumber,
city: row.city,
cityId: row.cityId,
address: row.address,
lat: row.lat,
lon: row.lon,
@@ -1212,14 +1217,14 @@ export default {
}
},
clearValidator(val){
clearValidator(val) {
this.$refs.form.clearValidate(val);
},
onLoad(row, type) {
this.type = type;
this.id = row.id;
this.$nextTick(() => {
if(type!='edit'){
if (type != 'edit') {
// getLastTaskInfo().then(res=>{
// const data=res.data.data;
// this.obj.callName=data.callName;
@@ -1240,58 +1245,58 @@ export default {
this.drawer = true;
let tradeIdState = this.tradeIdAttr.indexOf(this.obj.tradeId);
//判断有无此行业
if(tradeIdState == -1){
if (tradeIdState == -1) {
this.obj.tradeId = "";
setTimeout(()=>{
setTimeout(() => {
this.$message({
type: "error",
message: "此岗位所包含行业已经不存在，请重新选择！",
})
},1000);
}else{
}, 1000);
} else {
this.tradeState = this.obj.tradeNames;
//判断有无此工种
getWork(this.obj.tradeId).then((res) => {
this.workData = res;
this.workDataIdAttr = res.map((ele)=>{
this.workDataIdAttr = res.map((ele) => {
return ele.id
})
let workDataIdState = this.workDataIdAttr.indexOf(this.obj.worktypeIds);
//判断有无此工种
if(workDataIdState == -1){
if (workDataIdState == -1) {
this.obj.worktypeIds = "";
setTimeout(()=>{
setTimeout(() => {
this.$message({
type: "error",
message: "此岗位所包含工种已经不存在，请重新选择！",
})
},1000);
}else{
}, 1000);
} else {
this.workTypeState = this.obj.worktypeNames;
getSkillList(this.obj.worktypeIds).then((res) => {
this.skillIdAttr = res.data.data.records.map((ele)=>{
this.skillIdAttr = res.data.data.records.map((ele) => {
return ele;
});
let newSelectedSkills = [];
this.skillIdAttr.forEach((val) => {
let selectedSkillsState = this.obj.selectedSkills.find(v => v.id == val.id);
if(selectedSkillsState){
if (selectedSkillsState) {
newSelectedSkills.push(val);
}
})
// 判断有无此技能
if(newSelectedSkills.length == 0){
if (newSelectedSkills.length == 0) {
// setTimeout(()=>{
// this.$message({
// type: "error",
// message: "此岗位所包含技能已经不存在，请重新选择！",
// })
// },1000);
}else{
} else {
this.selectedSkills = newSelectedSkills;
}
});
}
}
})
}
});
@@ -1303,11 +1308,11 @@ export default {
ageDesc: "不限年龄",
education: 7,
experienceDesc: "不限经验",
userNature:"灵活用工"
userNature: "灵活用工"
};
this.selectedSkills = [];
this.drawer = true;
this.$nextTick(() =>{
this.$nextTick(() => {
this.$refs.form.clearValidate();
})
if (this.$refs.selectMap) {
@@ -1316,7 +1321,7 @@ export default {
} else if (type === "edit") {
this.title = "编辑岗位";
detail(row.id).then((res) => {
if(res.cityId === -1) {
if (res.cityId === -1) {
res.cityId = ''
}
this.obj = res;
@@ -1381,7 +1386,7 @@ export default {
},
mounted() {
}
}
};
</script>
<style scoped>
@@ -1394,41 +1399,50 @@ export default {
.input-with-select {
width: 100%;
}
.copy-form .el-input-group__append {
background-color: #fff;
}
.input-with-select .el-input-group__append .el-input__icon {
display: none;
}
.input-with-select .el-input-group__append input {
width: 105px;
padding: 0;
text-align: center;
}
.my-autocomplete li{
.my-autocomplete li {
line-height: normal;
padding: 7px;
padding: 7px;
}
.my-autocomplete li .name{
text-overflow: ellipsis;
overflow: hidden;
.my-autocomplete li .name {
text-overflow: ellipsis;
overflow: hidden;
}
.my-autocomplete li .addr{
font-size: 12px;
color: #b4b4b4;
.my-autocomplete li .addr {
font-size: 12px;
color: #b4b4b4;
}
.my-autocomplete li .highlighted .addr{
color: #ddd;
.my-autocomplete li .highlighted .addr {
color: #ddd;
}
.tradeId .el-autocomplete{
width:100%;
.tradeId .el-autocomplete {
width: 100%;
}
.tradeId .el-icon-plus:before{
content: "\e6d9 添加行业类型";
color: #606266;
.tradeId .el-icon-plus:before {
content: "\e6d9 添加行业类型";
color: #606266;
}
.tradeId .el-input--small input{
.tradeId .el-input--small input {
padding-right: 150px;
}
</style>