Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
ac2f7e62 by xiaomiao
Options

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

2 parents 160c29c0 49644b17
Inline Side-by-side
Showing 34 changed files with 157 additions and 155 deletions
1 /*
2 * @Description: 用户首页
3 * @Autor: renchao
4 * @LastEditTime: 2023-05-16 16:06:51
5 */
6 import request from '@/utils/request'
7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
8 /**
9 * @description: 获取首页通知公告列表
10 * @author: renchao
11 */
12 export function getHomeNoticeList () {
13 return request({
14 url: SERVER.SERVERAPI + '/rest/home/getHomeNoticeList',
15 method: 'get'
16 })
17 }
18 /**
19 * @description:
20 * @author: renchao
21 */
22 // 获取首页待办事项
23 export function getHomeTodoList () {
24 return request({
25 url: SERVER.SERVERAPI + '/rest/home/getHomeTodoList',
26 method: 'get'
27 })
28 }
29
30 /**
31 * @description: 获取首页已办事项
32 * @author: renchao
33 */
34 export function getHomeDoneList () {
35 return request({
36 url: SERVER.SERVERAPI + '/rest/home/getHomeDoneList',
37 method: 'get'
38 })
39 }
40
41 /**
42 * @description: 获取首页常办项目
43 * @author: renchao
44 */
45 export function getHomeFrequentProjects () {
46 return request({
47 url: SERVER.SERVERAPI + '/rest/home/getHomeFrequentProjects',
48 method: 'get'
49 })
50 }
51
52 /**
53 * @description: 保存常办项目
54 * @param {*} data
55 * @author: renchao
56 */
57 export function saveFrequentProjectsList (data) {
58 return request({
59 url: SERVER.SERVERAPI + '/rest/home/saveFrequentProjectsList',
60 method: 'post',
61 data
62 })
63 }
...\ No newline at end of file ...\ No newline at end of file
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-18 10:53:07 4 * @LastEditTime: 2023-06-08 13:43:33
5 */ 5 */
6 import request from '@/utils/request' 6 import request from '@/utils/request'
7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) 7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
...@@ -14,7 +14,7 @@ const url = SERVER.SERVERAPI + '/rest/zhcx/lpcx/' ...@@ -14,7 +14,7 @@ const url = SERVER.SERVERAPI + '/rest/zhcx/lpcx/'
14 */ 14 */
15 export function getLpZrz (data) { 15 export function getLpZrz (data) {
16 return request({ 16 return request({
17 url: 'service-lpb/rest/zhcx/lpcx/getLpZrz', 17 url: 'service-lpb-zq/rest/zhcx/lpcx/getLpZrz',
18 method: 'post', 18 method: 'post',
19 data: data 19 data: data
20 }) 20 })
...@@ -27,7 +27,7 @@ export function getLpZrz (data) { ...@@ -27,7 +27,7 @@ export function getLpZrz (data) {
27 */ 27 */
28 export function getLpb (zrzbsm) { 28 export function getLpb (zrzbsm) {
29 return request({ 29 return request({
30 url: url + 'getLpb?scyclx=1&zrzbsm=' + zrzbsm, 30 url: 'service-lpb-zq/rest/zhcx/lpcx/getLpb?scyclx=1&zrzbsm=' + zrzbsm,
31 method: 'get' 31 method: 'get'
32 }) 32 })
33 } 33 }
...@@ -38,7 +38,7 @@ export function getLpb (zrzbsm) { ...@@ -38,7 +38,7 @@ export function getLpb (zrzbsm) {
38 */ 38 */
39 export function getLpbFwytAndQlxz (zrzbsm) { 39 export function getLpbFwytAndQlxz (zrzbsm) {
40 return request({ 40 return request({
41 url: url + 'getLpbFwytAndQlxz?scyclx=1&zrzbsm=' + zrzbsm, 41 url: 'service-lpb-zq/rest/zhcx/lpcx/getLpbFwytAndQlxz?scyclx=1&zrzbsm=' + zrzbsm,
42 method: 'get' 42 method: 'get'
43 }) 43 })
44 } 44 }
......
...@@ -5,62 +5,6 @@ ...@@ -5,62 +5,6 @@
5 */ 5 */
6 import request from '@/utils/request' 6 import request from '@/utils/request'
7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) 7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
8 /**
9 * @description: 获取首页通知公告列表
10 * @author: renchao
11 */
12 export function getHomeNoticeList () {
13 return request({
14 url: SERVER.SERVERAPI + '/rest/workBench/getHomeNoticeList',
15 method: 'get'
16 })
17 }
18 /**
19 * @description:
20 * @author: renchao
21 */
22 // 获取首页待办事项
23 export function getHomeTodoList () {
24 return request({
25 url: SERVER.SERVERAPI + '/rest/workBench/getHomeTodoList',
26 method: 'get'
27 })
28 }
29
30 /**
31 * @description: 获取首页已办事项
32 * @author: renchao
33 */
34 export function getHomeDoneList () {
35 return request({
36 url: SERVER.SERVERAPI + '/rest/workBench/getHomeDoneList',
37 method: 'get'
38 })
39 }
40
41 /**
42 * @description: 获取首页常办项目
43 * @author: renchao
44 */
45 export function getHomeFrequentProjects () {
46 return request({
47 url: SERVER.SERVERAPI + '/rest/workBench/getHomeFrequentProjects',
48 method: 'get'
49 })
50 }
51
52 /**
53 * @description: 保存常办项目
54 * @param {*} data
55 * @author: renchao
56 */
57 export function saveFrequentProjectsList (data) {
58 return request({
59 url: SERVER.SERVERAPI + '/rest/workBench/saveFrequentProjectsList',
60 method: 'post',
61 data
62 })
63 }
64 8
65 9
66 /** 10 /**
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:13:24 4 * @LastEditTime: 2023-05-17 10:13:24
5 */ 5 */
...@@ -285,7 +285,7 @@ export function selectZdjbxxSplitMergeLast (data) { ...@@ -285,7 +285,7 @@ export function selectZdjbxxSplitMergeLast (data) {
285 */ 285 */
286 export function selectZrz (data) { 286 export function selectZrz (data) {
287 return request({ 287 return request({
288 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZrz', 288 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZrzQjdc',
289 method: 'post', 289 method: 'post',
290 data 290 data
291 }) 291 })
...@@ -348,7 +348,7 @@ export function selectJsydQlxxSplitMergeBefore (data) { ...@@ -348,7 +348,7 @@ export function selectJsydQlxxSplitMergeBefore (data) {
348 */ 348 */
349 export function selectFwsyq (data) { 349 export function selectFwsyq (data) {
350 return request({ 350 return request({
351 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectFwsyq', 351 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectFwsyqQlxx',
352 method: 'post', 352 method: 'post',
353 data 353 data
354 }) 354 })
...@@ -394,9 +394,9 @@ export function selectYgdy (data) { ...@@ -394,9 +394,9 @@ export function selectYgdy (data) {
394 * @param data 394 * @param data
395 * @returns {*} 395 * @returns {*}
396 */ 396 */
397 export function selectAllHInfo (data) { 397 export function selectHQjdc (data) {
398 return request({ 398 return request({
399 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectAllHInfo', 399 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectHQjdc',
400 method: 'post', 400 method: 'post',
401 data 401 data
402 }) 402 })
......
...@@ -31,9 +31,7 @@ ...@@ -31,9 +31,7 @@
31 import Cookies from 'js-cookie' 31 import Cookies from 'js-cookie'
32 import { mapGetters } from 'vuex' 32 import { mapGetters } from 'vuex'
33 import NoticeBar from '@/components/NoticeBar/index' 33 import NoticeBar from '@/components/NoticeBar/index'
34 import { 34 import {getHomeNoticeList} from "@/api/home"
35 getHomeNoticeList
36 } from "@/api/user"
37 export default { 35 export default {
38 components: { 36 components: {
39 NoticeBar 37 NoticeBar
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <script> 8 <script>
9 import { getMenuInfo } from "@/api/user.js"; 9 import { getMenuInfo } from "@/api/user.js";
10 import Tree from "@/components/Tree/src/tree.vue" 10 import Tree from "@/components/Tree/src/tree.vue"
11 import { saveFrequentProjectsList, getHomeFrequentProjects } from "@/api/user.js"; 11 import { saveFrequentProjectsList, getHomeFrequentProjects } from "@/api/home.js";
12 export default { 12 export default {
13 components: { 13 components: {
14 Tree 14 Tree
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 * @LastEditTime: 2023-05-24 14:42:24 4 * @LastEditTime: 2023-05-24 14:42:24
5 */ 5 */
6 import { getForm } from "../flowform"; 6 import { getForm } from "../flowform";
7 import { getHomeNoticeList } from "@/api/user.js" 7 import { getHomeNoticeList } from "@/api/home.js"
8 import { log } from "bpmn-js-token-simulation"; 8 import { log } from "bpmn-js-token-simulation";
9 export default { 9 export default {
10 data () { 10 data () {
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <script> 8 <script>
9 import { getMenuInfo } from "@/api/user.js"; 9 import { getMenuInfo } from "@/api/user.js";
10 import Tree from "@/components/Tree/src/tree.vue" 10 import Tree from "@/components/Tree/src/tree.vue"
11 import { saveFrequentProjectsList, getHomeFrequentProjects } from "@/api/user.js"; 11 import { saveFrequentProjectsList, getHomeFrequentProjects } from "@/api/home.js";
12 export default { 12 export default {
13 components: { 13 components: {
14 Tree 14 Tree
......
...@@ -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/user.js"; 109 import { getHomeNoticeList, getHomeTodoList, getHomeDoneList, getHomeFrequentProjects } from "@/api/home.js";
110 import { setReadStatus } from '@/api/system' 110 import { setReadStatus } from '@/api/system'
111 import addDialog from "./components/addProject.vue"; 111 import addDialog from "./components/addProject.vue";
112 export default { 112 export default {
......
...@@ -105,13 +105,13 @@ ...@@ -105,13 +105,13 @@
105 </div> 105 </div>
106 </div> 106 </div>
107 <!-- 单元列表页面--> 107 <!-- 单元列表页面-->
108 <selectAllHInfo v-else :sqywInfo="formData" /> 108 <selectZrzH v-else :sqywInfo="formData" />
109 </div> 109 </div>
110 </template> 110 </template>
111 111
112 <script> 112 <script>
113 import lpbContent from "./lpbContent/index"; 113 import lpbContent from "./lpbContent/index";
114 import selectAllHInfo from "../ywbl/ywsq/components/selectAllHInfo" 114 import selectZrzH from "../ywbl/ywsq/components/selectZrzH"
115 import { getLpbFwytAndQlxz,getLpbQsxtj } from '@/api/lpb' 115 import { getLpbFwytAndQlxz,getLpbQsxtj } from '@/api/lpb'
116 export default { 116 export default {
117 name: "lpb", 117 name: "lpb",
...@@ -123,7 +123,7 @@ export default { ...@@ -123,7 +123,7 @@ export default {
123 }, 123 },
124 components: { 124 components: {
125 lpbContent, 125 lpbContent,
126 selectAllHInfo 126 selectZrzH
127 }, 127 },
128 data () { 128 data () {
129 return { 129 return {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:40:48 4 * @LastEditTime: 2023-05-17 10:40:48
5 --> 5 -->
...@@ -52,10 +52,10 @@ ...@@ -52,10 +52,10 @@
52 { 52 {
53 prop: "qllxmc", 53 prop: "qllxmc",
54 label: "权利类型" 54 label: "权利类型"
55 }, 55 },
56 { 56 {
57 prop: "qlrmc", 57 prop: "qlrmc",
58 label: "权利人" 58 label: "被执行人"
59 }, 59 },
60 { 60 {
61 prop: "bdcqzh", 61 prop: "bdcqzh",
...@@ -127,4 +127,4 @@ ...@@ -127,4 +127,4 @@
127 } 127 }
128 </script> 128 </script>
129 <style scoped lang='scss'> 129 <style scoped lang='scss'>
130 </style>
...\ No newline at end of file ...\ No newline at end of file
130 </style>
......
...@@ -45,6 +45,9 @@ export default { ...@@ -45,6 +45,9 @@ export default {
45 var formdata = new FormData(); 45 var formdata = new FormData();
46 formdata.append("bsmSlsq", this.bsmSlsq); 46 formdata.append("bsmSlsq", this.bsmSlsq);
47 formdata.append("bestepid", this.bestepid); 47 formdata.append("bestepid", this.bestepid);
48 if (this.type) {
49 formdata.append("type", "READ_ONLY");
50 }
48 stepExpandInfo(formdata).then((res) => { 51 stepExpandInfo(formdata).then((res) => {
49 if (res.code === 200) { 52 if (res.code === 200) {
50 this.leftButtonList = res.result.button; 53 this.leftButtonList = res.result.button;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 * @LastEditTime: 2023-05-24 14:42:24 4 * @LastEditTime: 2023-05-24 14:42:24
5 */ 5 */
6 import { getForm } from "../flowform"; 6 import { getForm } from "../flowform";
7 import { getHomeNoticeList } from "@/api/user.js" 7 import { getHomeNoticeList } from "@/api/home.js"
8 export default { 8 export default {
9 data () { 9 data () {
10 return { 10 return {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-24 15:50:38 4 * @LastEditTime: 2023-06-09 16:55:31
5 --> 5 -->
6 <template> 6 <template>
7 <div class="container"> 7 <div class="container">
...@@ -79,6 +79,8 @@ ...@@ -79,6 +79,8 @@
79 bsmSlsq: this.$route.query.bsmSlsq, 79 bsmSlsq: this.$route.query.bsmSlsq,
80 //当前流程所在环节 80 //当前流程所在环节
81 bestepid: this.$route.query.bestepid, 81 bestepid: this.$route.query.bestepid,
82 // 判断类型
83 type: "READ_ONLY",
82 //设置那个表单选中 84 //设置那个表单选中
83 tabName: "", 85 tabName: "",
84 //表单集合 86 //表单集合
...@@ -105,6 +107,7 @@ ...@@ -105,6 +107,7 @@
105 }, 107 },
106 //申请单元点击事件 108 //申请单元点击事件
107 stepForm (index) { 109 stepForm (index) {
110 this.currentSelectProps.type = "READ_ONLY"
108 getStepFormInfo(this.currentSelectProps).then((res) => { 111 getStepFormInfo(this.currentSelectProps).then((res) => {
109 if (res.code === 200) { 112 if (res.code === 200) {
110 this.fresh++; 113 this.fresh++;
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:43:00 4 * @LastEditTime: 2023-05-17 10:43:00
5 --> 5 -->
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
56 查封不动产列表 56 查封不动产列表
57 <div class="triangle"></div> 57 <div class="triangle"></div>
58 </div> 58 </div>
59 <cfBdcdyTable :tableData="ruleForm.yqlxxList" /> 59 <cfBdcdyTable :tableData="ruleForm.ssQlxxList" />
60 <div class="slxx_title title-block"> 60 <div class="slxx_title title-block">
61 批量查封信息 61 批量查封信息
62 <div class="triangle"></div> 62 <div class="triangle"></div>
...@@ -72,11 +72,12 @@ ...@@ -72,11 +72,12 @@
72 <el-input v-model="ruleForm.cfdjList[0].cfwh" :disabled="$route.query.viewtype || isJfOperation"></el-input> 72 <el-input v-model="ruleForm.cfdjList[0].cfwh" :disabled="$route.query.viewtype || isJfOperation"></el-input>
73 </el-form-item> 73 </el-form-item>
74 </el-col> 74 </el-col>
75 <el-col :span="8"> 75 <!-- 批量查封状态有多种查封类型，不予展示 -->
76 <!-- <el-col :span="8">
76 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封类型：" prop="cfdj.cflxmc"> 77 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封类型：" prop="cfdj.cflxmc">
77 <el-input v-model="ruleForm.cfdjList[0].cflxmc" disabled></el-input> 78 <el-input v-model="ruleForm.cfdjList[0].cflxmc" disabled></el-input>
78 </el-form-item> 79 </el-form-item>
79 </el-col> 80 </el-col>-->
80 </el-row> 81 </el-row>
81 <el-row :gutter="10"> 82 <el-row :gutter="10">
82 <el-col :span="8"> 83 <el-col :span="8">
...@@ -230,4 +231,4 @@ ...@@ -230,4 +231,4 @@
230 <style scoped lang='scss'> 231 <style scoped lang='scss'>
231 @import "~@/styles/public.scss"; 232 @import "~@/styles/public.scss";
232 @import "~@/styles/slxx/slxx.scss"; 233 @import "~@/styles/slxx/slxx.scss";
233 </style>
...\ No newline at end of file ...\ No newline at end of file
234 </style>
......
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
173 </el-col> 173 </el-col>
174 </el-row> 174 </el-row>
175 <qlrCommonTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList" 175 <qlrCommonTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList"
176 :gyfs="ruleForm.qlxx.gyfs" /> 176 :gyfs="ruleForm.slsq.gyfs" />
177 177
178 <div v-if="ruleForm.ywrList && ruleForm.slsq.djlx == '200'"> 178 <div v-if="ruleForm.ywrList && ruleForm.slsq.djlx == '200'">
179 <div class="slxx_title title-block"> 179 <div class="slxx_title title-block">
......
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
166 </el-col> 166 </el-col>
167 </el-row> 167 </el-row>
168 <qlrCommonTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList" 168 <qlrCommonTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList"
169 :gyfs="ruleForm.qlxx.gyfs" /> 169 :gyfs="ruleForm.slsq.gyfs" />
170 <div class="slxx_title title-block"> 170 <div class="slxx_title title-block">
171 登记原因 171 登记原因
172 <div class="triangle"></div> 172 <div class="triangle"></div>
......
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
130 </el-col> 130 </el-col>
131 </el-row> 131 </el-row>
132 <qlrCommonTable v-if="ruleForm.qlxxList[0]" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList" 132 <qlrCommonTable v-if="ruleForm.qlxxList[0]" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList"
133 :gyfs="ruleForm.qlxxList[0].gyfs" /> 133 :gyfs="ruleForm.slsq.gyfs" />
134 <div class="slxx_title title-block"> 134 <div class="slxx_title title-block">
135 登记原因 135 登记原因
136 <div class="triangle"></div> 136 <div class="triangle"></div>
......
...@@ -159,10 +159,6 @@ export default { ...@@ -159,10 +159,6 @@ export default {
159 } 159 }
160 }, 160 },
161 handleSelectionChange(val) { 161 handleSelectionChange(val) {
162 val.forEach((item, index) => {
163 item.bsmSsql = item.bsmQlxx;
164 item.ybdcqzsh = item.bdcqzh;
165 });
166 this.bdcdysz = val; 162 this.bdcdysz = val;
167 }, 163 },
168 select(selection, row) { 164 select(selection, row) {
......
...@@ -126,10 +126,6 @@ ...@@ -126,10 +126,6 @@
126 }) 126 })
127 }, 127 },
128 handleSelectionChange (val) { 128 handleSelectionChange (val) {
129 val.forEach((item, index) => {
130 item.bsmSsql = item.bsmQlxx;
131 item.ybdcqzsh = item.bdcqzh;
132 });
133 this.bdcdysz = val; 129 this.bdcdysz = val;
134 }, 130 },
135 select(selection, row){ 131 select(selection, row){
......
...@@ -260,9 +260,6 @@ ...@@ -260,9 +260,6 @@
260 this.$popupCacel() 260 this.$popupCacel()
261 }, 261 },
262 handleSelectionChange (val) { 262 handleSelectionChange (val) {
263 val.forEach((item, index) => {
264 item.bsmSsql = item.zdbsm
265 })
266 this.bdcdysz = val 263 this.bdcdysz = val
267 }, 264 },
268 handleLpbClick (item) { 265 handleLpbClick (item) {
......
...@@ -111,10 +111,6 @@ ...@@ -111,10 +111,6 @@
111 }) 111 })
112 }, 112 },
113 handleSelectionChange (val) { 113 handleSelectionChange (val) {
114 val.forEach((item, index) => {
115 item.bsmSsql = item.bsmQlxx
116 item.ybdcqzsh = item.bdcqzh
117 })
118 this.bdcdysz = val; 114 this.bdcdysz = val;
119 }, 115 },
120 openBook (row) { 116 openBook (row) {
......
...@@ -139,10 +139,6 @@ ...@@ -139,10 +139,6 @@
139 }) 139 })
140 }, 140 },
141 handleSelectionChange (val) { 141 handleSelectionChange (val) {
142 val.forEach((item, index) => {
143 item.bsmSsql = item.bsmQlxx;
144 item.ybdcqzsh = item.bdcqzh;
145 });
146 this.bdcdysz = val; 142 this.bdcdysz = val;
147 }, 143 },
148 select(selection, row){ 144 select(selection, row){
......
...@@ -116,10 +116,6 @@ ...@@ -116,10 +116,6 @@
116 }) 116 })
117 }, 117 },
118 handleSelectionChange (val) { 118 handleSelectionChange (val) {
119 val.forEach((item, index) => {
120 item.bsmSsql = item.bsmQlxx;
121 item.ybdcqzsh = item.bdcqzh;
122 });
123 this.bdcdysz = val; 119 this.bdcdysz = val;
124 }, 120 },
125 select(selection, row){ 121 select(selection, row){
......
...@@ -48,11 +48,11 @@ ...@@ -48,11 +48,11 @@
48 </template> 48 </template>
49 <script> 49 <script>
50 import store from '@/store/index.js' 50 import store from '@/store/index.js'
51 import { datas, sendThis } from "../javascript/selectYgdj100.js"; 51 import { datas, sendThis } from "../javascript/selectH.js";
52 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 52 import { defaultParameters } from "../javascript/publicDefaultPar.js";
53 import table from "@/utils/mixin/table"; 53 import table from "@/utils/mixin/table";
54 import jump from "./mixin/jump"; 54 import jump from "./mixin/jump";
55 import { selectYgdj100, startBusinessFlow } from "@/api/ywbl.js"; 55 import { selectHQjdc, startBusinessFlow } from "@/api/ywbl.js";
56 export default { 56 export default {
57 mixins: [table, jump], 57 mixins: [table, jump],
58 props: { 58 props: {
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
78 console.log("申请业务单一流向状态",this.sqywInfo.sqywdylx); 78 console.log("申请业务单一流向状态",this.sqywInfo.sqywdylx);
79 this.$startLoading(); 79 this.$startLoading();
80 this.queryForm.sqywbm = this.sqywInfo.djywbm; 80 this.queryForm.sqywbm = this.sqywInfo.djywbm;
81 selectYgdj100({ ...this.queryForm, ...this.pageData }).then((res) => { 81 selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {
82 this.$endLoading(); 82 this.$endLoading();
83 if (res.code === 200) { 83 if (res.code === 200) {
84 let { total, records } = res.result; 84 let { total, records } = res.result;
...@@ -115,11 +115,7 @@ ...@@ -115,11 +115,7 @@
115 this.$popupCacel() 115 this.$popupCacel()
116 }) 116 })
117 }, 117 },
118 handleSelectionChange (val) { 118 handleSelectionChange (val) {
119 val.forEach((item, index) => {
120 item.bsmSsql = item.bsmQlxx;
121 item.ybdcqzsh = item.bdcqzh;
122 });
123 this.bdcdysz = val; 119 this.bdcdysz = val;
124 }, 120 },
125 select(selection, row){ 121 select(selection, row){
......
...@@ -123,11 +123,7 @@ ...@@ -123,11 +123,7 @@
123 this.$popupCacel() 123 this.$popupCacel()
124 }) 124 })
125 }, 125 },
126 handleSelectionChange (val) { 126 handleSelectionChange (val) {
127 val.forEach((item, index) => {
128 item.bsmSsql = item.bsmQlxx;
129 item.ybdcqzsh = item.bdcqzh;
130 });
131 this.bdcdysz = val; 127 this.bdcdysz = val;
132 }, 128 },
133 openBook (row) { 129 openBook (row) {
......
...@@ -110,6 +110,7 @@ ...@@ -110,6 +110,7 @@
110 if (res.code === 200) { 110 if (res.code === 200) {
111 this.tableData.datastwo = res.result 111 this.tableData.datastwo = res.result
112 this.tableData.datastwo.forEach(item => { 112 this.tableData.datastwo.forEach(item => {
113 item.bsm = item.zdbsm;
113 item.bglx = '2' 114 item.bglx = '2'
114 }) 115 })
115 this.bdcdysz = [this.bdcdysz[0], ...this.tableData.datastwo] 116 this.bdcdysz = [this.bdcdysz[0], ...this.tableData.datastwo]
...@@ -130,8 +131,6 @@ ...@@ -130,8 +131,6 @@
130 handleRowClick (val) { 131 handleRowClick (val) {
131 this.radioVal = val.bhqkbsm 132 this.radioVal = val.bhqkbsm
132 let obj = val 133 let obj = val
133 obj.bsmSsql = val.bsmQlxx;
134 obj.ybdcqzsh = val.bdcqzh;
135 obj.bglx = '1'; 134 obj.bglx = '1';
136 135
137 this.bdcdysz[0] = obj 136 this.bdcdysz[0] = obj
......
...@@ -121,6 +121,9 @@ ...@@ -121,6 +121,9 @@
121 }) 121 })
122 }, 122 },
123 handleSelectionChange (val) { 123 handleSelectionChange (val) {
124 val.forEach((item, index) => {
125 item.bsm = item.zdbsm;
126 });
124 this.bdcdysz = val; 127 this.bdcdysz = val;
125 }, 128 },
126 select(selection, row){ 129 select(selection, row){
......
...@@ -115,11 +115,7 @@ ...@@ -115,11 +115,7 @@
115 this.$popupCacel() 115 this.$popupCacel()
116 }) 116 })
117 }, 117 },
118 handleSelectionChange (val) { 118 handleSelectionChange (val) {
119 val.forEach((item, index) => {
120 item.bsmSsql = item.bsmQlxx;
121 item.ybdcqzsh = item.bdcqzh;
122 });
123 this.bdcdysz = val; 119 this.bdcdysz = val;
124 }, 120 },
125 select(selection, row){ 121 select(selection, row){
......
...@@ -116,10 +116,6 @@ ...@@ -116,10 +116,6 @@
116 }) 116 })
117 }, 117 },
118 handleSelectionChange (val) { 118 handleSelectionChange (val) {
119 val.forEach((item, index) => {
120 item.bsmSsql = item.bsmQlxx;
121 item.ybdcqzsh = item.bdcqzh;
122 });
123 this.bdcdysz = val; 119 this.bdcdysz = val;
124 }, 120 },
125 select(selection, row){ 121 select(selection, row){
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
52 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 52 import { defaultParameters } from "../javascript/publicDefaultPar.js";
53 import table from "@/utils/mixin/table"; 53 import table from "@/utils/mixin/table";
54 import jump from "./mixin/jump"; 54 import jump from "./mixin/jump";
55 import { selectAllHInfo, startBusinessFlow } from "@/api/ywbl.js"; 55 import { selectHQjdc, startBusinessFlow } from "@/api/ywbl.js";
56 export default { 56 export default {
57 mixins: [table, jump], 57 mixins: [table, jump],
58 props: { 58 props: {
...@@ -75,10 +75,10 @@ ...@@ -75,10 +75,10 @@
75 sendThis(this); 75 sendThis(this);
76 }, 76 },
77 methods: { 77 methods: {
78 queryClick () { 78 queryClick () {
79 console.log("申请业务单一流向状态",this.sqywInfo.sqywdylx);
80 this.$startLoading(); 79 this.$startLoading();
81 selectAllHInfo({ "zrzbsm": this.sqywInfo.zrzbsm, ...this.queryForm, ...this.pageData }).then((res) => { 80 this.queryForm.zrzbsm = this.sqywInfo.zrzbsm;
81 selectHQjdc({...this.queryForm, ...this.pageData }).then((res) => {
82 this.$endLoading(); 82 this.$endLoading();
83 if (res.code === 200) { 83 if (res.code === 200) {
84 let { total, records } = res.result; 84 let { total, records } = res.result;
...@@ -116,10 +116,6 @@ ...@@ -116,10 +116,6 @@
116 }) 116 })
117 }, 117 },
118 handleSelectionChange (val) { 118 handleSelectionChange (val) {
119 val.forEach((item, index) => {
120 item.bsmSsql = item.bsmQlxx;
121 item.ybdcqzsh = item.bdcqzh;
122 });
123 this.bdcdysz = val; 119 this.bdcdysz = val;
124 }, 120 },
125 select(selection, row){ 121 select(selection, row){
......
...@@ -51,25 +51,48 @@ class data extends filter { ...@@ -51,25 +51,48 @@ class data extends filter {
51 </div> 51 </div>
52 ) 52 )
53 } 53 }
54 }, 54 },
55 { 55 {
56 prop: "qllxmc", 56 label: "测绘类型",
57 label: "权利类型", 57 render: (h, scope) => {
58 return (
59 <div>
60 <span v-show={scope.row.scyclx == 0}>预测</span>
61 <span v-show={scope.row.scyclx == 1}>实测</span>
62 </div>
63 )
64 }
58 }, 65 },
59 { 66 {
60 prop: "bdcdyh", 67 prop: "bdcdyh",
61 label: "不动产单元号", 68 label: "不动产单元号",
62 }, 69 },
63 { 70 {
71 prop: "jzwmc",
72 label: "建筑物名称",
73 },
74 {
75 prop: "fwxzmc",
76 label: "房屋性质",
77 },
78 {
79 prop: "showFwyt",
80 label: "房屋用途",
81 },
82 {
64 prop: "szc", 83 prop: "szc",
65 label: "房屋所在层数", 84 label: "所在层",
85 },
86 {
87 prop: "zcs",
88 label: "总层数",
66 }, 89 },
67 { 90 {
68 prop: "mj", 91 prop: "jzmj",
69 label: "房屋面积", 92 label: "建筑面积",
70 }, 93 },
71 { 94 {
72 prop: "fwjgmc", 95 prop: "showfwjg",
73 label: "房屋结构", 96 label: "房屋结构",
74 }, 97 },
75 { 98 {
......
...@@ -67,11 +67,11 @@ class data extends filter { ...@@ -67,11 +67,11 @@ class data extends filter {
67 minWidth: '110' 67 minWidth: '110'
68 }, 68 },
69 { 69 {
70 prop: "qlxzmc", 70 prop: "showQlxz",
71 label: "权利性质", 71 label: "权利性质",
72 }, 72 },
73 { 73 {
74 prop: "mj", 74 prop: "zdmj",
75 label: "宗地面积(㎡)", 75 label: "宗地面积(㎡)",
76 }, 76 },
77 { 77 {
...@@ -79,10 +79,18 @@ class data extends filter { ...@@ -79,10 +79,18 @@ class data extends filter {
79 label: "权利设定方式", 79 label: "权利设定方式",
80 }, 80 },
81 { 81 {
82 prop: "ytmc", 82 prop: "showTdyt",
83 label: "土地用途", 83 label: "土地用途",
84 }, 84 },
85 { 85 {
86 prop: "tfh",
87 label: "图幅号",
88 },
89 {
90 prop: "djh",
91 label: "地籍号",
92 },
93 {
86 prop: "zl", 94 prop: "zl",
87 label: "坐落", 95 label: "坐落",
88 minWidth: '110' 96 minWidth: '110'
......
...@@ -54,7 +54,7 @@ export function queueDjywmc(djywbm, djqxbm) { ...@@ -54,7 +54,7 @@ export function queueDjywmc(djywbm, djqxbm) {
54 vm = "cfdj"; 54 vm = "cfdj";
55 break; 55 break;
56 case "B40100"://预告首次 56 case "B40100"://预告首次
57 vm = "selectYgdj100"; 57 vm = "selectH";
58 break; 58 break;
59 case "B40200"://预告转移 59 case "B40200"://预告转移
60 case "B40300"://预告变更 60 case "B40300"://预告变更
......