Commit 900e5a16 by @zhang-bin-1

gx

parent c755ab75
...@@ -32,7 +32,8 @@ export default { ...@@ -32,7 +32,8 @@ export default {
userId: 37393, userId: 37393,
name: "124晚6565", name: "124晚6565",
realName: "梁中全", realName: "梁中全",
idCardNo: "32092219930813831X", // idCardNo: "32092219930813831X",
idCardNo: "321111198502254219",
// idCardNo: "321183199610151344", // idCardNo: "321183199610151344",
// idCardNo: "DDfCYHcrBMRhvRt4AQKt+WfGq6l2uT5G", // idCardNo: "DDfCYHcrBMRhvRt4AQKt+WfGq6l2uT5G",
// mobileNo: 13776475181, // mobileNo: 13776475181,
......
import { request, request1, config } from '@/utils/request' // import { request, config } from '@/utils/request'
import { request2, config2 } from '@/utils/axios'
/** /**
* 上传照片文件 * 上传照片文件
* @param {Object} data * @param {Object} data
*/ */
export function uploadFile(data) { export function uploadFile(data) {
return request({ return request2({
headers: { "Content-Type": "multipart/form-data" }, // headers: {
// url: `${config.baseUrl}file/DeedTaxUpload`, // "Content-Type": "multipart/form-data",
url: `${config.baseUrl}file/upload`, // "Authorization": "Bearer " + sessionStorage.getItem("token")
// },
url: `${config2.baseUrl}app-api/file/DeedTaxUpload`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -18,8 +21,8 @@ export function uploadFile(data) { ...@@ -18,8 +21,8 @@ export function uploadFile(data) {
* 契税补贴申请列表 * 契税补贴申请列表
*/ */
export function queryListDeedTaxInfoByUserId(data) { export function queryListDeedTaxInfoByUserId(data) {
return request1({ return request2({
url: `${config.baseUrl}deedTax/queryListDeedTaxInfoByUserId`, url: `${config2.baseUrl}app-api/deedTax/queryListDeedTaxInfoByUserId`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -29,8 +32,8 @@ export function queryListDeedTaxInfoByUserId(data) { ...@@ -29,8 +32,8 @@ export function queryListDeedTaxInfoByUserId(data) {
* 契税补贴申请新增 * 契税补贴申请新增
*/ */
export function addDeedTax(data) { export function addDeedTax(data) {
return request1({ return request2({
url: `${config.baseUrl}deedTax/addDeedTax`, url: `${config2.baseUrl}app-api/deedTax/addDeedTax`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -40,8 +43,8 @@ export function addDeedTax(data) { ...@@ -40,8 +43,8 @@ export function addDeedTax(data) {
* 契税补贴初审审核意见 * 契税补贴初审审核意见
*/ */
export function queryReviewerDeedTaxRecord(data) { export function queryReviewerDeedTaxRecord(data) {
return request1({ return request2({
url: `${config.baseUrl}deedTax/queryReviewerDeedTaxRecord`, url: `${config2.baseUrl}app-api/deedTax/queryReviewerDeedTaxRecord`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -51,8 +54,8 @@ export function queryReviewerDeedTaxRecord(data) { ...@@ -51,8 +54,8 @@ export function queryReviewerDeedTaxRecord(data) {
* 契税补贴审核意见 * 契税补贴审核意见
*/ */
export function queryDeedTaxRecord(data) { export function queryDeedTaxRecord(data) {
return request1({ return request2({
url: `${config.baseUrl}deedTax/queryDeedTaxRecord`, url: `${config2.baseUrl}app-api/deedTax/queryDeedTaxRecord`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -62,8 +65,8 @@ export function queryDeedTaxRecord(data) { ...@@ -62,8 +65,8 @@ export function queryDeedTaxRecord(data) {
* 契税补贴查询详情 * 契税补贴查询详情
*/ */
export function queryDeedTaxInfoByCode(data) { export function queryDeedTaxInfoByCode(data) {
return request1({ return request2({
url: `${config.baseUrl}deedTax/queryDeedTaxInfoByCode`, url: `${config2.baseUrl}app-api/deedTax/queryDeedTaxInfoByCode`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -73,8 +76,8 @@ export function queryDeedTaxInfoByCode(data) { ...@@ -73,8 +76,8 @@ export function queryDeedTaxInfoByCode(data) {
* 契税补贴申请修改 * 契税补贴申请修改
*/ */
export function updateDeedTax(data) { export function updateDeedTax(data) {
return request1({ return request2({
url: `${config.baseUrl}deedTax/updateDeedTax`, url: `${config2.baseUrl}app-api/deedTax/updateDeedTax`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -84,8 +87,8 @@ export function updateDeedTax(data) { ...@@ -84,8 +87,8 @@ export function updateDeedTax(data) {
* 银行卡确认 * 银行卡确认
*/ */
export function updateDeedTaxState(data) { export function updateDeedTaxState(data) {
return request1({ return request2({
url: `${config.baseUrl}deedTax/updateDeedTaxState`, url: `${config2.baseUrl}app-api/deedTax/updateDeedTaxState`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -95,8 +98,8 @@ export function updateDeedTaxState(data) { ...@@ -95,8 +98,8 @@ export function updateDeedTaxState(data) {
* 查询用户申请记录 * 查询用户申请记录
*/ */
export function queryUserApplyForRecord(data) { export function queryUserApplyForRecord(data) {
return request1({ return request2({
url: `${config.baseUrl}deedTax/queryUserApplyForRecord`, url: `${config2.baseUrl}app-api/deedTax/queryUserApplyForRecord`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -106,8 +109,19 @@ export function queryUserApplyForRecord(data) { ...@@ -106,8 +109,19 @@ export function queryUserApplyForRecord(data) {
* 查询用户申请中的详细信息 * 查询用户申请中的详细信息
*/ */
export function queryApplyingDeedTaxInfo(data) { export function queryApplyingDeedTaxInfo(data) {
return request1({ return request2({
url: `${config.baseUrl}deedTax/queryApplyingDeedTaxInfo`, url: `${config2.baseUrl}app-api/deedTax/queryApplyingDeedTaxInfo`,
method: 'post',
data: data
})
}
/**
* 身份证验重(判断用户是否享受过相关政策)
*/
export function idCardVerification(data) {
return request2({
url: `${config2.baseUrl}app-api/deedTax/idCardVerification`,
method: 'post', method: 'post',
data: data data: data
}) })
......
import { request, config } from '@/utils/request' import { request, config } from '@/utils/request'
import { request2, config2 } from '@/utils/axios'
/** /**
* 部门列表 * 部门列表
...@@ -54,8 +55,8 @@ export function mattersById(data) { ...@@ -54,8 +55,8 @@ export function mattersById(data) {
* @returns * @returns
*/ */
export function mattersGuideGet(data) { export function mattersGuideGet(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersGuideGet`, url: `${config2.baseUrl}app-api/talent/mattersGuideGet`,
method: 'post', method: 'post',
data: data data: data
}) })
......
import { request, config, formatUrl } from '@/utils/request' import { request, config, formatUrl } from '@/utils/request'
import { request3, config2 } from '@/utils/axios'
// /** // /**
// * 通过ticket查询用户实名信息 // * 通过ticket查询用户实名信息
...@@ -15,13 +16,15 @@ import { request, config, formatUrl } from '@/utils/request' ...@@ -15,13 +16,15 @@ import { request, config, formatUrl } from '@/utils/request'
* 上传照片文件 * 上传照片文件
* @param {Object} data * @param {Object} data
*/ */
export function uploadFile(data) { export function uploadFile(data) {
return request({ return request3({
headers: { "Content-Type": "multipart/form-data" }, // headers: {
// url: `${config.baseUrl}file/uploadTalent`, // "Content-Type": "multipart/form-data",
url: `${config.baseUrl}file/upload`, // "Authorization": "Bearer " + sessionStorage.getItem("token")
method: 'post', // },
data: data url: `${config2.baseUrl}app-api/file/uploadTalent`,
method: 'post',
data: data
}) })
} }
...@@ -30,8 +33,8 @@ export function uploadFile(data) { ...@@ -30,8 +33,8 @@ export function uploadFile(data) {
* @param {Object} data * @param {Object} data
*/ */
export function getType(data) { export function getType(data) {
return request({ return request3({
url: `${config.baseUrl}talent/getType`, url: `${config2.baseUrl}app-api/talent/getType`,
method: 'get', method: 'get',
params: data params: data
}) })
...@@ -42,8 +45,8 @@ export function getType(data) { ...@@ -42,8 +45,8 @@ export function getType(data) {
* @param {Object} data * @param {Object} data
*/ */
export function getCategory(data) { export function getCategory(data) {
return request({ return request3({
url: `${config.baseUrl}talent/getCategory`, url: `${config2.baseUrl}app-api/talent/getCategory`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -54,8 +57,8 @@ export function getCategory(data) { ...@@ -54,8 +57,8 @@ export function getCategory(data) {
* @param {Object} data * @param {Object} data
*/ */
export function addBehavior(data) { export function addBehavior(data) {
return request({ return request3({
url: `${config.baseUrl}talent/addBehavior`, url: `${config2.baseUrl}/app-api/talent/addBehavior`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -77,8 +80,8 @@ export function getCategory(data) { ...@@ -77,8 +80,8 @@ export function getCategory(data) {
* 查询用户实名信息 * 查询用户实名信息
*/ */
export function queryUser(data) { export function queryUser(data) {
return request({ return request3({
url: `${config.baseUrl}user/queryUser${formatUrl(data)}`, url: `${config2.baseUrl}app-api/user/queryUser`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -89,8 +92,8 @@ export function getCategory(data) { ...@@ -89,8 +92,8 @@ export function getCategory(data) {
* @param {Object} data * @param {Object} data
*/ */
export function getContent(data) { export function getContent(data) {
return request({ return request3({
url: `${config.baseUrl}talent/getContent`, url: `${config2.baseUrl}app-api/talent/getContent`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -100,8 +103,8 @@ export function getContent(data) { ...@@ -100,8 +103,8 @@ export function getContent(data) {
* 查询详情 * 查询详情
*/ */
export function get(data) { export function get(data) {
return request({ return request3({
url: `${config.baseUrl}talent/get`, url: `${config2.baseUrl}app-api/talent/get`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -110,8 +113,8 @@ export function get(data) { ...@@ -110,8 +113,8 @@ export function get(data) {
* 根据二维码查询详情 * 根据二维码查询详情
*/ */
export function getCodeDetails(data) { export function getCodeDetails(data) {
return request({ return request3({
url: `${config.baseUrl}talent/getCodeDetails`, url: `${config2.baseUrl}app-api/talent/getCodeDetails`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -121,8 +124,8 @@ export function getCodeDetails(data) { ...@@ -121,8 +124,8 @@ export function getCodeDetails(data) {
* 提交/保存 * 提交/保存
*/ */
export function add(data) { export function add(data) {
return request({ return request3({
url: `${config.baseUrl}talent/add`, url: `${config2.baseUrl}app-api/talent/add`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -132,8 +135,8 @@ export function add(data) { ...@@ -132,8 +135,8 @@ export function add(data) {
* 修改提交/保存 * 修改提交/保存
*/ */
export function update(data) { export function update(data) {
return request({ return request3({
url: `${config.baseUrl}talent/update`, url: `${config2.baseUrl}app-api/talent/update`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -143,8 +146,8 @@ export function update(data) { ...@@ -143,8 +146,8 @@ export function update(data) {
* 删除 * 删除
*/ */
export function del(data) { export function del(data) {
return request({ return request3({
url: `${config.baseUrl}talent/delete`, url: `${config2.baseUrl}app-api/talent/delete`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -154,8 +157,8 @@ export function del(data) { ...@@ -154,8 +157,8 @@ export function del(data) {
* 修改状态 * 修改状态
*/ */
export function updateState(data) { export function updateState(data) {
return request({ return request3({
url: `${config.baseUrl}talent/updateState`, url: `${config2.baseUrl}app-api/talent/updateState`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -165,8 +168,8 @@ export function updateState(data) { ...@@ -165,8 +168,8 @@ export function updateState(data) {
* 公式名单 * 公式名单
*/ */
export function getList(data) { export function getList(data) {
return request({ return request3({
url: `${config.baseUrl}talent/getList`, url: `${config2.baseUrl}app-api/talent/getList`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -176,8 +179,8 @@ export function getList(data) { ...@@ -176,8 +179,8 @@ export function getList(data) {
* 查询人才名单 * 查询人才名单
*/ */
export function getPersonnel(data) { export function getPersonnel(data) {
return request({ return request3({
url: `${config.baseUrl}talent/getPersonnel`, url: `${config2.baseUrl}app-api/talent/getPersonnel`,
method: 'post', method: 'post',
data: data data: data
}) })
......
import Vue from "vue";
import axios from "axios";
import { Toast } from "vant";
Vue.use(Toast);
// 配置环境
const env = process.env.NODE_ENV === "development" ? "dev" : "prod";
const baseUrl = {
dev: "http://192.168.3.144:10010/",
// dev: "http://81.69.231.72:10010/",
// dev: "https://www.smart-zj.cn:55901/cert/",
// prod: 'http://81.69.231.72:9090/',
prod: "https://www.smart-zj.cn:55901/cert/",
};
const baseH5 = {
// dev: "http://www.smart-zj.cn:55902/zjh/html/pages/#/",
dev: "http://81.69.44.115/zjh/html/pages2/#/",
// prod: 'http://81.69.44.115/zjh/html/pages/#/',
prod: "http://www.smart-zj.cn:55902/zjh/html/pages/#/",
};
const config2 = {
baseUrl: baseUrl[env],
baseH5: baseH5[env],
// baseUrl: 'http://81.69.231.72:9090/', // 测试
// baseH5: 'http://81.69.44.115/zjh/html/pages/#/', // 测试
// baseUrl: 'https://www.smart-zj.cn:55901/cert/', // 生产
// baseH5: 'http://www.smart-zj.cn:55902/zjh/html/pages/#/', // 生产
baseSocUrl: "https://www.smart-zj.cn:55901/soc/", // 公积金社保
baseServiceUrl: "http://58.217.53.110/epoint-web-zwdt/rest/", // 政务np服务
basePurchase:
"http://zfcg.ggzy.zhenjiang.gov.cn/WebBuilderMobileService/appservice/", // 公共资源采购
};
const request2 = axios.create({
timeout: 30000,
withCredentials: false,
});
request2.interceptors.request.use(
(config) => {
config.headers = {
"Content-Type": "application/json;multipart/form-data;",
"Authorization": "Bearer " + sessionStorage.getItem("token")
};
// alert(JSON.stringify(config.headers))
// if (config.method === 'post') {
// config.data = { ...config.data }
// } else if (config.method === 'get') {
// config.params = { ...config.params }
// }
return config;
},
(error) => {
console.log(error);
return Promise.reject(error);
}
);
request2.interceptors.response.use(
(response) => {
const res = response.data;
if (response.config.url.indexOf(config2.basePurchase) !== -1) {
if (res.EpointDataBody.DATA.ReturnInfo.Status === "True") {
return res;
} else {
Toast(res.EpointDataBody.DATA.ReturnInfo.Description || "网络错误");
return Promise.reject(
new Error(
res.EpointDataBody.DATA.ReturnInfo.Description || "网络错误"
)
);
}
} else if (response.config.url.indexOf(config2.baseServiceUrl) !== -1) {
if (res.status.code === 200) {
return res;
} else {
Toast(res.status.text || "网络错误");
return Promise.reject(new Error(res.status.text || "网络错误"));
}
} else {
// alert(JSON.stringify(res))
if (parseInt(res.code) === 200) {
return res;
} else {
Toast(res.message || res.msg || "网络错误");
return Promise.reject(new Error(res.message || "网络错误"));
}
}
},
(error) => {
Toast.clear();
console.log("err" + error);
Toast(error.message || "网络错误");
return Promise.reject(error);
}
);
const request3 = axios.create({
timeout: 30000,
withCredentials: false,
});
request3.interceptors.request.use(
(config) => {
config.headers = {
"Content-Type": "application/json;multipart/form-data;",
"Authorization": "Bearer " + sessionStorage.getItem("token")
};
// if (config.method === 'post') {
// config.data = { ...config.data }
// } else if (config.method === 'get') {
// config.params = { ...config.params }
// }
return config;
},
(error) => {
console.log(error);
return Promise.reject(error);
}
);
request3.interceptors.response.use(
(response) => {
const res = response.data;
if (response.config.url.indexOf(config2.basePurchase) !== -1) {
if (res.EpointDataBody.DATA.ReturnInfo.Status === "True") {
return res;
} else {
Toast(res.EpointDataBody.DATA.ReturnInfo.Description || "网络错误");
return Promise.reject(
new Error(
res.EpointDataBody.DATA.ReturnInfo.Description || "网络错误"
)
);
}
} else if (response.config.url.indexOf(config2.baseServiceUrl) !== -1) {
if (res.status.code === 200) {
return res;
} else {
Toast(res.status.text || "网络错误");
return Promise.reject(new Error(res.status.text || "网络错误"));
}
} else {
// alert(JSON.stringify(res))
if (parseInt(res.code) === 200) {
return res.data || res.message;
} else {
Toast(res.message || "网络错误");
return Promise.reject(new Error(res.message || "网络错误"));
}
}
},
(error) => {
Toast.clear();
console.log("err" + error);
Toast(error.message || "网络错误");
return Promise.reject(error);
}
);
const formatUrl = (params) => {
let ary = [];
Object.keys(params).map((key) => {
ary.push(encodeURIComponent(key) + "=" + encodeURIComponent(params[key]));
// if (params[key]) {
// ary.push(encodeURIComponent(key) + '=' + encodeURIComponent(params[key]));
// }
});
let urlStr = ary.join("&");
return `?${urlStr}`;
};
export { config2, request2, request3, formatUrl };
...@@ -7,9 +7,8 @@ Vue.use(Toast); ...@@ -7,9 +7,8 @@ Vue.use(Toast);
const env = process.env.NODE_ENV === "development" ? "dev" : "prod"; const env = process.env.NODE_ENV === "development" ? "dev" : "prod";
const baseUrl = { const baseUrl = {
// dev: "http://192.168.3.98:9090/",
// dev: "http://192.168.3.144:9090/", // dev: "http://192.168.3.144:9090/",
dev: "http://81.69.231.72:9090/", dev: "http://81.69.231.72:10010/",
// dev: "https://www.smart-zj.cn:55901/cert/", // dev: "https://www.smart-zj.cn:55901/cert/",
// prod: 'http://81.69.231.72:9090/', // prod: 'http://81.69.231.72:9090/',
...@@ -17,9 +16,9 @@ const baseUrl = { ...@@ -17,9 +16,9 @@ const baseUrl = {
}; };
const baseH5 = { const baseH5 = {
// dev: "http://www.smart-zj.cn:55902/zjh/html/pages/#/", // dev: "http://www.smart-zj.cn:55902/zjh/html/pages/#/",
dev: "http://81.69.44.115/zjh/html/pages/#/", dev: "http://81.69.44.115/zjh/html/pages2/#/",
// prod: 'http://81.69.44.115/zjh/html/pages/#/', // prod: 'http://81.69.44.115/zjh/html/pages/#/',
prod: "http://www.smart-zj.cn:55902/zjh/html/pages/#/", prod: "http://www.smart-zj.cn:55902/zjh/html/pages2/#/",
}; };
const config = { const config = {
baseUrl: baseUrl[env], baseUrl: baseUrl[env],
......
...@@ -1067,7 +1067,7 @@ export default { ...@@ -1067,7 +1067,7 @@ export default {
}, },
]; ];
} }
params.userId = this.userInfo.userId ? this.userInfo.userId : "37393"; // params.userId = this.userInfo.userId ? this.userInfo.userId : "37393";
delete params.idimg; delete params.idimg;
delete params.bankimg; delete params.bankimg;
delete params.certificate; delete params.certificate;
......
...@@ -63,7 +63,7 @@ export default { ...@@ -63,7 +63,7 @@ export default {
mattersGuideGet({ appId: 1234, id: this.id }).then(res => { mattersGuideGet({ appId: 1234, id: this.id }).then(res => {
console.log("详情的res---", res); console.log("详情的res---", res);
this.$toast.clear(); this.$toast.clear();
this.detail = res; this.detail = res.data;
}); });
}, },
report() { report() {
...@@ -121,6 +121,8 @@ export default { ...@@ -121,6 +121,8 @@ export default {
} }
sessionStorage.setItem("ZJCD-UserInfo", res); sessionStorage.setItem("ZJCD-UserInfo", res);
this.userInfo = userInfo; this.userInfo = userInfo;
sessionStorage.setItem('token', this.userInfo.token),
// alert(sessionStorage.getItem("token"))
this.init() this.init()
}, },
}, },
......
...@@ -537,8 +537,10 @@ import { ...@@ -537,8 +537,10 @@ import {
updateDeedTaxState, updateDeedTaxState,
queryUserApplyForRecord, queryUserApplyForRecord,
queryApplyingDeedTaxInfo, queryApplyingDeedTaxInfo,
idCardVerification
} from "@/api/deedtax.js"; } from "@/api/deedtax.js";
import { decryptByDES, encryptByDES } from "@/utils/utils"; // import { decryptByDES, encryptByDES } from "@/utils/utils";
import { decryptByDES } from "@/utils/utils";
Vue.use(Button) Vue.use(Button)
.use(Tab) .use(Tab)
...@@ -749,68 +751,72 @@ export default { ...@@ -749,68 +751,72 @@ export default {
}); });
}, },
jump() { jump() {
// console.log(this.code); idCardVerification({idCard: this.userInfo.idCardNo}).then((res) => {
// // console.log(decryptByDES(this.code, "MnuYbhGv")); if (res.data) {
// console.log(this.userInfo); let newCard = decryptByDES(this.userInfo.idCardNo, "MnuYbhGv");
let newCard = decryptByDES(this.userInfo.idCardNo, "MnuYbhGv"); console.log(newCard);
console.log(newCard); let params = {
let params = { idCard: newCard,
userId: encryptByDES(this.userInfo.userId, "MnuYbhGv"), };
idCard: newCard, queryUserApplyForRecord(params).then((res) => {
}; console.log(res);
// alert(JSON.stringify(params)) // alert(JSON.stringify(res))
if (res.code == 200) {
queryUserApplyForRecord(params).then((res) => { if (res.data.state == 0) {
console.log(res); this.$router.replace({
// alert(JSON.stringify(res)) name: "DeedtaxDeclare",
if (res.code == 200) { query: { code: this.code },
if (res.data.state == 0) { });
this.$router.replace({ } else if (res.data.state == 2) {
name: "DeedtaxDeclare", Dialog.confirm({
query: { code: this.code }, confirmButtonText: "申报",
}); message: res.data.msg || "您已享受契税补贴,是否再次申报?",
} else if (res.data.state == 2) { }).then(() => {
Dialog.confirm({ this.$router.push({ name: "DeedtaxDeclare" });
confirmButtonText: "申报", });
message: res.data.msg || "您已享受契税补贴,是否再次申报?", } else if (res.data.state == 1) {
}).then(() => { Dialog.confirm({
this.$router.push({ name: "DeedtaxDeclare" }); confirmButtonText: "查看",
}); message: res.data.msg || "您的申请已提交",
} else if (res.data.state == 1) { }).then(() => {
Dialog.confirm({ queryApplyingDeedTaxInfo({
confirmButtonText: "查看", code: "",
message: res.data.msg || "您的申请已提交", idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv"),
}).then(() => { name: "",
queryApplyingDeedTaxInfo({ pageNum: 1,
code: "", pageSize: 10,
idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv"), state: 0,
name: "", // userId: "",
pageNum: 1, }).then((res) => {
pageSize: 10, // alert(JSON.stringify(res))
state: 0, console.log(res);
userId: "", // this.$router.push({ name: 'DeedtaxHandling', query: { code: res.data.code } })
}).then((res) => { this.code = res.data.code;
// alert(JSON.stringify(res)) this.init();
console.log(res); });
// this.$router.push({ name: 'DeedtaxHandling', query: { code: res.data.code } }) });
this.code = res.data.code; } else if (res.data.state == 11) {
this.init(); console.log(111);
}); Dialog.confirm({
}); confirmButtonText: "查看",
} else if (res.data.state == 11) { message: res.data.msg || "您的申请已提交",
console.log(111); }).then(() => {
Dialog.confirm({ this.$router.push({
confirmButtonText: "查看", name: "PolicyReportTwo",
message: res.data.msg || "您的申请已提交", query: { code: res.data.code },
}).then(() => { });
this.$router.push({ });
name: "PolicyReportTwo", }
query: { code: res.data.code }, }
}); });
}); } else {
} Dialog.confirm({
title: '提示',
messageAlign: 'left',
message: "经系统查询,您已享受过相关政策补贴 ,不能再次申报契税补贴政策。如有异议请联系市财政窗口,地址:镇江市政务服务中心(冠城路8号工人大厦)二楼市财政局窗口,联系电话:0511-89881850",
})
} }
}); })
// this.$router.replace({ name: 'DeedtaxDeclare', query: { code: this.code } }) // this.$router.replace({ name: 'DeedtaxDeclare', query: { code: this.code } })
}, },
// 初始化获取userInfo // 初始化获取userInfo
......
...@@ -142,6 +142,7 @@ import { ...@@ -142,6 +142,7 @@ import {
queryListDeedTaxInfoByUserId, queryListDeedTaxInfoByUserId,
queryUserApplyForRecord, queryUserApplyForRecord,
queryApplyingDeedTaxInfo, queryApplyingDeedTaxInfo,
idCardVerification
} from "@/api/deedtax.js"; } from "@/api/deedtax.js";
import { decryptByDES, encryptByDES } from "@/utils/utils"; import { decryptByDES, encryptByDES } from "@/utils/utils";
Vue.use(Step) Vue.use(Step)
...@@ -164,67 +165,72 @@ export default { ...@@ -164,67 +165,72 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 20, pageSize: 20,
state: null, state: null,
userId: "", // userId: "",
}, },
}; };
}, },
methods: { methods: {
go() { go() {
// alert(JSON.stringify(this.userInfo)) idCardVerification({idCard: this.userInfo.idCardNo}).then((res) => {
let params = { if (res.data) {
userId: this.userInfo.userId, let params = {
idCard: encryptByDES(this.userInfo.idCardNo, "MnuYbhGv"), idCard: encryptByDES(this.userInfo.idCardNo, "MnuYbhGv"),
}; };
// alert(JSON.stringify(params)) queryUserApplyForRecord(params).then((res) => {
queryUserApplyForRecord(params).then((res) => { if (res.code == 200) {
console.log(res); if (res.data.state == 0) {
// alert(JSON.stringify(res)) this.$router.push({ name: "DeedtaxDeclare" });
if (res.code == 200) { } else if (res.data.state == 2) {
if (res.data.state == 0) { Dialog.confirm({
this.$router.push({ name: "DeedtaxDeclare" }); confirmButtonText: "申报",
} else if (res.data.state == 2) { message: res.data.msg || "您已享受契税补贴,是否再次申报?",
Dialog.confirm({ }).then(() => {
confirmButtonText: "申报", this.$router.push({ name: "DeedtaxDeclare" });
message: res.data.msg || "您已享受契税补贴,是否再次申报?", });
}).then(() => { } else if (res.data.state == 1) {
this.$router.push({ name: "DeedtaxDeclare" }); Dialog.confirm({
}); confirmButtonText: "查看",
} else if (res.data.state == 1) { message: res.data.msg || "您的申请已提交",
Dialog.confirm({ }).then(() => {
confirmButtonText: "查看", queryApplyingDeedTaxInfo({
message: res.data.msg || "您的申请已提交", code: "",
}).then(() => { idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv"),
queryApplyingDeedTaxInfo({ name: "",
code: "", pageNum: 1,
idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv"), pageSize: 10,
name: "", state: 0,
pageNum: 1, userId: "",
pageSize: 10, }).then((res) => {
state: 0, // alert(JSON.stringify(res))
userId: "", console.log(res);
}).then((res) => { this.$router.push({
// alert(JSON.stringify(res)) name: "DeedtaxHandling",
console.log(res); query: { code: res.data.code },
this.$router.push({ });
name: "DeedtaxHandling", });
query: { code: res.data.code }, });
} else if (res.data.state == 11) {
console.log(111);
Dialog.confirm({
confirmButtonText: "查看",
message: res.data.msg || "您的申请已提交",
}).then(() => {
this.$router.push({
name: "PolicyReportTwo",
query: { code: res.data.code },
});
}); });
}); }
}); }
} else if (res.data.state == 11) { });
console.log(111); } else {
Dialog.confirm({ Dialog.confirm({
confirmButtonText: "查看", title: '提示',
message: res.data.msg || "您的申请已提交", messageAlign: 'left',
}).then(() => { message: "经系统查询,您已享受过相关政策补贴 ,不能再次申报契税补贴政策。如有异议请联系市财政窗口,地址:镇江市政务服务中心(冠城路8号工人大厦)二楼市财政局窗口,联系电话:0511-89881850",
this.$router.push({ })
name: "PolicyReportTwo",
query: { code: res.data.code },
});
});
}
} }
}); })
}, },
change(val) { change(val) {
console.log(val); console.log(val);
...@@ -247,7 +253,7 @@ export default { ...@@ -247,7 +253,7 @@ export default {
this.init(); this.init();
}, },
init() { init() {
this.params.userId = encryptByDES(this.userInfo.userId, "MnuYbhGv"); // this.params.userId = encryptByDES(this.userInfo.userId, "MnuYbhGv");
queryListDeedTaxInfoByUserId(this.params).then((res) => { queryListDeedTaxInfoByUserId(this.params).then((res) => {
console.log(res); console.log(res);
this.mockData = res.data.list; this.mockData = res.data.list;
......
...@@ -32,7 +32,7 @@ import { ...@@ -32,7 +32,7 @@ import {
/*mattersById,*/ mattersByUserId, /*mattersById,*/ mattersByUserId,
mattersGuideGet mattersGuideGet
} from "@/api/policy"; } from "@/api/policy";
import {queryUserApplyForRecord,queryApplyingDeedTaxInfo} from '@/api/deedtax' import {queryUserApplyForRecord,queryApplyingDeedTaxInfo,idCardVerification} from '@/api/deedtax'
import { decryptByDES } from "@/utils/utils"; import { decryptByDES } from "@/utils/utils";
import imgUrl from "@/assets/policy/banner.png"; import imgUrl from "@/assets/policy/banner.png";
...@@ -185,58 +185,67 @@ export default { ...@@ -185,58 +185,67 @@ export default {
this.detail.matterType === 5 || this.detail.matterType === 5 ||
this.detail.matterType === 6 this.detail.matterType === 6
) { ) {
let params = { idCardVerification({idCard: this.userInfo.idCardNo}).then((res) => {
userId: this.userInfo.userId, if (res.data) {
// idCard: this.userInfo.idCardNo let params = {
idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv") // userId: this.userInfo.userId,
} // idCard: this.userInfo.idCardNo
// alert(JSON.stringify(params)) idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv")
queryUserApplyForRecord(params).then((res) => {
console.log(res)
// alert(JSON.stringify(res))
if (res.code == 200) {
if (res.data.state == 0) {
// 人才“镇兴”行动购住房契税补贴(住宅)||人才“镇兴”行动购住房契税补贴(商办)
this.$router.push({
name: "HousePurchase",
query: {
departmentCode: this.detail.departmentCode,
guideId: this.detail.id,
talentCode: this.talentCode,
matterType: this.detail.matterType,
type: "add"
}
});
} else if (res.data.state == 1) {
Dialog.confirm({
confirmButtonText: '查看',
message: res.data.msg || '您的申请已提交',
}).then(() => {
queryApplyingDeedTaxInfo({
code: "",
idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv"),
name: "",
pageNum: 1,
pageSize: 10,
state: 0,
userId: ""
}).then((res) => {
console.log(res)
this.$router.push({ name: 'DeedtaxHandling', query: { code: res.data.code } })
})
})
} else if (res.data.state == 11) {
console.log(111)
Dialog.confirm({
confirmButtonText: '查看',
message: res.data.msg || '您的申请已提交',
}).then(() => {
this.$router.push({ name: 'PolicyReportTwo', query: { code: res.data.code } })
})
} }
// alert(JSON.stringify(params))
queryUserApplyForRecord(params).then((res) => {
console.log(res)
// alert(JSON.stringify(res))
if (res.code == 200) {
if (res.data.state == 0) {
// 人才“镇兴”行动购住房契税补贴(住宅)||人才“镇兴”行动购住房契税补贴(商办)
this.$router.push({
name: "HousePurchase",
query: {
departmentCode: this.detail.departmentCode,
guideId: this.detail.id,
talentCode: this.talentCode,
matterType: this.detail.matterType,
type: "add"
}
});
} else if (res.data.state == 1) {
Dialog.confirm({
confirmButtonText: '查看',
message: res.data.msg || '您的申请已提交',
}).then(() => {
queryApplyingDeedTaxInfo({
code: "",
idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv"),
name: "",
pageNum: 1,
pageSize: 10,
state: 0,
userId: ""
}).then((res) => {
console.log(res)
this.$router.push({ name: 'DeedtaxHandling', query: { code: res.data.code } })
})
})
} else if (res.data.state == 11) {
console.log(111)
Dialog.confirm({
confirmButtonText: '查看',
message: res.data.msg || '您的申请已提交',
}).then(() => {
this.$router.push({ name: 'PolicyReportTwo', query: { code: res.data.code } })
})
}
}
})
} else {
Dialog.confirm({
title: '提示',
messageAlign: 'left',
message: "经系统查询,您已享受过相关政策补贴 ,不能再次申报契税补贴政策。如有异议请联系市财政窗口,地址:镇江市政务服务中心(冠城路8号工人大厦)二楼市财政局窗口,联系电话:0511-89881850",
})
} }
}) })
} }
} }
} }
......
...@@ -75,7 +75,7 @@ import Vue from "vue"; ...@@ -75,7 +75,7 @@ import Vue from "vue";
import { Tab, Tabs, PullRefresh, List, Search, Button,Dialog } from "vant"; import { Tab, Tabs, PullRefresh, List, Search, Button,Dialog } from "vant";
import { mattersHousingList, mattersHousingUpdateState } from "@/api/policy"; import { mattersHousingList, mattersHousingUpdateState } from "@/api/policy";
import { policyEnume } from "@/utils/utils"; import { policyEnume } from "@/utils/utils";
import {queryUserApplyForRecord,queryApplyingDeedTaxInfo} from '@/api/deedtax' import {queryUserApplyForRecord,queryApplyingDeedTaxInfo,idCardVerification} from '@/api/deedtax'
import { decryptByDES,encryptByDES } from "@/utils/utils"; import { decryptByDES,encryptByDES } from "@/utils/utils";
Vue.use(Tab) Vue.use(Tab)
...@@ -191,81 +191,83 @@ export default { ...@@ -191,81 +191,83 @@ export default {
}, },
// 修改 // 修改
update(record) { update(record) {
let params = { idCardVerification({idCard: this.userInfo.idCardNo}).then((res) => {
userId: this.userInfo.userId, if (res.data) {
// idCard: this.userInfo.idCardNo let params = {
idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv") // userId: this.userInfo.userId,
} // idCard: this.userInfo.idCardNo
// alert(JSON.stringify(params)) idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv")
queryUserApplyForRecord(params).then((res) => {
console.log(res)
// alert(JSON.stringify(res))
if (res.code == 200) {
if (res.data.state == 0) {
// 人才“镇兴”行动购住房契税补贴(住宅)||人才“镇兴”行动购住房契税补贴(商办)
this.$router.push({
name: "HousePurchase",
query: {
code: record.code,
matterType: record.housingType === 2 ? 5 : 6,
type: "edit"
}
});
// this.$router.push({
// name: "HousePurchase",
// query: {
// departmentCode: this.detail.departmentCode,
// guideId: this.detail.id,
// talentCode: this.talentCode,
// matterType: this.detail.matterType,
// type: "add"
// }
// });
} else if (res.data.state == 1) {
Dialog.confirm({
confirmButtonText: '查看',
message: res.data.msg || '您的申请已提交',
}).then(() => {
queryApplyingDeedTaxInfo({
code: "",
idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv"),
name: "",
pageNum: 1,
pageSize: 10,
state: 0,
userId: ""
}).then((res) => {
console.log(res)
this.$router.push({ name: 'DeedtaxHandling', query: { code: res.data.code } })
})
})
} else if (res.data.state == 11) {
console.log(111)
Dialog.confirm({
confirmButtonText: '查看',
message: res.data.msg || '您的申请已提交',
}).then(() => {
// this.$router.push({ name: 'PolicyReportTwo', query: { code: res.data.code } })
this.$router.push({
name: "HousePurchase",
query: {
code: record.code,
matterType: record.housingType === 2 ? 5 : 6,
type: "edit"
}
});
})
} }
// alert(JSON.stringify(params))
queryUserApplyForRecord(params).then((res) => {
console.log(res)
// alert(JSON.stringify(res))
if (res.code == 200) {
if (res.data.state == 0) {
// 人才“镇兴”行动购住房契税补贴(住宅)||人才“镇兴”行动购住房契税补贴(商办)
this.$router.push({
name: "HousePurchase",
query: {
code: record.code,
matterType: record.housingType === 2 ? 5 : 6,
type: "edit"
}
});
// this.$router.push({
// name: "HousePurchase",
// query: {
// departmentCode: this.detail.departmentCode,
// guideId: this.detail.id,
// talentCode: this.talentCode,
// matterType: this.detail.matterType,
// type: "add"
// }
// });
} else if (res.data.state == 1) {
Dialog.confirm({
confirmButtonText: '查看',
message: res.data.msg || '您的申请已提交',
}).then(() => {
queryApplyingDeedTaxInfo({
code: "",
idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv"),
name: "",
pageNum: 1,
pageSize: 10,
state: 0,
userId: ""
}).then((res) => {
console.log(res)
this.$router.push({ name: 'DeedtaxHandling', query: { code: res.data.code } })
})
})
} else if (res.data.state == 11) {
console.log(111)
Dialog.confirm({
confirmButtonText: '查看',
message: res.data.msg || '您的申请已提交',
}).then(() => {
// this.$router.push({ name: 'PolicyReportTwo', query: { code: res.data.code } })
this.$router.push({
name: "HousePurchase",
query: {
code: record.code,
matterType: record.housingType === 2 ? 5 : 6,
type: "edit"
}
});
})
}
}
})
} else {
Dialog.confirm({
title: '提示',
messageAlign: 'left',
message: "经系统查询,您已享受过相关政策补贴 ,不能再次申报契税补贴政策。如有异议请联系市财政窗口,地址:镇江市政务服务中心(冠城路8号工人大厦)二楼市财政局窗口,联系电话:0511-89881850",
})
} }
}) })
// this.$router.push({
// name: "HousePurchase",
// query: {
// code: record.code,
// matterType: record.housingType === 2 ? 5 : 6,
// type: "edit"
// }
// });
}, },
handleChange(index) { handleChange(index) {
this.currentPage = index; this.currentPage = index;
......
...@@ -123,30 +123,31 @@ export default { ...@@ -123,30 +123,31 @@ export default {
}).then((res) => { }).then((res) => {
this.isolatedState = res.data.data ? res.data.data : '' this.isolatedState = res.data.data ? res.data.data : ''
this.riskArea = res.data.message ? res.data.message : '' this.riskArea = res.data.message ? res.data.message : ''
axios({ // axios({
url: 'https://appointment.smart-zj.cn/applet/applet/epidemic/queryHealthCodeColor', // url: 'https://appointment.smart-zj.cn/applet/applet/epidemic/queryHealthCodeColor',
methods: 'get', // methods: 'get',
headers: { // headers: {
"Content-Type": "application/json", // "Content-Type": "application/json",
}, // },
params: { // params: {
idCard: params.idCard, // idCard: params.idCard,
name: params.uploadName // name: params.uploadName
} // }
}).then((res) => { // }).then((res) => {
this.healthType = res.data.data.levelData ? res.data.data.levelData : '4' // this.healthType = res.data.data.levelData ? res.data.data.levelData : '4'
this.healthType = '1'
this.upLoad() this.upLoad()
}).catch(err => { // }).catch(err => {
if (err.data.status == 500) { // if (err.data.status == 500) {
this.upLoad() // this.upLoad()
} else { // } else {
this.$toast.clear(); // this.$toast.clear();
this.$dialog.confirm({ // this.$dialog.confirm({
message: "服务异常,请稍后重试", // message: "服务异常,请稍后重试",
showCancelButton: false, // showCancelButton: false,
}) // })
} // }
}) // })
}).catch(() => { }).catch(() => {
this.$toast.clear(); this.$toast.clear();
this.$dialog.confirm({ this.$dialog.confirm({
......
...@@ -37,6 +37,7 @@ import Vue from "vue"; ...@@ -37,6 +37,7 @@ import Vue from "vue";
import { Field, Button, CellGroup, Form, Overlay } from "vant"; import { Field, Button, CellGroup, Form, Overlay } from "vant";
// import BaiDuMap from "@/components/baidumap/Main.vue"; // import BaiDuMap from "@/components/baidumap/Main.vue";
import { addPermitStatistics, queryCacheUser, isManageUser } from "@/api/epidemic"; import { addPermitStatistics, queryCacheUser, isManageUser } from "@/api/epidemic";
import { config } from "@/utils/request";
Vue.use(Field).use(Button).use(CellGroup).use(Form).use(Overlay); Vue.use(Field).use(Button).use(CellGroup).use(Form).use(Overlay);
export default { export default {
components: { components: {
...@@ -247,7 +248,7 @@ export default { ...@@ -247,7 +248,7 @@ export default {
window.AlipayJSBridge.call("popWindow"); window.AlipayJSBridge.call("popWindow");
}); });
} else if (whatWebView() === "wetchat") { } else if (whatWebView() === "wetchat") {
let link = 'http://www.smart-zj.cn:55902/zjh/html/pages/#/report/index' + '?area=' + this.area + '&address=' + this.address + '&place=' + this.place + '&permitCode=' + this.permitCode let link = `${config.baseH5}report/index` + '?area=' + this.area + '&address=' + this.address + '&place=' + this.place + '&permitCode=' + this.permitCode
location.replace(link); location.replace(link);
} else if ( } else if (
window.android?.getUserInfo || window.android?.getUserInfo ||
......
...@@ -175,52 +175,53 @@ export default { ...@@ -175,52 +175,53 @@ export default {
}).then((res) => { }).then((res) => {
this.isolatedState = res.data.data ? res.data.data : '' this.isolatedState = res.data.data ? res.data.data : ''
this.riskArea = res.data.message ? res.data.message : '' this.riskArea = res.data.message ? res.data.message : ''
axios({ // axios({
url: 'https://appointment.smart-zj.cn/applet/applet/epidemic/queryHealthCodeColor', // url: 'https://appointment.smart-zj.cn/applet/applet/epidemic/queryHealthCodeColor',
methods: 'get', // methods: 'get',
headers: { // headers: {
"Content-Type": "application/json", // "Content-Type": "application/json",
}, // },
params: { // params: {
idCard: params.idCard, // idCard: params.idCard,
name: params.uploadName // name: params.uploadName
} // }
}).then((res) => { // }).then((res) => {
if (res.data.status == 550) { // if (res.data.status == 550) {
this.$toast.clear(); // this.$toast.clear();
this.$dialog.confirm({ // this.$dialog.confirm({
message: "请填写正确的身份信息", // message: "请填写正确的身份信息",
showCancelButton: false, // showCancelButton: false,
}) // })
} else { // } else {
this.healthType = res.data.data.levelData ? res.data.data.levelData : '' // this.healthType = res.data.data.levelData ? res.data.data.levelData : ''
if (res.data.data.code == 407) { // if (res.data.data.code == 407) {
this.$toast.clear(); // this.$toast.clear();
this.$dialog.confirm({ // this.$dialog.confirm({
message: "请先更新苏康码再进行填报", // message: "请先更新苏康码再进行填报",
showCancelButton: false, // showCancelButton: false,
}) // })
}else if (res.data.data.code == 404) { // }else if (res.data.data.code == 404) {
this.$toast.clear(); // this.$toast.clear();
this.$dialog.confirm({ // this.$dialog.confirm({
message: "请先申领苏康码再进行填报", // message: "请先申领苏康码再进行填报",
showCancelButton: false, // showCancelButton: false,
}) // })
} else { // } else {
this.healthType = '1'
this.upLoad() this.upLoad()
} // }
} // }
}).catch(err => { // }).catch(err => {
if(err.data.status == 500) { // if(err.data.status == 500) {
this.upLoad() // this.upLoad()
} else { // } else {
this.$toast.clear(); // this.$toast.clear();
this.$dialog.confirm({ // this.$dialog.confirm({
message: "服务异常,请稍后重试", // message: "服务异常,请稍后重试",
showCancelButton: false, // showCancelButton: false,
}) // })
} // }
}) // })
}).catch(() => { }).catch(() => {
this.$toast.clear(); this.$toast.clear();
this.$dialog.confirm({ this.$dialog.confirm({
......
...@@ -166,52 +166,53 @@ export default { ...@@ -166,52 +166,53 @@ export default {
}).then((res) => { }).then((res) => {
this.isolatedState = res.data.data ? res.data.data : '0' this.isolatedState = res.data.data ? res.data.data : '0'
this.riskArea = res.data.message ? res.data.message : '' this.riskArea = res.data.message ? res.data.message : ''
axios({ // axios({
url: 'https://appointment.smart-zj.cn/applet/applet/epidemic/queryHealthCodeColor', // url: 'https://appointment.smart-zj.cn/applet/applet/epidemic/queryHealthCodeColor',
methods: 'get', // methods: 'get',
headers: { // headers: {
"Content-Type": "application/json", // "Content-Type": "application/json",
}, // },
params: { // params: {
idCard: params.idCard, // idCard: params.idCard,
name: params.realUserName // name: params.realUserName
} // }
}).then((res) => { // }).then((res) => {
if (res.data.status == 550) { // if (res.data.status == 550) {
this.$toast.clear(); // this.$toast.clear();
this.$dialog.confirm({ // this.$dialog.confirm({
message: "请填写正确的身份信息", // message: "请填写正确的身份信息",
showCancelButton: false, // showCancelButton: false,
}) // })
} else { // } else {
this.healthType = res.data.data.levelData ? res.data.data.levelData : '' // this.healthType = res.data.data.levelData ? res.data.data.levelData : ''
if (res.data.data.code == 407) { // if (res.data.data.code == 407) {
this.$toast.clear(); // this.$toast.clear();
this.$dialog.confirm({ // this.$dialog.confirm({
message: "请先更新苏康码再进行填报", // message: "请先更新苏康码再进行填报",
showCancelButton: false, // showCancelButton: false,
}) // })
} else if (res.data.data.code == 404) { // } else if (res.data.data.code == 404) {
this.$toast.clear(); // this.$toast.clear();
this.$dialog.confirm({ // this.$dialog.confirm({
message: "请先申领苏康码再进行填报", // message: "请先申领苏康码再进行填报",
showCancelButton: false, // showCancelButton: false,
}) // })
} else { // } else {
this.healthType = '1'
this.upLoad() this.upLoad()
} // }
} // }
}).catch(err => { // }).catch(err => {
if (err.data.status == 500) { // if (err.data.status == 500) {
this.upLoad() // this.upLoad()
} else { // } else {
this.$toast.clear(); // this.$toast.clear();
this.$dialog.confirm({ // this.$dialog.confirm({
message: "服务异常,请稍后重试", // message: "服务异常,请稍后重试",
showCancelButton: false, // showCancelButton: false,
}) // })
} // }
}) // })
}).catch(() => { }).catch(() => {
this.$toast.clear(); this.$toast.clear();
this.$dialog.confirm({ this.$dialog.confirm({
......
...@@ -151,52 +151,53 @@ export default { ...@@ -151,52 +151,53 @@ export default {
}).then((res) => { }).then((res) => {
this.isolatedState = res.data.data ? res.data.data : '' this.isolatedState = res.data.data ? res.data.data : ''
this.riskArea = res.data.message ? res.data.message : '' this.riskArea = res.data.message ? res.data.message : ''
axios({ // axios({
url: 'https://appointment.smart-zj.cn/applet/applet/epidemic/queryHealthCodeColor', // url: 'https://appointment.smart-zj.cn/applet/applet/epidemic/queryHealthCodeColor',
methods: 'get', // methods: 'get',
headers: { // headers: {
"Content-Type": "application/json", // "Content-Type": "application/json",
}, // },
params: { // params: {
idCard: params.idCard, // idCard: params.idCard,
name: params.uploadName // name: params.uploadName
} // }
}).then((res) => { // }).then((res) => {
if (res.data.status == 550) { // if (res.data.status == 550) {
this.$toast.clear(); // this.$toast.clear();
this.$dialog.confirm({ // this.$dialog.confirm({
message: "请填写正确的身份信息", // message: "请填写正确的身份信息",
showCancelButton: false, // showCancelButton: false,
}) // })
} else { // } else {
this.healthType = res.data.data.levelData ? res.data.data.levelData : '' // this.healthType = res.data.data.levelData ? res.data.data.levelData : ''
if (res.data.data.code == 407) { // if (res.data.data.code == 407) {
this.$toast.clear(); // this.$toast.clear();
this.$dialog.confirm({ // this.$dialog.confirm({
message: "请先更新苏康码再进行填报", // message: "请先更新苏康码再进行填报",
showCancelButton: false, // showCancelButton: false,
}) // })
} else if (res.data.data.code == 404) { // } else if (res.data.data.code == 404) {
this.$toast.clear(); // this.$toast.clear();
this.$dialog.confirm({ // this.$dialog.confirm({
message: "请先申领苏康码再进行填报", // message: "请先申领苏康码再进行填报",
showCancelButton: false, // showCancelButton: false,
}) // })
} else { // } else {
this.healthType = '1'
this.upLoad1() this.upLoad1()
} // }
} // }
}).catch(err => { // }).catch(err => {
if (err.data.status == 500) { // if (err.data.status == 500) {
this.upLoad1() // this.upLoad1()
} else { // } else {
this.$toast.clear(); // this.$toast.clear();
this.$dialog.confirm({ // this.$dialog.confirm({
message: "服务异常,请稍后重试", // message: "服务异常,请稍后重试",
showCancelButton: false, // showCancelButton: false,
}) // })
} // }
}) // })
}).catch(() => { }).catch(() => {
this.$toast.clear(); this.$toast.clear();
this.$dialog.confirm({ this.$dialog.confirm({
......
...@@ -270,38 +270,38 @@ export default { ...@@ -270,38 +270,38 @@ export default {
}) })
// this.form.idCard = JSON.parse(JSON.stringify(this.idCard)) // this.form.idCard = JSON.parse(JSON.stringify(this.idCard))
this.form.idCard = encryptByDES(JSON.parse(JSON.stringify(this.idCard)), "MnuYbhGv"); this.form.idCard = encryptByDES(JSON.parse(JSON.stringify(this.idCard)), "MnuYbhGv");
axios({ // axios({
url: 'https://appointment.smart-zj.cn/applet/applet/epidemic/queryHealthCodeColor', // url: 'https://appointment.smart-zj.cn/applet/applet/epidemic/queryHealthCodeColor',
methods: 'get', // methods: 'get',
headers: { // headers: {
"Content-Type": "application/json", // "Content-Type": "application/json",
}, // },
params: { // params: {
idCard: this.form.idCard, // idCard: this.form.idCard,
name: this.form.name // name: this.form.name
} // }
}).then((res) => { // }).then((res) => {
// alert(JSON.stringify(res)) // // alert(JSON.stringify(res))
if (res.data.status == 550) { // if (res.data.status == 550) {
a.clear(); // a.clear();
this.$dialog.confirm({ // this.$dialog.confirm({
message: "请填写正确的身份信息", // message: "请填写正确的身份信息",
showCancelButton: false, // showCancelButton: false,
}) // })
} else { // } else {
if (res.data.data.code == 407) { // if (res.data.data.code == 407) {
a.clear(); // a.clear();
this.$dialog.confirm({ // this.$dialog.confirm({
message: "请先更新苏康码再进行填报", // message: "请先更新苏康码再进行填报",
showCancelButton: false, // showCancelButton: false,
}) // })
} else if (res.data.data.code == 404) { // } else if (res.data.data.code == 404) {
a.clear(); // a.clear();
this.$dialog.confirm({ // this.$dialog.confirm({
message: res.data.data.maessage || "请先申领苏康码再进行填报", // message: res.data.data.maessage || "请先申领苏康码再进行填报",
showCancelButton: false, // showCancelButton: false,
}) // })
} else { // } else {
if (JSON.parse(sessionStorage.getItem("code"))) { if (JSON.parse(sessionStorage.getItem("code"))) {
this.form.code = JSON.parse(sessionStorage.getItem("code")) this.form.code = JSON.parse(sessionStorage.getItem("code"))
updateUserPermitCode(this.form).then((res) => { updateUserPermitCode(this.form).then((res) => {
...@@ -334,50 +334,50 @@ export default { ...@@ -334,50 +334,50 @@ export default {
this.$toast.file(err.message) this.$toast.file(err.message)
}) })
} }
} // }
} // }
}).catch(err => { // }).catch(err => {
if (err.data.status == 500) { // if (err.data.status == 500) {
if (JSON.parse(sessionStorage.getItem("code"))) { // if (JSON.parse(sessionStorage.getItem("code"))) {
this.form.code = JSON.parse(sessionStorage.getItem("code")) // this.form.code = JSON.parse(sessionStorage.getItem("code"))
updateUserPermitCode(this.form).then((res) => { // updateUserPermitCode(this.form).then((res) => {
a.clear() // a.clear()
if (res.code == 200) { // if (res.code == 200) {
this.$toast.success(res.data) // this.$toast.success(res.data)
if (this.type == 0) { // if (this.type == 0) {
this.$router.replace({ name: 'ReverseGrDetail' }) // this.$router.replace({ name: 'ReverseGrDetail' })
} else { // } else {
this.$router.replace({ name: 'ReverseJrList' }) // this.$router.replace({ name: 'ReverseJrList' })
} // }
} // }
}).catch((err) => { // }).catch((err) => {
a.clear() // a.clear()
this.$toast.file(err.message) // this.$toast.file(err.message)
}) // })
} else { // } else {
addUserPermitCode(this.form).then((res) => { // addUserPermitCode(this.form).then((res) => {
a.clear() // a.clear()
if (res.code == 200) { // if (res.code == 200) {
this.$toast.success(res.data) // this.$toast.success(res.data)
if (this.type == 0) { // if (this.type == 0) {
this.$router.replace({ name: 'ReverseGrDetail' }) // this.$router.replace({ name: 'ReverseGrDetail' })
} else { // } else {
this.$router.replace({ name: 'ReverseJrList' }) // this.$router.replace({ name: 'ReverseJrList' })
} // }
} // }
}).catch((err) => { // }).catch((err) => {
a.clear() // a.clear()
this.$toast.file(err.message) // this.$toast.file(err.message)
}) // })
} // }
} else { // } else {
a.clear() // a.clear()
this.$dialog.confirm({ // this.$dialog.confirm({
message: "服务异常,请稍后重试", // message: "服务异常,请稍后重试",
showCancelButton: false, // showCancelButton: false,
}) // })
} // }
}) // })
}, },
// 初始化获取userInfo // 初始化获取userInfo
JSBgetUserInfo() { JSBgetUserInfo() {
......
...@@ -190,7 +190,8 @@ import { ...@@ -190,7 +190,8 @@ import {
} from "vant"; } from "vant";
import { get, getList, del, querySfbUserInfo } from "@/api/talents"; import { get, getList, del, querySfbUserInfo } from "@/api/talents";
import { config } from "@/utils/request"; import { config } from "@/utils/request";
import { encryptByDES,decryptByDES } from "@/utils/utils"; // import { encryptByDES,decryptByDES } from "@/utils/utils";
import { decryptByDES } from "@/utils/utils";
Vue.use(Button) Vue.use(Button)
.use(Picker) .use(Picker)
...@@ -246,12 +247,11 @@ export default { ...@@ -246,12 +247,11 @@ export default {
// alert(this.userInfo) // alert(this.userInfo)
get({ get({
appId: 1234, appId: 1234,
// userId: this.userInfo.userId, // userId: encryptByDES(this.userInfo.userId.toString(), "MnuYbhGv"),
userId: encryptByDES(this.userInfo.userId.toString(), "MnuYbhGv"),
idCard: this.userInfo.idCardNo ? decryptByDES(this.userInfo.idCardNo, "MnuYbhGv") : null idCard: this.userInfo.idCardNo ? decryptByDES(this.userInfo.idCardNo, "MnuYbhGv") : null
}).then((res) => { }).then((res) => {
console.log("res------", res); console.log("res------", res);
// alert(JSON.stringify(res))
this.$toast.clear(); this.$toast.clear();
if (!res) { if (!res) {
// 说明还未申请过人才码 // 说明还未申请过人才码
...@@ -494,6 +494,7 @@ export default { ...@@ -494,6 +494,7 @@ export default {
} }
sessionStorage.setItem("ZJCD-UserInfo", res); sessionStorage.setItem("ZJCD-UserInfo", res);
this.userInfo = userInfo; this.userInfo = userInfo;
sessionStorage.setItem('token', this.userInfo.token),
this.init(); this.init();
}, },
callPhone(branchPhone) { callPhone(branchPhone) {
......
...@@ -128,10 +128,11 @@ export default { ...@@ -128,10 +128,11 @@ export default {
methods: { methods: {
onIndustryConfirm(value, index) { onIndustryConfirm(value, index) {
this.industry.name = value; this.industry.name = value;
this.industry.code = this.industryList[index].typeCode; this.industry.code = this.industryList[index].code;
this.category = ""; // 每次选完行业都要先清空类别 this.category = ""; // 每次选完行业都要先清空类别
this.getCategory(); this.getCategory();
this.showIndustryPicker = false; this.showIndustryPicker = false;
// alert(JSON.stringify(this.industry))
}, },
getCategory() { getCategory() {
this.$toast.loading({ this.$toast.loading({
...@@ -180,6 +181,7 @@ export default { ...@@ -180,6 +181,7 @@ export default {
}); });
}, },
setContent(item) { setContent(item) {
alert(JSON.stringify(item))
// console.log(item); // console.log(item);
this.result = item; this.result = item;
this.contentCode = item.contentCode; this.contentCode = item.contentCode;
...@@ -274,6 +276,8 @@ export default { ...@@ -274,6 +276,8 @@ export default {
}); });
Promise.all([getType({ appId: 1234 }), getCategory({ appId: 1234 })]).then( Promise.all([getType({ appId: 1234 }), getCategory({ appId: 1234 })]).then(
(res) => { (res) => {
// alert(JSON.stringify(res))
this.$toast.clear(); this.$toast.clear();
this.industryList = res[0]; this.industryList = res[0];
this.industryList.unshift({ this.industryList.unshift({
......
...@@ -351,7 +351,7 @@ ...@@ -351,7 +351,7 @@
:rules="[ :rules="[
{ required: true, message: '请选择单位类别', trigger: 'onChange' }, { required: true, message: '请选择单位类别', trigger: 'onChange' },
]" ]"
v-if="this.genera != '企业全职人员' && this.classType != 'AB'" v-if="this.genera != '企业全职人员' && this.classType != 'AB' && this.genera != '海外设立研发中心等机构的全职引进人才'"
> >
<template #input> <template #input>
<van-radio-group <van-radio-group
...@@ -373,7 +373,7 @@ ...@@ -373,7 +373,7 @@
:rules="[ :rules="[
{ required: true, message: '请选择单位类别', trigger: 'onChange' }, { required: true, message: '请选择单位类别', trigger: 'onChange' },
]" ]"
v-if="this.classType == 'AB'" v-if="this.classType == 'AB' || this.genera == '海外设立研发中心等机构的全职引进人才'"
> >
<template #input> <template #input>
<van-radio-group <van-radio-group
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment