From 542e27d5696da5bb7d4af2766a383ef1defab17d Mon Sep 17 00:00:00 2001 From: wesley88 <9519127+wesley88@user.noreply.gitee.com> Date: Mon, 24 Mar 2025 18:01:01 +0800 Subject: [PATCH] 1 --- admin-web-master/src/api/newly.js | 33 +++++++++++++++++++++++++++++++++ admin-web-master/src/components/add/addcd.vue | 43 +++++++++++++++++++++++++++++++++++++------ admin-web-master/src/components/add/addht.vue | 20 ++++++++++++++++++-- admin-web-master/src/components/add/addmap.vue | 44 +++++++++++++++++++++++++++++++++++--------- admin-web-master/src/components/buscha/busCha.vue | 13 +++++++++---- admin-web-master/src/components/buscha/busChanew.vue | 9 +++++---- admin-web-master/src/components/chakan/cd.vue | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- admin-web-master/src/components/chakan/map.vue | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------- admin-web-master/src/components/resourceCommodity/index.vue | 35 ++++++++++++++++++++++++++++------- admin-web-master/src/main.js | 33 ++++++++++++++++++++++++++++++++- admin-web-master/src/utils/request.js | 4 ++-- admin-web-master/src/utils/request2.js | 4 ++-- admin-web-master/src/views/couponmanagement/capitalpool.vue | 4 ++-- admin-web-master/src/views/shopRental/manage/index.vue | 5 +++-- admin-web-master/src/views/shopRental/renewalMan/index.vue | 5 +++-- admin-web-master/src/views/shopRental/rentTermination/add.vue | 44 ++++++++++++++++++++++++-------------------- admin-web-master/src/views/shopRental/rentTermination/index.vue | 5 +++-- lvdao-miniapp/pages/message/message.vue | 7 ++++++- lvdao-miniapp/pages/my/my.vue | 8 +++++++- lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue | 7 ++++--- lvdao-miniapp/pagesA/rentPay/rentPay.vue | 21 ++++++++++++++++++--- lvdao-miniapp/utils/request.js | 12 ++++++------ 22 files changed, 417 insertions(+), 97 deletions(-) diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js index 89e2702..2fb7494 100644 --- a/admin-web-master/src/api/newly.js +++ b/admin-web-master/src/api/newly.js @@ -1,5 +1,38 @@ import request from '@/utils/request' // import request from '@/utils/request2' + +// 方案资源 +export function resourcesFindPlan(data) { + return request({ + url: '/cereBusinessPlan/resourcesFindPlan', + method: 'post', + data + }) +} +// 发消息 +export function sendToUser(data) { + return request({ + url: '/cereMessage/sendToUser', + method: 'post', + data + }) +} +// 修改查询合同的店铺 +export function cereAssetShopInformationedit(data) { + return request({ + url: '/cereAssetShopInformation/edit', + method: 'post', + data + }) +} +// 查询合同的店铺 +export function cereAssetShopInformationqueryByPage(data) { + return request({ + url: '/cereAssetShopInformation/queryByPage', + method: 'post', + data + }) +} // 退租决算管理oa export function generalBySurrenderTenancy(data) { return request({ diff --git a/admin-web-master/src/components/add/addcd.vue b/admin-web-master/src/components/add/addcd.vue index afd88a8..9aad14c 100644 --- a/admin-web-master/src/components/add/addcd.vue +++ b/admin-web-master/src/components/add/addcd.vue @@ -32,7 +32,26 @@ - + + + + + + + + + + + + + + + + + @@ -112,16 +131,16 @@ miniioupload } from '../../api/commodityLease.js' import { - gongyuan, - addList, - editList - } from '../../api/map1.js'; - import { changadd, changedit } from '../../api/information' import newmap from "@/components/newmap/indexall"; import wangEditor from "@/components/editor/index" + import { + lvdaoduan, + parkTrails, + gongyuan + } from '@/api/information.js'; export default { components: { upimg, @@ -132,6 +151,7 @@ }, data() { return { + lat: 30.67, lng: 104.06, ontype: '线上广告位', @@ -167,8 +187,15 @@ phoneNumber: '', // 联系电话 createDate: '', // 创建时间 createUser: '', // 创建人 + belongingGreenwaySection: '', // 所属绿道段 + belongingParkTrail: '', // 所属公园/步道 }, rulesSt: { + belongingGreenwaySection: [{ + required: true, + message: '请填写所属绿道段', + trigger: 'blur' + }, ], venueName: [{ required: true, message: '请输入场地名称', @@ -208,6 +235,7 @@ uploadFiles: [], filesLength: 1, gongyuanList: [], + lvdaoList: [], fileData: [], parentMessage: {}, edit: true @@ -235,6 +263,9 @@ } else { } + const lvdao = await lvdaoduan() + const gongyua = await parkTrails() + this.lvdaoList = lvdao.data.concat(gongyua.data) }, methods: { diff --git a/admin-web-master/src/components/add/addht.vue b/admin-web-master/src/components/add/addht.vue index 9f46199..bb098d2 100644 --- a/admin-web-master/src/components/add/addht.vue +++ b/admin-web-master/src/components/add/addht.vue @@ -40,7 +40,8 @@ cereContractTemplate,cerePlatformMerchant } from '@/api/newly.js' import { - dataInprotDocument,modifyResourceStatus + dataInprotDocument,modifyResourceStatus, + cereAssetShopInformationqueryByPage,cereAssetShopInformationedit } from '@/api/newly.js' import { msgedit @@ -115,7 +116,8 @@ import { templateInformationUrl:'' }, templateAttachment:'', - AddData:[] + AddData:[], + dpinfo:null } }, props: { @@ -142,6 +144,12 @@ import { if(this.info.cereBasicInformationVenue && this.info.cereBasicInformationVenue.id) { this.AddData.push(this.info.cereBasicInformationVenue) } + cereAssetShopInformationqueryByPage({"pageNumber":0,"pageSize":10,"contractId":this.info.id}).then(res => { + console.error(res.data.content) + if(res.data.content.length>0){ + this.dpinfo = res.data.content[0] + } + }) // for (let index = 0; index < this.shopList.length; index++) { // const element = this.shopList[index]; // console.error(element) @@ -256,6 +264,14 @@ import { }).then(res => { console.error(res) }) + if(this.dpinfo) { + cereAssetShopInformationedit({ + ...this.dpinfo, + contractId:res.data + }).then(res => { + console.error(res) + }) + } this.$emit('removeonaction', '1') } else { this.$message({ diff --git a/admin-web-master/src/components/add/addmap.vue b/admin-web-master/src/components/add/addmap.vue index e76063d..099989e 100644 --- a/admin-web-master/src/components/add/addmap.vue +++ b/admin-web-master/src/components/add/addmap.vue @@ -1,6 +1,6 @@