提交 9ea86a41 编写于 作者: 钟一霄's avatar 钟一霄

场地类型文本域加长。物资管理改弹框标题树点击展开子级。场地管理钥匙管理改弹框标题。活动管理加查询条件

上级 61b0a6f6
......@@ -71,6 +71,7 @@
<TimePicker
v-else-if="item.type == 'timerange'"
v-model="formData[item['id']]"
style="width: 100%;"
format="HH:mm"
type="timerange"
placement="bottom-end"
......@@ -212,11 +213,11 @@ export default {
* Modal打开初始化(新增编辑用)
* @param {String} addOrEdit add.新增 edit.编辑
*/
modalInit(addOrEdit = 'add', row) {
modalInit(addOrEdit = 'add', row, title = '') {
this.isDetails = false
this.uploadBtLoading = []
if (addOrEdit == 'add') {
this.modalTitle = '新增'
this.modalTitle = title ? title : '新增'
this.formData = row ? cloneDeep(row) : {}
} else if (addOrEdit == 'edit') {
this.modalTitle = '编辑'
......
......@@ -323,6 +323,7 @@ export default {
{ id: 'user_card_name', name: '用户卡号/姓名', type: 'input', show: true, optList: [] },
{ id: 'place_code_name', name: '场地编号/名称', type: 'input', show: true, optList: [] },
{ id: 'place_type_id', name: '场地类型', type: 'select', show: true, optList: [] },
{ id: 'state', name: '活动状态', type: 'select', show: true, optList: [{value:'1', label: '审批中'},{value:'2', label: '已取消'},{value:'3', label: '驳回'},{value:'4', label: '审批通过'},{value:'5', label: '邀请中'},{value:'6', label: '邀请超时'},{value:'7', label: '待使用'},{value:'8', label: '使用中'},{value:'9', label: '已结束'},{value:'10', label: '强制结束'}] },
],
// 搜索条件
params:{
......@@ -483,7 +484,7 @@ export default {
{ key: 'name', title: '借用人', align: 'center', minWidth: 150, show: true },
{ key: 'card', title: '借用人卡号', align: 'center', minWidth: 150, show: true },
// { key: 'is_enable', title: '启用', align: 'center', minWidth: 80, show: true },
{ slot: 'details', title: '操作', align: 'center', minWidth: 100, show: true, fixed: 'right' },
{ slot: 'details', title: '操作', align: 'center', minWidth: 100, show: false, fixed: 'right' },
],
cmdTableData: [],
cmdTableLoading: false,
......
......@@ -50,8 +50,12 @@
<List v-if="eltTableData.length != 0" item-layout="vertical">
<ListItem v-for="item in eltTableData" :key="item.id">
<ListItemMeta
:title="item.name"
:description="`评价人:${item.evaluate_card}`" />
:description="`评价人:${item.evaluate_card}`">
<template #title>
{{ item.name }} &nbsp;&nbsp;
<a style="font-size: 12px;" @click="eltActDetails(item)">活动详情</a>
</template>
</ListItemMeta>
<p>
<Rate
v-model="item.grade"
......@@ -72,6 +76,16 @@
</List>
<p v-else style="text-align: center;">暂无评价</p>
<!-- 活动详情 -->
<CEditModal
ref="eltacdetailsmodal"
v-model="eltActDetailsModalShow"
:formItem="eltActDetailsItemForm"
:loading="eltActDetailsModalLoading"
:formLabelWidth="100"
:width="800"
@onClose="eltActDetailsModalShow = false"></CEditModal>
<template #footer>
<Button @click="eltModalShow = false">关闭</Button>
</template>
......@@ -138,11 +152,72 @@ export default {
eltActiveId: '',
eltTableData: [],
//#endregion
// 评价下活动详情
eltActDetailsModalShow: false,
eltActDetailsModalLoading: false,
eltActDetailsItemForm: [
// { id: 'id', name: 'id', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'activity_name', name: '活动名称', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'card', name: '申请人卡号', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'name', name: '申请人名称', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'phone', name: '联系方式', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'class_name', name: '班级名称', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'dept', name: '学院', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'place_type_id', name: '场地类型', type: 'select', disabled: false, require: false, optList: [] },
// { id: 'place_type_name', name: '场地类型', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'place_id', name: '场地编号', type: 'select', disabled: false, require: false, optList: [] },
// { id: 'place_code', name: '场地编号', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'place_name', name: '场地名称', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'place_sex', name: '场地性别限制', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'place_capacity', name: '容纳人数', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'threshold', name: '最低申请人数', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'begin_time', name: '开始时间', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'end_time', name: '结束时间', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'people_interval', name: '人数区间', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'people_num', name: '实际人数', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'state', name: '活动状态', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'overtime_state', name: '加时状态', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'key_state', name: '钥匙借用状态', type: 'input', disabled: false, require: false, optList: [] },
// { id: 'is_del', name: '是否删除', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'remark', name: '备注', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'overtime_num', name: '加时次数', type: 'input', disabled: false, require: false, optList: [] },
// { id: 'class_id', name: '班级id', type: 'input', disabled: false, require: false, optList: [] },
// { id: 'dept_id', name: '学院id', type: 'input', disabled: false, require: false, optList: [] },
// { id: 'userid', name: '申请人id', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'is_evaluate', name: '是否评价', type: 'input', disabled: false, require: false, optList: [] },
// { id: 'flow_id', name: '关联流程id', type: 'input', disabled: false, require: false, optList: [] },
],
}
},
// 查询条件初始化
created(){},
mounted(){
// 获取场地类型
this.asc.getApiCommonGetPlaceTypeSelect().then(res => {
// console.log('场地类型', res)
let arr = res.response.map(a => {
return {
...a,
label: a.name,
value: a.id,
}
})
this.eltActDetailsItemForm[this.eltActDetailsItemForm.findIndex(a => a.id == 'place_type_id')].optList = arr
})
// 获取场地
this.asc.getApiCommonGetPlaceSelect({id: ''}).then(res => {
// console.log('场地', res)
let arr = res.response.map(a => {
return {
...a,
label: a.name,
value: a.id,
}
})
this.eltActDetailsItemForm[this.eltActDetailsItemForm.findIndex(a => a.id == 'place_id')].optList = arr
})
this.getData()
},
methods: {
......@@ -219,6 +294,49 @@ export default {
}
})
},
// 评价中活动详情
eltActDetails(item) {
// console.log('评价中活动详情', item)
this.eltActDetailsModalShow = true
this.eltActDetailsModalLoading = true
this.asc.getApiActivityGetActivityInfo({id: item.activity_id}).then(res => {
// console.log('活动详情', res)
if (res.code == 1) {
// 活动状态
let stateCode = res.response.state
res.response.state = stateCode == 1 ? '审批中' :
stateCode == 2 ? '已取消' :
stateCode == 3 ? '驳回' :
stateCode == 4 ? '审批通过' :
stateCode == 5 ? '邀请中' :
stateCode == 6 ? '邀请超时' :
stateCode == 7 ? '待使用' :
stateCode == 8 ? '使用中' :
stateCode == 9 ? '已结束' :
stateCode == 10 ? '强制结束' : ''
// 加时状态
let otStateCode = res.response.overtime_state
res.response.overtime_state = otStateCode == 0 ? '未加时' :
otStateCode == 1 ? '申请中' :
otStateCode == 2 ? '加时' :
otStateCode == 3 ? '不通过' : ''
// 钥匙借用状态
let keyStateCode = res.response.key_state
res.response.keyStateCode = keyStateCode == 0 ? '未领取' :
keyStateCode == 1 ? '借出' :
keyStateCode == 2 ? '归还' : ''
this.$refs.eltacdetailsmodal.modalDetailsInit(res.response, 'activity_name')
} else {
this.$Message.error(res.msg_detail)
}
}).finally(() => {
this.eltActDetailsModalLoading = false
})
},
}
}
</script>
\ No newline at end of file
......@@ -104,7 +104,7 @@ export default {
{ id: 'key_name', name: '钥匙名称', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'place_id', name: '场地名称', type: 'select', disabled: false, require: false, optList: [] },
// { id: 'place_name', name: '场地名称', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'state', name: '是否可借', type: 'select', disabled: true, require: false, optList: [{label:'可借',value:0},{label:'借出',value:1},{label:'维护中',value:2}] },
{ id: 'state', name: '是否可借', type: 'select', disabled: false, require: false, optList: [{label:'可借',value:0},{label:'借出',value:1},{label:'维护中',value:2}] },
// { id: 'file_id', name: '附件', type: 'file', disabled: false, require: false, optList: [] },
{ id: 'file_list', name: '附件', type: 'file', disabled: false, require: false, optList: [] },
{ id: 'is_enable', name: '启用', type: 'switch', disabled: false, require: false, optList: [], show: false },
......@@ -192,7 +192,7 @@ export default {
// 新增
add(){
this.editModalshow = true
this.$refs.ceditmodal.modalInit('add', this.defaultFormData)
this.$refs.ceditmodal.modalInit('add', this.defaultFormData, '钥匙管理')
},
// 编辑
rowEdit(row){
......
......@@ -183,6 +183,10 @@ export default {
// 树形节点改变
treeNodeChange(val1, val2) {
// console.log('树形节点改变', val1, val2)
// 展开物资树
val2.expand = true
// 选中 / 取消节点
if (!val2.selected) {
this.currentTreeNode = {}
this.params.parent_id = '1'
......@@ -258,7 +262,7 @@ export default {
this.formItem[this.formItem.findIndex(a => a.id == 'place_type_id')].disabled = true
this.defaultFormData.place_type_id = this.currentTreeNode.place_type_id
}
this.$refs.ceditmodal.modalInit('add', this.defaultFormData)
this.$refs.ceditmodal.modalInit('add', this.defaultFormData, '新增物资')
},
// 编辑
rowEdit(row){
......
......@@ -21,13 +21,15 @@
:pageIndex="params.page_index"
:pageSize="params.page_size"
@switchChange="switchChange"
@rowDetails="rowDetails"
@rowEdit="rowEdit"
@rowDelete="rowDelete"
@onPageChange="onPageChange"
@onPageSizeChange="onPageSizeChange">
<template #other="{ row }">
<template #action="{ row }">
<a @click="keyMng(row)">钥匙管理</a>
<a style="margin-left: 8px" @click="rowDetails(row)">详情</a>
<Button style="margin-left: 8px" type="info" size="small" @click="rowEdit(row)">编辑</Button>
<Poptip confirm transfer title="是否确认删除?" @on-ok="rowDelete(row)">
<Button type="error" size="small" style="margin-left: 8px">删除</Button>
</Poptip>
</template>
</CTable>
......@@ -57,13 +59,15 @@
:pageIndex="detailsParams.page_index"
:pageSize="detailsParams.page_size"
@switchChange="keySwitchChange"
@rowEdit="keyRowEdit"
@rowDelete="keyRowDelete"
@onPageChange="keyOnPageChange"
@onPageSizeChange="keyOnPageSizeChange">
<!-- 钥匙借还记录 -->
<template #other="{ row }">
<template #action="{ row }">
<a @click="keyBTRecordsRow(row)">借还记录</a>
<Button style="margin-left: 8px" type="info" size="small" @click="rowEdit(row)">编辑</Button>
<Poptip confirm transfer title="是否确认删除?" @on-ok="rowDelete(row)">
<Button type="error" size="small" style="margin-left: 8px">删除</Button>
</Poptip>
</template>
<template #keystate="{ row }">
<span v-if="row.state == 0">可借</span>
......@@ -106,6 +110,11 @@
<!-- <template #action="{ row }">
<a @click="keyBTRecordsRowDetails(row)">详情</a>
</template> -->
<template #state="{ row }">
<span v-if="row.state == 0">可借</span>
<span v-if="row.state == 1">借出</span>
<span v-if="row.state == 2">维护中</span>
</template>
</CTable>
<!-- 钥匙记录详情Modal -->
......@@ -179,8 +188,8 @@ export default {
{ key: 'file_id', title: '附件', align: 'center', minWidth: 150, show: false },
// { key: 'is_enable', title: '启用', align: 'center', minWidth: 150, show: true },
{ slot: 'generalSwitch', title: '启用', align: 'center', minWidth: 80, show: true },
{ slot: 'other', title: '其他', align: 'center', minWidth: 100, show: true, fixed: 'right' },
{ slot: 'actionAndDetails', title: '操作', align: 'center', minWidth: 180, show: true, fixed: 'right' },
// { slot: 'other', title: '其他', align: 'center', minWidth: 100, show: true, fixed: 'right' },
{ slot: 'action', title: '操作', align: 'center', minWidth: 240, show: true, fixed: 'right' },
],
tableLoading: false,
......@@ -254,8 +263,8 @@ export default {
{ slot: 'keystate', title: '是否可借', align: 'center', minWidth: 100, show: true },
// { key: 'is_enable', title: '启用', align: 'center', minWidth: 80, show: true },
{ slot: 'generalSwitch', title: '启用', align: 'center', minWidth: 80, show: true },
{ slot: 'other', title: '其他', align: 'center', minWidth: 100, show: true, fixed: 'right' },
{ slot: 'action', title: '操作', align: 'center', minWidth: 150, show: true, fixed: 'right' },
{ slot: 'other', title: '其他', align: 'center', minWidth: 100, show: false, fixed: 'right' },
{ slot: 'action', title: '操作', align: 'center', minWidth: 200, show: true, fixed: 'right' },
],
detailsTableData: [],
detailsTableLoading: false,
......@@ -312,7 +321,7 @@ export default {
{ key: 'return_card', title: '归还者卡号', align: 'center', minWidth: 120, show: true },
{ key: 'return_name', title: '归还者', align: 'center', minWidth: 120, show: true },
{ key: 'return_time', title: '归还时间', align: 'center', minWidth: 180, show: true },
{ key: 'state', title: '状态', align: 'center', minWidth: 120, show: true },
{ slot: 'state', title: '状态', align: 'center', minWidth: 120, show: true },
{ key: 'borrow_userid', title: '借用者id', align: 'center', minWidth: 120, show: false },
{ key: 'return_userid', title: '归还者id', align: 'center', minWidth: 120, show: false },
{ slot: 'action', title: '操作', align: 'center', minWidth: 150, show: false, fixed: 'right' },
......@@ -447,7 +456,7 @@ export default {
// 新增
add(){
this.editModalshow = true
this.$refs.ceditmodal.modalInit('add', this.defaultFormData)
this.$refs.ceditmodal.modalInit('add', this.defaultFormData, '新增场地')
},
// 详情
rowDetails(row) {
......
......@@ -37,7 +37,7 @@
:formItem="formItem"
:loading="editModalLoading"
:formLabelWidth="100"
:width="800"
:width="1000"
@onClose="editModalshow = false"
@onSubmit="modalSubmit"></CEditModal>
......@@ -114,7 +114,7 @@ export default {
{ id: 'time_split', name: '分割时间段(分钟)', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'read_time', name: '阅读时间(秒)', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'service_interval_time', name: '时间范围', type: 'timerange', disabled: false, require: false, optList: [] },
{ id: 'instructions', name: '使用须知', type: 'textarea', disabled: false, require: false, optList: [], rows: 6 },
{ id: 'instructions', name: '使用须知', type: 'textarea', disabled: false, require: false, optList: [], rows: 10 },
// { id: 'file_id', name: '附件', type: 'file', disabled: false, require: false, optList: [] },
{ id: 'is_enable', name: '启用', type: 'switch', disabled: false, require: false, optList: [] },
],
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或