Skip to content

bdc / bdcdj-web

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

Merge branch 'dev'

2 parents 28f75ab2 9a6981a0
Inline Side-by-side
Showing 7 changed files with 106 additions and 108 deletions
...@@ -80,6 +80,18 @@ export function getStepFormInfo (data) { ...@@ -80,6 +80,18 @@ export function getStepFormInfo (data) {
80 }); 80 });
81 } 81 }
82 /** 82 /**
83 * @description: 获取单元对应的环节表单信息
84 * @param {*} data
85 * @author: renchao
86 */
87 export function getBlYbxStepFormInfo (data) {
88 return request({
89 url: SERVER.SERVERAPI + '/rest/business/workFlow/getBlYbxStepFormInfo',
90 method: 'post',
91 data
92 });
93 }
94 /**
83 * @description: 环节扩展信息 95 * @description: 环节扩展信息
84 * @param {*} data 96 * @param {*} data
85 * @author: renchao 97 * @author: renchao
......
...@@ -321,19 +321,6 @@ ...@@ -321,19 +321,6 @@
321 :key="key" 321 :key="key"
322 :gyfs="ruleForm.qlxx.gyfs" 322 :gyfs="ruleForm.qlxx.gyfs"
323 /> 323 />
324
325 <div v-if="ruleForm.ywrData && ruleForm.ywrData.length > 0">
326 <div class="slxx_title title-block">
327 义务人信息
328 <div class="triangle"></div>
329 </div>
330 <qlrCommonTable
331 v-if="ruleForm.ywrData"
332 :tableData="ruleForm.ywrData"
333 :key="key"
334 @upDateQlrxxList="upDateYwrxxList"
335 />
336 </div>
337 </div> 324 </div>
338 <el-row class="btn" v-if="!$route.query.viewtype"> 325 <el-row class="btn" v-if="!$route.query.viewtype">
339 <el-form-item> 326 <el-form-item>
......
...@@ -266,19 +266,6 @@ ...@@ -266,19 +266,6 @@
266 :gyfs="ruleForm.qlxx.gyfs" 266 :gyfs="ruleForm.qlxx.gyfs"
267 /> 267 />
268 268
269 <div v-if="ruleForm.ywrData && ruleForm.ywrData.length > 0">
270 <div class="slxx_title title-block">
271 义务人信息
272 <div class="triangle"></div>
273 </div>
274 <ywrCommonTable
275 v-if="ruleForm.ywrData"
276 :tableData="ruleForm.ywrData"
277 :key="key"
278 @upDateQlrxxList="upDateYwrxxList"
279 :viewtype="$route.query.viewtype"
280 />
281 </div>
282 </div> 269 </div>
283 <el-row class="btn" v-if="!$route.query.viewtype"> 270 <el-row class="btn" v-if="!$route.query.viewtype">
284 <el-form-item> 271 <el-form-item>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
39 </el-col> 39 </el-col>
40 </el-row> 40 </el-row>
41 <div class="slxx_title title-block"> 41 <div class="slxx_title title-block">
42 建设用地、宅基地使用权信息 42 土地所有权信息
43 <div class="triangle"></div> 43 <div class="triangle"></div>
44 </div> 44 </div>
45 <el-row :gutter="10"> 45 <el-row :gutter="10">
...@@ -79,6 +79,42 @@ ...@@ -79,6 +79,42 @@
79 </el-form-item> 79 </el-form-item>
80 </el-col> 80 </el-col>
81 <el-col :span="8"> 81 <el-col :span="8">
82 <el-form-item
83 label="登簿人："
84 prop="qlxx.dbr"
85 :rules="rules.dbrrules"
86 >
87 <el-input v-model="ruleForm.qlxx.dbr"></el-input>
88 </el-form-item>
89 </el-col>
90 <el-col :span="8">
91 <el-form-item
92 label="登记机构："
93 prop="qlxx.djjg"
94 :rules="rules.djjgrules"
95 >
96 <el-input v-model="ruleForm.qlxx.djjg"></el-input>
97 </el-form-item>
98 </el-col>
99 <el-col :span="8">
100 <el-form-item
101 label="区县代码："
102 prop="qlxx.qxdm"
103 :rules="rules.qxdmrules"
104 >
105 <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
106 </el-form-item>
107 </el-col>
108 <el-col :span="8">
109 <el-form-item
110 label="不动产权证号："
111 prop="qlxx.bdcqzh"
112 :rules="rules.bdcqzhrules"
113 >
114 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
115 </el-form-item>
116 </el-col>
117 <el-col :span="8">
82 <el-form-item label="权属状态："> 118 <el-form-item label="权属状态：">
83 <el-select v-model="ruleForm.qlxx.qszt"> 119 <el-select v-model="ruleForm.qlxx.qszt">
84 <el-option 120 <el-option
...@@ -94,93 +130,84 @@ ...@@ -94,93 +130,84 @@
94 130
95 <el-col :span="8"> 131 <el-col :span="8">
96 <el-form-item label="登记原因："> 132 <el-form-item label="登记原因：">
97 <el-input v-model="ruleForm.jsydsyq.djyy"></el-input> 133 <el-input v-model="ruleForm.tdsyq.djyy"></el-input>
98 </el-form-item>
99 </el-col>
100 <!-- <el-col :span="8">
101 <el-form-item label="房地坐落：">
102 <el-input v-model="ruleForm.qlxx.zl"></el-input>
103 </el-form-item>
104 </el-col> -->
105 <el-col :span="8">
106 <el-form-item label="使用权面积：">
107 <el-input v-model="ruleForm.jsydsyq.syqmj"></el-input>
108 </el-form-item>
109 </el-col>
110 <el-col :span="8">
111 <el-form-item label="使用权起始时间">
112 <el-input v-model="ruleForm.jsydsyq.syqqssj"></el-input>
113 </el-form-item> 134 </el-form-item>
114 </el-col> 135 </el-col>
136 </el-row>
137 <el-row :gutter="10">
115 <el-col :span="8"> 138 <el-col :span="8">
116 <el-form-item label="使用权结束时间"> 139 <el-form-item label="农用地面积：">
117 <el-input v-model="ruleForm.jsydsyq.syqjssj"></el-input> 140 <el-input
141 v-model="ruleForm.tdsyq.nydmj"
142 :disabled="!ableOperation"
143 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
144 ></el-input>
118 </el-form-item> 145 </el-form-item>
119 </el-col> 146 </el-col>
120 <el-col :span="8"> 147 <el-col :span="8">
121 <el-form-item label="土地使用期限"> 148 <el-form-item label="耕地面积：">
122 <el-input v-model="ruleForm.jsydsyq.tdsyqx"></el-input> 149 <el-input
150 v-model="ruleForm.tdsyq.gdmj"
151 :disabled="!ableOperation"
152 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
153 ></el-input>
123 </el-form-item> 154 </el-form-item>
124 </el-col> 155 </el-col>
125 <el-col :span="8"> 156 <el-col :span="8">
126 <el-form-item label="土地用途"> 157 <el-form-item label="林地面积：">
127 <el-input v-model="ruleForm.jsydsyq.yt"></el-input> 158 <el-input
159 v-model="ruleForm.tdsyq.ldmj"
160 :disabled="!ableOperation"
161 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
162 ></el-input>
128 </el-form-item> 163 </el-form-item>
129 </el-col> 164 </el-col>
165 </el-row>
166 <el-row :gutter="10">
130 <el-col :span="8"> 167 <el-col :span="8">
131 <el-form-item label="取得价格："> 168 <el-form-item label="草地面积：">
132 <div style="display: flex">
133 <el-input 169 <el-input
134 v-model="ruleForm.jsydsyq.qdjg" 170 v-model="ruleForm.tdsyq.cdmj"
135 style="width: 500%" 171 :disabled="!ableOperation"
172 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
136 ></el-input> 173 ></el-input>
137 <el-select v-model="ruleForm.jsydsyq.jedw">
138 <el-option
139 v-for="item in dictData['A57']"
140 :key="item.dcode"
141 :label="item.dname"
142 :value="item.dcode"
143 >
144 </el-option>
145 </el-select>
146 </div>
147 </el-form-item> 174 </el-form-item>
148 </el-col> 175 </el-col>
149
150 <el-col :span="8"> 176 <el-col :span="8">
151 <el-form-item 177 <el-form-item label="其他农用地面积：">
152 label="不动产权证号：" 178 <el-input
153 prop="qlxx.bdcqzh" 179 v-model="ruleForm.tdsyq.qtnydmj"
154 :rules="rules.bdcqzhrules" 180 :disabled="!ableOperation"
155 > 181 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
156 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input> 182 ></el-input>
157 </el-form-item> 183 </el-form-item>
158 </el-col> 184 </el-col>
159 <el-col :span="8"> 185 <el-col :span="8">
160 <el-form-item 186 <el-form-item label="建筑使用面积：">
161 label="区县代码：" 187 <el-input
162 prop="qlxx.qxdm" 188 v-model="ruleForm.tdsyq.jsydmj"
163 :rules="rules.qxdmrules" 189 :disabled="!ableOperation"
164 > 190 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
165 <el-input v-model="ruleForm.qlxx.qxdm"></el-input> 191 ></el-input>
166 </el-form-item> 192 </el-form-item>
167 </el-col> 193 </el-col>
194 </el-row>
195 <el-row :gutter="10">
168 <el-col :span="8"> 196 <el-col :span="8">
169 <el-form-item 197 <el-form-item label="未利用地面积：">
170 label="登记机构：" 198 <el-input
171 prop="qlxx.djjg" 199 v-model="ruleForm.tdsyq.wlydmj"
172 :rules="rules.djjgrules" 200 :disabled="!ableOperation"
173 > 201 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
174 <el-input v-model="ruleForm.qlxx.djjg"></el-input> 202 ></el-input>
175 </el-form-item> 203 </el-form-item>
176 </el-col> 204 </el-col>
177 <el-col :span="8"> 205 <el-col :span="8">
178 <el-form-item 206 <el-form-item label="面积单位：">
179 label="登簿人：" 207 <el-input
180 prop="qlxx.dbr" 208 v-model="ruleForm.tdsyq.mjdw"
181 :rules="rules.dbrrules" 209 :disabled="!ableOperation"
182 > 210 ></el-input>
183 <el-input v-model="ruleForm.qlxx.dbr"></el-input>
184 </el-form-item> 211 </el-form-item>
185 </el-col> 212 </el-col>
186 <el-col :span="8"> 213 <el-col :span="8">
...@@ -203,7 +230,7 @@ ...@@ -203,7 +230,7 @@
203 <el-row> 230 <el-row>
204 <el-col :span="24"> 231 <el-col :span="24">
205 <el-form-item label="附记："> 232 <el-form-item label="附记：">
206 <el-input v-model="ruleForm.jsydsyq.fj"></el-input> 233 <el-input v-model="ruleForm.tdsyq.fj"></el-input>
207 </el-form-item> 234 </el-form-item>
208 </el-col> 235 </el-col>
209 </el-row> 236 </el-row>
...@@ -265,20 +292,6 @@ ...@@ -265,20 +292,6 @@
265 :viewtype="$route.query.viewtype" 292 :viewtype="$route.query.viewtype"
266 :gyfs="ruleForm.qlxx.gyfs" 293 :gyfs="ruleForm.qlxx.gyfs"
267 /> 294 />
268
269 <div v-if="ruleForm.ywrData && ruleForm.ywrData.length > 0">
270 <div class="slxx_title title-block">
271 义务人信息
272 <div class="triangle"></div>
273 </div>
274 <ywrCommonTable
275 v-if="ruleForm.ywrData"
276 :tableData="ruleForm.ywrData"
277 :key="key"
278 @upDateQlrxxList="upDateYwrxxList"
279 :viewtype="$route.query.viewtype"
280 />
281 </div>
282 </div> 295 </div>
283 <el-row class="btn" v-if="!$route.query.viewtype"> 296 <el-row class="btn" v-if="!$route.query.viewtype">
284 <el-form-item> 297 <el-form-item>
...@@ -382,7 +395,6 @@ export default { ...@@ -382,7 +395,6 @@ export default {
382 return store.getters.dictData[val]; 395 return store.getters.dictData[val];
383 }, 396 },
384 loadData() { 397 loadData() {
385
386 this.propsParam.isEdit = this.$parent.isEdit; 398 this.propsParam.isEdit = this.$parent.isEdit;
387 init(this.propsParam).then((res) => { 399 init(this.propsParam).then((res) => {
388 if (res.code == 200) { 400 if (res.code == 200) {
......
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
73 <script> 73 <script>
74 import WorkFlow from "./mixin/index"; 74 import WorkFlow from "./mixin/index";
75 import { getForm } from "./flowform"; 75 import { getForm } from "./flowform";
76 import { getStepFormInfo } from "@/api/fqsq.js"; 76 import { getBlYbxStepFormInfo } from "@/api/fqsq.js";
77 import NoticeBar from "@/components/NoticeBar/index"; 77 import NoticeBar from "@/components/NoticeBar/index";
78 import ProcessViewer from "./components/processViewer.vue"; 78 import ProcessViewer from "./components/processViewer.vue";
79 // 引入左侧菜单 79 // 引入左侧菜单
...@@ -140,7 +140,7 @@ export default { ...@@ -140,7 +140,7 @@ export default {
140 this.oneSelectProps.qllx = qllx; 140 this.oneSelectProps.qllx = qllx;
141 if (this.$refs.Menu.supplementarylist.length) { 141 if (this.$refs.Menu.supplementarylist.length) {
142 this.oneSelectProps.type = this.type 142 this.oneSelectProps.type = this.type
143 getStepFormInfo(this.oneSelectProps).then((res) => { 143 getBlYbxStepFormInfo(this.oneSelectProps).then((res) => {
144 this.$nextTick(function () { 144 this.$nextTick(function () {
145 this.tabList = res.result; 145 this.tabList = res.result;
146 this.tabName = this.tabList[0].value; 146 this.tabName = this.tabList[0].value;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 .workbench { 14 .workbench {
15 flex-wrap: wrap; 15 flex-wrap: wrap;
16 height: 100%; 16 height: 100%;
17 17 padding-left: 0;
18 li { 18 li {
19 width: 32.5%; 19 width: 32.5%;
20 height: 90px; 20 height: 90px;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 </div> 15 </div>
16 <el-row :gutter="10"> 16 <el-row :gutter="10">
17 <el-col :span="8"> 17 <el-col :span="8">
18 <el-form-item label="业务号111："> 18 <el-form-item label="业务号：">
19 <el-input disabled v-model="ruleForm.flow.ywh"></el-input> 19 <el-input disabled v-model="ruleForm.flow.ywh"></el-input>
20 </el-form-item> 20 </el-form-item>
21 </el-col> 21 </el-col>
......