Commit 173aa0e0ca4f87de80a78e7148d5a5b3b37450f0

Authored by wesley88
1 parent 5de38747

1

admin-web-master/dist.zip deleted
No preview for this file type
admin-web-master/src/components/add/addht.vue
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 <el-select style="width: 100%;" v-model="formInline.relatedMerchants" placeholder="请输入关键词搜索" filterable 96 <el-select style="width: 100%;" v-model="formInline.relatedMerchants" placeholder="请输入关键词搜索" filterable
97 @change="changeRelatedMerchants"> 97 @change="changeRelatedMerchants">
98 <el-option v-for="(item,index) in shopList" :key="index" :label="item.name+ ' ' + item.phone" 98 <el-option v-for="(item,index) in shopList" :key="index" :label="item.name+ ' ' + item.phone"
99 - :value="index" /> 99 + :value="item.id+''" />
100 </el-select> 100 </el-select>
101 </el-form-item> 101 </el-form-item>
102 <el-row :gutter="20"> 102 <el-row :gutter="20">
@@ -254,6 +254,12 @@ @@ -254,6 +254,12 @@
254 import { 254 import {
255 cerePlatformMerchant 255 cerePlatformMerchant
256 } from '@/api/newly.js' 256 } from '@/api/newly.js'
  257 + import {
  258 + msgedit
  259 + } from '@/api/cereBusinessInfo'
  260 + import {
  261 + AdvertiserInfoEdit
  262 + } from '@/api/advertisement.js'
257 export default { 263 export default {
258 components: { 264 components: {
259 upimg 265 upimg
@@ -413,11 +419,32 @@ @@ -413,11 +419,32 @@
413 default: {} 419 default: {}
414 } 420 }
415 }, 421 },
416 - created() {  
417 - cerePlatformMerchant(this.shopfrom).then(res => { 422 + async created() {
  423 + console.error({...this.info})
  424 + await cerePlatformMerchant(this.shopfrom).then(res => {
418 this.shopList = res.data.content 425 this.shopList = res.data.content
419 console.error(this.shopList) 426 console.error(this.shopList)
420 }) 427 })
  428 + if(this.info.id) {
  429 + if(this.info.cereBasicInformationShop && this.info.cereBasicInformationShop.id) {
  430 + this.AddData.push(this.info.cereBasicInformationShop)
  431 + }
  432 + if(this.info.cereAdvertisingInformation && this.info.cereAdvertisingInformation.id) {
  433 + this.AddData.push(this.info.cereAdvertisingInformation)
  434 + }
  435 + if(this.info.cereBasicInformationVenue && this.info.cereBasicInformationVenue.id) {
  436 + this.AddData.push(this.info.cereBasicInformationVenue)
  437 + }
  438 + for (let index = 0; index < this.shopList.length; index++) {
  439 + const element = this.shopList[index];
  440 + console.error(element)
  441 + if(element.phone == this.info.applicant) {
  442 + this.formInline.relatedMerchants = element.id+''
  443 + this.formInline.tenantName = element.name
  444 + this.formInline.tenantTelephone = element.phone
  445 + }
  446 + }
  447 + }
421 }, 448 },
422 methods: { 449 methods: {
423 add() { 450 add() {
@@ -485,6 +512,32 @@ @@ -485,6 +512,32 @@
485 message: '添加成功', 512 message: '添加成功',
486 type: 'success' 513 type: 'success'
487 }) 514 })
  515 + if(this.info.id) {
  516 + if(this.info.cereBasicInformationShop && this.info.cereBasicInformationShop.id) {
  517 + msgedit({
  518 + auditStatus: '4',
  519 + id: this.info.id,
  520 + contractNumber: this.formInline.contractNumber
  521 + })
  522 + }
  523 + if(this.info.cereAdvertisingInformation && this.info.cereAdvertisingInformation.id) {
  524 + AdvertiserInfoEdit({
  525 + auditStatus: '4',
  526 + id: this.info.id,
  527 + contractId: this.formInline.contractNumber
  528 + }).then(item => {
  529 + this.getAll()
  530 + })
  531 + }
  532 + if(this.info.cereBasicInformationVenue && this.info.cereBasicInformationVenue.id) {
  533 + msgedit({
  534 + auditStatus: '4',
  535 + id: this.info.id,
  536 + contractNumber: this.formInline.contractNumber
  537 + })
  538 + }
  539 +
  540 + }
488 this.$emit('removeonaction', '1') 541 this.$emit('removeonaction', '1')
489 } else { 542 } else {
490 this.$message({ 543 this.$message({
admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
77 <template slot-scope="scope"> 77 <template slot-scope="scope">
78 <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div> 78 <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div>
79 <div v-if="scope.row.auditStatus =='1' " @click="details(scope.row,'2')" class="tableBtn greens">审核</div> 79 <div v-if="scope.row.auditStatus =='1' " @click="details(scope.row,'2')" class="tableBtn greens">审核</div>
80 - <div v-if="scope.row.auditStatus == '2'" @click="removeonaction('2')" class="tableBtn greens">录入合同</div> 80 + <div v-if="scope.row.auditStatus == '2'" @click="openhet(scope.row)" class="tableBtn greens">录入合同</div>
81 <div @click="removeinfozz(scope.row,'5','终止')" class="tableBtn greens" 81 <div @click="removeinfozz(scope.row,'5','终止')" class="tableBtn greens"
82 v-if="(scope.row.auditStatus =='2' || scope.row.auditStatus =='4') && leixing">终止 82 v-if="(scope.row.auditStatus =='2' || scope.row.auditStatus =='4') && leixing">终止
83 </div> 83 </div>
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
111 </div> 111 </div>
112 112
113 <div style="padding: 20px 20px 20px 0;"> 113 <div style="padding: 20px 20px 20px 0;">
114 - <add @removeonaction="removeonaction"></add> 114 + <add :info="formInline" @removeonaction="removeonaction"></add>
115 </div> 115 </div>
116 </div> 116 </div>
117 <div class="zhuti" v-if="onaction == '3'"> 117 <div class="zhuti" v-if="onaction == '3'">
@@ -232,6 +232,10 @@ @@ -232,6 +232,10 @@
232 this.getAll() 232 this.getAll()
233 }, 233 },
234 methods: { 234 methods: {
  235 + openhet(row) {
  236 + this.formInline = row
  237 + this.onaction = '2'
  238 + },
235 changeauditStatus() { 239 changeauditStatus() {
236 AdvertiserInfoEdit({ 240 AdvertiserInfoEdit({
237 id: this.oninfo.id, 241 id: this.oninfo.id,
admin-web-master/src/views/rent/audit/index.vue
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 <template slot-scope="scope"> 88 <template slot-scope="scope">
89 <div @click="details(scope.row)" class="tableBtn greens">查看</div> 89 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
90 <div @click="details(scope.row)" class="tableBtn greens">审核</div> 90 <div @click="details(scope.row)" class="tableBtn greens">审核</div>
91 - <div v-if='scope.row.auditStatus == 2' @click="removeonaction('2')" class="tableBtn greens">录入合同</div> 91 + <div v-if='scope.row.auditStatus == 2' @click="openhet(scope.row)" class="tableBtn greens">录入合同</div>
92 </template> 92 </template>
93 </el-table-column> 93 </el-table-column>
94 </el-table> 94 </el-table>
@@ -185,6 +185,10 @@ @@ -185,6 +185,10 @@
185 this.getAll() 185 this.getAll()
186 }, 186 },
187 methods: { 187 methods: {
  188 + openhet(row) {
  189 + this.formInline = row
  190 + this.onaction = '2'
  191 + },
188 //删除 192 //删除
189 async closemsg(e) { 193 async closemsg(e) {
190 console.error(e) 194 console.error(e)