From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007

---
 admin/src/views/business/reportRecord.vue |   42 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/admin/src/views/business/reportRecord.vue b/admin/src/views/business/reportRecord.vue
index d6f2406..2cba9f7 100644
--- a/admin/src/views/business/reportRecord.vue
+++ b/admin/src/views/business/reportRecord.vue
@@ -77,18 +77,19 @@
           <span v-if="row.status === 4" style="color: gray">鍙栨秷</span>
           <span v-if="row.status === 5" style="color: green">涓嬪彂鎴愬姛</span>
           <span v-if="row.status === 6" style="color: gray">涓嬪彂澶辫触</span>
-          <span v-if="row.status === 7" style="color: green">鎷滆涓�</span>
+          <span v-if="row.status === 7" style="color: green">宸茬櫥璁�</span>
           <span v-if="row.status === 8" style="color: red">宸茬绂�</span>
           <span v-if="row.status === 9" style="color: gray">宸插け鏁�</span>
         </template>
       </el-table-column>
-      <el-table-column label="鎿嶄綔" align="center" width="180" fixed="right">
+      <el-table-column label="鎿嶄綔" align="center" width="240" fixed="right">
         <template slot-scope="{ row }">
           <el-button
             type="text"
             @click="handleDetail(row)"
             v-permissions="['business:company:update']">鏌ョ湅璇︽儏</el-button>
           <el-button  type="text"  icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:visits:delete']">鍒犻櫎</el-button>
+          <el-button type="text" @click="cancel(row.id)"   v-permissions="['business:visits:cancel']"  v-if="(row.status == 0 || row.status == 1 || row.status == 2|| row.status == 5)"  icon="el-icon-delete" style="color: red"  >鍙栨秷棰勭害</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -108,10 +109,11 @@
 // import ReportDetail from './page-components/ReportDetail.vue'
 import ReportDetail from '@/views/task/visReportDetail.vue'
 import OperaVisitsReportWindow from '@/components/business/operaVisitsReportWindow.vue'
-import { fetchList, exportExcel, deleteById } from '@/api/business/visits'
-import BaseComputHeight from "@/components/base/BaseComputHeight";
+import { fetchList, exportExcel, deleteById ,visitsCancel} from '@/api/business/visits'
+import BasePage from '@/components/base/BasePage'
+import {mapState } from "vuex";
 export default {
-  extends: BaseComputHeight,
+  extends: BasePage,
   components: {
     ReportDetail,
     QueryForm,
@@ -140,6 +142,12 @@
             filed: 'companyName',
             type: 'input',
             label: '鍏徃鍚嶇О'
+          },
+          {
+            filed1: 'queryStarttime',
+            filed2: 'queryEndtime',
+            type: 'datetime',
+            label: '鎷滆鏃堕棿'
           }
         ],
         online: true
@@ -157,10 +165,27 @@
       total: 0
     }
   },
+  computed: {
+    ...mapState(['userInfo'])
+  },
   created () {
     this.getList()
   },
   methods: {
+    cancel (id) {
+      this.$confirm('纭畾鍙栨秷棰勭害鍚�, 鏄惁缁х画?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        visitsCancel(id)
+          .then(res => {
+            this.pagination.page = 1
+            this.getList()
+          })
+      }).catch(() => {
+      })
+    },
     exportExcel () {
       this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
         .then(() => {
@@ -240,15 +265,16 @@
 
 <style lang="scss" scoped>
 .table-pagination {
-  margin-left: -18px;
-  padding: 16px 0px 16px 25px;
+
+  margin-left: 0px;
+  padding: 16px 0px ;
   text-align: left;
   display: block;
   z-index: 100;
   width: -webkit-fill-available;
   /* width: 80%; */
   position: fixed;
-  bottom: 25px;
+  bottom: 0px;
   background-color: white;
   margin-right: 50px;
 }

--
Gitblit v1.9.3