Skip to content

M
mes-ui
Commit 1d0d4953 authored by 康振飞's avatar 康振飞
Browse files
Options

工厂日历new

parent b264962d
Show whitespace changes
Inline Side-by-side
Showing with 290 additions and 399 deletions
i18n/locale/zh-CN.js
View file @ 1d0d4953
...@@ -730,20 +730,22 @@ export default { ...@@ -730,20 +730,22 @@ export default {
notes: '备注', notes: '备注',
}, },
// 工厂日历 // 工厂日历
calendar_class: { mes_shift_work_sched: {
id: '', id: '',
creationTime: '创建时间', shiftWorkSchedCode:'班次编号',
creatorUserId: '创建人', shiftName:'班次名称',
lastModificationTime: '更新时间', shiftStart:'班次开始时间',
lastModifierUserId: '更新人', shiftEnd:'班次结束时间',
isDeleted: '删除人', status:'状态',
deletionTime: '删除时间', workingLong:'工作时长',
deleterUserId: '删除人', shiftWorkSchedPk1:'班次id',
title: '班次名称', creationTime:'',
startTime: '开始时间', creatorUserId:'',
endTime: '结束时间', lastModificationTime:'',
startendTime: '班次时间', lastModifierUserId:'',
workHours: '工作时长', isDeleted:'',
deletionTime:'',
deleterUserId:'',
}, },
calendar_holiday: { calendar_holiday: {
id: '', id: '',
......
pages/basicData/calendar/class/add.vue
View file @ 1d0d4953
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90"> <Form ref="form" :model="entity" :rules="rules" :label-width="110">
<Row> <Row>
<Col span="24"> <Col :span="24">
<FormItem :label="l('title')" prop="title"> <FormItem :label="l('shiftWorkSchedCode')" prop="shiftWorkSchedCode">
<Input v-model="entity.title"></Input> <Input v-model="entity.shiftWorkSchedCode"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col span="24"> <Col :span="24">
<FormItem :label="l('startendTime')" prop="startTime"> <FormItem :label="l('shiftName')" prop="shiftName">
<TimePicker <Input v-model="entity.shiftName"></Input>
type="timerange"
format="HH:mm"
v-model="entity.startendTime"
placeholder="请选择时间段"
></TimePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24">
<FormItem :label="l('shiftStart')" prop="shiftStart">
<DatePicker type="date" v-model="entity.shiftStart"></DatePicker>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('shiftEnd')" prop="shiftEnd">
<DatePicker type="date" v-model="entity.shiftEnd"></DatePicker>
</FormItem>
</Col>
<!-- <Col :span="12">
<FormItem :label="l('status')" prop="status">
<InputNumber v-model="entity.status"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('workingLong')" prop="workingLong">
<Input v-model="entity.workingLong"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('shiftWorkSchedPk1')" prop="shiftWorkSchedPk1">
<InputNumber v-model="entity.shiftWorkSchedPk1"></InputNumber>
</FormItem>
</Col> -->
</Row> </Row>
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
...@@ -23,84 +43,57 @@ ...@@ -23,84 +43,57 @@
</FormItem> </FormItem>
</Form> </Form>
</template> </template>
<script> <script>
import Api from './api' import Api from "./api";
export default { export default {
name: 'Add', name: "Add",
data() { data() {
return { return {
disabled: false, disabled: false,
entity: {}, entity: {},
rules: { rules: {
title: [{ required: true, message: '请填写班次名称', trigger: 'blur' }] name: [{ required: true, message: "必填", trigger: "blur" }]
}
} }
};
}, },
props: { props: {
v: Object v: Object
}, },
methods: { methods: {
handleSubmit() { handleSubmit() {
this.$refs.form.validate((v) => { this.$refs.form.validate(v => {
if (v) { if (v) {
this.disabled = true this.disabled = true;
// let parmes = { Api.create(this.entity)
// pageIndex: 1, .then(r => {
// pageSize: 20, this.disabled = false;
// conditions: [
// {
// fieldName: 'keys',
// fieldValue: this.entity.title,
// conditionalType: 'title'
// }
// ],
// total: 4
// }
// Api.paged(parmes).then((r) => {
// console.log(r.success)
// if(r.success){
// this.$Message.error("该班次名称已存在！")
// this.disabled = true
// return
// }else{
let pames = {
title: this.entity.title,
startendTime: this.entity.startendTime.join('-')
}
Api.create(pames)
.then((r) => {
if (r.success) { if (r.success) {
// this.disabled = false this.$Message.success("保存成功");
this.$Message.success('保存成功') this.$emit("on-ok");
this.entity = {}
this.$emit('on-ok')
} else { } else {
this.$Message.error('保存失败') this.$Message.error("保存失败");
} }
}) })
.catch((err) => { .catch(err => {
this.$Message.error('保存失败') this.disabled = false;
console.warn(err) this.$Message.error("保存失败");
}) console.warn(err);
});
} }
}) });
// }
// })
}, },
handleClose() { handleClose() {
this.entity = {} this.$emit("on-close");
this.disabled = true
this.$emit('on-close')
}, },
l(key) { l(key) {
key = 'calendar_class' + '.' + key key = "mes_shift_work_sched" + "." + key;
return this.$t(key) return this.$t(key);
} }
}, },
watch: { watch: {
v() { v() {
this.entity = this.$u.clone(this.v) this.entity = this.$u.clone(this.v);
} }
} }
} };
</script> </script>
pages/basicData/calendar/class/api.js
View file @ 1d0d4953
import Api from '@/plugins/request' import Api from '@/plugins/request'
export default { export default {
index:`${systemUrl}/calendarclass/paged`, index:`${systemUrl}/messhiftworksched/paged`,
paged(params){ paged(params){
return Api.post(`${systemUrl}/calendarclass/paged`,params); return Api.post(`${systemUrl}/messhiftworksched/paged`,params);
}, },
get(params){ get(params){
return Api.get(`${systemUrl}/calendarclass/get`,params); return Api.get(`${systemUrl}/messhiftworksched/get`,params);
}, },
create(params){ create(params){
return Api.post(`${systemUrl}/calendarclass/create`,params); return Api.post(`${systemUrl}/messhiftworksched/create`,params);
}, },
update(params){ update(params){
return Api.post(`${systemUrl}/calendarclass/update`,params); return Api.put(`${systemUrl}/messhiftworksched/update`,params);
}, },
//删除： //删除：
delete(params) { delete(params) {
return Api.delete(`${systemUrl}/calendarclass/delete`,{params:params}); return Api.delete(`${systemUrl}/messhiftworksched/delete`,{params:params});
}, },
} }
\ No newline at end of file \ No newline at end of file
pages/basicData/calendar/class/detail.vue
View file @ 1d0d4953
...@@ -2,10 +2,13 @@ ...@@ -2,10 +2,13 @@
<div class="detail"> <div class="detail">
<Row> <Row>
<Filed :span="12" :name="l('title')">{{entity.title}}</Filed> <Filed :span="12" :name="l('shiftWorkSchedCode')">{{entity.shiftWorkSchedCode}}</Filed>
<Filed :span="12" :name="l('startTime')">{{entity.startTime}}</Filed> <Filed :span="12" :name="l('shiftName')">{{entity.shiftName}}</Filed>
<Filed :span="12" :name="l('endTime')">{{entity.endTime}}</Filed> <Filed :span="12" :name="l('shiftStart')">{{entity.shiftStart}}</Filed>
<Filed :span="12" :name="l('workHours')">{{entity.workHours}}</Filed> <Filed :span="12" :name="l('shiftEnd')">{{entity.shiftEnd}}</Filed>
<!-- <Filed :span="12" :name="l('status')">{{entity.status}}</Filed>
<Filed :span="12" :name="l('workingLong')">{{entity.workingLong}}</Filed>
<Filed :span="12" :name="l('shiftWorkSchedPk1')">{{entity.shiftWorkSchedPk1}}</Filed> -->
</Row> </Row>
</div> </div>
...@@ -37,7 +40,7 @@ ...@@ -37,7 +40,7 @@
this.$emit('on-close') this.$emit('on-close')
}, },
l(key) { l(key) {
key = "calendar_class" + "." + key; key = "mes_shift_work_sched" + "." + key;
return this.$t(key) return this.$t(key)
} }
}, },
......
pages/basicData/calendar/class/edit.vue
View file @ 1d0d4953
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90"> <Form ref="form" :model="entity" :rules="rules" :label-width="110">
<Row> <Row>
<Col span="24"> <Col :span="24">
<FormItem :label="l('title')" prop="title"> <FormItem :label="l('shiftWorkSchedCode')" prop="shiftWorkSchedCode">
<Input v-model="entity.title"></Input> <Input v-model="entity.shiftWorkSchedCode"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col span="24"> <Col :span="24">
<!-- prop="startendTime" --> <FormItem :label="l('shiftName')" prop="shiftName">
<FormItem :label="l('startendTime')"> <Input v-model="entity.shiftName"></Input>
<TimePicker type="timerange" format="HH:mm" v-model="entity.startendTime" placeholder="请选择时间段"></TimePicker> </FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('shiftStart')" prop="shiftStart">
<DatePicker type="date" v-model="entity.shiftStart"></DatePicker>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('shiftEnd')" prop="shiftEnd">
<DatePicker type="date" v-model="entity.shiftEnd"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -20,74 +29,64 @@ ...@@ -20,74 +29,64 @@
</Form> </Form>
</template> </template>
<script> <script>
import Api from './api' import Api from "./api";
export default { export default {
name: 'Edit', name: "Edit",
data() { data() {
return { return {
disabled: false, disabled: false,
entity: {}, entity: {},
rules: { rules: {
title: [{ required: true, message: '请填写班次名称', trigger: 'blur' }], name: [{ required: true, message: "必填", trigger: "blur" }]
// startendTime: [{ required: true, message: '请选择时间段', trigger: 'blur' }],
}
} }
};
}, },
props: { props: {
eid: Number eid: Number
}, },
methods: { methods: {
load(v) { load(v) {
Api.get({ id: v }).then((r) => { Api.get({ id: v }).then(r => {
r.result.startendTime=r.result.startendTime.split('-') this.entity = r.result;
this.entity = r.result this.$emit("on-load");
this.$emit('on-load') });
})
}, },
handleSubmit() { handleSubmit() {
this.$refs.form.validate((v) => { this.$refs.form.validate(v => {
if (v) { if (v) {
let startendTime = this.entity.startendTime this.disabled = true;
let pames={ Api.update(this.entity)
title: this.entity.title, .then(r => {
startendTime: startendTime.join('-'), this.disabled = false;
workHours: this.entity.workHours,
creationTime: this.entity.creationTime,
creatorUserId: this.entity.creatorUserId,
id: this.entity.id,
}
Api.update(pames)
.then((r) => {
this.disabled = false
if (r.success) { if (r.success) {
this.$Message.success('保存成功') this.$Message.success("保存成功");
this.$emit('on-ok') this.$emit("on-ok");
} else { } else {
this.$Message.error('保存失败') this.$Message.error("保存失败");
} }
}) })
.catch((err) => { .catch(err => {
this.disabled = false this.disabled = false;
this.$Message.error('保存失败') this.$Message.error("保存失败");
console.warn(err) console.warn(err);
}) });
} }
}) });
}, },
handleClose() { handleClose() {
this.$emit('on-close') this.$emit("on-close");
}, },
l(key) { l(key) {
key = 'calendar_class' + '.' + key key = "mes_shift_work_sched" + "." + key;
return this.$t(key) return this.$t(key);
} }
}, },
watch: { watch: {
eid(v) { eid(v) {
if (v != 0) { if (v != 0) {
this.load(v) this.load(v);
} }
} }
} }
} };
</script> </script>
\ No newline at end of file
pages/basicData/calendar/class/index.vue
View file @ 1d0d4953
<template> <template>
<div class="classview"> <div>
<DataGrid :columns="columns" ref="grid" :action="action" :height="tableHeight" <DataGrid :columns="columns" ref="grid" :action="action"><template slot="easySearch"><Form ref="formInline" :model="easySearch" inline><FormItem prop="keys"><Input placeholder="请输入关键字编号/班次名称" v-model="easySearch.keys.value" /> </FormItem>
@on-selection-change="selectionChange" :high="false"> <FormItem><Button type="primary" @click="search">查询</Button></FormItem>
<!-- :height="tabheight" --> </Form></template>
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
<Input placeholder="请输入关键字班次名称" v-model="easySearch.keys.value" />
</FormItem>
<FormItem>
<Button type="primary" @click="search">查询</Button>
</FormItem>
</Form>
</template>
<template slot="searchForm"> <template slot="searchForm">
<Search /> <Search />
</template> </template>
...@@ -20,24 +10,18 @@ ...@@ -20,24 +10,18 @@
<Button type="primary" @click="addModal=true">新增</Button> <Button type="primary" @click="addModal=true">新增</Button>
</template> </template>
</DataGrid> </DataGrid>
<div class="footer02" v-if="footerModel">
<span class="span">
已选择
<b class="span02">{{selectedRows.length}}</b> 项
</span>
<Button @click="deleteMore" class="span ml20"><Icon type="md-close"/>批量删除</Button>
</div>
<Modal v-model="addModal" title="新增" footer-hide> <Modal v-model="addModal" title="新增" footer-hide>
<Add @on-close="cancel" @on-ok="addOk" /> <Add @on-close="cancel" @on-ok="addOk" />
</Modal> </Modal>
<Modal v-model="editModal" title="编辑" footer-hide> <Modal v-model="editModal" title="编辑" footer-hide>
<Edit :eid="curId" @on-close="cancel" @on-ok="addOk" /> <Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
</Modal> </Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel"> <Modal v-model="detailModal" title="详情">
<p>确定删除？</p> <Detail :eid="curId" />
</Modal> </Modal>
<Modal v-model="deletelMore" title="批量删除"@on-ok="cancel" @on-cancel="cancel"> <Modal v-model="deletelModal" title="删除" @on-ok="removeOk"
<p>确定删除这{{selectedRows.length}}项么？</p> @on-cancel="cancel">
<p>确定删除？</p>
</Modal> </Modal>
</div> </div>
</template> </template>
...@@ -49,225 +33,126 @@ import Detail from './detail' ...@@ -49,225 +33,126 @@ import Detail from './detail'
import Search from './search' import Search from './search'
export default { export default {
name: 'list', name: 'list',
components: { components:{
Add, Add,Edit,Detail,Search
Edit,
Detail,
Search
}, },
data() { data() {
return { return {
action: Api.index, action: Api.index,
easySearch: { easySearch: {
keys: { op: 'title', value: null } keys:{op:"shiftWorkSchedCode,shiftName",value:null}
}, },
addModal: false, addModal: false,
editModal: false, editModal: false,
detailModal: false,
deletelModal: false, deletelModal: false,
selectedRows: [], //表格选中项
footerModel: false,
deletelMore: false,
tableHeight: '',
curId: 0, curId: 0,
columns: [ columns: [
// { type: 'selection', width: 70, align: 'center'}, { key:"id",title:this.l("id") ,hide:true ,align:"left" },
{ key: 'id', title: this.l('id'), hide: true, align: 'left' }, { key:"shiftWorkSchedCode",title:this.l("shiftWorkSchedCode") ,align:"left" ,easy:true ,high:true },
{ { key:"shiftName",title:this.l("shiftName") ,align:"left" ,easy:true ,high:true },
key: 'creationTime', { key:"shiftStart",title:this.l("shiftStart") ,align:"left" ,high:true },
title: this.l('creationTime'), { key:"shiftEnd",title:this.l("shiftEnd") ,align:"left" ,high:true },
hide: true, { key:"status",title:this.l("status") ,hide:true ,align:"left" ,high:true },
align: 'left' { key:"workingLong",title:this.l("workingLong") ,align:"left" ,high:true },
}, { key:"shiftWorkSchedPk1",title:this.l("shiftWorkSchedPk1") ,hide:true ,align:"left" ,high:true },
{ { key:"creationTime",title:this.l("creationTime") ,hide:true ,align:"left" },
key: 'creatorUserId', { key:"creatorUserId",title:this.l("creatorUserId") ,hide:true ,align:"left" },
title: this.l('creatorUserId'), { key:"lastModificationTime",title:this.l("lastModificationTime") ,hide:true ,align:"left" },
hide: true, { key:"lastModifierUserId",title:this.l("lastModifierUserId") ,hide:true ,align:"left" },
align: 'left' { key:"isDeleted",title:this.l("isDeleted") ,hide:true ,align:"left" },
}, { key:"deletionTime",title:this.l("deletionTime") ,hide:true ,align:"left" },
{ { key:"deleterUserId",title:this.l("deleterUserId") ,hide:true ,align:"left" },
key: 'lastModificationTime',
title: this.l('lastModificationTime'),
hide: true,
align: 'left'
},
{
key: 'lastModifierUserId',
title: this.l('lastModifierUserId'),
hide: true,
align: 'left'
},
{
key: 'isDeleted',
title: this.l('isDeleted'),
hide: true,
align: 'left'
},
{
key: 'deletionTime',
title: this.l('deletionTime'),
hide: true,
align: 'left'
},
{
key: 'deleterUserId',
title: this.l('deleterUserId'),
hide: true,
align: 'left'
},
{
key: 'title',
title: this.l('title'),
align: 'left',
easy: true,
high: true
},
{
key: 'startendTime',
title: this.l('startendTime'),
align: 'left',
high: true,
},
{
key: 'startTime',
title: this.l('startTime'),
align: 'left',
hide: true,
high: true
},
{ key: 'endTime', title: this.l('endTime'), align: 'left',
hide: true, high: true },
{
key: 'workHours',
title: this.l('workHours'),
align: 'left',
high: true
},
{ {
title: '操作', title: '操作',
key: 'id', key: 'id',
width: 140, width: 140,
align: 'center', align: 'center',
render: (h, params) => { render: (h, params) => {
return h('div', { class: 'action' }, [ return h('div', { class: "action" }, [
h( // h('op', { attrs: { oprate: 'detail' }, on: { click: () => this.detail(params.row.id) } }, '查看'),
'op', h('op', { attrs: { oprate: 'edit'}, on: { click: () => this.edit(params.row.id) } }, '编辑'),
{ h('op', { attrs: { oprate: 'remove' }, on: { click: () => this.remove(params.row.id) } }, '删除')
attrs: { oprate: 'edit' },
on: { click: () => this.edit(params.row.id) }
},
'编辑'
),
h(
'op',
{
attrs: { oprate: 'remove' },
on: { click: () => this.remove(params.row.id) }
},
'删除'
)
]) ])
} }
} },
] ]
} }
}, },
created(){ mounted(){
this.tableHeight = window.innerHeight - 230 console.log(this);
},
mounted() {
window.onresize = () => {///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight
this.tableHeight = window.screenHeight - 230
})()
}
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch('loadDictionary') // 加载数据字典
}, },
methods: { methods:{
addOk() { addOk() {
this.$refs.grid.load() this.$refs.grid.load()
this.addModal = false this.addModal = false
this.editModal = false this.detailModal = false
this.curId = 0 this.editModal = false;
this.curId = 0;
}, },
search() { search() {
this.$refs.grid.reload(this.easySearch) this.$refs.grid.reload(this.easySearch)
}, },
detail(id) {
this.detailModal = true;
this.curId = id;
},
edit(id) { edit(id) {
this.editModal = true this.editModal = true;
this.curId = id this.curId = id;
}, },
remove(id) { remove(id) {
this.deletelModal = true this.deletelModal = true;
this.curId = id this.curId = id;
}, },
removeOk() { removeOk() {
Api.delete({ id: this.curId }).then((r) => { Api.delete({ id: this.curId }).then((r) => {
if (r.success) { if (r.success) {
this.$refs.grid.load() this.$refs.grid.load();
this.deletelModal = false this.deletelModal = false;
this.$Message.success('删除成功') this.$Message.success('删除成功')
} }
}) })
}, },
removeCancel() { removeCancel() {
this.deletelModal = false this.deletelModal = false;
}, },
cancel() { cancel() {
this.curId = 0 this.curId = 0;
this.addModal = false this.addModal = false
this.editModal = false this.detailModal = false
this.deletedlModal = false this.editModal = false;
this.deletelMore = false this.deletedlModal = false;
},
//多选处理--表格选择项变化方法
selectionChange(selection) {
this.selectedRows = selection
this.footerModel = selection.length > 0
},
deleteMore(){
this.deletelMore = true
}, },
l(key) { l(key) {
/* /*
calendar_class:{ mes_shift_work_sched:{
id:'', id:'',
creationTime:'创建时间', shiftWorkSchedCode:'编号',
creatorUserId:'创建人', shiftName:'班次名称',
lastModificationTime:'更新时间', shiftStart:'班次开始时间',
lastModifierUserId:'更新人', shiftEnd:'班次结束时间',
isDeleted:'删除人', status:'状态',
deletionTime:'删除时间', workingLong:'工作时长',
deleterUserId:'删除人', shiftWorkSchedPk1:'班次id',
title:'班次名称', creationTime:'',
startTime:'开始时间', creatorUserId:'',
endTime:'结束时间', lastModificationTime:'',
workHours:'工作时长', lastModifierUserId:'',
isDeleted:'',
deletionTime:'',
deleterUserId:'',
} }
*/ */
let vkey = 'calendar_class' + '.' + key let vkey = "mes_shift_work_sched" + "." + key;
return this.$t(vkey) || key return this.$t(vkey)||key
} }
} }
} }
</script> </script>
<style lang="less"> <style lang="less">
.classview{
height: 100%;
.footer02 {
background: #4c5968;
opacity: 0.9;
position: absolute;
bottom: 9px;
box-shadow: 0px -5px 6px rgba(0,0,0,0.3);
width: 86%;
z-index: 99;
padding: 10px;
color: #fff;
margin: 10px 0 10px 0;
}
}
</style> </style>
\ No newline at end of file
pages/basicData/calendar/class/search.vue
View file @ 1d0d4953
...@@ -3,6 +3,20 @@ ...@@ -3,6 +3,20 @@
<Row> <Row>
<Col :span="12" :v-if="condition.id.show"><FormItem :label="l('id')" prop="id"> <Input v-model="condition.id.value"> </Input> <Col :span="12" :v-if="condition.id.show"><FormItem :label="l('id')" prop="id"> <Input v-model="condition.id.value"> </Input>
</FormItem></Col> </FormItem></Col>
<Col :span="12" :v-if="condition.shiftWorkSchedCode.show"><FormItem :label="l('shiftWorkSchedCode')" prop="shiftWorkSchedCode"> <Input v-model="condition.shiftWorkSchedCode.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.shiftName.show"><FormItem :label="l('shiftName')" prop="shiftName"> <Input v-model="condition.shiftName.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.shiftStart.show"><FormItem :label="l('shiftStart')" prop="shiftStart"> <DatePicker type="daterange" v-model="condition.shiftStart.value"></DatePicker>
</FormItem></Col>
<Col :span="12" :v-if="condition.shiftEnd.show"><FormItem :label="l('shiftEnd')" prop="shiftEnd"> <DatePicker type="daterange" v-model="condition.shiftEnd.value"></DatePicker>
</FormItem></Col>
<Col :span="12" :v-if="condition.status.show"><FormItem :label="l('status')" prop="status"> <Input v-model="condition.status.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.workingLong.show"><FormItem :label="l('workingLong')" prop="workingLong"> <Input v-model="condition.workingLong.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.shiftWorkSchedPk1.show"><FormItem :label="l('shiftWorkSchedPk1')" prop="shiftWorkSchedPk1"> <Input v-model="condition.shiftWorkSchedPk1.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.creationTime.show"><FormItem :label="l('creationTime')" prop="creationTime"> <DatePicker type="daterange" v-model="condition.creationTime.value"></DatePicker> <Col :span="12" :v-if="condition.creationTime.show"><FormItem :label="l('creationTime')" prop="creationTime"> <DatePicker type="daterange" v-model="condition.creationTime.value"></DatePicker>
</FormItem></Col> </FormItem></Col>
<Col :span="12" :v-if="condition.creatorUserId.show"><FormItem :label="l('creatorUserId')" prop="creatorUserId"> <Input v-model="condition.creatorUserId.value"> </Input> <Col :span="12" :v-if="condition.creatorUserId.show"><FormItem :label="l('creatorUserId')" prop="creatorUserId"> <Input v-model="condition.creatorUserId.value"> </Input>
...@@ -16,14 +30,6 @@ ...@@ -16,14 +30,6 @@
<Col :span="12" :v-if="condition.deletionTime.show"><FormItem :label="l('deletionTime')" prop="deletionTime"> <DatePicker type="daterange" v-model="condition.deletionTime.value"></DatePicker> <Col :span="12" :v-if="condition.deletionTime.show"><FormItem :label="l('deletionTime')" prop="deletionTime"> <DatePicker type="daterange" v-model="condition.deletionTime.value"></DatePicker>
</FormItem></Col> </FormItem></Col>
<Col :span="12" :v-if="condition.deleterUserId.show"><FormItem :label="l('deleterUserId')" prop="deleterUserId"> <Input v-model="condition.deleterUserId.value"> </Input> <Col :span="12" :v-if="condition.deleterUserId.show"><FormItem :label="l('deleterUserId')" prop="deleterUserId"> <Input v-model="condition.deleterUserId.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.title.show"><FormItem :label="l('title')" prop="title"> <Input v-model="condition.title.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.startTime.show"><FormItem :label="l('startTime')" prop="startTime"> <DatePicker type="daterange" v-model="condition.startTime.value"></DatePicker>
</FormItem></Col>
<Col :span="12" :v-if="condition.endTime.show"><FormItem :label="l('endTime')" prop="endTime"> <DatePicker type="daterange" v-model="condition.endTime.value"></DatePicker>
</FormItem></Col>
<Col :span="12" :v-if="condition.workHours.show"><FormItem :label="l('workHours')" prop="workHours"> <Input v-model="condition.workHours.value"> </Input>
</FormItem></Col> </FormItem></Col>
</Row> </Row>
</Form> </Form>
...@@ -36,6 +42,13 @@ ...@@ -36,6 +42,13 @@
return { return {
condition: { condition: {
id:{op:"Equal",value:null,show:false}, id:{op:"Equal",value:null,show:false},
shiftWorkSchedCode:{op:"Equal",value:null,show:true},
shiftName:{op:"Equal",value:null,show:true},
shiftStart:{op:"Range",value:null,show:true},
shiftEnd:{op:"Range",value:null,show:true},
status:{op:"Equal",value:null,show:true},
workingLong:{op:"Equal",value:null,show:true},
shiftWorkSchedPk1:{op:"Equal",value:null,show:true},
creationTime:{op:"Range",value:null,show:false}, creationTime:{op:"Range",value:null,show:false},
creatorUserId:{op:"Equal",value:null,show:false}, creatorUserId:{op:"Equal",value:null,show:false},
lastModificationTime:{op:"Range",value:null,show:false}, lastModificationTime:{op:"Range",value:null,show:false},
...@@ -43,10 +56,6 @@ lastModifierUserId:{op:"Equal",value:null,show:false}, ...@@ -43,10 +56,6 @@ lastModifierUserId:{op:"Equal",value:null,show:false},
isDeleted:{op:"Equal",value:null,show:false}, isDeleted:{op:"Equal",value:null,show:false},
deletionTime:{op:"Range",value:null,show:false}, deletionTime:{op:"Range",value:null,show:false},
deleterUserId:{op:"Equal",value:null,show:false}, deleterUserId:{op:"Equal",value:null,show:false},
title:{op:"Equal",value:null,show:true},
startTime:{op:"Range",value:null,show:true},
endTime:{op:"Range",value:null,show:true},
workHours:{op:"Equal",value:null,show:true},
}, },
} }
}, },
...@@ -55,7 +64,7 @@ workHours:{op:"Equal",value:null,show:true}, ...@@ -55,7 +64,7 @@ workHours:{op:"Equal",value:null,show:true},
this.$emit('on-close') this.$emit('on-close')
}, },
l(key) { l(key) {
key = "calendar_class" + "." + key; key = "mes_shift_work_sched" + "." + key;
return this.$t(key) return this.$t(key)
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment