439724e9 by “miaofang

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

2 parents b4259648 b37ae4bd
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-14 15:05:38 4 * @LastEditTime: 2023-09-21 09:27:14
5 */ 5 */
6 import Vue from 'vue' 6 import Vue from 'vue'
7 import Popup from './index.vue' 7 import Popup from './index.vue'
...@@ -50,6 +50,8 @@ const Popup1 = (title, editItem, data, formData) => { ...@@ -50,6 +50,8 @@ const Popup1 = (title, editItem, data, formData) => {
50 let instance = new PopupBox({ 50 let instance = new PopupBox({
51 data 51 data
52 }).$mount() 52 }).$mount()
53 // 设置 z-index 并递增层级计数器
54 instance.zIndex = data.zIndexCounter++
53 document.body.appendChild(instance.$el) 55 document.body.appendChild(instance.$el)
54 Vue.nextTick(() => { 56 Vue.nextTick(() => {
55 instance.isShow = true 57 instance.isShow = true
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-19 10:19:52 4 * @LastEditTime: 2023-09-21 09:25:47
5 --> 5 -->
6 <template> 6 <template>
7 <transition name="msgbox-fade"> 7 <transition name="msgbox-fade">
8 <div class="ls-mask" v-if="myShow"> 8 <div class="ls-mask" ref="popup" v-if="myShow">
9 <div class="ls-mask-window" :class="isMain ? 'mainCenter' : 'contentCenter'" :style="{ 'width': width }"> 9 <div class="ls-mask-window" :class="isMain ? 'mainCenter' : 'contentCenter'" :style="{ 'width': width }">
10 <div class="ls-head"> 10 <div class="ls-head">
11 <div class="ls-title" :style="{ 'text-align': titleStyle }"> 11 <div class="ls-title" :style="{ 'text-align': titleStyle }">
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
30 name: 'index', 30 name: 'index',
31 data () { 31 data () {
32 return { 32 return {
33 zIndexCounter: 2000,
33 title: '标题', 34 title: '标题',
34 editItem: "", 35 editItem: "",
35 isMain: false, 36 isMain: false,
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-15 09:30:33 4 * @LastEditTime: 2023-09-21 09:39:21
5 --> 5 -->
6 <template> 6 <template>
7 <el-dialog 7 <el-dialog
...@@ -12,14 +12,6 @@ ...@@ -12,14 +12,6 @@
12 custom-class="insetDialog" 12 custom-class="insetDialog"
13 append-to-body 13 append-to-body
14 width="31%"> 14 width="31%">
15 <!-- <el-radio-group v-model="radio">
16 <el-radio-button
17 v-for="(value, key) in qllxlistdata"
18 :key="key"
19 :label="value"
20 ></el-radio-button>
21
22 </el-radio-group> -->
23 <el-button class="gettypebutton" v-for="(value, key) in qllxlistdata" 15 <el-button class="gettypebutton" v-for="(value, key) in qllxlistdata"
24 :key="key" 16 :key="key"
25 :label="value" @click="clicksss(key)" plain>{{value}}</el-button> 17 :label="value" @click="clicksss(key)" plain>{{value}}</el-button>
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-18 16:32:42 4 * @LastEditTime: 2023-09-21 09:55:21
5 */ 5 */
6 //流程环节操作按钮 6 //流程环节操作按钮
7 export function getForm (tabName) { 7 export function getForm (tabName) {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-19 09:12:32 4 * @LastEditTime: 2023-09-21 10:19:25
5 --> 5 -->
6 <template> 6 <template>
7 <div class="tableBox"> 7 <div class="tableBox">
...@@ -235,7 +235,10 @@ ...@@ -235,7 +235,10 @@
235 } else { 235 } else {
236 getBlParamsByYwh(ywh, bsmQlxx).then(res => { 236 getBlParamsByYwh(ywh, bsmQlxx).then(res => {
237 let data = res.result 237 let data = res.result
238 ywPopupDialog("材料信息", "registerBook/components/clxx/index", data, "60%", true, false) 238 this.$popup('材料信息', 'registerBook/components/clxx/index', {
239 width: '60%',
240 formData: data
241 })
239 }) 242 })
240 } 243 }
241 } 244 }
......
1 <!-- 1 <!--
2 * @Description: workFrame左侧菜单列表-普通 2 * @Description: workFrame左侧菜单列表-普通
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-20 15:46:25 4 * @LastEditTime: 2023-09-21 10:46:05
5 --> 5 -->
6 <template> 6 <template>
7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
...@@ -90,9 +90,6 @@ ...@@ -90,9 +90,6 @@
90 let that = this 90 let that = this
91 var formdata = new FormData(); 91 var formdata = new FormData();
92 formdata.append("bsmSlsq", this.bsmSlsq); 92 formdata.append("bsmSlsq", this.bsmSlsq);
93 if (this.$route.query.bestepid) {
94 formdata.append("bestepid", this.bestepid);
95 }
96 if (this.$route.query.bsmBusiness) { 93 if (this.$route.query.bsmBusiness) {
97 formdata.append("bsmBusiness", this.$route.query.bsmBusiness); 94 formdata.append("bsmBusiness", this.$route.query.bsmBusiness);
98 } 95 }
......
1 <!-- 1 <!--
2 * @Description: workFrame左侧菜单列表-分割 2 * @Description: workFrame左侧菜单列表-分割
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-20 15:33:05 4 * @LastEditTime: 2023-09-21 10:46:34
5 --> 5 -->
6 <template> 6 <template>
7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
...@@ -103,8 +103,6 @@ ...@@ -103,8 +103,6 @@
103 var formdata = new FormData(); 103 var formdata = new FormData();
104 // 受理申请标识码 104 // 受理申请标识码
105 formdata.append("bsmSlsq", this.paramData.bsmSlsq); 105 formdata.append("bsmSlsq", this.paramData.bsmSlsq);
106 // 当前流程所在环节
107 formdata.append("bestepid", this.paramData.bestepid);
108 formdata.append("bsmBusiness", this.paramData.bsmBusiness); 106 formdata.append("bsmBusiness", this.paramData.bsmBusiness);
109 if (this.$route.query.type == 'jdcx') { 107 if (this.$route.query.type == 'jdcx') {
110 jdcxLeftMenu(formdata).then((res) => { 108 jdcxLeftMenu(formdata).then((res) => {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-20 17:30:41 4 * @LastEditTime: 2023-09-21 10:46:55
5 --> 5 -->
6 <template> 6 <template>
7 <div class="container"> 7 <div class="container">
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 <ul> 18 <ul>
19 <li @click="operation(item)" v-for="(item, index) in rightButtonList" :key="index"> 19 <li @click="operation(item)" v-for="(item, index) in rightButtonList" :key="index">
20 <svg-icon class="icon" :icon-class="item.icon" /> 20 <svg-icon class="icon" :icon-class="item.icon" />
21 <span class="iconName">{{ item.name }} {{ item.value }}</span> 21 <span class="iconName">{{ item.name }}</span>
22 </li> 22 </li>
23 </ul> 23 </ul>
24 <NoticeBar class="NoticeBar" :noticeList="noticeList" v-if="noticeList.length > 0" /> 24 <NoticeBar class="NoticeBar" :noticeList="noticeList" v-if="noticeList.length > 0" />
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 14:59:46 4 * @LastEditTime: 2023-09-21 10:18:57
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -252,9 +252,9 @@ ...@@ -252,9 +252,9 @@
252 this.$popup("登记簿详情", "registerBook/djbFrame", { 252 this.$popup("登记簿详情", "registerBook/djbFrame", {
253 formData: param 253 formData: param
254 }) 254 })
255 }, 255 }
256 }, 256 }
257 }; 257 }
258 </script> 258 </script>
259 <style scoped lang="scss"> 259 <style scoped lang="scss">
260 @import "~@/styles/mixin.scss"; 260 @import "~@/styles/mixin.scss";
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-23 14:51:26 4 * @LastEditTime: 2023-09-21 09:37:44
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 抵押权利信息查询 --> 7 <!-- 抵押权利信息查询 -->
...@@ -223,9 +223,9 @@ ...@@ -223,9 +223,9 @@
223 this.$popup("登记簿详情", "registerBook/djbFrame", { 223 this.$popup("登记簿详情", "registerBook/djbFrame", {
224 formData: param 224 formData: param
225 }) 225 })
226 }, 226 }
227 }, 227 }
228 }; 228 }
229 </script> 229 </script>
230 <style scoped lang="scss"> 230 <style scoped lang="scss">
231 @import "~@/styles/mixin.scss"; 231 @import "~@/styles/mixin.scss";
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
38 </el-col> 38 </el-col>
39 <el-col :span="3" class="btnColRight"> 39 <el-col :span="3" class="btnColRight">
40 <el-form-item> 40 <el-form-item>
41 <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
42 <el-button type="primary" @click="handleSearch">查询</el-button> 41 <el-button type="primary" @click="handleSearch">查询</el-button>
43 </el-form-item> 42 </el-form-item>
44 </el-col> 43 </el-col>
...@@ -67,7 +66,7 @@ ...@@ -67,7 +66,7 @@
67 import { datas, sendThis } from "../javascript/selecBdcql.js"; 66 import { datas, sendThis } from "../javascript/selecBdcql.js";
68 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 67 import { defaultParameters } from "../javascript/publicDefaultPar.js";
69 import { selectQlxx } from "@/api/ywsq.js"; 68 import { selectQlxx } from "@/api/ywsq.js";
70 import { startBusinessFlow,startTogetherFlow } from "@/api/workFlow.js"; 69 import { startBusinessFlow, startTogetherFlow } from "@/api/workFlow.js";
71 import { getQllxByBsmSqyw } from "@/api/sysSqdjyw.js"; 70 import { getQllxByBsmSqyw } from "@/api/sysSqdjyw.js";
72 export default { 71 export default {
73 mixins: [table, jump], 72 mixins: [table, jump],
...@@ -127,7 +126,7 @@ ...@@ -127,7 +126,7 @@
127 return; 126 return;
128 } 127 }
129 this.loading = true; 128 this.loading = true;
130 if(this.sqywInfo.sqfl=='1'){ 129 if (this.sqywInfo.sqfl == '1') {
131 startBusinessFlow({ 130 startBusinessFlow({
132 bsmSqyw: this.sqywInfo.bsmSqyw, 131 bsmSqyw: this.sqywInfo.bsmSqyw,
133 bdcdysz: this.bdcdysz, 132 bdcdysz: this.bdcdysz,
...@@ -155,7 +154,7 @@ ...@@ -155,7 +154,7 @@
155 }).catch(() => { 154 }).catch(() => {
156 this.loading = false 155 this.loading = false
157 }) 156 })
158 }else{ 157 } else {
159 startTogetherFlow({ 158 startTogetherFlow({
160 bsmSqyw: this.sqywInfo.bsmSqyw, 159 bsmSqyw: this.sqywInfo.bsmSqyw,
161 bdcdysz: this.bdcdysz, 160 bdcdysz: this.bdcdysz,
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-02 09:58:45 4 * @LastEditTime: 2023-09-21 10:16:16
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
8 <!-- 表单部分 --> 8 <!-- 表单部分 -->
9 <div class="from-clues-header"> 9 <div class="from-clues-header">
10 <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="70px"> 10 <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="100px">
11 <el-row> 11 <el-row>
12 <el-col :span="10"> 12 <el-col :span="8">
13 <el-form-item label="不动产单元号" label-width="105px"> 13 <el-form-item label="不动产单元号">
14 <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100"> 14 <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
15 </el-input> 15 </el-input>
16 </el-form-item> 16 </el-form-item>
17 </el-col> 17 </el-col>
18 <el-col :span="10"> 18 <el-col :span="8">
19 <el-form-item label="不动产权证号" label-width="105px"> 19 <el-form-item label="不动产权证号">
20 <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100"> 20 <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100">
21 </el-input> 21 </el-input>
22 </el-form-item> 22 </el-form-item>
23 </el-col> 23 </el-col>
24 <el-col :span="5"> 24 <el-col :span="8">
25 <el-form-item label="业务号"> 25 <el-form-item label="业务号">
26 <el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width100"> 26 <el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width100">
27 </el-input> 27 </el-input>
28 </el-form-item> 28 </el-form-item>
29 </el-col> 29 </el-col>
30 <el-col :span="6"> 30 <el-col :span="8">
31 <el-form-item label="坐落"> 31 <el-form-item label="坐落">
32 <el-input placeholder="" v-model.trim="queryForm.zl" clearable class="width200px"> 32 <el-input placeholder="" v-model.trim="queryForm.zl" clearable class="width100">
33 </el-input> 33 </el-input>
34 </el-form-item> 34 </el-form-item>
35 </el-col> 35 </el-col>
36 <el-col :span="4" class="btnColRight"> 36 <el-col :span="16" class="btnColRight">
37 <el-form-item> 37 <el-form-item>
38 <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
39 <el-button type="primary" @click="handleSearch">查询</el-button> 38 <el-button type="primary" @click="handleSearch">查询</el-button>
39 <el-button type="primary" @click="resetForm(true)">重置</el-button>
40 </el-form-item> 40 </el-form-item>
41 </el-col> 41 </el-col>
42 </el-row> 42 </el-row>
...@@ -122,14 +122,6 @@ ...@@ -122,14 +122,6 @@
122 }, 122 },
123 // 高级查询 123 // 高级查询
124 moreQueryClick () { }, 124 moreQueryClick () { },
125 // openDialog (scroll) {
126 // this.$popupDialog('登记簿详情', 'registerBook/djbFrame', scroll, '85%');
127 // },
128 // handleLpbClick (item) {
129 // this.$popupDialog('楼盘表', 'lpb/index', {
130 // bsm: ''
131 // }, '85%')
132 // },
133 /** 125 /**
134 * @description: ywhClick 126 * @description: ywhClick
135 * @param {*} item) 127 * @param {*} item)
...@@ -249,10 +241,8 @@ ...@@ -249,10 +241,8 @@
249 bdcdyh: row.bdcdyh, 241 bdcdyh: row.bdcdyh,
250 bsmQlxx: row.bsmQlxx, 242 bsmQlxx: row.bsmQlxx,
251 }; 243 };
252 this.$popup("登记簿详情", "registerBook/djbFrame", { 244 ywPopupDialog("登记簿详情", "registerBook/djbFrame", param, '80%', true)
253 formData: param 245 }
254 })
255 },
256 } 246 }
257 } 247 }
258 </script> 248 </script>
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
39 */ 39 */
40 40
41 loadView (view) { 41 loadView (view) {
42 console.log(view, 'viewviewview');
42 return (r) => 43 return (r) =>
43 require.ensure([], () => r(require(`./components/${view}.vue`))); 44 require.ensure([], () => r(require(`./components/${view}.vue`)));
44 }, 45 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-18 11:25:30 4 * @LastEditTime: 2023-09-21 10:39:16
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -184,7 +184,6 @@ ...@@ -184,7 +184,6 @@
184 * @author: renchao 184 * @author: renchao
185 */ 185 */
186 handleLpbClick (item) { 186 handleLpbClick (item) {
187 console.log("item", item);
188 this.$popup('楼盘表', 'lpb/index', { 187 this.$popup('楼盘表', 'lpb/index', {
189 width: '85%', 188 width: '85%',
190 formData: { 189 formData: {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-19 10:04:04 4 * @LastEditTime: 2023-09-21 10:35:34
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -150,8 +150,8 @@ ...@@ -150,8 +150,8 @@
150 const { href } = this.$router.resolve( 150 const { href } = this.$router.resolve(
151 "/djbworkFrameview?bsmSlsq=" + 151 "/djbworkFrameview?bsmSlsq=" +
152 item.bsmSlsq + 152 item.bsmSlsq +
153 "&bestepid=" + 153 "&bsmBusiness=" +
154 item.bestepid + 154 item.bsmBusiness +
155 "&sqywbm=" + 155 "&sqywbm=" +
156 item.djywbm 156 item.djywbm
157 ); 157 );
...@@ -160,10 +160,10 @@ ...@@ -160,10 +160,10 @@
160 const { href } = this.$router.resolve( 160 const { href } = this.$router.resolve(
161 "/workFrameView?bsmSlsq=" + 161 "/workFrameView?bsmSlsq=" +
162 item.bsmSlsq + 162 item.bsmSlsq +
163 "&bestepid=" + 163 "&bsmBusiness=" +
164 item.bestepid 164 item.bsmBusiness
165 ); 165 );
166 window.open(href, `workFrameView${item.bsmSlsq}`); 166 window.open(href, `workFrameView${item.bsmSlsq}`)
167 } 167 }
168 } 168 }
169 } 169 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-18 11:22:10 4 * @LastEditTime: 2023-09-21 10:41:10
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -116,8 +116,26 @@ ...@@ -116,8 +116,26 @@
116 * @author: renchao 116 * @author: renchao
117 */ 117 */
118 openYwDialog (item) { 118 openYwDialog (item) {
119 const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&viewtype=3' + '&type=jdcx') 119 if (item.sjlx == "3") {
120 window.open(href, `urlname${item.bsmSlsq}`) 120 item.djywbm = "DJBBL";
121 const { href } = this.$router.resolve(
122 "/djbworkFrameview?bsmSlsq=" +
123 item.bsmSlsq +
124 "&bsmBusiness=" +
125 item.bsmBusiness +
126 "&sqywbm=" +
127 item.djywbm
128 );
129 window.open(href, `djbworkFrameview${item.bsmSlsq}`);
130 } else {
131 const { href } = this.$router.resolve(
132 "/workFrameView?bsmSlsq=" +
133 item.bsmSlsq +
134 "&bsmBusiness=" +
135 item.bsmBusiness
136 );
137 window.open(href, `workFrameView${item.bsmSlsq}`)
138 }
121 } 139 }
122 } 140 }
123 } 141 }
......