From 173aa0e0ca4f87de80a78e7148d5a5b3b37450f0 Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Sun, 12 Jan 2025 14:26:48 +0800
Subject: [PATCH] 1

---
 admin-web-master/dist.zip                                                        | Bin 18211072 -> 0 bytes
 admin-web-master/src/components/add/addht.vue                                    | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue |  8 ++++++--
 admin-web-master/src/views/rent/audit/index.vue                                  |  6 +++++-
 4 files changed, 67 insertions(+), 6 deletions(-)
 delete mode 100644 admin-web-master/dist.zip

diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip
deleted file mode 100644
index a7864d1..0000000
Binary files a/admin-web-master/dist.zip and /dev/null differ
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 @@
         <el-select style="width: 100%;" v-model="formInline.relatedMerchants" placeholder="请输入关键词搜索" filterable
           @change="changeRelatedMerchants">
           <el-option v-for="(item,index) in shopList" :key="index" :label="item.name+ ' ' + item.phone"
-            :value="index" />
+            :value="item.id+''" />
         </el-select>
       </el-form-item>
       <el-row :gutter="20">
@@ -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 @@
             <template slot-scope="scope">
               <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div>
               <div v-if="scope.row.auditStatus =='1' "  @click="details(scope.row,'2')" class="tableBtn greens">审核</div>
-              <div v-if="scope.row.auditStatus == '2'" @click="removeonaction('2')" class="tableBtn greens">录入合同</div>
+              <div v-if="scope.row.auditStatus == '2'" @click="openhet(scope.row)" class="tableBtn greens">录入合同</div>
               <div @click="removeinfozz(scope.row,'5','终止')" class="tableBtn greens"
                 v-if="(scope.row.auditStatus =='2' || scope.row.auditStatus =='4') && leixing">终止
               </div>
@@ -111,7 +111,7 @@
       </div>
 
       <div style="padding: 20px 20px 20px 0;">
-        <add @removeonaction="removeonaction"></add>
+        <add :info="formInline" @removeonaction="removeonaction"></add>
       </div>
     </div>
     <div class="zhuti" v-if="onaction == '3'">
@@ -232,6 +232,10 @@
       this.getAll()
     },
     methods: {
+      openhet(row) {
+        this.formInline = row
+        this.onaction = '2'
+      },
       changeauditStatus() {
         AdvertiserInfoEdit({
             id: this.oninfo.id,
diff --git a/admin-web-master/src/views/rent/audit/index.vue b/admin-web-master/src/views/rent/audit/index.vue
index fa82dc4..d20d85f 100644
--- a/admin-web-master/src/views/rent/audit/index.vue
+++ b/admin-web-master/src/views/rent/audit/index.vue
@@ -88,7 +88,7 @@
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
               <div  @click="details(scope.row)" class="tableBtn greens">审核</div>
-              <div v-if='scope.row.auditStatus == 2' @click="removeonaction('2')" class="tableBtn greens">录入合同</div>
+              <div v-if='scope.row.auditStatus == 2' @click="openhet(scope.row)" class="tableBtn greens">录入合同</div>
             </template>
           </el-table-column>
         </el-table>
@@ -185,6 +185,10 @@
       this.getAll()
     },
     methods: {
+      openhet(row) {
+        this.formInline = row
+        this.onaction = '2'
+      },
             //删除
       async closemsg(e) {
         console.error(e)
--
libgit2 0.21.4