提交 404dfe66 编写于 作者: 钟一霄's avatar 钟一霄

钥匙借还记录、其他bug修正、优化调整

上级 41377805
......@@ -16,12 +16,12 @@
ref="form"
label-colon
:model="formData"
:rules="rules"
:rules="formRule"
:label-width="formLabelWidth">
<!-- 新增 / 编辑 -->
<Row v-if="!isDetails">
<Col v-bind="grid" v-for="item in formItem.filter(a => a.type != 'file' && (!a.hasOwnProperty('show') || a.show))" :key="item.id">
<FormItem :label="item.name" :prop="item.name">
<FormItem :label="item.name" :prop="item.id">
<Input
v-if="item.type == 'input'"
v-model="formData[item.id]"
......@@ -67,6 +67,14 @@
v-model="formData[item['id']]"
:true-value="1"
:false-value="0"/>
<TimePicker
v-else-if="item.type == 'timerange'"
v-model="formData[item['id']]"
format="HH:mm"
type="timerange"
placement="bottom-end"
placeholder="请选择时间"/>
</FormItem>
</Col>
<!-- 文件类型 -->
......@@ -180,7 +188,6 @@ export default {
// 表单数据
formData: {},
rules: {},
grid: {
xl: 12,
......@@ -214,6 +221,13 @@ export default {
} else if (addOrEdit == 'edit') {
this.modalTitle = '编辑'
this.formData = cloneDeep(row)
// 时间范围处理
let tri = this.formItem.findIndex(a => a.type == 'timerange')
if (tri != -1) {
let id = this.formItem[tri].id
this.formData[id] = this.formData[id].split('-')
}
}
// 设置上传按钮loading
......@@ -267,7 +281,22 @@ export default {
},
// 提交
onSubmit() {
this.$emit('onSubmit', cloneDeep(this.formData))
this.$refs.form.validate((valid) => {
if (valid) {
let obj = cloneDeep(this.formData)
// 时间范围处理
let tri = this.formItem.findIndex(a => a.type == 'timerange')
if (tri != -1) {
let id = this.formItem[tri].id
obj[id] = obj[id].join('-')
}
this.$emit('onSubmit', obj)
} else {
this.$Message.warning('请检查输入项')
}
})
},
},
}
......
......@@ -26,6 +26,14 @@
:key="it.value"
:value="it.value">{{ it.label }}</Option>
</Select>
<DatePicker
v-else-if="item.type == 'datetime'"
v-model="searchCondObj[item['id']]"
type="datetime"
format="yyyy-MM-dd HH:mm"
placeholder="请选择时间"
@on-change="(val1, val2) => datetimeChange(val1, val2, item.id)"/>
</FormItem>
</Col>
......@@ -76,6 +84,12 @@ export default {
this.searchCondObj = {}
this.$emit('onReset')
},
// 日期时间改变选择
datetimeChange(val1, val2, id) {
// console.log('日期时间改变选择', val1, val2, id)
this.searchCondObj[id] = val1
},
},
}
</script>
......
......@@ -320,7 +320,9 @@ export default {
return {
// 搜索项
searchCondList: [
{ id: 'name', name: '类型名称', type: 'input', show: true, optList: [] },
{ 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: [] },
],
// 搜索条件
params:{
......@@ -473,12 +475,12 @@ export default {
cmdActiveId: '',
cmdTableColumns: [
{ type: 'index', title: '序号', align: 'center', width: 80, show: true, fixed: 'left' },
{ key: 'name', title: '借用人', align: 'center', minWidth: 150, show: true },
{ key: 'card', title: '借用人卡号', align: 'center', minWidth: 150, show: true },
{ key: 'commodity_name', title: '物资名称', align: 'center', minWidth: 250, show: true },
{ key: 'parent_id', title: '父级id', align: 'center', minWidth: 300, show: false },
{ key: 'place_type_id', title: '场地类型id', align: 'center', minWidth: 150, show: false },
{ key: 'place_type_name', title: '场地类型', align: 'center', minWidth: 250, show: true },
{ 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' },
],
......@@ -588,6 +590,7 @@ export default {
}
})
this.formItem[this.formItem.findIndex(a => a.id == 'place_type_id')].optList = arr
this.searchCondList[this.searchCondList.findIndex(a => a.id == 'place_type_id')].optList = arr
})
// 获取场地
this.asc.getApiCommonGetPlaceSelect({id: ''}).then(res => {
......@@ -610,6 +613,8 @@ export default {
Object.keys(val).forEach(a => {
if (val[a]) {
this.params[a] = val[a]
} else {
this.params[a] = ''
}
})
this.onPageChange(1)
......
......@@ -154,6 +154,8 @@ export default {
Object.keys(val).forEach(a => {
if (val[a]) {
this.params[a] = val[a]
} else {
this.params[a] = ''
}
})
this.onPageChange(1)
......
<template>
<div>
<Modal
:title="addOrEdit == 'add' ? '新增' : '修改'"
v-model="visibleShow"
width="40%"
>
<Form :model="formData" :label-width="100" ref="formData" :rules="rules">
<Row :gutter="32">
<Col span="12">
<FormItem label="ddd" prop="a">
<Input v-model="formData.a"/>
</FormItem>
</Col>
</Row>
</Form>
<div class="demo-drawer-footer" v-if="addOrEdit == 'add'">
<Button style="margin-right: 8px" @click="visibleShow = false">取消</Button>
<Button type="primary" @click="addSubmit">确认新增</Button>
</div>
<div class="demo-drawer-footer" v-if="addOrEdit == 'edit'">
<Button style="margin-right: 8px" @click="visibleShow = false">取消</Button>
<Button type="primary" @click="editSubmit">确认修改</Button>
</div>
</Modal>
</div>
</template>
<script>
export default {
data () {
return {
visibleShow: false,
rules: {
class_code: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
class_name: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
college_id: [
{ required: true, message: '不能为空', trigger: 'change' }
],
grade: [
{ required: true, message: '不能为空', trigger: 'change' }
],
training_id: [
{ required: true, message: '不能为空', trigger: 'change' }
],
},
formData: {
a: ''
},
formList:[],
addOrEdit: ''
}
},
mounted() {
this.getData()
},
methods: {
// 初始化
getData(){
},
// 确认新增
addSubmit() {
this.$refs.formData.validate((valid) => {
if(valid) {
this.$Message.success(res)
this.visibleShow = false
this.$emit('getData')
}
})
},
// 确认修改
editSubmit() {
const {status, ...params} = this.formData //从对象中删除status
this.$refs.formData.validate((valid) => {
if(valid) {
}
})
},
// 点击新增
add() {
this.addOrEdit = "add"
this.visibleShow = true
Object.keys(this.formData).forEach(key => this.formData[key] = '') //es6清空对象属性
},
// 点击修改
edit(row) {
this.addOrEdit = "edit"
this.visibleShow = true
this.formData = Object.assign({},row) //es6深拷贝
}
}
}
</script>
<style>
.demo-drawer-footer{
width: 100%;
position: absolute;
bottom: 0;
left: 0;
border-top: 1px solid #e8e8e8;
padding: 12px 16px;
text-align: right;
background: #fff;
}
</style>
\ No newline at end of file
<template>
<Form :label-width="120">
<Row :gutter="32">
<template v-for="(item, index) in formList">
<Col v-bind="grid" :key="item.code" v-if="!!~[0,1].indexOf(index)">
<FormItem :label="`${item.label}:`" >
<Select v-if="item.option_list" clearable @on-clear="getData" placeholder="请选择" v-model="params[item.code]">
<Option :value="items.value" v-for="items in item.option_list" :key="items.label">{{items.label}}</Option>
</Select>
<Input clearable @on-clear="getData" v-if="!item.option_list" placeholder="请输入" v-model="params[item.code]"></Input>
</FormItem>
</Col>
<template v-if="collapse">
<Col v-bind="grid" :key="item.code" v-if="index>=2">
<FormItem :label="`${item.label}:`">
<Select v-if="item.option_list" clearable @on-clear="getData" placeholder="请选择" v-model="params[item.code]">
<Option :value="items.value" v-for="items in item.option_list" :key="items.label">{{items.label}}</Option>
</Select>
<Input clearable @on-clear="getData" v-if="!item.option_list" placeholder="请输入" v-model="params[item.code]"></Input>
</FormItem>
</Col>
</template>
</template>
<Col v-bind="grid" class="ivu-text-right" v-if="formList.length === 0 ? false : true">
<FormItem type="flex" justify="end">
<Button type="primary" @click="getData">查询</Button>
<a v-font="14" class="ivu-ml-8" @click="collapse = !collapse">
<template v-if="!collapse">
展开 <Icon type="ios-arrow-down"/>
</template>
<template v-else>
收起 <Icon type="ios-arrow-up"/>
</template>
</a>
</FormItem>
</Col>
</Row>
</Form>
</template>
<script>
export default {
data () {
return {
grid: {
xl: 8,
lg: 12,
md: 24,
sm: 24,
xs: 24
},
formList:[
{
label: "所属院系",
code: "college_id",
search_type: "select",
is_must: 0,
option_list: [
{
value: "117c96a1-5c8f-4c71-8574-d45ec049db3b",
label: "电气工程系"
}
]
},
{
label: "状态1",
code: "status",
search_type: "select",
is_must: 0,
option_list: [
{
value: "0",
label: "停用"
}
]
},
{
label: "状态2",
code: "status2",
search_type: "select",
is_must: 0,
option_list: [
{
value: "0",
label: "停用"
}
]
},
{
label: "状态3",
code: "status3",
search_type: "select",
is_must: 0,
option_list: [
{
value: "0",
label: "停用"
}
]
}
],
collapse: false,
params:{
pageIndex: 1,
pageSize: 10,
college_id: '',
status: '',
status2: '',
status3: '',
}
}
},
mounted() {
},
methods: {
getData() {
console.log('搜索条件查询');
}
}
}
</script>
\ No newline at end of file
......@@ -97,9 +97,9 @@ export default {
// 搜索项
searchCondList: [
{ id: 'card_name', name: '卡号或姓名', type: 'input', show: true, optList: [] },
{ id: 'begin_time', name: '开始时间', type: 'input', show: true, optList: [] },
{ id: 'end_time', name: '结束时间', type: 'input', show: true, optList: [] },
{ id: 'state', name: '状态', type: 'select', show: true, optList: [{value:0,label:'过期'},{value:1,label:'生效'},{value:2,label:'强制取消'}] },
{ id: 'begin_time', name: '开始时间', type: 'datetime', show: true, optList: [] },
{ id: 'end_time', name: '结束时间', type: 'datetime', show: true, optList: [] },
{ id: 'state', name: '状态', type: 'select', show: true, optList: [{value:"0",label:'过期'},{value:"1",label:'生效'},{value:"2",label:'强制取消'}] },
],
// 搜索条件
params:{
......@@ -141,9 +141,7 @@ export default {
}
},
// 查询条件初始化
created(){
},
created(){},
mounted(){
this.getData()
},
......@@ -153,6 +151,8 @@ export default {
Object.keys(val).forEach(a => {
if (val[a]) {
this.params[a] = val[a]
} else {
this.params[a] = ''
}
})
this.onPageChange(1)
......
......@@ -107,7 +107,7 @@ export default {
{ id: 'state', name: '是否可借', type: 'select', disabled: true, 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: [] },
{ id: 'is_enable', name: '启用', type: 'switch', disabled: false, require: false, optList: [], show: false },
],
defaultFormData: {
id: "",
......@@ -115,7 +115,7 @@ export default {
key_name: "",
place_id: "",
place_name: "",
state: 0,
state: 2,
is_enable: 0,
is_del: 0,
createby: null,
......@@ -149,6 +149,8 @@ export default {
Object.keys(val).forEach(a => {
if (val[a]) {
this.params[a] = val[a]
} else {
this.params[a] = ''
}
})
this.onPageChange(1)
......
......@@ -198,6 +198,8 @@ export default {
Object.keys(val).forEach(a => {
if (val[a]) {
this.params[a] = val[a]
} else {
this.params[a] = ''
}
})
this.onPageChange(1)
......@@ -308,6 +310,7 @@ export default {
this.$Message.success(res.response)
this.editModalshow = false
this.getData()
this.getTreeData()
} else {
this.$Message.error(res.msg_detail)
}
......@@ -318,11 +321,12 @@ export default {
// 删除
rowDelete(row) {
// console.log('删除', row);
this.asc.getApiKeyKeyDel({id:row.id, is_del:1}).then(res => {
this.asc.getApiCommodityCommodityDel({id:row.id, is_del:1}).then(res => {
// console.log('删除行后', res)
if (res.code == 1) {
this.$Message.success(res.msg)
this.getData()
this.getTreeData()
} else {
this.$Message.error(res.msg_detail)
}
......@@ -351,7 +355,7 @@ export default {
return {
...a,
title: a.commodity_name,
expand: true,
expand: a.id == '1' ? true : false,
selected: false,
}
})
......
此差异已折叠。
......@@ -91,6 +91,7 @@ export default {
{ key: 'time_split', title: '分割时间段(分钟)', align: 'center', minWidth: 150, show: true },
{ key: 'instructions', title: '使用须知', align: 'center', minWidth: 300, show: true, tooltip: true, tooltipMaxWidth: 800 },
{ key: 'read_time', title: '阅读时间(秒)', align: 'center', minWidth: 120, show: true },
{ key: 'service_interval_time', title: '时间范围', align: 'center', minWidth: 120, 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: 80, show: true, fixed: 'right' },
......@@ -112,6 +113,7 @@ export default {
{ id: 'place_type_name', name: '场地类型名称', type: 'input', disabled: false, require: false, optList: [] },
{ 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: 'file_id', name: '附件', type: 'file', disabled: false, require: false, optList: [] },
{ id: 'is_enable', name: '启用', type: 'switch', disabled: false, require: false, optList: [] },
......@@ -152,6 +154,8 @@ export default {
Object.keys(val).forEach(a => {
if (val[a]) {
this.params[a] = val[a]
} else {
this.params[a] = ''
}
})
this.onPageChange(1)
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或