Commit 5ff95dd6 by @zhang-bin-1

gx

parent 4415d467
...@@ -32,8 +32,8 @@ export default { ...@@ -32,8 +32,8 @@ export default {
userId: 37393, userId: 37393,
name: "124晚6565", name: "124晚6565",
realName: "梁中全", realName: "梁中全",
// idCardNo: "32092219930813831X", idCardNo: "342601199503121817",
idCardNo: "321111198502254219", // idCardNo: "321111198502254219",
// idCardNo: "321183199610151344", // idCardNo: "321183199610151344",
// idCardNo: "DDfCYHcrBMRhvRt4AQKt+WfGq6l2uT5G", // idCardNo: "DDfCYHcrBMRhvRt4AQKt+WfGq6l2uT5G",
// mobileNo: 13776475181, // mobileNo: 13776475181,
......
...@@ -6,8 +6,8 @@ import { request2, config2 } from '@/utils/axios' ...@@ -6,8 +6,8 @@ import { request2, config2 } from '@/utils/axios'
* @param {Object} data * @param {Object} data
*/ */
export function departmentList(data) { export function departmentList(data) {
return request({ return request2({
url: `${config.baseUrl}talent/departmentList`, url: `${config2.baseUrl}app-api/talent/departmentList`,
method: 'POST', method: 'POST',
data: data data: data
}) })
...@@ -31,8 +31,8 @@ export function mattersList(data) { ...@@ -31,8 +31,8 @@ export function mattersList(data) {
* @returns * @returns
*/ */
export function mattersGuideList(data){ export function mattersGuideList(data){
return request({ return request2({
url: `${config.baseUrl}talent/mattersGuideList`, url: `${config2.baseUrl}app-api/talent/mattersGuideList`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -66,8 +66,8 @@ export function mattersGuideGet(data) { ...@@ -66,8 +66,8 @@ export function mattersGuideGet(data) {
* 查询报名条件 * 查询报名条件
*/ */
export function mattersByUserId(data) { export function mattersByUserId(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersByUserId`, url: `${config2.baseUrl}app-api/healthy/mattersByUserId`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -77,8 +77,8 @@ export function mattersByUserId(data) { ...@@ -77,8 +77,8 @@ export function mattersByUserId(data) {
* 健康管理指南申报 * 健康管理指南申报
*/ */
export function mattersHealthyAdd(data) { export function mattersHealthyAdd(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersHealthyAdd`, url: `${config2.baseUrl}app-api/healthy/mattersHealthyAdd`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -88,8 +88,8 @@ export function mattersHealthyAdd(data) { ...@@ -88,8 +88,8 @@ export function mattersHealthyAdd(data) {
* 健康管理指南申报修改 * 健康管理指南申报修改
*/ */
export function mattersHealthyUpdate(data) { export function mattersHealthyUpdate(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersHealthyUpdate`, url: `${config2.baseUrl}app-api/healthy/mattersHealthyUpdate`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -99,8 +99,8 @@ export function mattersHealthyUpdate(data) { ...@@ -99,8 +99,8 @@ export function mattersHealthyUpdate(data) {
* 健康体检申报 * 健康体检申报
*/ */
export function mattersInspectAdd(data) { export function mattersInspectAdd(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersInspectAdd`, url: `${config2.baseUrl}app-api/healthy/mattersInspectAdd`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -110,8 +110,8 @@ export function mattersInspectAdd(data) { ...@@ -110,8 +110,8 @@ export function mattersInspectAdd(data) {
* 健康体检修改 * 健康体检修改
*/ */
export function mattersInspectUpdate(data) { export function mattersInspectUpdate(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersInspectUpdate`, url: `${config2.baseUrl}app-api/healthy/mattersInspectUpdate`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -122,8 +122,8 @@ export function mattersInspectAdd(data) { ...@@ -122,8 +122,8 @@ export function mattersInspectAdd(data) {
* 绿色就医通道申报 * 绿色就医通道申报
*/ */
export function mattersGreenAdd(data) { export function mattersGreenAdd(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersGreenAdd`, url: `${config2.baseUrl}app-api/healthy/mattersGreenAdd`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -133,8 +133,8 @@ export function mattersInspectAdd(data) { ...@@ -133,8 +133,8 @@ export function mattersInspectAdd(data) {
* 绿色就医通道修改 * 绿色就医通道修改
*/ */
export function mattersGreenUpdate(data) { export function mattersGreenUpdate(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersGreenUpdate`, url: `${config2.baseUrl}app-api/healthy/mattersGreenUpdate`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -144,8 +144,8 @@ export function mattersInspectAdd(data) { ...@@ -144,8 +144,8 @@ export function mattersInspectAdd(data) {
* 我的申报列表 * 我的申报列表
*/ */
export function mattersByUserIdList(data) { export function mattersByUserIdList(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersByUserIdList`, url: `${config2.baseUrl}app-api/healthy/mattersByUserIdList`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -155,8 +155,8 @@ export function mattersByUserIdList(data) { ...@@ -155,8 +155,8 @@ export function mattersByUserIdList(data) {
* 申报详情 * 申报详情
*/ */
export function mattersGet(data) { export function mattersGet(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersGet`, url: `${config2.baseUrl}app-api/healthy/mattersGet`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -166,8 +166,8 @@ export function mattersGet(data) { ...@@ -166,8 +166,8 @@ export function mattersGet(data) {
* 修改申报单状态 * 修改申报单状态
*/ */
export function mattersUpdateState(data) { export function mattersUpdateState(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersUpdateState`, url: `${config2.baseUrl}app-api/healthy/mattersUpdateState`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -177,8 +177,8 @@ export function mattersGet(data) { ...@@ -177,8 +177,8 @@ export function mattersGet(data) {
* 预约医院列表 * 预约医院列表
*/ */
export function mattersHospitalList(data) { export function mattersHospitalList(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersHospitalList`, url: `${config2.baseUrl}app-api/healthy/mattersHospitalList`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -190,8 +190,8 @@ export function mattersGet(data) { ...@@ -190,8 +190,8 @@ export function mattersGet(data) {
* @returns * @returns
*/ */
export function mattersParentAdd(data) { export function mattersParentAdd(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersParentAdd`, url: `${config2.baseUrl}app-api/healthy/mattersParentAdd`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -203,8 +203,8 @@ export function mattersParentAdd(data) { ...@@ -203,8 +203,8 @@ export function mattersParentAdd(data) {
* @returns * @returns
*/ */
export function mattersParentUpdate(data) { export function mattersParentUpdate(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersParentUpdate`, url: `${config2.baseUrl}app-api/healthy/mattersParentUpdate`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -216,8 +216,8 @@ export function mattersParentAdd(data) { ...@@ -216,8 +216,8 @@ export function mattersParentAdd(data) {
* @returns * @returns
*/ */
export function mattersHousingAdd(data) { export function mattersHousingAdd(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersHousingAdd`, url: `${config2.baseUrl}app-api/housing/mattersHousingAdd`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -227,8 +227,8 @@ export function mattersParentAdd(data) { ...@@ -227,8 +227,8 @@ export function mattersParentAdd(data) {
* 住房契税补贴我的申报列表 * 住房契税补贴我的申报列表
*/ */
export function mattersHousingList(data) { export function mattersHousingList(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersHousingList`, url: `${config2.baseUrl}app-api/housing/mattersHousingList`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -239,8 +239,8 @@ export function mattersParentAdd(data) { ...@@ -239,8 +239,8 @@ export function mattersParentAdd(data) {
* 住房契税补贴申报详情 * 住房契税补贴申报详情
*/ */
export function mattersHousingGet(data) { export function mattersHousingGet(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersHousingGet`, url: `${config2.baseUrl}app-api/housing/mattersHousingGet`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -250,8 +250,8 @@ export function mattersParentAdd(data) { ...@@ -250,8 +250,8 @@ export function mattersParentAdd(data) {
* 住房契税补贴申报更新 * 住房契税补贴申报更新
*/ */
export function mattersHousingUpdate(data) { export function mattersHousingUpdate(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersHousingUpdate`, url: `${config2.baseUrl}app-api/housing/mattersHousingUpdate`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -261,8 +261,8 @@ export function mattersParentAdd(data) { ...@@ -261,8 +261,8 @@ export function mattersParentAdd(data) {
* 住房契税补贴申报状态修改 * 住房契税补贴申报状态修改
*/ */
export function mattersHousingUpdateState(data) { export function mattersHousingUpdateState(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersHousingUpdateState`, url: `${config2.baseUrl}app-api/housing/mattersHousingUpdateState`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -277,8 +277,8 @@ export function mattersArea(data) { ...@@ -277,8 +277,8 @@ export function mattersArea(data) {
} }
// 判断是否满足惠老关怀追加 // 判断是否满足惠老关怀追加
export function isParentState(data) { export function isParentState(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersSuperAdditionParentState`, url: `${config2.baseUrl}app-api/healthy/mattersSuperAdditionParentState`,
method: 'post', method: 'post',
data: data data: data
}) })
...@@ -286,8 +286,8 @@ export function isParentState(data) { ...@@ -286,8 +286,8 @@ export function isParentState(data) {
// 父母惠老关怀追加 // 父母惠老关怀追加
export function mattersSuperAdditionParent(data) { export function mattersSuperAdditionParent(data) {
return request({ return request2({
url: `${config.baseUrl}talent/mattersSuperAdditionParent`, url: `${config2.baseUrl}app-api/healthy/mattersSuperAdditionParent`,
method: 'post', method: 'post',
data: data data: data
}) })
......
...@@ -8,7 +8,7 @@ const env = process.env.NODE_ENV === "development" ? "dev" : "prod"; ...@@ -8,7 +8,7 @@ const env = process.env.NODE_ENV === "development" ? "dev" : "prod";
const baseUrl = { const baseUrl = {
// dev: "http://192.168.3.144:9090/", // dev: "http://192.168.3.144:9090/",
dev: "http://81.69.231.72:10010/", dev: "http://81.69.231.72:9090/",
// 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/',
......
...@@ -208,13 +208,6 @@ ...@@ -208,13 +208,6 @@
class="add-o" class="add-o"
color="#29A400" color="#29A400"
/> />
<!-- <div style="display: flex">
<div>NO.</div>
<van-field v-model="form.secondDeedBillCode" placeholder="输入契税发票号码"
input-align="center" :disabled="view" type="digit"
:rules="[{ required: true, message: '' }]" class="megic megic3">
</van-field>
</div> -->
</div> </div>
</template> </template>
</van-field> </van-field>
...@@ -705,10 +698,12 @@ export default { ...@@ -705,10 +698,12 @@ export default {
}); });
uploadFile(param) uploadFile(param)
.then((res) => { .then((res) => {
// alert(JSON.stringify(res.data))
this.$toast.clear(); this.$toast.clear();
file.status = "done"; file.status = "done";
file.message = "上传成功"; file.message = "上传成功";
file.url = res; file.url = res.data;
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
......
...@@ -540,7 +540,6 @@ import { ...@@ -540,7 +540,6 @@ import {
idCardVerification 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)
...@@ -753,10 +752,8 @@ export default { ...@@ -753,10 +752,8 @@ export default {
jump() { jump() {
idCardVerification({idCard: this.userInfo.idCardNo}).then((res) => { idCardVerification({idCard: this.userInfo.idCardNo}).then((res) => {
if (res.data) { if (res.data) {
let newCard = decryptByDES(this.userInfo.idCardNo, "MnuYbhGv");
console.log(newCard);
let params = { let params = {
idCard: newCard, idCard: this.userInfo.idCardNo,
}; };
queryUserApplyForRecord(params).then((res) => { queryUserApplyForRecord(params).then((res) => {
console.log(res); console.log(res);
...@@ -781,7 +778,7 @@ export default { ...@@ -781,7 +778,7 @@ export default {
}).then(() => { }).then(() => {
queryApplyingDeedTaxInfo({ queryApplyingDeedTaxInfo({
code: "", code: "",
idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv"), idCard: this.userInfo.idCardNo,
name: "", name: "",
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
......
...@@ -144,7 +144,6 @@ import { ...@@ -144,7 +144,6 @@ import {
queryApplyingDeedTaxInfo, queryApplyingDeedTaxInfo,
idCardVerification idCardVerification
} from "@/api/deedtax.js"; } from "@/api/deedtax.js";
import { decryptByDES, encryptByDES } from "@/utils/utils";
Vue.use(Step) Vue.use(Step)
.use(Steps) .use(Steps)
.use(Tab) .use(Tab)
...@@ -174,9 +173,10 @@ export default { ...@@ -174,9 +173,10 @@ export default {
idCardVerification({idCard: this.userInfo.idCardNo}).then((res) => { idCardVerification({idCard: this.userInfo.idCardNo}).then((res) => {
if (res.data) { if (res.data) {
let params = { let params = {
idCard: encryptByDES(this.userInfo.idCardNo, "MnuYbhGv"), idCard: this.userInfo.idCardNo,
}; };
queryUserApplyForRecord(params).then((res) => { queryUserApplyForRecord(params).then((res) => {
// alert(JSON.stringify(res))
if (res.code == 200) { if (res.code == 200) {
if (res.data.state == 0) { if (res.data.state == 0) {
this.$router.push({ name: "DeedtaxDeclare" }); this.$router.push({ name: "DeedtaxDeclare" });
...@@ -194,7 +194,7 @@ export default { ...@@ -194,7 +194,7 @@ export default {
}).then(() => { }).then(() => {
queryApplyingDeedTaxInfo({ queryApplyingDeedTaxInfo({
code: "", code: "",
idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv"), idCard: this.userInfo.idCardNo,
name: "", name: "",
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
...@@ -230,6 +230,8 @@ export default { ...@@ -230,6 +230,8 @@ export default {
message: "经系统查询,您已享受过相关政策补贴 ,不能再次申报契税补贴政策。如有异议请联系市财政窗口,地址:镇江市政务服务中心(冠城路8号工人大厦)二楼市财政局窗口,联系电话:0511-89881850", message: "经系统查询,您已享受过相关政策补贴 ,不能再次申报契税补贴政策。如有异议请联系市财政窗口,地址:镇江市政务服务中心(冠城路8号工人大厦)二楼市财政局窗口,联系电话:0511-89881850",
}) })
} }
}).catch((res) => {
alert(JSON.stringify(res))
}) })
}, },
change(val) { change(val) {
......
...@@ -754,12 +754,12 @@ export default { ...@@ -754,12 +754,12 @@ export default {
code: this.$route.query.code, code: this.$route.query.code,
matterType: 4, matterType: 4,
}).then((res) => { }).then((res) => {
res.registration = [{ url: res.registration }]; res.data.registration = [{ url: res.data.registration }];
res.parentList.map((item) => { res.data.parentList.map((item) => {
if (this.type == "continue") { if (this.type == "continue") {
item.isShow = false; item.isShow = false;
} else { } else {
if (res.code == item.basicCode) { if (res.data.code == item.basicCode) {
item.isShow = true; item.isShow = true;
} else { } else {
item.isShow = false; item.isShow = false;
...@@ -776,8 +776,8 @@ export default { ...@@ -776,8 +776,8 @@ export default {
item.pickerParentType = false; item.pickerParentType = false;
item.pickerParentDiscount = false; item.pickerParentDiscount = false;
}); });
res.jurisdiction = res.areaName + "/" + res.streetName; res.data.jurisdiction = res.data.areaName + "/" + res.data.streetName;
this.form = res; this.form = res.data;
console.log(this.form); console.log(this.form);
if (this.type == "continue") { if (this.type == "continue") {
this.form.registration = []; this.form.registration = [];
......
<template> <template>
<div class="wrapper"> <div class="wrapper">
<NavHeader color="#0687D2" title="人才事项详情" @back="$router.go(-1)" /> <NavHeader color="#0687D2" title="人才事项详情" @back="$router.go(-1)" />
<!-- <div
:class="[detail.handlingMethod === '1' ? 'contentBu' : 'content']"
v-html="detail.notice"
>
{{ detail.notice }}
</div> -->
<img :src="imgUrl" style="width: 100%" /> <img :src="imgUrl" style="width: 100%" />
<div class="title"> <div class="title">
...@@ -33,7 +28,7 @@ import { ...@@ -33,7 +28,7 @@ import {
mattersGuideGet mattersGuideGet
} from "@/api/policy"; } from "@/api/policy";
import {queryUserApplyForRecord,queryApplyingDeedTaxInfo,idCardVerification} 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";
Vue.use(Button).use(Dialog); Vue.use(Button).use(Dialog);
...@@ -68,9 +63,13 @@ export default { ...@@ -68,9 +63,13 @@ export default {
message: "加载中..." message: "加载中..."
}); });
mattersGuideGet({ appId: 1234, id: this.id }).then(res => { mattersGuideGet({ appId: 1234, id: this.id }).then(res => {
if (res.code == 200) {
console.log("详情的res---", res); console.log("详情的res---", res);
this.$toast.clear(); this.$toast.clear();
this.detail = res; this.detail = res.data;
}
}); });
}, },
report() { report() {
...@@ -86,11 +85,11 @@ export default { ...@@ -86,11 +85,11 @@ export default {
mattersByUserId({ mattersByUserId({
appId: 1234, appId: 1234,
guideId: this.detail.id, guideId: this.detail.id,
userId: this.userInfo.userId // userId: this.userInfo.userId
}).then(res => { }).then(res => {
console.log("人才吗的code----", res); console.log("人才吗的code----", res);
sessionStorage.setItem("talentCode", res.talentCode); sessionStorage.setItem("talentCode", res.data.talentCode);
this.talentCode = res.talentCode this.talentCode = res.data.talentCode
this.$toast.clear(); this.$toast.clear();
// console.log(res) // console.log(res)
if (this.detail.matterType === 7) { if (this.detail.matterType === 7) {
...@@ -100,13 +99,13 @@ export default { ...@@ -100,13 +99,13 @@ export default {
query: { query: {
departmentCode: this.detail.departmentCode, departmentCode: this.detail.departmentCode,
guideId: this.detail.id, guideId: this.detail.id,
talentCode: res.talentCode, talentCode: res.data.talentCode,
matterType: this.detail.matterType, matterType: this.detail.matterType,
type: "add" type: "add"
} }
}); });
} else { } else {
if (!res.mark) { if (!res.data.mark) {
this.$dialog this.$dialog
.confirm({ .confirm({
message: "您现在还不具备申报该政策的资格,请先申请人才码!", message: "您现在还不具备申报该政策的资格,请先申请人才码!",
...@@ -118,7 +117,7 @@ export default { ...@@ -118,7 +117,7 @@ export default {
} else { } else {
// 已申请人才码 // 已申请人才码
// 已申请该事项类型 // 已申请该事项类型
if (!res.recordMark) { if (!res.data.recordMark) {
if (this.detail.matterType === 5 || this.detail.matterType === 6) { if (this.detail.matterType === 5 || this.detail.matterType === 6) {
this.$router.push({ name: "PolicyReportTwo" }); this.$router.push({ name: "PolicyReportTwo" });
} }
...@@ -128,7 +127,7 @@ export default { ...@@ -128,7 +127,7 @@ export default {
query: { query: {
departmentCode: this.detail.departmentCode, departmentCode: this.detail.departmentCode,
guideId: this.detail.id, guideId: this.detail.id,
talentCode: res.talentCode, talentCode: res.data.talentCode,
type: "add" type: "add"
} }
}); });
...@@ -144,7 +143,7 @@ export default { ...@@ -144,7 +143,7 @@ export default {
query: { query: {
departmentCode: this.detail.departmentCode, departmentCode: this.detail.departmentCode,
guideId: this.detail.id, guideId: this.detail.id,
talentCode: res.talentCode, talentCode: res.data.talentCode,
type: "add" type: "add"
} }
}); });
...@@ -155,7 +154,7 @@ export default { ...@@ -155,7 +154,7 @@ export default {
query: { query: {
departmentCode: this.detail.departmentCode, departmentCode: this.detail.departmentCode,
guideId: this.detail.id, guideId: this.detail.id,
talentCode: res.talentCode, talentCode: res.data.talentCode,
type: "add" type: "add"
} }
}); });
...@@ -166,7 +165,7 @@ export default { ...@@ -166,7 +165,7 @@ export default {
query: { query: {
departmentCode: this.detail.departmentCode, departmentCode: this.detail.departmentCode,
guideId: this.detail.id, guideId: this.detail.id,
talentCode: res.talentCode, talentCode: res.data.talentCode,
type: "add" type: "add"
} }
}); });
...@@ -177,7 +176,7 @@ export default { ...@@ -177,7 +176,7 @@ export default {
query: { query: {
departmentCode: this.detail.departmentCode, departmentCode: this.detail.departmentCode,
guideId: this.detail.id, guideId: this.detail.id,
talentCode: res.talentCode, talentCode: res.data.talentCode,
type: "add" type: "add"
} }
}); });
...@@ -190,12 +189,10 @@ export default { ...@@ -190,12 +189,10 @@ export default {
let params = { let params = {
// userId: this.userInfo.userId, // userId: this.userInfo.userId,
// idCard: this.userInfo.idCardNo // idCard: this.userInfo.idCardNo
idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv") idCard: this.userInfo.idCardNo
} }
// alert(JSON.stringify(params))
queryUserApplyForRecord(params).then((res) => { queryUserApplyForRecord(params).then((res) => {
console.log(res) console.log(res)
// alert(JSON.stringify(res))
if (res.code == 200) { if (res.code == 200) {
if (res.data.state == 0) { if (res.data.state == 0) {
// 人才“镇兴”行动购住房契税补贴(住宅)||人才“镇兴”行动购住房契税补贴(商办) // 人才“镇兴”行动购住房契税补贴(住宅)||人才“镇兴”行动购住房契税补贴(商办)
...@@ -216,7 +213,7 @@ export default { ...@@ -216,7 +213,7 @@ export default {
}).then(() => { }).then(() => {
queryApplyingDeedTaxInfo({ queryApplyingDeedTaxInfo({
code: "", code: "",
idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv"), idCard: this.userInfo.idCardNo,
name: "", name: "",
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
...@@ -249,7 +246,6 @@ export default { ...@@ -249,7 +246,6 @@ export default {
} }
} }
} }
}); });
} }
}, },
...@@ -291,24 +287,6 @@ export default { ...@@ -291,24 +287,6 @@ export default {
padding-bottom: 500px; padding-bottom: 500px;
} }
.contentBu {
height: calc(100vh - 193px);
padding: 10px;
overflow: auto;
}
.content {
height: calc(100vh - 108px);
padding: 10px;
overflow: auto;
}
.buttonWrapper {
display: flex;
align-items: center;
margin-bottom: 100px;
}
.bottom-fixed { .bottom-fixed {
position: fixed; position: fixed;
left: 0; left: 0;
......
...@@ -59,6 +59,7 @@ export default { ...@@ -59,6 +59,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)
}, },
jumpOne() { jumpOne() {
this.$router.push({ name: "PolicyList" }); this.$router.push({ name: "PolicyList" });
......
...@@ -79,10 +79,10 @@ export default { ...@@ -79,10 +79,10 @@ export default {
departmentList({ appId: "1234" }).then(res => { departmentList({ appId: "1234" }).then(res => {
console.log("列表的res---", res); console.log("列表的res---", res);
this.option1 = this.option1.concat( this.option1 = this.option1.concat(
res.map(item => { res.data.map(item => {
return { return {
text: item.departmentName, text: item.name,
value: item.departmentCode value: item.code
}; };
}) })
); );
...@@ -103,20 +103,20 @@ export default { ...@@ -103,20 +103,20 @@ export default {
appId: 1234, appId: 1234,
departmentCode: this.departmentCode, departmentCode: this.departmentCode,
handlingMethod: this.handlingMethod, handlingMethod: this.handlingMethod,
pageNum: 1, pageNo: 1,
pageSize: 10 pageSize: 10
}).then(res => { }).then(res => {
this.$toast.clear(); this.$toast.clear();
this.refresh = false; this.refresh = false;
this.pageNum = 1; this.pageNum = 1;
const records = res.list; const records = res.data.list;
if (records.length <= 0) { if (records.length <= 0) {
this.list = []; this.list = [];
this.finished = this.nodata = true; this.finished = this.nodata = true;
} else { } else {
this.list = records; this.list = records;
this.nodata = false; this.nodata = false;
this.finished = !res.hasNextPage; this.finished = !res.data.hasNextPage;
} }
}); });
}, },
...@@ -130,18 +130,18 @@ export default { ...@@ -130,18 +130,18 @@ export default {
appId: 1234, appId: 1234,
departmentCode: this.departmentCode, departmentCode: this.departmentCode,
handlingMethod: this.handlingMethod, handlingMethod: this.handlingMethod,
pageNum: this.pageNum + 1, pageNo: this.pageNum + 1,
pageSize: 10 pageSize: 10
}).then(res => { }).then(res => {
this.$toast.clear(); this.$toast.clear();
this.loading = false; this.loading = false;
this.pageNum = this.pageNum + 1; this.pageNum = this.pageNum + 1;
const records = res.list; const records = res.data.list;
if (records.length <= 0) { if (records.length <= 0) {
this.finished = true; this.finished = this.nodata = true;
} else { } else {
this.list = this.list.concat(records); this.list = this.list.concat(records);
this.finished = !res.hasNextPage; this.finished = this.nodata = !res.data.hasNextPage;
} }
}); });
}, },
......
...@@ -132,7 +132,7 @@ export default { ...@@ -132,7 +132,7 @@ export default {
appId: 1234, appId: 1234,
guideName: this.guideName, guideName: this.guideName,
state: this.list[index].state, state: this.list[index].state,
pageNum: pageNo:
type === "refresh" ? 1 : parseInt(this.list[index].pageNum) + 1, type === "refresh" ? 1 : parseInt(this.list[index].pageNum) + 1,
pageSize: 20, pageSize: 20,
userId: encryptByDES(this.userInfo.userId, "MnuYbhGv") userId: encryptByDES(this.userInfo.userId, "MnuYbhGv")
...@@ -146,8 +146,8 @@ export default { ...@@ -146,8 +146,8 @@ export default {
this.$toast.clear(); this.$toast.clear();
this.refreshing = false; this.refreshing = false;
this.loading = false; this.loading = false;
const current = res.pageNum; const current = res.data.pageNum;
const records = res.list.map((item) => { const records = res.data.list.map((item) => {
let Obj = policyEnume(item.state); let Obj = policyEnume(item.state);
item.stateName = Obj.text; item.stateName = Obj.text;
item.color = Obj.color; item.color = Obj.color;
...@@ -160,7 +160,7 @@ export default { ...@@ -160,7 +160,7 @@ export default {
item.pageNum = 1; item.pageNum = 1;
} else { } else {
item.pageNum = current; item.pageNum = current;
item.finished = !res.hasNextPage; item.finished = !res.data.hasNextPage;
if (type === "refresh") item.content = records; if (type === "refresh") item.content = records;
else item.content = item.content.concat(records); else item.content = item.content.concat(records);
} }
......
...@@ -76,7 +76,7 @@ import { Tab, Tabs, PullRefresh, List, Search, Button,Dialog } from "vant"; ...@@ -76,7 +76,7 @@ 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,idCardVerification} 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)
.use(Tabs) .use(Tabs)
...@@ -103,9 +103,9 @@ export default { ...@@ -103,9 +103,9 @@ export default {
init(type) { init(type) {
let params = { let params = {
appId: 1234, appId: 1234,
pageNum: type === "refresh" ? 1 : parseInt(this.pageNum) + 1, pageNo: type === "refresh" ? 1 : parseInt(this.pageNum) + 1,
pageSize: 20, pageSize: 20,
userId: encryptByDES(this.userInfo.userId, "MnuYbhGv") // userId: this.userInfo.userId
}; };
this.$toast.loading({ this.$toast.loading({
duration: 0, // 持续展示 toast duration: 0, // 持续展示 toast
...@@ -117,8 +117,8 @@ export default { ...@@ -117,8 +117,8 @@ export default {
this.$toast.clear(); this.$toast.clear();
this.refreshing = false; this.refreshing = false;
this.loading = false; this.loading = false;
const current = res.pageNum; const current = res.data.pageNum;
const records = res.list.map(item => { const records = res.data.list.map(item => {
// this.code = item.code; // this.code = item.code;
let Obj = policyEnume(item.state); let Obj = policyEnume(item.state);
item.stateName = Obj.text; item.stateName = Obj.text;
...@@ -131,11 +131,11 @@ export default { ...@@ -131,11 +131,11 @@ export default {
this.pageNum = 1; this.pageNum = 1;
} else { } else {
this.pageNum = current; this.pageNum = current;
this.finished = !res.hasNextPage; this.finished = !res.data.hasNextPage;
if (type === "refresh") this.list = records; if (type === "refresh") this.list = records;
else this.list = this.list.concat(records); else this.list = this.list.concat(records);
} }
}); })
}, },
onRefresh() { onRefresh() {
this.init("refresh"); this.init("refresh");
...@@ -196,12 +196,10 @@ export default { ...@@ -196,12 +196,10 @@ export default {
let params = { let params = {
// userId: this.userInfo.userId, // userId: this.userInfo.userId,
// idCard: this.userInfo.idCardNo // idCard: this.userInfo.idCardNo
idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv") idCard: this.userInfo.idCardNo
} }
// alert(JSON.stringify(params))
queryUserApplyForRecord(params).then((res) => { queryUserApplyForRecord(params).then((res) => {
console.log(res) console.log(res)
// alert(JSON.stringify(res))
if (res.code == 200) { if (res.code == 200) {
if (res.data.state == 0) { if (res.data.state == 0) {
// 人才“镇兴”行动购住房契税补贴(住宅)||人才“镇兴”行动购住房契税补贴(商办) // 人才“镇兴”行动购住房契税补贴(住宅)||人才“镇兴”行动购住房契税补贴(商办)
...@@ -213,16 +211,6 @@ export default { ...@@ -213,16 +211,6 @@ export default {
type: "edit" 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) { } else if (res.data.state == 1) {
Dialog.confirm({ Dialog.confirm({
confirmButtonText: '查看', confirmButtonText: '查看',
...@@ -230,7 +218,7 @@ export default { ...@@ -230,7 +218,7 @@ export default {
}).then(() => { }).then(() => {
queryApplyingDeedTaxInfo({ queryApplyingDeedTaxInfo({
code: "", code: "",
idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv"), idCard: this.userInfo.idCardNo,
name: "", name: "",
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
...@@ -244,18 +232,19 @@ export default { ...@@ -244,18 +232,19 @@ export default {
} else if (res.data.state == 11) { } else if (res.data.state == 11) {
console.log(111) console.log(111)
Dialog.confirm({ Dialog.confirm({
confirmButtonText: '查看', // confirmButtonText: '查看',
showConfirmButton: false,
message: res.data.msg || '您的申请已提交', message: res.data.msg || '您的申请已提交',
}).then(() => { // }).then(() => {
// this.$router.push({ name: 'PolicyReportTwo', query: { code: res.data.code } }) // // this.$router.push({ name: 'PolicyReportTwo', query: { code: res.data.code } })
this.$router.push({ // this.$router.push({
name: "HousePurchase", // name: "HousePurchase",
query: { // query: {
code: record.code, // code: record.code,
matterType: record.housingType === 2 ? 5 : 6, // matterType: record.housingType === 2 ? 5 : 6,
type: "edit" // type: "view"
} // }
}); // });
}) })
} }
} }
...@@ -267,6 +256,8 @@ export default { ...@@ -267,6 +256,8 @@ export default {
message: "经系统查询,您已享受过相关政策补贴 ,不能再次申报契税补贴政策。如有异议请联系市财政窗口,地址:镇江市政务服务中心(冠城路8号工人大厦)二楼市财政局窗口,联系电话:0511-89881850", message: "经系统查询,您已享受过相关政策补贴 ,不能再次申报契税补贴政策。如有异议请联系市财政窗口,地址:镇江市政务服务中心(冠城路8号工人大厦)二楼市财政局窗口,联系电话:0511-89881850",
}) })
} }
}).catch((err) => {
console.log(err)
}) })
}, },
handleChange(index) { handleChange(index) {
......
...@@ -46,7 +46,7 @@ export default { ...@@ -46,7 +46,7 @@ export default {
}).then((res) => { }).then((res) => {
console.log(res); console.log(res);
this.$toast.clear(); this.$toast.clear();
this.list = res.list; this.list = res.data.list;
if (this.list && this.list.length <= 0) { if (this.list && this.list.length <= 0) {
this.nodata = true; this.nodata = true;
} else { } else {
......
...@@ -527,7 +527,7 @@ ...@@ -527,7 +527,7 @@
@click=" @click="
download( download(
'https://www.smart-zj.cn:55901/image/事业工资变动审批表', 'https://www.smart-zj.cn:55901/image/事业工资变动审批表',
'https://www.smart-zj.cn:55901/image/事业工资变动审批表.doc', 'https://www.smart-zj.cn:55901/image/gongzibiandongshenpibiaoIos.doc',
'工资变动审批表模板' '工资变动审批表模板'
) )
" "
......
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