提交 a631f500 编写于 作者: 刘英杰's avatar 刘英杰

V20240121 优化tag等

上级 4a66302f
.ivu-form-item[data-v-7c9c86d0]{padding-right:15px}.fileRow[data-v-7c9c86d0]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-7c9c86d0]{color:#ed4014}.fileRow .delIcon[data-v-7c9c86d0]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}
\ No newline at end of file
.ivu-form-item[data-v-7c9c86d0]{padding-right:15px}.fileRow[data-v-7c9c86d0]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-7c9c86d0]{color:#ed4014}.fileRow .delIcon[data-v-7c9c86d0]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}
\ No newline at end of file
.ivu-form-item[data-v-7c9c86d0]{padding-right:15px}.fileRow[data-v-7c9c86d0]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-7c9c86d0]{color:#ed4014}.fileRow .delIcon[data-v-7c9c86d0]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}
\ No newline at end of file
.ivu-form-item[data-v-7c9c86d0]{padding-right:15px}.fileRow[data-v-7c9c86d0]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-7c9c86d0]{color:#ed4014}.fileRow .delIcon[data-v-7c9c86d0]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}
\ No newline at end of file
.ivu-form-item[data-v-7c9c86d0]{padding-right:15px}.fileRow[data-v-7c9c86d0]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-7c9c86d0]{color:#ed4014}.fileRow .delIcon[data-v-7c9c86d0]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}
\ No newline at end of file
.ivu-form-item[data-v-7c9c86d0]{padding-right:15px}.fileRow[data-v-7c9c86d0]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-7c9c86d0]{color:#ed4014}.fileRow .delIcon[data-v-7c9c86d0]:hover{color:#f16643;cursor:pointer}.mainDiv[data-v-159b2d98]{width:100%;height:100%;display:flex;flex-wrap:wrap;justify-content:space-between}.mainDiv .bigCard[data-v-159b2d98],.mainDiv .smallCard[data-v-159b2d98]{margin-bottom:16px}.mainDiv .bigCard[data-v-159b2d98] .ivu-card-body,.mainDiv .smallCard[data-v-159b2d98] .ivu-card-body{height:calc(100% - 51px)}.mainDiv .bigCard[data-v-159b2d98] .ivu-card-body .ivu-form-item,.mainDiv .smallCard[data-v-159b2d98] .ivu-card-body .ivu-form-item{margin-bottom:12px}.mainDiv .bigCard[data-v-159b2d98]{width:calc(50% - 8px)}.mainDiv .smallCard[data-v-159b2d98]{width:calc(33.33333% - 10.66667px)}.mainDiv[data-v-159b2d98] .kjyyCard .ivu-card-body{overflow:auto}.mainDiv[data-v-159b2d98] .kjyyCard .ivu-card-body p[name=fastCP]{display:flex;justify-content:space-between}.mainDiv[data-v-159b2d98] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]{color:#ed4014}.mainDiv[data-v-159b2d98] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]:hover{color:#f16643}.mainDiv[data-v-159b2d98] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]:active{color:#e13d13}.mainDiv[data-v-159b2d98] .cplhsCard .ivu-card-body{display:flex;flex-direction:column;justify-content:space-evenly}.mainDiv[data-v-159b2d98] .save-bt{text-align:right;position:absolute;bottom:16px;right:16px}
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>场地管理</title><link href=css/app.f8f860e0.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 场地管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors.c0d93cbb.js></script><script src=js/app.dc107f90.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>场地管理</title><link href=css/app.f8f860e0.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 场地管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors.c0d93cbb.js></script><script src=js/app.198b75c7.js></script></body></html>
\ No newline at end of file
此差异已折叠。
<template>
<!-- 通用Table -->
<div>
<Table
class="ivu-mt"
<Table
class="ivu-mt"
:columns="tableColumns"
:data="tableData"
:loading="tableLoading"
:size="tableSize"
>
<template slot-scope="{ row, index }" slot="generalSwitch">
<template slot-scope="{ row, index }" slot="generalSwitch">
<Switch
v-model="row.is_enable"
size="large"
......@@ -17,7 +17,7 @@
@on-change="(val) => switchChange(val, row, index)">
<span type="md-checkmark" slot="open" >启用</span>
<span type="md-close" slot="close">停用</span>
</Switch>
</Switch>
</template>
<template slot-scope="{ row }" slot="action">
<Button type="info" size="small" @click="edit(row)">编辑</Button>
......@@ -35,7 +35,7 @@
<!-- 自定义插槽 -->
<template v-for="(_, slot) in $scopedSlots" v-slot:[slot]="scope">
<slot :name="slot" v-bind="scope"></slot>
<slot :name="slot" v-bind="scope"> </slot>
</template>
</Table>
<div class="ivu-text-center ivu-mt">
......@@ -102,4 +102,4 @@ export default {
<style scoped lang="less">
</style>
\ No newline at end of file
</style>
......@@ -9,14 +9,14 @@
* */
export const activityRequest = {
// 活动申请状态
array : ['', '审批中', '已取消', '驳回', '邀请中', '邀请超时', '待使用', '使用中', '已结束'],
array : ['', '审批中', '已取消', '驳回', '审批通过', '邀请中', '邀请超时', '待使用', '使用中','已结束','强制结束'],
tag :['default', 'primary', 'success', 'error', 'warning', 'magenta', 'red', 'volcano', 'orange', 'gold', 'yellow', 'lime', 'green', 'cyan', 'blue']
}
export const activeOvertime = {
// 申请状态
array : ['未加时', '审批中', '加时'],
tag :['blue', 'primary', 'success',]
array : ['未加时', '申请中', '加时','不通过'],
tag :['blue', 'primary', 'success','warning']
}
export const participatingState = {
//参与状态
......@@ -30,6 +30,16 @@ export const siteStatus = {
tag :["default", 'warning', 'error', 'success', 'blue', ]
}
export const keyState = {
array : ['可借', '借出', '无法使用'],
tag :['success', 'warning', 'error']
array : ['未领取', '借出', '归还'],
tag :['magenta', 'warning', 'success']
}
export const keyState2 = {
array : ['可借', '借出', '维护中'],
tag :['success', 'warning', 'magenta']
}
export const blackListed = {
//黑名单
array : ['过期', '生效', '强制取消'],
tag :['warning', 'success', 'magenta']
}
......@@ -47,7 +47,7 @@ import buttonLoad from "@/components/my/buttonLoad.vue";
import * as status from "@/config/index"
Vue.prototype.hooks = hooks //自定义hooks 挂原型链 全局调用
Vue.prototype.asc = api //请求方法集合 挂原型链 全局调用
Vue.prototype.status = status //静态字典 挂原型链 全局反射状态
Vue.prototype.configStates = status //静态字典 挂原型链 全局反射状态
if (window) window.$t = (key, value) => i18n.t(key, value);
......
......@@ -21,27 +21,35 @@
@onPageChange="onPageChange"
@onPageSizeChange="onPageSizeChange">
<template #state="{ row }">
<h4 v-if="row.state == 1">审批中</h4>
<h4 v-if="row.state == 2">已取消</h4>
<h4 v-if="row.state == 3">驳回</h4>
<h4 v-if="row.state == 4">审批通过</h4>
<h4 v-if="row.state == 5">邀请中</h4>
<h4 v-if="row.state == 6">邀请超时</h4>
<h4 v-if="row.state == 7">待使用</h4>
<h4 v-if="row.state == 8">使用中</h4>
<h4 v-if="row.state == 9">已结束</h4>
<h4 v-if="row.state == 10">强制结束</h4>
<Tag :color="configStates.activityRequest.tag[row.state]">{{configStates.activityRequest.array[row.state]}}</Tag>
<!-- <h4 v-if="row.state == 1">审批中</h4>-->
<!-- <h4 v-if="row.state == 2">已取消</h4>-->
<!-- <h4 v-if="row.state == 3">驳回</h4>-->
<!-- <h4 v-if="row.state == 4">审批通过</h4>-->
<!-- <h4 v-if="row.state == 5">邀请中</h4>-->
<!-- <h4 v-if="row.state == 6">邀请超时</h4>-->
<!-- <h4 v-if="row.state == 7">待使用</h4>-->
<!-- <h4 v-if="row.state == 8">使用中</h4>-->
<!-- <h4 v-if="row.state == 9">已结束</h4>-->
<!-- <h4 v-if="row.state == 10">强制结束</h4>-->
</template>
<template #overtime_state="{ row }">
<h4 v-if="row.overtime_state == 0">未加时</h4>
<h4 v-if="row.overtime_state == 1">申请中</h4>
<h4 v-if="row.overtime_state == 2">加时</h4>
<h4 v-if="row.overtime_state == 3">不通过</h4>
<Tag :color="configStates.activeOvertime.tag[row.overtime_state]">{{configStates.activeOvertime.array[row.overtime_state]}}</Tag>
<!-- <h4 v-if="row.overtime_state == 0">未加时</h4>-->
<!-- <h4 v-if="row.overtime_state == 1">申请中</h4>-->
<!-- <h4 v-if="row.overtime_state == 2">加时</h4>-->
<!-- <h4 v-if="row.overtime_state == 3">不通过</h4>-->
</template>
<template #key_state="{ row }">
<h4 v-if="row.key_state == 0">未领取</h4>
<h4 v-if="row.key_state == 1">借出</h4>
<h4 v-if="row.key_state == 2">归还</h4>
<Tag :color="configStates.keyState.tag[row.key_state]">{{configStates.keyState.array[row.key_state]}}</Tag>
<!-- <h4 v-if="row.key_state == 0">未领取</h4>-->
<!-- <h4 v-if="row.key_state == 1">借出</h4>-->
<!-- <h4 v-if="row.key_state == 2">归还</h4>-->
</template>
<template #participant="{ row }">
<Icon class="cyrIcon" type="md-person" @click="ptcDetails(row)"/>
......@@ -309,6 +317,7 @@ import CEditModal from '@/components/CEditModal.vue'
import SearchCondForm from '@/components/SearchCondForm.vue'
import { cloneDeep } from 'lodash'
export default {
name: 'list',
components: {
......@@ -376,7 +385,7 @@ export default {
],
tableLoading: false,
tableData:[],
tableSize: 'default',
tableFullscreen: false,
......@@ -558,6 +567,12 @@ export default {
}
},
computed: {
$status() {
return $status
},
activityRequest() {
return activityRequest
},
// 邀请参与人员已选人员标签计算
ptcAddPsCal() {
return function (item) {
......@@ -682,7 +697,7 @@ export default {
this.asc.getApiActivityGetActivityTrackList({activity_id: this.trkActiveId}).then(res => {
// console.log('获取轨迹', res)
this.trkData = res.response
this.trkModalLoading = false
})
},
......@@ -780,7 +795,7 @@ export default {
// }
// })
},
// 更改页码
onPageChange(val) {
this.params.page_index = val
......@@ -1009,4 +1024,4 @@ export default {
.cyrIcon:active{
color: #3f485c;
}
</style>
\ No newline at end of file
</style>
......@@ -10,7 +10,7 @@
@onReset="reset"></SearchCondForm>
<Button disabled type="primary" class="ivu-ml-8"><Icon type="md-trash" />清空黑名单</Button>
<!-- 数据table -->
<CTable
:tableColumns="tableColumns.filter(a => a.show)"
......@@ -24,9 +24,11 @@
@onPageSizeChange="onPageSizeChange">
<!-- 状态 -->
<template #state="{ row }">
<span v-if="row.state == 0">过期</span>
<span v-if="row.state == 1">生效</span>
<span v-if="row.state == 2">强制取消</span>
<Tag :color="configStates.blackListed.tag[row.state]">{{configStates.blackListed.array[row.state]}}</Tag>
<!-- <span v-if="row.state == 0">过期</span>-->
<!-- <span v-if="row.state == 1">生效</span>-->
<!-- <span v-if="row.state == 2">强制取消</span>-->
</template>
<template #action="{ row }">
......@@ -98,9 +100,15 @@
import CTable from '@/components/CTable.vue'
import CEditModal from '@/components/CEditModal.vue'
import SearchCondForm from '@/components/SearchCondForm.vue'
import {blackListed} from "@/config";
export default {
name: 'list',
computed: {
blackListed() {
return blackListed
}
},
components: {
CTable,
CEditModal,
......@@ -137,7 +145,7 @@ export default {
],
tableLoading: false,
tableData:[],
tableSize: 'default',
tableFullscreen: false,
......@@ -250,7 +258,7 @@ export default {
this.tableLoading = false
})
},
// 更改页码
onPageChange(val) {
this.params.page_index = val
......@@ -339,4 +347,4 @@ export default {
},
}
}
</script>
\ No newline at end of file
</script>
......@@ -26,9 +26,10 @@
@onPageChange="onPageChange"
@onPageSizeChange="onPageSizeChange">
<template #keystate="{ row }">
<span v-if="row.state == 0">可借</span>
<span v-if="row.state == 1">借出</span>
<span v-if="row.state == 2">维护中</span>
<!-- <span v-if="row.state == 0">可借</span>-->
<!-- <span v-if="row.state == 1">借出</span>-->
<!-- <span v-if="row.state == 2">维护中</span>-->
<Tag :color="configStates.keyState2.tag[row.state]">{{configStates.keyState2.array[row.state]}}</Tag>
</template>
</CTable>
......@@ -42,6 +43,7 @@
:width="800"
@onClose="editModalshow = false"
@onSubmit="modalSubmit">
</CEditModal>
</Card>
</div>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或