c583cad6 by renchao@pashanhoo.com

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

2 parents 29c9e685 41e669de
...@@ -407,6 +407,7 @@ ...@@ -407,6 +407,7 @@
407 <el-date-picker 407 <el-date-picker
408 v-model="ruleForm.qlxx.djsj" 408 v-model="ruleForm.qlxx.djsj"
409 type="date" 409 type="date"
410 class="width100"
410 placeholder="选择日期" 411 placeholder="选择日期"
411 value-format="yyyy-MM-dd HH:mm:ss" 412 value-format="yyyy-MM-dd HH:mm:ss"
412 format="yyyy-MM-dd" 413 format="yyyy-MM-dd"
......
...@@ -115,12 +115,40 @@ ...@@ -115,12 +115,40 @@
115 </el-col> 115 </el-col>
116 <el-col :span="8"> 116 <el-col :span="8">
117 <el-form-item label="独用土地面积:"> 117 <el-form-item label="独用土地面积:">
118 <el-input v-model="ruleForm.fdcq2.dytdmj"></el-input> 118 <div class="flex">
119 <el-input v-model="ruleForm.fdcq2.dytdmj"
120 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
121 <el-select
122 v-model="ruleForm.fdcq2.mjdw"
123 :disabled="!ableOperation"
124 style="width: 20%">
125 <el-option
126 v-for="item in dictData['A7']"
127 :key="item.dcode"
128 :label="item.dname"
129 :value="item.dcode">
130 </el-option>
131 </el-select>
132 </div>
119 </el-form-item> 133 </el-form-item>
120 </el-col> 134 </el-col>
121 <el-col :span="8"> 135 <el-col :span="8">
122 <el-form-item label="分摊土地面积:"> 136 <el-form-item label="分摊土地面积:">
123 <el-input v-model="ruleForm.fdcq2.fttdmj"></el-input> 137 <div class="flex">
138 <el-input v-model="ruleForm.fdcq2.fttdmj"
139 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
140 <el-select
141 v-model="ruleForm.fdcq2.mjdw"
142 :disabled="!ableOperation"
143 style="width: 20%">
144 <el-option
145 v-for="item in dictData['A7']"
146 :key="item.dcode"
147 :label="item.dname"
148 :value="item.dcode">
149 </el-option>
150 </el-select>
151 </div>
124 </el-form-item> 152 </el-form-item>
125 </el-col> 153 </el-col>
126 <el-col :span="8"> 154 <el-col :span="8">
...@@ -137,10 +165,12 @@ ...@@ -137,10 +165,12 @@
137 </el-col> 165 </el-col>
138 <el-col :span="8"> 166 <el-col :span="8">
139 <el-form-item label="房地产交易价格:"> 167 <el-form-item label="房地产交易价格:">
140 <div style="display: flex"> 168 <div class="flex">
141 <el-input 169 <el-input
142 v-model="ruleForm.fdcq2.qjjg" 170 v-model="ruleForm.fdcq2.qjjg"
143 style="width: 500%"></el-input> 171 style="width: 500%"
172 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
173 ></el-input>
144 <el-select v-model="ruleForm.fdcq2.jedw"> 174 <el-select v-model="ruleForm.fdcq2.jedw">
145 <el-option 175 <el-option
146 v-for="item in dictData['A57']" 176 v-for="item in dictData['A57']"
...@@ -225,17 +255,59 @@ ...@@ -225,17 +255,59 @@
225 </el-col> 255 </el-col>
226 <el-col :span="8"> 256 <el-col :span="8">
227 <el-form-item label="建筑面积:"> 257 <el-form-item label="建筑面积:">
228 <el-input v-model="ruleForm.fdcq2.jzmj"></el-input> 258 <div class="flex">
259 <el-input v-model="ruleForm.fdcq2.jzmj"
260 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
261 <el-select
262 v-model="ruleForm.fdcq2.mjdw"
263 :disabled="!ableOperation"
264 style="width: 20%">
265 <el-option
266 v-for="item in dictData['A7']"
267 :key="item.dcode"
268 :label="item.dname"
269 :value="item.dcode">
270 </el-option>
271 </el-select>
272 </div>
229 </el-form-item> 273 </el-form-item>
230 </el-col> 274 </el-col>
231 <el-col :span="8"> 275 <el-col :span="8">
232 <el-form-item label="专有建筑面积:"> 276 <el-form-item label="专有建筑面积:">
233 <el-input v-model="ruleForm.fdcq2.zyjzmj"></el-input> 277 <div class="flex">
278 <el-input v-model="ruleForm.fdcq2.zyjzmj"
279 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
280 <el-select
281 v-model="ruleForm.fdcq2.mjdw"
282 :disabled="!ableOperation"
283 style="width: 20%">
284 <el-option
285 v-for="item in dictData['A7']"
286 :key="item.dcode"
287 :label="item.dname"
288 :value="item.dcode">
289 </el-option>
290 </el-select>
291 </div>
234 </el-form-item> 292 </el-form-item>
235 </el-col> 293 </el-col>
236 <el-col :span="8"> 294 <el-col :span="8">
237 <el-form-item label="分摊建筑面积:"> 295 <el-form-item label="分摊建筑面积:">
238 <el-input v-model="ruleForm.fdcq2.ftjzmj"></el-input> 296 <div class="flex">
297 <el-input v-model="ruleForm.fdcq2.ftjzmj"
298 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
299 <el-select
300 v-model="ruleForm.fdcq2.mjdw"
301 :disabled="!ableOperation"
302 style="width: 20%">
303 <el-option
304 v-for="item in dictData['A7']"
305 :key="item.dcode"
306 :label="item.dname"
307 :value="item.dcode">
308 </el-option>
309 </el-select>
310 </div>
239 </el-form-item> 311 </el-form-item>
240 </el-col> 312 </el-col>
241 <el-col :span="8"> 313 <el-col :span="8">
...@@ -647,4 +719,10 @@ ...@@ -647,4 +719,10 @@
647 <style scoped lang="scss"> 719 <style scoped lang="scss">
648 @import "~@/styles/public.scss"; 720 @import "~@/styles/public.scss";
649 @import "~@/styles/slxx/slxx.scss"; 721 @import "~@/styles/slxx/slxx.scss";
722 .el-date-editor.el-input {
723 width: 100%;
724 }
725 .el-table__row {
726 height: 30px !important;
727 }
650 </style> 728 </style>
......
...@@ -45,6 +45,32 @@ ...@@ -45,6 +45,32 @@
45 <div class="triangle"></div> 45 <div class="triangle"></div>
46 </div> 46 </div>
47 <el-row :gutter="10"> 47 <el-row :gutter="10">
48 <el-col :span="8" v-if="ssqlxxshow">
49 <el-form-item label="上手权利信息:">
50 <select-table
51 v-model="ruleForm.ssQlxx"
52 :table-width="550"
53 :tableData="ssQlxxList"
54 :props="props"
55 @change="ssQlxxchange"
56 >
57 <el-table-column
58 prop="qllxmc"
59 width="130"
60 label="权利类型"
61 ></el-table-column>
62 <el-table-column
63 prop="bdcqzh"
64 width="160"
65 label="不动产权证书"
66 ></el-table-column>
67 <el-table-column prop="qlrmc" label="权利人"></el-table-column>
68 <el-table-column prop="mjmc" label="面积"></el-table-column>
69 <el-table-column prop="ytmc" label="用途"></el-table-column>
70 <el-table-column prop="zl" label="坐落"></el-table-column>
71 </select-table>
72 </el-form-item>
73 </el-col>
48 <el-col :span="8"> 74 <el-col :span="8">
49 <el-form-item label="不动产单元号:"> 75 <el-form-item label="不动产单元号:">
50 <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input> 76 <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 :model="ruleForm" 10 :model="ruleForm"
11 :rules="rules" 11 :rules="rules"
12 ref="ruleForm" 12 ref="ruleForm"
13 :class="{readonly: editDisabled }" 13 :class="{ readonly: editDisabled }"
14 class="loadingtext" 14 class="loadingtext"
15 :show-message="false" 15 :show-message="false"
16 :label-position="flag ? 'top' : ''" 16 :label-position="flag ? 'top' : ''"
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
43 土地所有权信息 43 土地所有权信息
44 <div class="triangle"></div> 44 <div class="triangle"></div>
45 </div> 45 </div>
46 <el-row :gutter="10" class="ssqlxx"> 46 <el-row :gutter="10">
47 <el-col :span="24" v-if="ssqlxxshow"> 47 <el-col :span="8" v-if="ssqlxxshow">
48 <el-form-item label="上手权利信息:"> 48 <el-form-item label="上手权利信息:">
49 <select-table 49 <select-table
50 v-model="ruleForm.ssQlxx" 50 v-model="ruleForm.ssQlxx"
...@@ -70,8 +70,6 @@ ...@@ -70,8 +70,6 @@
70 </select-table> 70 </select-table>
71 </el-form-item> 71 </el-form-item>
72 </el-col> 72 </el-col>
73 </el-row>
74 <el-row :gutter="10">
75 <el-col :span="8"> 73 <el-col :span="8">
76 <el-form-item label="不动产单元号:"> 74 <el-form-item label="不动产单元号:">
77 <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input> 75 <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
...@@ -95,7 +93,11 @@ ...@@ -95,7 +93,11 @@
95 </el-form-item> 93 </el-form-item>
96 </el-col> 94 </el-col>
97 <el-col :span="8"> 95 <el-col :span="8">
98 <el-form-item label="登记类型:" prop="qlxx.djlx" :rules="rules.djlxrules"> 96 <el-form-item
97 label="登记类型:"
98 prop="qlxx.djlx"
99 :rules="rules.djlxrules"
100 >
99 <el-select v-model="ruleForm.qlxx.djlx" @change="djlxchange"> 101 <el-select v-model="ruleForm.qlxx.djlx" @change="djlxchange">
100 <el-option 102 <el-option
101 v-for="item in djlxlist" 103 v-for="item in djlxlist"
...@@ -166,77 +168,174 @@ ...@@ -166,77 +168,174 @@
166 <el-row :gutter="10"> 168 <el-row :gutter="10">
167 <el-col :span="8"> 169 <el-col :span="8">
168 <el-form-item label="农用地面积:"> 170 <el-form-item label="农用地面积:">
171 <div class="flex">
169 <el-input 172 <el-input
170 v-model="ruleForm.tdsyq.nydmj" 173 v-model="ruleForm.tdsyq.nydmj"
171 :disabled="!ableOperation" 174 :disabled="!ableOperation"
172 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" 175 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
173 ></el-input> 176 ></el-input>
177 <el-select
178 v-model="ruleForm.tdsyq.mjdw"
179 :disabled="!ableOperation"
180 style="width: 20%"
181 >
182 <el-option
183 v-for="item in dictData['A7']"
184 :key="item.dcode"
185 :label="item.dname"
186 :value="item.dcode"
187 >
188 </el-option>
189 </el-select>
190 </div>
174 </el-form-item> 191 </el-form-item>
175 </el-col> 192 </el-col>
176 <el-col :span="8"> 193 <el-col :span="8">
177 <el-form-item label="耕地面积:"> 194 <el-form-item label="耕地面积:">
195 <div class="flex">
178 <el-input 196 <el-input
179 v-model="ruleForm.tdsyq.gdmj" 197 v-model="ruleForm.tdsyq.gdmj"
180 :disabled="!ableOperation" 198 :disabled="!ableOperation"
181 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" 199 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
182 ></el-input> 200 ></el-input>
201 <el-select
202 v-model="ruleForm.tdsyq.mjdw"
203 :disabled="!ableOperation"
204 style="width: 20%"
205 >
206 <el-option
207 v-for="item in dictData['A7']"
208 :key="item.dcode"
209 :label="item.dname"
210 :value="item.dcode"
211 >
212 </el-option>
213 </el-select>
214 </div>
183 </el-form-item> 215 </el-form-item>
184 </el-col> 216 </el-col>
185 <el-col :span="8"> 217 <el-col :span="8">
186 <el-form-item label="林地面积:"> 218 <el-form-item label="林地面积:">
219 <div class="flex">
187 <el-input 220 <el-input
188 v-model="ruleForm.tdsyq.ldmj" 221 v-model="ruleForm.tdsyq.ldmj"
189 :disabled="!ableOperation" 222 :disabled="!ableOperation"
190 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" 223 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
191 ></el-input> 224 ></el-input>
225 <el-select
226 v-model="ruleForm.tdsyq.mjdw"
227 :disabled="!ableOperation"
228 style="width: 20%"
229 >
230 <el-option
231 v-for="item in dictData['A7']"
232 :key="item.dcode"
233 :label="item.dname"
234 :value="item.dcode"
235 >
236 </el-option>
237 </el-select>
238 </div>
192 </el-form-item> 239 </el-form-item>
193 </el-col> 240 </el-col>
194 </el-row> 241 </el-row>
195 <el-row :gutter="10"> 242 <el-row :gutter="10">
196 <el-col :span="8"> 243 <el-col :span="8">
197 <el-form-item label="草地面积:"> 244 <el-form-item label="草地面积:">
245 <div class="flex">
198 <el-input 246 <el-input
199 v-model="ruleForm.tdsyq.cdmj" 247 v-model="ruleForm.tdsyq.cdmj"
200 :disabled="!ableOperation" 248 :disabled="!ableOperation"
201 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null" 249 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
202 ></el-input> 250 ></el-input>
251 <el-select
252 v-model="ruleForm.tdsyq.mjdw"
253 :disabled="!ableOperation"
254 style="width: 20%"
255 >
256 <el-option
257 v-for="item in dictData['A7']"
258 :key="item.dcode"
259 :label="item.dname"
260 :value="item.dcode"
261 >
262 </el-option>
263 </el-select>
264 </div>
203 </el-form-item> 265 </el-form-item>
204 </el-col> 266 </el-col>
205 <el-col :span="8"> 267 <el-col :span="8">
206 <el-form-item label="其他农用地面积:"> 268 <el-form-item label="其他农用地面积:">
269 <div class="flex">
207 <el-input 270 <el-input
208 v-model="ruleForm.tdsyq.qtnydmj" 271 v-model="ruleForm.tdsyq.qtnydmj"
209 :disabled="!ableOperation" 272 :disabled="!ableOperation"
210 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" 273 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
211 ></el-input> 274 ></el-input>
275 <el-select
276 v-model="ruleForm.tdsyq.mjdw"
277 :disabled="!ableOperation"
278 style="width: 20%"
279 >
280 <el-option
281 v-for="item in dictData['A7']"
282 :key="item.dcode"
283 :label="item.dname"
284 :value="item.dcode"
285 >
286 </el-option>
287 </el-select>
288 </div>
212 </el-form-item> 289 </el-form-item>
213 </el-col> 290 </el-col>
214 <el-col :span="8"> 291 <el-col :span="8">
215 <el-form-item label="建筑使用面积:"> 292 <el-form-item label="建筑使用面积:">
293 <div class="flex">
216 <el-input 294 <el-input
217 v-model="ruleForm.tdsyq.jsydmj" 295 v-model="ruleForm.tdsyq.jsydmj"
218 :disabled="!ableOperation" 296 :disabled="!ableOperation"
219 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" 297 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
220 ></el-input> 298 ></el-input>
299 <el-select
300 v-model="ruleForm.tdsyq.mjdw"
301 :disabled="!ableOperation"
302 style="width: 20%"
303 >
304 <el-option
305 v-for="item in dictData['A7']"
306 :key="item.dcode"
307 :label="item.dname"
308 :value="item.dcode"
309 >
310 </el-option>
311 </el-select>
312 </div>
221 </el-form-item> 313 </el-form-item>
222 </el-col> 314 </el-col>
223 </el-row> 315 </el-row>
224 <el-row :gutter="10"> 316 <el-row :gutter="10">
225 <el-col :span="8"> 317 <el-col :span="8">
226 <el-form-item label="未利用地面积:"> 318 <el-form-item label="未利用地面积:">
319 <div class="flex">
227 <el-input 320 <el-input
228 v-model="ruleForm.tdsyq.wlydmj" 321 v-model="ruleForm.tdsyq.wlydmj"
229 :disabled="!ableOperation" 322 :disabled="!ableOperation"
230 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" 323 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
231 ></el-input> 324 ></el-input>
232 </el-form-item> 325 <el-select
233 </el-col>
234 <el-col :span="8">
235 <el-form-item label="面积单位:">
236 <el-input
237 v-model="ruleForm.tdsyq.mjdw" 326 v-model="ruleForm.tdsyq.mjdw"
238 :disabled="!ableOperation" 327 :disabled="!ableOperation"
239 ></el-input> 328 style="width: 20%"
329 >
330 <el-option
331 v-for="item in dictData['A7']"
332 :key="item.dcode"
333 :label="item.dname"
334 :value="item.dcode"
335 >
336 </el-option>
337 </el-select>
338 </div>
240 </el-form-item> 339 </el-form-item>
241 </el-col> 340 </el-col>
242 <el-col :span="8"> 341 <el-col :span="8">
...@@ -248,6 +347,7 @@ ...@@ -248,6 +347,7 @@
248 <el-date-picker 347 <el-date-picker
249 v-model="ruleForm.qlxx.djsj" 348 v-model="ruleForm.qlxx.djsj"
250 type="date" 349 type="date"
350 class="width100"
251 placeholder="选择日期" 351 placeholder="选择日期"
252 value-format="yyyy-MM-dd HH:mm:ss" 352 value-format="yyyy-MM-dd HH:mm:ss"
253 format="yyyy-MM-dd" 353 format="yyyy-MM-dd"
...@@ -310,12 +410,12 @@ ...@@ -310,12 +410,12 @@
310 <script> 410 <script>
311 import store from "@/store/index.js"; 411 import store from "@/store/index.js";
312 import { mapGetters } from "vuex"; 412 import { mapGetters } from "vuex";
313 import { init,getSsQlxx, save } from "@/api/djbRepair.js"; 413 import { init, getSsQlxx, save } from "@/api/djbRepair.js";
314 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable"; 414 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
315 import selectTable from "@/components/selectTable/index.vue"; 415 import selectTable from "@/components/selectTable/index.vue";
316 import tdytTable from "@/views/workflow/components/tdytTable"; 416 import tdytTable from "@/views/workflow/components/tdytTable";
317 export default { 417 export default {
318 components: { qlrCommonTable, tdytTable ,selectTable}, 418 components: { qlrCommonTable, tdytTable, selectTable },
319 computed: { 419 computed: {
320 ...mapGetters(["dictData", "flag"]), 420 ...mapGetters(["dictData", "flag"]),
321 // 根据流程判断表单是否为只读 421 // 根据流程判断表单是否为只读
...@@ -329,7 +429,7 @@ export default { ...@@ -329,7 +429,7 @@ export default {
329 }, 429 },
330 data() { 430 data() {
331 return { 431 return {
332 ssqlxxshow:true, 432 ssqlxxshow: true,
333 props: { 433 props: {
334 label: "bdcqzh", 434 label: "bdcqzh",
335 value: "bdcdyid", 435 value: "bdcdyid",
...@@ -392,7 +492,7 @@ export default { ...@@ -392,7 +492,7 @@ export default {
392 czrOptions: [], 492 czrOptions: [],
393 ssQlxxList: [], 493 ssQlxxList: [],
394 ruleForm: {}, 494 ruleForm: {},
395 ableOperation:false, 495 ableOperation: false,
396 //传递参数\ 496 //传递参数\
397 rules: { 497 rules: {
398 bdcqzhrules: [ 498 bdcqzhrules: [
...@@ -406,12 +506,10 @@ export default { ...@@ -406,12 +506,10 @@ export default {
406 }, 506 },
407 }; 507 };
408 }, 508 },
409 created() { 509 created() {},
410
411 },
412 mounted() { 510 mounted() {
413 this.loadData(); 511 this.loadData();
414 this.ableOperation=this.$parent.ableOperation 512 this.ableOperation = this.$parent.ableOperation;
415 }, 513 },
416 methods: { 514 methods: {
417 /** 515 /**
...@@ -429,7 +527,7 @@ export default { ...@@ -429,7 +527,7 @@ export default {
429 * @author: renchao 527 * @author: renchao
430 */ 528 */
431 djlxchange(val) { 529 djlxchange(val) {
432 console.log("val",val); 530 console.log("val", val);
433 if (val == null || val == 100) { 531 if (val == null || val == 100) {
434 this.ssqlxxshow = false; 532 this.ssqlxxshow = false;
435 } else { 533 } else {
...@@ -646,5 +744,4 @@ export default { ...@@ -646,5 +744,4 @@ export default {
646 /deep/.el-form-item__label { 744 /deep/.el-form-item__label {
647 padding-bottom: 0px; 745 padding-bottom: 0px;
648 } 746 }
649
650 </style> 747 </style>
......
...@@ -328,7 +328,24 @@ ...@@ -328,7 +328,24 @@
328 </el-col> 328 </el-col>
329 <el-col :span="8"> 329 <el-col :span="8">
330 <el-form-item label="建筑面积:"> 330 <el-form-item label="建筑面积:">
331 <el-input v-model="ruleForm.ygdj.jzmj"></el-input> 331 <div class="flex">
332 <el-input v-model="ruleForm.ygdj.jzmj"
333 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
334 ></el-input>
335 <el-select
336 v-model="ruleForm.ygdj.mjdw"
337 :disabled="!ableOperation"
338 style="width: 20%"
339 >
340 <el-option
341 v-for="item in dictData['A7']"
342 :key="item.dcode"
343 :label="item.dname"
344 :value="item.dcode"
345 >
346 </el-option>
347 </el-select>
348 </div>
332 </el-form-item> 349 </el-form-item>
333 </el-col> 350 </el-col>
334 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'"> 351 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
...@@ -356,7 +373,21 @@ ...@@ -356,7 +373,21 @@
356 </el-col> 373 </el-col>
357 <el-col :span="8"> 374 <el-col :span="8">
358 <el-form-item label="取得价格/被担保主债权数额:"> 375 <el-form-item label="取得价格/被担保主债权数额:">
359 <el-input v-model="ruleForm.ygdj.qdjg"></el-input> 376 <div class="flex">
377 <el-input v-model="ruleForm.ygdj.qdjg"
378 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
379 <el-select
380 v-model="ruleForm.ygdj.jedw"
381 :disabled="!ableOperation"
382 style="width: 20%">
383 <el-option
384 v-for="item in dictData['A7']"
385 :key="item.dcode"
386 :label="item.dname"
387 :value="item.dcode">
388 </el-option>
389 </el-select>
390 </div>
360 </el-form-item> 391 </el-form-item>
361 </el-col> 392 </el-col>
362 <el-col :span="8"> 393 <el-col :span="8">
......
...@@ -241,7 +241,24 @@ ...@@ -241,7 +241,24 @@
241 </el-col> 241 </el-col>
242 <el-col :span="8"> 242 <el-col :span="8">
243 <el-form-item label="建筑面积:"> 243 <el-form-item label="建筑面积:">
244 <el-input v-model="ruleForm.ygdj.jzmj"></el-input> 244 <div class="flex">
245 <el-input v-model="ruleForm.ygdj.jzmj"
246 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
247 ></el-input>
248 <el-select
249 v-model="ruleForm.ygdj.mjdw"
250 :disabled="!ableOperation"
251 style="width: 20%"
252 >
253 <el-option
254 v-for="item in dictData['A7']"
255 :key="item.dcode"
256 :label="item.dname"
257 :value="item.dcode"
258 >
259 </el-option>
260 </el-select>
261 </div>
245 </el-form-item> 262 </el-form-item>
246 </el-col> 263 </el-col>
247 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'"> 264 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
...@@ -269,7 +286,21 @@ ...@@ -269,7 +286,21 @@
269 </el-col> 286 </el-col>
270 <el-col :span="8"> 287 <el-col :span="8">
271 <el-form-item label="取得价格/被担保主债权数额:"> 288 <el-form-item label="取得价格/被担保主债权数额:">
272 <el-input v-model="ruleForm.ygdj.qdjg"></el-input> 289 <div class="flex">
290 <el-input v-model="ruleForm.ygdj.qdjg"
291 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
292 <el-select
293 v-model="ruleForm.ygdj.jedw"
294 :disabled="!ableOperation"
295 style="width: 20%">
296 <el-option
297 v-for="item in dictData['A7']"
298 :key="item.dcode"
299 :label="item.dname"
300 :value="item.dcode">
301 </el-option>
302 </el-select>
303 </div>
273 </el-form-item> 304 </el-form-item>
274 </el-col> 305 </el-col>
275 <el-col :span="8"> 306 <el-col :span="8">
......
...@@ -282,11 +282,6 @@ ...@@ -282,11 +282,6 @@
282 <el-input v-model="ruleForm.yydj.bdcdjzmh"></el-input> 282 <el-input v-model="ruleForm.yydj.bdcdjzmh"></el-input>
283 </el-form-item> 283 </el-form-item>
284 </el-col> 284 </el-col>
285 <el-col :span="8">
286 <el-form-item label="登记时间:">
287 <el-input v-model="ruleForm.yydj.djsj"></el-input>
288 </el-form-item>
289 </el-col>
290 <el-col :span="24"> 285 <el-col :span="24">
291 <el-form-item label="附记:"> 286 <el-form-item label="附记:">
292 <el-input v-model="ruleForm.yydj.fj"></el-input> 287 <el-input v-model="ruleForm.yydj.fj"></el-input>
......
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
12 <li 12 <li
13 @click="operation(item)" 13 @click="operation(item)"
14 v-for="(item, index) in leftButtonList" 14 v-for="(item, index) in leftButtonList"
15 :key="index"> 15 :key="index"
16 >
16 <svg-icon class="icon" :icon-class="item.icon" /> 17 <svg-icon class="icon" :icon-class="item.icon" />
17 <span class="iconName">{{ item.name }}</span> 18 <span class="iconName">{{ item.name }}</span>
18 </li> 19 </li>
...@@ -21,7 +22,8 @@ ...@@ -21,7 +22,8 @@
21 <li 22 <li
22 @click="operation(item)" 23 @click="operation(item)"
23 v-for="(item, index) in rightButtonList" 24 v-for="(item, index) in rightButtonList"
24 :key="index"> 25 :key="index"
26 >
25 <svg-icon class="icon" :icon-class="item.icon" /> 27 <svg-icon class="icon" :icon-class="item.icon" />
26 <span class="iconName">{{ item.name }}</span> 28 <span class="iconName">{{ item.name }}</span>
27 </li> 29 </li>
...@@ -43,18 +45,25 @@ ...@@ -43,18 +45,25 @@
43 </div> 45 </div>
44 <!-- 表单内容区域 --> 46 <!-- 表单内容区域 -->
45 <div class="rightContainer"> 47 <div class="rightContainer">
48 <div class="count">
49 当前流程所在环节:
50 <span>{{ this.zbhj }}</span>
51 </div>
46 <el-tabs v-model="tabName" :before-leave="beforeLeave"> 52 <el-tabs v-model="tabName" :before-leave="beforeLeave">
47 <el-tab-pane 53 <el-tab-pane
48 :label="item.name" 54 :label="item.name"
49 :name="item.value" 55 :name="item.value"
50 v-for="item in tabList" 56 v-for="item in tabList"
51 :key="item.value"> 57 :key="item.value"
58 >
52 </el-tab-pane> 59 </el-tab-pane>
53 </el-tabs> 60 </el-tabs>
61
54 <component 62 <component
55 :key="fresh" 63 :key="fresh"
56 :is="componentTag" 64 :is="componentTag"
57 v-bind="currentSelectProps" /> 65 v-bind="currentSelectProps"
66 />
58 </div> 67 </div>
59 </div> 68 </div>
60 </div> 69 </div>
...@@ -63,26 +72,26 @@ ...@@ -63,26 +72,26 @@
63 </div> 72 </div>
64 </template> 73 </template>
65 <style scoped lang="scss"> 74 <style scoped lang="scss">
66 @import "~@/styles/mixin.scss"; 75 @import "~@/styles/mixin.scss";
67 @import "./workFrame.scss"; 76 @import "./workFrame.scss";
68 </style> 77 </style>
69 <script> 78 <script>
70 import WorkFlow from "./mixin/index"; 79 import WorkFlow from "./mixin/index";
71 import { getForm } from "./flowform"; 80 import { getForm } from "./flowform";
72 import { getStepFormInfo } from "@/api/workFlow.js"; 81 import { getStepFormInfo } from "@/api/workFlow.js";
73 import NoticeBar from "@/components/NoticeBar/index"; 82 import NoticeBar from "@/components/NoticeBar/index";
74 // import ProcessViewer from "./components/processViewer.vue"; 83 // import ProcessViewer from "./components/processViewer.vue";
75 84
76 import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue"; 85 import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
77 import qllxDailog from "./djbBook/components/qllxDailog"; 86 import qllxDailog from "./djbBook/components/qllxDailog";
78 import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue"; 87 import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
79 import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js"; 88 import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
80 // 登记簿数据信息 89 // 登记簿数据信息
81 import { addRepairRecord } from "@/api/djbRepair.js"; 90 import { addRepairRecord } from "@/api/djbRepair.js";
82 // 获取权利类型数组 91 // 获取权利类型数组
83 92
84 import { getBdcqljqtsx } from "@/api/djbDetail.js"; 93 import { getBdcqljqtsx } from "@/api/djbDetail.js";
85 export default { 94 export default {
86 components: { 95 components: {
87 selectBdc, 96 selectBdc,
88 NoticeBar, 97 NoticeBar,
...@@ -90,11 +99,13 @@ ...@@ -90,11 +99,13 @@
90 qllxDailog, 99 qllxDailog,
91 }, 100 },
92 mixins: [WorkFlow], 101 mixins: [WorkFlow],
93 data () { 102 data() {
94 return { 103 return {
95 bsmSlsq: this.$route.query.bsmSlsq, 104 bsmSlsq: this.$route.query.bsmSlsq,
96 //当前流程所在环节 105 //当前流程所在环节
97 bestepid: this.$route.query.bestepid, 106 bestepid: this.$route.query.bestepid,
107 //当前流程所在环节
108 zbhj: this.$route.query.zbhj,
98 //设置那个表单选中 109 //设置那个表单选中
99 tabName: "", 110 tabName: "",
100 isEdit: true, 111 isEdit: true,
...@@ -114,17 +125,17 @@ ...@@ -114,17 +125,17 @@
114 _beforeUnload_time: "", 125 _beforeUnload_time: "",
115 treedata: {}, 126 treedata: {},
116 tabdata: [], 127 tabdata: [],
117 bsmRepair:"", 128 bsmRepair: "",
118 defaultNode: {}, 129 defaultNode: {},
119 clxxForm: "", 130 clxxForm: "",
120 //材料信息选择卡索引 131 //材料信息选择卡索引
121 clxxIndex: "", 132 clxxIndex: "",
122 //材料信息选项卡对象 133 //材料信息选项卡对象
123 clxxTab: {}, 134 clxxTab: {},
124 ableOperation:false 135 ableOperation: false,
125 }; 136 };
126 }, 137 },
127 mounted () { 138 mounted() {
128 // this.getleftMenubl() 139 // this.getleftMenubl()
129 }, 140 },
130 141
...@@ -134,17 +145,17 @@ ...@@ -134,17 +145,17 @@
134 * @param {*} qllx 145 * @param {*} qllx
135 * @author: renchao 146 * @author: renchao
136 */ 147 */
137 stepForm (qllx) { 148 stepForm(qllx) {
138 this.oneSelectProps.qllx = qllx; 149 this.oneSelectProps.qllx = qllx;
139 if (this.$refs.Menu.supplementarylist.length) { 150 if (this.$refs.Menu.supplementarylist.length) {
140 getStepFormInfo(this.oneSelectProps).then((res) => { 151 getStepFormInfo(this.oneSelectProps).then((res) => {
141 this.$nextTick(function () { 152 this.$nextTick(function () {
142 this.tabList = res.result; 153 this.tabList = res.result;
143 this.tabName = this.tabList[0].value; 154 this.tabName = this.tabList[0].value;
144 this.ableOperation=this.tabList[0].ableOperation 155 this.ableOperation = this.tabList[0].ableOperation;
145 this.getFromRouter(this.tabName); 156 this.getFromRouter(this.tabName);
146 157
147 if(this.tabList.length!=8){ 158 if (this.tabList.length != 8) {
148 let that = this; 159 let that = this;
149 this.tabList.forEach(function (item, index) { 160 this.tabList.forEach(function (item, index) {
150 if (item.value == "clxx") { 161 if (item.value == "clxx") {
...@@ -152,7 +163,7 @@ ...@@ -152,7 +163,7 @@
152 that.clxxForm = getForm(item.value, that.$route.query.sqywbm); 163 that.clxxForm = getForm(item.value, that.$route.query.sqywbm);
153 that.clxxTab = item; 164 that.clxxTab = item;
154 } 165 }
155 }) 166 });
156 } 167 }
157 }); 168 });
158 }); 169 });
...@@ -164,8 +175,8 @@ ...@@ -164,8 +175,8 @@
164 * @param {*} val 175 * @param {*} val
165 * @author: renchao 176 * @author: renchao
166 */ 177 */
167 getCurrentSelectProps (val) { 178 getCurrentSelectProps(val) {
168 this.bsmRepair= val.bsmRepair 179 this.bsmRepair = val.bsmRepair;
169 if (val.bdcdyid) { 180 if (val.bdcdyid) {
170 this.oneSelectProps = val; 181 this.oneSelectProps = val;
171 } 182 }
...@@ -185,7 +196,7 @@ ...@@ -185,7 +196,7 @@
185 * @description: 获取渲染登记簿列表 196 * @description: 获取渲染登记簿列表
186 * @author: renchao 197 * @author: renchao
187 */ 198 */
188 getdjblist () { 199 getdjblist() {
189 getBdcqljqtsx({ 200 getBdcqljqtsx({
190 bdcdyid: this.currentSelectProps.bdcdyid, 201 bdcdyid: this.currentSelectProps.bdcdyid,
191 bdcdyh: this.currentSelectProps.bdcdyh, 202 bdcdyh: this.currentSelectProps.bdcdyh,
...@@ -219,7 +230,7 @@ ...@@ -219,7 +230,7 @@
219 * @param {*} activeName 230 * @param {*} activeName
220 * @author: renchao 231 * @author: renchao
221 */ 232 */
222 beforeLeave (activeName) { 233 beforeLeave(activeName) {
223 if (activeName && activeName != 0) this.getFromRouter(activeName); 234 if (activeName && activeName != 0) this.getFromRouter(activeName);
224 }, 235 },
225 //切换选项卡内容组件 236 //切换选项卡内容组件
...@@ -228,7 +239,7 @@ ...@@ -228,7 +239,7 @@
228 * @param {*} tabname 239 * @param {*} tabname
229 * @author: renchao 240 * @author: renchao
230 */ 241 */
231 getFromRouter (tabname) { 242 getFromRouter(tabname) {
232 this.componentTag = getForm(tabname); 243 this.componentTag = getForm(tabname);
233 }, 244 },
234 // closefp () { 245 // closefp () {
...@@ -245,7 +256,7 @@ ...@@ -245,7 +256,7 @@
245 * @param {*} del 256 * @param {*} del
246 * @author: renchao 257 * @author: renchao
247 */ 258 */
248 addRepairRecord (row, del) { 259 addRepairRecord(row, del) {
249 let from = { 260 let from = {
250 bsmQlxx: "", 261 bsmQlxx: "",
251 bsmSlsq: this.bsmSlsq, 262 bsmSlsq: this.bsmSlsq,
...@@ -282,7 +293,7 @@ ...@@ -282,7 +293,7 @@
282 }) 293 })
283 .catch((res) => { 294 .catch((res) => {
284 console.log("错", res); 295 console.log("错", res);
285 }) 296 });
286 }, 297 },
287 // openDialog () { 298 // openDialog () {
288 // this.$store.dispatch('user/refreshPage', false) 299 // this.$store.dispatch('user/refreshPage', false)
...@@ -296,7 +307,22 @@ ...@@ -296,7 +307,22 @@
296 307
297 // this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'djywbm': this.$route.query.sqywbm, 'isJump': true, 'sqywInfo': data }, "80%", true) 308 // this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'djywbm': this.$route.query.sqywbm, 'isJump': true, 'sqywInfo': data }, "80%", true)
298 // } 309 // }
299 } 310 },
300 }; 311 };
301 </script> 312 </script>
302 <style scoped lang="scss"></style> 313 <style scoped lang="scss">
314 .rightContainer {
315 position: relative;
316 }
317 .count {
318 font-size: 14px;
319 position: absolute;
320 right: 25px;
321 top: 12px;
322 height: 30px;
323 span {
324 font-weight: 600;
325 color: #3498db;
326 }
327 }
328 </style>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 :normalizer="normalizer" 40 :normalizer="normalizer"
41 :appendToBody="true" 41 :appendToBody="true"
42 z-index="9999" 42 z-index="9999"
43 @input="addrow(scope.$index)" 43 @input="addrow(scope.row)"
44 /> 44 />
45 </template> 45 </template>
46 </el-table-column> 46 </el-table-column>
...@@ -192,10 +192,10 @@ export default { ...@@ -192,10 +192,10 @@ export default {
192 // this.tableDataList = this.tableDataList.map((item) => { 192 // this.tableDataList = this.tableDataList.map((item) => {
193 // return { 193 // return {
194 // ...item, 194 // ...item,
195 // yt: this.tdyt, 195 // yt: a.yt,
196 // }; 196 // };
197 // }); 197 // });
198 // this.$emit("upDateTdytxxList", this.tableDataList); 198 this.$emit("upDateTdytxxList", this.tableDataList);
199 }, 199 },
200 /** 200 /**
201 * @description: startTime 201 * @description: startTime
......
...@@ -35,6 +35,10 @@ ...@@ -35,6 +35,10 @@
35 </div> 35 </div>
36 <!-- 表单内容区域 --> 36 <!-- 表单内容区域 -->
37 <div class="rightContainer"> 37 <div class="rightContainer">
38 <div class="count">
39 当前流程所在环节:
40 <span>{{ this.zbhj }}</span>
41 </div>
38 <el-tabs v-model="tabName" :before-leave="beforeLeave"> 42 <el-tabs v-model="tabName" :before-leave="beforeLeave">
39 <el-tab-pane :label="item.name" :name="item.value" v-for="item in tabList" :key="item.value"> 43 <el-tab-pane :label="item.name" :name="item.value" v-for="item in tabList" :key="item.value">
40 </el-tab-pane> 44 </el-tab-pane>
...@@ -84,6 +88,8 @@ ...@@ -84,6 +88,8 @@
84 bsmSlsq: this.$route.query.bsmSlsq, 88 bsmSlsq: this.$route.query.bsmSlsq,
85 //当前流程所在环节 89 //当前流程所在环节
86 bestepid: this.$route.query.bestepid, 90 bestepid: this.$route.query.bestepid,
91 //当前流程所在环节
92 zbhj: this.$route.query.zbhj,
87 //设置那个表单选中 93 //设置那个表单选中
88 tabName: "", 94 tabName: "",
89 //设置那个表单选择 95 //设置那个表单选择
...@@ -201,4 +207,19 @@ ...@@ -201,4 +207,19 @@
201 } 207 }
202 } 208 }
203 </script> 209 </script>
204 210 <style scoped lang="scss">
211 .rightContainer {
212 position: relative;
213 }
214 .count {
215 font-size: 14px;
216 position: absolute;
217 right: 25px;
218 top: 12px;
219 height: 30px;
220 span {
221 font-weight: 600;
222 color: #3498db;
223 }
224 }
225 </style>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 <el-row :gutter="10"> 32 <el-row :gutter="10">
33 <el-col :span="8"> 33 <el-col :span="8">
34 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型:" prop="slsq.qllx"> 34 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型:" prop="slsq.qllx">
35 <el-select disabled v-model="ruleForm.sldy.qllx" filterable clearable placeholder="请选择权利类型"> 35 <el-select disabled v-model="ruleForm.sldyList[0].qllx" filterable clearable placeholder="请选择权利类型">
36 <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 36 <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
37 </el-option> 37 </el-option>
38 </el-select> 38 </el-select>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 </el-col> 40 </el-col>
41 <el-col :span="8"> 41 <el-col :span="8">
42 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记类型:" prop="slsq.djlx"> 42 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记类型:" prop="slsq.djlx">
43 <el-select disabled v-model="ruleForm.sldy.djlx" filterable clearable placeholder="请选择登记类型"> 43 <el-select disabled v-model="ruleForm.sldyList[0].djlx" filterable clearable placeholder="请选择登记类型">
44 <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 44 <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
45 </el-option> 45 </el-option>
46 </el-select> 46 </el-select>
......
...@@ -72,7 +72,21 @@ ...@@ -72,7 +72,21 @@
72 <el-row :gutter="10"> 72 <el-row :gutter="10">
73 <el-col :span="8"> 73 <el-col :span="8">
74 <el-form-item label="宗地面积:"> 74 <el-form-item label="宗地面积:">
75 <el-input v-model="ruleForm.zdjbxx.zdmj"></el-input> 75 <div class="flex">
76 <el-input v-model="ruleForm.zdjbxx.zdmj"
77 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
78 <el-select
79 v-model="ruleForm.fdcq2.mjdw"
80 :disabled="!ableOperation"
81 style="width: 20%">
82 <el-option
83 v-for="item in dictData['A7']"
84 :key="item.dcode"
85 :label="item.dname"
86 :value="item.dcode">
87 </el-option>
88 </el-select>
89 </div>
76 </el-form-item> 90 </el-form-item>
77 </el-col> 91 </el-col>
78 <!-- <el-col :span="8"> 92 <!-- <el-col :span="8">
...@@ -88,7 +102,7 @@ ...@@ -88,7 +102,7 @@
88 <el-col :span="8"> 102 <el-col :span="8">
89 <el-form-item label="取得价格:"> 103 <el-form-item label="取得价格:">
90 <div style="display:flex"> 104 <div style="display:flex">
91 <el-input v-model="ruleForm.jsydsyq.qdjg" style="width:500%" oninput="value=value.replace(/[^\d.]/g,'')"></el-input> 105 <el-input v-model="ruleForm.jsydsyq.qdjg" style="width:500%" oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
92 <el-select v-model="ruleForm.jsydsyq.jedw"> 106 <el-select v-model="ruleForm.jsydsyq.jedw">
93 <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 107 <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
94 </el-option> 108 </el-option>
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
102 <el-input 102 <el-input
103 v-model="ruleForm.jsydsyq.qdjg" 103 v-model="ruleForm.jsydsyq.qdjg"
104 style="width: 500%" 104 style="width: 500%"
105 oninput="value=value.replace(/[^\d.]/g,'')" 105 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
106 disabled 106 disabled
107 ></el-input> 107 ></el-input>
108 <el-select v-model="ruleForm.jsydsyq.jedw" disabled> 108 <el-select v-model="ruleForm.jsydsyq.jedw" disabled>
......
...@@ -242,7 +242,8 @@ ...@@ -242,7 +242,8 @@
242 if (!this.isJump) { 242 if (!this.isJump) {
243 startBusinessFlow({ 243 startBusinessFlow({
244 bsmSqyw: this.bsmSqyw, 244 bsmSqyw: this.bsmSqyw,
245 sjlx: 'zrz', 245 //sjlx: 'zrz',
246 sjlx: this.activeName,
246 bdcdysz: this.bdcdysz, 247 bdcdysz: this.bdcdysz,
247 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "", 248 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
248 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "", 249 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
......
...@@ -28,7 +28,7 @@ export default { ...@@ -28,7 +28,7 @@ export default {
28 "/workFrame?bsmSlsq=" + 28 "/workFrame?bsmSlsq=" +
29 data.bsmSlsq + 29 data.bsmSlsq +
30 "&bestepid=" + 30 "&bestepid=" +
31 data.bestepid + '&bsmBusiness=' + '&sqywbm=' + type 31 data.bestepid + '&bsmBusiness=' + '&sqywbm=' + type+"&zbhj=受理"
32 ); 32 );
33 window.open(href, "_blank"); 33 window.open(href, "_blank");
34 this.$popupCacel() 34 this.$popupCacel()
......
...@@ -122,7 +122,7 @@ class data extends filter { ...@@ -122,7 +122,7 @@ class data extends filter {
122 minWidth: '130' 122 minWidth: '130'
123 }, 123 },
124 { 124 {
125 label: '操作111', 125 label: '操作',
126 width: '160', 126 width: '160',
127 align: 'center', 127 align: 'center',
128 fixed: 'right', 128 fixed: 'right',
......
...@@ -103,7 +103,7 @@ class data extends filter { ...@@ -103,7 +103,7 @@ class data extends filter {
103 minWidth: '130' 103 minWidth: '130'
104 }, 104 },
105 { 105 {
106 label: '操作111', 106 label: '操作',
107 width: '160', 107 width: '160',
108 align: 'center', 108 align: 'center',
109 fixed: 'right', 109 fixed: 'right',
......