Skip to content

Z
zj-manage
Commit 740a261f by zhangbin
Options

gx

parent 3e5eb55b
Showing with 768 additions and 321 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`
}))
}
......@@ -178,3 +173,12 @@ export function dtSubsidy(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'
......@@ -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>
......@@ -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">
......@@ -53,6 +53,10 @@
scope.row.housingState === 3 &&
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
......
src/views/Policy/housemain.vue
......@@ -3,13 +3,14 @@
<div class="search-wrapper">
<el-form :inline="true" :model="searchForm" class="search_form" style="text-align: left">
<el-form-item label="姓名">
<el-input v-model="searchForm.name" placeholder="请输入姓名" @keyup.enter.native="onSubmit"></el-input>
<el-input v-model="searchForm.name" size="small" placeholder="请输入姓名" @keyup.enter.native="onSubmit"></el-input>
</el-form-item>
<el-form-item label="手机号码">
<el-input v-model="searchForm.phone" placeholder="请输入手机号码" @keyup.enter.native="onSubmit"></el-input>
<el-input v-model="searchForm.phone" size="small" placeholder="请输入手机号码"
@keyup.enter.native="onSubmit"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button>
<el-button type="primary" size="small" @click="onSubmit">查询</el-button>
</el-form-item>
<br />
<el-form-item label="状态" style="margin-top: 10px">
......@@ -45,6 +46,10 @@
<el-button type="success" size="mini" round @click="passFinal(scope.row)">终审通过</el-button>
<el-button type="danger" size="mini" round @click="deny(scope.row)">终审拒绝</el-button>
</template>
<el-button v-if="
scope.row.attachedFileMark === true &&
searchForm.departmentCode === '10000027'
" type="info" size="mini" round @click="viewUrl(scope.row)">查看附件</el-button>
</template>
</el-table-column>
</table-template>
......@@ -66,7 +71,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">
......@@ -146,11 +152,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>
......@@ -205,18 +212,64 @@
<p v-if="record.length === 0">暂无记录~</p>
</div>
</el-dialog>
<el-dialog title="终审通过" :visible.sync="finalShow" width="500px" :close-on-press-escape="false">
<div class="content">
<div class="cell1">
<p class="label" style="margin: 0 0 10px 0">请输入原因：</p>
<el-input type="textarea" placeholder="请输入通过原因" v-model="textarea" maxlength="50" show-word-limit></el-input>
</div>
<div class="cell1">
<p class="label">请上传附件：</p>
<el-upload class="upload-demo" name="file" action="string" :limit="1" :show-file-list="true"
:on-remove="handleRemove" :on-error="handleError" :on-exceed="handleExceed" ref="dmtUploadFile"
:file-list="fileList" :http-request="uploadFile">
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip" style="color: #F56C6C">支持上传jpg/png/doc/docx/xls/xlsx/pdf等文件</div>
</el-upload>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="finalShow = false">取 消</el-button>
<el-button type="primary" @click="passFinal1">确 定</el-button>
</span>
</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>
<script>
import TableTemplate from "@/components/Table";
import { changeList,setName,setTel,setCertNo } from "@/utils";
import { changeList, setName, setTel, setCertNo } from "@/utils";
import { get } from "@/api/talents";
import docxtemplater from "docxtemplater";
import PizZip from "pizzip";
import JSZipUtils from "jszip-utils";
import { saveAs } from "file-saver";
import { uploadWordFile } from "@/api/upload";
import { uploadWordFile, uploadTalentFile } from "@/api/upload";
import {
mattersHousingList,
......@@ -224,12 +277,21 @@ import {
mattersHousingGet,
mattersGetReason,
mattersHousingReason,
queryAttacheFile
} from "@/api/policy";
export default {
components: { TableTemplate },
data() {
return {
showUrl: false,
pictureUrlList: [],
fileUrlList: [],
finalShow: false,
textarea: "",
fileList: [],
rowDetail: {},
fileUrl1: [],
userName: "",
searchForm: {
name: "",
......@@ -406,6 +468,69 @@ export default {
};
},
methods: {
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 || '查询失败');
}
})
},
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
}
},
handleExceed(files, fileList) {
console.log(files, fileList)
this.$message.warning(`最多上传1个文件！`);
},
handleRemove(file, fileList) {
console.log(file, fileList);
this.fileUrl1 = this.fileUrl1.filter((item) => {
return item.fileExplain != file.name
})
console.log(this.fileUrl1)
},
handleError(err, file, fileList) {
console.log('err,file,fileList', err, file, fileList)
},
uploadFile(param) {
const link = document.createElement("a");
link.style.display = "none";
uploadTalentFile(param.file).then((res) => {
console.log('res', res);
if (res.success) {
this.$message.success(res.msg || "上传成功");
this.fileUrl1.push({ fileExplain: param.file.name, file: res.data })
} else {
// 上传失败删除列表展示
this.$refs.dmtUploadFile.uploadFiles.splice(this.$refs.dmtUploadFile.uploadFiles.indexOf(res), 1);
console.log(this.$refs.dmtUploadFile.uploadFiles)
this.$message.error(res.msg || "上传失败");
}
}).catch((err) => {
this.fileList = []
this.$message.error(err.msg || "上传失败");
});
},
init() {
this.loading = true;
let parmas = {
......@@ -433,6 +558,8 @@ export default {
} else {
this.tableData = []
}
} else {
this.$message.error("网络错误");
}
});
},
......@@ -490,9 +617,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
......@@ -609,7 +738,7 @@ export default {
"人才购房契税补贴(住宅)申请表"
);
}
});
})
// }
})
.catch(() => {
......@@ -618,14 +747,14 @@ export default {
},
// 填充模板代码 ---
initTemplate(res, row, value, tepname) {
console.log('res-----',res)
console.log('row-----',row)
console.log('value-----',value)
console.log('tepname-----',tepname)
console.log('1-----',this.realEstateAddress)
console.log('2-----',this.square)
console.log('3-----',this.realEstateCard)
console.log('4-----',this.address)
// console.log('res-----',res)
// console.log('row-----',row)
// console.log('value-----',value)
// console.log('tepname-----',tepname)
// console.log('1-----',this.realEstateAddress)
// console.log('2-----',this.square)
// console.log('3-----',this.realEstateCard)
// console.log('4-----',this.address)
let that = this;
let arr = res.data;
arr.name = arr.name ? arr.name : ""; // 姓名
......@@ -693,7 +822,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) => {
......@@ -707,12 +836,12 @@ export default {
fileUrl: res.data,
};
mattersHousingUpdate(params).then((res) => {
// console.log("复审通过后的返回值---", res);
console.log("复审通过后的返回值---", res);
if (res.success) {
that.$message.success(`复审通过`);
that.init();
} else {
this.$message.error(res.msg || '审核失败');
that.$message.error(res.msg || '审核失败');
}
});
});
......@@ -722,37 +851,38 @@ export default {
});
},
passFinal(row) {
this.$prompt(`确定通过该申请的终审吗?`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
inputPlaceholder: "请输入原因",
inputType: "textarea",
type: "warning",
})
.then(({ value }) => {
if (!value) {
console.log(row)
this.rowDetail = row
this.fileList = []
this.fileUrl1 = []
this.finalShow = true
},
passFinal1() {
if (!this.textarea) {
this.$message.error("未输入原因");
return;
}
if (this.fileUrl1.length == 0) {
this.$message.error("未上传附件");
return;
}
let params = {
code: row.code,
code: this.rowDetail.code,
name: this.userName,
state: 3,
reason: value,
reviewerId: row.reviewerId,
reason: this.textarea,
reviewerId: this.rowDetail.reviewerId,
attachedPictureUploadDTO: this.fileUrl1
};
mattersHousingUpdate(params).then((res) => {
if (res.success) {
this.finalShow = false
this.$message.success(`资料终审通过`);
this.init();
} else {
this.$message.error(res.msg || '审核失败');
}
});
})
.catch(() => {
// console.log("取消审核");
});
},
deny(row) {
this.$prompt(`确定驳回该申请的审核吗?`, "提示", {
......
src/views/Policy/talentwindow.vue
<template>
<div class="policy">
<div class="search-wrapper">
<el-form
:inline="true"
:model="searchForm"
class="search_form"
style="text-align: left"
>
<el-form :inline="true" :model="searchForm" class="search_form" style="text-align: left">
<el-form-item label="姓名">
<el-input
v-model="searchForm.name"
placeholder="请输入姓名"
@keyup.enter.native="onSubmit"
></el-input>
<el-input v-model="searchForm.name" placeholder="请输入姓名" @keyup.enter.native="onSubmit"></el-input>
</el-form-item>
<el-form-item label="手机号码">
<el-input
v-model="searchForm.phone"
placeholder="请输入手机号码"
@keyup.enter.native="onSubmit"
></el-input>
<el-input v-model="searchForm.phone" placeholder="请输入手机号码" @keyup.enter.native="onSubmit"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button>
......@@ -27,52 +14,28 @@
<br />
<el-form-item label="状态" style="margin-top: 10px">
<el-radio-group v-model="searchForm.state" @change="onSubmit">
<el-radio
:label="item.state"
v-for="item in stateList"
:key="item.state"
>{{ item.stateName }}</el-radio
>
<el-radio :label="item.state" v-for="item in stateList" :key="item.state">{{ item.stateName }}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
</div>
<div class="table-wrapper">
<table-template
:tableData="tableData"
:tableColumns="tableColumns"
:loading="loading"
:pagination="pagination"
@Jump="jumpPage"
>
<table-template :tableData="tableData" :tableColumns="tableColumns" :loading="loading" :pagination="pagination"
@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"
key="stateName"
prop="stateName"
label="状态"
align="center"
>
<el-table-column width="120" key="stateName" prop="stateName" label="状态" align="center">
<template slot-scope="scope">
<el-tag :type="scope.row.type">{{ scope.row.stateName }}</el-tag>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="380" align="left">
<template slot-scope="scope">
<el-button type="primary" size="mini" round @click="view(scope.row)"
>查看</el-button
>
<el-button
type="primary"
size="mini"
round
@click="record(scope.row)"
>记录</el-button
>
<el-button type="primary" size="mini" round @click="view(scope.row)">查看</el-button>
<el-button type="primary" size="mini" round @click="record(scope.row)">记录</el-button>
<!-- 待复审的单子有通过拒绝-->
<!-- <template v-if="scope.row.state === 1">
<el-button
......@@ -91,13 +54,7 @@
>
</template> -->
<template v-if="scope.row.state === 6">
<el-button
type="success"
size="mini"
round
@click="passData(scope.row)"
>资料通过</el-button
>
<el-button type="success" size="mini" round @click="passData(scope.row)">资料通过</el-button>
</template>
<!-- <template v-if="scope.row.state === 2">
<el-button
......@@ -119,12 +76,7 @@
</el-table-column>
</table-template>
</div>
<el-dialog
title="申报详情"
:visible.sync="viewShow"
width="800px"
:close-on-press-escape="false"
>
<el-dialog title="申报详情" :visible.sync="viewShow" width="800px" :close-on-press-escape="false">
<div class="content">
<!-- 新增start -->
<el-table :data="totalList" style="width: 100%">
......@@ -141,7 +93,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">
......@@ -217,53 +170,37 @@
</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>
<div class="cell">
<p class="label">商品房买卖合同3张</p>
<p class="value">
<el-image
v-for="(item, index) in viewDetail.contract"
:key="index"
style="width: 100px; height: 100px; margin-right: 10px"
:src="item.picture"
:z-index="7777777"
:preview-src-list="[item.picture]"
>
<el-image v-for="(item, index) in viewDetail.contract" :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>
<div class="cell">
<p class="label">不动产权证书</p>
<p class="value">
<el-image
style="width: 100px; height: 100px"
:src="viewDetail.certificate"
:z-index="7777777"
:preview-src-list="[viewDetail.certificate]"
>
<el-image style="width: 100px; height: 100px" :src="viewDetail.certificate" :z-index="7777777"
:preview-src-list="[viewDetail.certificate]">
</el-image>
</p>
</div>
<div class="cell">
<p class="label">契税完税凭证</p>
<p class="value">
<el-image
style="width: 100px; height: 100px"
:src="viewDetail.voucher"
:z-index="7777777"
:preview-src-list="[viewDetail.voucher]"
>
<el-image style="width: 100px; height: 100px" :src="viewDetail.voucher" :z-index="7777777"
:preview-src-list="[viewDetail.voucher]">
</el-image>
</p>
</div>
......@@ -278,12 +215,7 @@
</div>
</div>
</el-dialog>
<el-dialog
title="操作记录"
:visible.sync="recordShow"
width="800px"
:close-on-press-escape="false"
>
<el-dialog title="操作记录" :visible.sync="recordShow" width="800px" :close-on-press-escape="false">
<div class="content">
<div class="cell" v-for="item in recordList" :key="item.createTime">
<p class="label" style="margin-right: 20px">
......@@ -303,7 +235,7 @@
<script>
import TableTemplate from "@/components/Table";
import { changeList,setName,setTel,setCertNo } from "@/utils";
import { changeList, setName, setTel, setCertNo } from "@/utils";
// import { get } from "@/api/talents";
import {
mattersHousingList,
......@@ -565,9 +497,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
......
src/views/Purchase/details.vue
......@@ -46,14 +46,16 @@
<el-button type="primary" size="mini" round @click="view(scope.row)">查看</el-button>
<el-button type="primary" size="mini" round @click="record(scope.row)">记录</el-button>
<!-- 申请的单子有通过拒绝-->
<el-button v-if="scope.row.houseState === 0 && scope.row.reviewerState === 0" type="success" size="mini"
round @click="pass(scope.row)">通过</el-button>
<el-button v-if="scope.row.houseState === 0 && scope.row.reviewerState === 0" type="danger" size="mini"
round @click="deny(scope.row)">拒绝</el-button>
<el-button v-if="scope.row.houseState === 0 && scope.row.reviewerState === 0" type="success" size="mini" round
@click="pass(scope.row)">通过</el-button>
<el-button v-if="scope.row.houseState === 0 && scope.row.reviewerState === 0" type="danger" size="mini" round
@click="deny(scope.row)">拒绝</el-button>
<el-button v-if="
scope.row.houseState === 3 &&
searchForm.departmentCode === '10000031'
" type="success" size="mini" round @click="dispatch(scope.row)">发放补贴</el-button>
<el-button v-if="scope.row.attachedFileMark === true" type="info" size="mini" round
@click="viewUrl(scope.row)">查看附件</el-button>
</template>
</el-table-column>
</table-template>
......@@ -191,9 +193,8 @@
<p class="label">个人申请表</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 3" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 3" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -202,9 +203,8 @@
<p class="label">身份证照片</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 4" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 4" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -213,9 +213,8 @@
<p class="label">个人银行卡照</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 5" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 5" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -224,9 +223,8 @@
<p class="label">商品买卖合同</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 6" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 6" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -235,9 +233,8 @@
<p class="label">不动产权证书</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 7" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 7" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -246,9 +243,8 @@
<p class="label">契税完税凭证</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 8" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 8" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -257,9 +253,8 @@
<p class="label">劳动或聘用合同</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 9" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 9" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -306,6 +301,35 @@
<el-button @click="affirm" type="primary">确认</el-button>
</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>
......@@ -321,12 +345,16 @@ import {
mattersHouseReviewerReject,
mattersHousePass,
mattersHouseStaffList,
queryAttacheFile,
} from "@/api/purchase";
export default {
components: { TableTemplate },
data() {
return {
showUrl: false,
pictureUrlList: [],
fileUrlList: [],
options: [
{
value: "",
......@@ -358,14 +386,16 @@ export default {
},
guideIdList: [
{
label: '全部',
value: null
}, {
label: '购房补贴申领服务指南',
value: '1000126'
}, {
label: '镇江市市区“归雁”人才购房补贴',
value: '1000159'
label: "全部",
value: null,
},
{
label: "购房补贴申领服务指南",
value: "1000126",
},
{
label: "镇江市市区“归雁”人才购房补贴",
value: "1000159",
},
],
stateList: [
......@@ -488,7 +518,7 @@ export default {
},
viewShow: false,
viewDetail: {
guideName: '',
guideName: "",
enterprise: {
businessLicenseList: [],
summarySheetList: [],
......@@ -507,18 +537,54 @@ export default {
watch: {
$route() {
if (this.$route) {
this.userName = localStorage.getItem('userName');
this.searchForm.departmentCode = this.$route.query.departmentCode
this.searchForm.name = ''
this.searchForm.phone = ''
this.searchForm.state = ''
this.userName = localStorage.getItem("userName");
this.searchForm.departmentCode = this.$route.query.departmentCode;
this.searchForm.name = "";
this.searchForm.phone = "";
this.searchForm.state = "";
this.init();
}
}
},
},
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.houseCode }).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.tableData = [];
this.loading = true;
let parmas = {
name: this.searchForm.name,
......@@ -544,11 +610,11 @@ export default {
}
return item;
});
if (localStorage.getItem('userName') == 'admin') {
this.tableData = changeList(this.tableData)
if (localStorage.getItem("userName") == "admin") {
this.tableData = changeList(this.tableData);
}
} else {
this.tableData = []
this.tableData = [];
}
}
});
......@@ -596,7 +662,7 @@ export default {
this.totalList = this.examineList.concat(this.housingList);
});
mattersHouseGetInfo(params2).then((res) => {
console.log(res.data);
// console.log(res.data);
this.viewDetail.guideName = res.data.guideName;
this.viewDetail.enterprise = res.data.enterpriseVO;
this.viewDetail.enterprise.businessLicenseList =
......@@ -608,10 +674,14 @@ export default {
return item.pictureType != 1;
});
this.viewDetail.appliList = res.data.staffVOList;
if (localStorage.getItem('userName') == 'admin') {
this.viewDetail.enterprise.contactUser = setName(this.viewDetail.enterprise.contactUser)
this.viewDetail.enterprise.contactMobile = setTel(this.viewDetail.enterprise.contactMobile)
this.viewDetail.appliList = changeList(res.data.staffVOList)
if (localStorage.getItem("userName") == "admin") {
this.viewDetail.enterprise.contactUser = setName(
this.viewDetail.enterprise.contactUser
);
this.viewDetail.enterprise.contactMobile = setTel(
this.viewDetail.enterprise.contactMobile
);
this.viewDetail.appliList = changeList(res.data.staffVOList);
}
this.viewShow = true;
});
......@@ -627,7 +697,7 @@ export default {
let housingReason = res.data;
// 查询住建局的记录 mattersHouseReason
mattersHouseReason(params).then((res) => {
console.log(res.data);
// console.log(res.data);
let getReason = res.data;
let reason = housingReason.concat(getReason);
this.recordList = reason.map((item) => {
......@@ -726,7 +796,7 @@ export default {
reason: item.remark,
rejectType: 1,
};
} else if (item.test.length == 0 || item.remark == '') {
} else if (item.test.length == 0 || item.remark == "") {
this.$alert("请将拒绝原因填写完整！");
}
}),
......@@ -790,9 +860,9 @@ export default {
},
},
created() {
this.userName = localStorage.getItem('userName');
this.userName = localStorage.getItem("userName");
// 10000031 财政局code 10000032 税务局code 10000033 不动产登记中心code 10000023 人社局code 10000027 住建局
this.searchForm.departmentCode = this.$route.query.departmentCode
this.searchForm.departmentCode = this.$route.query.departmentCode;
this.init();
},
};
......
src/views/Purchase/index.vue
......@@ -33,7 +33,7 @@
<el-tag :type="scope.row.type">{{ scope.row.stateName }}</el-tag>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="380" align="left">
<el-table-column fixed="right" label="操作" width="420" align="left">
<template slot-scope="scope">
<el-button type="primary" size="mini" round @click="view(scope.row)">查看</el-button>
<el-button type="primary" size="mini" round @click="record(scope.row)">记录</el-button>
......@@ -46,6 +46,9 @@
<el-button type="success" size="mini" round @click="passFinal(scope.row)">终审通过</el-button>
<el-button type="danger" size="mini" round @click="deny(scope.row)" m>终审拒绝</el-button>
</template>
<template v-if="scope.row.attachedFileMark === true">
<el-button type="info" size="mini" round @click="viewUrl(scope.row)">查看附件</el-button>
</template>
</template>
</el-table-column>
</table-template>
......@@ -183,9 +186,8 @@
<p class="label">个人申请表</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 3" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 3" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -194,9 +196,8 @@
<p class="label">身份证照片</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 4" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 4" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -205,9 +206,8 @@
<p class="label">个人银行卡照</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 5" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 5" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -216,9 +216,8 @@
<p class="label">商品买卖合同</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 6" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 6" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -227,9 +226,8 @@
<p class="label">不动产权证书</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 7" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 7" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -238,9 +236,8 @@
<p class="label">契税完税凭证</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 8" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 8" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -249,9 +246,8 @@
<p class="label">劳动或聘用合同</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 9" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 9" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -298,6 +294,29 @@
<el-button @click="affirm" type="primary">确认</el-button>
</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>
......@@ -312,12 +331,16 @@ import {
mattersHouseStaffList,
mattersHouseReject,
mattersHousePass,
queryAttacheFile
} from "@/api/purchase";
export default {
components: { TableTemplate },
data() {
return {
showUrl: false,
pictureUrlList: [],
fileUrlList: [],
options: [
{
value: "",
......@@ -538,6 +561,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.houseCode }).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;
......@@ -648,7 +701,7 @@ export default {
let getReason = res.data;
// 查询四个部门的记录 mattersHouseRevieweReason
mattersHouseRevieweReason(params).then((res) => {
console.log(res.data);
// console.log(res.data);
let housingReason = res.data;
let reason = housingReason.concat(getReason);
this.recordList = reason.map((item) => {
......
src/views/Purchase/windows.vue
......@@ -41,6 +41,9 @@
<template v-if="scope.row.state === 6">
<el-button type="success" size="mini" round @click="passData(scope.row)">资料通过</el-button>
</template>
<template v-if="scope.row.attachedFileMark === true">
<el-button type="info" size="mini" round @click="viewUrl(scope.row)">查看附件</el-button>
</template>
</template>
</el-table-column>
</table-template>
......@@ -178,9 +181,8 @@
<p class="label">个人申请表</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 3" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 3" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -189,9 +191,8 @@
<p class="label">身份证照片</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 4" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 4" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -200,9 +201,8 @@
<p class="label">个人银行卡照</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 5" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 5" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -211,9 +211,8 @@
<p class="label">商品买卖合同</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 6" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 6" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -222,9 +221,8 @@
<p class="label">不动产权证书</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 7" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 7" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -233,9 +231,8 @@
<p class="label">契税完税凭证</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 8" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 8" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -244,9 +241,8 @@
<p class="label">劳动或聘用合同</p>
<p class="value">
<template v-for="(i, index) in item.pictureVoS">
<el-image v-if="i.pictureType == 9" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="i.picture" :z-index="7777777"
:preview-src-list="[i.picture]">
<el-image v-if="i.pictureType == 9" :key="index" style="width: 100px; height: 100px; margin-right: 10px"
:src="i.picture" :z-index="7777777" :preview-src-list="[i.picture]">
</el-image>
</template>
</p>
......@@ -268,7 +264,7 @@
</el-dialog>
<el-dialog title="操作记录" :visible.sync="recordShow" width="800px" :close-on-press-escape="false">
<div class="content">
<div class="cell" v-for="(item,index) in recordList" :key="index">
<div class="cell" v-for="(item, index) in recordList" :key="index">
<p class="label" style="margin-right: 20px">
{{ item.stateName }}
<span v-if="item.reason">({{ item.reason }})</span>
......@@ -281,6 +277,52 @@
<p v-if="record.length === 0">暂无记录~</p>
</div>
</el-dialog>
<el-dialog title="资料审核通过" :visible.sync="finalShow" width="500px" :close-on-press-escape="false">
<div class="content">
<div class="cell1">
<p class="label" style="margin: 0 0 10px 0">请输入原因：</p>
<el-input type="textarea" placeholder="请输入通过原因" v-model="textarea" maxlength="50" show-word-limit></el-input>
</div>
<div class="cell1">
<p class="label">请上传附件：</p>
<el-upload class="upload-demo" name="file" action="string" :limit="10" :show-file-list="true"
:on-remove="handleRemove" :on-error="handleError" :on-exceed="handleExceed" ref="dmtUploadFile"
:file-list="fileList" :http-request="uploadFile">
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip" style="color: #F56C6C">支持上传jpg/png/doc/docx/xls/xlsx/pdf等文件</div>
</el-upload>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="finalShow = false">取 消</el-button>
<el-button type="primary" @click="passData1">确 定</el-button>
</span>
</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>
......@@ -293,12 +335,23 @@ import {
mattersHouseReason,
mattersHouseGetInfo,
mattersHousePass,
queryAttacheFile
} from "@/api/purchase";
import { uploadTalentFile } from "@/api/upload";
export default {
components: { TableTemplate },
data() {
return {
showUrl: false,
pictureUrlList: [],
fileUrlList: [],
finalShow: false,
textarea: "",
fileList: [],
rowDetail: {},
fileUrl1: [],
userName: "",
searchForm: {
name: "",
......@@ -480,6 +533,69 @@ 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.houseCode }).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 || '查询失败');
}
})
},
handleExceed(files, fileList) {
console.log(files, fileList)
this.$message.warning(`最多上传10个文件！`);
},
handleRemove(file, fileList) {
console.log(file, fileList);
this.fileUrl1 = this.fileUrl1.filter((item) => {
return item.fileExplain != file.name
})
console.log(this.fileUrl1)
},
handleError(err, file, fileList) {
console.log('err,file,fileList', err, file, fileList)
},
uploadFile(param) {
const link = document.createElement("a");
link.style.display = "none";
uploadTalentFile(param.file).then((res) => {
console.log('res', res);
if (res.success) {
this.$message.success(res.msg || "上传成功");
this.fileUrl1.push({ fileExplain: param.file.name, file: res.data })
} else {
// 上传失败删除列表展示
this.$refs.dmtUploadFile.uploadFiles.splice(this.$refs.dmtUploadFile.uploadFiles.indexOf(res), 1);
console.log(this.$refs.dmtUploadFile.uploadFiles)
this.$message.error(res.msg || "上传失败");
}
}).catch((err) => {
this.fileList = []
this.$message.error(err.msg || "上传失败");
});
},
init() {
this.loading = true;
let parmas = {
......@@ -556,7 +672,7 @@ export default {
this.totalList = this.examineList.concat(this.housingList);
});
mattersHouseGetInfo(params2).then((res) => {
console.log(res.data);
// console.log(res.data);
this.viewDetail.guideName = res.data.guideName;
this.viewDetail.enterprise = res.data.enterpriseVO;
this.viewDetail.enterprise.businessLicenseList =
......@@ -587,7 +703,7 @@ export default {
let getReason = res.data;
// 查询四个部门的记录 mattersHouseRevieweReason
mattersHouseRevieweReason(params).then((res) => {
console.log(res.data);
// console.log(res.data);
let housingReason = res.data;
let reason = housingReason.concat(getReason);
this.recordList = reason.map((item) => {
......@@ -602,35 +718,38 @@ export default {
},
//资料审核
passData(row) {
this.$prompt(`确定通过该申请的资料审核吗?`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
inputPlaceholder: "请输入原因",
inputType: "textarea",
type: "warning",
})
.then(({ value }) => {
if (!value) {
console.log(row)
this.rowDetail = row
this.fileList = []
this.fileUrl1 = []
this.finalShow = true
},
passData1() {
if (!this.textarea) {
this.$message.error("未输入原因");
return;
}
if (this.fileUrl1.length == 0) {
this.$message.error("未上传附件");
return;
}
let params = {
appId: "1234",
code: row.houseCode,
code: this.rowDetail.houseCode,
name: this.userName,
state: 2,
reason: value,
reason: this.textarea,
attachedPictureUploadDTO: this.fileUrl1
};
mattersHousePass(params).then((res) => {
if (res.success) {
this.finalShow = false
this.$message.success(`资料审核通过`);
this.init();
} else {
this.$message.error(res.msg || `资料审核失败`);
}
});
})
.catch(() => {
// console.log("取消审核");
});
},
getSatusArr(state) {
return this.stateList.filter((item) => {
......
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