Merge remote-tracking branch 'origin/master'

jiangping

2024-06-28 43942a545271345ce26e40d82bb97138c5ea7611

 admin/src/views/business/visits.vue

@@ -33,10 +33,10 @@
        </el-form>
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
<!--            <ul class="toolbar" v-permissions="['business:visits:create', 'business:visits:delete']">-->
<!--                <li><el-button type="primary" @click="$refs.operaVisitsWindow.open('新建访客申请信息表')" icon="el-icon-plus" v-permissions="['business:visits:create']">新建</el-button></li>-->
<!--                <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:visits:delete']">删除</el-button></li>-->
<!--            </ul>-->
           <ul class="toolbar" v-permissions="['business:visits:create', 'business:visits:exportExcel']">
               <li><el-button type="primary" @click="handleEdit()" icon="el-icon-plus" v-permissions="['business:visits:create']">新建</el-button></li>
               <li><el-button type="primary" :loading="isWorking.export" @click="exportExcel" v-permissions="['business:visits:exportExcel']">导出</el-button></li>
           </ul>
            <el-table
                v-loading="isWorking.search"
                :data="tableData.list"
@@ -110,6 +110,8 @@
            </pagination>
            <!--      详情      -->
            <OperaVisitsDesWindow ref="OperaVisitsDesWindow" />
            <!-- 新建 -->
            <OperaVisitsWindow @close="isShowEdit = false" @success="search"  v-if="isShowEdit" ref="operaVisitsWindowRef" />
        </template>
    </TableLayout>
</template>
@@ -119,13 +121,15 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaVisitsDesWindow from '@/components/business/OperaVisitsDesWindow'
import OperaVisitsWindow from '@/components/business/operaVisitsWindow'

export default {
  name: 'Visits',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaVisitsDesWindow },
  components: { TableLayout, Pagination, OperaVisitsDesWindow, OperaVisitsWindow },
  data () {
    return {
      isShowEdit: false,
      // 搜索
      searchForm: {
        name: '',
@@ -145,36 +149,42 @@
    this.search()
  },
  methods: {
    departure(id) {
    handleEdit () {
      this.isShowEdit = true
      this.$nextTick(() => {
        this.$refs.operaVisitsWindowRef.isShowModal = true
      })
    },
    departure (id) {
      this.$confirm('确定离场吗, 是否继续?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        level(id)
            .then(res => {
              this.page = 1
              this.getData()
            })
          .then(res => {
            this.page = 1
            this.getData()
          })
      }).catch(() => {

      });
      })
    },
    cancel(id) {
    cancel (id) {
      this.$confirm('确定取消预约吗, 是否继续?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        visitCancel(id)
            .then(res => {
              this.page = 1
              this.getData()
            })
          .then(res => {
            this.page = 1
            this.getData()
          })
      }).catch(() => {

      });
    },
      })
    }
  }
}
</script>