From ad5052c5438222621d9ea785cdd68fe19916a7f4 Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Mon, 17 Feb 2025 00:40:02 +0800
Subject: [PATCH] 1

---
 admin-web-master/src/components/add/addht.vue               |  64 ++++++++++++++++++++++++++++++++++++++--------------------------
 admin-web-master/src/components/resourceCommodity/index.vue |   6 +++---
 admin-web-master/src/views/detect/examine/index.vue         |   6 +++---
 admin-web-master/src/views/detect/information/index.vue     |   2 +-
 admin-web-master/src/views/detect/map/index.vue             |   2 +-
 admin-web-master/src/views/serve/kefuServe/index.vue        | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------
 admin-web-master/src/views/shopRental/manage/index.vue      |  10 ++++++++++
 7 files changed, 140 insertions(+), 109 deletions(-)

diff --git a/admin-web-master/src/components/add/addht.vue b/admin-web-master/src/components/add/addht.vue
index 51a7be8..772f0ad 100644
--- a/admin-web-master/src/components/add/addht.vue
+++ b/admin-web-master/src/components/add/addht.vue
@@ -40,7 +40,7 @@
     cereContractTemplate,cerePlatformMerchant
   } from '@/api/newly.js'
   import {
-    dataInprotDocument
+    dataInprotDocument,modifyResourceStatus
   } from '@/api/newly.js'
 import {
     msgedit
@@ -248,6 +248,12 @@ import {
                   message: '添加成功',
                   type: 'success'
                 })
+                modifyResourceStatus({
+                  resourcesId: info1.shopNumber,
+                  status:"4"
+                }).then(res => {
+                  console.error(res)
+                })
                 this.$emit('removeonaction', '1')
               } else {
                 this.$message({
@@ -342,31 +348,37 @@ import {
                   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
-                    })
-                  }
-                }
+                modifyResourceStatus({
+                  resourcesId: info1.shopNumber,
+                  status:"4"
+                }).then(res => {
+                  console.error(res)
+                })
+                // 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/components/resourceCommodity/index.vue b/admin-web-master/src/components/resourceCommodity/index.vue
index b2ffa5e..8b72810 100644
--- a/admin-web-master/src/components/resourceCommodity/index.vue
+++ b/admin-web-master/src/components/resourceCommodity/index.vue
@@ -27,17 +27,17 @@
                 <el-row :gutter="20">
                   <el-col :span="8">
                     <el-form-item label="测绘面积" prop="surveyingArea">
-                      <div class="duiqi">{{editbgid.surveyingArea || '无'}}</div>
+                      <div class="duiqi">{{editbgid.surveyingArea?editbgid.surveyingArea+' ㎡': '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="产权面积" prop="propertyArea">
-                      <div class="duiqi">{{editbgid.propertyArea || '无'}}</div>
+                      <div class="duiqi">{{editbgid.propertyArea?editbgid.propertyArea+' ㎡':'无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="实际使用面积" prop="actualUsableArea">
-                      <div class="duiqi">{{editbgid.actualUsableArea || '无'}}</div>
+                      <div class="duiqi">{{editbgid.actualUsableArea?editbgid.actualUsableArea+' ㎡':'无'}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
diff --git a/admin-web-master/src/views/detect/examine/index.vue b/admin-web-master/src/views/detect/examine/index.vue
index 035e53b..e575119 100644
--- a/admin-web-master/src/views/detect/examine/index.vue
+++ b/admin-web-master/src/views/detect/examine/index.vue
@@ -78,7 +78,7 @@
           </el-table-column>
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.cereBasicInformationShop.publishStatus=='0'?'空置中':scope.row.cereBasicInformationShop.publishStatus=='1'?'待审核':scope.row.cereBasicInformationShop.publishStatus=='2'?'已发布':scope.row.cereBasicInformationShop.publishStatus=='3'?'不通过':'-'}}
+              {{scope.row.cereBasicInformationShop.publishStatus=='0'?'空置中':scope.row.cereBasicInformationShop.publishStatus=='1'?'待审核':scope.row.cereBasicInformationShop.publishStatus=='2'?'已发布':scope.row.cereBasicInformationShop.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}}
             </template>
           </el-table-column>
           <el-table-column label="操作" fixed="right" prop="sh">
@@ -123,7 +123,7 @@
           </el-table-column>
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.cereAdvertisingInformation.publishStatus=='0'?'空置中':scope.row.cereAdvertisingInformation.publishStatus=='1'?'待审核':scope.row.cereAdvertisingInformation.publishStatus=='2'?'已发布':scope.row.cereAdvertisingInformation.publishStatus=='3'?'不通过':'-'}}
+              {{scope.row.cereAdvertisingInformation.publishStatus=='0'?'空置中':scope.row.cereAdvertisingInformation.publishStatus=='1'?'待审核':scope.row.cereAdvertisingInformation.publishStatus=='2'?'已发布':scope.row.cereAdvertisingInformation.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}}
             </template>
           </el-table-column>
           <el-table-column label="操作" fixed="right" prop="sh">
@@ -168,7 +168,7 @@
           </el-table-column>
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.cereBasicInformationVenue.publishStatus=='0'?'空置中':scope.row.cereBasicInformationVenue.publishStatus=='1'?'待审核':scope.row.cereBasicInformationVenue.publishStatus=='2'?'已发布':scope.row.cereBasicInformationVenue.publishStatus=='3'?'不通过':'-'}}
+              {{scope.row.cereBasicInformationVenue.publishStatus=='0'?'空置中':scope.row.cereBasicInformationVenue.publishStatus=='1'?'待审核':scope.row.cereBasicInformationVenue.publishStatus=='2'?'已发布':scope.row.cereBasicInformationVenue.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}}
             </template>
           </el-table-column>
           <el-table-column label="操作" fixed="right" prop="sh">
diff --git a/admin-web-master/src/views/detect/information/index.vue b/admin-web-master/src/views/detect/information/index.vue
index c82a05c..df85b93 100644
--- a/admin-web-master/src/views/detect/information/index.vue
+++ b/admin-web-master/src/views/detect/information/index.vue
@@ -68,7 +68,7 @@
           <el-table-column label="提交时间" prop="createDate" > </el-table-column>
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
+              {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}}
             </template>
           </el-table-column>
           <el-table-column label="操作" min-width="100" fixed="right">
diff --git a/admin-web-master/src/views/detect/map/index.vue b/admin-web-master/src/views/detect/map/index.vue
index 82a9905..bcb271a 100644
--- a/admin-web-master/src/views/detect/map/index.vue
+++ b/admin-web-master/src/views/detect/map/index.vue
@@ -90,7 +90,7 @@
           <el-table-column label="提交时间" prop="createDate" > </el-table-column>
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
+              {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}}
             </template>
           </el-table-column>
           <el-table-column label="操作" min-width="100" fixed="right">
diff --git a/admin-web-master/src/views/serve/kefuServe/index.vue b/admin-web-master/src/views/serve/kefuServe/index.vue
index 30ac5a0..bf5c9d1 100644
--- a/admin-web-master/src/views/serve/kefuServe/index.vue
+++ b/admin-web-master/src/views/serve/kefuServe/index.vue
@@ -13,93 +13,101 @@
         </div>
       </div> -->
       <div>
+        <el-tabs v-model="xiangTab">
+          <el-tab-pane label="报修记录" name="first">
+            <el-table :data="
+                tableData.slice(
+                  (currentPage - 1) * pageSize,
+                  currentPage * pageSize
+                )
+              " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+              style="width: 100%">
+              <el-table-column label="序号" width="auto" min-width="6%" align="center">
+                <template slot-scope="scope">
+                  {{scope.$index+1}}
+                </template>
+              </el-table-column>
+              <el-table-column label="报修类型" prop="deviceType" width="auto" min-width="12%" />
+              <el-table-column label="问题描述" prop="warrantyIssue" width="auto" min-width="12%" />
+    <el-table-column label="设备名称" prop="deviceName" width="auto" min-width="12%" />
+              <el-table-column label="备注" prop="memo" width="auto" min-width="12%" />
+
+
+              <el-table-column label="申请时间" prop="applicationTime" width="auto" min-width="12%" />
+              <el-table-column label="报修到期时间" prop="repairEndTime" width="auto" min-width="12%" />
+              <el-table-column label="报修人" prop="repairman" width="auto" min-width="12%" />
+    <!-- <el-table-column label="状态" prop="repairStatus" width="auto" min-width="12%" >
+      <template slot-scope="scope">
+            {{scope.row.repairStatus==0?'暂未派单':scope.row.repairStatus==1?'已派单':scope.row.repairStatus==2?'已完成':scope.row.repairStatus==3?'已过期':''}}
+        </template>
+      </el-table-column> -->
+              <el-table-column label="操作" width="auto" min-width="12%">
+                <template slot-scope="scope">
+                  <div class="tableBtn greens" @click="handleEditForm(scope.row)">
+                    查看
+                  </div>
+    <!-- <div class="tableBtn greens" @click="setPei(scope.row)">
+                    报修流程配置
+                  </div> -->
+                  <div class="tableBtn greens" @click="delGuan(scope.row,1)">
+                    删除
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+          <el-tab-pane label="投诉记录" name="second">
+            <el-table :data="
+                toushuData.slice(
+                  (currentPage - 1) * pageSize,
+                  currentPage * pageSize
+                )
+              " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+              style="width: 100%">
+              <el-table-column label="序号" width="auto" min-width="6%" align="center">
+                <template slot-scope="scope">
+                  {{scope.$index+1}}
+                </template>
+              </el-table-column>
+              <el-table-column label="投诉类型" prop="complaintType" width="auto" min-width="12%" />
+              <el-table-column label="问题描述" prop="problemDescription" width="auto" min-width="12%" />
+              <el-table-column label="备注" prop="remark" width="auto" min-width="12%" />
+              <el-table-column label="申请时间" prop="applicationTime" width="auto" min-width="12%" />
+
+              <el-table-column label="操作" width="auto" min-width="12%">
+                <template slot-scope="scope">
+                  <div class="tableBtn greens" @click="handleEditForm(scope.row)">
+                    查看
+                  </div>
+                  <!-- <div class="tableBtn greens">
+                    再次发布
+                  </div> -->
+                  <div class="tableBtn greens" @click="delGuan(scope.row,2)">
+                    删除
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+        </el-tabs>
         <!-- 搜索 -->
-        <div style="margin-bottom:20px;">
+        <!-- <div style="margin-bottom:20px;">
             报修记录
-        </div>
+        </div> -->
 
         <!-- 表格 -->
-        <el-table :data="
-            tableData.slice(
-              (currentPage - 1) * pageSize,
-              currentPage * pageSize
-            )
-          " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-          style="width: 100%">
-          <el-table-column label="序号" width="auto" min-width="6%" align="center">
-            <template slot-scope="scope">
-              {{scope.$index+1}}
-            </template>
-          </el-table-column>
-          <el-table-column label="报修类型" prop="deviceType" width="auto" min-width="12%" />
-          <el-table-column label="问题描述" prop="warrantyIssue" width="auto" min-width="12%" />
-<el-table-column label="设备名称" prop="deviceName" width="auto" min-width="12%" />
-          <el-table-column label="备注" prop="memo" width="auto" min-width="12%" />
-
-
-          <el-table-column label="申请时间" prop="applicationTime" width="auto" min-width="12%" />
-          <el-table-column label="报修到期时间" prop="repairEndTime" width="auto" min-width="12%" />
-          <el-table-column label="报修人" prop="repairman" width="auto" min-width="12%" />
-<!-- <el-table-column label="状态" prop="repairStatus" width="auto" min-width="12%" >
-  <template slot-scope="scope">
-        {{scope.row.repairStatus==0?'暂未派单':scope.row.repairStatus==1?'已派单':scope.row.repairStatus==2?'已完成':scope.row.repairStatus==3?'已过期':''}}
-    </template>
-  </el-table-column> -->
-          <el-table-column label="操作" width="auto" min-width="17%">
-            <template slot-scope="scope">
-              <div class="tableBtn greens" @click="handleEditForm(scope.row)">
-                查看
-              </div>
-<!-- <div class="tableBtn greens" @click="setPei(scope.row)">
-                报修流程配置
-              </div> -->
-              <div class="tableBtn greens" @click="delGuan(scope.row,1)">
-                删除
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
+
 
       </div>
 
       <div>
         <!-- 搜索 -->
-        <div style="margin:20px 0;">
+        <!-- <div style="margin:20px 0;">
             投诉记录
-        </div>
+        </div> -->
 
         <!-- 表格 -->
-        <el-table :data="
-            toushuData.slice(
-              (currentPage - 1) * pageSize,
-              currentPage * pageSize
-            )
-          " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-          style="width: 100%">
-          <el-table-column label="序号" width="auto" min-width="6%" align="center">
-            <template slot-scope="scope">
-              {{scope.$index+1}}
-            </template>
-          </el-table-column>
-          <el-table-column label="投诉类型" prop="complaintType" width="auto" min-width="12%" />
-          <el-table-column label="问题描述" prop="problemDescription" width="auto" min-width="12%" />
-          <el-table-column label="备注" prop="remark" width="auto" min-width="12%" />
-          <el-table-column label="申请时间" prop="applicationTime" width="auto" min-width="12%" />
-
-          <el-table-column label="操作" width="auto" min-width="17%">
-            <template slot-scope="scope">
-              <div class="tableBtn greens" @click="handleEditForm(scope.row)">
-                查看
-              </div>
-              <!-- <div class="tableBtn greens">
-                再次发布
-              </div> -->
-              <div class="tableBtn greens" @click="delGuan(scope.row,2)">
-                删除
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
+ 
         <!-- 详情框  :visible.sync="detbox" -->
         <el-dialog :visible.sync="detbox" custom-class="dialog_css" style="padding: 0" width="50%" center
           :close-on-click-modal="false" class="dialog_css_Xq" :show-close="false">
@@ -203,6 +211,7 @@
   export default {
     data() {
       return {
+        xiangTab: 'first',
         detbox: false, // 详情
         edit: true, // 编辑
         action: uploadUrl, // 上传图片
diff --git a/admin-web-master/src/views/shopRental/manage/index.vue b/admin-web-master/src/views/shopRental/manage/index.vue
index 0e200a7..b6f895a 100644
--- a/admin-web-master/src/views/shopRental/manage/index.vue
+++ b/admin-web-master/src/views/shopRental/manage/index.vue
@@ -161,6 +161,9 @@
   import {
     cereContractInformation
   } from '@/api/commodityLease.js'
+  import {
+    modifyResourceStatus
+  } from '@/api/newly.js'
   export default {
     data() {
       return {
@@ -247,6 +250,13 @@
                 message: '终止成功',
                 type: 'success'
               })
+              let c1 = row.shopNumber
+              modifyResourceStatus({
+                resourcesId: c1,
+                status:"0"
+              }).then(res => {
+                console.error(res)
+              })
               // this.$emit('removeonaction', '1')
               this.getAll()
             } else {
--
libgit2 0.21.4