cba0f5de by xiaomiao

--no commit message

1 parent 5817fcac
...@@ -79,7 +79,6 @@ export function getNode(qllx, qlxx, bdcdylx) { ...@@ -79,7 +79,6 @@ export function getNode(qllx, qlxx, bdcdylx) {
79 node = { id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label}; 79 node = { id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label};
80 } 80 }
81 } else { 81 } else {
82 console.log("jin1111");
83 node = { id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label}; 82 node = { id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label};
84 } 83 }
85 break; 84 break;
......
...@@ -482,9 +482,12 @@ ...@@ -482,9 +482,12 @@
482 <div class="triangle"></div> 482 <div class="triangle"></div>
483 </div> 483 </div>
484 <el-row :gutter="10"> 484 <el-row :gutter="10">
485 <el-col :span="12"> 485 <el-col :span="14">
486 <el-form-item label="共有方式:"> 486 <el-form-item label="共有方式:">
487 <el-radio-group v-model="ruleForm.qlxx.gyqk"> 487 <el-radio-group
488 :disabled="!ableOperation"
489 v-model="ruleForm.qlxx.gyfs"
490 >
488 <el-radio label="0">单独所有</el-radio> 491 <el-radio label="0">单独所有</el-radio>
489 <el-radio label="1">共同共有</el-radio> 492 <el-radio label="1">共同共有</el-radio>
490 <el-radio label="2">按份所有</el-radio> 493 <el-radio label="2">按份所有</el-radio>
......
...@@ -260,7 +260,10 @@ ...@@ -260,7 +260,10 @@
260 <el-row :gutter="10"> 260 <el-row :gutter="10">
261 <el-col :span="12"> 261 <el-col :span="12">
262 <el-form-item label="共有方式:"> 262 <el-form-item label="共有方式:">
263 <el-radio-group v-model="ruleForm.qlxx.gyqk"> 263 <el-radio-group
264 :disabled="!ableOperation"
265 v-model="ruleForm.qlxx.gyfs"
266 >
264 <el-radio label="0">单独所有</el-radio> 267 <el-radio label="0">单独所有</el-radio>
265 <el-radio label="1">共同共有</el-radio> 268 <el-radio label="1">共同共有</el-radio>
266 <el-radio label="2">按份所有</el-radio> 269 <el-radio label="2">按份所有</el-radio>
......
...@@ -340,7 +340,10 @@ ...@@ -340,7 +340,10 @@
340 <el-row :gutter="10"> 340 <el-row :gutter="10">
341 <el-col :span="12"> 341 <el-col :span="12">
342 <el-form-item label="共有方式:"> 342 <el-form-item label="共有方式:">
343 <el-radio-group v-model="ruleForm.qlxx.gyqk"> 343 <el-radio-group
344 :disabled="!ableOperation"
345 v-model="ruleForm.qlxx.gyfs"
346 >
344 <el-radio label="0">单独所有</el-radio> 347 <el-radio label="0">单独所有</el-radio>
345 <el-radio label="1">共同共有</el-radio> 348 <el-radio label="1">共同共有</el-radio>
346 <el-radio label="2">按份所有</el-radio> 349 <el-radio label="2">按份所有</el-radio>
...@@ -348,30 +351,6 @@ ...@@ -348,30 +351,6 @@
348 </el-radio-group> 351 </el-radio-group>
349 </el-form-item> 352 </el-form-item>
350 </el-col> 353 </el-col>
351 <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
352 <el-form-item label="是否分别持证:">
353 <el-radio-group v-model="ruleForm.qlxx.sqfbcz">
354 <el-radio :label="1"></el-radio>
355 <el-radio :label="0"></el-radio>
356 </el-radio-group>
357 </el-form-item>
358 </el-col> -->
359 <!-- <el-col
360 :span="6"
361 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'"
362 >
363 <el-form-item label="持证人:">
364 <el-select v-model="ruleForm.czr" placeholder="持证人">
365 <el-option
366 v-for="item in czrOptions"
367 :key="item.zjh"
368 :label="item.sqrmc"
369 :value="item.zjh"
370 >
371 </el-option>
372 </el-select>
373 </el-form-item>
374 </el-col> -->
375 </el-row> 354 </el-row>
376 <qlrCommonTable 355 <qlrCommonTable
377 :tableData="ruleForm.qlrData" 356 :tableData="ruleForm.qlrData"
......
...@@ -226,8 +226,8 @@ ...@@ -226,8 +226,8 @@
226 <el-col :span="12"> 226 <el-col :span="12">
227 <el-form-item label="共有方式:"> 227 <el-form-item label="共有方式:">
228 <el-radio-group 228 <el-radio-group
229 :disabled="$route.query.viewtype == 0" 229 :disabled="!ableOperation"
230 v-model="ruleForm.qlxx.gyqk" 230 v-model="ruleForm.qlxx.gyfs"
231 > 231 >
232 <el-radio label="0">单独所有</el-radio> 232 <el-radio label="0">单独所有</el-radio>
233 <el-radio label="1">共同共有</el-radio> 233 <el-radio label="1">共同共有</el-radio>
...@@ -236,30 +236,6 @@ ...@@ -236,30 +236,6 @@
236 </el-radio-group> 236 </el-radio-group>
237 </el-form-item> 237 </el-form-item>
238 </el-col> 238 </el-col>
239 <el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
240 <el-form-item label="是否分别持证:">
241 <el-radio-group v-model="ruleForm.qlxx.sqfbcz">
242 <el-radio :label="1"></el-radio>
243 <el-radio :label="0"></el-radio>
244 </el-radio-group>
245 </el-form-item>
246 </el-col>
247 <el-col
248 :span="6"
249 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'"
250 >
251 <el-form-item label="持证人:">
252 <el-select v-model="ruleForm.czr" placeholder="持证人">
253 <el-option
254 v-for="item in czrOptions"
255 :key="item.zjh"
256 :label="item.sqrmc"
257 :value="item.zjh"
258 >
259 </el-option>
260 </el-select>
261 </el-form-item>
262 </el-col>
263 </el-row> 239 </el-row>
264 <qlrCommonTable 240 <qlrCommonTable
265 :tableData="ruleForm.qlrData" 241 :tableData="ruleForm.qlrData"
......
...@@ -9,14 +9,13 @@ ...@@ -9,14 +9,13 @@
9 <el-form 9 <el-form
10 :model="ruleForm" 10 :model="ruleForm"
11 :rules="rules" 11 :rules="rules"
12 ref="ruleForm"
12 :class="{readonly: editDisabled }" 13 :class="{readonly: editDisabled }"
13 class="loadingtext" 14 class="loadingtext"
14 ref="ruleForm" 15 :show-message="false"
15 :label-position="flag ? 'top' : ''" 16 :label-position="flag ? 'top' : ''"
16 :inline="flag" 17 :inline="flag"
17 18 label-width="120px"
18 inline-message
19 label-width="145px"
20 > 19 >
21 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''"> 20 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
22 <div class="slxx_title title-block"> 21 <div class="slxx_title title-block">
...@@ -291,30 +290,6 @@ ...@@ -291,30 +290,6 @@
291 </el-radio-group> 290 </el-radio-group>
292 </el-form-item> 291 </el-form-item>
293 </el-col> 292 </el-col>
294 <el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
295 <el-form-item label="是否分别持证:">
296 <el-radio-group v-model="ruleForm.qlxx.sqfbcz">
297 <el-radio :label="1"></el-radio>
298 <el-radio :label="0"></el-radio>
299 </el-radio-group>
300 </el-form-item>
301 </el-col>
302 <el-col
303 :span="6"
304 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'"
305 >
306 <el-form-item label="持证人:">
307 <el-select v-model="ruleForm.czr" placeholder="持证人">
308 <el-option
309 v-for="item in czrOptions"
310 :key="item.zjh"
311 :label="item.sqrmc"
312 :value="item.zjh"
313 >
314 </el-option>
315 </el-select>
316 </el-form-item>
317 </el-col>
318 </el-row> 293 </el-row>
319 <qlrCommonTable 294 <qlrCommonTable
320 :tableData="ruleForm.qlrData" 295 :tableData="ruleForm.qlrData"
...@@ -568,6 +543,76 @@ export default { ...@@ -568,6 +543,76 @@ export default {
568 </script> 543 </script>
569 <style scoped lang="scss"> 544 <style scoped lang="scss">
570 @import "~@/styles/public.scss"; 545 @import "~@/styles/public.scss";
571 @import "~@/styles/slxx/slxx.scss"; 546 /deep/.el-form {
547 display: flex;
548 flex-direction: column;
549 height: calc(100vh - 130px);
550 }
551
552 /deep/.el-form-item__label {
553 padding: 0;
554 }
555
556 /deep/.el-radio {
557 margin-right: 10px;
558 }
559
560 /deep/.el-select {
561 width: 100%;
562 }
563
564 /deep/.el-form-item {
565 margin-bottom: 8px;
566 }
567
568 .marginBot0 {
569 margin-bottom: 0 !important;
570 }
571
572 .slxx {
573 box-sizing: border-box;
574 }
575
576 .slxx_con {
577 flex: 1;
578 height: 100%;
579 background-color: #ffffff;
580 overflow-y: auto;
581 padding-right: 3px;
582 overflow-x: hidden;
583 }
584
585 .submit_btn {
586 height: 50px;
587 }
588
589 .slxx_title {
590 border-bottom: 1px solid $borderColor;
591 padding-left: 10px;
592 padding-bottom: 5px;
593 margin-bottom: 10px;
594 margin-top: 5px;
595 font-size: 16px;
596 font-weight: 500;
597 color: #4a4a4a;
598 }
599
600 .btn {
601 text-align: center;
602 padding-top: 10px;
603 height: 36px;
604 background-color: #ffffff;
605 padding: 5px 0;
606 }
607
608 .textArea {
609 /deep/.el-textarea__inner {
610 min-height: 90px !important;
611 }
612 }
613
614 /deep/.el-form-item__label {
615 padding-bottom: 0px;
616 }
572 617
573 </style> 618 </style>
......
...@@ -300,7 +300,10 @@ ...@@ -300,7 +300,10 @@
300 <el-row :gutter="10"> 300 <el-row :gutter="10">
301 <el-col :span="12"> 301 <el-col :span="12">
302 <el-form-item label="共有方式:"> 302 <el-form-item label="共有方式:">
303 <el-radio-group v-model="ruleForm.qlxx.gyqk"> 303 <el-radio-group
304 :disabled="!ableOperation"
305 v-model="ruleForm.qlxx.gyfs"
306 >
304 <el-radio label="0">单独所有</el-radio> 307 <el-radio label="0">单独所有</el-radio>
305 <el-radio label="1">共同共有</el-radio> 308 <el-radio label="1">共同共有</el-radio>
306 <el-radio label="2">按份所有</el-radio> 309 <el-radio label="2">按份所有</el-radio>
......
...@@ -191,7 +191,10 @@ ...@@ -191,7 +191,10 @@
191 <el-row :gutter="10"> 191 <el-row :gutter="10">
192 <el-col :span="12"> 192 <el-col :span="12">
193 <el-form-item label="共有方式:"> 193 <el-form-item label="共有方式:">
194 <el-radio-group v-model="ruleForm.qlxx.gyqk"> 194 <el-radio-group
195 :disabled="!ableOperation"
196 v-model="ruleForm.qlxx.gyfs"
197 >
195 <el-radio label="0">单独所有</el-radio> 198 <el-radio label="0">单独所有</el-radio>
196 <el-radio label="1">共同共有</el-radio> 199 <el-radio label="1">共同共有</el-radio>
197 <el-radio label="2">按份所有</el-radio> 200 <el-radio label="2">按份所有</el-radio>
......
...@@ -98,8 +98,22 @@ export default { ...@@ -98,8 +98,22 @@ export default {
98 }) 98 })
99 break; 99 break;
100 case "B2": //材料分屏按钮 100 case "B2": //材料分屏按钮
101 this.splitScreen = this.splitScreen ? false : true;
102 this.$store.dispatch("app/settScreen", this.splitScreen);
103 if (this.splitScreen) {
101 104
102 this.closefp() 105 //如果当前选项卡为材料信息内容,递减到上一个选项卡内容
106 if (this.tabName == this.clxxTab.value) {
107 this.tabName = this.tabList[this.clxxIndex - 1].value;
108 this.getFromRouter(this.tabList[this.clxxIndex - 1].value);
109 }
110 //删除材料信息选项卡数据
111 this.tabList.splice(this.clxxIndex, 1);
112 } else {
113 //新增材料信息选项卡数据
114 this.tabList.splice(this.clxxIndex, 0, this.clxxTab);
115 }
116 // this.closefp()
103 117
104 // if (this.splitScreen) { 118 // if (this.splitScreen) {
105 // //如果当前选项卡为材料信息内容,递减到上一个选项卡内容 119 // //如果当前选项卡为材料信息内容,递减到上一个选项卡内容
......
...@@ -117,6 +117,11 @@ ...@@ -117,6 +117,11 @@
117 tabdata: [], 117 tabdata: [],
118 bsmRepair:"", 118 bsmRepair:"",
119 defaultNode: {}, 119 defaultNode: {},
120 clxxForm: "",
121 //材料信息选择卡索引
122 clxxIndex: "",
123 //材料信息选项卡对象
124 clxxTab: {},
120 ableOperation:false 125 ableOperation:false
121 }; 126 };
122 }, 127 },
...@@ -134,7 +139,25 @@ ...@@ -134,7 +139,25 @@
134 this.tabName = this.tabList[0].value; 139 this.tabName = this.tabList[0].value;
135 this.ableOperation=this.tabList[0].ableOperation 140 this.ableOperation=this.tabList[0].ableOperation
136 this.getFromRouter(this.tabName); 141 this.getFromRouter(this.tabName);
142
143 if(this.tabList.length!=8){
144 let that = this;
145 this.tabList.forEach(function (item, index) {
146 if (item.value == "clxx") {
147 that.clxxIndex = index;
148 that.clxxForm = getForm(item.value, that.$route.query.sqywbm);
149 that.clxxTab = item;
150 }
151 })
152 }
153
154
155
137 }); 156 });
157
158
159
160
138 }); 161 });
139 } 162 }
140 }, 163 },
...@@ -193,12 +216,13 @@ ...@@ -193,12 +216,13 @@
193 getFromRouter (tabname) { 216 getFromRouter (tabname) {
194 this.componentTag = getForm(tabname); 217 this.componentTag = getForm(tabname);
195 }, 218 },
196 closefp () { 219 // closefp () {
197 this.splitScreen = this.splitScreen ? false : true; 220 // this.splitScreen = this.splitScreen ? false : true;
198 this.$store.dispatch("app/set1tScreen", this.splitScreen); 221 // this.$store.dispatch("app/set1tScreen", this.splitScreen);
199 this.getFromRouter(this.tabList[0].value); 222 // this.getFromRouter(this.tabList[0].value);
200 this.clxxForm = getForm(this.tabList[1].value); 223 // this.clxxForm = getForm(this.tabList[1].value);
201 }, 224 // this.tabName = this.tabList[0].value
225 // },
202 // 增加补录记录 226 // 增加补录记录
203 addRepairRecord (row, del) { 227 addRepairRecord (row, del) {
204 let from = { 228 let from = {
...@@ -239,18 +263,18 @@ ...@@ -239,18 +263,18 @@
239 console.log("错", res); 263 console.log("错", res);
240 }) 264 })
241 }, 265 },
242 openDialog () { 266 // openDialog () {
243 this.$store.dispatch('user/refreshPage', false) 267 // this.$store.dispatch('user/refreshPage', false)
244 let data = JSON.parse(localStorage.getItem('ywbl')) 268 // let data = JSON.parse(localStorage.getItem('ywbl'))
245 let title 269 // let title
246 if (data?.sqywmc) { 270 // if (data?.sqywmc) {
247 title = "申请业务:" + data?.sqywmc 271 // title = "申请业务:" + data?.sqywmc
248 } else { 272 // } else {
249 title = "申请业务:" + data?.djywmc 273 // title = "申请业务:" + data?.djywmc
250 } 274 // }
251 275
252 this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'djywbm': this.$route.query.sqywbm, 'isJump': true, 'sqywInfo': data }, "80%", true) 276 // this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'djywbm': this.$route.query.sqywbm, 'isJump': true, 'sqywInfo': data }, "80%", true)
253 } 277 // }
254 } 278 }
255 }; 279 };
256 </script> 280 </script>
......