Skip to content

Z
zj-manage
Commit 740a261f by zhangbin
Options

gx

parent 3e5eb55b
Showing with 302 additions and 108 deletions
.vscode/settings.json 0 → 100644
{
"editor.suggest.snippetsPreventQuickSuggestions": false
}
\ No newline at end of file
package-lock.json
......@@ -11,6 +11,7 @@
"axios": "^0.24.0",
"core-js": "^3.6.4",
"crypto-js": "^4.1.1",
"default-passive-events": "^2.0.0",
"docxtemplater": "^3.31.3",
"echarts": "^4.8.0",
"element-ui": "^2.15.6",
......@@ -5339,6 +5340,11 @@
"node": ">= 8"
}
},
"node_modules/default-passive-events": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/default-passive-events/-/default-passive-events-2.0.0.tgz",
"integrity": "sha512-eMtt76GpDVngZQ3ocgvRcNCklUMwID1PaNbCNxfpDXuiOXttSh0HzBbda1HU9SIUsDc02vb7g9+3I5tlqe/qMQ=="
},
"node_modules/defaults": {
"version": "1.0.3",
"resolved": "https://registry.npmmirror.com/defaults/-/defaults-1.0.3.tgz",
......@@ -19606,6 +19612,11 @@
}
}
},
"default-passive-events": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/default-passive-events/-/default-passive-events-2.0.0.tgz",
"integrity": "sha512-eMtt76GpDVngZQ3ocgvRcNCklUMwID1PaNbCNxfpDXuiOXttSh0HzBbda1HU9SIUsDc02vb7g9+3I5tlqe/qMQ=="
},
"defaults": {
"version": "1.0.3",
"resolved": "https://registry.npmmirror.com/defaults/-/defaults-1.0.3.tgz",
package.json
......@@ -11,6 +11,7 @@
"axios": "^0.24.0",
"core-js": "^3.6.4",
"crypto-js": "^4.1.1",
"default-passive-events": "^2.0.0",
"docxtemplater": "^3.31.3",
"echarts": "^4.8.0",
"element-ui": "^2.15.6",
......
src/api/policy.js
......@@ -2,11 +2,6 @@ import {
api,
formatParams
} from "@/utils/axios";
import {
api1,
formatParams1,
config
} from '@/utils/request'
/**
* 购房契税补贴住建局审核申请列表
......@@ -52,8 +47,8 @@ export function mattersGet(params) {
* 修改状态
*/
export function mattersUpdateState(params) {
return api1(Object.assign(formatParams1('POST', params), {
url: `${config.proxy}talent/mattersUpdateState`
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/talent/mattersUpdateState`
}))
}
......@@ -62,8 +57,8 @@ export function mattersUpdateState(params) {
* @returns <promise>
*/
export function mattersGuideList(params) {
return api1(Object.assign(formatParams1('POST', params), {
url: `${config.proxy}talent/mattersGuideList`
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/talent/mattersGuideList`
}))
}
......@@ -71,8 +66,8 @@ export function mattersGuideList(params) {
* 人才事项部门列表
*/
export function mattersDepartmentList(params) {
return api1(Object.assign(formatParams1('POST', params), {
url: `${config.proxy}talent/mattersDepartmentList`
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/talent/mattersDepartmentList`
}))
}
......@@ -81,8 +76,8 @@ export function mattersDepartmentList(params) {
* @returns
*/
export function mattersGuideGet(params) {
return api1(Object.assign(formatParams1('POST', params), {
url: `${config.proxy}talent/mattersGuideGet`
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/talent/mattersGuideGet`
}))
}
......@@ -91,8 +86,8 @@ export function mattersGuideGet(params) {
* @returns <promise>
*/
export function mattersGuideAdd(params) {
return api1(Object.assign(formatParams1('POST', params), {
url: `${config.proxy}talent/mattersGuideAdd`
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/talent/mattersGuideAdd`
}))
}
......@@ -102,8 +97,8 @@ export function mattersGuideAdd(params) {
* @returns
*/
export function mattersGuideUpdate(params) {
return api1(Object.assign(formatParams1('POST', params), {
url: `${config.proxy}talent/mattersGuideUpdate`
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/talent/mattersGuideUpdate`
}))
}
......@@ -112,8 +107,8 @@ export function mattersGuideUpdate(params) {
* @returns <promise>
*/
export function mattersGuideDelete(params) {
return api1(Object.assign(formatParams1('POST', params), {
url: `${config.proxy}talent/mattersGuideDelete`
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/talent/mattersGuideDelete`
}))
}
......@@ -143,8 +138,8 @@ export function mattersHousingUpdate(params) {
* 记录
*/
export function mattersGetReason(params) {
return api1(Object.assign(formatParams1('POST', params), {
url: `${config.proxy}talent/mattersGetReason`
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/talent/mattersGetReason`
}))
}
......@@ -177,4 +172,13 @@ export function dtSubsidy(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/deedTax/dtSubsidy`
}))
}
/**
* 查询附件
*/
export function queryAttacheFile(params) {
return api(Object.assign(formatParams('GET', params), {
url: `/admin-api/housing/queryAttacheFile`
}))
}
\ No newline at end of file
src/api/purchase.js
......@@ -2,11 +2,11 @@ import {
api,
formatParams
} from "@/utils/axios";
import {
api1,
formatParams1,
config
} from '@/utils/request'
// import {
// api1,
// formatParams1,
// config
// } from '@/utils/request'
/**
* 购房契税补贴住建局审核申请列表
......@@ -43,8 +43,8 @@ export function mattersHouseReviewerList(params) {
* 购房补贴4个初审部门通过
*/
export function mattersHouseReviewerPass(params) {
return api1(Object.assign(formatParams1('POST', params), {
url: `${config.proxy}talentMatters/mattersHouseReviewerPass`
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/house/mattersHouseReviewerPass`
}))
}
......@@ -52,8 +52,8 @@ export function mattersHouseReviewerPass(params) {
* 购房补贴4个初审部门拒绝
*/
export function mattersHouseReviewerReject(params) {
return api1(Object.assign(formatParams1('POST', params), {
url: `${config.proxy}talentMatters/mattersHouseReviewerReject`
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/house/mattersHouseReviewerReject`
}))
}
......@@ -62,8 +62,8 @@ export function mattersHouseReviewerReject(params) {
* 购房补贴4个初审部门操作记录
*/
export function mattersHouseRevieweReason(params) {
return api1(Object.assign(formatParams1('POST', params), {
url: `${config.proxy}talentMatters/mattersHouseReviewerReason`
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/house/mattersHouseReviewerReason`
}))
}
......@@ -71,8 +71,8 @@ export function mattersHouseRevieweReason(params) {
* 购房补贴住建局操作记录
*/
export function mattersHouseReason(params) {
return api1(Object.assign(formatParams1('POST', params), {
url: `${config.proxy}talentMatters/mattersHouseReason`
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/house/mattersHouseReason`
}))
}
......@@ -80,8 +80,8 @@ export function mattersHouseReason(params) {
* 购房补贴申请员工列表
*/
export function mattersHouseStaffList(params) {
return api1(Object.assign(formatParams1('POST', params), {
url: `${config.proxy}talentMatters/mattersHouseStaffList`
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/house/mattersHouseStaffList`
}))
}
......@@ -89,8 +89,8 @@ export function mattersHouseStaffList(params) {
* 购房补贴住建局拒绝
*/
export function mattersHouseReject(params) {
return api1(Object.assign(formatParams1('POST', params), {
url: `${config.proxy}talentMatters/mattersHouseReject`
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/house/mattersHouseReject`
}))
}
......@@ -98,7 +98,16 @@ export function mattersHouseReject(params) {
* 购房补贴住建局通过
*/
export function mattersHousePass(params) {
return api1(Object.assign(formatParams1('POST', params), {
url: `${config.proxy}talentMatters/mattersHousePass`
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/house/mattersHousePass`
}))
}
/**
* 查询附件
*/
export function queryAttacheFile(params) {
return api(Object.assign(formatParams('GET', params), {
url: `/admin-api/house/queryAttacheFile`
}))
}
\ No newline at end of file
src/api/upload.js
import { api1, formatParams1, config } from '@/utils/request'
import {
api,
formatParams
} from "@/utils/axios";
import { getToken } from '@/utils/auth'
/**
......@@ -56,9 +60,24 @@ export function uploadFile(params) {
}
let formData = new FormData();
formData.append('file', params);
return api1(Object.assign(formatParams1('POST', formData, header), {
url: `${config.proxy}file/uploadWordFile`
// url: `${config.proxy}file/deedTaxWorldUpload`
return api(Object.assign(formatParams('POST', formData, header), {
url: `/admin-api/file/uploadWordFile`
}))
}
/**
* 上传人才政策文件
*/
export function uploadTalentFile(params) {
console.log('params---',params);
let header = {
'Content-Type': 'multipart/form-data'
}
let formData = new FormData();
formData.append('file', params);
return api(Object.assign(formatParams('POST', formData, header), {
url: `/admin-api/file/uploadTalentFile`
}))
}
......
src/main.js
......@@ -4,6 +4,7 @@ import router from './router'
import ElementUI from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css'
import { getToken } from "./utils/auth";
import 'default-passive-events'
Vue.use(ElementUI)
Vue.config.productionTip = false
......
src/utils/axios.js
import axios from "axios";
import { baseUrl } from "@/config";
import { getToken } from "@/utils/auth";
import {
Message
} from "element-ui";
import {
baseUrl
} from "@/config";
import {
getToken
} from "@/utils/auth";
import router from "@/router";
const api = axios.create({
baseURL: `${baseUrl}`,
......@@ -13,7 +20,10 @@ api.interceptors.request.use(
if (config.data) config.data.appId = appId;
return config;
},
(error) => ({ status: 0, msg: error.message })
(error) => ({
status: 0,
msg: error.message
})
);
// 请求返回
api.interceptors.response.use(
......@@ -40,7 +50,7 @@ api.interceptors.response.use(
error.response.data.status == 500
) {
window.localStorage.clear();
router.push("/login");
router.replace("/login");
}
return Promise.resolve(returnData);
}
......@@ -57,6 +67,10 @@ const checkCode = (res) => {
msg: res.data.message,
};
return returnData;
} else if (res.data.code == 401) {
Message.error('登录已失效，请重新登录')
window.localStorage.clear();
router.replace('/login')
} else {
//统一处理错误
const returnData = {
......@@ -90,7 +104,7 @@ const formatParams = (method = "GET", params, type) => {
}
let headers = {
"Content-Type": contentType,
"Authorization": getToken() ? ( 'Bearer ' + getToken()) : "",
"Authorization": getToken() ? ('Bearer ' + getToken()) : "",
};
// appId设置
// 如果接口需要序列化 type == 'qs'
......@@ -111,23 +125,23 @@ const formatParams = (method = "GET", params, type) => {
case "DOWNLOAD":
return {
responseType: type,
headers,
method: "POST",
data: params,
headers,
method: "POST",
data: params,
};
case "PUT":
return {
responseType: type,
headers,
method,
data: params,
headers,
method,
data: params,
};
case "DELETE":
return {
responseType: type,
headers,
method,
data: params,
headers,
method,
data: params,
};
case "GET":
return {
......@@ -144,4 +158,8 @@ const formatParams = (method = "GET", params, type) => {
}
};
export { api, formatParams, baseUrl };
\ No newline at end of file
export {
api,
formatParams,
baseUrl
};
\ No newline at end of file
src/views/Deedtax/house.vue
......@@ -571,8 +571,9 @@ export default {
} else {
// 生产环境
// http跨域 ---> https
let a = url.substr(0, 4) + 's' + url.substr(4)
window.location.href = a
// let a = url.substr(0, 4) + 's' + url.substr(4)
// window.location.href = a
window.location.href = url
}
},
view(row) {
......
src/views/Deedtax/index.vue
......@@ -14,8 +14,7 @@
(this.searchForm.departmentCode == '10000032' &&
this.realEstateArea != '句容市')
">
<el-select v-model="searchForm.checkArealEstateArea" placeholder="请选择不动产坐落辖市区" @change="onSubmit"
size="medium">
<el-select v-model="searchForm.checkArealEstateArea" placeholder="请选择不动产坐落辖市区" @change="onSubmit" size="medium">
<el-option v-for="item in areaList" :key="item.id" :label="item.label" :value="item.id">
</el-option>
</el-select>
......@@ -169,7 +168,7 @@
</p>
<p class="value" v-if="viewDetail.deedBillCode && viewDetail.secondDeedBillCode">
NO.{{ viewDetail.deedBillCode }}、NO.{{
viewDetail.secondDeedBillCode
viewDetail.secondDeedBillCode
}}
</p>
</div>
......@@ -201,11 +200,11 @@
<p class="label">房屋属性</p>
<p class="value">
{{
viewDetail.houseType == 1
? "商品房"
: viewDetail.houseType == 2
? "二手房"
: "-"
viewDetail.houseType == 1
? "商品房"
: viewDetail.houseType == 2
? "二手房"
: "-"
}}
</p>
</div>
......@@ -262,8 +261,8 @@
<el-form label-width="120px" :model="params">
<el-row>
<el-form-item label="改派部门">
<el-cascader v-model="params.checkArea" placeholder="请选择部门" :options="checkAreaList"
:show-all-levels="false" @change="handleChange">
<el-cascader v-model="params.checkArea" placeholder="请选择部门" :options="checkAreaList" :show-all-levels="false"
@change="handleChange">
</el-cascader>
</el-form-item>
</el-row>
......@@ -602,7 +601,7 @@ export default {
};
queryListDeedTaxFromInitDepartment(parmas).then((res) => {
this.loading = false;
console.log(res.data)
// console.log(res.data)
if (res.success) {
this.pagination.total = res.data.total;
if (res.data.total) {
......@@ -688,7 +687,7 @@ export default {
record(row) {
// console.log(row);
queryDeedTaxRecord({ code: row.code }).then((res) => {
console.log(res.data);
// console.log(res.data);
let reason = [];
res.data.map((item) => {
if (item) {
......@@ -864,7 +863,7 @@ export default {
});
console.log("out----", out);
uploadWordFile(
new File([out], "deed-text" + new Date().valueOf(), {
new File([out], "deed-text" + new Date().valueOf() + ".docx", {
type: out.type,
})
).then((res) => {
......
src/views/Policy/house.vue
......@@ -24,7 +24,7 @@
@Jump="jumpPage">
<el-table-column slot="housingType" label="事项类型" align="center">
<template slot-scope="scope">
<el-tag>{{scope.row.housingType == 2 ? '住房' : scope.row.housingType == 3 ? '商办' : '-'}}</el-tag>
<el-tag>{{ scope.row.housingType == 2 ? '住房' : scope.row.housingType == 3 ? '商办' : '-' }}</el-tag>
</template>
</el-table-column>
<el-table-column width="120" label="状态" align="center">
......@@ -51,8 +51,12 @@
</el-button>
<el-button v-if="
scope.row.housingState === 3 &&
searchForm.departmentCode === '10000031'
searchForm.departmentCode === '10000031'
" type="success" size="mini" round @click="dispatch(scope.row)">发放补贴</el-button>
<el-button v-if="
scope.row.attachedFileMark === true &&
searchForm.departmentCode === '10000031'
" type="info" size="mini" round @click="viewUrl(scope.row)">查看附件</el-button>
</template>
</el-table-column>
</table-template>
......@@ -74,7 +78,8 @@
</div>
<div class="cell">
<p class="label">市契税系统</p>
<p class="value">{{ viewDetail.tradeStatus === 0 ? '未支付' : viewDetail.tradeStatus === 1 ? '已支付' : viewDetail.tradeStatus === 2 ? '不予发放' : '未审核' }}</p>
<p class="value">{{ viewDetail.tradeStatus === 0 ? '未支付' : viewDetail.tradeStatus === 1 ? '已支付' :
viewDetail.tradeStatus === 2 ? '不予发放' : '未审核' }}</p>
</div>
<!-- 新增功能end -->
<div class="cell">
......@@ -150,11 +155,12 @@
</el-image>
</p>
</div>
<div class="cell">
<div class="cell" v-if="viewDetail.idCardPicture && viewDetail.idCardPicture.length > 0">
<p class="label">身份证照片</p>
<p class="value">
<el-image style="width: 100px; height: 100px" :src="viewDetail.idCardPicture" :z-index="7777777"
:preview-src-list="[viewDetail.idCardPicture]">
<el-image v-for="(item, index) in viewDetail.idCardPicture" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="item.picture" :z-index="7777777"
:preview-src-list="[item.picture]">
</el-image>
</p>
</div>
......@@ -209,6 +215,31 @@
<p v-if="record.length === 0">暂无记录~</p>
</div>
</el-dialog>
<el-dialog title="查看附件" :visible.sync="showUrl" width="500px" :close-on-press-escape="false">
<div style="margin: 0 0 0 10px;font-weight: 700;">图片附件：</div>
<div class="content" style="display:flex;flex-wrap:wrap;" v-if="pictureUrlList.length > 0">
<div v-for="(item, index) in pictureUrlList" :key="index">
<el-image style="width: 95px; height: 95px; margin: 10px;" :src="item.file"
:preview-src-list="[item.file]"></el-image>
</div>
</div>
<div class="content" style="display:flex;justify-content: center;" v-if="pictureUrlList.length == 0">
<el-empty :image-size="50"></el-empty>
</div>
<div style="margin: 0 0 0 10px;font-weight: 700;">文件附件：</div>
<div class="content" style="display:flex;flex-direction:column;flex-wrap:wrap;" v-if="fileUrlList.length > 0">
<div v-for="(item, index) in fileUrlList" :key="index"
style="margin: 10px 10px 0 10px; display:flex; align-items:center; justify-content: space-between;">
<p class="label" style="margin: 0;text-align:center;">{{ item.fileExplain }}</p>
<el-button size="mini" type="primary" @click="
download(item.file)
" class="down-text">下载附件</el-button>
</div>
</div>
<div class="content" style="display:flex;justify-content: center;" v-if="fileUrlList.length == 0">
<el-empty :image-size="50"></el-empty>
</div>
</el-dialog>
</div>
</template>
......@@ -222,13 +253,17 @@ import {
mattersHousingUpdate,
mattersHousingGet,
mattersHousingReason,
mattersGetReason
mattersGetReason,
queryAttacheFile
} from "@/api/policy";
export default {
components: { TableTemplate },
data() {
return {
showUrl: false,
pictureUrlList: [],
fileUrlList: [],
userName: "",
searchForm: {
name: "",
......@@ -379,6 +414,36 @@ export default {
}
},
methods: {
download(url) {
console.log(url)
let fileType = url.split(".")[url.split('.').length - 1]
if (fileType == 'pdf' || fileType == 'PDF') {
window.open(url)
} else {
window.location.href = url
}
},
viewUrl(row) {
console.log(row)
queryAttacheFile({ code: row.code }).then((res) => {
console.log(res)
if (res.success) {
this.pictureUrlList = res.data.filter((item) => {
let fileType = item.fileExplain.split(".")[item.fileExplain.split('.').length - 1]
return fileType == 'jpg' || fileType == 'jpeg' || fileType == 'png'
})
this.fileUrlList = res.data.filter((item) => {
let fileType = item.fileExplain.split(".")[item.fileExplain.split('.').length - 1]
return fileType != 'jpg' && fileType != 'jpeg' && fileType != 'png'
})
console.log(this.pictureUrlList)
console.log(this.fileUrlList)
this.showUrl = true
} else {
this.$message.error(res.msg || '查询失败');
}
})
},
init() {
this.tableData = [];
this.loading = true;
......@@ -462,9 +527,11 @@ export default {
this.viewDetail.phone = setTel(this.viewDetail.phone)
this.viewDetail.idCard = setCertNo(this.viewDetail.idCard)
}
this.viewDetail.idCardPicture = res.data.pictureList.find(item => {
return item.pictureType === 1;
}).picture;
this.viewDetail.idCardPicture = res.data.pictureList.filter(item => {
return (
item.pictureType === 1
)
});
this.viewDetail.bankPicture = res.data.pictureList.filter((item) => {
return (
item.pictureType === 8
......
yarn.lock
......@@ -3152,6 +3152,11 @@
dependencies:
"execa" "^3.3.0"
"default-passive-events@^2.0.0":
"integrity" "sha512-eMtt76GpDVngZQ3ocgvRcNCklUMwID1PaNbCNxfpDXuiOXttSh0HzBbda1HU9SIUsDc02vb7g9+3I5tlqe/qMQ=="
"resolved" "https://registry.npmmirror.com/default-passive-events/-/default-passive-events-2.0.0.tgz"
"version" "2.0.0"
"defaults@^1.0.3":
"integrity" "sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA=="
"resolved" "https://registry.npmmirror.com/defaults/-/defaults-1.0.3.tgz"
......
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