Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
457e9f87 by 田浩浩
Options

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

2 parents db6c6f2f f19fa033
Expand all
Inline Side-by-side
Showing 72 changed files with 379 additions and 521 deletions
1 import request from '@/utils/request'
2 import SERVER from './config'
3 /*
4 获取全部字典数据
5 */
6 export function getAllDict () {
7 return request({
8 url: SERVER.SERVERAPI + '/rest/sys/dict/getAllDict',
9 method: 'post'
10 })
11 }
12 export function getQlxxDictList (data) {
13 return request({
14 url: SERVER.SERVERAPI + '/rest/sys/dict/getQlxxDictList',
15 method: 'post',
16 data
17 })
18 }
19 /*
20 获取字典子级列表
21 */
22 export function getChildDictList (bsmDict) {
23 return request({
24 url: SERVER.SERVERAPI + '/rest/sys/dict/getChildDictList',
25 method: 'get',
26 params: {
27 bsmDict: bsmDict
28 }
29 })
30 }
31 /*
32 编辑字典数据
33 */
34 export function editDictNode (data) {
35 return request({
36 url: SERVER.SERVERAPI + '/rest/sys/dict/editDictNode',
37 method: 'post',
38 data
39 })
40 }
41
42 /*
43 刷新字典缓存
44 */
45 export function refreshDictCache () {
46 return request({
47 url: SERVER.SERVERAPI + '/rest/sys/dict/refreshDictCache',
48 method: 'get'
49 })
50 }
...\ No newline at end of file ...\ No newline at end of file
1 import request from '@/utils/request' 1 import request from '@/utils/request'
2 import SERVER from './config' 2 import SERVER from './config'
3 3 export function uploadUrl () {
4 return process.env.VUE_APP_BASE_API + SERVER.SERVERAPI + '/file/upload'
5 }
4 // 上传单个文件 6 // 上传单个文件
5 export function sjClmxUpload (data) { 7 export function sjClmxUpload (data) {
6 return request({ 8 return request({
......
1 import SERVER from './config'
2 class fileController {
3 uploadUrl () {
4 return process.env.VUE_APP_BASE_API + SERVER.SERVERAPI + '/file/upload'
5 }
6 }
7 export default new fileController()
1 import request from '@/utils/request'
2 import SERVER from './config'
3
4 // 获取首页通知公告列表
5 export function getHomeNoticeList () {
6 return request({
7 url: SERVER.SERVERAPI + '/rest/workBench/getHomeNoticeList',
8 method: 'get'
9 })
10 }
11
12 // 获取首页待办事项
13 export function getHomeTodoList () {
14 return request({
15 url: SERVER.SERVERAPI + '/rest/workBench/getHomeTodoList',
16 method: 'get'
17 })
18 }
19
20 //获取首页已办事项
21 export function getHomeDoneList () {
22 return request({
23 url: SERVER.SERVERAPI + '/rest/workBench/getHomeDoneList',
24 method: 'get'
25 })
26 }
27
28 //获取首页常办项目
29 export function getHomeFrequentProjects () {
30 return request({
31 url: SERVER.SERVERAPI + '/rest/workBench/getHomeFrequentProjects',
32 method: 'get'
33 })
34 }
35
36 //保存常办项目
37 export function saveFrequentProjectsList (data) {
38 return request({
39 url: SERVER.SERVERAPI + '/rest/workBench/saveFrequentProjectsList',
40 method: 'post',
41 data
42 })
43 }
1 import request from '@/utils/request'
2 import SERVER from './config'
3 /*
4 楼盘查询
5 */
6 // 根据条件进行列表查询
7 export function getLpZrz (data) {
8 return request({
9 url: SERVER.SERVERAPI + '/rest/zhcx/lpcx/getLpZrz',
10 method: 'post',
11 data: data
12 })
13 }
14
15 // 获取楼盘表
16 export function getLpb (zrzbsm) {
17 return request({
18 url: SERVER.SERVERAPI + '/rest/zhcx/lpcx/getLpb?zrzbsm=' + zrzbsm,
19 method: 'get'
20 })
21 }
...@@ -10,17 +10,6 @@ export function selectOtherH (data) { ...@@ -10,17 +10,6 @@ export function selectOtherH (data) {
10 data 10 data
11 }) 11 })
12 } 12 }
13 // /*
14 // 业务办理-选择单元-根据条件进行列表查询-房屋所有权
15 // */
16 // export function selectFwsyq (data) {
17 // return request({
18 // url: 'ywbl/ywsq/selectFwsyq',
19 // method: 'post',
20 // data,
21 // showLoading: true
22 // })
23 // }
24 /* 13 /*
25 业务办理-选择抵押权信息-根据条件进行列表查询 14 业务办理-选择抵押权信息-根据条件进行列表查询
26 */ 15 */
......
...@@ -16,3 +16,11 @@ export function addJtfcCxjgXx (data) { ...@@ -16,3 +16,11 @@ export function addJtfcCxjgXx (data) {
16 data 16 data
17 }) 17 })
18 } 18 }
19 // 获取申请查询记录详细信息
20 export function getJtfcInfo (params) {
21 return request({
22 url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getJtfcInfo/',
23 method: 'get',
24 params
25 })
26 }
......
1 import request from '@/utils/request'
2 import SERVER from './config'
3 // 获取申请查询记录详细信息
4 export function getJtfcInfo (params) {
5 return request({
6 url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getJtfcInfo/',
7 method: 'get',
8 params
9 })
10 }
...@@ -91,7 +91,6 @@ export function updateSysSqywmbsz (data) { ...@@ -91,7 +91,6 @@ export function updateSysSqywmbsz (data) {
91 }) 91 })
92 } 92 }
93 93
94
95 // 通知 94 // 通知
96 // 新增系统通知 95 // 新增系统通知
97 export function addSysNotice (data) { 96 export function addSysNotice (data) {
......
1 import request from '@/utils/request' 1 import request from '@/utils/request'
2 import SERVER from './config' 2 import SERVER from './config'
3 3
4 // 用户首页
5 // 获取首页通知公告列表
6 export function getHomeNoticeList () {
7 return request({
8 url: SERVER.SERVERAPI + '/rest/workBench/getHomeNoticeList',
9 method: 'get'
10 })
11 }
12
13 // 获取首页待办事项
14 export function getHomeTodoList () {
15 return request({
16 url: SERVER.SERVERAPI + '/rest/workBench/getHomeTodoList',
17 method: 'get'
18 })
19 }
20
21 //获取首页已办事项
22 export function getHomeDoneList () {
23 return request({
24 url: SERVER.SERVERAPI + '/rest/workBench/getHomeDoneList',
25 method: 'get'
26 })
27 }
28
29 //获取首页常办项目
30 export function getHomeFrequentProjects () {
31 return request({
32 url: SERVER.SERVERAPI + '/rest/workBench/getHomeFrequentProjects',
33 method: 'get'
34 })
35 }
36
37 //保存常办项目
38 export function saveFrequentProjectsList (data) {
39 return request({
40 url: SERVER.SERVERAPI + '/rest/workBench/saveFrequentProjectsList',
41 method: 'post',
42 data
43 })
44 }
45
46
4 // 获取用户信息 47 // 获取用户信息
5 export function getUserInfo () { 48 export function getUserInfo () {
6 return request({ 49 return request({
...@@ -16,3 +59,51 @@ export function getMenuInfo () { ...@@ -16,3 +59,51 @@ export function getMenuInfo () {
16 method: 'get', 59 method: 'get',
17 }) 60 })
18 } 61 }
62 /*
63 获取全部字典数据
64 */
65 export function getAllDict () {
66 return request({
67 url: SERVER.SERVERAPI + '/rest/sys/dict/getAllDict',
68 method: 'post'
69 })
70 }
71 export function getQlxxDictList (data) {
72 return request({
73 url: SERVER.SERVERAPI + '/rest/sys/dict/getQlxxDictList',
74 method: 'post',
75 data
76 })
77 }
78 /*
79 获取字典子级列表
80 */
81 export function getChildDictList (bsmDict) {
82 return request({
83 url: SERVER.SERVERAPI + '/rest/sys/dict/getChildDictList',
84 method: 'get',
85 params: {
86 bsmDict: bsmDict
87 }
88 })
89 }
90 /*
91 编辑字典数据
92 */
93 export function editDictNode (data) {
94 return request({
95 url: SERVER.SERVERAPI + '/rest/sys/dict/editDictNode',
96 method: 'post',
97 data
98 })
99 }
100
101 /*
102 刷新字典缓存
103 */
104 export function refreshDictCache () {
105 return request({
106 url: SERVER.SERVERAPI + '/rest/sys/dict/refreshDictCache',
107 method: 'get'
108 })
109 }
...\ No newline at end of file ...\ No newline at end of file
......
1 import request from '@/utils/request' 1 import request from '@/utils/request'
2 import SERVER from './config' 2 import SERVER from '../config'
3 3
4 //批量初始化 4 //批量初始化
5 export function BatchInit (data) { 5 export function BatchInit (data) {
......
1 import request from '@/utils/request' 1 import request from '@/utils/request'
2 import SERVER from './config' 2 import SERVER from '../config'
3 3
4 // 初始化内容 4 // 初始化内容
5 export function Init (data) { 5 export function Init (data) {
......
1 import request from '@/utils/request' 1 import request from '@/utils/request'
2 import SERVER from './config' 2 import SERVER from '../config'
3 // 初始化内容 3 // 初始化内容
4 export function Init(data) { 4 export function Init(data) {
5 let apiUrl = ""; 5 let apiUrl = "";
......
1 import request from '@/utils/request' 1 import request from '@/utils/request'
2 import SERVER from './config' 2 import SERVER from '../config'
3 3
4 // 初始化内容 4 // 初始化内容
5 export function Init (data) { 5 export function Init (data) {
......
1 import request from '@/utils/request' 1 import request from '@/utils/request'
2 import SERVER from './config' 2 import SERVER from '../config'
3 3
4 // 初始化内容 4 // 初始化内容
5 export function Init (data) { 5 export function Init (data) {
......
1 import request from '@/utils/request' 1 import request from '@/utils/request'
2 import SERVER from './config' 2 import SERVER from '../config'
3 // 初始化内容 3 // 初始化内容
4 export function Init(data) { 4 export function Init (data) {
5 let apiUrl = ""; 5 let apiUrl = "";
6 switch (data.get("djlx")) { 6 switch (data.get("djlx")) {
7 case "100": 7 case "100":
8 apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/fristInit"; 8 apiUrl = SERVER.SERVERAPI + "/rest/ywbl/ygdj/fristInit";
9 break; 9 break;
10 case "200": 10 case "200":
11 apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/transferInit"; 11 apiUrl = SERVER.SERVERAPI + "/rest/ywbl/ygdj/transferInit";
12 break; 12 break;
13 case "300": 13 case "300":
14 apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/changeInit"; 14 apiUrl = SERVER.SERVERAPI + "/rest/ywbl/ygdj/changeInit";
15 break; 15 break;
16 case "400": 16 case "400":
17 apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/logoutInit"; 17 apiUrl = SERVER.SERVERAPI + "/rest/ywbl/ygdj/logoutInit";
18 break; 18 break;
19 case "500": 19 case "500":
20 apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/riviseInit"; 20 apiUrl = SERVER.SERVERAPI + "/rest/ywbl/ygdj/riviseInit";
21 break; 21 break;
22 case "901": 22 case "901":
23 apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/renewalInit"; 23 apiUrl = SERVER.SERVERAPI + "/rest/ywbl/ygdj/renewalInit";
24 break; 24 break;
25 case "902": 25 case "902":
26 apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/replaceInit"; 26 apiUrl = SERVER.SERVERAPI + "/rest/ywbl/ygdj/replaceInit";
27 break; 27 break;
28 } 28 }
29 return request({ 29 return request({
...@@ -34,7 +34,6 @@ export function Init(data) { ...@@ -34,7 +34,6 @@ export function Init(data) {
34 } 34 }
35 // 初始化内容 35 // 初始化内容
36 export function saveData (data) { 36 export function saveData (data) {
37 console.log("222222222222222"+data);
38 return request({ 37 return request({
39 url: SERVER.SERVERAPI + '/rest/ywbl/ygdj/saveData', 38 url: SERVER.SERVERAPI + '/rest/ywbl/ygdj/saveData',
40 method: 'post', 39 method: 'post',
......
...@@ -140,3 +140,24 @@ export function getJdcxBysearch (data) { ...@@ -140,3 +140,24 @@ export function getJdcxBysearch (data) {
140 data 140 data
141 }) 141 })
142 } 142 }
143
144
145 /*
146 楼盘查询
147 */
148 // 根据条件进行列表查询
149 export function getLpZrz (data) {
150 return request({
151 url: SERVER.SERVERAPI + '/rest/zhcx/lpcx/getLpZrz',
152 method: 'post',
153 data: data
154 })
155 }
156
157 // 获取楼盘表
158 export function getLpb (zrzbsm) {
159 return request({
160 url: SERVER.SERVERAPI + '/rest/zhcx/lpcx/getLpb?zrzbsm=' + zrzbsm,
161 method: 'get'
162 })
163 }
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 </div> 12 </div>
13 </div> 13 </div>
14 </div> 14 </div>
15 <div class="dialogBox-content" :style="{ height: scrollerHeight ? scrollerHeight : 'auto' }"> 15 <div class="dialogBox-content" :style="{ height: scrollerHeight }">
16 <slot></slot> 16 <slot></slot>
17 </div> 17 </div>
18 <div slot="footer" class="dialog_footer" v-if="isButton"> 18 <div slot="footer" class="dialog_footer" v-if="isButton">
...@@ -69,6 +69,10 @@ export default { ...@@ -69,6 +69,10 @@ export default {
69 btnDisabled: { 69 btnDisabled: {
70 type: Boolean, 70 type: Boolean,
71 default: false 71 default: false
72 },
73 height: {
74 type: String,
75 default: ''
72 } 76 }
73 }, 77 },
74 data () { 78 data () {
...@@ -76,22 +80,22 @@ export default { ...@@ -76,22 +80,22 @@ export default {
76 key: 0, 80 key: 0,
77 dialogVisible: false, 81 dialogVisible: false,
78 fullscreen: false, 82 fullscreen: false,
79 scrollerHeight: false, 83 scrollerHeight: ''
80 } 84 }
81 }, 85 },
82 watch: { 86 watch: {
83 value (val) { 87 value (val) {
84 this.dialogVisible = val 88 this.dialogVisible = val
89 this.height && (this.scrollerHeight = this.height + 'px')
85 } 90 }
86 }, 91 },
87 methods: { 92 methods: {
88 handleFullscreen (val) { 93 handleFullscreen () {
89 this.fullscreen = !this.fullscreen 94 this.fullscreen = !this.fullscreen
90 let height = document.getElementById('dialogBox').clientHeight
91 if (!this.fullscreen) { 95 if (!this.fullscreen) {
92 this.scrollerHeight = false 96 this.scrollerHeight = ''
93 } else { 97 } else {
94 this.scrollerHeight = (window.innerHeight - 180) + 'px' 98 this.scrollerHeight = (window.innerHeight - 120) + 'px'
95 } 99 }
96 }, 100 },
97 submitForm () { 101 submitForm () {
......
...@@ -3,12 +3,19 @@ ...@@ -3,12 +3,19 @@
3 <div class="el-message-box__wrapper" tabindex="-1" v-show="visible" @click.self="handleWrapperClick" role="dialog" 3 <div class="el-message-box__wrapper" tabindex="-1" v-show="visible" @click.self="handleWrapperClick" role="dialog"
4 aria-modal="true" :aria-label="title || 'dialog'"> 4 aria-modal="true" :aria-label="title || 'dialog'">
5 <div class="el-message-box" :class="[customClass, center && 'el-message-box--center']"> 5 <div class="el-message-box" :class="[customClass, center && 'el-message-box--center']">
6 <div class="el-message-box__header" v-if="title !== null">
7 <div class="el-message-box__title">
8 <span>标题：{{ title }}</span>
9 </div>
10 <button type="button" class="el-message-box__headerbtn" aria-label="Close" v-if="showClose"
11 @click="handleAction(distinguishCancelAndClose ? 'close' : 'cancel')"
12 @keydown.enter="handleAction(distinguishCancelAndClose ? 'close' : 'cancel')">
13 <i class="el-message-box__close el-icon-close"></i>
14 </button>
15 </div>
6 <div class="el-message-box__content"> 16 <div class="el-message-box__content">
7 <div class="el-message-box__container">
8 <div v-if="title !== ''" class="message-title">标题：{{ title }}</div>
9 <div v-if="message !== ''" class="richText" v-html="message"></div> 17 <div v-if="message !== ''" class="richText" v-html="message"></div>
10 </div> 18 </div>
11 </div>
12 <div class="el-message-box__btns"> 19 <div class="el-message-box__btns">
13 <el-button :loading="cancelButtonLoading" :class="[cancelButtonClasses]" :round="roundButton" size="small" 20 <el-button :loading="cancelButtonLoading" :class="[cancelButtonClasses]" :round="roundButton" size="small"
14 @click.native="handleAction('cancel')" @keydown.enter="handleAction('cancel')"> 21 @click.native="handleAction('cancel')" @keydown.enter="handleAction('cancel')">
...@@ -283,4 +290,8 @@ export default { ...@@ -283,4 +290,8 @@ export default {
283 width: 100%; 290 width: 100%;
284 height: 100%; 291 height: 100%;
285 } 292 }
293
294 /deep/.el-message-box__content {
295 padding-top: 0;
296 }
286 </style> 297 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 <template> 1 <template>
2 <transition name="dialog-fade" mode="out-in" v-if="isShow"> 2 <transition name="msgbox-fade" v-if="myShow">
3 <div class="ls-mask" v-loading="loading"> 3 <div class="ls-mask" v-loading="loading">
4 <div class="ls-mask-window" :style="{ 'width': width }"> 4 <div class="ls-mask-window" :style="{ 'width': width }">
5 <div class="ls-head"> 5 <div class="ls-head">
...@@ -35,6 +35,7 @@ export default { ...@@ -35,6 +35,7 @@ export default {
35 confirmText: '确认', 35 confirmText: '确认',
36 isSync: false, 36 isSync: false,
37 isShow: false, 37 isShow: false,
38 myShow: false,
38 titleStyle: 'center', 39 titleStyle: 'center',
39 width: "75%", 40 width: "75%",
40 height: "auto", 41 height: "auto",
...@@ -47,10 +48,10 @@ export default { ...@@ -47,10 +48,10 @@ export default {
47 loading: { type: Boolean, default: false }, 48 loading: { type: Boolean, default: false },
48 }, 49 },
49 watch: { 50 watch: {
50 isShow (a, b) { 51 isShow (newValue) {
51 this.key++
52 this.editItem = this.loadViewFn(this.editItem) 52 this.editItem = this.loadViewFn(this.editItem)
53 document.body.appendChild(this.$el); 53 document.body.appendChild(this.$el);
54 this.myShow = newValue
54 } 55 }
55 }, 56 },
56 mounted () { 57 mounted () {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 </div> 12 </div>
13 </div> 13 </div>
14 </div> 14 </div>
15 <div class="dialogBox-content" :style="{ height: scrollerHeight ? scrollerHeight : 'auto' }"> 15 <div class="dialogBox-content" :style="{ height: scrollerHeight }">
16 <slot></slot> 16 <slot></slot>
17 </div> 17 </div>
18 <div slot="footer" class="dialog_footer" v-if="isButton"> 18 <div slot="footer" class="dialog_footer" v-if="isButton">
...@@ -69,6 +69,10 @@ export default { ...@@ -69,6 +69,10 @@ export default {
69 btnDisabled: { 69 btnDisabled: {
70 type: Boolean, 70 type: Boolean,
71 default: false 71 default: false
72 },
73 height: {
74 type: String,
75 default: ''
72 } 76 }
73 }, 77 },
74 data () { 78 data () {
...@@ -76,22 +80,22 @@ export default { ...@@ -76,22 +80,22 @@ export default {
76 key: 0, 80 key: 0,
77 dialogVisible: false, 81 dialogVisible: false,
78 fullscreen: false, 82 fullscreen: false,
79 scrollerHeight: false, 83 scrollerHeight: ''
80 } 84 }
81 }, 85 },
82 watch: { 86 watch: {
83 value (val) { 87 value (val) {
84 this.dialogVisible = val 88 this.dialogVisible = val
89 this.height && (this.scrollerHeight = this.height + 'px')
85 } 90 }
86 }, 91 },
87 methods: { 92 methods: {
88 handleFullscreen (val) { 93 handleFullscreen () {
89 this.fullscreen = !this.fullscreen 94 this.fullscreen = !this.fullscreen
90 let height = document.getElementById('dialogBox').clientHeight
91 if (!this.fullscreen) { 95 if (!this.fullscreen) {
92 this.scrollerHeight = false 96 this.scrollerHeight = ''
93 } else { 97 } else {
94 this.scrollerHeight = (window.innerHeight - 180) + 'px' 98 this.scrollerHeight = (window.innerHeight - 120) + 'px'
95 } 99 }
96 }, 100 },
97 submitForm () { 101 submitForm () {
......
...@@ -32,7 +32,7 @@ import { mapGetters } from 'vuex' ...@@ -32,7 +32,7 @@ import { mapGetters } from 'vuex'
32 import NoticeBar from '@/components/NoticeBar/index' 32 import NoticeBar from '@/components/NoticeBar/index'
33 import { 33 import {
34 getHomeNoticeList 34 getHomeNoticeList
35 } from "@/api/home.js" 35 } from "@/api/user"
36 export default { 36 export default {
37 components: { 37 components: {
38 NoticeBar 38 NoticeBar
......
1 import { getAllDict } from '@/api/dict' 1 import { getAllDict } from '@/api/user'
2 const state = { 2 const state = {
3 dictData: {}, 3 dictData: {},
4 addDict: false, 4 addDict: false,
......
...@@ -33,7 +33,9 @@ ...@@ -33,7 +33,9 @@
33 @include flex-center; 33 @include flex-center;
34 } 34 }
35 35
36 36 .dialogBox-content {
37 height: auto
38 }
37 } 39 }
38 40
39 .dialog_title { 41 .dialog_title {
......
1 import Popup from '@/components/Popup/index'
2 export function popupDialog (title, url, params, width = '75%', height, btnShow = false, callback) {
3 Popup.install(title, url, {
4 height: height,
5 width: width,
6 formData: params,
7 btnShow: btnShow,
8 cancel: () => {
9 console.log("取消回调");
10 },
11 confirm: () => {
12 callback
13 }
14 })
15 }
...\ No newline at end of file ...\ No newline at end of file
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 </template> 37 </template>
38 <script> 38 <script>
39 import PhotoZoom from '@/components/PhotoZoom' 39 import PhotoZoom from '@/components/PhotoZoom'
40 import { sjClmxUpload, sjClmxDelete } from '@/api/jsydsyqFlow' 40 import { sjClmxUpload, sjClmxDelete } from '@/api/workflow/jsydsyqFlow'
41 import publicPicture from '@/components/publicPicture/index.vue' 41 import publicPicture from '@/components/publicPicture/index.vue'
42 export default { 42 export default {
43 name: 'PreviewImage', 43 name: 'PreviewImage',
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 </template> 7 </template>
8 <script> 8 <script>
9 import { getMenuInfo } from "@/api/user.js"; 9 import { getMenuInfo } from "@/api/user.js";
10 import { saveFrequentProjectsList, getHomeFrequentProjects } from "@/api/home.js"; 10 import { saveFrequentProjectsList, getHomeFrequentProjects } from "@/api/user.js";
11 export default { 11 export default {
12 props: { 12 props: {
13 value: { type: Boolean, default: false }, 13 value: { type: Boolean, default: false },
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
106 <script> 106 <script>
107 import * as G2 from '@antv/g2' 107 import * as G2 from '@antv/g2'
108 import vueSeamlessScroll from "vue-seamless-scroll" 108 import vueSeamlessScroll from "vue-seamless-scroll"
109 import { getHomeNoticeList, getHomeTodoList, getHomeDoneList, getHomeFrequentProjects } from "@/api/home.js"; 109 import { getHomeNoticeList, getHomeTodoList, getHomeDoneList, getHomeFrequentProjects } from "@/api/user.js";
110 import addDialog from "./components/addProject.vue"; 110 import addDialog from "./components/addProject.vue";
111 export default { 111 export default {
112 name: 'home', 112 name: 'home',
......
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
189 </div> 189 </div>
190 </template> 190 </template>
191 <script> 191 <script>
192 import { getLpb } from '@/api/lpb' 192 import { getLpb } from '@/api/zhcx'
193 import { Message } from 'element-ui'; 193 import { Message } from 'element-ui';
194 import hbj from "../hbj/lpb-hbj/index"; 194 import hbj from "../hbj/lpb-hbj/index";
195 export default { 195 export default {
......
...@@ -9,32 +9,9 @@ ...@@ -9,32 +9,9 @@
9 </el-checkbox-group> 9 </el-checkbox-group>
10 </div> 10 </div>
11 </div> 11 </div>
12 <div class="xxTableBox"> 12 <div class="xxTableBox rollTable">
13 <table class="xxTable"> 13 <table class="xxTable">
14 <tr v-for="(item, colindex) in columns.slice(0, 2)" :key="colindex"> 14 <tr v-for="(item, colindex) in columns" :key="colindex">
15 <td>
16 {{ item.label }}
17 </td>
18 <td v-for="(row, index) in tableData" :key="index" :class="[
19 row.qszt == '2' ? 'lishi' : '',
20 row.qszt == '0' ? 'linshi' : '',
21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
22 ]">
23 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
24 正在办理
25 </div>
26 <span v-if="item.prop == 'qszt'">
27 {{ getQsztName(row[item.prop]) }}
28 </span>
29
30 <span v-else> {{ row[item.prop] }}</span>
31 </td>
32 <td v-for="count in emptycolNum" :key="~count"></td>
33 </tr>
34 </table>
35
36 <table class="xxTable rollTable">
37 <tr v-for="(item, colindex) in columns.slice(3)" :key="colindex">
38 <td> 15 <td>
39 {{ item.label }} 16 {{ item.label }}
40 </td> 17 </td>
...@@ -91,8 +68,8 @@ export default { ...@@ -91,8 +68,8 @@ export default {
91 }).then((res) => { 68 }).then((res) => {
92 if (res.code === 200) { 69 if (res.code === 200) {
93 this.tableData = res.result; 70 this.tableData = res.result;
94 this.tableData.forEach((item,index) => { 71 this.tableData.forEach((item, index) => {
95 if(item.sfbxf == '1'){ 72 if (item.sfbxf == '1') {
96 item.zxywh = ''; 73 item.zxywh = '';
97 item.zxdbr = ''; 74 item.zxdbr = '';
98 item.zxsj = ''; 75 item.zxsj = '';
......
...@@ -9,32 +9,9 @@ ...@@ -9,32 +9,9 @@
9 </el-checkbox-group> 9 </el-checkbox-group>
10 </div> 10 </div>
11 </div> 11 </div>
12 <div class="xxTableBox"> 12 <div class="xxTableBox rollTable">
13 <table class="xxTable"> 13 <table class="xxTable">
14 <tr v-for="(item, colindex) in columns.slice(0, 3)" :key="colindex"> 14 <tr v-for="(item, colindex) in columns" :key="colindex">
15 <td>
16 {{ item.label }}
17 </td>
18 <td v-for="(row, index) in tableData" :key="index" :class="[
19 row.qszt == '2' ? 'lishi' : '',
20 row.qszt == '0' ? 'linshi' : '',
21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
22 ]">
23 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
24 正在办理
25 </div>
26 <span v-if="item.prop == 'qszt'">
27 {{ getQsztName(row[item.prop]) }}
28 </span>
29
30 <span v-else> {{ row[item.prop] }}</span>
31 </td>
32 <td v-for="count in emptycolNum" :key="~count"></td>
33 </tr>
34 </table>
35
36 <table class="xxTable rollTable">
37 <tr v-for="(item, colindex) in columns.slice(3)" :key="colindex">
38 <td> 15 <td>
39 {{ item.label }} 16 {{ item.label }}
40 </td> 17 </td>
......
...@@ -9,31 +9,9 @@ ...@@ -9,31 +9,9 @@
9 </el-checkbox-group> 9 </el-checkbox-group>
10 </div> 10 </div>
11 </div> 11 </div>
12 <div class="xxTableBox"> 12 <div class="xxTableBox rollTable">
13 <table class="xxTable"> 13 <table class="xxTable">
14 <tr v-for="(item, colindex) in columns.slice(0, 3)" :key="colindex"> 14 <tr v-for="(item, colindex) in columns" :key="colindex">
15 <td>
16 {{ item.label }}
17 </td>
18 <td v-for="(row, index) in tableData" :key="index" :class="[
19 row.qszt == '2' ? 'lishi' : '',
20 row.qszt == '0' ? 'linshi' : '',
21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
22 ]">
23 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
24 正在办理
25 </div>
26 <span v-if="item.prop == 'qszt'">
27 {{ getQsztName(row[item.prop]) }}
28 </span>
29
30 <span v-else> {{ row[item.prop] }}</span>
31 </td>
32 <td v-for="count in emptycolNum" :key="~count"></td>
33 </tr>
34 </table>
35 <table class="xxTable rollTable">
36 <tr v-for="(item, colindex) in columns.slice(3)" :key="colindex">
37 <td> 15 <td>
38 {{ item.label }} 16 {{ item.label }}
39 </td> 17 </td>
......
...@@ -62,6 +62,7 @@ export default { ...@@ -62,6 +62,7 @@ export default {
62 }; 62 };
63 }, 63 },
64 handleNodeClick (data, node, elem) { 64 handleNodeClick (data, node, elem) {
65 console.log(data.form);
65 this.loadComponent(data.form); 66 this.loadComponent(data.form);
66 }, 67 },
67 loadComponent (form) { 68 loadComponent (form) {
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
10 </div> 10 </div>
11 </div> 11 </div>
12 <div class="xxTableBox rollTable"> 12 <div class="xxTableBox rollTable">
13 <!-- 固定前三个 -->
14 <table class="xxTable"> 13 <table class="xxTable">
15 <tr v-for="(item, colindex) in columns" :key="colindex"> 14 <tr v-for="(item, colindex) in columns" :key="colindex">
16 <td> 15 <td>
......
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
71 position: sticky; 71 position: sticky;
72 top: 80px; 72 top: 80px;
73 z-index: 3; 73 z-index: 3;
74 box-shadow: 0px 15px 10px -15px #409EFF;
74 } 75 }
75 76
76 tr td:first-child { 77 tr td:first-child {
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
9 </el-checkbox-group> 9 </el-checkbox-group>
10 </div> 10 </div>
11 </div> 11 </div>
12 <div class="xxTableBox"> 12 <div class="xxTableBox rollTable">
13 <table class="xxTable rollTable"> 13 <table class="xxTable">
14 <tr v-for="(item, colindex) in columns" :key="colindex"> 14 <tr v-for="(item, colindex) in columns" :key="colindex">
15 <td> 15 <td>
16 {{ item.label }} 16 {{ item.label }}
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
9 </el-checkbox-group> 9 </el-checkbox-group>
10 </div> 10 </div>
11 </div> 11 </div>
12 <div class="xxTableBox"> 12 <div class="xxTableBox rollTable">
13 <table class="xxTable rollTable"> 13 <table class="xxTable">
14 <tr v-for="(item, colindex) in columns" :key="colindex"> 14 <tr v-for="(item, colindex) in columns" :key="colindex">
15 <td> 15 <td>
16 {{ item.label }} 16 {{ item.label }}
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
24 <script> 24 <script>
25 import imgPath from "./djbyb.png" 25 import imgPath from "./djbyb.png"
26 export default { 26 export default {
27 components: {},
28 props: ["formData"], 27 props: ["formData"],
29 28
30 created () { 29 created () {
......
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
38 <script> 38 <script>
39 import { mapGetters } from "vuex"; 39 import { mapGetters } from "vuex";
40 import table from "@/utils/mixin/table"; 40 import table from "@/utils/mixin/table";
41 import { popupDialog } from "@/utils/popup.js";
41 import { datas, sendThis } from "./dydjbdata"; 42 import { datas, sendThis } from "./dydjbdata";
42 import { getJtfcPage } from "@/api/sqcx"; 43 import { getJtfcPage } from "@/api/sqcx";
43
44 export default { 44 export default {
45 name: "dydjb", 45 name: "dydjb",
46 mixins: [table], 46 mixins: [table],
...@@ -78,14 +78,9 @@ export default { ...@@ -78,14 +78,9 @@ export default {
78 }); 78 });
79 }, 79 },
80 dydjbClick (scope) { 80 dydjbClick (scope) {
81 this.$popup("打印登记薄", "sqcx/dydjb/components/dydjbInfo", { 81 popupDialog("打印登记薄", "sqcx/dydjb/components/dydjbInfo", {
82 height: "800px",
83 formData: {
84 sqcxdata: scope.row, 82 sqcxdata: scope.row,
85 }, 83 })
86 cancel: function () { }, //取消事件的回调
87 confirm: function () { },
88 });
89 }, 84 },
90 handleSort (name, sort) { 85 handleSort (name, sort) {
91 console.log(name, sort); 86 console.log(name, sort);
......
1 <template> 1 <template>
2 <dialogBox title="家庭房产查询" @closeDialog="closeDialog" isMain width="70%" :isButton="false" v-model="myValue"> 2 <dialogBox title="家庭房产查询" @closeDialog="closeDialog" width="70%" height="700" :isButton="false" v-model="myValue">
3 <div class="jtfccx-edit"> 3 <div class="jtfccx-edit">
4 <div class="jtfccx-edit-con"> 4 <div class="jtfccx-edit-con">
5 <b class="title">申请信息</b> 5 <b class="title">申请信息</b>
...@@ -29,13 +29,13 @@ ...@@ -29,13 +29,13 @@
29 <el-button type="primary" @click="queryChick">查询</el-button> 29 <el-button type="primary" @click="queryChick">查询</el-button>
30 <el-button @click="resetClick">重置</el-button> 30 <el-button @click="resetClick">重置</el-button>
31 </div> 31 </div>
32 <b class="title" v-if="isSearch">查询结果</b> 32 <b class="title" v-show="isSearch">查询结果</b>
33 <lb-table :column="searchData.columns" v-if="isSearch" :data="searchData.data" :maxHeight="200" heightNumSetting 33 <lb-table :column="searchData.columns" v-if="isSearch" :data="searchData.data" :maxHeight="200" heightNumSetting
34 :pagination="false"> 34 :pagination="false">
35 </lb-table> 35 </lb-table>
36 </div> 36 </div>
37 37
38 <div class="submit-button" v-if="isSearch" style="padding-bottom:20px"> 38 <div class="submit-button" v-show="isSearch" style="padding-bottom:20px">
39 <el-button type="primary" v-if="searchData.data.length > 0">房产结果打印（1）</el-button> 39 <el-button type="primary" v-if="searchData.data.length > 0">房产结果打印（1）</el-button>
40 <el-button type="primary" v-else>无房证明打印（1）</el-button> 40 <el-button type="primary" v-else>无房证明打印（1）</el-button>
41 <el-button @click="closeDialog">关闭</el-button> 41 <el-button @click="closeDialog">关闭</el-button>
......
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
76 </template> 76 </template>
77 77
78 <script> 78 <script>
79 import { getJtfcInfo } from "@/api/sqcxjl"; 79 import { getJtfcInfo } from "@/api/sqcx";
80 import { datas, sendThis } from "./sqcxjlInfodata"; 80 import { datas, sendThis } from "./sqcxjlInfodata";
81 81
82 export default { 82 export default {
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 24
25 <script> 25 <script>
26 import { getUuid, judgeSort, realMove, findParents, removeTreeListItem } from '@/utils/operation' 26 import { getUuid, judgeSort, realMove, findParents, removeTreeListItem } from '@/utils/operation'
27 import { editDictNode } from '@/api/dict' 27 import { editDictNode } from '@/api/user'
28 export default { 28 export default {
29 props: { 29 props: {
30 value: { type: Boolean, default: false }, 30 value: { type: Boolean, default: false },
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 </template> 35 </template>
36 <script> 36 <script>
37 import table from "@/utils/mixin/table" 37 import table from "@/utils/mixin/table"
38 import { getQlxxDictList, getChildDictList,refreshDictCache } from "@/api/dict.js" 38 import { getQlxxDictList, getChildDictList, refreshDictCache } from "@/api/user.js"
39 import { datas, sendThis } from "./dictionaries" 39 import { datas, sendThis } from "./dictionaries"
40 import editDialog from "./components/editDialog.vue" 40 import editDialog from "./components/editDialog.vue"
41 export default { 41 export default {
......
...@@ -122,9 +122,8 @@ ...@@ -122,9 +122,8 @@
122 </div> 122 </div>
123 </dialogBox> 123 </dialogBox>
124 </template> 124 </template>
125
126 <script> 125 <script>
127 import fileController from '@/api/fileController' 126 import { uploadUrl } from '@/api/file'
128 import djqxsd from './djqxsd.vue' 127 import djqxsd from './djqxsd.vue'
129 import clgzsd from './clgzsd.vue' 128 import clgzsd from './clgzsd.vue'
130 import dyztsd from './dyztsd.vue' 129 import dyztsd from './dyztsd.vue'
...@@ -170,7 +169,7 @@ export default { ...@@ -170,7 +169,7 @@ export default {
170 btnDisabled: false, 169 btnDisabled: false,
171 tn: 0, 170 tn: 0,
172 titleList: [], 171 titleList: [],
173 imgUploadUrl: fileController.uploadUrl(), 172 imgUploadUrl: uploadUrl(),
174 n: 0, 173 n: 0,
175 leftList: [ 174 leftList: [
176 { 175 {
......
1 <template> 1 <template>
2 <dialogBox 2 <dialogBox title="申请人信息" width="60%" isMain v-model="myValue" :isFullscreen="false" @submitForm="submitForm"
3 title="申请人信息" 3 @closeDialog="closeDialog">
4 width="60%" 4 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
5 isMain
6 v-model="myValue"
7 :isFullscreen="false"
8 @submitForm="submitForm"
9 @closeDialog="closeDialog"
10 >
11 <el-form
12 :model="ruleForm"
13 :rules="rules"
14 ref="ruleForm"
15 label-width="120px"
16 >
17 <el-row> 5 <el-row>
18 <el-col :span="8"> 6 <el-col :span="8">
19 <el-form-item label="权利人类型" prop="sqrlx"> 7 <el-form-item label="权利人类型" prop="sqrlx">
20 <el-select 8 <el-select clearable v-model="ruleForm.sqrlx" class="width100" placeholder="请选择">
21 clearable 9 <el-option v-for="item in dictData['A36']" :key="item.dcode" :label="item.dname" :value="item.dcode">
22 v-model="ruleForm.sqrlx"
23 class="width100"
24 placeholder="请选择"
25 >
26 <el-option
27 v-for="item in dictData['A36']"
28 :key="item.dcode"
29 :label="item.dname"
30 :value="item.dcode"
31 >
32 </el-option> 10 </el-option>
33 </el-select> 11 </el-select>
34 </el-form-item> 12 </el-form-item>
...@@ -40,18 +18,8 @@ ...@@ -40,18 +18,8 @@
40 </el-col> 18 </el-col>
41 <el-col :span="8"> 19 <el-col :span="8">
42 <el-form-item label="证件种类" prop="zjzl"> 20 <el-form-item label="证件种类" prop="zjzl">
43 <el-select 21 <el-select clearable v-model="ruleForm.zjzl" class="width100" placeholder="请选择">
44 clearable 22 <el-option v-for="item in dictData['A30']" :key="item.dcode" :label="item.dname" :value="item.dcode">
45 v-model="ruleForm.zjzl"
46 class="width100"
47 placeholder="请选择"
48 >
49 <el-option
50 v-for="item in dictData['A30']"
51 :key="item.dcode"
52 :label="item.dname"
53 :value="item.dcode"
54 >
55 </el-option> 23 </el-option>
56 </el-select> 24 </el-select>
57 </el-form-item> 25 </el-form-item>
...@@ -70,18 +38,8 @@ ...@@ -70,18 +38,8 @@
70 </el-col> 38 </el-col>
71 <el-col :span="8"> 39 <el-col :span="8">
72 <el-form-item label="性别"> 40 <el-form-item label="性别">
73 <el-select 41 <el-select clearable v-model="ruleForm.xb" class="width100" placeholder="请选择">
74 clearable 42 <el-option v-for="item in dictData['A43']" :key="item.dcode" :label="item.dname" :value="item.dcode">
75 v-model="ruleForm.xb"
76 class="width100"
77 placeholder="请选择"
78 >
79 <el-option
80 v-for="item in dictData['A43']"
81 :key="item.dcode"
82 :label="item.dname"
83 :value="item.dcode"
84 >
85 </el-option> 43 </el-option>
86 </el-select> 44 </el-select>
87 </el-form-item> 45 </el-form-item>
...@@ -162,18 +120,8 @@ ...@@ -162,18 +120,8 @@
162 </el-col> 120 </el-col>
163 <el-col :span="8"> 121 <el-col :span="8">
164 <el-form-item label="代理人证件类型"> 122 <el-form-item label="代理人证件类型">
165 <el-select 123 <el-select clearable v-model="ruleForm.dlrzjlx" class="width100" placeholder="请选择">
166 clearable 124 <el-option v-for="item in dictData['A30']" :key="item.dcode" :label="item.dname" :value="item.dcode">
167 v-model="ruleForm.dlrzjlx"
168 class="width100"
169 placeholder="请选择"
170 >
171 <el-option
172 v-for="item in dictData['A30']"
173 :key="item.dcode"
174 :label="item.dname"
175 :value="item.dcode"
176 >
177 </el-option> 125 </el-option>
178 </el-select> 126 </el-select>
179 </el-form-item> 127 </el-form-item>
...@@ -199,7 +147,7 @@ export default { ...@@ -199,7 +147,7 @@ export default {
199 computed: { 147 computed: {
200 ...mapGetters(["dictData"]), 148 ...mapGetters(["dictData"]),
201 }, 149 },
202 data() { 150 data () {
203 return { 151 return {
204 myValue: this.value, 152 myValue: this.value,
205 ruleForm: { 153 ruleForm: {
...@@ -232,7 +180,7 @@ export default { ...@@ -232,7 +180,7 @@ export default {
232 }; 180 };
233 }, 181 },
234 watch: { 182 watch: {
235 value(val) { 183 value (val) {
236 this.myValue = _.cloneDeep(val); 184 this.myValue = _.cloneDeep(val);
237 }, 185 },
238 details: { 186 details: {
...@@ -243,11 +191,11 @@ export default { ...@@ -243,11 +191,11 @@ export default {
243 }, 191 },
244 }, 192 },
245 methods: { 193 methods: {
246 closeDialog() { 194 closeDialog () {
247 this.$emit("input", false); 195 this.$emit("input", false);
248 this.$refs["ruleForm"].resetFields(); 196 this.$refs["ruleForm"].resetFields();
249 }, 197 },
250 submitForm() { 198 submitForm () {
251 // this.$refs['ruleForm'].validate((valid) => { 199 // this.$refs['ruleForm'].validate((valid) => {
252 // if (valid) { 200 // if (valid) {
253 // this.$message({ 201 // this.$message({
......
1 <template> 1 <template>
2 <div>
3 <lb-table :column="column" :maxHeight="300" heightNumSetting :pagination="false" :key="key" :data="tableData"> 2 <lb-table :column="column" :maxHeight="300" heightNumSetting :pagination="false" :key="key" :data="tableData">
4 </lb-table> 3 </lb-table>
5 </div>
6 </template> 4 </template>
7 <script> 5 <script>
8 import addQlr from './addQlr.vue' 6 import addQlr from './addQlr.vue'
......
1 <template> 1 <template>
2 <div>
3 <lb-table :column="column" :maxHeight="300" heightNumSetting :pagination="false" :key="key" :data="tableData"> 2 <lb-table :column="column" :maxHeight="300" heightNumSetting :pagination="false" :key="key" :data="tableData">
4 </lb-table> 3 </lb-table>
5 </div>
6 </template> 4 </template>
7 <script> 5 <script>
8 import addQlr from './addQlr.vue' 6 import addQlr from './addQlr.vue'
......
...@@ -109,8 +109,6 @@ class data extends filter { ...@@ -109,8 +109,6 @@ class data extends filter {
109 ] 109 ]
110 } 110 }
111 } 111 }
112
113
114 } 112 }
115 let datas = new data() 113 let datas = new data()
116 export { 114 export {
......
1 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js"; 1 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js";
2 import { popupDialog } from "@/utils/popup.js";
2 import { 3 import {
3 leftMenu, 4 leftMenu,
4 stepExpandInfo, 5 stepExpandInfo,
...@@ -86,14 +87,12 @@ export default { ...@@ -86,14 +87,12 @@ export default {
86 let that = this; 87 let that = this;
87 switch (item.value) { 88 switch (item.value) {
88 case "B0": 89 case "B0":
89 // let type = queueDjywmc(this.$route.query.sqywbm)
90 this.isDialog = true; 90 this.isDialog = true;
91 break; 91 break;
92 case "B1": 92 case "B1":
93 getWorkFlowImage(this.bsmSlsq, this.$route.query.bestepid).then(res => { 93 getWorkFlowImage(this.bsmSlsq, this.$route.query.bestepid).then(res => {
94 let { result } = res 94 let { result } = res
95 this.$popup("流程图", "workflow/components/processViewer", { 95 popupDialog("流程图", "workflow/components/processViewer", {
96 formData: {
97 xml: result.xml, 96 xml: result.xml,
98 finishedInfo: { 97 finishedInfo: {
99 finishedTaskSet: result.finishedTaskSet, 98 finishedTaskSet: result.finishedTaskSet,
...@@ -102,7 +101,6 @@ export default { ...@@ -102,7 +101,6 @@ export default {
102 finishedSequenceFlowSet: result.finishedSequenceFlowSet 101 finishedSequenceFlowSet: result.finishedSequenceFlowSet
103 }, 102 },
104 allCommentList: result.historyTaskList 103 allCommentList: result.historyTaskList
105 }
106 }) 104 })
107 }) 105 })
108 break; 106 break;
...@@ -123,50 +121,24 @@ export default { ...@@ -123,50 +121,24 @@ export default {
123 } 121 }
124 break; 122 break;
125 case "B4": 123 case "B4":
126 this.$popup("登记簿详情", "registerBook/djbFrame", { 124 popupDialog("登记簿详情", "registerBook/djbFrame", this.currentSelectProps, '80%')
127 formData: this.currentSelectProps,
128 width: "1220px",
129 height: "790px",
130 cancel: () => {
131 console.log("取消回调");
132 },
133 confirm: () => {
134 console.log("确认回调");
135 },
136 });
137 break; 125 break;
138 case "B5": 126 case "B5":
139 this.$popup("证书预览", "workflow/components/zsyl", { 127 popupDialog("证书预览", "workflow/components/zsyl", {
140 height: "600px",
141 width: "800px",
142 formData: {
143 bsmSlsq: this.bsmSlsq, 128 bsmSlsq: this.bsmSlsq,
144 entryType: '1' 129 entryType: '1'
145 }, 130 }, '800px')
146 })
147 break; 131 break;
148 case "B7": 132 case "B7":
149 this.$popup("证书领取", "workflow/components/zslq", { 133 this.$popup("证书领取", "workflow/components/zslq", {
150 width: '900px', 134 formData: { bsmSlsq: this.$route.query.bsmSlsq }
151 formData: { bsmSlsq: this.$route.query.bsmSlsq },
152 }) 135 })
153 break; 136 break;
154 case "back": //退回按钮 137 case "back": //退回按钮
155 this.$popup("退回", "workflow/components/th", { 138 popupDialog("退回", "workflow/components/th", {
156 height: "200px",
157 width: '30%',
158 formData: {
159 bsmSlsq: this.bsmSlsq, 139 bsmSlsq: this.bsmSlsq,
160 bestepid: this.bestepid 140 bestepid: this.bestepid
161 }, 141 }, '30%', "200px", true)
162 btnShow: true,
163 cancel: () => {
164 console.log("取消回调");
165 },
166 confirm: () => {
167 console.log("确认回调");
168 },
169 })
170 break; 142 break;
171 case "transfer": //转件按钮 143 case "transfer": //转件按钮
172 getNextLinkInfo({ 144 getNextLinkInfo({
...@@ -183,21 +155,10 @@ export default { ...@@ -183,21 +155,10 @@ export default {
183 }); 155 });
184 break; 156 break;
185 case "stop": //终止按钮 157 case "stop": //终止按钮
186 this.$popup("终止", "workflow/components/stop", { 158 popupDialog("终止", "workflow/components/stop", {
187 height: "330px",
188 width: '30%',
189 formData: {
190 bsmSlsq: this.bsmSlsq, 159 bsmSlsq: this.bsmSlsq,
191 bestepid: this.bestepid, 160 bestepid: this.bestepid,
192 }, 161 }, '30%', "330px", true)
193 btnShow: true,
194 cancel: () => {
195 console.log("取消回调");
196 },
197 confirm: () => {
198 console.log("确认回调");
199 },
200 })
201 break; 162 break;
202 case "signout": 163 case "signout":
203 window.close(); 164 window.close();
...@@ -315,9 +276,9 @@ export default { ...@@ -315,9 +276,9 @@ export default {
315 }).then((action) => { 276 }).then((action) => {
316 this.$message({ 277 this.$message({
317 type: "info", 278 type: "info",
318 message: "action: " + action, 279 message: "action: " + action
319 }); 280 })
320 }); 281 })
321 } 282 }
322 } 283 }
323 } 284 }
......
1 import { getForm } from "../flowform"; 1 import { getForm } from "../flowform";
2 import { getHomeNoticeList } from "@/api/home.js" 2 import { getHomeNoticeList } from "@/api/user.js"
3 export default { 3 export default {
4 data () { 4 data () {
5 return { 5 return {
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
28 .title { 28 .title {
29 line-height: 36px; 29 line-height: 36px;
30 text-align: center; 30 text-align: center;
31 font-size: 14px;
31 } 32 }
32 33
33 .batchDel { 34 .batchDel {
...@@ -45,7 +46,7 @@ ...@@ -45,7 +46,7 @@
45 ul { 46 ul {
46 position: relative; 47 position: relative;
47 height: calc(100vh - 120px); 48 height: calc(100vh - 120px);
48 overflow-y: scroll; 49 overflow-y: auto;
49 50
50 .xian { 51 .xian {
51 background: #f2f2f2; 52 background: #f2f2f2;
......
...@@ -85,7 +85,7 @@ import { mapGetters } from "vuex" ...@@ -85,7 +85,7 @@ import { mapGetters } from "vuex"
85 import NoticeBar from '@/components/NoticeBar/index' 85 import NoticeBar from '@/components/NoticeBar/index'
86 import { deleteFlow, unClaimTask } from "@/api/ywbl.js"; 86 import { deleteFlow, unClaimTask } from "@/api/ywbl.js";
87 import ProcessViewer from './components/processViewer.vue' 87 import ProcessViewer from './components/processViewer.vue'
88 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js"; 88 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js";
89 import { getForm } from "./flowform.js"; 89 import { getForm } from "./flowform.js";
90 import fqsqDialog from "@/views/ywbl/ywsq/slectBdc.vue"; 90 import fqsqDialog from "@/views/ywbl/ywsq/slectBdc.vue";
91 import { queueDjywmc } from "@/views/ywbl/ywsq/slectBdcdata.js"; 91 import { queueDjywmc } from "@/views/ywbl/ywsq/slectBdcdata.js";
......
...@@ -72,7 +72,6 @@ ...@@ -72,7 +72,6 @@
72 @import "./workFrame.scss"; 72 @import "./workFrame.scss";
73 </style> 73 </style>
74 <script> 74 <script>
75 import { mapGetters } from "vuex"
76 import WorkFlow from "./mixin/index" 75 import WorkFlow from "./mixin/index"
77 import publicFlow from "./mixin/public.js" 76 import publicFlow from "./mixin/public.js"
78 import { getStepFormInfo } from "@/api/fqsq.js"; 77 import { getStepFormInfo } from "@/api/fqsq.js";
...@@ -91,7 +90,6 @@ export default { ...@@ -91,7 +90,6 @@ export default {
91 data () { 90 data () {
92 return { 91 return {
93 isDialog: false, 92 isDialog: false,
94 // 流程图
95 // 折叠 93 // 折叠
96 isShowdrawer: true, 94 isShowdrawer: true,
97 // 默认选中 95 // 默认选中
...@@ -178,11 +176,9 @@ export default { ...@@ -178,11 +176,9 @@ export default {
178 }, 176 },
179 handleBatchDel () { 177 handleBatchDel () {
180 let that = this; 178 let that = this;
181 this.$popup({ 179 this.$popup("批量删除", "workflow/components/batchDel", {
182 title: "批量删除",
183 width: "50%", 180 width: "50%",
184 btnShow: true, 181 btnShow: true,
185 editItem: "workflow/components/batchDel",
186 height: "600px", 182 height: "600px",
187 formData: { 183 formData: {
188 bsmSlsq: this.bsmSlsq, 184 bsmSlsq: this.bsmSlsq,
......
...@@ -75,7 +75,7 @@ import { ...@@ -75,7 +75,7 @@ import {
75 completeTask, 75 completeTask,
76 getStepFormInfo 76 getStepFormInfo
77 } from "@/api/fqsq.js" 77 } from "@/api/fqsq.js"
78 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js" 78 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js"
79 import { getForm } from "./flowform.js" 79 import { getForm } from "./flowform.js"
80 export default { 80 export default {
81 data () { 81 data () {
......
...@@ -72,8 +72,9 @@ import { ...@@ -72,8 +72,9 @@ import {
72 getStepFormInfo 72 getStepFormInfo
73 } from "@/api/fqsq.js" 73 } from "@/api/fqsq.js"
74 import publicFlow from "./mixin/public.js" 74 import publicFlow from "./mixin/public.js"
75 import { popupDialog } from "@/utils/popup.js";
75 import NoticeBar from '@/components/NoticeBar/index' 76 import NoticeBar from '@/components/NoticeBar/index'
76 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js" 77 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js"
77 export default { 78 export default {
78 mixins: [publicFlow], 79 mixins: [publicFlow],
79 components: { 80 components: {
...@@ -139,15 +140,19 @@ export default { ...@@ -139,15 +140,19 @@ export default {
139 operation (item) { 140 operation (item) {
140 //按钮 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6：打印申请书 141 //按钮 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6：打印申请书
141 //操作按钮 登簿：record 转件：transfer 退回：back 退出：signout 142 //操作按钮 登簿：record 转件：transfer 退回：back 退出：signout
142 let that = this;
143 switch (item.value) { 143 switch (item.value) {
144 case "B1": 144 case "B1":
145 getWorkFlowImage(this.bsmSlsq).then(res => { 145 getWorkFlowImage(this.bsmSlsq, this.$route.query.bestepid).then(res => {
146 this.imgSrc = URL.createObjectURL(res) 146 let { result } = res
147 this.$popup({ 147 popupDialog("流程图", "workflow/components/processViewer", {
148 title: '流程图', 148 xml: result.xml,
149 editItem: 'workflow/components/flowChart', 149 finishedInfo: {
150 formData: this.imgSrc 150 finishedTaskSet: result.finishedTaskSet,
151 unfinishedTaskSet: result.unfinishedTaskSet,
152 rejectedTaskSet: result.rejectedTaskSet,
153 finishedSequenceFlowSet: result.finishedSequenceFlowSet
154 },
155 allCommentList: result.historyTaskList
151 }) 156 })
152 }) 157 })
153 break; 158 break;
...@@ -198,7 +203,7 @@ export default { ...@@ -198,7 +203,7 @@ export default {
198 //默认加载第一个表单信息 203 //默认加载第一个表单信息
199 this.tabName = res.result[0].value; 204 this.tabName = res.result[0].value;
200 } 205 }
201 }); 206 })
202 } 207 }
203 } 208 }
204 } 209 }
......
...@@ -81,14 +81,15 @@ ...@@ -81,14 +81,15 @@
81 </el-col> 81 </el-col>
82 <el-col :span="8"> 82 <el-col :span="8">
83 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间：" prop="cfdj.cfqssj"> 83 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间：" prop="cfdj.cfqssj">
84 <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" disabled 84 <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" disabled type="date" placeholder="选择日期"
85 type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker> 85 value-format="yyyy-MM-dd"></el-date-picker>
86 </el-form-item> 86 </el-form-item>
87 </el-col> 87 </el-col>
88 <el-col :span="8"> 88 <el-col :span="8">
89 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封结束时间：" prop="cfdj.cfjssj"> 89 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封结束时间：" prop="cfdj.cfjssj">
90 <el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100" :disabled="$route.query.viewtype || isJfOperation" 90 <el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100"
91 type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker> 91 :disabled="$route.query.viewtype || isJfOperation" type="date" placeholder="选择日期"
92 value-format="yyyy-MM-dd"></el-date-picker>
92 </el-form-item> 93 </el-form-item>
93 </el-col> 94 </el-col>
94 </el-row> 95 </el-row>
...@@ -107,14 +108,16 @@ ...@@ -107,14 +108,16 @@
107 <el-row :gutter="10"> 108 <el-row :gutter="10">
108 <el-col :span="24"> 109 <el-col :span="24">
109 <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="cfdj.fj"> 110 <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="cfdj.fj">
110 <el-input v-model="ruleForm.cfdj.fj" type="textarea" :disabled="$route.query.viewtype || isJfOperation"></el-input> 111 <el-input v-model="ruleForm.cfdj.fj" type="textarea" :disabled="$route.query.viewtype || isJfOperation">
112 </el-input>
111 </el-form-item> 113 </el-form-item>
112 </el-col> 114 </el-col>
113 </el-row> 115 </el-row>
114 <el-row :gutter="10"> 116 <el-row :gutter="10">
115 <el-col> 117 <el-col>
116 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="cfdj.djyy"> 118 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="cfdj.djyy">
117 <el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.djyy" :disabled="$route.query.viewtype || isJfOperation"></el-input> 119 <el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.djyy"
120 :disabled="$route.query.viewtype || isJfOperation"></el-input>
118 </el-form-item> 121 </el-form-item>
119 </el-col> 122 </el-col>
120 </el-row> 123 </el-row>
...@@ -152,7 +155,7 @@ ...@@ -152,7 +155,7 @@
152 </template> 155 </template>
153 <script> 156 <script>
154 import cfBdcdyTable from "@/views/workflow/components/cfBdcdyTable"; 157 import cfBdcdyTable from "@/views/workflow/components/cfBdcdyTable";
155 import { BatchInit, batchSaveData } from "@/api/cfdjFlow.js"; 158 import { BatchInit, batchSaveData } from "@/api/workflow/cfdjFlow.js";
156 import { mapGetters } from "vuex"; 159 import { mapGetters } from "vuex";
157 export default { 160 export default {
158 data () { 161 data () {
...@@ -171,7 +174,7 @@ export default { ...@@ -171,7 +174,7 @@ export default {
171 created () { 174 created () {
172 this.propsParam = this.$attrs; 175 this.propsParam = this.$attrs;
173 var formdata = new FormData(); 176 var formdata = new FormData();
174 if(this.propsParam.djlx == '400'){ 177 if (this.propsParam.djlx == '400') {
175 this.isJfOperation = true; 178 this.isJfOperation = true;
176 } 179 }
177 formdata.append("bsmSlsq", this.$route.query.bsmSlsq); 180 formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
...@@ -209,7 +212,7 @@ export default { ...@@ -209,7 +212,7 @@ export default {
209 } 212 }
210 }); 213 });
211 }, 214 },
212 changeCflx(e){ 215 changeCflx (e) {
213 let cflxItem = {} 216 let cflxItem = {}
214 cflxItem = this.dictData['A32'].find((item) => { 217 cflxItem = this.dictData['A32'].find((item) => {
215 return item.dcode == e 218 return item.dcode == e
...@@ -222,5 +225,4 @@ export default { ...@@ -222,5 +225,4 @@ export default {
222 <style scoped lang='scss'> 225 <style scoped lang='scss'>
223 @import "~@/styles/public.scss"; 226 @import "~@/styles/public.scss";
224 @import "~@/styles/slxx/slxx.scss"; 227 @import "~@/styles/slxx/slxx.scss";
225
226 </style> 228 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -126,14 +126,15 @@ ...@@ -126,14 +126,15 @@
126 </el-col> 126 </el-col>
127 <el-col :span="8"> 127 <el-col :span="8">
128 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间：" prop="cfdj.cfqssj"> 128 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间：" prop="cfdj.cfqssj">
129 <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" disabled 129 <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" disabled type="date" placeholder="选择日期"
130 type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker> 130 value-format="yyyy-MM-dd"></el-date-picker>
131 </el-form-item> 131 </el-form-item>
132 </el-col> 132 </el-col>
133 <el-col :span="8"> 133 <el-col :span="8">
134 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封结束时间：" prop="cfdj.cfjssj"> 134 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封结束时间：" prop="cfdj.cfjssj">
135 <el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100" :disabled="$route.query.viewtype || ableEdit" 135 <el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100"
136 type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker> 136 :disabled="$route.query.viewtype || ableEdit" type="date" placeholder="选择日期" value-format="yyyy-MM-dd">
137 </el-date-picker>
137 </el-form-item> 138 </el-form-item>
138 </el-col> 139 </el-col>
139 </el-row> 140 </el-row>
...@@ -152,14 +153,16 @@ ...@@ -152,14 +153,16 @@
152 <el-row :gutter="10"> 153 <el-row :gutter="10">
153 <el-col :span="24"> 154 <el-col :span="24">
154 <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="cfdj.fj"> 155 <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="cfdj.fj">
155 <el-input v-model="ruleForm.cfdj.fj" type="textarea" :disabled="$route.query.viewtype || ableEdit"></el-input> 156 <el-input v-model="ruleForm.cfdj.fj" type="textarea" :disabled="$route.query.viewtype || ableEdit">
157 </el-input>
156 </el-form-item> 158 </el-form-item>
157 </el-col> 159 </el-col>
158 </el-row> 160 </el-row>
159 <el-row :gutter="10"> 161 <el-row :gutter="10">
160 <el-col> 162 <el-col>
161 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="cfdj.djyy"> 163 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="cfdj.djyy">
162 <el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.djyy" :disabled="$route.query.viewtype || ableEdit"></el-input> 164 <el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.djyy"
165 :disabled="$route.query.viewtype || ableEdit"></el-input>
163 </el-form-item> 166 </el-form-item>
164 </el-col> 167 </el-col>
165 </el-row> 168 </el-row>
...@@ -197,7 +200,7 @@ ...@@ -197,7 +200,7 @@
197 </template> 200 </template>
198 <script> 201 <script>
199 import sqrViewTable from "@/views/workflow/components/sqrViewTable"; 202 import sqrViewTable from "@/views/workflow/components/sqrViewTable";
200 import { BatchInit, saveData } from "@/api/cfdjFlow.js"; 203 import { BatchInit, saveData } from "@/api/workflow/cfdjFlow.js";
201 import { mapGetters } from "vuex"; 204 import { mapGetters } from "vuex";
202 export default { 205 export default {
203 data () { 206 data () {
...@@ -252,7 +255,7 @@ export default { ...@@ -252,7 +255,7 @@ export default {
252 } 255 }
253 }); 256 });
254 }, 257 },
255 changeCflx(e){ 258 changeCflx (e) {
256 let cflxItem = {} 259 let cflxItem = {}
257 cflxItem = this.dictData['A32'].find((item) => { 260 cflxItem = this.dictData['A32'].find((item) => {
258 return item.dcode == e 261 return item.dcode == e
......
...@@ -102,9 +102,6 @@ export default { ...@@ -102,9 +102,6 @@ export default {
102 } 102 }
103 } 103 }
104 }, 104 },
105 created () {
106 this.queryClick()
107 },
108 mounted () { 105 mounted () {
109 sendThis(this); 106 sendThis(this);
110 this.queryClick() 107 this.queryClick()
......
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
133 <el-row :gutter="10"> 133 <el-row :gutter="10">
134 <el-col :span="14" v-if="ruleForm.qlxx"> 134 <el-col :span="14" v-if="ruleForm.qlxx">
135 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式："> 135 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
136 <el-radio-group :disabled="$route.query.viewtype==1" @change="showCZInfo" v-model="ruleForm.slywxx.gyfs"> 136 <el-radio-group :disabled="$route.query.viewtype == 1" @change="showCZInfo" v-model="ruleForm.slywxx.gyfs">
137 <el-radio label="0">单独所有</el-radio> 137 <el-radio label="0">单独所有</el-radio>
138 <el-radio label="1">共同共有</el-radio> 138 <el-radio label="1">共同共有</el-radio>
139 <el-radio label="2">按份所有</el-radio> 139 <el-radio label="2">按份所有</el-radio>
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
150 </el-form-item> 150 </el-form-item>
151 </el-col> 151 </el-col>
152 152
153 <el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'"> 153 <el-col :span="5" v-show="ruleForm.qlxx && ruleForm.qlxx.gyfs == '2'">
154 <el-form-item :class="flag ? 'marginBot0' : ''" label="是否分别持证："> 154 <el-form-item :class="flag ? 'marginBot0' : ''" label="是否分别持证：">
155 <el-radio-group v-model="ruleForm.slywxx.sffbcz"> 155 <el-radio-group v-model="ruleForm.slywxx.sffbcz">
156 <el-radio label="1">是</el-radio> 156 <el-radio label="1">是</el-radio>
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
158 </el-radio-group> 158 </el-radio-group>
159 </el-form-item> 159 </el-form-item>
160 </el-col> 160 </el-col>
161 <el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'"> 161 <el-col :span="5" v-show="ruleForm.qlxx && ruleForm.qlxx.gyfs == '2'">
162 <el-form-item :class="flag ? 'marginBot0' : ''" label="持证人："> 162 <el-form-item :class="flag ? 'marginBot0' : ''" label="持证人：">
163 <el-select v-model="ruleForm.slywxx.czr" placeholder="持证人"> 163 <el-select v-model="ruleForm.slywxx.czr" placeholder="持证人">
164 <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value"> 164 <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
170 <InformationTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList" 170 <InformationTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList"
171 :gyfs="ruleForm.qlxx.gyfs" /> 171 :gyfs="ruleForm.qlxx.gyfs" />
172 172
173 <div v-if="ruleForm.ywrList.length>0"> 173 <div v-if="ruleForm.ywrList.length > 0">
174 <div class="slxx_title title-block"> 174 <div class="slxx_title title-block">
175 义务人信息 175 义务人信息
176 <div class="triangle"></div> 176 <div class="triangle"></div>
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
185 <el-row :gutter="10"> 185 <el-row :gutter="10">
186 <el-col> 186 <el-col>
187 <el-form-item v-if="ruleForm.fdcq2" :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy"> 187 <el-form-item v-if="ruleForm.fdcq2" :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy">
188 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype==1" 188 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
189 v-model="ruleForm.fdcq2.djyy"> 189 v-model="ruleForm.fdcq2.djyy">
190 </el-input> 190 </el-input>
191 </el-form-item> 191 </el-form-item>
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
202 </template> 202 </template>
203 <script> 203 <script>
204 import InformationTable from "@/views/workflow/components/InformationTable"; 204 import InformationTable from "@/views/workflow/components/InformationTable";
205 import {Init, saveBatchData} from "@/api/fwsyqFlow.js"; 205 import { Init, saveBatchData } from "@/api/workflow/fwsyqFlow.js";
206 import { mapGetters } from "vuex"; 206 import { mapGetters } from "vuex";
207 export default { 207 export default {
208 created () { 208 created () {
...@@ -239,7 +239,7 @@ export default { ...@@ -239,7 +239,7 @@ export default {
239 upDateQlrxxList (val) { 239 upDateQlrxxList (val) {
240 this.ruleForm.qlrList = _.cloneDeep(val); 240 this.ruleForm.qlrList = _.cloneDeep(val);
241 }, 241 },
242 showCZInfo() { 242 showCZInfo () {
243 console.log(this.ruleForm.slywxx.gyfs); 243 console.log(this.ruleForm.slywxx.gyfs);
244 }, 244 },
245 // 更新权利人信息 245 // 更新权利人信息
......
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
136 <el-row :gutter="10"> 136 <el-row :gutter="10">
137 <el-col :span="14" v-if="ruleForm.qlxx"> 137 <el-col :span="14" v-if="ruleForm.qlxx">
138 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式："> 138 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
139 <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs"> 139 <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs">
140 <el-radio label="0">单独所有</el-radio> 140 <el-radio label="0">单独所有</el-radio>
141 <el-radio label="1">共同共有</el-radio> 141 <el-radio label="1">共同共有</el-radio>
142 <el-radio label="2">按份所有</el-radio> 142 <el-radio label="2">按份所有</el-radio>
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
144 </el-radio-group> 144 </el-radio-group>
145 </el-form-item> 145 </el-form-item>
146 </el-col> 146 </el-col>
147 <el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'"> 147 <el-col :span="5" v-show="ruleForm.qlxx && ruleForm.qlxx.gyfs == '2'">
148 <el-form-item :class="flag ? 'marginBot0' : ''" label="是否分别持证："> 148 <el-form-item :class="flag ? 'marginBot0' : ''" label="是否分别持证：">
149 <el-radio-group v-model="ruleForm.sffbcz"> 149 <el-radio-group v-model="ruleForm.sffbcz">
150 <el-radio label="1">是</el-radio> 150 <el-radio label="1">是</el-radio>
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
152 </el-radio-group> 152 </el-radio-group>
153 </el-form-item> 153 </el-form-item>
154 </el-col> 154 </el-col>
155 <el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'"> 155 <el-col :span="5" v-show="ruleForm.qlxx && ruleForm.qlxx.gyfs == '2'">
156 <el-form-item :class="flag ? 'marginBot0' : ''" label="持证人："> 156 <el-form-item :class="flag ? 'marginBot0' : ''" label="持证人：">
157 <el-select v-model="ruleForm.czr" placeholder="持证人"> 157 <el-select v-model="ruleForm.czr" placeholder="持证人">
158 <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value"> 158 <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
170 <el-row :gutter="10"> 170 <el-row :gutter="10">
171 <el-col> 171 <el-col>
172 <el-form-item v-if="ruleForm.fdcq2" :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy"> 172 <el-form-item v-if="ruleForm.fdcq2" :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy">
173 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype==1" 173 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
174 v-model="ruleForm.fdcq2.djyy"> 174 v-model="ruleForm.fdcq2.djyy">
175 </el-input> 175 </el-input>
176 </el-form-item> 176 </el-form-item>
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
187 </template> 187 </template>
188 <script> 188 <script>
189 import InformationTable from "@/views/workflow/components/InformationTable"; 189 import InformationTable from "@/views/workflow/components/InformationTable";
190 import {Init, saveBatchData} from "@/api/fwsyqFlow.js"; 190 import { Init, saveBatchData } from "@/api/workflow/fwsyqFlow.js";
191 import { mapGetters } from "vuex"; 191 import { mapGetters } from "vuex";
192 import SERVER from "@/api/config"; 192 import SERVER from "@/api/config";
193 export default { 193 export default {
...@@ -254,8 +254,8 @@ export default { ...@@ -254,8 +254,8 @@ export default {
254 }; 254 };
255 }, 255 },
256 methods: { 256 methods: {
257 dataSelectClick(){ 257 dataSelectClick () {
258 this.$popup("房屋信息比对",SERVER.SERVERAPI + "/rest/ywbl/fdcq2/slxxCompareDetai", 258 this.$popup("房屋信息比对", SERVER.SERVERAPI + "/rest/ywbl/fdcq2/slxxCompareDetai",
259 { 259 {
260 formData: { 260 formData: {
261 bsmSldy: this.propsParam.bsmSldy, 261 bsmSldy: this.propsParam.bsmSldy,
......
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
126 <el-row :gutter="10"> 126 <el-row :gutter="10">
127 <el-col :span="14"> 127 <el-col :span="14">
128 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式："> 128 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
129 <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.gyfs"> 129 <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.gyfs">
130 <el-radio label="1">单独所有</el-radio> 130 <el-radio label="1">单独所有</el-radio>
131 <el-radio label="2">共同共有</el-radio> 131 <el-radio label="2">共同共有</el-radio>
132 <el-radio label="3">按份所有</el-radio> 132 <el-radio label="3">按份所有</el-radio>
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
158 <el-row :gutter="10"> 158 <el-row :gutter="10">
159 <el-col> 159 <el-col>
160 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy"> 160 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy">
161 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype==1" v-model="ruleForm.djyy"> 161 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1" v-model="ruleForm.djyy">
162 </el-input> 162 </el-input>
163 </el-form-item> 163 </el-form-item>
164 </el-col> 164 </el-col>
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
174 </template> 174 </template>
175 <script> 175 <script>
176 import InformationTable from "@/views/workflow/components/InformationTable"; 176 import InformationTable from "@/views/workflow/components/InformationTable";
177 import { Init } from "@/api/fwsyqFlow.js"; 177 import { Init } from "@/api/workflow/fwsyqFlow.js";
178 import { mapGetters } from "vuex"; 178 import { mapGetters } from "vuex";
179 export default { 179 export default {
180 async created () { 180 async created () {
......
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
109 <el-row :gutter="10"> 109 <el-row :gutter="10">
110 <el-col> 110 <el-col>
111 <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="fj"> 111 <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="fj">
112 <el-input type="textarea" v-model="ruleForm.jsydsyq.fj" :disabled="$route.query.viewtype==1"></el-input> 112 <el-input type="textarea" v-model="ruleForm.jsydsyq.fj" :disabled="$route.query.viewtype == 1"></el-input>
113 </el-form-item> 113 </el-form-item>
114 </el-col> 114 </el-col>
115 </el-row> 115 </el-row>
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
120 <el-row :gutter="10"> 120 <el-row :gutter="10">
121 <el-col :span="14"> 121 <el-col :span="14">
122 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式："> 122 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
123 <el-radio-group :disabled="$route.query.viewtype==0" v-model="ruleForm.slywxx.gyfs"> 123 <el-radio-group :disabled="$route.query.viewtype == 0" v-model="ruleForm.slywxx.gyfs">
124 <el-radio label="0">单独所有</el-radio> 124 <el-radio label="0">单独所有</el-radio>
125 <el-radio label="1">共同共有</el-radio> 125 <el-radio label="1">共同共有</el-radio>
126 <el-radio label="2">按份所有</el-radio> 126 <el-radio label="2">按份所有</el-radio>
...@@ -147,10 +147,11 @@ ...@@ -147,10 +147,11 @@
147 </el-row> 147 </el-row>
148 <InformationTable :tableData="ruleForm.qlrList" @upDateQlrxxList="upDateQlrxxList" 148 <InformationTable :tableData="ruleForm.qlrList" @upDateQlrxxList="upDateQlrxxList"
149 :viewtype="$route.query.viewtype" :gyfs="ruleForm.slywxx.gyfs" /> 149 :viewtype="$route.query.viewtype" :gyfs="ruleForm.slywxx.gyfs" />
150 <div v-if="ruleForm.ywrList.length>0"> 150 <div v-if="ruleForm.ywrList.length > 0">
151 <div class="slxx_title title-block"> 151 <div class="slxx_title title-block">
152 义务人信息 152 义务人信息
153 <div class="triangle"></div> </div> 153 <div class="triangle"></div>
154 </div>
154 <InformationTable :tableData="ruleForm.ywrList" @upDateQlrxxList="upDateYwrxxList" 155 <InformationTable :tableData="ruleForm.ywrList" @upDateQlrxxList="upDateYwrxxList"
155 :viewtype="$route.query.viewtype" /> 156 :viewtype="$route.query.viewtype" />
156 </div> 157 </div>
...@@ -162,7 +163,8 @@ ...@@ -162,7 +163,8 @@
162 <el-row :gutter="10"> 163 <el-row :gutter="10">
163 <el-col> 164 <el-col>
164 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy"> 165 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy">
165 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype==1" v-model="ruleForm.jsydsyq.djyy"> 166 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
167 v-model="ruleForm.jsydsyq.djyy">
166 </el-input> 168 </el-input>
167 </el-form-item> 169 </el-form-item>
168 </el-col> 170 </el-col>
...@@ -178,7 +180,7 @@ ...@@ -178,7 +180,7 @@
178 </template> 180 </template>
179 <script> 181 <script>
180 import { mapGetters } from "vuex" 182 import { mapGetters } from "vuex"
181 import { Init, saveData } from "@/api/jsydsyqFlow.js" 183 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js"
182 import InformationTable from "@/views/workflow/components/InformationTable" 184 import InformationTable from "@/views/workflow/components/InformationTable"
183 export default { 185 export default {
184 created () { 186 created () {
...@@ -188,7 +190,7 @@ export default { ...@@ -188,7 +190,7 @@ export default {
188 formdata.append("djlx", this.propsParam.djlx); 190 formdata.append("djlx", this.propsParam.djlx);
189 Init(formdata).then((res) => { 191 Init(formdata).then((res) => {
190 this.ruleForm = res.result; 192 this.ruleForm = res.result;
191 if (res.code === 200 ) { 193 if (res.code === 200) {
192 this.$store.dispatch('slxx/setQlrxxOld', { 194 this.$store.dispatch('slxx/setQlrxxOld', {
193 qlrxx: this.ruleForm.qlrxx, 195 qlrxx: this.ruleForm.qlrxx,
194 fj: this.ruleForm.fj, 196 fj: this.ruleForm.fj,
...@@ -196,7 +198,7 @@ export default { ...@@ -196,7 +198,7 @@ export default {
196 djyy: this.ruleForm.djyy 198 djyy: this.ruleForm.djyy
197 }) 199 })
198 } 200 }
199 else{ 201 else {
200 this.$alert(res.message, '提示'); 202 this.$alert(res.message, '提示');
201 } 203 }
202 }) 204 })
......
...@@ -44,7 +44,9 @@ ...@@ -44,7 +44,9 @@
44 </el-row> 44 </el-row>
45 <div class="slxx_title title-block"> 45 <div class="slxx_title title-block">
46 不动产单元情况 46 不动产单元情况
47 <div><el-button @click="compare">变化情况对比+</el-button></div> 47 <div>
48 <el-button @click="compare">变化情况对比+</el-button>
49 </div>
48 </div> 50 </div>
49 <el-row :gutter="10"> 51 <el-row :gutter="10">
50 <el-col :span="8"> 52 <el-col :span="8">
...@@ -109,7 +111,7 @@ ...@@ -109,7 +111,7 @@
109 <el-row :gutter="10"> 111 <el-row :gutter="10">
110 <el-col> 112 <el-col>
111 <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="fj"> 113 <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="fj">
112 <el-input type="textarea" v-model="ruleForm.jsydsyq.fj" :disabled="$route.query.viewtype==1"></el-input> 114 <el-input type="textarea" v-model="ruleForm.jsydsyq.fj" :disabled="$route.query.viewtype == 1"></el-input>
113 </el-form-item> 115 </el-form-item>
114 </el-col> 116 </el-col>
115 </el-row> 117 </el-row>
...@@ -117,11 +119,13 @@ ...@@ -117,11 +119,13 @@
117 权利人信息 119 权利人信息
118 <div class="triangle"></div> 120 <div class="triangle"></div>
119 </div> --> 121 </div> -->
120 <el-divider content-position="left" ><i style="background-color:#3498db;font-size:16px;color:#fff !important;border-radius: 5px 5px 5px 0px;margin-bottom:10px;" class="el-icon-edit-outline">权利人信息</i></el-divider> 122 <el-divider content-position="left"><i
123 style="background-color:#3498db;font-size:16px;color:#fff !important;border-radius: 5px 5px 5px 0px;margin-bottom:10px;"
124 class="el-icon-edit-outline">权利人信息</i></el-divider>
121 <el-row :gutter="10"> 125 <el-row :gutter="10">
122 <el-col :span="14"> 126 <el-col :span="14">
123 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式："> 127 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
124 <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs"> 128 <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs">
125 <el-radio label="1">单独所有</el-radio> 129 <el-radio label="1">单独所有</el-radio>
126 <el-radio label="2">共同共有</el-radio> 130 <el-radio label="2">共同共有</el-radio>
127 <el-radio label="3">按份所有</el-radio> 131 <el-radio label="3">按份所有</el-radio>
...@@ -145,7 +149,8 @@ ...@@ -145,7 +149,8 @@
145 </el-form-item> 149 </el-form-item>
146 </el-col> 150 </el-col>
147 </el-row> 151 </el-row>
148 <InformationTable :tableData="ruleForm.qlrList" @upDateQlrxxList='upDateQlrxxList' :viewtype="$route.query.viewtype" :gyfs="ruleForm.slywxx.gyfs" /> 152 <InformationTable :tableData="ruleForm.qlrList" @upDateQlrxxList='upDateQlrxxList'
153 :viewtype="$route.query.viewtype" :gyfs="ruleForm.slywxx.gyfs" />
149 <div class="slxx_title title-block"> 154 <div class="slxx_title title-block">
150 登记原因 155 登记原因
151 <div class="triangle"></div> 156 <div class="triangle"></div>
...@@ -153,7 +158,8 @@ ...@@ -153,7 +158,8 @@
153 <el-row :gutter="10"> 158 <el-row :gutter="10">
154 <el-col> 159 <el-col>
155 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy"> 160 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy">
156 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype==1" v-model="ruleForm.jsydsyq.djyy"> 161 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
162 v-model="ruleForm.jsydsyq.djyy">
157 </el-input> 163 </el-input>
158 </el-form-item> 164 </el-form-item>
159 </el-col> 165 </el-col>
...@@ -168,9 +174,9 @@ ...@@ -168,9 +174,9 @@
168 </div> 174 </div>
169 </template> 175 </template>
170 <script> 176 <script>
171 import InformationTable from "@/views/workflow/components/InformationTable";
172 import { Init, saveData } from "@/api/jsydsyqFlow.js";
173 import { mapGetters } from "vuex"; 177 import { mapGetters } from "vuex";
178 import InformationTable from "@/views/workflow/components/InformationTable";
179 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
174 export default { 180 export default {
175 async created () { 181 async created () {
176 this.propsParam = this.$attrs; 182 this.propsParam = this.$attrs;
...@@ -219,7 +225,7 @@ export default { ...@@ -219,7 +225,7 @@ export default {
219 } 225 }
220 }); 226 });
221 }, 227 },
222 compare(){ 228 compare () {
223 this.$popup({ 229 this.$popup({
224 titleStyle: "left", 230 titleStyle: "left",
225 title: "土地变化情况比对", // 弹窗标题 231 title: "土地变化情况比对", // 弹窗标题
......
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
165 <el-row :gutter="10"> 165 <el-row :gutter="10">
166 <el-col> 166 <el-col>
167 <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="fj"> 167 <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="fj">
168 <el-input type="textarea" v-model="ruleForm.nydsyq.fj" :disabled="$route.query.viewtype==1"></el-input> 168 <el-input type="textarea" v-model="ruleForm.nydsyq.fj" :disabled="$route.query.viewtype == 1"></el-input>
169 </el-form-item> 169 </el-form-item>
170 </el-col> 170 </el-col>
171 </el-row> 171 </el-row>
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
176 <el-row :gutter="10"> 176 <el-row :gutter="10">
177 <el-col :span="14"> 177 <el-col :span="14">
178 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式："> 178 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
179 <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs"> 179 <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs">
180 <el-radio label="0">单独所有</el-radio> 180 <el-radio label="0">单独所有</el-radio>
181 <el-radio label="1">共同共有</el-radio> 181 <el-radio label="1">共同共有</el-radio>
182 <el-radio label="2">按份所有</el-radio> 182 <el-radio label="2">按份所有</el-radio>
...@@ -207,8 +207,8 @@ ...@@ -207,8 +207,8 @@
207 家庭成员 207 家庭成员
208 <div class="triangle"></div> 208 <div class="triangle"></div>
209 </div> 209 </div>
210 <JtcyTable :tableData="ruleForm.jtcyList" @upDateJtcyList="upDateJtcyList" 210 <JtcyTable :tableData="ruleForm.jtcyList" @upDateJtcyList="upDateJtcyList" :viewtype="$route.query.viewtype"
211 :viewtype="$route.query.viewtype" :gyfs="ruleForm.slywxx.gyfs" /> 211 :gyfs="ruleForm.slywxx.gyfs" />
212 <div class="slxx_title title-block"> 212 <div class="slxx_title title-block">
213 登记原因 213 登记原因
214 <div class="triangle"></div> 214 <div class="triangle"></div>
...@@ -216,7 +216,8 @@ ...@@ -216,7 +216,8 @@
216 <el-row :gutter="10"> 216 <el-row :gutter="10">
217 <el-col> 217 <el-col>
218 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy"> 218 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy">
219 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype==1" v-model="ruleForm.nydsyq.djyy"> 219 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
220 v-model="ruleForm.nydsyq.djyy">
220 </el-input> 221 </el-input>
221 </el-form-item> 222 </el-form-item>
222 </el-col> 223 </el-col>
...@@ -232,7 +233,7 @@ ...@@ -232,7 +233,7 @@
232 </template> 233 </template>
233 <script> 234 <script>
234 import { mapGetters } from "vuex" 235 import { mapGetters } from "vuex"
235 import { Init, saveData } from "@/api/nydsyqFlow.js" 236 import { Init, saveData } from "@/api/workflow/nydsyqFlow.js"
236 import InformationTable from "@/views/workflow/components/InformationTable" 237 import InformationTable from "@/views/workflow/components/InformationTable"
237 import JtcyTable from "@/views/workflow/components/JtcyTable" 238 import JtcyTable from "@/views/workflow/components/JtcyTable"
238 export default { 239 export default {
...@@ -243,14 +244,14 @@ export default { ...@@ -243,14 +244,14 @@ export default {
243 formdata.append("djlx", this.propsParam.djlx); 244 formdata.append("djlx", this.propsParam.djlx);
244 Init(formdata).then((res) => { 245 Init(formdata).then((res) => {
245 this.ruleForm = res.result; 246 this.ruleForm = res.result;
246 if (res.code === 200 ) { 247 if (res.code === 200) {
247 } 248 }
248 else{ 249 else {
249 this.$alert(res.message, '提示'); 250 this.$alert(res.message, '提示');
250 } 251 }
251 }) 252 })
252 }, 253 },
253 components: { InformationTable,JtcyTable }, 254 components: { InformationTable, JtcyTable },
254 computed: { 255 computed: {
255 ...mapGetters(["dictData", "flag"]) 256 ...mapGetters(["dictData", "flag"])
256 }, 257 },
...@@ -292,7 +293,7 @@ export default { ...@@ -292,7 +293,7 @@ export default {
292 this.ruleForm.jtcyList = _.cloneDeep(val) 293 this.ruleForm.jtcyList = _.cloneDeep(val)
293 }, 294 },
294 //水域滩涂类型变化事件 295 //水域滩涂类型变化事件
295 changeSyttlx(e){ 296 changeSyttlx (e) {
296 let itemLx = {} 297 let itemLx = {}
297 itemLx = this.dictData['A23'].find((item) => { 298 itemLx = this.dictData['A23'].find((item) => {
298 return item.dcode == e 299 return item.dcode == e
...@@ -300,7 +301,7 @@ export default { ...@@ -300,7 +301,7 @@ export default {
300 this.ruleForm.nydsyq.syttlxmc = itemLx.dname; 301 this.ruleForm.nydsyq.syttlxmc = itemLx.dname;
301 }, 302 },
302 //养殖业方式变化事件 303 //养殖业方式变化事件
303 changeYzyfs(e){ 304 changeYzyfs (e) {
304 let itemLx = {} 305 let itemLx = {}
305 itemLx = this.dictData['A24'].find((item) => { 306 itemLx = this.dictData['A24'].find((item) => {
306 return item.dcode == e 307 return item.dcode == e
...@@ -308,7 +309,7 @@ export default { ...@@ -308,7 +309,7 @@ export default {
308 this.ruleForm.nydsyq.yzyfsmc = itemLx.dname; 309 this.ruleForm.nydsyq.yzyfsmc = itemLx.dname;
309 }, 310 },
310 //用地用海变化事件 311 //用地用海变化事件
311 changeYdyhfl(e){ 312 changeYdyhfl (e) {
312 let itemLx = {} 313 let itemLx = {}
313 itemLx = this.dictData['A51'].find((item) => { 314 itemLx = this.dictData['A51'].find((item) => {
314 return item.dcode == e 315 return item.dcode == e
......
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
165 <el-row :gutter="10"> 165 <el-row :gutter="10">
166 <el-col> 166 <el-col>
167 <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="fj"> 167 <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="fj">
168 <el-input type="textarea" v-model="ruleForm.nydsyq.fj" :disabled="$route.query.viewtype==1"></el-input> 168 <el-input type="textarea" v-model="ruleForm.nydsyq.fj" :disabled="$route.query.viewtype == 1"></el-input>
169 </el-form-item> 169 </el-form-item>
170 </el-col> 170 </el-col>
171 </el-row> 171 </el-row>
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
176 <el-row :gutter="10"> 176 <el-row :gutter="10">
177 <el-col :span="14"> 177 <el-col :span="14">
178 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式："> 178 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
179 <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs"> 179 <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs">
180 <el-radio label="0">单独所有</el-radio> 180 <el-radio label="0">单独所有</el-radio>
181 <el-radio label="1">共同共有</el-radio> 181 <el-radio label="1">共同共有</el-radio>
182 <el-radio label="2">按份所有</el-radio> 182 <el-radio label="2">按份所有</el-radio>
...@@ -213,8 +213,8 @@ ...@@ -213,8 +213,8 @@
213 家庭成员 213 家庭成员
214 <div class="triangle"></div> 214 <div class="triangle"></div>
215 </div> 215 </div>
216 <JtcyTable :tableData="ruleForm.jtcyList" @upDateJtcyList="upDateJtcyList" 216 <JtcyTable :tableData="ruleForm.jtcyList" @upDateJtcyList="upDateJtcyList" :viewtype="$route.query.viewtype"
217 :viewtype="$route.query.viewtype" :gyfs="ruleForm.slywxx.gyfs" /> 217 :gyfs="ruleForm.slywxx.gyfs" />
218 <div class="slxx_title title-block"> 218 <div class="slxx_title title-block">
219 登记原因 219 登记原因
220 <div class="triangle"></div> 220 <div class="triangle"></div>
...@@ -222,7 +222,8 @@ ...@@ -222,7 +222,8 @@
222 <el-row :gutter="10"> 222 <el-row :gutter="10">
223 <el-col> 223 <el-col>
224 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy"> 224 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy">
225 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype==1" v-model="ruleForm.nydsyq.djyy"> 225 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
226 v-model="ruleForm.nydsyq.djyy">
226 </el-input> 227 </el-input>
227 </el-form-item> 228 </el-form-item>
228 </el-col> 229 </el-col>
...@@ -238,7 +239,7 @@ ...@@ -238,7 +239,7 @@
238 </template> 239 </template>
239 <script> 240 <script>
240 import { mapGetters } from "vuex" 241 import { mapGetters } from "vuex"
241 import { Init, saveData } from "@/api/nydsyqFlow.js" 242 import { Init, saveData } from "@/api/workflow/nydsyqFlow.js"
242 import InformationTable from "@/views/workflow/components/InformationTable" 243 import InformationTable from "@/views/workflow/components/InformationTable"
243 import JtcyTable from "@/views/workflow/components/JtcyTable" 244 import JtcyTable from "@/views/workflow/components/JtcyTable"
244 export default { 245 export default {
...@@ -249,14 +250,14 @@ export default { ...@@ -249,14 +250,14 @@ export default {
249 formdata.append("djlx", this.propsParam.djlx); 250 formdata.append("djlx", this.propsParam.djlx);
250 Init(formdata).then((res) => { 251 Init(formdata).then((res) => {
251 this.ruleForm = res.result; 252 this.ruleForm = res.result;
252 if (res.code === 200 ) { 253 if (res.code === 200) {
253 } 254 }
254 else{ 255 else {
255 this.$alert(res.message, '提示'); 256 this.$alert(res.message, '提示');
256 } 257 }
257 }) 258 })
258 }, 259 },
259 components: { InformationTable,JtcyTable }, 260 components: { InformationTable, JtcyTable },
260 computed: { 261 computed: {
261 ...mapGetters(["dictData", "flag"]) 262 ...mapGetters(["dictData", "flag"])
262 }, 263 },
...@@ -304,7 +305,7 @@ export default { ...@@ -304,7 +305,7 @@ export default {
304 this.ruleForm.jtcyList = _.cloneDeep(val) 305 this.ruleForm.jtcyList = _.cloneDeep(val)
305 }, 306 },
306 //水域滩涂类型变化事件 307 //水域滩涂类型变化事件
307 changeSyttlx(e){ 308 changeSyttlx (e) {
308 let itemLx = {} 309 let itemLx = {}
309 itemLx = this.dictData['A23'].find((item) => { 310 itemLx = this.dictData['A23'].find((item) => {
310 return item.dcode == e 311 return item.dcode == e
...@@ -312,7 +313,7 @@ export default { ...@@ -312,7 +313,7 @@ export default {
312 this.ruleForm.nydsyq.syttlxmc = itemLx.dname; 313 this.ruleForm.nydsyq.syttlxmc = itemLx.dname;
313 }, 314 },
314 //养殖业方式变化事件 315 //养殖业方式变化事件
315 changeYzyfs(e){ 316 changeYzyfs (e) {
316 let itemLx = {} 317 let itemLx = {}
317 itemLx = this.dictData['A24'].find((item) => { 318 itemLx = this.dictData['A24'].find((item) => {
318 return item.dcode == e 319 return item.dcode == e
...@@ -320,7 +321,7 @@ export default { ...@@ -320,7 +321,7 @@ export default {
320 this.ruleForm.nydsyq.yzyfsmc = itemLx.dname; 321 this.ruleForm.nydsyq.yzyfsmc = itemLx.dname;
321 }, 322 },
322 //用地用海变化事件 323 //用地用海变化事件
323 changeYdyhfl(e){ 324 changeYdyhfl (e) {
324 let itemLx = {} 325 let itemLx = {}
325 itemLx = this.dictData['A51'].find((item) => { 326 itemLx = this.dictData['A51'].find((item) => {
326 return item.dcode == e 327 return item.dcode == e
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
58 </el-form-item> 58 </el-form-item>
59 </el-col> 59 </el-col>
60 </el-row> 60 </el-row>
61 <el-row :gutter="10" > 61 <el-row :gutter="10">
62 <el-col :span="8"> 62 <el-col :span="8">
63 <el-form-item :class="flag ? 'marginBot0' : ''" label="规划用途："> 63 <el-form-item :class="flag ? 'marginBot0' : ''" label="规划用途：">
64 <el-input disabled v-model="ruleForm.ygdj.ghyt"></el-input> 64 <el-input disabled v-model="ruleForm.ygdj.ghyt"></el-input>
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
92 </el-form-item> 92 </el-form-item>
93 </el-col> 93 </el-col>
94 </el-row> 94 </el-row>
95 <el-row :gutter="10" > 95 <el-row :gutter="10">
96 <el-col :span="8"> 96 <el-col :span="8">
97 <el-form-item :class="flag ? 'marginBot0' : ''" label="所在层："> 97 <el-form-item :class="flag ? 'marginBot0' : ''" label="所在层：">
98 <el-input disabled v-model="ruleForm.ygdj.szc"></el-input> 98 <el-input disabled v-model="ruleForm.ygdj.szc"></el-input>
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
133 <el-row :gutter="10"> 133 <el-row :gutter="10">
134 <el-col :span="14" v-if="ruleForm.qlxx"> 134 <el-col :span="14" v-if="ruleForm.qlxx">
135 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式："> 135 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
136 <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs"> 136 <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs">
137 <el-radio label="0">单独所有</el-radio> 137 <el-radio label="0">单独所有</el-radio>
138 <el-radio label="1">共同共有</el-radio> 138 <el-radio label="1">共同共有</el-radio>
139 <el-radio label="2">按份所有</el-radio> 139 <el-radio label="2">按份所有</el-radio>
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
157 <el-row :gutter="10"> 157 <el-row :gutter="10">
158 <el-col> 158 <el-col>
159 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy"> 159 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy">
160 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype==1" 160 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
161 v-model="ruleForm.ygdj.djyy"> 161 v-model="ruleForm.ygdj.djyy">
162 </el-input> 162 </el-input>
163 </el-form-item> 163 </el-form-item>
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
174 </template> 174 </template>
175 <script> 175 <script>
176 import InformationTable from "@/views/workflow/components/InformationTable"; 176 import InformationTable from "@/views/workflow/components/InformationTable";
177 import { Init, saveData } from "@/api/ygdjFlow.js"; 177 import { Init, saveData } from "@/api/workflow/ygdjFlow.js";
178 import { mapGetters } from "vuex"; 178 import { mapGetters } from "vuex";
179 export default { 179 export default {
180 async created () { 180 async created () {
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
47 <div class="triangle"></div> 47 <div class="triangle"></div>
48 </div> 48 </div>
49 49
50 <!-- <el-button type="primary" style="float: right;margin-right: 20px; " @click="onClick">数据查看</el-button>--> 50 <!-- <el-button type="primary" style="float: right;margin-right: 20px; " @click="onClick">数据查看</el-button>-->
51 51
52 <el-row :gutter="10" v-if="ruleForm.qlxx"> 52 <el-row :gutter="10" v-if="ruleForm.qlxx">
53 <el-col :span="8"> 53 <el-col :span="8">
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
95 </el-form-item> 95 </el-form-item>
96 </el-col> 96 </el-col>
97 </el-row> 97 </el-row>
98 <el-row :gutter="10" > 98 <el-row :gutter="10">
99 <el-col :span="8"> 99 <el-col :span="8">
100 <el-form-item :class="flag ? 'marginBot0' : ''" label="所在层："> 100 <el-form-item :class="flag ? 'marginBot0' : ''" label="所在层：">
101 <el-input disabled v-model="ruleForm.ygdj.szc"></el-input> 101 <el-input disabled v-model="ruleForm.ygdj.szc"></el-input>
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
136 <el-row :gutter="10"> 136 <el-row :gutter="10">
137 <el-col :span="14" v-if="ruleForm.qlxx"> 137 <el-col :span="14" v-if="ruleForm.qlxx">
138 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式："> 138 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
139 <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs"> 139 <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs">
140 <el-radio label="0">单独所有</el-radio> 140 <el-radio label="0">单独所有</el-radio>
141 <el-radio label="1">共同共有</el-radio> 141 <el-radio label="1">共同共有</el-radio>
142 <el-radio label="2">按份所有</el-radio> 142 <el-radio label="2">按份所有</el-radio>
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
160 <el-row :gutter="10"> 160 <el-row :gutter="10">
161 <el-col> 161 <el-col>
162 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy"> 162 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy">
163 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype==1" 163 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
164 v-model="ruleForm.ygdj.djyy"> 164 v-model="ruleForm.ygdj.djyy">
165 </el-input> 165 </el-input>
166 </el-form-item> 166 </el-form-item>
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
177 </template> 177 </template>
178 <script> 178 <script>
179 import InformationTable from "@/views/workflow/components/InformationTable"; 179 import InformationTable from "@/views/workflow/components/InformationTable";
180 import { Init, saveData } from "@/api/ygdjFlow.js"; 180 import { Init, saveData } from "@/api/workflow/ygdjFlow.js";
181 import { mapGetters } from "vuex"; 181 import { mapGetters } from "vuex";
182 export default { 182 export default {
183 async created () { 183 async created () {
...@@ -207,8 +207,8 @@ export default { ...@@ -207,8 +207,8 @@ export default {
207 }; 207 };
208 }, 208 },
209 methods: { 209 methods: {
210 onClick(){ 210 onClick () {
211 this.$popup("房屋信息比对","ywbl/ygdj/slxxCompareDetai", 211 this.$popup("房屋信息比对", "ywbl/ygdj/slxxCompareDetai",
212 { 212 {
213 formData: { 213 formData: {
214 bsmSldy: this.propsParam.bsmSldy, 214 bsmSldy: this.propsParam.bsmSldy,
......
...@@ -52,10 +52,10 @@ ...@@ -52,10 +52,10 @@
52 </div> 52 </div>
53 </template> 53 </template>
54 <script> 54 <script>
55 import { mapGetters } from "vuex";
55 import table from "@/utils/mixin/table"; 56 import table from "@/utils/mixin/table";
56 import { datas, sendThis } from "./djbcxdata"; 57 import { datas, sendThis } from "./djbcxdata";
57 import { getDjbBysearch } from "@/api/zhcx.js"; 58 import { getDjbBysearch } from "@/api/zhcx.js";
58 import { mapGetters } from "vuex";
59 59
60 export default { 60 export default {
61 name: "djbcx", 61 name: "djbcx",
......
...@@ -121,7 +121,7 @@ export default { ...@@ -121,7 +121,7 @@ export default {
121 console.log(name, sort); 121 console.log(name, sort);
122 }, 122 },
123 openDialog (item) { 123 openDialog (item) {
124 const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&viewtype=3') 124 const { href } = this.$router.resolve('/workFrameViewcs?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&viewtype=3')
125 window.open(href, '_blank'); 125 window.open(href, '_blank');
126 } 126 }
127 } 127 }
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
50 <script> 50 <script>
51 import table from "@/utils/mixin/table"; 51 import table from "@/utils/mixin/table";
52 import { datas, sendThis } from "./lpcxdata"; 52 import { datas, sendThis } from "./lpcxdata";
53 import { getLpZrz, getLpb } from "@/api/lpb.js"; 53 import { getLpZrz, getLpb } from "@/api/zhcx.js";
54 export default { 54 export default {
55 name: "lpcx", 55 name: "lpcx",
56 components: {}, 56 components: {},
......