32435f18 by xiaomiao

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents f49cf06c 95689d6f
/*
* @Description: 材料信息
* @Autor: renchao
* @LastEditTime: 2023-05-16 14:04:42
* @LastEditTime: 2023-07-28 14:31:00
*/
import request from '@/utils/request'
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
......@@ -75,6 +75,22 @@ export function uploadSjClmx (data) {
}
/**
* @description: 上传duo个文件
* @param {*} data
* @author: renchao
*/
export function uploadBatch (data) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/clxx/uploadBatch',
method: 'post',
headers: {
'Content-Type': 'multipart/form-data'
},
data
})
}
/**
* @description: 删除上传文件
* @param {*} bsmClmx
* @author: renchao
......
/*
* @Description: 房地产权多幢接口
* @Autor: ssq
* @LastEditTime: 2023年07月27日 19:40:34
*/
import request from '@/utils/request'
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
/**
* @description: 初始化内容
* @param {*} data
* @author: 单帅旗
*/
export function Init (data) {
let apiUrl = "";
switch (data.get("djlx")) {
case "100":
apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq1lr/firstInit";
break;
case "200":
apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq1lr/transferInit";
break;
case "300":
apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq1lr/changeInit";
break;
case "400":
apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq1lr/logoutInit";
break;
case "500":
apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq1lr/riviseInit";
break;
case "901":
apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq1lr/renewalInit";
break;
case "902":
apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq1lr/replaceInit";
break;
}
return request({
url: apiUrl,
method: 'post',
data
})
}
/**
* @description: 首次登记提交
* @param {*} data
* @author: ssq
*/
export function saveBatchData (data) {
return request({
url: SERVER.SERVERAPI + "/rest/ywbl/fdcq1lr/saveBatchData",
method: 'post',
data
})
}
/**
* @description: 保存
* @param {*} data
* @author: ssq
*/
export function saveData (data) {
return request({
url: SERVER.SERVERAPI + "/rest/ywbl/fdcq1lr/saveData",
method: 'post',
data
})
}
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-04 11:14:25
* @LastEditTime: 2023-07-28 15:49:38
*/
const getters = {
sidebar: state => state.app.sidebar,
......@@ -20,6 +20,7 @@ const getters = {
djbxx: state => state.djbxx.djbxx,
// workflow
isRefresh: state => state.user.isRefresh,
workFresh: state => state.user.workFresh,
yjsqOptions: state => state.workflow.yjsqOptions
}
export default getters
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-04-12 10:47:33
* @LastEditTime: 2023-07-28 15:45:21
*/
import { getUserInfo } from '@/api/user'
const state = {
name: '',
avatar: 'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
isRefresh: false,
// 业务流程刷新
workFresh: false
}
const mutations = {
SET_NAME: (state, data) => {
......@@ -15,6 +17,9 @@ const mutations = {
},
REFRESH: (state, data) => {
state.isRefresh = data
},
SETWORKFRESH: (state, data) => {
state.workFresh = data
}
}
......@@ -29,6 +34,9 @@ const actions = {
refreshPage ({ commit }, data) {
commit('REFRESH', data)
},
reWorkFresh ({ commit }, data) {
commit('SETWORKFRESH', data)
}
}
export default {
namespaced: true,
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-04 16:07:37
* @LastEditTime: 2023-07-28 14:59:55
-->
<template>
<div class="rlPopup">
......@@ -50,7 +50,7 @@
<script>
import PhotoZoom from '@/components/PhotoZoom'
import { getAltimeterInfo, getUuid } from '@/utils/operation.js'
import { uploadSjClmx, deleteClmx } from "@/api/clxx.js";
import { uploadBatch, deleteClmx } from "@/api/clxx.js";
import publicPicture from '@/components/publicPicture/index.vue'
export default {
name: 'PreviewImage',
......@@ -77,7 +77,7 @@
scale: 1,
degree: 0
},
maxLength: 0,
maxFileLength: 0,
// 缩略图
thumbnailImages: [],
showViewer: false,
......@@ -252,26 +252,29 @@
* @param {*} files
* @author: renchao
*/
async handleChange (file, files) {
// 清空 fileList 数组
let length = files.length;
this.maxLength = Math.max(length, this.maxLength)
this.$refs.upload.clearFiles();
setTimeout(() => {
if (length !== this.maxLength) return
async handleChange (file, fileList) {
let length = fileList.length;
this.maxFileLength = Math.max(length, this.maxFileLength)
console.log(fileList, this.maxFileLength, 'this.maxFileLength');
var formData = new FormData();
files.forEach(file => {
formData.append('file', file.raw)
setTimeout(() => {
if (this.maxFileLength !== length) {
return
}
fileList.forEach(item => {
formData.append('file', item.raw)
})
formData.append("bsmSj", this.previewImg.bsmSj);
formData.append("bsmSlsq", this.previewImg.bsmSlsq);
uploadSjClmx(formData).then((res) => {
uploadBatch(formData).then((res) => {
if (res.code == 200) {
this.$emit('updateList', res.result)
this.$message({
message: '上传成功!',
type: 'success'
})
this.$refs.upload.clearFiles();
this.maxFileLength = 0
}
})
}, 0)
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-28 09:35:38
* @LastEditTime: 2023-07-28 11:37:31
-->
<template>
<div class="clxx">
......@@ -38,8 +38,7 @@
import clxxAddDialog from "../dialog/clxxAddDialog.vue";
import clxxDetailDialog from "../dialog/clxxDetailDialog.vue";
import imagePreview from '@/views/components/imagePreview.vue'
import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
import { popupDialog } from "@/utils/popup.js";
import { InitClml, saveClml } from "@/api/clxx.js";
export default {
components: { clxxAddDialog, imagePreview, clxxDetailDialog },
data () {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-25 11:13:07
* @LastEditTime: 2023-07-28 15:47:25
-->
<template>
<div>
......@@ -179,7 +179,7 @@
this.$popupCacel()
this.$message.success("提交成功")
//刷新列表
store.dispatch('user/refreshPage', true)
store.dispatch('user/reWorkFresh', true)
} else {
this.$message.error(res.message)
}
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-24 10:22:41
* @LastEditTime: 2023-07-28 15:45:56
-->
<template>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
......@@ -123,9 +123,6 @@
getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => {
if (res.code === 200) {
this.tableData.data = res.result.list;
if(this.tableData.data.length>0) {
this.ruleForm.lzrxm = this.tableData.data[0].qlr
}
this.ruleForm.fzrmc = res.result.fzrmc
this.ruleForm.fzsj = res.result.fzsj
this.ruleForm.fzsl = res.result.fzsl
......@@ -160,7 +157,7 @@
if (res.code == 200) {
this.$message.success('保存成功');
//刷新列表
store.dispatch('user/refreshPage', true)
store.dispatch('user/reWorkFresh', true)
this.$popupCacel()
} else {
this.$message.error(res.message)
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-25 09:26:10
* @LastEditTime: 2023-07-28 16:28:43
-->
<template>
<div class="from-clues">
......@@ -40,9 +40,11 @@
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import store from '@/store/index.js'
import table from "@/utils/mixin/table";
import { getCertificateList } from "@/api/bdcqz.js";
import { datas } from "../javascript/fzxxdata";
import { getCertificateList } from "@/api/bdcqz.js";
export default {
mixins: [table],
data () {
......@@ -66,6 +68,16 @@
created () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
},
computed: {
...mapGetters(['workFresh'])
},
watch: {
workFresh: {
handler (newVal, oldVal) {
if (newVal) this.queryClick()
}
}
},
methods: {
/**
* @description: queryClick
......@@ -84,6 +96,7 @@
* @author: renchao
*/
zslqClick () {
store.dispatch('user/reWorkFresh', false)
this.$popupDialog("不动产权证领取", "workflow/components/dialog/zslq", {}, '80%', true)
}
}
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-25 11:15:01
* @LastEditTime: 2023-07-28 15:46:24
-->
<template>
<div class="szxx">
......@@ -74,6 +74,7 @@
</template>
<script>
import { mapGetters } from 'vuex'
import store from '@/store/index.js'
import { getSlsqBdcqzList, invalidCertificate } from "@/api/bdcqz.js";
export default {
props: {},
......@@ -92,10 +93,10 @@
};
},
computed: {
...mapGetters(['isRefresh'])
...mapGetters(['workFresh'])
},
watch: {
isRefresh: {
workFresh: {
handler (newVal, oldVal) {
if (newVal) this.list()
}
......@@ -130,6 +131,7 @@
* @author: renchao
*/
openZsylDialog (item, type) {
store.dispatch('user/reWorkFresh', false)
if (type == 1) {
//证书预览
this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "70%", true);
......
......@@ -23,6 +23,9 @@ export function getForm(tabName, djywbm) {
form = require("@/views/ywbl/slsqxx/jsydsyq/slxx300.vue");
break;
//国有建设用地使用权/房屋所有权
case "fwsyqdzslxx":
form = require("@/views/ywbl/slsqxx/fdcq1/slxx.vue");
break;
case "fwsyqslxx100":
case "fwsyqslxx200":
case "fwsyqslxx400":
......