Skip to content

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

工厂日历

parent 391585dd
Show whitespace changes
Inline Side-by-side
Showing with 113 additions and 194 deletions
i18n/locale/zh-CN.js
View file @ 1428e545
......@@ -736,6 +736,7 @@ export default {
shiftName:'班次名称',
shiftStart:'班次开始时间',
shiftEnd:'班次结束时间',
shiftStartEnd: '班次时间',
status:'状态',
workingLong:'工作时长',
shiftWorkSchedPk1:'班次id',
......@@ -748,19 +749,13 @@ export default {
deleterUserId:'',
},
calendar_holiday: {
id: '',
creationTime: '创建时间',
holidayId: "节假日编号",
holidayName: "节假日名称",
holidayStart: "节假日开始时间",
holidayEnd: "节假日结束时间",
creationTime: "创建时间",
creatorUserId: '创建人',
lastModificationTime: '更新时间',
lastModifierUserId: '更新人',
isDeleted: '删除人',
deletionTime: '删除时间',
deleterUserId: '删除人',
title: '节日名称',
startTime: '开始时间',
days: '工作时长(小时)',
status: '状态',
endTime: '结束时间',
id: '',
},
calendar_overtime: {
id: '',
......@@ -775,23 +770,17 @@ export default {
restType: '',
holidayId: '',
holidayTitle: '关联节假日',
status: '',
status: '状态',
},
calendar_work: {
id: '',
creationTime: '创建时间',
creatorUserId: '创建人',
lastModificationTime: '更新时间',
lastModifierUserId: '更新人',
isDeleted: '删除人',
deletionTime: '删除时间',
deleterUserId: '删除人',
title: '日历名称',
calendarClassId: '',
calendarClassTitle: '关联班次',
calendarClassStart: '开始时间',
calendarClassEnd: '结束时间',
workHours: '工作时长',
calId: "日历编号",
calName: "日历名称",
mesShiftWorkSchedIds: "关联班次id",
shiftName: "关联班次名称",
workingLong: "工作时长",
creationTime: "创建时间",
creatorUserId: "创建人",
},
Connector: {
id: '',
......
pages/basicData/calendar/class/add.vue
View file @ 1428e545
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="110">
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="24">
<FormItem :label="l('shiftWorkSchedCode')" prop="shiftWorkSchedCode">
<Input v-model="entity.shiftWorkSchedCode"></Input>
<Input v-model="entity.shiftWorkSchedCode" style="width: 90%"></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('shiftName')" prop="shiftName">
<Input v-model="entity.shiftName"></Input>
<Input v-model="entity.shiftName" style="width: 90%"></Input>
</FormItem>
</Col>
<!-- <Col :span="24">
<FormItem :label="l('shiftStartEnd')" prop="shiftStartEnd">
<TimePicker format="HH:mm" v-model="entity.shiftStartEnd" type="timerange" placeholder="选择时间段" style="width: 130px"></TimePicker> -->
<!-- <DatePicker type="date"></DatePicker> -->
<!-- </FormItem>
</Col> -->
<Col :span="24">
<FormItem :label="l('shiftStart')" prop="shiftStart">
<TimePicker format="HH:mm" v-model="entity.shiftStart" placeholder="选择开始时间" style="width: 130px"></TimePicker>
......@@ -23,21 +29,6 @@
<!-- <DatePicker type="date"></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>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
......
pages/basicData/calendar/class/edit.vue
View file @ 1428e545
......@@ -12,15 +12,22 @@
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('shiftStart')" prop="shiftStart">
<DatePicker type="date" v-model="entity.shiftStart"></DatePicker>
<FormItem :label="l('shiftStartEnd')" prop="shiftStartEnd">
<TimePicker format="HH:mm" v-model="entity.shiftStartEnd" type="timerange" placeholder="选择时间段" style="width: 130px"></TimePicker>
<!-- <DatePicker type="date"></DatePicker> -->
</FormItem>
</Col>
<!-- <Col :span="24">
<FormItem :label="l('shiftStart')" prop="shiftStart">
<TimePicker format="HH:mm" v-model="entity.shiftStart" placeholder="选择时间段" style="width: 130px"></TimePicker> -->
<!-- <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>
<TimePicker format="HH:mm" v-model="entity.shiftEnd" placeholder="选择时间段" style="width: 130px"></TimePicker>
</FormItem>
</Col>
</Col> -->
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
......
pages/basicData/calendar/class/index.vue
View file @ 1428e545
......@@ -60,8 +60,9 @@ data() {
{ 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:"shiftStart",title:this.l("shiftStart") ,align:"left" ,high:true },
{ key:"shiftEnd",title:this.l("shiftEnd") ,align:"left" ,high:true },
{ key:"shiftStartEnd",title:this.l("shiftStartEnd") ,align:"left" ,high:true },
{ key:"shiftStart",title:this.l("shiftStart") ,hide:true ,align:"left" ,high:true },
{ key:"shiftEnd",title:this.l("shiftEnd") ,hide:true ,align:"left" ,high:true },
{ key:"status",title:this.l("status") ,hide:true ,align:"left" ,high:true },
{ key:"workingLong",title:this.l("workingLong") ,align:"left" ,high:true },
{
......@@ -78,14 +79,6 @@ data() {
])
}
},
{ key:"shiftWorkSchedPk1",title:this.l("shiftWorkSchedPk1") ,hide:true ,align:"left" ,high:true },
{ key:"creationTime",title:this.l("creationTime") ,hide:true ,align:"left" ,high:true },
{ key:"creatorUserId",title:this.l("creatorUserId") ,hide:true ,align:"left" ,high:true },
{ key:"lastModificationTime",title:this.l("lastModificationTime") ,hide:true ,align:"left" ,high:true },
{ key:"lastModifierUserId",title:this.l("lastModifierUserId") ,hide:true ,align:"left" ,high:true },
{ key:"isDeleted",title:this.l("isDeleted") ,hide:true ,align:"left" ,high:true },
{ key:"deletionTime",title:this.l("deletionTime") ,hide:true ,align:"left" ,high:true },
{ key:"deleterUserId",title:this.l("deleterUserId") ,hide:true ,align:"left" ,high:true },
],
}
},
......
pages/basicData/calendar/holiday/add.vue
View file @ 1428e545
......@@ -2,18 +2,18 @@
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="24">
<FormItem :label="l('title')" prop="title">
<Input v-model="entity.title"></Input>
<FormItem :label="l('holidayName')" prop="holidayName">
<Input v-model="entity.holidayName" style="width: 90%"></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('startTime')" prop="startTime">
<DatePicker type="date" v-model="entity.startTime"></DatePicker>
<FormItem :label="l('holidayStart')" prop="holidayStart">
<DatePicker type="date" v-model="entity.holidayStart"></DatePicker>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('endTime')" prop="endTime">
<DatePicker type="date" v-model="entity.endTime"></DatePicker>
<FormItem :label="l('holidayEnd')" prop="holidayEnd">
<DatePicker type="date" v-model="entity.holidayEnd"></DatePicker>
</FormItem>
</Col>
</Row>
......
pages/basicData/calendar/holiday/api.js
View file @ 1428e545
import Api from '@/plugins/request'
export default {
index:`${systemUrl}/calendarholiday/paged`,
// index:`${systemUrl}/calendarholiday/paged`,mesholiday/paged
index:`${systemUrl}/mesholiday/paged`,
paged(params){
return Api.post(`${systemUrl}/calendarholiday/paged`,params);
return Api.post(`${systemUrl}/mesholiday/paged`,params);
},
get(params){
return Api.get(`${systemUrl}/calendarholiday/get`,params);
return Api.get(`${systemUrl}/mesholiday/get`,params);
},
create(params){
return Api.post(`${systemUrl}/calendarholiday/create`,params);
return Api.post(`${systemUrl}/mesholiday/create`,params);
},
update(params){
return Api.post(`${systemUrl}/calendarholiday/update`,params);
return Api.put(`${systemUrl}/mesholiday/update`,params);
},
//删除：
delete(params) {
return Api.delete(`${systemUrl}/calendarholiday/delete`,{params:params});
return Api.delete(`${systemUrl}/mesholiday/delete`,{params:params});
},
}
\ No newline at end of file
pages/basicData/calendar/holiday/edit.vue
View file @ 1428e545
......@@ -2,18 +2,18 @@
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="24">
<FormItem :label="l('title')" prop="title">
<Input v-model="entity.title"></Input>
<FormItem :label="l('holidayName')" prop="holidayName">
<Input v-model="entity.holidayName" style="width: 90%"></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('startTime')" prop="startTime">
<DatePicker type="date" v-model="entity.startTime"></DatePicker>
<FormItem :label="l('holidayStart')" prop="holidayStart">
<DatePicker type="date" v-model="entity.holidayStart"></DatePicker>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('endTime')" prop="endTime">
<DatePicker type="date" v-model="entity.endTime"></DatePicker>
<FormItem :label="l('holidayEnd')" prop="holidayEnd">
<DatePicker type="date" v-model="entity.holidayEnd"></DatePicker>
</FormItem>
</Col>
</Row>
......
pages/basicData/calendar/holiday/index.vue
View file @ 1428e545
......@@ -72,32 +72,32 @@ export default {
// { type: 'selection', width: 70, align: 'center'},
{ key: 'id', title: this.l('id'), hide: true, align: 'left' },
{
key: 'creationTime',
title: this.l('creationTime'),
key: 'holidayId',
title: this.l('holidayId'),
hide: true,
align: 'left'
},
{
key: 'creatorUserId',
title: this.l('creatorUserId'),
hide: true,
key: 'holidayName',
title: this.l('holidayName'),
high: true,
align: 'left'
},
{
key: 'lastModificationTime',
title: this.l('lastModificationTime'),
hide: true,
key: 'holidayStart',
title: this.l('holidayStart'),
high: true,
align: 'left'
},
{
key: 'lastModifierUserId',
title: this.l('lastModifierUserId'),
hide: true,
key: 'holidayEnd',
title: this.l('holidayEnd'),
high: true,
align: 'left'
},
{
key: 'isDeleted',
title: this.l('isDeleted'),
key: 'creationTime',
title: this.l('creationTime'),
hide: true,
align: 'left'
},
......@@ -108,39 +108,11 @@ export default {
align: 'left'
},
{
key: 'deleterUserId',
title: this.l('deleterUserId'),
key: 'creatorUserId',
title: this.l('creatorUserId'),
hide: true,
align: 'left'
},
{
key: 'title',
title: this.l('title'),
align: 'left',
easy: true,
high: true
},
{
key: 'startTime',
title: this.l('startTime'),
align: 'left',
high: true
},
{
key: 'days',
title: this.l('days'),
hide: true,
align: 'left',
high: true
},
{
key: 'status',
title: this.l('status'),
hide: true,
align: 'left',
high: true
},
{ key: 'endTime', title: this.l('endTime'), align: 'left', high: true },
{
title: '操作',
key: 'id',
......
pages/basicData/calendar/work/add.vue
View file @ 1428e545
......@@ -2,13 +2,18 @@
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col span="24">
<FormItem :label="l('title')" prop="title">
<Input v-model="entity.title" placeholder="请填写日历名称"></Input>
<FormItem :label="l('calId')" prop="calId">
<Input v-model="entity.calId" placeholder="请填写日历名称"></Input>
</FormItem>
</Col>
<Col span="24">
<FormItem :label="l('calendarClassTitle')" prop="calendarClassId">
<Select v-model="entity.calendarClassId" multiple @on-change="getItems">
<FormItem :label="l('calName')" prop="calName">
<Input v-model="entity.calName" placeholder="请填写日历名称"></Input>
</FormItem>
</Col>
<Col span="24">
<FormItem :label="l('shiftName')" prop="mesShiftWorkSchedIds">
<Select v-model="entity.mesShiftWorkSchedIds" multiple @on-change="getItems">
<Option
v-for="item in orderCatList"
:value="item.id"
......@@ -71,10 +76,11 @@ export default {
titles.push(u.title+"("+u.startendTime+")")
})
let parme = {
title:this.entity.title,
calendarClassTitle:titles.join(),
calendarClassId:this.entity.calendarClassId.join(),
workHours:this.getHours()
calId:this.entity.calId,
calName:this.entity.calName,
shiftName:titles.join(),
mesShiftWorkSchedIds:this.entity.mesShiftWorkSchedIds.join(),
workingLong:this.getHours()
}
Api.create(parme)
.then((r) => {
......@@ -108,6 +114,7 @@ export default {
pageSize: 0
}
Api.getlist().then((res) => {
console.log(res)
this.orderCatList = res.result
})
},
......
pages/basicData/calendar/work/api.js
View file @ 1428e545
import Api from '@/plugins/request'
export default {
index:`${systemUrl}/calendarwork/paged`,
index:`${systemUrl}/mesdailyworksched/paged`,
paged(params){
return Api.post(`${systemUrl}/calendarwork/paged`,params);
return Api.post(`${systemUrl}/mesdailyworksched/paged`,params);
},
get(params){
return Api.get(`${systemUrl}/calendarwork/get`,params);
return Api.get(`${systemUrl}/mesdailyworksched/get`,params);
},
getlist(params){
return Api.get(`${systemUrl}/calendarwork/getselectclass`,params);
return Api.get(`${systemUrl}/mesdailyworksched/getselectclass`,params);
},
create(params){
return Api.post(`${systemUrl}/calendarwork/create`,params);
return Api.post(`${systemUrl}/mesdailyworksched/create`,params);
},
update(params){
return Api.post(`${systemUrl}/calendarwork/update`,params);
return Api.put(`${systemUrl}/mesdailyworksched/update`,params);
},
//删除：
delete(params) {
return Api.delete(`${systemUrl}/calendarwork/delete`,{params:params});
return Api.delete(`${systemUrl}/mesdailyworksched/delete`,{params:params});
},
}
\ No newline at end of file
pages/basicData/calendar/work/index.vue
View file @ 1428e545
......@@ -72,88 +72,47 @@ export default {
// { type: 'selection', width: 70, align: 'center'},
{ key: 'id', title: this.l('id'), hide: true, align: 'left' },
{
key: 'creationTime',
title: this.l('creationTime'),
hide: true,
key: 'calId',
title: this.l('calId'),
high: true,
align: 'left'
},
{
key: 'creatorUserId',
title: this.l('creatorUserId'),
hide: true,
key: 'calName',
title: this.l('calName'),
high: true,
align: 'left'
},
{
key: 'lastModificationTime',
title: this.l('lastModificationTime'),
hide: true,
key: 'shiftName',
title: this.l('shiftName'),
high: true,
align: 'left'
},
{
key: 'lastModifierUserId',
title: this.l('lastModifierUserId'),
key: 'mesShiftWorkSchedIds',
title: this.l('mesShiftWorkSchedIds'),
hide: true,
align: 'left'
},
{
key: 'isDeleted',
title: this.l('isDeleted'),
hide: true,
key: 'workingLong',
title: this.l('workingLong'),
high: true,
align: 'left'
},
{
key: 'deletionTime',
title: this.l('deletionTime'),
key: 'creationTime',
title: this.l('creationTime'),
hide: true,
align: 'left'
},
{
key: 'deleterUserId',
title: this.l('deleterUserId'),
key: 'creatorUserId',
title: this.l('creatorUserId'),
hide: true,
align: 'left'
},
{
key: 'title',
title: this.l('title'),
align: 'left',
easy: true,
high: true
},
{
key: 'calendarClassId',
title: this.l('calendarClassId'),
align: 'left',
hide: true,
high: true
},
{
key: 'calendarClassTitle',
title: this.l('calendarClassTitle'),
align: 'left',
easy: true,
high: true
},
{
key: 'calendarClassStart',
title: this.l('calendarClassStart'),
align: 'left',
hide: true,
high: true
},
{
key: 'calendarClassEnd',
title: this.l('calendarClassEnd'),
align: 'left',
hide: true,
high: true
},
{
key: 'workHours',
title: this.l('workHours'),
align: 'left',
high: true
},
{
title: '操作',
key: 'id',
......
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