Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web
Showing
13 changed files
with
40 additions
and
24 deletions
... | @@ -38,7 +38,21 @@ let mixin = { | ... | @@ -38,7 +38,21 @@ let mixin = { |
38 | }, | 38 | }, |
39 | // 详情 | 39 | // 详情 |
40 | handleEdit (row) { | 40 | handleEdit (row) { |
41 | this.title = row.rectypeName | 41 | let Title = '' |
42 | this.dicData['A21'].map(item => { | ||
43 | if (item.DCODE == row.DJLX || item.DCODE == row.djlx) { | ||
44 | Title = item.DNAME | ||
45 | return | ||
46 | } | ||
47 | }) | ||
48 | |||
49 | this.dicData['A8'].map(item => { | ||
50 | if (item.DCODE == row.QLLX || item.DCODE == row.qllx) { | ||
51 | Title += '-' + item.DNAME | ||
52 | return | ||
53 | } | ||
54 | }) | ||
55 | this.title = Title | ||
42 | this.$refs.editLog.isShow(row); | 56 | this.$refs.editLog.isShow(row); |
43 | }, | 57 | }, |
44 | // // 重置表单 | 58 | // // 重置表单 | ... | ... |
... | @@ -7,11 +7,18 @@ | ... | @@ -7,11 +7,18 @@ |
7 | display: flex; | 7 | display: flex; |
8 | position: relative; | 8 | position: relative; |
9 | top: -2px; | 9 | top: -2px; |
10 | |||
11 | b { | 10 | b { |
12 | @include flex-center; | 11 | font-weight: 200; |
13 | flex: 1; | 12 | display: inline-block; |
14 | width: 100%; | 13 | position: relative; |
14 | font-size: 24px; | ||
15 | top: -11px; | ||
16 | width: 38%; | ||
17 | height: 40px; | ||
18 | margin-left: 28px; | ||
19 | // @include flex-center; | ||
20 | display: flex; | ||
21 | justify-content: center; | ||
15 | } | 22 | } |
16 | } | 23 | } |
17 | 24 | ||
... | @@ -28,7 +35,7 @@ | ... | @@ -28,7 +35,7 @@ |
28 | } | 35 | } |
29 | 36 | ||
30 | .dialog_footer { | 37 | .dialog_footer { |
31 | margin-top: 8px; | 38 | margin-bottom: 8px; |
32 | @include flex-center; | 39 | @include flex-center; |
33 | } | 40 | } |
34 | 41 | ||
... | @@ -72,6 +79,9 @@ | ... | @@ -72,6 +79,9 @@ |
72 | background-size: 100% 100%; | 79 | background-size: 100% 100%; |
73 | right: 40px; | 80 | right: 40px; |
74 | top: 33px; | 81 | top: 33px; |
82 | &:hover{ | ||
83 | box-shadow: inset 0px 0px 12px 0px #02D9FD; | ||
84 | } | ||
75 | } | 85 | } |
76 | 86 | ||
77 | .el-dialog__close { | 87 | .el-dialog__close { | ... | ... |
... | @@ -66,7 +66,7 @@ | ... | @@ -66,7 +66,7 @@ |
66 | // refine element ui upload | 66 | // refine element ui upload |
67 | .el-input.is-disabled .el-input__inner { | 67 | .el-input.is-disabled .el-input__inner { |
68 | color: #FFFFFF !important; | 68 | color: #FFFFFF !important; |
69 | // background-color: transparent !important; | 69 | background-color: transparent !important; |
70 | border: 1px solid #224C7C !important; | 70 | border: 1px solid #224C7C !important; |
71 | } | 71 | } |
72 | 72 | ... | ... |
... | @@ -77,7 +77,7 @@ | ... | @@ -77,7 +77,7 @@ |
77 | </lb-table> | 77 | </lb-table> |
78 | </div> | 78 | </div> |
79 | <!-- 编辑 --> | 79 | <!-- 编辑 --> |
80 | <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlCfdj'" /> | 80 | <dataDetails ref="editLog" title="查封登记" :tabsActiveName="'qlfQlCfdj'" /> |
81 | </div> | 81 | </div> |
82 | </template> | 82 | </template> |
83 | <script> | 83 | <script> | ... | ... |
... | @@ -72,7 +72,7 @@ | ... | @@ -72,7 +72,7 @@ |
72 | </lb-table> | 72 | </lb-table> |
73 | </div> | 73 | </div> |
74 | <!-- 编辑 --> | 74 | <!-- 编辑 --> |
75 | <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlDyaq'" /> | 75 | <dataDetails ref="editLog" title="抵押权登记" :tabsActiveName="'qlfQlDyaq'" /> |
76 | </div> | 76 | </div> |
77 | </template> | 77 | </template> |
78 | 78 | ... | ... |
... | @@ -73,7 +73,7 @@ | ... | @@ -73,7 +73,7 @@ |
73 | </lb-table> | 73 | </lb-table> |
74 | </div> | 74 | </div> |
75 | <!-- 编辑 --> | 75 | <!-- 编辑 --> |
76 | <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlDyiq'" /> | 76 | <dataDetails ref="editLog" title="地役权登记" :tabsActiveName="'qlfQlDyiq'" /> |
77 | </div> | 77 | </div> |
78 | </template> | 78 | </template> |
79 | 79 | ... | ... |
... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
13 | </el-col> | 13 | </el-col> |
14 | <el-col :span="6"> | 14 | <el-col :span="6"> |
15 | <el-form-item label="权属状态"> | 15 | <el-form-item label="权属状态"> |
16 | <el-select class="width100" v-model="form.QSZT" placeholder="权属状态"> | 16 | <el-select class="width100" v-model="form.QSZT" placeholder="权属状态"> |
17 | <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> | 17 | <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> |
18 | </el-option> | 18 | </el-option> |
19 | </el-select> | 19 | </el-select> |
... | @@ -33,8 +33,7 @@ | ... | @@ -33,8 +33,7 @@ |
33 | <el-row class="mt-10"> | 33 | <el-row class="mt-10"> |
34 | <el-col :span="6"> | 34 | <el-col :span="6"> |
35 | <el-form-item label="登记类型"> | 35 | <el-form-item label="登记类型"> |
36 | <el-select v-model="form.DJLX" clearable class="width100" ref="selectlandDJ" | 36 | <el-select v-model="form.DJLX" clearable class="width100" ref="selectlandDJ" placeholder="请选择登记类型"> |
37 | @visible-change="isShowSelectOptions" placeholder="登记类型"> | ||
38 | <el-option v-for="item in dicData['A21']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> | 37 | <el-option v-for="item in dicData['A21']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> |
39 | </el-option> | 38 | </el-option> |
40 | </el-select> | 39 | </el-select> |
... | @@ -123,11 +122,6 @@ export default { | ... | @@ -123,11 +122,6 @@ export default { |
123 | } | 122 | } |
124 | }, | 123 | }, |
125 | methods: { | 124 | methods: { |
126 | // 是否显示下拉框 | ||
127 | isShowSelectOptions (e) { | ||
128 | if (!e) this.$refs.selectlandQL.blur() | ||
129 | if (!e) this.$refs.selectlandDJ.blur() | ||
130 | }, | ||
131 | async featchData () { | 125 | async featchData () { |
132 | try { | 126 | try { |
133 | this.form = Object.assign(this.form, this.formData) | 127 | this.form = Object.assign(this.form, this.formData) | ... | ... |
... | @@ -67,7 +67,7 @@ | ... | @@ -67,7 +67,7 @@ |
67 | </lb-table> | 67 | </lb-table> |
68 | </div> | 68 | </div> |
69 | <!-- 编辑 --> | 69 | <!-- 编辑 --> |
70 | <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlYgdj'" /> | 70 | <dataDetails ref="editLog" title="预告登记" :tabsActiveName="'qlfQlYgdj'" /> |
71 | </div> | 71 | </div> |
72 | </template> | 72 | </template> |
73 | 73 | ... | ... |
... | @@ -57,7 +57,7 @@ | ... | @@ -57,7 +57,7 @@ |
57 | </lb-table> | 57 | </lb-table> |
58 | </div> | 58 | </div> |
59 | <!-- 编辑 --> | 59 | <!-- 编辑 --> |
60 | <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlYydj'" /> | 60 | <dataDetails ref="editLog" title="异议登记" :tabsActiveName="'qlfQlYydj'" /> |
61 | </div> | 61 | </div> |
62 | </template> | 62 | </template> |
63 | 63 | ... | ... |
... | @@ -61,7 +61,7 @@ | ... | @@ -61,7 +61,7 @@ |
61 | </lb-table> | 61 | </lb-table> |
62 | </div> | 62 | </div> |
63 | <!-- 编辑 --> | 63 | <!-- 编辑 --> |
64 | <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlZxdj'" /> | 64 | <dataDetails ref="editLog" title="注销登记" :tabsActiveName="'qlfQlZxdj'" /> |
65 | </div> | 65 | </div> |
66 | </template> | 66 | </template> |
67 | 67 | ... | ... |
This diff is collapsed.
Click to expand it.
... | @@ -86,7 +86,6 @@ export default { | ... | @@ -86,7 +86,6 @@ export default { |
86 | methods: { | 86 | methods: { |
87 | // 初始化数据 | 87 | // 初始化数据 |
88 | queryClick () { | 88 | queryClick () { |
89 | // this.$startLoading(); | ||
90 | getQlxxDictList({ ...this.ruleForm, ...this.pageData }).then(res => { | 89 | getQlxxDictList({ ...this.ruleForm, ...this.pageData }).then(res => { |
91 | // this.$endLoading(); | 90 | // this.$endLoading(); |
92 | let { records, total } = res.result | 91 | let { records, total } = res.result |
... | @@ -100,7 +99,6 @@ export default { | ... | @@ -100,7 +99,6 @@ export default { |
100 | cancelButtonText: '取消', | 99 | cancelButtonText: '取消', |
101 | type: 'warning' | 100 | type: 'warning' |
102 | }).then(() => { | 101 | }).then(() => { |
103 | this.$startLoading() | ||
104 | refreshDictCache().then(res => { | 102 | refreshDictCache().then(res => { |
105 | if (res.code == 200) { | 103 | if (res.code == 200) { |
106 | let refech = this.$store.dispatch('dict/generateDic') | 104 | let refech = this.$store.dispatch('dict/generateDic') | ... | ... |
-
Please register or sign in to post a comment