Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
f806fd45 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents 5d68baf2 92c5dd4d
Inline Side-by-side
Showing 4 changed files with 42 additions and 55 deletions
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
83 }, 83 },
84 minHeight: { 84 minHeight: {
85 type: Number, 85 type: Number,
86 default: undefined 86 default: 160
87 }, 87 },
88 heightNumSetting: { 88 heightNumSetting: {
89 type: Boolean, 89 type: Boolean,
......
...@@ -31,6 +31,8 @@ export default { ...@@ -31,6 +31,8 @@ export default {
31 rightButtonList: [], 31 rightButtonList: [],
32 //批量按钮名称 32 //批量按钮名称
33 batchButtonName: '', 33 batchButtonName: '',
34 // 受理申请信息
35 slsq: {}
34 } 36 }
35 }, 37 },
36 computed: { 38 computed: {
...@@ -57,6 +59,7 @@ export default { ...@@ -57,6 +59,7 @@ export default {
57 if (res.code === 200) { 59 if (res.code === 200) {
58 this.leftButtonList = res.result.button; 60 this.leftButtonList = res.result.button;
59 this.rightButtonList = res.result.operation; 61 this.rightButtonList = res.result.operation;
62 this.slsq = res.result.slsq
60 } 63 }
61 }) 64 })
62 }, 65 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-18 14:58:55 4 * @LastEditTime: 2023-05-22 09:45:59
5 --> 5 -->
6 <template> 6 <template>
7 <div class="container"> 7 <div class="container">
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
26 <!-- 内容框架 --> 26 <!-- 内容框架 -->
27 <div class="containerFrame"> 27 <div class="containerFrame">
28 <!-- 左侧菜单栏 区分业务--> 28 <!-- 左侧菜单栏 区分业务-->
29 <ordinaryMenu @getCurrentSelectProps="getCurrentSelectProps" /> 29 <segmentMenu v-if="slsq.djqxbm == 'A0320099' || slsq.djqxbm == 'A0330099'" @getCurrentSelectProps="getCurrentSelectProps" />
30 <!-- <segmentMenu @getCurrentSelectProps="getCurrentSelectProps" /> --> 30 <ordinaryMenu v-else @getCurrentSelectProps="getCurrentSelectProps" />
31 <div class="leftCon"> 31 <div class="leftCon">
32 <!-- 分屏左侧预览 --> 32 <!-- 分屏左侧预览 -->
33 <div v-if="splitScreen" class="splitScreen-con"> 33 <div v-if="splitScreen" class="splitScreen-con">
......
...@@ -40,17 +40,15 @@ ...@@ -40,17 +40,15 @@
40 </el-form> 40 </el-form>
41 </div> 41 </div>
42 <!-- 表格 --> 42 <!-- 表格 -->
43 <div class="from-clues-content loadingtext">分割合并前权利信息 43 <div class="from-clues-content loadingtext">
44 <lb-table ref="table" @row-dblclick="handleRowClick" :pagination = false :page-size="pageData.pageSize" :calcHeight="300" 44 分割合并前权利信息
45 :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" 45 <lb-table ref="table" @row-click="handleRowClick" heightNumSetting :pagination=false
46 @p-current-change="handleCurrentChange" :column="tableData.columns" 46 :column="tableData.columns" :data="tableData.data">
47 :data="tableData.data" heightNumSetting :maxHeight="350" :minHeight="350" >
48 </lb-table> 47 </lb-table>
49 </div> 48 </div>
50 <div class="from-clues-content loadingtext">分割合并后宗地信息 49 <div class="from-clues-content loadingtext">
51 <lb-table ref="table" @row-dblclick="handleRowClick" :pagination = false :page-size="pageData.pageSize" :calcHeight="300" 50 分割合并后宗地信息
52 :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" 51 <lb-table ref="table" :pagination=false :calcHeight="500" :column="tableData.columns1"
53 @p-current-change="handleCurrentChange" :column="tableData.columns1"
54 :data="tableData.datastwo"> 52 :data="tableData.datastwo">
55 </lb-table> 53 </lb-table>
56 </div> 54 </div>
...@@ -63,11 +61,11 @@ ...@@ -63,11 +61,11 @@
63 <script> 61 <script>
64 //首次登记 62 //首次登记
65 import store from '@/store/index.js' 63 import store from '@/store/index.js'
66 import { datas,datastwo, sendThis } from "../javascript/selectJsydsyq.js"; 64 import { datas, datastwo, sendThis } from "../javascript/selectJsydsyq.js";
67 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 65 import { defaultParameters } from "../javascript/publicDefaultPar.js";
68 import table from "@/utils/mixin/table"; 66 import table from "@/utils/mixin/table";
69 import jump from "./mixin/jump"; 67 import jump from "./mixin/jump";
70 import { startBusinessFlow, selectJsydQlxxSplitMergeBefore,selectZdjbxxSplitMergeLast} from "@/api/ywbl.js"; 68 import { startBusinessFlow, selectJsydQlxxSplitMergeBefore, selectZdjbxxSplitMergeLast } from "@/api/ywbl.js";
71 export default { 69 export default {
72 mixins: [table, jump], 70 mixins: [table, jump],
73 props: { 71 props: {
...@@ -85,7 +83,7 @@ ...@@ -85,7 +83,7 @@
85 render: (h, scope) => { 83 render: (h, scope) => {
86 return ( 84 return (
87 <div class="orgColumn"> 85 <div class="orgColumn">
88 <el-radio v-model={this.radioVal} label={scope.row.bsmQlxx}> 86 <el-radio v-model={this.radioVal} label={scope.row.bhqkbsm}>
89 &ensp; 87 &ensp;
90 </el-radio> 88 </el-radio>
91 </div> 89 </div>
...@@ -94,39 +92,29 @@ ...@@ -94,39 +92,29 @@
94 },].concat(datas.columns()), 92 },].concat(datas.columns()),
95 data: [], 93 data: [],
96 columns1: datastwo.columns1(), 94 columns1: datastwo.columns1(),
97 datastwo:[] 95 datastwo: []
98 }, 96 },
99 bdcdysz: [], 97 bdcdysz: [],
100 radioVal:"" 98 radioVal: ""
101 } 99 }
102 }, 100 },
103 mounted () { 101 mounted () {
104 sendThis(this); 102 sendThis(this)
105 },
106 watch: {
107 radioVal: {
108 deep: true,
109 handler(newVal, oldVal) {
110 this.close()
111 },
112 },
113 }, 103 },
114 methods: { 104 methods: {
115 // 单选事件 105 // 单选事件
116 close(){ 106 close () {
117 this.tableData.data.forEach(e => { 107 this.queryForm.bhqkbsm = this.radioVal
118 if(e.bsmQlxx=this.radioVal){ 108 selectZdjbxxSplitMergeLast({ ...this.queryForm }).then((res) => {
119 this.queryForm.bhqkbsm=e.bhqkbsm
120 // 获取分割合并后宗地信息
121 selectZdjbxxSplitMergeLast({ ...this.queryForm}).then((res) => {
122 this.$endLoading(); 109 this.$endLoading();
123 if (res.code === 200) { 110 if (res.code === 200) {
124 this.tableData.datastwo = res.result; 111 this.tableData.datastwo = res.result
125 } 112 this.tableData.datastwo.forEach(item => {
126 }); 113 item.bglx = '2'
114 })
115 this.bdcdysz = [this.bdcdysz[0], ...this.tableData.datastwo]
127 } 116 }
128 }); 117 })
129
130 }, 118 },
131 queryClick () { 119 queryClick () {
132 this.$startLoading(); 120 this.$startLoading();
...@@ -134,17 +122,21 @@ ...@@ -134,17 +122,21 @@
134 selectJsydQlxxSplitMergeBefore({ ...this.queryForm, ...this.pageData }).then((res) => { 122 selectJsydQlxxSplitMergeBefore({ ...this.queryForm, ...this.pageData }).then((res) => {
135 this.$endLoading(); 123 this.$endLoading();
136 if (res.code === 200) { 124 if (res.code === 200) {
137 let { total, records } = res.result; 125 this.tableData.data = res.result
138 this.tableData.total = total;
139 this.tableData.data = res.result;
140 } 126 }
141 }); 127 });
142 }, 128 },
129 handleRowClick (val) {
130 this.radioVal = val.bhqkbsm
131 let obj = val
132 obj.bsmSsql = val.bsmQlxx;
133 obj.ybdcqzsh = val.bdcqzh;
134 obj.bglx = '1';
135
136 this.bdcdysz[0] = obj
137 this.close()
138 },
143 submitForm () { 139 submitForm () {
144 if (this.bdcdysz.length == 0) {
145 this.$message.error("请至少选择一条数据");
146 return;
147 }
148 startBusinessFlow({ 140 startBusinessFlow({
149 bsmSqyw: this.sqywInfo.parentid, 141 bsmSqyw: this.sqywInfo.parentid,
150 bdcdysz: this.bdcdysz, 142 bdcdysz: this.bdcdysz,
...@@ -163,17 +155,9 @@ ...@@ -163,17 +155,9 @@
163 store.dispatch('user/refreshPage', true); 155 store.dispatch('user/refreshPage', true);
164 } 156 }
165 } else { 157 } else {
166 this.$message.error(res.message); 158 this.$message.error(res.message)
167 } 159 }
168 }); 160 })
169 },
170 handleSelectionChange (val) {
171 val.forEach((item, index) => {
172 item.bsmSsql = item.bsmQlxx;
173 item.ybdcqzsh = item.bdcqzh;
174 item.bglx="1";
175 });
176 this.bdcdysz = val;
177 }, 161 },
178 openBook (row) { 162 openBook (row) {
179 var param = { 163 var param = {
......