webapp / GreenwayWeb

Commit 9d8bcb2694aace1d92d1d39ac5548bc69e9b0b71

Authored by wesley88
1 parent 1efed26b

2

Inline Side-by-side
Showing 14 changed files with 1245 additions and 133 deletions
admin-web-master/src/api/newly.js
  View file @9d8bcb2
... ... @@ -35,6 +35,14 @@ export function cerePlatformMerchantadd(data) {
35 35 data
36 36 })
37 37 }
  38 +// 详情
  39 +export function cerePlatformMerchantinfo(data) {
  40 + return requestnew({
  41 + url: '/cerePlatformMerchant/queryById',
  42 + method: 'post',
  43 + data
  44 + })
  45 +}
38 46 // 修改
39 47 export function cerePlatformMerchantedit(data) {
40 48 return requestnew({
... ... @@ -44,4 +52,6 @@ export function cerePlatformMerchantedit(data) {
44 52 })
45 53 }
46 54  
  55 +
  56 +
47 57  
48 58 \ No newline at end of file
... ...
admin-web-master/src/components/add/addht.vue
  View file @9d8bcb2
... ... @@ -95,7 +95,7 @@
95 95 <el-form-item label="绑定商家" prop="relatedMerchants">
96 96 <el-select style="width: 100%;" v-model="formInline.relatedMerchants" placeholder="请输入关键词搜索" filterable
97 97 @change="changeRelatedMerchants">
98   - <el-option v-for="(item,index) in shopList" :key="index" :label="item.shopName+ ' ' + item.chargePersonPhone"
  98 + <el-option v-for="(item,index) in shopList" :key="index" :label="item.name+ ' ' + item.phone"
99 99 :value="index" />
100 100 </el-select>
101 101 </el-form-item>
... ... @@ -251,6 +251,9 @@
251 251  
252 252 contractinsertAdd
253 253 } from '@/api/manage.js'
  254 + import {
  255 + cerePlatformMerchant
  256 + } from '@/api/newly.js'
254 257 export default {
255 258 components: {
256 259 upimg
... ... @@ -391,12 +394,9 @@
391 394 }],
392 395 },
393 396 shopfrom: {
394   - shopName: '', // 店铺名称
395   - shopCode: '', // 店铺编码
396   - chargePersonName: '', // 店铺负责人
397   - contractState: '1', // 合同状态 1-有效 0-无效
398   - page: '1', // 当前页
399   - pageSize: '1000' // 每页记录数
  397 + checkState:'2',
  398 + pageNumber: 0,
  399 + pageSize: 1000,
400 400 },
401 401 pageindex: {
402 402 pageNumber: 1,
... ... @@ -414,8 +414,8 @@
414 414 }
415 415 },
416 416 created() {
417   - businessListGetAll(this.shopfrom).then(res => {
418   - this.shopList = res.data.list
  417 + cerePlatformMerchant(this.shopfrom).then(res => {
  418 + this.shopList = res.data.content
419 419 console.error(this.shopList)
420 420 })
421 421 },
... ... @@ -543,9 +543,9 @@
543 543 },
544 544 changeRelatedMerchants(e) {
545 545 console.error(e)
546   - this.shopId = this.shopList[e].shopId
547   - this.formInline.tenantName = this.shopList[e].chargePersonName
548   - this.formInline.tenantTelephone = this.shopList[e].shopPhone
  546 + this.shopId = this.shopList[e].id
  547 + this.formInline.tenantName = this.shopList[e].name
  548 + this.formInline.tenantTelephone = this.shopList[e].phone
549 549 },
550 550 hefuRemove() {
551 551 this.hefuData = []
... ...
admin-web-master/src/components/add/addremoveht.vue
  View file @9d8bcb2
... ... @@ -92,14 +92,14 @@
92 92 </el-form-item>
93 93 </el-col>
94 94 </el-row>
95   - <el-form-item label="绑定商家" prop="relatedMerchants">
  95 + <el-form-item v-if="false" label="绑定商家" prop="relatedMerchants">
96 96 <el-select style="width: 100%;" v-model="formInline.relatedMerchants" placeholder="请输入关键词搜索" filterable
97 97 @change="changeRelatedMerchants">
98   - <el-option v-for="(item,index) in shopList" :key="index" :label="item.shopName+ ' ' + item.chargePersonPhone"
  98 + <el-option v-for="(item,index) in shopList" :key="index" :label="item.name+ ' ' + item.phone"
99 99 :value="index" />
100 100 </el-select>
101 101 </el-form-item>
102   - <el-row :gutter="20">
  102 + <el-row :gutter="20" v-if="false">
103 103 <el-col :span="12">
104 104 <el-form-item label="承租人名称" prop="tenantName">
105 105 <el-input v-model="formInline.tenantName" placeholder="请输入" maxlength="20"></el-input>
... ... @@ -123,7 +123,7 @@
123 123 </el-upload>
124 124  
125 125 </el-form-item>
126   - <el-row :gutter="20">
  126 + <el-row :gutter="20" v-if="false">
127 127 <el-col :span="24">
128 128 <el-form-item label="绑定资源" prop="shopNumber">
129 129 <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
... ... @@ -250,6 +250,9 @@
250 250 import {
251 251 cereContractInformation
252 252 } from '@/api/commodityLease.js'
  253 + import {
  254 + cerePlatformMerchant
  255 + } from '@/api/newly.js'
253 256 export default {
254 257 components: {
255 258 upimg
... ... @@ -390,12 +393,9 @@
390 393 }],
391 394 },
392 395 shopfrom: {
393   - shopName: '', // 店铺名称
394   - shopCode: '', // 店铺编码
395   - chargePersonName: '', // 店铺负责人
396   - contractState: '1', // 合同状态 1-有效 0-无效
397   - page: '1', // 当前页
398   - pageSize: '1000' // 每页记录数
  396 + checkState:'2',
  397 + pageNumber: 0,
  398 + pageSize: 1000,
399 399 },
400 400 pageindex: {
401 401 pageNumber: 1,
... ... @@ -414,8 +414,8 @@
414 414 },
415 415 },
416 416 created() {
417   - businessListGetAll(this.shopfrom).then(res => {
418   - this.shopList = res.data.list
  417 + cerePlatformMerchant(this.shopfrom).then(res => {
  418 + this.shopList = res.data.content
419 419 console.error(this.shopList)
420 420 })
421 421 },
... ... @@ -480,7 +480,13 @@
480 480 relatedMerchants: this.shopId,
481 481 contractChangeReason: this.contractChangeReason,
482 482 dataStatus: dataStatus,
483   - originalContractCode: this.info.contractNumber
  483 + originalContractCode: this.info.contractNumber,
  484 +
  485 + relatedMerchants: this.info.relatedMerchants,
  486 + tenantName: this.info.tenantName,
  487 + tenantTelephone: this.info.tenantTelephone,
  488 + shopNumber: this.info.shopNumber,
  489 +
484 490 })
485 491 // return
486 492 if (valid) {
... ... @@ -495,7 +501,11 @@
495 501 updateDate: this.gettime(),
496 502 createDate: this.gettime(),
497 503 contractChangeTime: this.gettime(),
498   - updateUser:localStorage.getItem('roleName')
  504 + updateUser:localStorage.getItem('roleName'),
  505 + relatedMerchants: this.info.relatedMerchants,
  506 + tenantName: this.info.tenantName,
  507 + tenantTelephone: this.info.tenantTelephone,
  508 + shopNumber: this.info.shopNumber,
499 509 }).then(res => {
500 510 console.error(res)
501 511 if (res.code == 200) {
... ... @@ -598,9 +608,9 @@
598 608 },
599 609 changeRelatedMerchants(e) {
600 610 console.error(e)
601   - this.shopId = this.shopList[e].shopId
602   - this.formInline.tenantName = this.shopList[e].chargePersonName
603   - this.formInline.tenantTelephone = this.shopList[e].shopPhone
  611 + this.shopId = this.shopList[e].id
  612 + this.formInline.tenantName = this.shopList[e].name
  613 + this.formInline.tenantTelephone = this.shopList[e].phone
604 614 },
605 615 hefuRemove() {
606 616 this.hefuData = []
... ...
admin-web-master/src/components/add/addss.vue
  View file @9d8bcb2
... ... @@ -19,7 +19,7 @@
19 19 <el-select v-model="formInline.sex" placeholder="请选择" style="width: 100%;">
20 20 <el-option label="男" value="男"></el-option>
21 21 <el-option label="女" value="女"></el-option>
22   - </el-select>
  22 + </el-select>
23 23 </el-form-item>
24 24  
25 25  
... ... @@ -192,27 +192,43 @@
192 192 })
193 193 },
194 194 methods: {
  195 + //获取当前时间
  196 + updateCurrentTime() {
  197 + const now = new Date();
  198 + const year = now.getFullYear();
  199 + const month = (now.getMonth() + 1).toString().padStart(2, '0');
  200 + const day = now.getDate().toString().padStart(2, '0');
  201 + const hours = now.getHours().toString().padStart(2, '0');
  202 + const minutes = now.getMinutes().toString().padStart(2, '0');
  203 + const seconds = now.getSeconds().toString().padStart(2, '0');
  204 +
  205 + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
  206 + },
195 207 add() {
196   - console.log({...this.formInline})
  208 + console.log({
  209 + ...this.formInline
  210 + })
197 211 this.$refs.heForm.validate((valid) => {
198 212 if (valid) {
199   -
200   - // cerePlatformMerchantadd({
201   - // ...this.formInline,
202   - // }).then(res => {
203   - // if (res.code == 200) {
204   - // this.$message({
205   - // message: '添加成功',
206   - // type: 'success'
207   - // })
208   - // this.$emit('removeonaction', '1')
209   - // } else {
210   - // this.$message({
211   - // message: res.msg,
212   - // type: 'error'
213   - // })
214   - // }
215   - // })
  213 +
  214 + cerePlatformMerchantadd({
  215 + ...this.formInline,
  216 + checkState: '2',
  217 + applyTime: this.updateCurrentTime()
  218 + }).then(res => {
  219 + if (res.code == 200) {
  220 + this.$message({
  221 + message: '添加成功',
  222 + type: 'success'
  223 + })
  224 + this.$emit('removeonaction', '1')
  225 + } else {
  226 + this.$message({
  227 + message: res.msg,
  228 + type: 'error'
  229 + })
  230 + }
  231 + })
216 232 } else {
217 233 this.$message({
218 234 message: '请填写完整信息',
... ... @@ -257,7 +273,7 @@
257 273 this.formInline.tenantTelephone = this.shopList[e].shopPhone
258 274 },
259 275 hefuRemove(e) {
260   - this.formInline[e] = ''
  276 + // this.formInline[e] = ''
261 277 },
262 278 hefuSuccess(response, e) {
263 279 console.error(response)
... ... @@ -267,6 +283,7 @@
267 283 fd.append('file', response.raw)
268 284 fd.append('filePath', 'yh')
269 285 miniioupload(fd).then(res => {
  286 + console.error(res)
270 287 this.formInline[e] = res.data
271 288 })
272 289 }
... ...
admin-web-master/src/components/buscha/busCha.vue
  View file @9d8bcb2
... ... @@ -135,22 +135,39 @@
135 135 <div style="padding: 20px;margin-top: 10px;">
136 136 <el-form :model="shop" ref="ruleForm" label-width="140px" class="demo-ruleForm">
137 137 <el-row :gutter="20">
138   - <el-col :span="8">
139   - <el-form-item label="店铺名称" prop="shopName">
140   - <div class="duiqi">{{shop.shopName}}</div>
  138 + <el-col :span="9">
  139 + <el-form-item label="姓名" prop="name">
  140 + <div class="duiqi">{{shop.name}}</div>
  141 + </el-form-item>
  142 + </el-col>
  143 + <el-col :span="9">
  144 + <el-form-item label="手机号" prop="phone">
  145 + <div class="duiqi">{{shop.phone}}</div>
141 146 </el-form-item>
142 147 </el-col>
143   - <el-col :span="8">
144   - <el-form-item label="联系方式" prop="shopPhone">
145   - <div class="duiqi">{{shop.shopPhone}}</div>
  148 + </el-row>
  149 + <el-row :gutter="20">
  150 + <el-col :span="9">
  151 + <el-form-item label="证件类型" prop="idCardType">
  152 + <div class="duiqi">{{shop.idCardType}}</div>
146 153 </el-form-item>
147 154 </el-col>
148   - <el-col :span="8">
149   - <el-form-item label="店铺地址" prop="shopAdress">
150   - <div class="duiqi">{{shop.shopAdress}}</div>
  155 + <el-col :span="9">
  156 + <el-form-item label="身份证号码" prop="idCardNumber">
  157 + <div class="duiqi">{{shop.idCardNumber}}</div>
151 158 </el-form-item>
152 159 </el-col>
153 160 </el-row>
  161 + <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
  162 + <div style="margin-top: 10px;">
  163 + <el-image style="width: 200px;" :src="$baseURL+shop.idCardFrontImage" fit="contain"></el-image>
  164 + </div>
  165 + </el-form-item>
  166 + <el-form-item label="身份证照片（反）" prop="idCardBackImage">
  167 + <div style="margin-top: 10px;">
  168 + <el-image style="width: 200px;" :src="$baseURL+shop.idCardBackImage" fit="contain"></el-image>
  169 + </div>
  170 + </el-form-item>
154 171 </el-form>
155 172 </div>
156 173 </div>
... ... @@ -300,22 +317,39 @@
300 317 <div style="padding: 20px;margin-top: 10px;">
301 318 <el-form :model="newshop" ref="ruleForm" label-width="140px" class="demo-ruleForm">
302 319 <el-row :gutter="20">
303   - <el-col :span="8">
304   - <el-form-item label="店铺名称" prop="shopName">
305   - <div class="duiqi">{{newshop.shopName}}</div>
  320 + <el-col :span="9">
  321 + <el-form-item label="姓名" prop="name">
  322 + <div class="duiqi">{{newshop.name}}</div>
306 323 </el-form-item>
307 324 </el-col>
308   - <el-col :span="8">
309   - <el-form-item label="联系方式" prop="shopPhone">
310   - <div class="duiqi">{{newshop.shopPhone}}</div>
  325 + <el-col :span="9">
  326 + <el-form-item label="手机号" prop="phone">
  327 + <div class="duiqi">{{newshop.phone}}</div>
311 328 </el-form-item>
312 329 </el-col>
313   - <el-col :span="8">
314   - <el-form-item label="店铺地址" prop="shopAdress">
315   - <div class="duiqi">{{newshop.shopAdress}}</div>
  330 + </el-row>
  331 + <el-row :gutter="20">
  332 + <el-col :span="9">
  333 + <el-form-item label="证件类型" prop="idCardType">
  334 + <div class="duiqi">{{newshop.idCardType}}</div>
  335 + </el-form-item>
  336 + </el-col>
  337 + <el-col :span="9">
  338 + <el-form-item label="身份证号码" prop="idCardNumber">
  339 + <div class="duiqi">{{newshop.idCardNumber}}</div>
316 340 </el-form-item>
317 341 </el-col>
318 342 </el-row>
  343 + <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
  344 + <div style="margin-top: 10px;">
  345 + <el-image style="width: 200px;" :src="$baseURL+newshop.idCardFrontImage" fit="contain"></el-image>
  346 + </div>
  347 + </el-form-item>
  348 + <el-form-item label="身份证照片（反）" prop="idCardBackImage">
  349 + <div style="margin-top: 10px;">
  350 + <el-image style="width: 200px;" :src="$baseURL+newshop.idCardBackImage" fit="contain"></el-image>
  351 + </div>
  352 + </el-form-item>
319 353 </el-form>
320 354 </div>
321 355 </div>
... ... @@ -338,6 +372,9 @@
338 372 businessListGetById
339 373 } from '../../api/business.js'
340 374 import TitleWithCircle from '@/components/top/index';
  375 + import {
  376 + cerePlatformMerchantinfo
  377 + } from '../../api/newly.js'
341 378 export default {
342 379 components: {
343 380 TitleWithCircle
... ... @@ -372,13 +409,17 @@
372 409 contractNumber: this.info.contractNumber
373 410 }).then(res => {
374 411 console.error(res)
375   - this.shop = res.data.shop
  412 + // this.shop = res.data.shop
376 413 this.siteIds = res.data.siteIds
377 414 this.shopIds = res.data.shopIds
378 415 this.advIds = res.data.advIds
379 416 this.list = res.data.list
380 417 this.tableData = [...res.data.siteIds, ...res.data.shopIds, ...res.data.advIds]
381 418 })
  419 + cerePlatformMerchantinfo({id:this.info.relatedMerchants}).then(res => {
  420 + console.error(res)
  421 + this.shop = res.data
  422 + })
382 423 },
383 424 computed: {
384 425  
... ... @@ -408,8 +449,12 @@
408 449 console.error(row)
409 450 this.type = '2'
410 451 this.newinfo = row
411   - businessListGetById ({shopId:row.relatedMerchants}).then(res => {
412   - console.log(res)
  452 + // businessListGetById ({shopId:row.relatedMerchants}).then(res => {
  453 + // console.log(res)
  454 + // this.newshop = res.data
  455 + // })
  456 + cerePlatformMerchantinfo({id:row.relatedMerchants}).then(res => {
  457 + console.error(res)
413 458 this.newshop = res.data
414 459 })
415 460 },
... ...
admin-web-master/src/components/chakan/zl.vue
  View file @9d8bcb2
... ... @@ -469,7 +469,20 @@
469 469 </el-tab-pane>
470 470 </el-tabs>
471 471 </div>
  472 + <!-- v-if='info.auditStatus == 1' -->
  473 + <div v-if='info.auditStatus == 1' style="border-top: 2px solid #eee;">
  474 + <div style="padding-left: 130px;margin: 25px 0;">
  475 + <el-radio v-model="radio" label="2">同意</el-radio>
  476 + <el-radio v-model="radio" label="3">拒绝</el-radio>
  477 + </div>
  478 + <el-form :model="info" label-width="130px" class="demo-ruleForm">
  479 + <el-form-item label="审核意见">
  480 + <el-input maxlength="200" show-word-limit rows="4" v-model="info.reviewComments" placeholder="请输入审核意见" type="textarea" />
  481 + </el-form-item>
  482 + </el-form>
  483 + </div>
472 484 <div>
  485 + <el-button v-if='info.auditStatus == 1' @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
473 486 <el-button class="buttonHover"
474 487 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
475 488 @click="changetype">返回</el-button>
... ... @@ -486,6 +499,10 @@
486 499 } from '../../api/business.js'
487 500 import TitleWithCircle from '@/components/top/index';
488 501 import MapXian from "@/components/MapContainer/MapXian";
  502 + import {
  503 + msgedit,
  504 +
  505 + } from '@/api/cereBusinessInfo'
489 506 export default {
490 507 components: {
491 508 TitleWithCircle,
... ... @@ -501,6 +518,7 @@
501 518 },
502 519 data() {
503 520 return {
  521 + radio:'2',
504 522 ontype:'线上广告位',
505 523 url:'',
506 524 type:'1',
... ... @@ -526,6 +544,26 @@
526 544  
527 545 },
528 546 methods: {
  547 + minSev(){
  548 + console.error(this.info)
  549 + console.error(this.radio)
  550 +
  551 + msgedit({id:this.info.id,'auditStatus':this.radio,reviewComments:this.info.reviewComments}).then(res => {
  552 + console.error(res)
  553 + if (res.code == 200) {
  554 + this.$message({
  555 + message: '处理成功',
  556 + type: 'success'
  557 + })
  558 + this.info.auditStatus= this.radio
  559 + } else {
  560 + this.$message({
  561 + message: '处理失败',
  562 + type: 'error'
  563 + })
  564 + }
  565 + })
  566 + },
529 567 openfile(e) {
530 568 if (e) {
531 569 const fullUrl = this.url + e;
... ...
admin-web-master/src/components/change/cl.vue 0 → 100644
  View file @9d8bcb2
  1 +<template>
  2 + <div class="policy-selector">
  3 + <div class="policy-selector-header">
  4 + <h3>选择策略</h3>
  5 + </div>
  6 + <div class="policy-selector-content" style="max-height:50vh;overflow-y: auto;">
  7 + <el-table
  8 + :data="celueData"
  9 + tooltip-effect="dark"
  10 + @selection-change="handleSelectionChange"
  11 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
  12 + >
  13 + <el-table-column label="选择" type="selection" width="55"></el-table-column>
  14 + <el-table-column label="策略名称" prop="policyName" min-width="200"></el-table-column>
  15 + <el-table-column label="适用资源" prop="applicableResources" min-width="100"></el-table-column>
  16 + <el-table-column label="经营类型" prop="businessType" min-width="150"></el-table-column>
  17 + <el-table-column label="租金价格" prop="rentalPrice" min-width="150"></el-table-column>
  18 + <el-table-column label="租期" prop="leaseTerm" min-width="100"></el-table-column>
  19 + <el-table-column label="是否出租" prop="planningObjectives" min-width="100">
  20 + <template slot-scope="scope">
  21 + {{ scope.row.isrental == '0' ? '否' : '是' }}
  22 + </template>
  23 + </el-table-column>
  24 + <el-table-column label="是否自营" prop="planningObjectives" min-width="100">
  25 + <template slot-scope="scope">
  26 + {{ scope.row.isSelfOperated == '0' ? '否' : '是' }}
  27 + </template>
  28 + </el-table-column>
  29 + </el-table>
  30 + </div>
  31 + <div class="policy-selector-footer" style="display: flex; justify-content: flex-end; align-items: center;">
  32 + <el-button @click="confirm" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
  33 + <el-button @click="cancel" class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
  34 + </div>
  35 + </div>
  36 +</template>
  37 +
  38 +<script>
  39 + import {
  40 + ceGetAll
  41 + } from '@/api/sam.js'
  42 +export default {
  43 + name: 'PolicySelector',
  44 + data() {
  45 + return {
  46 + pageindex: {
  47 + pageNumber: 1,
  48 + pageSize: 10,
  49 + },
  50 + selectedRows: [],
  51 + celueData: []
  52 + };
  53 + },
  54 + async created() {
  55 + const celue = await ceGetAll(this.pageindex)
  56 + this.celueData = celue.data.content
  57 + },
  58 + methods: {
  59 + handleSelectionChange(selection) {
  60 + this.selectedRows = selection;
  61 + },
  62 + confirm() {
  63 + this.$emit('minSev', this.selectedRows);
  64 + },
  65 + cancel() {
  66 + this.$emit('mingClose');
  67 + }
  68 + }
  69 +};
  70 +</script>
  71 +
  72 +<style scoped>
  73 +.policy-selector {
  74 + padding: 30px;
  75 + width: 100%;
  76 + margin: 0 auto;
  77 + border: 1px solid #ddd;
  78 + border-radius: 4px;
  79 + box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
  80 +}
  81 +
  82 +.policy-selector-header {
  83 + text-align: left;
  84 + margin-bottom: 20px;
  85 +}
  86 +
  87 +.policy-selector-header h3 {
  88 + margin: 0;
  89 + font-size: 18px;
  90 + color: #303133;
  91 +}
  92 +
  93 +.policy-selector-content {
  94 + margin-bottom: 20px;
  95 +}
  96 +
  97 +.policy-selector-footer {
  98 + display: flex;
  99 + justify-content: flex-end;
  100 + align-items: center;
  101 +}
  102 +</style>
0 103 \ No newline at end of file
... ...
admin-web-master/src/components/merchantInformation/index.vue
  View file @9d8bcb2
... ... @@ -33,12 +33,12 @@
33 33 </el-row>
34 34 <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
35 35 <div style="margin-top: 10px;">
36   - <el-image style="width: 200px;" :src="info.idCardFrontImage" fit="contain"></el-image>
  36 + <el-image style="width: 200px;" :src="$baseURL+info.idCardFrontImage" fit="contain"></el-image>
37 37 </div>
38 38 </el-form-item>
39 39 <el-form-item label="身份证照片（反）" prop="idCardBackImage">
40 40 <div style="margin-top: 10px;">
41   - <el-image style="width: 200px;" :src="info.idCardBackImage" fit="contain"></el-image>
  41 + <el-image style="width: 200px;" :src="$baseURL+info.idCardBackImage" fit="contain"></el-image>
42 42 </div>
43 43 </el-form-item>
44 44 </el-form>
... ... @@ -56,7 +56,7 @@
56 56 </div>
57 57 </el-form-item>
58 58 </el-col>
59   - <el-col :span="9" v-if="info.checkState != '1'">
  59 + <el-col :span="9" v-if="info.checkState != '1' && info.checkOpinion">
60 60 <el-form-item label="审核意见" prop="phone">
61 61 <div class="duiqi">{{info.checkOpinion}}</div>
62 62 </el-form-item>
... ...
admin-web-master/src/layout/index.vue
  View file @9d8bcb2
... ... @@ -259,7 +259,7 @@ export default {
259 259 // msg:['招商服务系统','推广策划系统','在线商城系统','支付服务模块','票务'],
260 260 listMune:[],
261 261 list:[
262   - ['招商资源监测','商家管理','商铺租赁服务','系统设置','招商方案管理','招商租赁管理','广告服务'],
  262 + ['招商资源监测','商家管理','商铺租赁服务','系统设置','招商方案管理','招商租赁管理'],
263 263 // ['问卷调查'],
264 264 // ['招商资源监测','商家管理','招商方案管理','招商租赁管理','广告服务','客服服务管理','系统设置','商铺租赁服务','问卷调查','招商过程管理','商户寻租管理','轮播图设置','平台活动','客服配置','优惠券管理'],
265 265 // ['品牌策划','活动策划','氛围策划','媒体推广'],
... ... @@ -638,7 +638,7 @@ this.listMune[0] = All
638 638 let list5=[]
639 639 this.listMune = []
640 640 this.list=[
641   - ['招商资源监测','商家管理','商铺租赁服务','系统设置','招商方案管理','招商租赁管理','广告服务'],
  641 + ['招商资源监测','商家管理','商铺租赁服务','系统设置','招商方案管理','招商租赁管理'],
642 642 // ['问卷调查'],
643 643 // ['招商资源监测','商家管理','招商方案管理','招商租赁管理','广告服务','客服服务管理','系统设置','商铺租赁服务','问卷调查','招商过程管理','商户寻租管理','轮播图设置','平台活动','客服配置','优惠券管理'],
644 644 // ['品牌策划','活动策划','氛围策划','媒体推广'],
... ...
admin-web-master/src/views/business/autd/index.vue
  View file @9d8bcb2
... ... @@ -10,8 +10,8 @@
10 10 <!-- 搜索 -->
11 11 <div class="formSearch">
12 12 <el-form :inline="true" :model="pagequery">
13   - <el-form-item label="合同名称">
14   - <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" />
  13 + <el-form-item label="名称">
  14 + <el-input v-model="pagequery.name" placeholder="请输入" style="width:168px;" />
15 15 </el-form-item>
16 16 </el-form>
17 17  
... ... @@ -160,8 +160,8 @@
160 160 pagequery: {
161 161 pageNumber: 0,
162 162 pageSize: 10,
163   - dataStatus:'1',
164   - contractName: '',
  163 + checkState:'1',
  164 + name: '',
165 165  
166 166 },
167 167 tableData: [],
... ... @@ -198,6 +198,7 @@
198 198 message: '处理成功',
199 199 type: 'success'
200 200 })
  201 + this.onSubmit()
201 202 this.yujingSet = false
202 203 } else {
203 204 this.$message({
... ... @@ -239,6 +240,7 @@
239 240 removeonaction(e) {
240 241 console.error(e)
241 242 this.onaction = e
  243 + this.onSubmit()
242 244 },
243 245 handleCurrentChange(val) {
244 246 this.pagequery.pageNumber = val - 1
... ... @@ -257,8 +259,8 @@
257 259 this.pagequery = {
258 260 pageNumber: 0,
259 261 pageSize: 10,
260   - dataStatus:'1',
261   - contractName: ''
  262 + checkState:'1',
  263 + name: ''
262 264 },
263 265 this.getAll()
264 266 },
... ...
admin-web-master/src/views/business/businessList/index.vue
  View file @9d8bcb2
... ... @@ -10,8 +10,8 @@
10 10 <!-- 搜索 -->
11 11 <div class="formSearch">
12 12 <el-form :inline="true" :model="pagequery">
13   - <el-form-item label="合同名称">
14   - <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" />
  13 + <el-form-item label="名称">
  14 + <el-input v-model="pagequery.name" placeholder="请输入" style="width:168px;" />
15 15 </el-form-item>
16 16 </el-form>
17 17  
... ... @@ -76,7 +76,7 @@
76 76 <el-table-column label="操作" min-width="150" fixed="right">
77 77 <template slot-scope="scope">
78 78 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
79   - <div @click="openyujingSet(scope.row)" class="tableBtn greens">审核</div>
  79 + <!-- <div @click="openyujingSet(scope.row)" class="tableBtn greens">审核</div> -->
80 80 </template>
81 81 </el-table-column>
82 82 </el-table>
... ... @@ -173,13 +173,13 @@
173 173 pagequery: {
174 174 pageNumber: 0,
175 175 pageSize: 10,
176   - dataStatus:'1',
177   - contractName: '',
  176 + checkState:'2',
  177 + name: '',
178 178  
179 179 },
180 180 tableData: [],
181 181 total: 0,
182   - onaction: '2',
  182 + onaction: '1',
183 183 info: {}
184 184 }
185 185 },
... ... @@ -253,6 +253,7 @@
253 253 removeonaction(e) {
254 254 console.error(e)
255 255 this.onaction = e
  256 + this.onSubmit()
256 257 },
257 258 handleCurrentChange(val) {
258 259 this.pagequery.pageNumber = val - 1
... ... @@ -271,8 +272,8 @@
271 272 this.pagequery = {
272 273 pageNumber: 0,
273 274 pageSize: 10,
274   - dataStatus:'1',
275   - contractName: ''
  275 + checkState:'2',
  276 + name: ''
276 277 },
277 278 this.getAll()
278 279 },
... ...
admin-web-master/src/views/detect/admap copy 3.vue 0 → 100644
  View file @9d8bcb2
  1 +<template>
  2 + <div style="background-color:#f7f7f7;padding:10px 10px;">
  3 + <div class="zhuti" v-if="onaction == '1'">
  4 + <div style="height:58px;line-height:58px;">
  5 + <div style="color:#0006"> <span>招商资源监测</span> <span style="padding:0 5px;">></span> <span
  6 + style="color:#000000e6">资源地图</span></div>
  7 + </div>
  8 + <!-- 线上 -->
  9 + <div>
  10 + <!-- 搜索 -->
  11 + <div class="formSearch">
  12 + <el-form :inline="true" :model="pagequery">
  13 + <!-- <el-form-item label="商铺名称" prop="shopName">
  14 + <el-select v-model="pagequery.shopName" placeholder="请选择" style="width: 168px;margin-right: 15px">
  15 + <el-option :label="item.shopName" :value="item.shopName" v-for="(item,index) in this.tableData"
  16 + :key="index" />
  17 + </el-select>
  18 + </el-form-item> -->
  19 + <el-form-item label="所属区域" prop="belongingRegion">
  20 + <el-select v-model="pagequery.belongingRegion" placeholder="请选择" style="width: 168px;margin-right: 15px">
  21 + <el-option label="成华区" value="成华区"></el-option>
  22 + <el-option label="武侯区" value="武侯区"></el-option>
  23 + <el-option label="锦江区" value="锦江区"></el-option>
  24 + <el-option label="青羊区" value="青羊区"></el-option>
  25 + <el-option label="金牛区" value="金牛区"></el-option>
  26 + <el-option label="双流区" value="双流区"></el-option>
  27 + <el-option label="郫都区" value="郫都区"></el-option>
  28 + <el-option label="龙泉驿区" value="龙泉驿区"></el-option>
  29 + <el-option label="温江区" value="温江区"></el-option>
  30 + </el-select>
  31 + </el-form-item>
  32 + <el-form-item label="建筑形式" prop="architecturalForm">
  33 + <el-select v-model="pagequery.architecturalForm" placeholder="请选择"
  34 + style="width: 168px;margin-right: 15px">
  35 + <el-option label="框剪结构" value="框剪结构"></el-option>
  36 + <el-option label="区域二" value="区域二"></el-option>
  37 + </el-select>
  38 + </el-form-item>
  39 + </el-form>
  40 +
  41 + <div>
  42 + <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
  43 + </el-button>
  44 + <el-button @click="resetting" class="buttonHover"
  45 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
  46 + </el-button>
  47 + </div>
  48 + </div>
  49 + <div style="margin-bottom: 20px;">
  50 + <el-button @click="removeonaction('2')" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
  51 + icon="el-icon-circle-plus-outline">新增</el-button>
  52 + <!-- <el-button @click="" style="background-color: #3F9B6A;color: #fff">批量导入</el-button> -->
  53 + </div>
  54 + <!-- 地图 -->
  55 + <div style="display: flex;justify-content: space-between;margin-bottom: 20px;">
  56 + <div style="width: 100%;height: 400px; border: 1px solid #3F9B6A;position: relative;">
  57 + <MapContainer :message="tableData" @MapItem='HandMapItem' ref="mapComponent"></MapContainer>
  58 + </div>
  59 + </div>
  60 + <div style="margin: 20px 0;">
  61 + <div style="display: flex;font-size: 14px">
  62 + <div style="margin-right: 25px;cursor: pointer;" @click="chenge('1')" :class="ontype=='1'?'chengeXia':''">商铺
  63 + </div>
  64 + <div style="margin-right: 25px;cursor: pointer;" @click="chenge('2')" :class="ontype=='2'?'chengeXia':''">
  65 + 广告位</div>
  66 + <div style="margin-right: 25px;cursor: pointer;" @click="chenge('3')" :class="ontype=='3'?'chengeXia':''">场地
  67 + </div>
  68 + </div>
  69 + </div>
  70 + <!-- 表格 -->
  71 + <el-table v-if="ontype=='1'" :data="tableData"
  72 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
  73 + <el-table-column label="序号" min-width="80">
  74 + <template slot-scope="scope">
  75 + {{scope.$index +1 }}
  76 + </template>
  77 + </el-table-column>
  78 + <el-table-column label="编号" prop="venueNumber" show-overflow-tooltip>
  79 + </el-table-column>
  80 + <el-table-column label="门牌号" prop="houseNumber" show-overflow-tooltip>
  81 +
  82 + </el-table-column>
  83 + <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip>
  84 +
  85 + </el-table-column>
  86 + <el-table-column label="所属区域" prop="belongingRegion" show-overflow-tooltip>
  87 + </el-table-column>
  88 + <el-table-column label="建筑形式" prop="architecturalForm" show-overflow-tooltip>
  89 + </el-table-column>
  90 + <el-table-column prop="detailedLocation" label="详细地址" show-overflow-tooltip>
  91 + </el-table-column>
  92 + <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip>
  93 + </el-table-column>
  94 + <el-table-column label="负责人" prop="head" show-overflow-tooltip>
  95 + </el-table-column>
  96 + <el-table-column label="租赁到期时间" prop="leaseExpirationDate" show-overflow-tooltip>
  97 + </el-table-column>
  98 + <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
  99 + <template slot-scope="scope">
  100 + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.rentalStatus=='0'?'待租':'已租'}}
  101 + </template>
  102 + </el-table-column>
  103 + <el-table-column label="操作" min-width="250" fixed="right">
  104 + <template slot-scope="scope">
  105 + <div @click="opencl(scope.row,'sp')" class="tableBtn greens">绑定策略</div>
  106 + <div @click="details(scope.row)" class="tableBtn greens">查看</div>
  107 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑
  108 + </div>
  109 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div>
  110 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'"
  111 + @click="removeinfozz(scope.row,'1','发布')">发布</div>
  112 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
  113 + @click="removeinfozz(scope.row,'0','下架')">下架</div>
  114 + </template>
  115 + </el-table-column>
  116 + </el-table>
  117 + <el-table v-if="ontype=='2'" :data="tableData"
  118 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
  119 + <el-table-column label="序号" min-width="100">
  120 + <template slot-scope="scope">
  121 + {{scope.$index +1}}
  122 + </template>
  123 + </el-table-column>
  124 + <el-table-column label="广告位名称" prop="advertisingName" min-width="200">
  125 + </el-table-column>
  126 + <el-table-column label="广告位类型" prop="advertisingType" min-width="150">
  127 + </el-table-column>
  128 + <!-- <el-table-column label="详细地址" prop="detailedLocation" min-width="200">
  129 + </el-table-column>
  130 + <el-table-column label="设备类型" prop="deviceType" min-width="150">
  131 + </el-table-column>
  132 + <el-table-column label="设备尺寸" prop="equipmentSize" min-width="200">
  133 + </el-table-column>
  134 + <el-table-column label="场地编号" prop="venueNumber" min-width="150">
  135 + </el-table-column>
  136 + <el-table-column label="广告尺寸" prop="dimensions" min-width="200">
  137 + </el-table-column>
  138 + <el-table-column label="广告材质" prop="advertisingMaterial" min-width="150">
  139 + </el-table-column>
  140 + <el-table-column prop="createUser" label="创建人" min-width="120">
  141 + </el-table-column>
  142 + <el-table-column prop="rentalStatus" label="租赁状态" min-width="120">
  143 + <template slot-scope="scope">
  144 + {{scope.row.rentalStatus == 0?'未租':'已租'}}
  145 + </template>
  146 + </el-table-column> -->
  147 + <el-table-column prop="publishStatus" label="发布状态" min-width="120">
  148 + <template slot-scope="scope">
  149 + {{scope.row.publishStatus == 0?'待发布':'已提交'}}
  150 + </template>
  151 + </el-table-column>
  152 + <el-table-column prop="leaseExpirationDate" label="租赁到期时间" min-width="200">
  153 + </el-table-column>
  154 + <el-table-column label="操作" min-width="250" fixed="right">
  155 + <template slot-scope="scope">
  156 + <div @click="details(scope.row)" class="tableBtn greens">查看</div>
  157 + <div @click="opencl(scope.row,'gg')" class="tableBtn greens">绑定策略</div>
  158 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑
  159 + </div>
  160 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div>
  161 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'"
  162 + @click="removeinfozz(scope.row,'1','发布')">发布</div>
  163 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
  164 + @click="removeinfozz(scope.row,'0','下架')">下架</div>
  165 + </template>
  166 + </el-table-column>
  167 + </el-table>
  168 + <el-table v-if="ontype=='3'" :data="tableData"
  169 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
  170 + <el-table-column label="序号">
  171 + <template slot-scope="scope">
  172 + {{scope.$index +1}}
  173 + </template>
  174 + </el-table-column>
  175 + <!-- <el-table-column label="编号" prop="id" v-if="activeName == 'second'">
  176 + </el-table-column> -->
  177 + <el-table-column label="场地名称" prop="venueName">
  178 + </el-table-column>
  179 + <el-table-column label="实际使用面积" prop="actualArea">
  180 + </el-table-column>
  181 + <el-table-column label="场地类型" prop="venueType">
  182 + </el-table-column>
  183 + <el-table-column label="所属区域" prop="district">
  184 + </el-table-column>
  185 + <el-table-column label="详细位置" prop="detailedLocation">
  186 + </el-table-column>
  187 + <!-- <el-table-column label="租赁状态" >
  188 + </el-table-column> -->
  189 + <!-- <el-table-column label="状态" >
  190 + </el-table-column> -->
  191 + <el-table-column prop="publishStatus" label="发布状态" min-width="120">
  192 + <template slot-scope="scope">
  193 + {{scope.row.publishStatus == 0?'待发布':'已提交'}}
  194 + </template>
  195 + </el-table-column>
  196 + <el-table-column label="操作" min-width="250" fixed="right">
  197 + <template slot-scope="scope">
  198 + <div @click="details(scope.row)" class="tableBtn greens">查看</div>
  199 + <div @click="opencl(scope.row,'cd')" class="tableBtn greens">绑定策略</div>
  200 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑
  201 + </div>
  202 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div>
  203 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'"
  204 + @click="removeinfozz(scope.row,'1','发布')">发布</div>
  205 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
  206 + @click="removeinfozz(scope.row,'0','下架')">下架</div>
  207 + </template>
  208 + </el-table-column>
  209 + </el-table>
  210 + <div style="display: flex;justify-content: space-between;" class="bom">
  211 + <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div>
  212 + <el-pagination :current-page="pagequery.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="10"
  213 + background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
  214 + @current-change="handleCurrentChange">
  215 + </el-pagination>
  216 + </div>
  217 +
  218 + </div>
  219 +
  220 + </div>
  221 +
  222 +
  223 +
  224 +
  225 +
  226 +
  227 + <div class="zhuti" v-if="onaction == '2'">
  228 + <div style="height:58px;line-height:58px;">
  229 + <div style="color:#0006"> <span>{{onaction == '1'?'商铺基本信息':onaction == '2'?'广告位基本信息管理':onaction == '3'?'场地基本信息管理':'-' }}</span> <span style="padding:0 5px;">></span> <span
  230 + style="color:#000000e6">新增</span></div>
  231 + </div>
  232 + <div style="margin: 20px 0;">
  233 + <div style="display: flex;font-size: 14px">
  234 + <div style="margin-right: 25px;cursor: pointer;" @click="chenge('1')" :class="ontype=='1'?'chengeXia':''">商铺
  235 + </div>
  236 + <div style="margin-right: 25px;cursor: pointer;" @click="chenge('2')" :class="ontype=='2'?'chengeXia':''">
  237 + 广告位</div>
  238 + <div style="margin-right: 25px;cursor: pointer;" @click="chenge('3')" :class="ontype=='3'?'chengeXia':''">场地
  239 + </div>
  240 + </div>
  241 + </div>
  242 + <div v-if="ontype == '1'" style="padding: 20px 20px 20px 0;">
  243 + <add @removeonaction="removeonaction"></add>
  244 + </div>
  245 + <div v-if="ontype == '2'" style="padding: 20px 20px 20px 0;">
  246 + <addmap @removeonaction="removeonaction" :leixing="leixing"></addmap>
  247 + </div>
  248 + <div v-if="ontype == '3'" style="padding: 20px 20px 20px 0;">
  249 + <addcd @removeonaction="removeonaction"></addcd>
  250 + </div>
  251 + </div>
  252 + <div class="zhuti" v-if="onaction == '3'">
  253 + <div style="height:58px;line-height:58px;">
  254 + <div style="color:#0006"> <span>{{ONACTION == '1'?'商铺基本信息':ONACTION == '2'?'广告位基本信息管理':ONACTION == '3'?'场地基本信息管理':'-' }}</span> <span style="padding:0 5px;">></span> <span
  255 + style="color:#000000e6">查看</span></div>
  256 + </div>
  257 + <div v-if="ontype == '1'">
  258 + <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction"></resourceCommodity>
  259 + </div>
  260 + <div v-if="ontype == '2'">
  261 + <chakanmap :editbgid="detailsinfo" @removeonaction="removeonaction" :leixing="leixing"></chakanmap>
  262 + </div>
  263 + <div v-if="ontype == '3'">
  264 + <chakancd :editbgid="detailsinfo" @removeonaction="removeonaction"></chakancd>
  265 + </div>
  266 + </div>
  267 + <div class="zhuti" v-if="onaction == '4'">
  268 + <div style="height:58px;line-height:58px;">
  269 + <div style="color:#0006"> <span>{{ONACTION == '1'?'商铺基本信息':ONACTION == '2'?'广告位基本信息管理':ONACTION == '3'?'场地基本信息管理':'-' }}</span> <span style="padding:0 5px;">></span> <span
  270 + style="color:#000000e6">{{contractChangeReason}}</span></div>
  271 + </div>
  272 + <div v-if="ontype == '1'" style="padding: 20px 20px 20px 0;">
  273 + <add :info="detailsinfo" @removeonaction="removeonaction"></add>
  274 + </div>
  275 + <div v-if="ontype == '2'" style="padding: 20px 20px 20px 0;">
  276 + <addmap :info="detailsinfo" @removeonaction="removeonaction" :leixing="leixing"></addmap>
  277 + </div>
  278 + <div v-if="ontype == '3'" style="padding: 20px 20px 20px 0;">
  279 + <addcd :info="detailsinfo" @removeonaction="removeonaction"></addcd>
  280 + </div>
  281 + </div>
  282 + <el-dialog :visible.sync="addcl" title="选择策略" style="padding: 30px;" width="65%" append-to-body center
  283 + :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
  284 + <div style="max-height:50vh;overflow-y: auto;">
  285 + <el-table :data="celueData" tooltip-effect="dark" @selection-change="handleSelectionChange"
  286 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
  287 + <el-table-column label="选择" type="selection" width="55">
  288 + </el-table-column>
  289 + <el-table-column label="策略名称" prop="policyName" min-width="200">
  290 + </el-table-column>
  291 + <el-table-column label="适用资源" prop="applicableResources" min-width="100">
  292 + </el-table-column>
  293 + <el-table-column label="经营类型" prop="businessType" min-width="150">
  294 +
  295 + </el-table-column>
  296 + <el-table-column label="租金价格" prop="rentalPrice" min-width="150">
  297 + </el-table-column>
  298 + <el-table-column label="租期" prop="leaseTerm" min-width="100">
  299 + </el-table-column>
  300 + <el-table-column label="是否出租" prop="planningObjectives" min-width="100">
  301 + <template slot-scope="scope">
  302 + {{scope.row.isrental == '0'?'否':'是'}}
  303 + </template>
  304 + </el-table-column>
  305 + <el-table-column label="是否自营" prop="planningObjectives" min-width="100">
  306 + <template slot-scope="scope">
  307 + {{scope.row.isSelfOperated == '0'?'否':'是'}}
  308 + </template>
  309 + </el-table-column>
  310 + </el-table>
  311 + </div>
  312 + <template #footer>
  313 + <div style="display: flex; justify-content: flex-end; align-items: center;">
  314 + <el-button @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
  315 + <el-button @click="mingClose" class="buttonHover"
  316 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
  317 + </div>
  318 + </template>
  319 + </el-dialog>
  320 + </div>
  321 +
  322 +
  323 +</template>
  324 +
  325 +<script>
  326 + import {
  327 + cereResourceStrategy
  328 + } from '../../api/newly.js'
  329 + import {
  330 + ceGetAll
  331 + } from '../../api/sam.js'
  332 + import * as information from '../../api/information';
  333 + import * as map1 from '../../api/map1';
  334 + import {
  335 + likeGet,
  336 + } from '../../api/map1'
  337 + import {
  338 + getAlls,
  339 + changAlls
  340 + } from '../../api/information';
  341 + import add from '../../components/add/addinformation'
  342 + import resourceCommodity from '../../components/resourceCommodity/index'
  343 + import MapContainer from "@/components/MapContainer/MapContainer"
  344 + import addmap from '../../components/add/addmap'
  345 + import addcd from '../../components/add/addcd'
  346 + import chakanmap from '../../components/chakan/map'
  347 + import chakancd from '../../components/chakan/cd'
  348 + import {
  349 + on
  350 + } from 'screenfull';
  351 + export default {
  352 + data() {
  353 + return {
  354 + oninfo: {},
  355 + celueData: [],
  356 + clData: [],
  357 + multipleSelection: [],
  358 + addcl: false,
  359 + leixing: true,
  360 + //传地图数据
  361 + parentMessage: [],
  362 + ontype: '1',
  363 + contractChangeReason: '',
  364 + detailsinfo: {},
  365 + pagequery: {
  366 + dataStatus: '1',
  367 + pageNumber: 0,
  368 + pageSize: 10,
  369 + contractName: ''
  370 + },
  371 + tableData: [],
  372 + total: 0,
  373 + onaction: '1',
  374 + formInline: {},
  375 + pageindex: {
  376 + pageNumber: 1,
  377 + pageSize: 10,
  378 + },
  379 + }
  380 + },
  381 + components: {
  382 + chakancd,
  383 + addcd,
  384 + addmap,
  385 + chakanmap,
  386 + MapContainer,
  387 + add,
  388 + resourceCommodity,
  389 + },
  390 + created() {
  391 + this.getAll()
  392 + },
  393 + methods: {
  394 + minSev() {
  395 +
  396 + console.error(this.multipleSelection)
  397 + let ids = []
  398 + for (let index = 0; index < this.multipleSelection.length; index++) {
  399 + ids.push(this.multipleSelection[index].id)
  400 + }
  401 + console.error(this.oninfo)
  402 + let c1 = {
  403 + resourcesId: this.oncetype+this.oninfo.id,
  404 + rentalPoliciesIds: ids,
  405 + // resources:this.oninfo
  406 + // rentalPoliciesId: 28,
  407 + // resourcesId: "sp65"
  408 + }
  409 + console.error(c1)
  410 + cereResourceStrategy(c1).then(res => {
  411 + if (res.code == 200) {
  412 + this.addcl = false
  413 + this.$message({
  414 + message: '绑定成功',
  415 + type: 'success'
  416 + })
  417 + } else {
  418 + this.$message({
  419 + message: '绑定失败',
  420 + type: 'error'
  421 + })
  422 + }
  423 + })
  424 + },
  425 + mingClose() {
  426 + this.multipleSelection = []
  427 + this.addcl = false
  428 + },
  429 + async opencl(row,e) {
  430 + this.oncetype = e
  431 + this.oninfo = row
  432 + const celue = await ceGetAll(this.pageindex)
  433 + this.celueData = celue.data.content
  434 + this.addcl = true
  435 + },
  436 + handleSelectionChange(val) {
  437 + this.multipleSelection = val
  438 + },
  439 + chenge(e) {
  440 + this.ontype = e
  441 + this.pagequery.pageNumber = 0
  442 + this.getAll()
  443 + },
  444 + gettime() {
  445 + // 获取当前时间
  446 + let currentTime = new Date();
  447 +
  448 + // 获取年份
  449 + let year = currentTime.getFullYear();
  450 +
  451 + // 获取月份（注意月份是从0开始计数的，所以需要加1）
  452 + let month = currentTime.getMonth() + 1;
  453 +
  454 + // 获取日期
  455 + let day = currentTime.getDate();
  456 +
  457 + // 获取小时
  458 + let hours = currentTime.getHours();
  459 +
  460 + // 获取分钟
  461 + let minutes = currentTime.getMinutes();
  462 +
  463 + // 获取秒数
  464 + let seconds = currentTime.getSeconds();
  465 +
  466 + // 获取毫秒数
  467 + let milliseconds = currentTime.getMilliseconds();
  468 +
  469 + // 格式化时间为 YYYY-MM-DD
  470 + let formattedDate = `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
  471 +
  472 + // 格式化时间为 HH:MM:SS
  473 + let formattedTime =
  474 + `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
  475 +
  476 + // 格式化时间为 YYYY-MM-DD HH:MM:SS
  477 + let formattedDateTime = `${formattedDate} ${formattedTime}`;
  478 + return formattedDateTime
  479 +
  480 + },
  481 + removeinfozz(row, e, tit) {
  482 + let that = this
  483 + this.$confirm('确定要' + tit + '吗？', '提示', {
  484 + confirmButtonText: '确定',
  485 + cancelButtonText: '取消',
  486 + type: 'warning'
  487 + }).then(() => {
  488 + if (this.ontype == '1') {
  489 + information.editList({
  490 + ...row,
  491 + publishStatus: e
  492 + }).then(res => {
  493 + console.error(res)
  494 + if (res.code == 200) {
  495 + this.$message({
  496 + message: tit + '成功',
  497 + type: 'success'
  498 + })
  499 + this.removeonaction('1')
  500 + } else {
  501 + this.$message({
  502 + message: res.msg,
  503 + type: 'error'
  504 + })
  505 + }
  506 + })
  507 + } else if (this.ontype == '2') {
  508 + map1.editList({
  509 + ...row,
  510 + publishStatus: e
  511 + }).then(res => {
  512 + console.error(res)
  513 + if (res.code == 200) {
  514 + this.$message({
  515 + message: tit + '成功',
  516 + type: 'success'
  517 + })
  518 + this.removeonaction('1')
  519 + } else {
  520 + this.$message({
  521 + message: res.msg,
  522 + type: 'error'
  523 + })
  524 + }
  525 + })
  526 + } else if (this.ontype == '3') {
  527 + information.changedit({
  528 + ...row,
  529 + publishStatus: e
  530 + }).then(res => {
  531 + console.error(res)
  532 + if (res.code == 200) {
  533 + this.$message({
  534 + message: tit + '成功',
  535 + type: 'success'
  536 + })
  537 + this.removeonaction('1')
  538 + } else {
  539 + this.$message({
  540 + message: res.msg,
  541 + type: 'error'
  542 + })
  543 + }
  544 + })
  545 + }
  546 +
  547 + })
  548 + },
  549 + details(row) {
  550 + this.detailsinfo = row
  551 + this.onaction = '3'
  552 + },
  553 + removeinfo(row, e) {
  554 + this.contractChangeReason = e
  555 + this.detailsinfo = row
  556 + this.onaction = '4'
  557 + },
  558 + async getAll() {
  559 + if (this.ontype == '1') {
  560 + const res = await getAlls(this.pagequery)
  561 + this.tableData = res.data.content
  562 + this.total = res.data.totalElements
  563 + } else if (this.ontype == '2') {
  564 + const res = await likeGet(this.pagequery)
  565 + this.tableData = res.data.content
  566 + this.total = res.data.totalElements
  567 + } else if (this.ontype == '3') {
  568 + const res = await changAlls(this.pagequery)
  569 + this.tableData = res.data.content
  570 + this.total = res.data.totalElements
  571 + }
  572 +
  573 + },
  574 + removeonaction(e) {
  575 + console.error(e)
  576 + this.onaction = e
  577 + this.pagequery.pageNumber = 0
  578 + this.getAll()
  579 + },
  580 + handleCurrentChange(val) {
  581 + this.pagequery.pageNumber = val - 1
  582 + this.getAll()
  583 + },
  584 + handleSizeChange(val) {
  585 + this.pagequery.pageSize = val
  586 + },
  587 + // 查询按钮
  588 + async onSubmit() {
  589 + this.pagequery.pageNumber = 0
  590 + this.getAll()
  591 + },
  592 + //重置按钮
  593 + resetting() {
  594 + this.pagequery = {
  595 + pageNumber: 0,
  596 + pageSize: 10,
  597 + dataStatus: '1',
  598 + contractName: ''
  599 + },
  600 + this.getAll()
  601 + },
  602 + //删除
  603 + closemsg(item) {
  604 + const h = this.$createElement;
  605 + this.$msgbox({
  606 + title: '消息',
  607 + message: h('p', null, [
  608 + h('span', null, '是否删除 '),
  609 + ]),
  610 + showCancelButton: true,
  611 + showClose: false,
  612 + confirmButtonText: '确定',
  613 + cancelButtonText: '取消',
  614 + customClass: 'oe-dialog-btn',
  615 + beforeClose: (action, instance, done) => {
  616 + if (action === 'confirm') {
  617 + if (this.ontype == '1') {
  618 + information.delList({
  619 + id: item.id
  620 + }).then(res => {
  621 + this.$message({
  622 + message: '删除成功',
  623 + type: 'success'
  624 + })
  625 + this.getAll()
  626 + done();
  627 + })
  628 + } else if (this.ontype == '2') {
  629 + map1.delList({
  630 + id: item.id
  631 + }).then(res => {
  632 + this.$message({
  633 + message: '删除成功',
  634 + type: 'success'
  635 + })
  636 + this.getAll()
  637 + done();
  638 + })
  639 + } else if (this.ontype == '3') {
  640 + information.changDel({
  641 + id: item.id
  642 + }).then(res => {
  643 + this.$message({
  644 + message: '删除成功',
  645 + type: 'success'
  646 + })
  647 + this.getAll()
  648 + done();
  649 + })
  650 + }
  651 + } else {
  652 + done();
  653 + }
  654 + }
  655 + })
  656 + },
  657 + //地图详细
  658 + HandMapItem(item) {
  659 + console.log(item)
  660 +
  661 +
  662 + // if (this.activeName == 'first') {
  663 + // this.editbgid = item
  664 + // this.restype = '商铺'
  665 +
  666 + // this.showBian = true
  667 + // if (typeof this.editbgid.mapPunctuation == 'string') {
  668 + // this.parentMessage = JSON.parse(this.editbgid.mapPunctuation)
  669 + // }
  670 +
  671 + // } else if (this.activeName == 'second') {
  672 + // this.editbgid = item
  673 + // this.restype = '广告位'
  674 +
  675 + // this.showBian = true
  676 + // if (item.advertisingType == '线上广告位') {
  677 + // this.leixing = true
  678 + // } else {
  679 + // this.leixing = false
  680 + // }
  681 +
  682 + // if (typeof this.editbgid.mapMarker == 'string') {
  683 + // this.parentMessage = JSON.parse(this.editbgid.mapMarker)
  684 + // }
  685 + // } else if (this.activeName == 'third') {
  686 + // this.editbgid = item
  687 + // this.restype = '场地'
  688 +
  689 + // this.showBian = true
  690 + // if (typeof this.editbgid.mapMarker == 'string') {
  691 + // this.parentMessage = JSON.parse(this.editbgid.mapMarker)
  692 + // }
  693 + // } else if (this.activeName == 'fourth') {
  694 +
  695 + // }
  696 +
  697 +
  698 + },
  699 + }
  700 +
  701 + }
  702 +</script>
  703 +
  704 +<style scoped>
  705 + .el-table {
  706 + /* height: calc(100vh - 330px); */
  707 + }
  708 +
  709 + .zhuti {
  710 + padding: 0 20px 20px 20px;
  711 + min-height: calc(100vh - 50px - 20px);
  712 + background-color: #Fff;
  713 +
  714 + }
  715 +
  716 + .chengeXia {
  717 + border-bottom: 6px solid #3F9B6A;
  718 + padding-bottom: 4px;
  719 + color: #3F9B6A;
  720 + }
  721 +
  722 + /* /deep/ .el-form-item__content {
  723 + line-height: 0;
  724 + } */
  725 +
  726 + .tableBtn {
  727 + display: inline-block;
  728 + margin-right: 10px;
  729 + color: #ACACAC;
  730 + }
  731 +
  732 + .formSearch {
  733 + display: flex;
  734 + width: 100%;
  735 + font-size: 14px;
  736 + justify-content: space-between;
  737 + }
  738 +
  739 + .greens {
  740 + color: #3F9B6A;
  741 + }
  742 +
  743 + /deep/ .el-table__row {
  744 + font-size: 14px;
  745 + color: #000000e6;
  746 + height: 42px;
  747 + }
  748 +
  749 + .fenye {
  750 + margin-top: 20px;
  751 + display: flex;
  752 + justify-content: space-between;
  753 + }
  754 +
  755 + /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
  756 + background-color: #3F9B6A;
  757 + }
  758 +
  759 +
  760 +
  761 + .el-col {
  762 + border-radius: 4px;
  763 + }
  764 +
  765 + .bg-purple-dark {
  766 + background: #99a9bf;
  767 + }
  768 +
  769 + .bg-purple {
  770 + background: #d3dce6;
  771 + }
  772 +
  773 + .bg-purple-light {
  774 + background: #e5e9f2;
  775 + }
  776 +
  777 + .grid-content {
  778 + border-radius: 4px;
  779 + min-height: 36px;
  780 + }
  781 +
  782 + .row-bg {
  783 + padding: 10px 0;
  784 + background-color: #f9fafc;
  785 + }
  786 +
  787 + /deep/ .bg-purple[data-v-0e3fe4ec] {
  788 + background: #fff;
  789 + height: 50px;
  790 + }
  791 +
  792 + /deep/ .bg-purple[data-v-3bebae82] {
  793 + background: #fff;
  794 + height: 50px;
  795 + }
  796 +
  797 + ::v-deep .bg-purple {
  798 + background: #fff;
  799 + height: 50px;
  800 + }
  801 +
  802 + /deep/ .el-form--label-top .el-form-item__label {
  803 + padding: 0;
  804 + }
  805 +
  806 + ::v-deep .el-dialog__wrapper {
  807 + .el-dialog__header {
  808 + background-color: #fff;
  809 + }
  810 + }
  811 +
  812 +
  813 +
  814 + .dialog-footer {
  815 + display: flex;
  816 + justify-content: flex-end;
  817 + border-top: solid rgba(209, 209, 209, 0.2) 2px;
  818 + padding-top: 20px;
  819 + }
  820 +
  821 +
  822 +
  823 +
  824 + .el-select-dropdown__item.selected {
  825 + color: #3F9B6A;
  826 + }
  827 +
  828 + ::v-deep .el-dialog__title {
  829 + color: #000;
  830 + }
  831 +
  832 + ::v-deep .el-dialog__wrapper {
  833 +
  834 + .dialog_css {
  835 + margin-right: 12px;
  836 + margin-top: 61px !important;
  837 +
  838 + }
  839 +
  840 + .diaslog_zhong {
  841 + margin-left: 222px;
  842 + margin-top: 61px !important;
  843 + }
  844 +
  845 + }
  846 +
  847 + /deep/ .el-table_1_column_8 .hetong {
  848 + color: #7DBB9A;
  849 + text-decoration: underline;
  850 + }
  851 +
  852 + /deep/ .first-column-bg {
  853 + background-color: #FAFAFA !important;
  854 + }
  855 +
  856 + .el-table tr {
  857 + height: 56px;
  858 + }
  859 +
  860 + ::v-deep .table3 {
  861 + .el-table__empty-block {
  862 + display: none;
  863 + }
  864 + }
  865 +
  866 + ::v-deep .textarea {
  867 + width: 85%;
  868 +
  869 + .el-textarea__inner {
  870 + width: 100%;
  871 + }
  872 + }
  873 +
  874 + ::v-deep .el-button--mini {
  875 + padding: 7px 10px;
  876 + }
  877 +
  878 + ::v-deep .pass_input {
  879 + width: 100%;
  880 +
  881 + .el-input__inner {
  882 + border: none;
  883 + padding: 0;
  884 + }
  885 + }
  886 +
  887 + ::v-deep .pass_select {
  888 + width: 100%;
  889 +
  890 + .el-input__inner {
  891 + border: none;
  892 + padding: 0;
  893 + }
  894 +
  895 + .el-icon-arrow-up:before {
  896 + content: ''
  897 + }
  898 +
  899 + }
  900 +
  901 + /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
  902 + background-color: #fff;
  903 + }
  904 +</style>
  905 +<style lang="scss" scoped>
  906 + ::v-deep .el-dialog__body {
  907 + // padding: 0 0 !important;
  908 + }
  909 +
  910 + ::v-deep .buttonHover:hover {
  911 + color: #3f9b6a !important;
  912 + border-color: #c5e1d2 !important;
  913 + background-color: #ecf5f0 !important;
  914 + outline: none;
  915 + }
  916 +</style>
... ...
admin-web-master/src/views/detect/admap.vue
  View file @9d8bcb2
... ... @@ -279,43 +279,9 @@
279 279 <addcd :info="detailsinfo" @removeonaction="removeonaction"></addcd>
280 280 </div>
281 281 </div>
282   - <el-dialog :visible.sync="addcl" title="选择策略" style="padding: 30px;" width="65%" append-to-body center
  282 + <el-dialog :visible.sync="addcl" style="padding: 0px;" width="65%" append-to-body center
283 283 :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
284   - <div style="max-height:50vh;overflow-y: auto;">
285   - <el-table :data="celueData" tooltip-effect="dark" @selection-change="handleSelectionChange"
286   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
287   - <el-table-column label="选择" type="selection" width="55">
288   - </el-table-column>
289   - <el-table-column label="策略名称" prop="policyName" min-width="200">
290   - </el-table-column>
291   - <el-table-column label="适用资源" prop="applicableResources" min-width="100">
292   - </el-table-column>
293   - <el-table-column label="经营类型" prop="businessType" min-width="150">
294   -
295   - </el-table-column>
296   - <el-table-column label="租金价格" prop="rentalPrice" min-width="150">
297   - </el-table-column>
298   - <el-table-column label="租期" prop="leaseTerm" min-width="100">
299   - </el-table-column>
300   - <el-table-column label="是否出租" prop="planningObjectives" min-width="100">
301   - <template slot-scope="scope">
302   - {{scope.row.isrental == '0'?'否':'是'}}
303   - </template>
304   - </el-table-column>
305   - <el-table-column label="是否自营" prop="planningObjectives" min-width="100">
306   - <template slot-scope="scope">
307   - {{scope.row.isSelfOperated == '0'?'否':'是'}}
308   - </template>
309   - </el-table-column>
310   - </el-table>
311   - </div>
312   - <template #footer>
313   - <div style="display: flex; justify-content: flex-end; align-items: center;">
314   - <el-button @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
315   - <el-button @click="mingClose" class="buttonHover"
316   - style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
317   - </div>
318   - </template>
  284 + <cl @minSev="minSev" @mingClose="mingClose"></cl>
319 285 </el-dialog>
320 286 </div>
321 287  
... ... @@ -345,6 +311,7 @@
345 311 import addcd from '../../components/add/addcd'
346 312 import chakanmap from '../../components/chakan/map'
347 313 import chakancd from '../../components/chakan/cd'
  314 + import cl from '@/components/change/cl.vue'
348 315 import {
349 316 on
350 317 } from 'screenfull';
... ... @@ -379,6 +346,7 @@
379 346 }
380 347 },
381 348 components: {
  349 + cl,
382 350 chakancd,
383 351 addcd,
384 352 addmap,
... ... @@ -391,8 +359,8 @@
391 359 this.getAll()
392 360 },
393 361 methods: {
394   - minSev() {
395   -
  362 + minSev(e) {
  363 + this.multipleSelection = e
396 364 console.error(this.multipleSelection)
397 365 let ids = []
398 366 for (let index = 0; index < this.multipleSelection.length; index++) {
... ... @@ -429,8 +397,7 @@
429 397 async opencl(row,e) {
430 398 this.oncetype = e
431 399 this.oninfo = row
432   - const celue = await ceGetAll(this.pageindex)
433   - this.celueData = celue.data.content
  400 + this.multipleSelection = []
434 401 this.addcl = true
435 402 },
436 403 handleSelectionChange(val) {
... ... @@ -904,7 +871,7 @@
904 871 </style>
905 872 <style lang="scss" scoped>
906 873 ::v-deep .el-dialog__body {
907   - // padding: 0 0 !important;
  874 + padding: 0 0 !important;
908 875 }
909 876  
910 877 ::v-deep .buttonHover:hover {
... ... @@ -913,4 +880,7 @@
913 880 background-color: #ecf5f0 !important;
914 881 outline: none;
915 882 }
  883 + .el-dialog__header{
  884 + padding: 0 0 !important;
  885 + }
916 886 </style>
... ...
admin-web-master/src/views/rent/audit/index.vue
  View file @9d8bcb2
... ... @@ -79,9 +79,10 @@
79 79 <el-table-column label="操作" min-width="150" fixed="right">
80 80 <template slot-scope="scope">
81 81 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
82   - <div v-if='scope.row.auditStatus == 1' @click="remove(scope.row,'2')" class="tableBtn greens">同意</div>
83   - <div v-if='scope.row.auditStatus == 1' @click="remove(scope.row,'3')" class="tableBtn greens">驳回</div>
84   - <div v-if='scope.row.auditStatus == 2' @click="removeinfo(scope.row,'合同续约')" class="tableBtn greens">录入合同</div>
  82 + <div @click="details(scope.row)" class="tableBtn greens">审核</div>
  83 + <!-- <div v-if='scope.row.auditStatus == 1' @click="remove(scope.row,'2')" class="tableBtn greens">同意</div>
  84 + <div v-if='scope.row.auditStatus == 1' @click="remove(scope.row,'3')" class="tableBtn greens">驳回</div> -->
  85 + <div v-if='scope.row.auditStatus == 2' @click="removeonaction('2')" class="tableBtn greens">录入合同</div>
85 86 </template>
86 87 </el-table-column>
87 88 </el-table>
... ...