d6a9b62b by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 18147399 8f52f70a
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 14:09:11
5 -->
1 <template> 6 <template>
2 <div class="from-clues"> 7 <div class="from-clues">
3 <!-- 表单部分 --> 8 <!-- 表单部分 -->
...@@ -6,12 +11,12 @@ ...@@ -6,12 +11,12 @@
6 <el-row> 11 <el-row>
7 <el-col :span="5"> 12 <el-col :span="5">
8 <el-form-item label="个性化配置"> 13 <el-form-item label="个性化配置">
9 <el-input ></el-input> 14 <el-input></el-input>
10 </el-form-item> 15 </el-form-item>
11 </el-col> 16 </el-col>
12 <el-col :span="19" class="btnColRight"> 17 <el-col :span="19" class="btnColRight">
13 <el-form-item> 18 <el-form-item>
14 <el-button type="primary" native-type="submit" >查询</el-button> 19 <el-button type="primary" native-type="submit">查询</el-button>
15 </el-form-item> 20 </el-form-item>
16 </el-col> 21 </el-col>
17 </el-row> 22 </el-row>
...@@ -19,12 +24,12 @@ ...@@ -19,12 +24,12 @@
19 </div> 24 </div>
20 <!-- 表格 --> 25 <!-- 表格 -->
21 </div> 26 </div>
22 </template> 27 </template>
23 <script> 28 <script>
24 import table from "@/utils/mixin/table"; 29 import table from "@/utils/mixin/table";
25 export default { 30 export default {
26 name: "gxhpz", 31 name: "gxhpz",
27 components: { }, 32 components: {},
28 mixins: [table], 33 mixins: [table],
29 mounted () { 34 mounted () {
30 }, 35 },
...@@ -40,5 +45,5 @@ ...@@ -40,5 +45,5 @@
40 </script> 45 </script>
41 <style scoped lang="scss"> 46 <style scoped lang="scss">
42 @import "~@/styles/public.scss"; 47 @import "~@/styles/public.scss";
43 </style> 48 </style>
44 49
...\ No newline at end of file ...\ No newline at end of file
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 14:09:29
5 -->
1 <template> 6 <template>
2 <div class="from-clues"> 7 <div class="from-clues">
3 <!-- 表单部分 --> 8 <!-- 表单部分 -->
...@@ -31,11 +36,11 @@ ...@@ -31,11 +36,11 @@
31 </div> 36 </div>
32 </template> 37 </template>
33 <script> 38 <script>
34 import { mapGetters } from 'vuex' 39 import { mapGetters } from 'vuex'
35 import { sysSqywmbszSearch } from '@/api/sysSqywmbsz' 40 import { sysSqywmbszSearch } from '@/api/sysSqywmbsz'
36 import table from "@/utils/mixin/table" 41 import table from "@/utils/mixin/table"
37 import { datas, sendThis } from "./qtjfjmb" 42 import { datas, sendThis } from "./qtjfjmb"
38 export default { 43 export default {
39 name: "qtjfjmb", 44 name: "qtjfjmb",
40 mixins: [table], 45 mixins: [table],
41 mounted () { 46 mounted () {
...@@ -73,8 +78,8 @@ export default { ...@@ -73,8 +78,8 @@ export default {
73 this.$popupDialog("其他及附记模板", "system/qtjfjmb/components/editDialog", row, '60%') 78 this.$popupDialog("其他及附记模板", "system/qtjfjmb/components/editDialog", row, '60%')
74 } 79 }
75 } 80 }
76 } 81 }
77 </script> 82 </script>
78 <style scoped lang="scss"> 83 <style scoped lang="scss">
79 @import "~@/styles/public.scss"; 84 @import "~@/styles/public.scss";
80 </style> 85 </style>
......
1 <!-- 1 <!--
2 功能:登记情形设定 2 * @Description: 登记情形设定
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 14:09:47
3 --> 5 -->
4 <template> 6 <template>
5 <div> 7 <div>
...@@ -22,9 +24,9 @@ ...@@ -22,9 +24,9 @@
22 </div> 24 </div>
23 </template> 25 </template>
24 <script> 26 <script>
25 import { mapGetters } from 'vuex' 27 import { mapGetters } from 'vuex'
26 import { upward, down } from '@/utils/operation' 28 import { upward, down } from '@/utils/operation'
27 export default { 29 export default {
28 props: { 30 props: {
29 ruleForm: { 31 ruleForm: {
30 type: Object, default: {} 32 type: Object, default: {}
...@@ -223,8 +225,7 @@ export default { ...@@ -223,8 +225,7 @@ export default {
223 down(index, this.tableData) 225 down(index, this.tableData)
224 }, 226 },
225 } 227 }
226 } 228 }
227 </script> 229 </script>
228 <style scoped lang='scss'> 230 <style scoped lang='scss'>
229
230 </style> 231 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 <!-- 1 <!--
2 功能:登记情形设定 2 * @Description: 功能:登记情形设定
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 14:10:04
3 --> 5 -->
4 <template> 6 <template>
5 <div class='djqxsd'> 7 <div class='djqxsd'>
...@@ -22,8 +24,8 @@ ...@@ -22,8 +24,8 @@
22 </div> 24 </div>
23 </template> 25 </template>
24 <script> 26 <script>
25 import { upward, down } from '@/utils/operation' 27 import { upward, down } from '@/utils/operation'
26 export default { 28 export default {
27 props: { 29 props: {
28 ruleForm: { 30 ruleForm: {
29 type: Object, default: () => { 31 type: Object, default: () => {
...@@ -241,14 +243,14 @@ export default { ...@@ -241,14 +243,14 @@ export default {
241 this.key++ 243 this.key++
242 } 244 }
243 } 245 }
244 } 246 }
245 </script> 247 </script>
246 <style lang='scss' scoped> 248 <style lang='scss' scoped>
247 .djqxsd { 249 .djqxsd {
248 .repeat { 250 .repeat {
249 .el-input__inner { 251 .el-input__inner {
250 border-color: red !important; 252 border-color: red !important;
251 } 253 }
252 } 254 }
253 } 255 }
254 </style> 256 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 <!-- 1 <!--
2 功能:单元状态设定 2 * @Description: 单元状态设定
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 14:10:44
3 --> 5 -->
4 <template> 6 <template>
5 <div class='该组件名称'> 7 <div class='该组件名称'>
...@@ -48,7 +50,7 @@ ...@@ -48,7 +50,7 @@
48 </div> 50 </div>
49 </template> 51 </template>
50 <script> 52 <script>
51 export default { 53 export default {
52 props: { 54 props: {
53 ruleForm: { 55 ruleForm: {
54 type: Object, default: {} 56 type: Object, default: {}
...@@ -103,19 +105,19 @@ export default { ...@@ -103,19 +105,19 @@ export default {
103 }) 105 })
104 } 106 }
105 } 107 }
106 } 108 }
107 </script> 109 </script>
108 <style scoped lang='scss'> 110 <style scoped lang='scss'>
109 @import "~@/styles/mixin.scss"; 111 @import "~@/styles/mixin.scss";
110 112
111 .dyztsd-title { 113 .dyztsd-title {
112 @include flex; 114 @include flex;
113 align-items: center; 115 align-items: center;
114 justify-content: space-between; 116 justify-content: space-between;
115 padding-left: 20px; 117 padding-left: 20px;
116 } 118 }
117 119
118 .qlxx-list { 120 .qlxx-list {
119 @include flex; 121 @include flex;
120 flex-wrap: wrap; 122 flex-wrap: wrap;
121 padding-left: 20px; 123 padding-left: 20px;
...@@ -124,9 +126,9 @@ export default { ...@@ -124,9 +126,9 @@ export default {
124 width: 33%; 126 width: 33%;
125 margin-bottom: 15px; 127 margin-bottom: 15px;
126 } 128 }
127 } 129 }
128 130
129 .screen-list { 131 .screen-list {
130 @include flex; 132 @include flex;
131 align-items: center; 133 align-items: center;
132 flex-wrap: wrap; 134 flex-wrap: wrap;
...@@ -151,5 +153,5 @@ export default { ...@@ -151,5 +153,5 @@ export default {
151 li:nth-child(odd) { 153 li:nth-child(odd) {
152 border-right: 1px solid $borderColor; 154 border-right: 1px solid $borderColor;
153 } 155 }
154 } 156 }
155 </style> 157 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 14:10:56
5 -->
1 <template> 6 <template>
2 <dialogBox title="申请业务规则配置" @submitForm="submitForm" @closeDialog="closeDialog" v-model="myValue" 7 <dialogBox title="申请业务规则配置" @submitForm="submitForm" @closeDialog="closeDialog" v-model="myValue"
3 :btnDisabled="btnDisabled"> 8 :btnDisabled="btnDisabled">
...@@ -123,12 +128,12 @@ ...@@ -123,12 +128,12 @@
123 </dialogBox> 128 </dialogBox>
124 </template> 129 </template>
125 <script> 130 <script>
126 import { uploadUrl } from '@/api/file' 131 import { uploadUrl } from '@/api/file'
127 import djqxsd from './djqxsd.vue' 132 import djqxsd from './djqxsd.vue'
128 import clgzsd from './clgzsd.vue' 133 import clgzsd from './clgzsd.vue'
129 import dyztsd from './dyztsd.vue' 134 import dyztsd from './dyztsd.vue'
130 import { getSqdjywDetail, saveSqdjyw } from '@/api/sysSqdjyw' 135 import { getSqdjywDetail, saveSqdjyw } from '@/api/sysSqdjyw'
131 export default { 136 export default {
132 components: { 137 components: {
133 djqxsd, 138 djqxsd,
134 clgzsd, 139 clgzsd,
...@@ -314,25 +319,25 @@ export default { ...@@ -314,25 +319,25 @@ export default {
314 } 319 }
315 } 320 }
316 } 321 }
317 }; 322 };
318 </script> 323 </script>
319 <style scoped lang="scss"> 324 <style scoped lang="scss">
320 @import "~@/styles/mixin.scss"; 325 @import "~@/styles/mixin.scss";
321 326
322 /deep/.el-radio { 327 /deep/.el-radio {
323 margin-right: 0; 328 margin-right: 0;
324 } 329 }
325 330
326 /deep/.el-radio__label { 331 /deep/.el-radio__label {
327 padding-left: 2px; 332 padding-left: 2px;
328 } 333 }
329 334
330 .active { 335 .active {
331 background: $light-blue !important; 336 background: $light-blue !important;
332 color: #fff; 337 color: #fff;
333 } 338 }
334 339
335 .edit-title-list { 340 .edit-title-list {
336 @include flex; 341 @include flex;
337 342
338 li { 343 li {
...@@ -348,9 +353,9 @@ export default { ...@@ -348,9 +353,9 @@ export default {
348 @extend .active; 353 @extend .active;
349 } 354 }
350 } 355 }
351 } 356 }
352 357
353 .sqywgz-edit { 358 .sqywgz-edit {
354 @include flex; 359 @include flex;
355 width: 100%; 360 width: 100%;
356 height: 563px; 361 height: 563px;
...@@ -358,11 +363,9 @@ export default { ...@@ -358,11 +363,9 @@ export default {
358 &-left { 363 &-left {
359 width: 26px; 364 width: 26px;
360 365
361
362
363 li { 366 li {
364 @include flex-center; 367 @include flex-center;
365 background-color: #E4E7ED; 368 background-color: #e4e7ed;
366 border-bottom-right-radius: 5px; 369 border-bottom-right-radius: 5px;
367 padding: 15px; 370 padding: 15px;
368 cursor: pointer; 371 cursor: pointer;
...@@ -383,5 +386,5 @@ export default { ...@@ -383,5 +386,5 @@ export default {
383 flex: 1; 386 flex: 1;
384 width: 100%; 387 width: 100%;
385 } 388 }
386 } 389 }
387 </style> 390 </style>
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 14:11:05
5 -->
1 <template> 6 <template>
2 <div> 7 <div>
3 <ul class="edit-title-list" v-if="djlxList.length > 0"> 8 <ul class="edit-title-list" v-if="djlxList.length > 0">
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 14:11:20
5 -->
1 <template> 6 <template>
2 <div class="from-clues"> 7 <div class="from-clues">
3 <!-- 表单部分 --> 8 <!-- 表单部分 -->
...@@ -36,12 +41,12 @@ ...@@ -36,12 +41,12 @@
36 </div> 41 </div>
37 </template> 42 </template>
38 <script> 43 <script>
39 import table from "@/utils/mixin/table"; 44 import table from "@/utils/mixin/table";
40 import editDialog from "./components/editDialog.vue"; 45 import editDialog from "./components/editDialog.vue";
41 import componentDialog from "./sqywDetail.vue"; 46 import componentDialog from "./sqywDetail.vue";
42 import { datas, sendThis } from "./sqywgzdata"; 47 import { datas, sendThis } from "./sqywgzdata";
43 import { getSysSqdjywBysearch, getDjlxInfo } from "@/api/sysSqdjyw.js"; 48 import { getSysSqdjywBysearch, getDjlxInfo } from "@/api/sysSqdjyw.js";
44 export default { 49 export default {
45 name: "djbcx", 50 name: "djbcx",
46 components: { 51 components: {
47 editDialog, 52 editDialog,
...@@ -93,8 +98,8 @@ export default { ...@@ -93,8 +98,8 @@ export default {
93 this.$popupDialog(row.nodename, "system/sqywgz/sqywDetail", this.sqqlRule, '80%') 98 this.$popupDialog(row.nodename, "system/sqywgz/sqywDetail", this.sqqlRule, '80%')
94 } 99 }
95 } 100 }
96 } 101 }
97 </script> 102 </script>
98 <style scoped lang="scss"> 103 <style scoped lang="scss">
99 @import "~@/styles/public.scss"; 104 @import "~@/styles/public.scss";
100 </style> 105 </style>
......
1 <!-- 1 <!--
2 功能:高级搜索 2 * @Description:
3 作者:calliope 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 14:08:17
4 --> 5 -->
5 <template> 6 <template>
6 <dialogBox :isButton="false" :isFullscreen="false" width="50%" @closeDialog="closeDialog" v-model="myValue" 7 <dialogBox :isButton="false" :isFullscreen="false" width="50%" @closeDialog="closeDialog" v-model="myValue"
...@@ -42,10 +43,10 @@ ...@@ -42,10 +43,10 @@
42 </template> 43 </template>
43 <script> 44 <script>
44 45
45 export default { 46 export default {
46 props: { 47 props: {
47 value: { type: Boolean, default: false }, 48 value: { type: Boolean, default: false },
48 advancedForm:{type: Object, default: "" } 49 advancedForm: { type: Object, default: "" }
49 }, 50 },
50 data () { 51 data () {
51 return { 52 return {
...@@ -62,8 +63,8 @@ export default { ...@@ -62,8 +63,8 @@ export default {
62 value (val) { 63 value (val) {
63 this.myValue = val 64 this.myValue = val
64 }, 65 },
65 advancedForm(){ 66 advancedForm () {
66 this.ruleForm={...this.advancedForm} 67 this.ruleForm = { ...this.advancedForm }
67 } 68 }
68 }, 69 },
69 70
...@@ -74,7 +75,7 @@ export default { ...@@ -74,7 +75,7 @@ export default {
74 }, 75 },
75 resetForm () { 76 resetForm () {
76 this.$refs['ruleForm'].resetFields() 77 this.$refs['ruleForm'].resetFields()
77 this.ruleForm={ 78 this.ruleForm = {
78 sqywmc: '', 79 sqywmc: '',
79 qlrmc: '', 80 qlrmc: '',
80 ywrmc: '', 81 ywrmc: '',
...@@ -88,17 +89,17 @@ export default { ...@@ -88,17 +89,17 @@ export default {
88 89
89 } 90 }
90 } 91 }
91 } 92 }
92 </script> 93 </script>
93 <style scoped lang='scss'> 94 <style scoped lang='scss'>
94 @import '~@/styles/public.scss'; 95 @import "~@/styles/public.scss";
95 96
96 .search-btn { 97 .search-btn {
97 padding: 0 20px 20px 20px; 98 padding: 0 20px 20px 20px;
98 text-align: right; 99 text-align: right;
99 } 100 }
100 101
101 /deep/.el-icon-date { 102 /deep/.el-icon-date {
102 display: none; 103 display: none;
103 } 104 }
104 </style> 105 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-13 16:31:05 4 * @LastEditTime: 2023-07-19 14:38:31
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
114 class="loadingtext" 114 class="loadingtext"
115 @sort-change="handleSort" 115 @sort-change="handleSort"
116 :current-page.sync="pageData.currentPage" 116 :current-page.sync="pageData.currentPage"
117 :heightNum="295" 117 :heightNum="305"
118 :total="tableData.total" 118 :total="tableData.total"
119 @size-change="handleSizeChange" 119 @size-change="handleSizeChange"
120 @p-current-change="handleCurrentChange" 120 @p-current-change="handleCurrentChange"
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 13:59:35
5 -->
1 <template> 6 <template>
2 <div class="from-clues"> 7 <div class="from-clues">
3 <!-- 表单部分 --> 8 <!-- 表单部分 -->
...@@ -89,12 +94,12 @@ ...@@ -89,12 +94,12 @@
89 </div> 94 </div>
90 </template> 95 </template>
91 <script> 96 <script>
92 import { mapGetters } from "vuex"; 97 import { mapGetters } from "vuex";
93 import table from "@/utils/mixin/table"; 98 import table from "@/utils/mixin/table";
94 import { datas, sendThis } from "./djbcxdata"; 99 import { datas, sendThis } from "./djbcxdata";
95 import { getDjbBysearch } from "@/api/search.js"; 100 import { getDjbBysearch } from "@/api/search.js";
96 101
97 export default { 102 export default {
98 name: "djbcx", 103 name: "djbcx",
99 mixins: [table], 104 mixins: [table],
100 mounted () { 105 mounted () {
...@@ -181,16 +186,16 @@ export default { ...@@ -181,16 +186,16 @@ export default {
181 186
182 // }, 187 // },
183 } 188 }
184 } 189 }
185 </script> 190 </script>
186 <style scoped lang="scss"> 191 <style scoped lang="scss">
187 @import "~@/styles/public.scss"; 192 @import "~@/styles/public.scss";
188 193
189 .icon-circle { 194 .icon-circle {
190 position: relative; 195 position: relative;
191 } 196 }
192 197
193 .icon-circle::before { 198 .icon-circle::before {
194 content: ""; 199 content: "";
195 width: 4px; 200 width: 4px;
196 height: 4px; 201 height: 4px;
...@@ -198,5 +203,5 @@ export default { ...@@ -198,5 +203,5 @@ export default {
198 background: #000; 203 background: #000;
199 top: 0px; 204 top: 0px;
200 left: 0px; 205 left: 0px;
201 } 206 }
202 </style> 207 </style>
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 13:59:55
5 -->
1 <template> 6 <template>
2 <div class="from-clues"> 7 <div class="from-clues">
3 <!-- 表单部分 --> 8 <!-- 表单部分 -->
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 14:00:03
5 -->
1 <template> 6 <template>
2 <div class="from-clues"> 7 <div class="from-clues">
3 <!-- 楼盘查询 --> 8 <!-- 楼盘查询 -->
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 14:07:38
5 -->
1 <template> 6 <template>
2 <div class="from-clues"> 7 <div class="from-clues">
3 <!-- 表单部分 --> 8 <!-- 表单部分 -->
......