diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip deleted file mode 100644 index a7864d1..0000000 --- a/admin-web-master/dist.zip +++ /dev/null diff --git a/admin-web-master/src/components/add/addht.vue b/admin-web-master/src/components/add/addht.vue index 4ed1df6..597a57e 100644 --- a/admin-web-master/src/components/add/addht.vue +++ b/admin-web-master/src/components/add/addht.vue @@ -96,7 +96,7 @@ + :value="item.id+''" /> @@ -254,6 +254,12 @@ import { cerePlatformMerchant } from '@/api/newly.js' + import { + msgedit + } from '@/api/cereBusinessInfo' + import { + AdvertiserInfoEdit + } from '@/api/advertisement.js' export default { components: { upimg @@ -413,11 +419,32 @@ default: {} } }, - created() { - cerePlatformMerchant(this.shopfrom).then(res => { + async created() { + console.error({...this.info}) + await cerePlatformMerchant(this.shopfrom).then(res => { this.shopList = res.data.content console.error(this.shopList) }) + if(this.info.id) { + if(this.info.cereBasicInformationShop && this.info.cereBasicInformationShop.id) { + this.AddData.push(this.info.cereBasicInformationShop) + } + if(this.info.cereAdvertisingInformation && this.info.cereAdvertisingInformation.id) { + this.AddData.push(this.info.cereAdvertisingInformation) + } + if(this.info.cereBasicInformationVenue && this.info.cereBasicInformationVenue.id) { + this.AddData.push(this.info.cereBasicInformationVenue) + } + for (let index = 0; index < this.shopList.length; index++) { + const element = this.shopList[index]; + console.error(element) + if(element.phone == this.info.applicant) { + this.formInline.relatedMerchants = element.id+'' + this.formInline.tenantName = element.name + this.formInline.tenantTelephone = element.phone + } + } + } }, methods: { add() { @@ -485,6 +512,32 @@ message: '添加成功', type: 'success' }) + if(this.info.id) { + if(this.info.cereBasicInformationShop && this.info.cereBasicInformationShop.id) { + msgedit({ + auditStatus: '4', + id: this.info.id, + contractNumber: this.formInline.contractNumber + }) + } + if(this.info.cereAdvertisingInformation && this.info.cereAdvertisingInformation.id) { + AdvertiserInfoEdit({ + auditStatus: '4', + id: this.info.id, + contractId: this.formInline.contractNumber + }).then(item => { + this.getAll() + }) + } + if(this.info.cereBasicInformationVenue && this.info.cereBasicInformationVenue.id) { + msgedit({ + auditStatus: '4', + id: this.info.id, + contractNumber: this.formInline.contractNumber + }) + } + + } this.$emit('removeonaction', '1') } else { this.$message({ diff --git a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue index 8e850aa..0332412 100644 --- a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue +++ b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue @@ -77,7 +77,7 @@