Merge branch 'master' into dev
Showing
19 changed files
with
122 additions
and
104 deletions
| ... | @@ -118,11 +118,11 @@ | ... | @@ -118,11 +118,11 @@ |
| 118 | </div> | 118 | </div> |
| 119 | </div> | 119 | </div> |
| 120 | </div> | 120 | </div> |
| 121 | <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'sjmx'"> | 121 | <div class="d-center" v-show="!$store.state.business.Edit && titleName == 'sjmx'"> |
| 122 | <btn nativeType="cz" @click="dialogVisible = false">取 消</btn> | 122 | <btn nativeType="cz" @click="dialogVisible = false">取 消</btn> |
| 123 | <btn nativeType="cx" @click="submitForm">保 存</btn> | 123 | <btn nativeType="cx" @click="submitForm">保 存</btn> |
| 124 | </div> | 124 | </div> |
| 125 | <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'xml'"> | 125 | <div class="d-center" v-show="!$store.state.business.Edit && titleName == 'xml'"> |
| 126 | <btn nativeType="cx" @click="handleResubmit">重新上报</btn> | 126 | <btn nativeType="cx" @click="handleResubmit">重新上报</btn> |
| 127 | </div> | 127 | </div> |
| 128 | </el-dialog> | 128 | </el-dialog> | ... | ... |
| ... | @@ -10,10 +10,9 @@ | ... | @@ -10,10 +10,9 @@ |
| 10 | </router-link> | 10 | </router-link> |
| 11 | </scroll-pane> | 11 | </scroll-pane> |
| 12 | <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu"> | 12 | <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu"> |
| 13 | <li @click="refreshSelectedTag(selectedTag)">Refresh</li> | 13 | <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭</li> |
| 14 | <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">Close</li> | 14 | <li @click="closeOthersTags">关闭其他</li> |
| 15 | <li @click="closeOthersTags">Close Others</li> | 15 | <li @click="closeAllTags(selectedTag)">关闭全部</li> |
| 16 | <li @click="closeAllTags(selectedTag)">Close All</li> | ||
| 17 | </ul> | 16 | </ul> |
| 18 | </div> | 17 | </div> |
| 19 | </template> | 18 | </template> |
| ... | @@ -165,7 +164,7 @@ export default { | ... | @@ -165,7 +164,7 @@ export default { |
| 165 | }, | 164 | }, |
| 166 | openMenu (tag, e) { | 165 | openMenu (tag, e) { |
| 167 | const menuMinWidth = 105 | 166 | const menuMinWidth = 105 |
| 168 | const offsetLeft = this.$el.getBoundingClientRect().left // container margin left | 167 | const offsetLeft = this.$el.getBoundingClientRect().left - 210 // container margin left |
| 169 | const offsetWidth = this.$el.offsetWidth // container width | 168 | const offsetWidth = this.$el.offsetWidth // container width |
| 170 | const maxLeft = offsetWidth - menuMinWidth // left boundary | 169 | const maxLeft = offsetWidth - menuMinWidth // left boundary |
| 171 | const left = e.clientX - offsetLeft + 15 // 15: margin right | 170 | const left = e.clientX - offsetLeft + 15 // 15: margin right | ... | ... |
| ... | @@ -258,7 +258,7 @@ | ... | @@ -258,7 +258,7 @@ |
| 258 | // 登簿日志弹出框 | 258 | // 登簿日志弹出框 |
| 259 | .commonDialog { | 259 | .commonDialog { |
| 260 | .el-textarea.is-disabled .el-textarea__inner { | 260 | .el-textarea.is-disabled .el-textarea__inner { |
| 261 | @include borderColor("border"); | 261 | background-color: none !important; |
| 262 | color: #4a4a4a; | 262 | color: #4a4a4a; |
| 263 | } | 263 | } |
| 264 | 264 | ||
| ... | @@ -302,6 +302,12 @@ | ... | @@ -302,6 +302,12 @@ |
| 302 | .JsonEditor { | 302 | .JsonEditor { |
| 303 | height: 73vh; | 303 | height: 73vh; |
| 304 | 304 | ||
| 305 | .el-textarea.is-disabled .el-textarea__inner { | ||
| 306 | @include borderColor("border"); | ||
| 307 | background-color: none !important; | ||
| 308 | color: #4a4a4a; | ||
| 309 | } | ||
| 310 | |||
| 305 | .editXML { | 311 | .editXML { |
| 306 | height: 100%; | 312 | height: 100%; |
| 307 | 313 | ||
| ... | @@ -320,7 +326,7 @@ | ... | @@ -320,7 +326,7 @@ |
| 320 | 326 | ||
| 321 | // 响应结果 | 327 | // 响应结果 |
| 322 | .xyjg { | 328 | .xyjg { |
| 323 | height: 78vh; | 329 | height: 80vh; |
| 324 | 330 | ||
| 325 | .result-con { | 331 | .result-con { |
| 326 | height: 49%; | 332 | height: 49%; |
| ... | @@ -547,7 +553,7 @@ | ... | @@ -547,7 +553,7 @@ |
| 547 | padding: 15px; | 553 | padding: 15px; |
| 548 | height: 100%; | 554 | height: 100%; |
| 549 | 555 | ||
| 550 | /deep/.el-textarea__inner { | 556 | .el-textarea__inner { |
| 551 | height: 50%; | 557 | height: 50%; |
| 552 | color: #ffffff; | 558 | color: #ffffff; |
| 553 | border: none !important; | 559 | border: none !important; |
| ... | @@ -834,7 +840,7 @@ | ... | @@ -834,7 +840,7 @@ |
| 834 | 840 | ||
| 835 | .el-textarea__inner { | 841 | .el-textarea__inner { |
| 836 | margin: 5px; | 842 | margin: 5px; |
| 837 | background: none; | 843 | background: transparent; |
| 838 | color: #FFFFFF; | 844 | color: #FFFFFF; |
| 839 | border-radius: 2px; | 845 | border-radius: 2px; |
| 840 | } | 846 | } |
| ... | @@ -844,7 +850,6 @@ | ... | @@ -844,7 +850,6 @@ |
| 844 | } | 850 | } |
| 845 | 851 | ||
| 846 | .el-input-number__increase { | 852 | .el-input-number__increase { |
| 847 | // background: #05275B; | ||
| 848 | color: #FFFFFF; | 853 | color: #FFFFFF; |
| 849 | border: none; | 854 | border: none; |
| 850 | right: 7px; | 855 | right: 7px; |
| ... | @@ -852,7 +857,6 @@ | ... | @@ -852,7 +857,6 @@ |
| 852 | } | 857 | } |
| 853 | 858 | ||
| 854 | .el-input-number__decrease { | 859 | .el-input-number__decrease { |
| 855 | // background: #05275B; | ||
| 856 | color: #FFFFFF; | 860 | color: #FFFFFF; |
| 857 | border: none; | 861 | border: none; |
| 858 | right: 7px; | 862 | right: 7px; | ... | ... |
| ... | @@ -2,8 +2,8 @@ | ... | @@ -2,8 +2,8 @@ |
| 2 | <div class="Cfdj from-clues"> | 2 | <div class="Cfdj from-clues"> |
| 3 | <div class="from-clues-header"> | 3 | <div class="from-clues-header"> |
| 4 | <el-form ref="form" :model="form" label-width="80px"> | 4 | <el-form ref="form" :model="form" label-width="80px"> |
| 5 | <!-- 判断进入监管还是上报系统 --> | 5 | <!-- 判断进入监管还是上报系统 --> |
| 6 | <el-form-item v-if="BASE_API.THEME=='jg'"> | 6 | <el-form-item v-if="BASE_API.THEME == 'jg'"> |
| 7 | <Breadcrumb /> | 7 | <Breadcrumb /> |
| 8 | </el-form-item> | 8 | </el-form-item> |
| 9 | <el-row> | 9 | <el-row> |
| ... | @@ -113,6 +113,7 @@ export default { | ... | @@ -113,6 +113,7 @@ export default { |
| 113 | { | 113 | { |
| 114 | label: "操作", | 114 | label: "操作", |
| 115 | width: 80, | 115 | width: 80, |
| 116 | fixed: "right", | ||
| 116 | render: (h, scope) => { | 117 | render: (h, scope) => { |
| 117 | return ( | 118 | return ( |
| 118 | <div> | 119 | <div> | ... | ... |
| ... | @@ -2,9 +2,8 @@ | ... | @@ -2,9 +2,8 @@ |
| 2 | <div class="dyaq from-clues"> | 2 | <div class="dyaq from-clues"> |
| 3 | <div class="from-clues-header"> | 3 | <div class="from-clues-header"> |
| 4 | <el-form ref="form" :model="form" label-width="120px"> | 4 | <el-form ref="form" :model="form" label-width="120px"> |
| 5 | <!-- 判断进入监管还是上报系统 --> | 5 | <!-- 判断进入监管还是上报系统 --> |
| 6 | <el-form-item v-if="BASE_API.THEME=='jg'"> | 6 | <el-form-item v-if="BASE_API.THEME == 'jg'"> |
| 7 | |||
| 8 | <Breadcrumb /> | 7 | <Breadcrumb /> |
| 9 | </el-form-item> | 8 | </el-form-item> |
| 10 | <el-row class="mb-5"> | 9 | <el-row class="mb-5"> |
| ... | @@ -121,6 +120,7 @@ export default { | ... | @@ -121,6 +120,7 @@ export default { |
| 121 | { | 120 | { |
| 122 | label: "操作", | 121 | label: "操作", |
| 123 | width: 80, | 122 | width: 80, |
| 123 | fixed: "right", | ||
| 124 | render: (h, scope) => { | 124 | render: (h, scope) => { |
| 125 | return ( | 125 | return ( |
| 126 | <div> | 126 | <div> | ... | ... |
| ... | @@ -3,7 +3,7 @@ | ... | @@ -3,7 +3,7 @@ |
| 3 | <div class="from-clues-header"> | 3 | <div class="from-clues-header"> |
| 4 | <el-form ref="form" :model="form" label-width="150px"> | 4 | <el-form ref="form" :model="form" label-width="150px"> |
| 5 | <!-- 判断进入监管还是上报系统 --> | 5 | <!-- 判断进入监管还是上报系统 --> |
| 6 | <el-form-item v-if="BASE_API.THEME=='jg'"> | 6 | <el-form-item v-if="BASE_API.THEME == 'jg'"> |
| 7 | <Breadcrumb /> | 7 | <Breadcrumb /> |
| 8 | </el-form-item> | 8 | </el-form-item> |
| 9 | <el-row> | 9 | <el-row> |
| ... | @@ -88,82 +88,83 @@ | ... | @@ -88,82 +88,83 @@ |
| 88 | </template> | 88 | </template> |
| 89 | 89 | ||
| 90 | <script> | 90 | <script> |
| 91 | // 地役权登记 | 91 | // 地役权登记 |
| 92 | import data from "./data" | 92 | import data from "./data" |
| 93 | import qlfQlDyiq from '@/api/qlfQlDyiq' | 93 | import qlfQlDyiq from '@/api/qlfQlDyiq' |
| 94 | import tableMixin from '@/mixins/tableMixin.js' | 94 | import tableMixin from '@/mixins/tableMixin.js' |
| 95 | import treeSelect from '@/components/TreeSelect.vue' | 95 | import treeSelect from '@/components/TreeSelect.vue' |
| 96 | export default { | 96 | export default { |
| 97 | name: "dyiq", | 97 | name: "dyiq", |
| 98 | mixins: [tableMixin], | 98 | mixins: [tableMixin], |
| 99 | components: { | 99 | components: { |
| 100 | treeSelect | 100 | treeSelect |
| 101 | }, | 101 | }, |
| 102 | data () { | 102 | data () { |
| 103 | return { | 103 | return { |
| 104 | form: { | 104 | form: { |
| 105 | XZQDM: '', | 105 | XZQDM: '', |
| 106 | QSZT: '', | 106 | QSZT: '', |
| 107 | ZL: '', | 107 | ZL: '', |
| 108 | BDCQZH: '', | 108 | BDCQZH: '', |
| 109 | QLR: '', | 109 | QLR: '', |
| 110 | BDCDYH: '', | 110 | BDCDYH: '', |
| 111 | // 供役地不动产单元号 | 111 | // 供役地不动产单元号 |
| 112 | GYDBDCDYH: '', | 112 | GYDBDCDYH: '', |
| 113 | // 需役地不动产单元号 | 113 | // 需役地不动产单元号 |
| 114 | XYDBDCDYH: '', | 114 | XYDBDCDYH: '', |
| 115 | ZJH: '', | 115 | ZJH: '', |
| 116 | currentPage: 1 | 116 | currentPage: 1 |
| 117 | }, | 117 | }, |
| 118 | tableData: { | 118 | tableData: { |
| 119 | columns: [{ | 119 | columns: [{ |
| 120 | label: '序号', | 120 | label: '序号', |
| 121 | type: 'index', | 121 | type: 'index', |
| 122 | width: '50', | 122 | width: '50', |
| 123 | index: this.indexMethod, | 123 | index: this.indexMethod, |
| 124 | }].concat(data.columns()).concat([ | 124 | }].concat(data.columns()).concat([ |
| 125 | { | 125 | { |
| 126 | label: "操作", | 126 | label: "操作", |
| 127 | width: 80, | 127 | width: 80, |
| 128 | render: (h, scope) => { | 128 | fixed: "right", |
| 129 | return ( | 129 | render: (h, scope) => { |
| 130 | <div> | 130 | return ( |
| 131 | <el-button | 131 | <div> |
| 132 | type="text" | 132 | <el-button |
| 133 | class='btnColor' | 133 | type="text" |
| 134 | onClick={() => { this.handleEdit(scope.row) }} | 134 | class='btnColor' |
| 135 | > | 135 | onClick={() => { this.handleEdit(scope.row) }} |
| 136 | 详情 | 136 | > |
| 137 | </el-button> | 137 | 详情 |
| 138 | </div> | 138 | </el-button> |
| 139 | ) | 139 | </div> |
| 140 | } | 140 | ) |
| 141 | } | 141 | } |
| 142 | ]), | ||
| 143 | data: [] | ||
| 144 | }, | ||
| 145 | pageData: { | ||
| 146 | total: 0, | ||
| 147 | pageSize: 15, | ||
| 148 | current: 1, | ||
| 149 | } | ||
| 150 | } | ||
| 151 | }, | ||
| 152 | methods: { | ||
| 153 | async featchData () { | ||
| 154 | try { | ||
| 155 | this.form = Object.assign(this.form, this.formData) | ||
| 156 | let { result: { list, total, pages: pageSize, pageNum: current } | ||
| 157 | } = await qlfQlDyiq.getQlfQlDyiqList(this.form) | ||
| 158 | this.tableData.data = list | ||
| 159 | this.pageData = { | ||
| 160 | pageSize, | ||
| 161 | current, | ||
| 162 | total | ||
| 163 | } | 142 | } |
| 164 | } catch (error) { | 143 | ]), |
| 144 | data: [] | ||
| 145 | }, | ||
| 146 | pageData: { | ||
| 147 | total: 0, | ||
| 148 | pageSize: 15, | ||
| 149 | current: 1, | ||
| 150 | } | ||
| 151 | } | ||
| 152 | }, | ||
| 153 | methods: { | ||
| 154 | async featchData () { | ||
| 155 | try { | ||
| 156 | this.form = Object.assign(this.form, this.formData) | ||
| 157 | let { result: { list, total, pages: pageSize, pageNum: current } | ||
| 158 | } = await qlfQlDyiq.getQlfQlDyiqList(this.form) | ||
| 159 | this.tableData.data = list | ||
| 160 | this.pageData = { | ||
| 161 | pageSize, | ||
| 162 | current, | ||
| 163 | total | ||
| 165 | } | 164 | } |
| 165 | } catch (error) { | ||
| 166 | } | 166 | } |
| 167 | } | 167 | } |
| 168 | } | 168 | } |
| 169 | } | ||
| 169 | </script> | 170 | </script> | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | <div class="fdcqdz from-clues"> | 2 | <div class="fdcqdz from-clues"> |
| 3 | <div class="from-clues-header"> | 3 | <div class="from-clues-header"> |
| 4 | <el-form ref="form" :model="form" label-width="120px"> | 4 | <el-form ref="form" :model="form" label-width="120px"> |
| 5 | <el-form-item v-if="BASE_API.THEME=='jg'"> | 5 | <el-form-item v-if="BASE_API.THEME == 'jg'"> |
| 6 | <Breadcrumb /> | 6 | <Breadcrumb /> |
| 7 | </el-form-item> | 7 | </el-form-item> |
| 8 | <el-row class="mb-5"> | 8 | <el-row class="mb-5"> |
| ... | @@ -115,6 +115,7 @@ export default { | ... | @@ -115,6 +115,7 @@ export default { |
| 115 | { | 115 | { |
| 116 | label: "操作", | 116 | label: "操作", |
| 117 | width: 80, | 117 | width: 80, |
| 118 | fixed: "right", | ||
| 118 | render: (h, scope) => { | 119 | render: (h, scope) => { |
| 119 | return ( | 120 | return ( |
| 120 | <div> | 121 | <div> | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | <div class="fdcqqfsyq from-clues"> | 2 | <div class="fdcqqfsyq from-clues"> |
| 3 | <div class="from-clues-header"> | 3 | <div class="from-clues-header"> |
| 4 | <el-form ref="form" :model="form" label-width="80px"> | 4 | <el-form ref="form" :model="form" label-width="80px"> |
| 5 | <el-form-item v-if="BASE_API.THEME=='jg'"> | 5 | <el-form-item v-if="BASE_API.THEME == 'jg'"> |
| 6 | <Breadcrumb /> | 6 | <Breadcrumb /> |
| 7 | </el-form-item> | 7 | </el-form-item> |
| 8 | <el-row class="mb-5"> | 8 | <el-row class="mb-5"> |
| ... | @@ -79,6 +79,7 @@ export default { | ... | @@ -79,6 +79,7 @@ export default { |
| 79 | { | 79 | { |
| 80 | label: "操作", | 80 | label: "操作", |
| 81 | width: 80, | 81 | width: 80, |
| 82 | fixed: "right", | ||
| 82 | render: (h, scope) => { | 83 | render: (h, scope) => { |
| 83 | return ( | 84 | return ( |
| 84 | <div> | 85 | <div> | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | <div class="fdcqyz from-clues"> | 2 | <div class="fdcqyz from-clues"> |
| 3 | <div class="from-clues-header"> | 3 | <div class="from-clues-header"> |
| 4 | <el-form ref="form" :model="form" label-width="120px"> | 4 | <el-form ref="form" :model="form" label-width="120px"> |
| 5 | <el-form-item v-if="BASE_API.THEME=='jg'"> | 5 | <el-form-item v-if="BASE_API.THEME == 'jg'"> |
| 6 | <Breadcrumb /> | 6 | <Breadcrumb /> |
| 7 | </el-form-item> | 7 | </el-form-item> |
| 8 | <el-row class="mb-5"> | 8 | <el-row class="mb-5"> |
| ... | @@ -115,6 +115,7 @@ export default { | ... | @@ -115,6 +115,7 @@ export default { |
| 115 | { | 115 | { |
| 116 | label: "操作", | 116 | label: "操作", |
| 117 | width: 80, | 117 | width: 80, |
| 118 | fixed: "right", | ||
| 118 | render: (h, scope) => { | 119 | render: (h, scope) => { |
| 119 | return ( | 120 | return ( |
| 120 | <div> | 121 | <div> | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | <div class="gzwsyq from-clues"> | 2 | <div class="gzwsyq from-clues"> |
| 3 | <div class="from-clues-header"> | 3 | <div class="from-clues-header"> |
| 4 | <el-form ref="form" :model="form" label-width="105px"> | 4 | <el-form ref="form" :model="form" label-width="105px"> |
| 5 | <el-form-item v-if="BASE_API.THEME=='jg'"> | 5 | <el-form-item v-if="BASE_API.THEME == 'jg'"> |
| 6 | <Breadcrumb /> | 6 | <Breadcrumb /> |
| 7 | </el-form-item> | 7 | </el-form-item> |
| 8 | <el-row> | 8 | <el-row> |
| ... | @@ -109,6 +109,7 @@ export default { | ... | @@ -109,6 +109,7 @@ export default { |
| 109 | { | 109 | { |
| 110 | label: "操作", | 110 | label: "操作", |
| 111 | width: 80, | 111 | width: 80, |
| 112 | fixed: "right", | ||
| 112 | render: (h, scope) => { | 113 | render: (h, scope) => { |
| 113 | return ( | 114 | return ( |
| 114 | <div> | 115 | <div> | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | <div class="hysyq from-clues"> | 2 | <div class="hysyq from-clues"> |
| 3 | <div class="from-clues-header"> | 3 | <div class="from-clues-header"> |
| 4 | <el-form ref="form" :model="form" label-width="105px"> | 4 | <el-form ref="form" :model="form" label-width="105px"> |
| 5 | <el-form-item v-if="BASE_API.THEME=='jg'"> | 5 | <el-form-item v-if="BASE_API.THEME == 'jg'"> |
| 6 | <Breadcrumb /> | 6 | <Breadcrumb /> |
| 7 | </el-form-item> | 7 | </el-form-item> |
| 8 | <el-row> | 8 | <el-row> |
| ... | @@ -114,6 +114,7 @@ export default { | ... | @@ -114,6 +114,7 @@ export default { |
| 114 | { | 114 | { |
| 115 | label: "操作", | 115 | label: "操作", |
| 116 | width: 80, | 116 | width: 80, |
| 117 | fixed: "right", | ||
| 117 | render: (h, scope) => { | 118 | render: (h, scope) => { |
| 118 | return ( | 119 | return ( |
| 119 | <div> | 120 | <div> | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | <div class="jsydzjdsyq from-clues"> | 2 | <div class="jsydzjdsyq from-clues"> |
| 3 | <div class="from-clues-header"> | 3 | <div class="from-clues-header"> |
| 4 | <el-form ref="form" :model="form" label-width="120px"> | 4 | <el-form ref="form" :model="form" label-width="120px"> |
| 5 | <el-form-item v-if="BASE_API.THEME=='jg'"> | 5 | <el-form-item v-if="BASE_API.THEME == 'jg'"> |
| 6 | <Breadcrumb /> | 6 | <Breadcrumb /> |
| 7 | </el-form-item> | 7 | </el-form-item> |
| 8 | <el-row class="mb-5"> | 8 | <el-row class="mb-5"> |
| ... | @@ -107,6 +107,7 @@ export default { | ... | @@ -107,6 +107,7 @@ export default { |
| 107 | { | 107 | { |
| 108 | label: "操作", | 108 | label: "操作", |
| 109 | width: 80, | 109 | width: 80, |
| 110 | fixed: "right", | ||
| 110 | render: (h, scope) => { | 111 | render: (h, scope) => { |
| 111 | return ( | 112 | return ( |
| 112 | <div> | 113 | <div> | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | <div class="lq from-clues"> | 2 | <div class="lq from-clues"> |
| 3 | <div class="from-clues-header"> | 3 | <div class="from-clues-header"> |
| 4 | <el-form ref="form" :model="form" label-width="105px"> | 4 | <el-form ref="form" :model="form" label-width="105px"> |
| 5 | <el-form-item v-if="BASE_API.THEME=='jg'"> | 5 | <el-form-item v-if="BASE_API.THEME == 'jg'"> |
| 6 | <Breadcrumb /> | 6 | <Breadcrumb /> |
| 7 | </el-form-item> | 7 | </el-form-item> |
| 8 | <el-row> | 8 | <el-row> |
| ... | @@ -103,6 +103,7 @@ export default { | ... | @@ -103,6 +103,7 @@ export default { |
| 103 | { | 103 | { |
| 104 | label: "操作", | 104 | label: "操作", |
| 105 | width: 80, | 105 | width: 80, |
| 106 | fixed: "right", | ||
| 106 | render: (h, scope) => { | 107 | render: (h, scope) => { |
| 107 | return ( | 108 | return ( |
| 108 | <div> | 109 | <div> | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | <div class="from-clues"> | 2 | <div class="from-clues"> |
| 3 | <div class="from-clues-header"> | 3 | <div class="from-clues-header"> |
| 4 | <el-form ref="form" :model="form" label-width="105px"> | 4 | <el-form ref="form" :model="form" label-width="105px"> |
| 5 | <el-form-item v-if="BASE_API.THEME=='jg'"> | 5 | <el-form-item v-if="BASE_API.THEME == 'jg'"> |
| 6 | <Breadcrumb /> | 6 | <Breadcrumb /> |
| 7 | </el-form-item> | 7 | </el-form-item> |
| 8 | <el-row> | 8 | <el-row> |
| ... | @@ -109,6 +109,7 @@ export default { | ... | @@ -109,6 +109,7 @@ export default { |
| 109 | { | 109 | { |
| 110 | label: "操作", | 110 | label: "操作", |
| 111 | width: 80, | 111 | width: 80, |
| 112 | fixed: "right", | ||
| 112 | render: (h, scope) => { | 113 | render: (h, scope) => { |
| 113 | return ( | 114 | return ( |
| 114 | <div> | 115 | <div> | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | <div class="tdsyq from-clues"> | 2 | <div class="tdsyq from-clues"> |
| 3 | <div class="from-clues-header"> | 3 | <div class="from-clues-header"> |
| 4 | <el-form ref="form" :model="form" label-width="120px"> | 4 | <el-form ref="form" :model="form" label-width="120px"> |
| 5 | <el-form-item v-if="BASE_API.THEME=='jg'"> | 5 | <el-form-item v-if="BASE_API.THEME == 'jg'"> |
| 6 | <Breadcrumb /> | 6 | <Breadcrumb /> |
| 7 | </el-form-item> | 7 | </el-form-item> |
| 8 | <el-row class="mb-5"> | 8 | <el-row class="mb-5"> |
| ... | @@ -105,6 +105,7 @@ export default { | ... | @@ -105,6 +105,7 @@ export default { |
| 105 | { | 105 | { |
| 106 | label: "操作", | 106 | label: "操作", |
| 107 | width: 80, | 107 | width: 80, |
| 108 | fixed: "right", | ||
| 108 | render: (h, scope) => { | 109 | render: (h, scope) => { |
| 109 | return ( | 110 | return ( |
| 110 | <div> | 111 | <div> | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | <div class="from-clues"> | 2 | <div class="from-clues"> |
| 3 | <div class="from-clues-header"> | 3 | <div class="from-clues-header"> |
| 4 | <el-form ref="form" :model="form" label-width="110px"> | 4 | <el-form ref="form" :model="form" label-width="110px"> |
| 5 | <el-form-item v-if="BASE_API.THEME=='jg'"> | 5 | <el-form-item v-if="BASE_API.THEME == 'jg'"> |
| 6 | <Breadcrumb /> | 6 | <Breadcrumb /> |
| 7 | </el-form-item> | 7 | </el-form-item> |
| 8 | <el-row class="mb-5"> | 8 | <el-row class="mb-5"> |
| ... | @@ -109,6 +109,7 @@ export default { | ... | @@ -109,6 +109,7 @@ export default { |
| 109 | { | 109 | { |
| 110 | label: "操作", | 110 | label: "操作", |
| 111 | width: 80, | 111 | width: 80, |
| 112 | fixed: "right", | ||
| 112 | render: (h, scope) => { | 113 | render: (h, scope) => { |
| 113 | return ( | 114 | return ( |
| 114 | <div> | 115 | <div> | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | <div class="from-clues"> | 2 | <div class="from-clues"> |
| 3 | <div class="from-clues-header"> | 3 | <div class="from-clues-header"> |
| 4 | <el-form ref="form" :model="form" label-width="105px"> | 4 | <el-form ref="form" :model="form" label-width="105px"> |
| 5 | <el-form-item v-if="BASE_API.THEME=='jg'"> | 5 | <el-form-item v-if="BASE_API.THEME == 'jg'"> |
| 6 | <Breadcrumb /> | 6 | <Breadcrumb /> |
| 7 | </el-form-item> | 7 | </el-form-item> |
| 8 | <el-row> | 8 | <el-row> |
| ... | @@ -105,6 +105,7 @@ export default { | ... | @@ -105,6 +105,7 @@ export default { |
| 105 | { | 105 | { |
| 106 | label: "操作", | 106 | label: "操作", |
| 107 | width: 80, | 107 | width: 80, |
| 108 | fixed: "right", | ||
| 108 | render: (h, scope) => { | 109 | render: (h, scope) => { |
| 109 | return ( | 110 | return ( |
| 110 | <div> | 111 | <div> | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | <div class="cancellationReg from-clues"> | 2 | <div class="cancellationReg from-clues"> |
| 3 | <div class="from-clues-header"> | 3 | <div class="from-clues-header"> |
| 4 | <el-form ref="form" :model="form" label-width="105px"> | 4 | <el-form ref="form" :model="form" label-width="105px"> |
| 5 | <el-form-item v-if="BASE_API.THEME=='jg'"> | 5 | <el-form-item v-if="BASE_API.THEME == 'jg'"> |
| 6 | <Breadcrumb /> | 6 | <Breadcrumb /> |
| 7 | </el-form-item> | 7 | </el-form-item> |
| 8 | <el-row> | 8 | <el-row> |
| ... | @@ -93,6 +93,7 @@ export default { | ... | @@ -93,6 +93,7 @@ export default { |
| 93 | { | 93 | { |
| 94 | label: "操作", | 94 | label: "操作", |
| 95 | width: 80, | 95 | width: 80, |
| 96 | fixed: "right", | ||
| 96 | render: (h, scope) => { | 97 | render: (h, scope) => { |
| 97 | return ( | 98 | return ( |
| 98 | <div> | 99 | <div> | ... | ... |
-
Please register or sign in to post a comment