diff --git a/src/views/tenant/mission/Dialog/CopyMission.vue b/src/views/tenant/mission/Dialog/CopyMission.vue
index 4aa9316..c3daa02 100644
--- a/src/views/tenant/mission/Dialog/CopyMission.vue
+++ b/src/views/tenant/mission/Dialog/CopyMission.vue
@@ -28,22 +28,31 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+ :fetch-suggestions="remoteMethod"
+ placeholder="请输入用工单位"
+ @select="selectMissionCompany"
+ >
@@ -223,7 +232,8 @@ export default {
days: null,//某个月份的天数
endTimeFlag: true,
stimeDate: null,
- wallMaxAndMin: []
+ wallMaxAndMin: [],
+ dwlist: []
};
},
components: {
@@ -372,9 +382,9 @@ export default {
trigger: "blur",
},
{
- min: 3,
+ min: 2,
max: 30,
- message: "长度在 3到 30 个字",
+ message: "长度在 2 到 30 个字",
trigger: "blur",
},
{validator: validatePass, trigger: 'blur'}
@@ -699,19 +709,6 @@ export default {
label: "单位介绍",
prop: "missionCompanyDescription",
type: "textarea",
- rules: [
- {
- required: true,
- message: "请输入单位介绍",
- trigger: "blur",
- },
- {
- min: 30,
- max: 200,
- message: "长度在 30 到 200 个字",
- trigger: "blur",
- },
- ],
placeholder: "请输入单位介绍，字数30-200字以内",
span: 24,
maxlength: 200,
@@ -793,12 +790,15 @@ export default {
methods: {
getHistroyCompanyList() {
missionHistory().then((res) => {
- this.options23 = res.data.data.map((item) => {
+ const obj = res.data.data.map((item) => {
return {
...item,
label: item.missionCompanyName,
+ value: item.missionCompanyName,
}
})
+ this.options23 = obj
+ this.dwlist = obj
})
},
resetForm() {
@@ -819,6 +819,7 @@ export default {
// this.obj.callName = ""
// this.obj.callTel = ""
// this.obj.callNumber = ""
+ // this.obj.callNumber = ""
// this.obj.cityId = ""
// this.obj.address = ""
this.obj.wageUnitCategory = 1
@@ -832,11 +833,10 @@ export default {
this.obj.$missionCompanyIndustry = ""
this.obj.$missionCompanyNature = ""
},
- selectMissionCompany(item) {
- const value = this.options23.find((vi) => vi.label === item)
- this.obj.missionCompanyScale = value.missionCompanyScale
- this.obj.missionCompanyIndustry = value.missionCompanyIndustry
- this.obj.missionCompanyNature = value.missionCompanyNature
+ selectMissionCompany(value) {
+ this.obj.missionCompanyScale = value.missionCompanyScale || value.jobCompanyScale
+ this.obj.missionCompanyIndustry = value.missionCompanyIndustry || value.jobCompanyIndustry
+ this.obj.missionCompanyNature = value.missionCompanyNature || value.jobCompanyNature
if (value.callTel) {
this.obj.missionCompanyDescription = value.missionCompanyDescription
this.obj.callName = value.callName
@@ -848,15 +848,23 @@ export default {
this.obj.lat = value.lat
}
},
- async remoteMethod(query) {
+ async remoteMethod(query, cb) {
+ if (!query) {
+ this.options23 = this.dwlist
+ cb(this.dwlist)
+ return
+ }
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) => ({
+ const op = resData.data.data.records.map((item) => ({
label: item.jobCompanyName,
- ...item
+ ...item,
+ value: item.jobCompanyName,
}))
+ this.options23 = op
+ cb(op)
}
},
wageBlur(e) {
@@ -1353,4 +1361,8 @@ export default {
.tradeId .el-input--small input {
padding-right: 150px;
}
+
+.el-autocomplete {
+ width: 100%;
+}
diff --git a/src/views/tenant/works/Dialog/CopyMission.vue b/src/views/tenant/works/Dialog/CopyMission.vue
index 0a8e6dd..e069cbf 100644
--- a/src/views/tenant/works/Dialog/CopyMission.vue
+++ b/src/views/tenant/works/Dialog/CopyMission.vue
@@ -59,22 +59,30 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+ :fetch-suggestions="remoteMethod"
+ placeholder="请输入用工单位"
+ @select="selectMissionCompany"
+ >
{
- this.options23 = res.data.data.map((item) => {
+ const obj = res.data.data.map((item) => {
return {
...item,
label: item.jobCompanyName,
+ value: item.jobCompanyName,
}
})
+ this.options23 = obj
+ this.dwlist = obj
})
},
resetForm() {
@@ -950,8 +962,7 @@ export default {
this.obj.$experienceDesc = ""
this.obj.$jobCompanyNature = ""
},
- selectMissionCompany(item) {
- const value = this.options23.find((vi) => vi.label === item)
+ selectMissionCompany(value) {
this.obj.jobCompanyScale = value.jobCompanyScale
this.obj.jobCompanyIndustry = value.jobCompanyIndustry
this.obj.jobCompanyNature = value.jobCompanyNature
@@ -966,15 +977,23 @@ export default {
this.obj.lat = value.lat
}
},
- async remoteMethod(query) {
+ async remoteMethod(query, cb) {
+ if (!query) {
+ this.options23 = this.dwlist
+ cb(this.dwlist)
+ return
+ }
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) => ({
+ const op = resData.data.data.records.map((item) => ({
label: item.jobCompanyName,
- ...item
+ ...item,
+ value: item.jobCompanyName,
}))
+ this.options23 = op
+ cb(op)
}
},
wageBlur(e) {
diff --git a/vue.config.js b/vue.config.js
index ca25372..5002c0d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -27,8 +27,8 @@ module.exports = {
port: 1888,
proxy: {
"/api": {
- target: 'http://192.168.1.115:8000',
- // target: 'http://10.165.0.173:8000',
+ // target: 'http://192.168.1.115:8000',
+ target: 'http://10.165.0.173:8000',
ws: true,
changeOrigin: true,
pathRewrite: {