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

Merge remote-tracking branch 'origin/serveChange' into serveChange

Browse Source
This commit is contained in:
lsd
2024-07-04 17:13:33 +08:00
parent affd6a8839 9fc23371ed
commit c817ec0f6b
4 changed files with 189 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/tenant/mission.js
View File

@@ -353,6 +353,13 @@ export const getDictionary = (params) => {
params
})
}
export const listCompany = (params) => {
return request({
url: '/api/jobslink-api/tenant/company/list/company',
method: 'get',
params
})
}
/*导入任务*/
export const upload = () => {

34
src/views/tenant/main/talents/latent/index.vue
View File

@@ -185,18 +185,18 @@
@onCancel="diaLogCancel"
@onConfirm="diaLogConfirm"
>
<template v-slot:header>
<div class="input_box" style="margin-top: 20px">
<el-select style="width: 100%" clearable v-model="GroupValue" placeholder="请选择分组 (驳回不用选择此项)">
<el-option
v-for="item in selecTreeData"
:key="item.id"
:label="item.groupName"
:value="item.id">
</el-option>
</el-select>
</div>
</template>
<!-- <template v-slot:header>-->
<!-- <div class="input_box" style="margin-top: 20px">-->
<!-- <el-select style="width: 100%" clearable v-model="GroupValue" placeholder="请选择分组 (驳回不用选择此项)">-->
<!-- <el-option-->
<!-- v-for="item in selecTreeData"-->
<!-- :key="item.id"-->
<!-- :label="item.groupName"-->
<!-- :value="item.id">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </div>-->
<!-- </template>-->
</PromptDialog>
</basic-container>
@@ -768,14 +768,14 @@ export default {
}
},
diaLogConfirm(value) {
if (this.GroupValue) {
// if (this.GroupValue) {
let params = {
idNumber: this.dialogInfo.idNumber,
id: this.dialogInfo.id,
name: this.dialogInfo.name,
approvalStatus: 0,
content: value,
groupId: this.GroupValue
// groupId: this.GroupValue
}
this.$confirm("确定通过?", {
confirmButtonText: "确定",
@@ -791,9 +791,9 @@ export default {
this.dialogFlag = false
this.$message.success('操作成功');
});
} else {
this.$message.error("请选择分组");
}
// } else {
// this.$message.error("请选择分组");
// }
},
handleExport() {
this.downloadButton = true

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

@@ -26,6 +26,25 @@
></jl-cityLabel-cascader>
</template>
<template slot="missionCompanyName" slot-scope="{row,disabled}">
<el-select
v-model="obj.missionCompanyName"
filterable
:remote="true"
:remoteMethod="remoteMethod"
@change="selectMissionCompany"
:loading="missionCompanyLoad"
placeholder="请选择"
>
<el-option
v-for="item in options23"
:key="item.label"
:label="item.label"
:value="item.label">
</el-option>
</el-select>
</template>
<template slot-scope="{ disabled }" slot="skillIds">
<skill-select
ref="skillSelect"
@@ -127,7 +146,16 @@
</template>
<script>
import {add, detail, update, tradeListAdd, workListAdd, getMounthDays, getDictionary} from "@/api/tenant/mission";
import {
add,
detail,
update,
tradeListAdd,
workListAdd,
getMounthDays,
getDictionary,
listCompany
} from "@/api/tenant/mission";
import {getTrade, getWork, getWorkTypes} from "@/api/tenant/common";
import SkillSelect from "../Dialog/Skill";
import {isvalidatemobile} from "@/util/validate";
@@ -150,6 +178,8 @@ const validateTel = (rule, value, callback) => {
export default {
data() {
return {
options23: [],
missionCompanyLoad: false,
skillArr: [],
id: "",
title: "",
@@ -606,30 +636,33 @@ export default {
trigger: "blur",
},
],
formslot: true,
span: 12,
},
{
label: "单位信用代码",
prop: "missionCompanyScale",
rules: [
{
required: true,
message: "请输入单位信用代码",
trigger: "blur",
},
],
disabled: true,
// rules: [
// {
// required: true,
// message: "请输入单位信用代码",
// trigger: "blur",
// },
// ],
span: 12,
},
{
label: "所属行业",
prop: "missionCompanyIndustry",
rules: [
{
required: true,
message: "请输入所属行业",
trigger: "blur",
},
],
disabled: true,
// rules: [
// {
// required: true,
// message: "请输入所属行业",
// trigger: "blur",
// },
// ],
type: "select",
dicData: this.tradeData,
props: {
@@ -641,19 +674,20 @@ export default {
{
label: "单位性质",
prop: "missionCompanyNature",
disabled: true,
type: 'select',
dicUrl: "/api/jobslink-api/system/dict-biz/dictionary?code=company_nature",
props: {
label: "dictValue",
value: "dictKey",
},
rules: [
{
required: true,
message: "请输入单位性质",
trigger: "blur",
},
],
// rules: [
// {
// required: true,
// message: "请输入单位性质",
// trigger: "blur",
// },
// ],
span: 12,
},
{
@@ -752,6 +786,23 @@ export default {
},
},
methods: {
selectMissionCompany(item) {
const value = this.options23.find((vi) => vi.label === item)
this.obj.missionCompanyScale = value.jobCompanyScale
this.obj.missionCompanyIndustry = value.jobCompanyIndustry
this.obj.missionCompanyNature = value.jobCompanyNature
},
async remoteMethod(query) {
this.missionCompanyLoad = true
let resData = await listCompany({companyName: query})
this.missionCompanyLoad = false
if (resData.data.code === 200) {
this.options23 = resData.data.data.records.map((item) => ({
label: item.jobCompanyName,
...item
}))
}
},
wageBlur(e) {
const value = e.target.value
const val = this.wallMaxAndMin

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

@@ -56,6 +56,25 @@
placeholder="请选择 工作地址"
></jl-cityLabel-cascader>
</template>
<template slot="jobCompanyName" slot-scope="{row,disabled}">
<el-select
v-model="obj.jobCompanyName"
filterable
:remote="true"
:remoteMethod="remoteMethod"
@change="selectMissionCompany"
:loading="missionCompanyLoad"
placeholder="请选择"
>
<el-option
v-for="item in options23"
:key="item.label"
:label="item.label"
:value="item.label">
</el-option>
</el-select>
</template>
<template slot="cityIdFrom" slot-scope="{ disabled }">
<jl-cityLabel-cascader
:disabled="disabled"
@@ -173,6 +192,7 @@
</template>
<script>
import {listCompany} from "@/api/tenant/mission";
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";
@@ -197,6 +217,8 @@ const validateTel = (rule, value, callback) => {
export default {
data() {
return {
options23: [],
missionCompanyLoad: false,
skillArr: [],
id: "",
title: "",
@@ -741,48 +763,52 @@ export default {
trigger: "blur",
},
],
formslot: true,
span: 12,
},
{
label: "单位信用代码",
prop: "jobCompanyScale",
rules: [
{
required: true,
message: "请输入单位信用代码",
trigger: "blur",
},
],
disabled: true,
// rules: [
// {
// required: true,
// message: "请输入单位信用代码",
// trigger: "blur",
// },
// ],
span: 12,
},
{
label: "所属行业",
prop: "jobCompanyIndustry",
rules: [
{
required: true,
message: "请输入所属行业",
trigger: "blur",
},
],
disabled: true,
// rules: [
// {
// required: true,
// message: "请输入所属行业",
// trigger: "blur",
// },
// ],
span: 12,
},
{
prop: "jobCompanyNature",
label: "单位性质",
type: 'select',
disabled: true,
dicUrl: "/api/jobslink-api/system/dict-biz/dictionary?code=company_nature",
props: {
label: "dictValue",
value: "dictKey",
},
rules: [
{
required: true,
message: "请输入单位性质",
trigger: "blur",
},
],
// rules: [
// {
// required: true,
// message: "请输入单位性质",
// trigger: "blur",
// },
// ],
span: 12,
},
{
@@ -881,6 +907,23 @@ export default {
},
},
methods: {
selectMissionCompany(item) {
const value = this.options23.find((vi) => vi.label === item)
this.obj.jobCompanyScale = value.jobCompanyScale
this.obj.jobCompanyIndustry = value.jobCompanyIndustry
this.obj.jobCompanyNature = value.jobCompanyNature
},
async remoteMethod(query) {
this.missionCompanyLoad = true
let resData = await listCompany({companyName: query})
this.missionCompanyLoad = false
if (resData.data.code === 200) {
this.options23 = resData.data.data.records.map((item) => ({
label: item.jobCompanyName,
...item
}))
}
},
wageBlur(e) {
const value = e.target.value
const val = this.wallMaxAndMin