diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index de3a175..0e6c28d 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -47,7 +47,9 @@ import { getCaptcha } from "@/api/user";
console.log('是否跳转', /(^http)(s?):\/\/([a-z0-9].+)\/manage(\/)?$/i.test(location.href), location.href)
if (/(^http)(s?):\/\/([a-z0-9].+)\/manage(\/)?$/i.test(location.href)) {
- // window.location.href = process.env.VUE_APP_LOGIN_NEXT
+ if (process.env.NODE_ENV !== "development") {
+ window.location.href = process.env.VUE_APP_LOGIN_NEXT;
+ }
}
if (/(\/login\?)(.*)/ig.test(location.href)) {
const obj = {}
diff --git a/src/router/axios.js b/src/router/axios.js
index 1fd2f81..1c3558b 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -94,7 +94,9 @@ service.interceptors.response.use(
//如果是401则跳转到登录页面
if (status === 401) {
store.dispatch("FedLogOut").then(() => {
- // window.location.href = process.env.VUE_APP_LOGIN_NEXT;
+ if (process.env.NODE_ENV !== "development") {
+ window.location.href = process.env.VUE_APP_LOGIN_NEXT;
+ }
});
// store.dispatch('FedLogOut').then(() => router.push({path: '/login'}));
}
diff --git a/src/views/tenant/main/serve/Dialog/pushService2.vue b/src/views/tenant/main/serve/Dialog/pushService2.vue
index dbd243a..dbf1e47 100644
--- a/src/views/tenant/main/serve/Dialog/pushService2.vue
+++ b/src/views/tenant/main/serve/Dialog/pushService2.vue
@@ -174,7 +174,7 @@ export default {
get() {
let name = this.selectInfo ? this.selectInfo.name : null;
if (name) name = name.trim()
- if (['潜在就业困难人员', '潜在登记失业人员'].some(item => item === name)) {
+ if (['潜在就业困难人员', '潜在登记失业人员', "潜在的就业困难退出人员"].some(item => item === name)) {
return true
}
return false
diff --git a/src/views/tenant/main/serve/followUpVisit/qzjyknry.vue b/src/views/tenant/main/serve/followUpVisit/qzjyknry.vue
index a0bc75d..9284a04 100644
--- a/src/views/tenant/main/serve/followUpVisit/qzjyknry.vue
+++ b/src/views/tenant/main/serve/followUpVisit/qzjyknry.vue
@@ -45,7 +45,7 @@
否
-
+
是
否
@@ -59,8 +59,8 @@
- 是
- 否
+ 有
+ 无
@@ -387,7 +387,12 @@ export default {
serveId: _this.serveId,
serveUserId: _this.item.serveUserId,
}
+ // console.log(this.phoneForm.list)
if (/^1[3-9]{1}\d{9}/.test(this.phoneForm.phone)) params.phone = this.phoneForm.phone;
+ if (this.phoneForm.list.length) {
+ const info = this.phoneForm.list[0]
+ params.phone = info.PHONE
+ }
if (params.phone) {
this.$confirm(`请同步更改省就业3.0系统中的人员联系方式`, {
confirmButtonText: "确定",
@@ -487,7 +492,7 @@ export default {
window.open('http://10.160.7.100:8000/jyback/template/general.html#/generalPage?_modulePartId_=1000076072', '_blank');
break
case name === '潜在的就业困难退出人员' && _this.phoneForm.isExit === 1:
- window.open('http://10.160.7.100:8000/jyback/template/general.html#/generalPage?_modulePartId_=1000076072', '_blank');
+ window.open('http://10.160.7.100:8000/jyback/template/general.html#/generalPage?_modulePartId_=1000241637', '_blank');
break
}
_this.handlePhoneClose(); // 关闭弹窗
diff --git a/src/views/tenant/main/serve/followUpVisit/rulesForm.js b/src/views/tenant/main/serve/followUpVisit/rulesForm.js
index c2d71b5..3b499b1 100644
--- a/src/views/tenant/main/serve/followUpVisit/rulesForm.js
+++ b/src/views/tenant/main/serve/followUpVisit/rulesForm.js
@@ -10,23 +10,23 @@ const allFieldsHidden = {
workSkillTwo: false, // 第二求职意愿
workPlace: false, // 就业区县
exitReason: false, // 不退出原因
- exitReasonTitle: "不退出原因",
+ isExitTitle: "是否退出",
+ exitReasonTitle: "退出原因",
rejectReason: false, // 拒绝服务理由
rejectResonUrl: false, // 文件佐证资料上传
regmanage: false, // 失业登记管理<按钮>
- PersonalBaseInfo: false // 个人基础信息修改<按钮>
+ PersonalBaseInfo: true // 个人基础信息修改<按钮>
};
const categoryVisibilityRules = {
潜在可享受职业培训政策人员: form => {
- const showTrain = form.isServe === 1; // 联动规则
+ // const showTrain = form.isServe === 1; // 联动规则
// 需要先全部隐藏，再打开需要的
return {
...allFieldsHidden,
isServe: true,
- regmanage: true,
- PersonalBaseInfo: true,
- isTrain: showTrain
+ regmanage: false,
+ isTrain: false
};
},
@@ -40,7 +40,6 @@ const categoryVisibilityRules = {
isServe: showServe,
isTrain: showTrain,
isWork: true,
- PersonalBaseInfo: false,
salary: showTrain,
workSkillOne: showTrain,
workSkillTwo: showTrain,
@@ -50,12 +49,14 @@ const categoryVisibilityRules = {
潜在的就业困难退出人员: form => {
const showExitReason = form.isExit === 0;
+ const exitReasonTitle = form.isExit === 0 ? "不退出原因" : "退出原因";
return {
...allFieldsHidden,
isExit: true,
exitReason: showExitReason,
- exitReasonTitle: "是否应退出就业困难人群"
+ exitReasonTitle,
+ isExitTitle: "是否应退出就业困难人群"
};
},
@@ -68,7 +69,6 @@ const categoryVisibilityRules = {
isServe: showServe,
isTrain: showTrain,
isWork: true,
- PersonalBaseInfo: true,
salary: showTrain,
workSkillOne: showTrain,
workSkillTwo: showTrain,
@@ -86,7 +86,6 @@ const categoryVisibilityRules = {
isServe: showServe,
isTrain: showTrain,
isWork: true,
- PersonalBaseInfo: false,
salary: showTrain,
workSkillOne: showTrain,
workSkillTwo: showTrain,
@@ -101,7 +100,7 @@ const categoryVisibilityRules = {
};
},
- 领取失业补助金人员: form => {
+ 失业保险金申领人员: form => {
const showReason = form.isReject === 1;
return {