Commit 761d537bf2437f1d9547b1c590d4b48a0b0d9fd5
'最新'
Showing
10 changed files
with
240 additions
and
53 deletions
admin-web-master/dist.zip deleted
No preview for this file type
admin-web-master/src/components/ImageUpload/index.vue
| @@ -74,7 +74,7 @@ | @@ -74,7 +74,7 @@ | ||
| 74 | }, | 74 | }, |
| 75 | limit: { | 75 | limit: { |
| 76 | type: Number, | 76 | type: Number, |
| 77 | - default: 10, | 77 | + default: 9, |
| 78 | }, | 78 | }, |
| 79 | }, | 79 | }, |
| 80 | data() { | 80 | data() { |
| @@ -83,10 +83,10 @@ | @@ -83,10 +83,10 @@ | ||
| 83 | onforIndex:0, | 83 | onforIndex:0, |
| 84 | localValue: [], | 84 | localValue: [], |
| 85 | options: { | 85 | options: { |
| 86 | - limitSize: 10, | 86 | + limitSize: 9, |
| 87 | accept: '.bmp,.jpg,.jpeg,.png', | 87 | accept: '.bmp,.jpg,.jpeg,.png', |
| 88 | multiple: false, | 88 | multiple: false, |
| 89 | - limit: 10, | 89 | + limit: 9, |
| 90 | disabled: false, | 90 | disabled: false, |
| 91 | field: 'files', | 91 | field: 'files', |
| 92 | reqParams: { | 92 | reqParams: { |
admin-web-master/src/components/add/addcd.vue
| @@ -50,7 +50,7 @@ | @@ -50,7 +50,7 @@ | ||
| 50 | <el-row :gutter="20"> | 50 | <el-row :gutter="20"> |
| 51 | <el-col :span="12"> | 51 | <el-col :span="12"> |
| 52 | <el-form-item label="联系人" prop="contact"> | 52 | <el-form-item label="联系人" prop="contact"> |
| 53 | - <el-input v-model="ruleForm.contact" placeholder="请输入" maxlength="20"> | 53 | + <el-input v-model="ruleForm.contact" placeholder="请输入" maxlength="50"> |
| 54 | </el-input> | 54 | </el-input> |
| 55 | </el-form-item> | 55 | </el-form-item> |
| 56 | </el-col> | 56 | </el-col> |
admin-web-master/src/components/add/addinformation.vue
| @@ -86,7 +86,7 @@ | @@ -86,7 +86,7 @@ | ||
| 86 | <el-row :gutter="20"> | 86 | <el-row :gutter="20"> |
| 87 | <el-col :span="12"> | 87 | <el-col :span="12"> |
| 88 | <el-form-item label="联系人" prop="contacts"> | 88 | <el-form-item label="联系人" prop="contacts"> |
| 89 | - <el-input v-model="ruleForm.contacts" placeholder="请输入" maxlength="10"> | 89 | + <el-input v-model="ruleForm.contacts" placeholder="请输入" maxlength="50"> |
| 90 | </el-input> | 90 | </el-input> |
| 91 | </el-form-item> | 91 | </el-form-item> |
| 92 | </el-col> | 92 | </el-col> |
admin-web-master/src/components/newmap/index.vue
| 1 | <template> | 1 | <template> |
| 2 | <div style="position: relative;width: 100%;"> | 2 | <div style="position: relative;width: 100%;"> |
| 3 | <div id="mapContainer" class="map"></div> | 3 | <div id="mapContainer" class="map"></div> |
| 4 | - <!-- <div id="addressInfo" class="address-info"> | ||
| 5 | - <p v-if="address">地址: {{ address }}</p> | ||
| 6 | - <p v-if="center">地址: {{ lat }}</p> | ||
| 7 | - <p v-if="center">地址: {{ lng }}</p> | ||
| 8 | - <p v-else>加载中...</p> | ||
| 9 | - </div> --> | 4 | + <div class="search-box"> |
| 5 | + <input v-model="searchQuery" placeholder="输入地址进行搜索" /> | ||
| 6 | + <button @click="searchLocation">搜索</button> | ||
| 7 | + </div> | ||
| 8 | + <div v-if="searchResults.length > 0" class="search-results"> | ||
| 9 | + <ul> | ||
| 10 | + <li v-for="(result, index) in searchResults" :key="index" @click="selectResult(result)"> | ||
| 11 | + {{ result.title }} | ||
| 12 | + </li> | ||
| 13 | + </ul> | ||
| 14 | + </div> | ||
| 10 | </div> | 15 | </div> |
| 11 | </template> | 16 | </template> |
| 12 | - | ||
| 13 | <script> | 17 | <script> |
| 14 | export default { | 18 | export default { |
| 15 | name: 'TencentMap', | 19 | name: 'TencentMap', |
| @@ -22,15 +26,15 @@ | @@ -22,15 +26,15 @@ | ||
| 22 | type: Number, | 26 | type: Number, |
| 23 | default: 104.06 | 27 | default: 104.06 |
| 24 | }, | 28 | }, |
| 25 | - isonloed:{ | 29 | + isonloed: { |
| 26 | type: Boolean, | 30 | type: Boolean, |
| 27 | default: false | 31 | default: false |
| 28 | }, | 32 | }, |
| 29 | - isx:{ | 33 | + isx: { |
| 30 | type: Boolean, | 34 | type: Boolean, |
| 31 | default: true | 35 | default: true |
| 32 | }, | 36 | }, |
| 33 | - message:{ | 37 | + message: { |
| 34 | type: String, | 38 | type: String, |
| 35 | default: '' | 39 | default: '' |
| 36 | }, | 40 | }, |
| @@ -39,7 +43,10 @@ | @@ -39,7 +43,10 @@ | ||
| 39 | return { | 43 | return { |
| 40 | map: null, | 44 | map: null, |
| 41 | marker: null, | 45 | marker: null, |
| 42 | - address: '' | 46 | + address: '', |
| 47 | + searchQuery: '', // 搜索查询 | ||
| 48 | + searchResults: [], // 搜索结果列表 | ||
| 49 | + | ||
| 43 | }; | 50 | }; |
| 44 | }, | 51 | }, |
| 45 | mounted() { | 52 | mounted() { |
| @@ -47,6 +54,47 @@ | @@ -47,6 +54,47 @@ | ||
| 47 | this.initMap(); | 54 | this.initMap(); |
| 48 | }, | 55 | }, |
| 49 | methods: { | 56 | methods: { |
| 57 | + // 选择某一条搜索结果 | ||
| 58 | + selectResult(result) { | ||
| 59 | + const latLng = new qq.maps.LatLng(result.location.lat, result.location.lng); | ||
| 60 | + | ||
| 61 | + // 移动地图中心到选择的位置 | ||
| 62 | + this.map.setCenter(latLng); | ||
| 63 | + | ||
| 64 | + // 更新标记位置 | ||
| 65 | + this.marker.setPosition(latLng); | ||
| 66 | + | ||
| 67 | + // 获取地址信息 | ||
| 68 | + this.getAreaCode(result.location.lat, result.location.lng); | ||
| 69 | + | ||
| 70 | + | ||
| 71 | + }, | ||
| 72 | + searchLocation() { | ||
| 73 | + let that = this | ||
| 74 | + if (!this.searchQuery) { | ||
| 75 | + this.$message.error('请输入搜索地址'); | ||
| 76 | + return; | ||
| 77 | + } | ||
| 78 | + | ||
| 79 | + // 使用腾讯地图的搜索服务 | ||
| 80 | + this.$jsonp("https://apis.map.qq.com/ws/place/v1/search", { | ||
| 81 | + keyword: this.searchQuery, | ||
| 82 | + key: 'PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU', // 使用你的腾讯地图API key | ||
| 83 | + output: "jsonp", | ||
| 84 | + boundary: 'nearby(' + that.lat + ',' + that.lng + ',1000,1)' | ||
| 85 | + }).then((res) => { | ||
| 86 | + console.error(res) | ||
| 87 | + if (res.status === 0 && res.data.length > 0) { | ||
| 88 | + this.searchResults = res.data; // 存储搜索结果 | ||
| 89 | + } else { | ||
| 90 | + this.$message.error('未找到相关地址'); | ||
| 91 | + this.searchResults = []; // 清空搜索结果 | ||
| 92 | + } | ||
| 93 | + }).catch(err => { | ||
| 94 | + this.$message.error("搜索失败"); | ||
| 95 | + console.error(err); | ||
| 96 | + }); | ||
| 97 | + }, | ||
| 50 | initMap() { | 98 | initMap() { |
| 51 | // 将经纬度转换为腾讯地图的LatLng对象 | 99 | // 将经纬度转换为腾讯地图的LatLng对象 |
| 52 | const centerLatLng = new qq.maps.LatLng(this.lat, this.lng); | 100 | const centerLatLng = new qq.maps.LatLng(this.lat, this.lng); |
| @@ -58,7 +106,7 @@ | @@ -58,7 +106,7 @@ | ||
| 58 | }); | 106 | }); |
| 59 | 107 | ||
| 60 | // 创建标记 | 108 | // 创建标记 |
| 61 | - if(this.isonloed) { | 109 | + if (this.isonloed) { |
| 62 | this.marker = new qq.maps.Marker({ | 110 | this.marker = new qq.maps.Marker({ |
| 63 | position: centerLatLng, | 111 | position: centerLatLng, |
| 64 | map: this.map | 112 | map: this.map |
| @@ -69,7 +117,7 @@ | @@ -69,7 +117,7 @@ | ||
| 69 | map: this.map | 117 | map: this.map |
| 70 | }); | 118 | }); |
| 71 | } | 119 | } |
| 72 | - if(this.isx) { | 120 | + if (this.isx) { |
| 73 | qq.maps.event.addListener(this.map, 'click', this.onMapClick); | 121 | qq.maps.event.addListener(this.map, 'click', this.onMapClick); |
| 74 | } else { | 122 | } else { |
| 75 | const centerLatLng1 = new qq.maps.LatLng(this.message.split(',')[0], this.message.split(',')[1]); | 123 | const centerLatLng1 = new qq.maps.LatLng(this.message.split(',')[0], this.message.split(',')[1]); |
| @@ -84,7 +132,7 @@ | @@ -84,7 +132,7 @@ | ||
| 84 | // qq.maps.event.addListener(this.marker, 'click', this.onMarkerClick); | 132 | // qq.maps.event.addListener(this.marker, 'click', this.onMarkerClick); |
| 85 | 133 | ||
| 86 | // 添加地图点击事件监听器 | 134 | // 添加地图点击事件监听器 |
| 87 | - | 135 | + |
| 88 | 136 | ||
| 89 | // // 获取地址信息 | 137 | // // 获取地址信息 |
| 90 | // this.getAreaCode(this.lat, this.lng); | 138 | // this.getAreaCode(this.lat, this.lng); |
| @@ -106,6 +154,9 @@ | @@ -106,6 +154,9 @@ | ||
| 106 | 154 | ||
| 107 | }, | 155 | }, |
| 108 | getAreaCode(lat, lng) { | 156 | getAreaCode(lat, lng) { |
| 157 | + this.searchQuery = '' | ||
| 158 | + // 清空搜索结果 | ||
| 159 | + this.searchResults = []; | ||
| 109 | let that = this; | 160 | let that = this; |
| 110 | //这里可以直接this.$jsonp地址传入你的经纬度; | 161 | //这里可以直接this.$jsonp地址传入你的经纬度; |
| 111 | that.$jsonp("https://apis.map.qq.com/ws/geocoder/v1/?", { | 162 | that.$jsonp("https://apis.map.qq.com/ws/geocoder/v1/?", { |
| @@ -140,11 +191,65 @@ | @@ -140,11 +191,65 @@ | ||
| 140 | height: 300px; | 191 | height: 300px; |
| 141 | } | 192 | } |
| 142 | 193 | ||
| 143 | - .address-info { | 194 | + .search-box { |
| 144 | position: absolute; | 195 | position: absolute; |
| 145 | - bottom: 0; | ||
| 146 | - left: 0; | ||
| 147 | - z-index: 999999; | 196 | + top: 10px; |
| 197 | + left: 10px; | ||
| 198 | + z-index: 999; | ||
| 148 | background: #fff; | 199 | background: #fff; |
| 200 | + padding: 10px; | ||
| 201 | + border-radius: 5px; | ||
| 202 | + box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1); | ||
| 203 | + width: 280px; | ||
| 204 | + } | ||
| 205 | + | ||
| 206 | + .search-box input { | ||
| 207 | + padding: 5px; | ||
| 208 | + margin-right: 5px; | ||
| 209 | + } | ||
| 210 | + | ||
| 211 | + .search-box button { | ||
| 212 | + padding: 5px 10px; | ||
| 213 | + background-color: #007bff; | ||
| 214 | + color: #fff; | ||
| 215 | + border: none; | ||
| 216 | + border-radius: 3px; | ||
| 217 | + cursor: pointer; | ||
| 218 | + } | ||
| 219 | + | ||
| 220 | + .search-box button:hover { | ||
| 221 | + background-color: #0056b3; | ||
| 222 | + } | ||
| 223 | + | ||
| 224 | + .search-results { | ||
| 225 | + position: absolute; | ||
| 226 | + top: 60px; | ||
| 227 | + left: 10px; | ||
| 228 | + z-index: 999; | ||
| 229 | + background: #fff; | ||
| 230 | + padding: 10px; | ||
| 231 | + border-radius: 5px; | ||
| 232 | + box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1); | ||
| 233 | + max-height: 200px; | ||
| 234 | + overflow-y: auto; | ||
| 235 | + width: 280px; | ||
| 236 | + | ||
| 237 | + } | ||
| 238 | + .search-results::-webkit-scrollbar { | ||
| 239 | + display: none; /* 隐藏滚动条 */ | ||
| 240 | + } | ||
| 241 | + .search-results ul { | ||
| 242 | + list-style: none; | ||
| 243 | + padding: 0; | ||
| 244 | + margin: 0; | ||
| 245 | + } | ||
| 246 | + | ||
| 247 | + .search-results li { | ||
| 248 | + padding: 5px; | ||
| 249 | + cursor: pointer; | ||
| 250 | + } | ||
| 251 | + | ||
| 252 | + .search-results li:hover { | ||
| 253 | + background-color: #f0f0f0; | ||
| 149 | } | 254 | } |
| 150 | -</style> | 255 | -</style> |
| 256 | +</style> | ||
| 151 | \ No newline at end of file | 257 | \ No newline at end of file |
admin-web-master/src/components/newmap/indexall.vue
| 1 | <template> | 1 | <template> |
| 2 | <div> | 2 | <div> |
| 3 | <div id="container"></div> | 3 | <div id="container"></div> |
| 4 | + <div class="search-box"> | ||
| 5 | + <input v-model="searchQuery" placeholder="输入地址进行搜索" /> | ||
| 6 | + <button @click="searchLocation">搜索</button> | ||
| 7 | + </div> | ||
| 4 | <!-- <div id="toolControl"> | 8 | <!-- <div id="toolControl"> |
| 5 | <div | 9 | <div |
| 6 | class="toolItem" | 10 | class="toolItem" |
| @@ -69,6 +73,7 @@ export default { | @@ -69,6 +73,7 @@ export default { | ||
| 69 | circle: null, | 73 | circle: null, |
| 70 | rectangle: null, | 74 | rectangle: null, |
| 71 | ellipse: null, | 75 | ellipse: null, |
| 76 | + searchQuery: '', // 搜索查询 | ||
| 72 | }; | 77 | }; |
| 73 | }, | 78 | }, |
| 74 | props: { | 79 | props: { |
| @@ -90,6 +95,35 @@ export default { | @@ -90,6 +95,35 @@ export default { | ||
| 90 | this.setActiveType('polygon') | 95 | this.setActiveType('polygon') |
| 91 | }, | 96 | }, |
| 92 | methods: { | 97 | methods: { |
| 98 | + searchLocation() { | ||
| 99 | + let that = this | ||
| 100 | + if (!this.searchQuery) { | ||
| 101 | + this.$message.error('请输入搜索地址'); | ||
| 102 | + return; | ||
| 103 | + } | ||
| 104 | + | ||
| 105 | + // 使用腾讯地图的搜索服务 | ||
| 106 | + this.$jsonp("https://apis.map.qq.com/ws/place/v1/search", { | ||
| 107 | + keyword: this.searchQuery, | ||
| 108 | + key: 'PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU', // 使用你的腾讯地图API key | ||
| 109 | + output: "jsonp", | ||
| 110 | + boundary: 'nearby(' + that.lat + ',' + that.lng + ',1000,1)' | ||
| 111 | + }).then((res) => { | ||
| 112 | + console.error(res) | ||
| 113 | + if (res.status === 0 && res.data.length > 0) { | ||
| 114 | + const location = res.data[0].location; | ||
| 115 | + const latLng = new qq.maps.LatLng(location.lat, location.lng); | ||
| 116 | + | ||
| 117 | + // 移动地图中心到搜索到的位置 | ||
| 118 | + this.map.setCenter(latLng); | ||
| 119 | + } else { | ||
| 120 | + this.$message.error('未找到相关地址'); | ||
| 121 | + } | ||
| 122 | + }).catch(err => { | ||
| 123 | + this.$message.error("搜索失败"); | ||
| 124 | + console.error(err); | ||
| 125 | + }); | ||
| 126 | + }, | ||
| 93 | setActiveType(type) { | 127 | setActiveType(type) { |
| 94 | this.activeType = type; | 128 | this.activeType = type; |
| 95 | this.editor.setActiveOverlay(type); | 129 | this.editor.setActiveOverlay(type); |
| @@ -271,4 +305,33 @@ body { | @@ -271,4 +305,33 @@ body { | ||
| 271 | #ellipse { | 305 | #ellipse { |
| 272 | background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/ellipse.png'); | 306 | background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/ellipse.png'); |
| 273 | } | 307 | } |
| 308 | +.search-box { | ||
| 309 | + position: absolute; | ||
| 310 | + top: 10px; | ||
| 311 | + left: 10px; | ||
| 312 | + z-index: 999999; | ||
| 313 | + background: #fff; | ||
| 314 | + padding: 10px; | ||
| 315 | + border-radius: 5px; | ||
| 316 | + box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1); | ||
| 317 | + width: 280px; | ||
| 318 | + } | ||
| 319 | + | ||
| 320 | + .search-box input { | ||
| 321 | + padding: 5px; | ||
| 322 | + margin-right: 5px; | ||
| 323 | + } | ||
| 324 | + | ||
| 325 | + .search-box button { | ||
| 326 | + padding: 5px 10px; | ||
| 327 | + background-color: #007bff; | ||
| 328 | + color: #fff; | ||
| 329 | + border: none; | ||
| 330 | + border-radius: 3px; | ||
| 331 | + cursor: pointer; | ||
| 332 | + } | ||
| 333 | + | ||
| 334 | + .search-box button:hover { | ||
| 335 | + background-color: #0056b3; | ||
| 336 | + } | ||
| 274 | </style> | 337 | </style> |
| 275 | \ No newline at end of file | 338 | \ No newline at end of file |
admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
| @@ -8,8 +8,8 @@ | @@ -8,8 +8,8 @@ | ||
| 8 | <!-- 线上 --> | 8 | <!-- 线上 --> |
| 9 | <div> | 9 | <div> |
| 10 | <div style="display: flex;font-size: 14px;" > | 10 | <div style="display: flex;font-size: 14px;" > |
| 11 | - <div style="margin-right: 4px;cursor: pointer;" @click="chenge(1)" :class="leixing?'chengeXia greens':''">线上({{xsNum}})</div> | ||
| 12 | - <div style="margin-left: 20px;margin-right: 4px;cursor: pointer;" @click="chenge(2)" :class="leixing?'':'chengeXia greens'">实体({{xxNum}})</div> | 11 | + <div style="margin-right: 4px;cursor: pointer;" @click="chenge(1)" :class="leixing?'chengeXia greens':''">线上({{xsNum || 0}})</div> |
| 12 | + <div style="margin-left: 20px;margin-right: 4px;cursor: pointer;" @click="chenge(2)" :class="leixing?'':'chengeXia greens'">实体({{xxNum || 0}})</div> | ||
| 13 | </div> | 13 | </div> |
| 14 | <!-- 搜索 --> | 14 | <!-- 搜索 --> |
| 15 | <div class="formSearch"> | 15 | <div class="formSearch"> |
admin-web-master/src/views/customer/rsaManagement/genjin.vue
| @@ -142,13 +142,25 @@ | @@ -142,13 +142,25 @@ | ||
| 142 | align="right" @change="changeNext"> | 142 | align="right" @change="changeNext"> |
| 143 | </el-date-picker> | 143 | </el-date-picker> |
| 144 | </el-form-item> | 144 | </el-form-item> |
| 145 | + <el-row :gutter="20"> | ||
| 146 | + <el-col :span="12"> | ||
| 147 | + <el-form-item> | ||
| 148 | + <div style="margin-top: 20px"> | ||
| 149 | + <el-button @click="addCheck()" style="background-color: #3F9B6A;color: #fff;">确定</el-button> | ||
| 150 | + <el-button @click="closeFn()" class="buttonHover" | ||
| 151 | + style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button> | ||
| 152 | + </div> | ||
| 153 | + </el-form-item> | ||
| 154 | + </el-col> | ||
| 155 | + </el-row> | ||
| 145 | </el-form> | 156 | </el-form> |
| 146 | </div> | 157 | </div> |
| 147 | - <div style="display: flex;"> | 158 | + |
| 159 | + <!-- <div style="display: flex;"> | ||
| 148 | <el-button @click="closeFn" class="buttonHover" | 160 | <el-button @click="closeFn" class="buttonHover" |
| 149 | style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button> | 161 | style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button> |
| 150 | <el-button @click="addCheck" style="background-color: #3F9B6A;color: #fff">确定</el-button> | 162 | <el-button @click="addCheck" style="background-color: #3F9B6A;color: #fff">确定</el-button> |
| 151 | - </div> | 163 | + </div> --> |
| 152 | </div> | 164 | </div> |
| 153 | <div class="zhuti" v-if="ontype == '3'"> | 165 | <div class="zhuti" v-if="ontype == '3'"> |
| 154 | <div style="height:58px;line-height:58px;"> | 166 | <div style="height:58px;line-height:58px;"> |
admin-web-master/src/views/customer/rsaManagement/index.vue
| @@ -52,7 +52,7 @@ | @@ -52,7 +52,7 @@ | ||
| 52 | <el-table-column label="意向租赁周期" prop="leaseCycle" min-width="120" /> | 52 | <el-table-column label="意向租赁周期" prop="leaseCycle" min-width="120" /> |
| 53 | <el-table-column label="意向租金(月)" prop="rentalRent" min-width="120" /> | 53 | <el-table-column label="意向租金(月)" prop="rentalRent" min-width="120" /> |
| 54 | <el-table-column label="意向区域" prop="intentionRegion" min-width="120" /> | 54 | <el-table-column label="意向区域" prop="intentionRegion" min-width="120" /> |
| 55 | -<el-table-column label="审核状态" min-width="120"> | 55 | + <el-table-column label="审核状态" min-width="120"> |
| 56 | <template slot-scope="scope"> | 56 | <template slot-scope="scope"> |
| 57 | {{scope.row.auditStatus == 1?'已通过':scope.row.auditStatus == 2?'未通过':'待审核'}} | 57 | {{scope.row.auditStatus == 1?'已通过':scope.row.auditStatus == 2?'未通过':'待审核'}} |
| 58 | </template> | 58 | </template> |
| @@ -94,8 +94,8 @@ | @@ -94,8 +94,8 @@ | ||
| 94 | </div> --> | 94 | </div> --> |
| 95 | <div style="display: flex;justify-content: space-between;" class="bom"> | 95 | <div style="display: flex;justify-content: space-between;" class="bom"> |
| 96 | <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 条</div> | 96 | <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 条</div> |
| 97 | - <el-pagination :current-page="currentPage" :page-sizes="[10, 20, 50, 100]" | ||
| 98 | - background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange" | 97 | + <el-pagination :current-page="currentPage" :page-sizes="[10, 20, 50, 100]" background small |
| 98 | + layout="prev, pager, next" :total="total" @size-change="handleSizeChange" | ||
| 99 | @current-change="handleCurrentChange"> | 99 | @current-change="handleCurrentChange"> |
| 100 | </el-pagination> | 100 | </el-pagination> |
| 101 | </div> | 101 | </div> |
| @@ -395,14 +395,10 @@ | @@ -395,14 +395,10 @@ | ||
| 395 | <el-col :span="12"> | 395 | <el-col :span="12"> |
| 396 | <el-form-item> | 396 | <el-form-item> |
| 397 | <div style="margin-top: 20px"> | 397 | <div style="margin-top: 20px"> |
| 398 | - <el-button class="buttonHover" | ||
| 399 | - style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="closeFn">取 | ||
| 400 | - 消</el-button> | ||
| 401 | - <el-button style="background-color: #3F9B6A;color: #fff" @click="addCheck">确 定</el-button> | ||
| 402 | - | ||
| 403 | - | 398 | + <el-button @click="addCheck()" style="background-color: #3F9B6A;color: #fff;">确定</el-button> |
| 399 | + <el-button @click="closeFn()" class="buttonHover" | ||
| 400 | + style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button> | ||
| 404 | </div> | 401 | </div> |
| 405 | - | ||
| 406 | </el-form-item> | 402 | </el-form-item> |
| 407 | </el-col> | 403 | </el-col> |
| 408 | </el-row> | 404 | </el-row> |
| @@ -472,7 +468,7 @@ | @@ -472,7 +468,7 @@ | ||
| 472 | leaseType: '', | 468 | leaseType: '', |
| 473 | pageNumber: 0, | 469 | pageNumber: 0, |
| 474 | pageSize: 10, | 470 | pageSize: 10, |
| 475 | - auditStatus:'1' | 471 | + auditStatus: '1' |
| 476 | }, | 472 | }, |
| 477 | ruleForm: { | 473 | ruleForm: { |
| 478 | intentCustomerName: '', //意向客户名称 | 474 | intentCustomerName: '', //意向客户名称 |
| @@ -501,7 +497,7 @@ | @@ -501,7 +497,7 @@ | ||
| 501 | pageindex: { | 497 | pageindex: { |
| 502 | pageNumber: 0, | 498 | pageNumber: 0, |
| 503 | pageSize: 10, | 499 | pageSize: 10, |
| 504 | - auditStatus:'1' | 500 | + auditStatus: '1' |
| 505 | }, | 501 | }, |
| 506 | ziyuanData: [], | 502 | ziyuanData: [], |
| 507 | multipleSelection: [], | 503 | multipleSelection: [], |
| @@ -803,7 +799,7 @@ | @@ -803,7 +799,7 @@ | ||
| 803 | leaseType: '', | 799 | leaseType: '', |
| 804 | pageNumber: 0, | 800 | pageNumber: 0, |
| 805 | pageSize: 10, | 801 | pageSize: 10, |
| 806 | - auditStatus:'1' | 802 | + auditStatus: '1' |
| 807 | } | 803 | } |
| 808 | this.currentPage = 1 | 804 | this.currentPage = 1 |
| 809 | this.getAll() | 805 | this.getAll() |
| @@ -892,6 +888,7 @@ | @@ -892,6 +888,7 @@ | ||
| 892 | background-color: #Fff; | 888 | background-color: #Fff; |
| 893 | 889 | ||
| 894 | } | 890 | } |
| 891 | + | ||
| 895 | .chengeXia { | 892 | .chengeXia { |
| 896 | border-bottom: 6px solid #3F9B6A; | 893 | border-bottom: 6px solid #3F9B6A; |
| 897 | padding-bottom: 4px; | 894 | padding-bottom: 4px; |
| @@ -905,9 +902,11 @@ | @@ -905,9 +902,11 @@ | ||
| 905 | font-size: 14px; | 902 | font-size: 14px; |
| 906 | justify-content: space-between; | 903 | justify-content: space-between; |
| 907 | } | 904 | } |
| 905 | + | ||
| 908 | .greens { | 906 | .greens { |
| 909 | color: #3F9B6A; | 907 | color: #3F9B6A; |
| 910 | } | 908 | } |
| 909 | + | ||
| 911 | .bg-purple-dark { | 910 | .bg-purple-dark { |
| 912 | background: #99a9bf; | 911 | background: #99a9bf; |
| 913 | } | 912 | } |
| @@ -919,17 +918,18 @@ | @@ -919,17 +918,18 @@ | ||
| 919 | .bg-purple-light { | 918 | .bg-purple-light { |
| 920 | background: #e5e9f2; | 919 | background: #e5e9f2; |
| 921 | } | 920 | } |
| 921 | + | ||
| 922 | .grid-content { | 922 | .grid-content { |
| 923 | border-radius: 4px; | 923 | border-radius: 4px; |
| 924 | min-height: 36px; | 924 | min-height: 36px; |
| 925 | } | 925 | } |
| 926 | - | ||
| 927 | </style> | 926 | </style> |
| 928 | <style lang="scss" scoped> | 927 | <style lang="scss" scoped> |
| 929 | ::v-deep .el-dialog__body { | 928 | ::v-deep .el-dialog__body { |
| 930 | padding: 0 0 !important; | 929 | padding: 0 0 !important; |
| 931 | } | 930 | } |
| 932 | - .el-dialog__header{ | 931 | + |
| 932 | + .el-dialog__header { | ||
| 933 | padding: 0; | 933 | padding: 0; |
| 934 | display: none; | 934 | display: none; |
| 935 | } | 935 | } |
admin-web-master/src/views/customer/rsaManagement/tanpan.vue
| @@ -98,13 +98,19 @@ | @@ -98,13 +98,19 @@ | ||
| 98 | align="right" @change="changeNext"> | 98 | align="right" @change="changeNext"> |
| 99 | </el-date-picker> | 99 | </el-date-picker> |
| 100 | </el-form-item> | 100 | </el-form-item> |
| 101 | + <el-row :gutter="20"> | ||
| 102 | + <el-col :span="12"> | ||
| 103 | + <el-form-item> | ||
| 104 | + <div style="margin-top: 20px"> | ||
| 105 | + <el-button @click="addCheck()" style="background-color: #3F9B6A;color: #fff;">确定</el-button> | ||
| 106 | + <el-button @click="closeFn()" class="buttonHover" | ||
| 107 | + style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button> | ||
| 108 | + </div> | ||
| 109 | + </el-form-item> | ||
| 110 | + </el-col> | ||
| 111 | + </el-row> | ||
| 101 | </el-form> | 112 | </el-form> |
| 102 | </div> | 113 | </div> |
| 103 | - <div style="display: flex;"> | ||
| 104 | - <el-button @click="closeFn" class="buttonHover" | ||
| 105 | - style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button> | ||
| 106 | - <el-button @click="addCheck" style="background-color: #3F9B6A;color: #fff" >确定</el-button> | ||
| 107 | - </div> | ||
| 108 | </div> | 114 | </div> |
| 109 | <div class="zhuti" v-if="ontype == '3'"> | 115 | <div class="zhuti" v-if="ontype == '3'"> |
| 110 | <div style="height:58px;line-height:58px;"> | 116 | <div style="height:58px;line-height:58px;"> |
| @@ -152,12 +158,13 @@ | @@ -152,12 +158,13 @@ | ||
| 152 | <div class="duiqi">{{formInline.plan_Time?formInline.plan_Time.length>0&&formInline.plan_Time[0]?formInline.plan_Time[0]+' 至 '+formInline.plan_Time[1]:'无':'无'}}</div> | 158 | <div class="duiqi">{{formInline.plan_Time?formInline.plan_Time.length>0&&formInline.plan_Time[0]?formInline.plan_Time[0]+' 至 '+formInline.plan_Time[1]:'无':'无'}}</div> |
| 153 | </el-form-item> | 159 | </el-form-item> |
| 154 | </el-form> | 160 | </el-form> |
| 161 | + <div> | ||
| 162 | + <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" | ||
| 163 | + @click="closeFn">返回 | ||
| 164 | + </el-button> | ||
| 165 | + </div> | ||
| 155 | </div> | 166 | </div> |
| 156 | - <div style="display: flex;"> | ||
| 157 | - <el-button @click="closeFn" class="buttonHover" | ||
| 158 | - style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button> | ||
| 159 | - <el-button @click="addCheck" style="background-color: #3F9B6A;color: #fff" >确定</el-button> | ||
| 160 | - </div> | 167 | + |
| 161 | </div> | 168 | </div> |
| 162 | </div> | 169 | </div> |
| 163 | </template> | 170 | </template> |