d92a9f9f by xiaomiao

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

2 parents 5618adc0 7208710c
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
21 </transition> 21 </transition>
22 </template> 22 </template>
23 <script> 23 <script>
24 import Popup1 from './index' 24 import Popup1 from './index'
25 export default { 25 export default {
26 name: 'index', 26 name: 'index',
27 data () { 27 data () {
28 return { 28 return {
...@@ -98,13 +98,13 @@ export default { ...@@ -98,13 +98,13 @@ export default {
98 this.$el.parentNode.removeChild(this.$el); 98 this.$el.parentNode.removeChild(this.$el);
99 } 99 }
100 } 100 }
101 } 101 }
102 </script> 102 </script>
103 <style scoped lang="scss" > 103 <style scoped lang="scss" >
104 @import "~@/styles/mixin.scss"; 104 @import "~@/styles/mixin.scss";
105 @import "~@/styles/dialogBox.scss"; 105 @import "~@/styles/dialogBox.scss";
106 106
107 .ls-mask { 107 .ls-mask {
108 width: 100%; 108 width: 100%;
109 height: 100%; 109 height: 100%;
110 z-index: 500; 110 z-index: 500;
...@@ -112,10 +112,9 @@ export default { ...@@ -112,10 +112,9 @@ export default {
112 left: 0; 112 left: 0;
113 top: 0; 113 top: 0;
114 background: rgba(0, 0, 0, 0.3); 114 background: rgba(0, 0, 0, 0.3);
115 }
115 116
116 } 117 .ls-mask-window {
117
118 .ls-mask-window {
119 background: white; 118 background: white;
120 position: relative; 119 position: relative;
121 left: 50%; 120 left: 50%;
...@@ -124,32 +123,32 @@ export default { ...@@ -124,32 +123,32 @@ export default {
124 transform: translate(-50%, -50%); 123 transform: translate(-50%, -50%);
125 border-radius: 5px; 124 border-radius: 5px;
126 overflow: hidden; 125 overflow: hidden;
127 } 126 }
128 127
129 .ls-mask-window b { 128 .ls-mask-window b {
130 padding-left: 5px; 129 padding-left: 5px;
131 } 130 }
132 131
133 .ls-title { 132 .ls-title {
134 padding: 16px; 133 padding: 16px;
135 color: #ffffff; 134 color: #ffffff;
136 background: linear-gradient(3deg, #409EFF, #a7cbee); 135 background: linear-gradient(3deg, #409eff, #a7cbee);
137 font-size: 16px; 136 font-size: 16px;
138 } 137 }
139 138
140 .ls-title .svg-icon { 139 .ls-title .svg-icon {
141 font-size: 18px; 140 font-size: 18px;
142 } 141 }
143 142
144 .mask-content { 143 .mask-content {
145 padding: 20px; 144 padding: 20px;
146 width: 100%; 145 width: 100%;
147 min-height: 30%; 146 min-height: 30%;
148 max-height: 90vh; 147 max-height: 90vh;
149 overflow-y: scroll; 148 overflow-y: scroll;
150 } 149 }
151 150
152 .ls-mask-footer { 151 .ls-mask-footer {
153 height: 50px; 152 height: 50px;
154 display: flex; 153 display: flex;
155 justify-content: center; 154 justify-content: center;
...@@ -161,30 +160,29 @@ export default { ...@@ -161,30 +160,29 @@ export default {
161 border-bottom-left-radius: 5px; 160 border-bottom-left-radius: 5px;
162 border-bottom-right-radius: 5px; 161 border-bottom-right-radius: 5px;
163 overflow: hidden; 162 overflow: hidden;
164 } 163 }
165
166 164
167 /deep/.closeStyle { 165 /deep/.closeStyle {
168 position: absolute; 166 position: absolute;
169 top: 13px; 167 top: 13px;
170 right: 26px; 168 right: 26px;
171 font-size: 24px; 169 font-size: 24px;
172 cursor: pointer; 170 cursor: pointer;
173 color: #409EFF; 171 color: #409eff;
174 } 172 }
175 173
176 /deep/.el-loading-mask { 174 /deep/.el-loading-mask {
177 background: none; 175 background: none;
178 } 176 }
179 177
180 .dialog-fade-enter-active, 178 .dialog-fade-enter-active,
181 .dialog-fade-leave-active { 179 .dialog-fade-leave-active {
182 transition: opacity 0.3s; 180 transition: opacity 0.3s;
183 } 181 }
184 182
185 .dialog-fade-enter, 183 .dialog-fade-enter,
186 .dialog-fade-leave-to { 184 .dialog-fade-leave-to {
187 opacity: 0; 185 opacity: 0;
188 } 186 }
189 </style> 187 </style>
190 188
...\ No newline at end of file ...\ No newline at end of file
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-06-14 15:05:38
5 */
6 import Vue from 'vue'
7 import Popup from './index.vue'
8 const PopupBox = Vue.extend(Popup)
9 let popuping = undefined
10
11 PopupBox.prototype.close = function () {
12 // 如果Popup 有引用,则去掉引用
13 if (popuping) {
14 popuping = undefined
15 }
16 // 先将组件隐藏
17 this.isShow = false
18 // 延迟300毫秒,等待Popup关闭动画执行完之后销毁组件
19 setTimeout(() => {
20 // 移除挂载的dom元素
21 if (this.$el && this.$el.parentNode) {
22 this.$el.parentNode.removeChild(this.$el)
23 }
24 }, 300)
25 }
26
27 const Popup1 = (title, editItem, data, formData) => {
28 // 如果组件已渲染,则返回即可
29 if (popuping) {
30 return popuping
31 }
32 data.title = title
33 data.editItem = editItem
34 if (formData) {
35 data.formData = formData
36 }
37 // 通过构造函数初始化组件 相当于 new Vue()
38 let instance = new PopupBox({
39 data
40 }).$mount()
41 document.body.appendChild(instance.$el)
42 Vue.nextTick(() => {
43 instance.isShow = true
44 // 将组件实例赋值给loading
45 popuping = instance
46 })
47 return instance
48 }
49 export default Popup1
1 <template>
2 <transition name="msgbox-fade">
3 <div class="ls-mask" v-if="myShow">
4 <div class="ls-mask-window" :class="isMain ? 'mainCenter' : 'contentCenter'" :style="{ 'width': width }">
5 <div class="ls-head">
6 <div class="ls-title" :style="{ 'text-align': titleStyle }">
7 <svg-icon v-if="iconClass != ''" :icon-class='iconClass' />
8 <b>{{ title }}</b>
9 </div>
10 <svg-icon icon-class='close' class="closeStyle" @click="onCancel" />
11 </div>
12 <div class="mask-content" ref='contentRef' :style="{ 'height': contentHeight }">
13 <component :is="editItem" ref='childRef' :key="key" :formData='formData' />
14 </div>
15 <div class="ls-mask-footer" v-if='btnShow'>
16 <el-button type="primary" @click="onConfirm">{{ confirmText }}</el-button>
17 <el-button @click="onCancel">{{ cancelText }}</el-button>
18 </div>
19 </div>
20 </div>
21 </transition>
22 </template>
23 <script>
24 import Popup1 from './index'
25 export default {
26 name: 'index',
27 data () {
28 return {
29 title: '标题',
30 editItem: "",
31 isMain: false,
32 formData: undefined,//父组件传递的参数 负责传给子组件
33 btnShow: false,
34 cancel: function () { },
35 confirm: function () { },
36 cancelText: '取消',
37 confirmText: '确认',
38 isSync: false,
39 isShow: false,
40 myShow: false,
41 titleStyle: 'center',
42 width: "75%",
43 height: "auto",
44 contentHeight: "",
45 iconClass: "",
46 key: 0
47 }
48 },
49 watch: {
50 isShow (newValue) {
51 this.$nextTick(() => {
52 this.editItem = this.loadViewFn(this.editItem)
53 document.body.appendChild(this.$el);
54 this.myShow = newValue
55 })
56 }
57 },
58 mounted () {
59 // 计算滚动条高度
60 setTimeout(() => {
61 if (this.btnShow) {
62 if (this.height == 'auto') {
63 this.contentHeight = (this.$refs.contentRef.offsetHeight) + 'px'
64 } else {
65 this.contentHeight = this.height
66 }
67 } else {
68 if (this.height == 'auto') {
69 this.contentHeight = (this.$refs.contentRef.offsetHeight) + 'px'
70 } else {
71 this.contentHeight = this.height
72 }
73 }
74 }, 300)
75 },
76 methods: {
77 onCancel () {
78 Popup1().close()
79 },
80 onConfirm () {
81 let res = new Promise((resolve, reject) => {
82 this.confirm()
83 resolve(true)
84 })
85 if (res) {
86 this.isShow = false
87 }
88 },
89 loadViewFn (view) {
90 return (r) =>
91 require.ensure([], () =>
92 r(require(`@/views/${view}.vue`))
93 )
94 }
95 },
96 destroyed () {
97 if (this.appendToBody && this.$el && this.$el.parentNode) {
98 this.$el.parentNode.removeChild(this.$el);
99 }
100 }
101 }
102 </script>
103 <style scoped lang="scss" >
104 @import "~@/styles/mixin.scss";
105 @import "~@/styles/dialogBox.scss";
106
107 .ls-mask {
108 width: 100%;
109 height: 100%;
110 z-index: 500;
111 position: fixed;
112 left: 0;
113 top: 0;
114 background: rgba(0, 0, 0, 0.3);
115 }
116
117 .ls-mask-window {
118 background: white;
119 position: relative;
120 left: 50%;
121 top: 50%;
122 min-height: 200px;
123 transform: translate(-50%, -50%);
124 border-radius: 5px;
125 overflow: hidden;
126 }
127
128 .ls-mask-window b {
129 padding-left: 5px;
130 }
131
132 .ls-title {
133 padding: 16px;
134 color: #ffffff;
135 background: linear-gradient(3deg, #409eff, #a7cbee);
136 font-size: 16px;
137 }
138
139 .ls-title .svg-icon {
140 font-size: 18px;
141 }
142
143 .mask-content {
144 padding: 20px;
145 width: 100%;
146 min-height: 30%;
147 max-height: 90vh;
148 overflow-y: scroll;
149 }
150
151 .ls-mask-footer {
152 height: 50px;
153 display: flex;
154 justify-content: center;
155 width: 100%;
156 position: absolute;
157 border-top: 1px solid $borderColor;
158 bottom: 0;
159 background: #ffffff;
160 border-bottom-left-radius: 5px;
161 border-bottom-right-radius: 5px;
162 overflow: hidden;
163 }
164
165 /deep/.closeStyle {
166 position: absolute;
167 top: 13px;
168 right: 26px;
169 font-size: 24px;
170 cursor: pointer;
171 color: #409eff;
172 }
173
174 /deep/.el-loading-mask {
175 background: none;
176 }
177
178 .dialog-fade-enter-active,
179 .dialog-fade-leave-active {
180 transition: opacity 0.3s;
181 }
182
183 .dialog-fade-enter,
184 .dialog-fade-leave-to {
185 opacity: 0;
186 }
187 </style>
188
...\ No newline at end of file ...\ No newline at end of file
1 弹窗封装
2 2.用法以及参数:
3 this.$popup('提示','ywbl/dbx/aa',{
4 width: '75%', // 初始化75% 不需要改的话 可以直接不要
5 formData: this.formData, // 父组件传给子组件的参数
6 cancel: function () {}, //取消事件的回调 没有按钮可以不需要
7 confirm: function () {} //确认事件的回调 没有按钮可以不需要
8 })
9
10 5.后续有修改请添加在此处文档说明作用
...\ No newline at end of file ...\ No newline at end of file
1 /* 1 /*
2 * @Description: 弹框组件的封装 2 * @Description: 弹框组件的封装
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-04-11 09:31:14 4 * @LastEditTime: 2023-07-07 09:21:10
5 */ 5 */
6 import Popup from '@/components/Popup/index' 6 import ywPopup from '@/components/ywPopup/index'
7 import Popup1 from '@/components/Popup1/index' 7 import Popup1 from '@/components/Popup1/index'
8 export function popupDialog (title, url, params, width = '75%', isMain, height, btnShow = false, callback, cancel) { 8 export function popupDialog (title, url, params, width = '75%', isMain, height, btnShow = false, callback, cancel) {
9 // Popup.install 9 // Popup.install
...@@ -18,10 +18,32 @@ export function popupDialog (title, url, params, width = '75%', isMain, height, ...@@ -18,10 +18,32 @@ export function popupDialog (title, url, params, width = '75%', isMain, height,
18 }, 18 },
19 confirm: () => { 19 confirm: () => {
20 callback() 20 callback()
21 } 21 },
22 popupDialog: popupDialog // 将 popupDialog 方法传递给弹框组件
23 })
24 }
25
26 export function ywPopupDialog (title, url, params, width = '75%', isMain, height, btnShow = false, callback, cancel) {
27 // Popup.install
28 ywPopup(title, url, {
29 height: height,
30 width: width,
31 formData: params,
32 btnShow: btnShow,
33 isMain: isMain,
34 cancel: () => {
35 cancel()
36 },
37 confirm: () => {
38 callback()
39 },
40 popupDialog: popupDialog // 将 popupDialog 方法传递给弹框组件
22 }) 41 })
23 } 42 }
24 43
25 export function popupCacel () { 44 export function popupCacel () {
26 Popup1().close() 45 Popup1().close()
27 } 46 }
47 export function ywPopupCacel () {
48 ywPopupDialog().close()
49 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 --> 4 -->
5 <template> 5 <template>
6 <div class='ywdialog'> 6 <div class='ywdialog'>
7 <el-link type="danger">{{formData.message}}</el-link> 7 <el-link type="danger" :underline="false">{{formData.message}}</el-link>
8 <el-table 8 <el-table
9 v-if="formData.result" 9 v-if="formData.result"
10 :data="formData.result" 10 :data="formData.result"
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-05 16:57:08 4 * @LastEditTime: 2023-07-07 13:12:58
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> 7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 v-for="(item, index) in headTabBdcqz" :key="index"> 11 v-for="(item, index) in headTabBdcqz" :key="index">
12 </el-tab-pane> 12 </el-tab-pane>
13 </el-tabs> 13 </el-tabs>
14 <div class="no-data" v-if="headTabBdcqz.length == 0">暂无数据</div> 14 <el-empty description="暂无数据" v-if="headTabBdcqz.length == 0 && noData"></el-empty>
15 <canvas ref="zs" width="1000" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx==1" height="700"></canvas> 15 <canvas ref="zs" width="1000" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx==1" height="700"></canvas>
16 <canvas ref="zm" width="1180" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx!=1" height="780"></canvas> 16 <canvas ref="zm" width="1180" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx!=1" height="780"></canvas>
17 </div> 17 </div>
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
30 }, 30 },
31 data () { 31 data () {
32 return { 32 return {
33 noData: false,
33 imgSrc: require('@/image/bdcqz/bdcqzs2.jpg'), 34 imgSrc: require('@/image/bdcqz/bdcqzs2.jpg'),
34 bdczmSrc: require('@/image/bdcqz/bdczm.jpg'), 35 bdczmSrc: require('@/image/bdcqz/bdczm.jpg'),
35 loading: false, 36 loading: false,
...@@ -77,6 +78,7 @@ ...@@ -77,6 +78,7 @@
77 this.loading = true 78 this.loading = true
78 getSlsqBdcqzList({ bsmSlsq: this.formData.bsmSlsq }).then(res => { 79 getSlsqBdcqzList({ bsmSlsq: this.formData.bsmSlsq }).then(res => {
79 if (res.code == 200) { 80 if (res.code == 200) {
81 this.noData = true
80 if (res.result && res.result.length > 0) { 82 if (res.result && res.result.length > 0) {
81 this.activeName = res.result[0].bsmBdcqz 83 this.activeName = res.result[0].bsmBdcqz
82 this.bdcqz = res.result[0] 84 this.bdcqz = res.result[0]
......
...@@ -72,8 +72,8 @@ ...@@ -72,8 +72,8 @@
72 <el-input v-model="ruleForm.cfdjList[0].cfwh" :disabled="$route.query.viewtype || isJfOperation"></el-input> 72 <el-input v-model="ruleForm.cfdjList[0].cfwh" :disabled="$route.query.viewtype || isJfOperation"></el-input>
73 </el-form-item> 73 </el-form-item>
74 </el-col> 74 </el-col>
75 <!-- 批量查封状态有多种查封类型,不予展示 --> 75 <!-- 批量查封状态有多种查封类型,不予展示 -->
76 <!-- <el-col :span="8"> 76 <!-- <el-col :span="8">
77 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封类型:" prop="cfdj.cflxmc"> 77 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封类型:" prop="cfdj.cflxmc">
78 <el-input v-model="ruleForm.cfdjList[0].cflxmc" disabled></el-input> 78 <el-input v-model="ruleForm.cfdjList[0].cflxmc" disabled></el-input>
79 </el-form-item> 79 </el-form-item>
......
...@@ -193,17 +193,17 @@ ...@@ -193,17 +193,17 @@
193 }, 193 },
194 ywhClick (item) { 194 ywhClick (item) {
195 //有任务权限 195 //有任务权限
196 if(item.sjlx=="3"){ 196 if (item.sjlx == "3") {
197 const { href } = this.$router.resolve( 197 const { href } = this.$router.resolve(
198 "/djbworkFrameview?bsmSlsq=" + 198 "/djbworkFrameview?bsmSlsq=" +
199 item.bsmSlsq + 199 item.bsmSlsq +
200 "&bestepid=" + 200 "&bestepid=" +
201 item.bestepid+ 201 item.bestepid +
202 "&isEdit=" + 202 "&isEdit=" +
203 true 203 true
204 ); 204 );
205 window.open(href, `urlname${item.bsmSlsq}`); 205 window.open(href, `urlname${item.bsmSlsq}`);
206 }else{ 206 } else {
207 const { href } = this.$router.resolve( 207 const { href } = this.$router.resolve(
208 "/workFrameView?bsmSlsq=" + 208 "/workFrameView?bsmSlsq=" +
209 item.bsmSlsq + 209 item.bsmSlsq +
......
...@@ -69,10 +69,11 @@ ...@@ -69,10 +69,11 @@
69 <script> 69 <script>
70 //查封登记 70 //查封登记
71 import store from "@/store/index.js"; 71 import store from "@/store/index.js";
72 import { datas, sendThis } from "../javascript/cfdj.js";
73 import { defaultParameters } from "../javascript/publicDefaultPar.js";
74 import table from "@/utils/mixin/table"; 72 import table from "@/utils/mixin/table";
75 import jump from "../components/mixin/jump"; 73 import jump from "../components/mixin/jump";
74 import { ywPopupDialog } from "@/utils/popup.js";
75 import { datas, sendThis } from "../javascript/cfdj.js";
76 import { defaultParameters } from "../javascript/publicDefaultPar.js";
76 import { selectCfdj, startBusinessFlow, choiceBdcdy } from "@/api/ywbl.js"; 77 import { selectCfdj, startBusinessFlow, choiceBdcdy } from "@/api/ywbl.js";
77 export default { 78 export default {
78 props: { 79 props: {
...@@ -138,9 +139,9 @@ ...@@ -138,9 +139,9 @@
138 this.$popupCacel() 139 this.$popupCacel()
139 140
140 } else { 141 } else {
141 this.$message.error(res.message); 142 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
142 } 143 }
143 }); 144 })
144 } else { 145 } else {
145 choiceBdcdy({ 146 choiceBdcdy({
146 bsmSlsq: this.$route.query.bsmSlsq, 147 bsmSlsq: this.$route.query.bsmSlsq,
......
...@@ -56,10 +56,11 @@ ...@@ -56,10 +56,11 @@
56 </template> 56 </template>
57 <script> 57 <script>
58 import store from '@/store/index.js' 58 import store from '@/store/index.js'
59 import { datas, sendThis } from "../javascript/diyaq.js";
60 import { defaultParameters } from "../javascript/publicDefaultPar.js";
61 import table from "@/utils/mixin/table"; 59 import table from "@/utils/mixin/table";
62 import jump from "../components/mixin/jump"; 60 import jump from "../components/mixin/jump";
61 import { ywPopupDialog } from "@/utils/popup.js";
62 import { datas, sendThis } from "../javascript/diyaq.js";
63 import { defaultParameters } from "../javascript/publicDefaultPar.js";
63 import { selectDiyaq, startBusinessFlow } from "@/api/ywbl.js"; 64 import { selectDiyaq, startBusinessFlow } from "@/api/ywbl.js";
64 export default { 65 export default {
65 mixins: [table, jump], 66 mixins: [table, jump],
...@@ -119,7 +120,7 @@ ...@@ -119,7 +120,7 @@
119 } 120 }
120 this.$popupCacel() 121 this.$popupCacel()
121 } else { 122 } else {
122 this.$message.error(res.message); 123 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
123 } 124 }
124 }) 125 })
125 }, 126 },
......
...@@ -123,9 +123,10 @@ ...@@ -123,9 +123,10 @@
123 <script> 123 <script>
124 import Vue from 'vue' 124 import Vue from 'vue'
125 import store from '@/store/index.js' 125 import store from '@/store/index.js'
126 import table from "@/utils/mixin/table";
126 //国有建设用地使用权/房屋使用权 127 //国有建设用地使用权/房屋使用权
128 import { ywPopupDialog } from "@/utils/popup.js";
127 import { datas, sendThis } from "../javascript/fwsyq.js"; 129 import { datas, sendThis } from "../javascript/fwsyq.js";
128 import table from "@/utils/mixin/table";
129 import jump from "@/views/ywbl/ywsq/components/mixin/jump"; 130 import jump from "@/views/ywbl/ywsq/components/mixin/jump";
130 import { selectScBdcdy, startBusinessFlow, choiceBdcdy, selectOtherH, selectZrz, selectDz } from "@/api/ywbl.js"; 131 import { selectScBdcdy, startBusinessFlow, choiceBdcdy, selectOtherH, selectZrz, selectDz } from "@/api/ywbl.js";
131 export default { 132 export default {
...@@ -241,7 +242,7 @@ ...@@ -241,7 +242,7 @@
241 } 242 }
242 this.$popupCacel() 243 this.$popupCacel()
243 } else { 244 } else {
244 this.$message.error(res.message); 245 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
245 } 246 }
246 }) 247 })
247 } else { 248 } else {
...@@ -258,7 +259,7 @@ ...@@ -258,7 +259,7 @@
258 store.dispatch('user/refreshPage', true); 259 store.dispatch('user/refreshPage', true);
259 this.$popupCacel() 260 this.$popupCacel()
260 } else { 261 } else {
261 this.$message.error(res.message); 262 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
262 } 263 }
263 }) 264 })
264 } 265 }
......
...@@ -42,10 +42,11 @@ ...@@ -42,10 +42,11 @@
42 <script> 42 <script>
43 //首次登记 43 //首次登记
44 import store from '@/store/index.js' 44 import store from '@/store/index.js'
45 import { datas, sendThis } from "../javascript/nydsyq100.js";
46 import { defaultParameters } from "../javascript/publicDefaultPar.js";
47 import table from "@/utils/mixin/table"; 45 import table from "@/utils/mixin/table";
48 import jump from "../components/mixin/jump"; 46 import jump from "../components/mixin/jump";
47 import { ywPopupDialog } from "@/utils/popup.js";
48 import { datas, sendThis } from "../javascript/nydsyq100.js";
49 import { defaultParameters } from "../javascript/publicDefaultPar.js";
49 import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js"; 50 import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js";
50 export default { 51 export default {
51 mixins: [table, jump], 52 mixins: [table, jump],
...@@ -108,7 +109,7 @@ ...@@ -108,7 +109,7 @@
108 } 109 }
109 this.$popupCacel() 110 this.$popupCacel()
110 } else { 111 } else {
111 this.$message.error(res.message); 112 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
112 } 113 }
113 }) 114 })
114 }, 115 },
......
...@@ -42,10 +42,11 @@ ...@@ -42,10 +42,11 @@
42 <script> 42 <script>
43 //首次登记 43 //首次登记
44 import store from '@/store/index.js' 44 import store from '@/store/index.js'
45 import { datas, sendThis } from "../javascript/selectJsydsyq.js";
46 import { defaultParameters } from "../javascript/publicDefaultPar.js";
47 import table from "@/utils/mixin/table"; 45 import table from "@/utils/mixin/table";
48 import jump from "../components/mixin/jump"; 46 import jump from "../components/mixin/jump";
47 import { ywPopupDialog } from "@/utils/popup.js";
48 import { datas, sendThis } from "../javascript/selectJsydsyq.js";
49 import { defaultParameters } from "../javascript/publicDefaultPar.js";
49 import { startBusinessFlow, selectNydsyqQlxx } from "@/api/ywbl.js"; 50 import { startBusinessFlow, selectNydsyqQlxx } from "@/api/ywbl.js";
50 export default { 51 export default {
51 mixins: [table, jump], 52 mixins: [table, jump],
...@@ -105,7 +106,7 @@ ...@@ -105,7 +106,7 @@
105 } 106 }
106 this.$popupCacel() 107 this.$popupCacel()
107 } else { 108 } else {
108 this.$message.error(res.message); 109 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
109 } 110 }
110 }) 111 })
111 }, 112 },
......
...@@ -55,11 +55,12 @@ ...@@ -55,11 +55,12 @@
55 </div> 55 </div>
56 </template> 56 </template>
57 <script> 57 <script>
58 import jump from "./mixin/jump";
58 import store from '@/store/index.js' 59 import store from '@/store/index.js'
60 import table from "@/utils/mixin/table";
61 import { ywPopupDialog } from "@/utils/popup.js";
59 import { datas, sendThis } from "../javascript/selecBdcql.js"; 62 import { datas, sendThis } from "../javascript/selecBdcql.js";
60 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 63 import { defaultParameters } from "../javascript/publicDefaultPar.js";
61 import table from "@/utils/mixin/table";
62 import jump from "./mixin/jump";
63 import { selectQlxx, startBusinessFlow } from "@/api/ywbl.js"; 64 import { selectQlxx, startBusinessFlow } from "@/api/ywbl.js";
64 import { getQllxByBsmSqyw } from "@/api/system.js"; 65 import { getQllxByBsmSqyw } from "@/api/system.js";
65 export default { 66 export default {
...@@ -133,7 +134,7 @@ ...@@ -133,7 +134,7 @@
133 } 134 }
134 this.$popupCacel() 135 this.$popupCacel()
135 } else { 136 } else {
136 this.$message.error(res.message) 137 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
137 } 138 }
138 }) 139 })
139 }, 140 },
......
...@@ -52,9 +52,10 @@ ...@@ -52,9 +52,10 @@
52 </template> 52 </template>
53 <script> 53 <script>
54 import { mapGetters } from "vuex"; 54 import { mapGetters } from "vuex";
55 import { startRepairFlow } from "@/api/ywbl.js";
56 import store from '@/store/index.js' 55 import store from '@/store/index.js'
57 import table from "@/utils/mixin/table"; 56 import table from "@/utils/mixin/table";
57 import { ywPopupDialog } from "@/utils/popup.js";
58 import { startRepairFlow } from "@/api/ywbl.js";
58 import { datas, sendThis } from "../javascript/selectDjbbl.js"; 59 import { datas, sendThis } from "../javascript/selectDjbbl.js";
59 import { selectRepairQlxx } from "@/api/selectQlxx.js"; 60 import { selectRepairQlxx } from "@/api/selectQlxx.js";
60 import jump from "../components/mixin/djbbljump"; 61 import jump from "../components/mixin/djbbljump";
...@@ -161,7 +162,7 @@ ...@@ -161,7 +162,7 @@
161 } 162 }
162 this.$popupCacel() 163 this.$popupCacel()
163 } else { 164 } else {
164 this.$message.error(res.message); 165 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
165 } 166 }
166 }) 167 })
167 }, 168 },
......
...@@ -47,11 +47,12 @@ ...@@ -47,11 +47,12 @@
47 </div> 47 </div>
48 </template> 48 </template>
49 <script> 49 <script>
50 import jump from "./mixin/jump";
50 import store from '@/store/index.js' 51 import store from '@/store/index.js'
52 import table from "@/utils/mixin/table";
53 import { ywPopupDialog } from "@/utils/popup.js";
51 import { datas, sendThis } from "../javascript/selectFwsyq.js"; 54 import { datas, sendThis } from "../javascript/selectFwsyq.js";
52 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 55 import { defaultParameters } from "../javascript/publicDefaultPar.js";
53 import table from "@/utils/mixin/table";
54 import jump from "./mixin/jump";
55 import { selectFwsyq, startBusinessFlow } from "@/api/ywbl.js"; 56 import { selectFwsyq, startBusinessFlow } from "@/api/ywbl.js";
56 export default { 57 export default {
57 mixins: [table, jump], 58 mixins: [table, jump],
...@@ -110,7 +111,7 @@ ...@@ -110,7 +111,7 @@
110 } 111 }
111 this.$popupCacel() 112 this.$popupCacel()
112 } else { 113 } else {
113 this.$message.error(res.message); 114 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
114 } 115 }
115 }) 116 })
116 }, 117 },
......
...@@ -47,11 +47,12 @@ ...@@ -47,11 +47,12 @@
47 </div> 47 </div>
48 </template> 48 </template>
49 <script> 49 <script>
50 import jump from "./mixin/jump";
50 import store from '@/store/index.js' 51 import store from '@/store/index.js'
52 import table from "@/utils/mixin/table";
53 import { ywPopupDialog } from "@/utils/popup.js";
51 import { datas, sendThis } from "../javascript/selectH.js"; 54 import { datas, sendThis } from "../javascript/selectH.js";
52 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 55 import { defaultParameters } from "../javascript/publicDefaultPar.js";
53 import table from "@/utils/mixin/table";
54 import jump from "./mixin/jump";
55 import { selectHQjdc, startBusinessFlow } from "@/api/ywbl.js"; 56 import { selectHQjdc, startBusinessFlow } from "@/api/ywbl.js";
56 export default { 57 export default {
57 mixins: [table, jump], 58 mixins: [table, jump],
...@@ -110,7 +111,7 @@ ...@@ -110,7 +111,7 @@
110 } 111 }
111 this.$popupCacel() 112 this.$popupCacel()
112 } else { 113 } else {
113 this.$message.error(res.message); 114 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
114 } 115 }
115 }) 116 })
116 }, 117 },
......
...@@ -55,11 +55,12 @@ ...@@ -55,11 +55,12 @@
55 </template> 55 </template>
56 <script> 56 <script>
57 //首次登记 57 //首次登记
58 import jump from "./mixin/jump";
58 import store from '@/store/index.js' 59 import store from '@/store/index.js'
60 import table from "@/utils/mixin/table";
61 import { ywPopupDialog } from "@/utils/popup.js";
59 import { datas, sendThis } from "../javascript/selectJsydsyq.js"; 62 import { datas, sendThis } from "../javascript/selectJsydsyq.js";
60 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 63 import { defaultParameters } from "../javascript/publicDefaultPar.js";
61 import table from "@/utils/mixin/table";
62 import jump from "./mixin/jump";
63 import { startBusinessFlow, selectJsydQlxx } from "@/api/ywbl.js"; 64 import { startBusinessFlow, selectJsydQlxx } from "@/api/ywbl.js";
64 export default { 65 export default {
65 mixins: [table, jump], 66 mixins: [table, jump],
...@@ -118,7 +119,7 @@ ...@@ -118,7 +119,7 @@
118 } 119 }
119 this.$popupCacel() 120 this.$popupCacel()
120 } else { 121 } else {
121 this.$message.error(res.message); 122 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
122 } 123 }
123 }) 124 })
124 }, 125 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-16 09:37:51 4 * @LastEditTime: 2023-07-07 09:27:48
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -138,11 +138,12 @@ ...@@ -138,11 +138,12 @@
138 </template> 138 </template>
139 <script> 139 <script>
140 //首次登记 140 //首次登记
141 import jump from "./mixin/jump";
141 import store from '@/store/index.js' 142 import store from '@/store/index.js'
143 import table from "@/utils/mixin/table";
144 import { ywPopupDialog } from "@/utils/popup.js";
142 import { datas, datastwo, sendThis } from "../javascript/selectJsydsyqhbfg.js"; 145 import { datas, datastwo, sendThis } from "../javascript/selectJsydsyqhbfg.js";
143 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 146 import { defaultParameters } from "../javascript/publicDefaultPar.js";
144 import table from "@/utils/mixin/table";
145 import jump from "./mixin/jump";
146 import { startBusinessFlow, selectJsydQlxxSplitMergeBefore, selectZdjbxxSplitMergeLast } from "@/api/ywbl.js"; 147 import { startBusinessFlow, selectJsydQlxxSplitMergeBefore, selectZdjbxxSplitMergeLast } from "@/api/ywbl.js";
147 export default { 148 export default {
148 mixins: [table, jump], 149 mixins: [table, jump],
...@@ -246,7 +247,7 @@ ...@@ -246,7 +247,7 @@
246 } 247 }
247 this.$popupCacel() 248 this.$popupCacel()
248 } else { 249 } else {
249 this.$message.error(res.message) 250 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
250 } 251 }
251 }) 252 })
252 }, 253 },
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
50 import jump from "./mixin/jump"; 50 import jump from "./mixin/jump";
51 import store from '@/store/index.js' 51 import store from '@/store/index.js'
52 import table from "@/utils/mixin/table"; 52 import table from "@/utils/mixin/table";
53 import { popupDialog, popupCacel } from "@/utils/popup.js"; 53 import { ywPopupDialog } from "@/utils/popup.js";
54 import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js"; 54 import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js";
55 import { datas, sendThis } from "../javascript/selectQjzdjbxx.js"; 55 import { datas, sendThis } from "../javascript/selectQjzdjbxx.js";
56 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 56 import { defaultParameters } from "../javascript/publicDefaultPar.js";
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
116 } 116 }
117 this.$popupCacel() 117 this.$popupCacel()
118 } else { 118 } else {
119 popupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) 119 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
120 } 120 }
121 }) 121 })
122 }, 122 },
......
...@@ -55,11 +55,12 @@ ...@@ -55,11 +55,12 @@
55 </template> 55 </template>
56 <script> 56 <script>
57 //首次登记 57 //首次登记
58 import jump from "./mixin/jump";
58 import store from '@/store/index.js' 59 import store from '@/store/index.js'
60 import table from "@/utils/mixin/table";
61 import { ywPopupDialog } from "@/utils/popup.js";
59 import { datas, sendThis } from "../javascript/selectTdsyq.js"; 62 import { datas, sendThis } from "../javascript/selectTdsyq.js";
60 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 63 import { defaultParameters } from "../javascript/publicDefaultPar.js";
61 import table from "@/utils/mixin/table";
62 import jump from "./mixin/jump";
63 import { startBusinessFlow, selectTdsyqQlxx } from "@/api/ywbl.js"; 64 import { startBusinessFlow, selectTdsyqQlxx } from "@/api/ywbl.js";
64 export default { 65 export default {
65 mixins: [table, jump], 66 mixins: [table, jump],
...@@ -118,7 +119,7 @@ ...@@ -118,7 +119,7 @@
118 } 119 }
119 this.$popupCacel() 120 this.$popupCacel()
120 } else { 121 } else {
121 this.$message.error(res.message); 122 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
122 } 123 }
123 }) 124 })
124 }, 125 },
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
48 </template> 48 </template>
49 <script> 49 <script>
50 import store from '@/store/index.js' 50 import store from '@/store/index.js'
51 import { ywPopupDialog } from "@/utils/popup.js";
51 import { datas, sendThis } from "../javascript/selectYgdj200.js"; 52 import { datas, sendThis } from "../javascript/selectYgdj200.js";
52 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 53 import { defaultParameters } from "../javascript/publicDefaultPar.js";
53 import table from "@/utils/mixin/table"; 54 import table from "@/utils/mixin/table";
...@@ -110,7 +111,7 @@ ...@@ -110,7 +111,7 @@
110 this.$popupCacel() 111 this.$popupCacel()
111 } 112 }
112 } else { 113 } else {
113 this.$message.error(res.message); 114 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
114 } 115 }
115 }) 116 })
116 }, 117 },
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
48 </template> 48 </template>
49 <script> 49 <script>
50 import store from '@/store/index.js' 50 import store from '@/store/index.js'
51 import { ywPopupDialog } from "@/utils/popup.js";
51 import { datas, sendThis } from "../javascript/selectYgdy.js"; 52 import { datas, sendThis } from "../javascript/selectYgdy.js";
52 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 53 import { defaultParameters } from "../javascript/publicDefaultPar.js";
53 import table from "@/utils/mixin/table"; 54 import table from "@/utils/mixin/table";
...@@ -110,7 +111,7 @@ ...@@ -110,7 +111,7 @@
110 } 111 }
111 this.$popupCacel() 112 this.$popupCacel()
112 } else { 113 } else {
113 this.$message.error(res.message); 114 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
114 } 115 }
115 }) 116 })
116 }, 117 },
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
48 </template> 48 </template>
49 <script> 49 <script>
50 import store from '@/store/index.js' 50 import store from '@/store/index.js'
51 import { ywPopupDialog } from "@/utils/popup.js";
51 import { datas, sendThis } from "../javascript/selectAllHInfo.js"; 52 import { datas, sendThis } from "../javascript/selectAllHInfo.js";
52 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 53 import { defaultParameters } from "../javascript/publicDefaultPar.js";
53 import table from "@/utils/mixin/table"; 54 import table from "@/utils/mixin/table";
...@@ -111,7 +112,7 @@ ...@@ -111,7 +112,7 @@
111 } 112 }
112 this.$popupCacel() 113 this.$popupCacel()
113 } else { 114 } else {
114 this.$message.error(res.message); 115 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%')
115 } 116 }
116 }) 117 })
117 }, 118 },
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <div class="from-clues-header"> 4 <div class="from-clues-header">
5 <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="70px"> 5 <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="70px">
6 <el-row> 6 <el-row>
7 <el-col :span="5"> 7 <el-col :span="4">
8 <el-form-item label="权利类型"> 8 <el-form-item label="权利类型">
9 <el-select v-model="queryForm.qllx" filterable class="width100" clearable placeholder="请选择权利类型"> 9 <el-select v-model="queryForm.qllx" filterable class="width100" clearable placeholder="请选择权利类型">
10 <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 10 <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
...@@ -12,24 +12,63 @@ ...@@ -12,24 +12,63 @@
12 </el-select> 12 </el-select>
13 </el-form-item> 13 </el-form-item>
14 </el-col> 14 </el-col>
15 <el-col :span="5"> 15 <el-col :span="4">
16 <el-form-item label="登记类型">
17 <el-select v-model="queryForm.djlx" filterable class="width100" clearable placeholder="请选择登记类型">
18 <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
19 </el-option>
20 </el-select>
21 </el-form-item>
22 </el-col>
23 <el-col :span="4">
24 <el-form-item label="权属状态">
25 <el-select v-model="queryForm.qszt" filterable class="width100" clearable placeholder="请选择登记类型">
26 <el-option
27 v-for="item in qsztlist"
28 :key="item.dcode"
29 :label="item.dname"
30 :value="item.dcode"></el-option>
31 </el-select>
32 </el-form-item>
33 </el-col>
34 <el-col :span="6">
16 <el-form-item label="不动产单元号" label-width="105px"> 35 <el-form-item label="不动产单元号" label-width="105px">
17 <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100"> 36 <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
18 </el-input> 37 </el-input>
19 </el-form-item> 38 </el-form-item>
20 </el-col> 39 </el-col>
21 <el-col :span="5"> 40 <el-col :span="6">
22 <el-form-item label="不动产权证号" label-width="105px"> 41 <el-form-item label="不动产权证号" label-width="105px">
23 <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100"> 42 <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100">
24 </el-input> 43 </el-input>
25 </el-form-item> 44 </el-form-item>
26 </el-col> 45 </el-col>
46 </el-row>
47 <el-row>
27 <el-col :span="5"> 48 <el-col :span="5">
28 <el-form-item label="业务号"> 49 <el-form-item label="业务号:">
29 <el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width100"> 50 <el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width100">
30 </el-input> 51 </el-input>
31 </el-form-item> 52 </el-form-item>
32 </el-col> 53 </el-col>
54 <el-col :span="5">
55 <el-form-item label="坐落:" label-width="105px">
56 <el-input v-model="queryForm.zl" clearable class="width100">
57 </el-input>
58 </el-form-item>
59 </el-col>
60 <el-col :span="5">
61 <el-form-item label="权利人:" label-width="105px">
62 <el-input v-model="queryForm.qlrmc" clearable class="width100">
63 </el-input>
64 </el-form-item>
65 </el-col>
66 <el-col :span="5">
67 <el-form-item label="义务人:">
68 <el-input v-model="queryForm.ywrmc" clearable class="width100">
69 </el-input>
70 </el-form-item>
71 </el-col>
33 72
34 <el-col :span="4" class="btnColRight"> 73 <el-col :span="4" class="btnColRight">
35 <el-form-item> 74 <el-form-item>
...@@ -64,7 +103,19 @@ export default { ...@@ -64,7 +103,19 @@ export default {
64 }, 103 },
65 data () { 104 data () {
66 return { 105 return {
106 // 权属状态
107 qsztlist: [
108 {
109 dcode: "1",
110 dname: "现势",
111 },
112 {
113 dcode: "2",
114 dname: "历史",
115 },
116 ],
67 queryForm: { 117 queryForm: {
118 qszt: "1",
68 qllx: "", 119 qllx: "",
69 bdcdyh: "", 120 bdcdyh: "",
70 bdcqzh: "", 121 bdcqzh: "",
......