32435f18 by xiaomiao

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

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