Skip to content

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

工厂日历

parent 1428e545
Show whitespace changes
Inline Side-by-side
Showing with 127 additions and 112 deletions
i18n/locale/zh-CN.js
View file @ e529026e
......@@ -759,18 +759,14 @@ export default {
},
calendar_overtime: {
id: '',
holidayCalId: "日历编号",
holidayCalName: "日历名称",
mesHolidayTitles: "关联节假日",
mesHolidayIds: "关联节假日id",
creationTime: '创建时间',
creatorUserId: '创建人',
lastModificationTime: '更新时间',
lastModifierUserId: '更新人',
isDeleted: '删除人',
deletionTime: '删除时间',
deleterUserId: '删除人',
title: '日历名称',
restType: '',
holidayId: '',
holidayTitle: '关联节假日',
status: '状态',
},
calendar_work: {
id: '',
......
pages/basicData/calendar/class/add.vue
View file @ e529026e
......@@ -11,24 +11,21 @@
<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('shiftStartEnd')" prop="shiftStartEnd">
<TimePicker format="HH:mm" v-model="entity.shiftStartEnd" type="timerange" placeholder="选择时间段" style="width: 130px"></TimePicker>
</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"></DatePicker> -->
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('shiftEnd')" prop="shiftEnd">
<TimePicker format="HH:mm" v-model="entity.shiftEnd" placeholder="选择结束时间" style="width: 130px"></TimePicker>
<!-- <DatePicker type="date"></DatePicker> -->
</FormItem>
</Col>
</Col> -->
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
......@@ -45,7 +42,20 @@ export default {
disabled: false,
entity: {},
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }]
shiftWorkSchedCode: [{ required: true, message: "请填写班次编号", trigger: "blur" }],
shiftName: [{ required: true, message: "请填写班次名称", trigger: "blur" }],
// shiftStartEnd: [//{ required: true, message: "请选择班次时间段", trigger: "blur" }
// {
// required: true,
// type: 'array',
// message: "请选择班次时间段",
// trigger: 'blur',
// fields: {
// 0: {type: "date", required: true, message: "请选择班次时间段"},
// 1: {type: "date", required: true, message: "请选择班次时间段"}
// }
// }
// ],
}
};
},
......@@ -57,7 +67,10 @@ export default {
this.$refs.form.validate(v => {
if (v) {
this.disabled = true;
Api.create(this.entity)
var data = this.$u.clone(this.entity)
data.shiftStart = this.entity.shiftStartEnd[0]
data.shiftEnd = this.entity.shiftStartEnd[1]
Api.create(data)
.then(r => {
this.disabled = false;
if (r.success) {
......
pages/basicData/calendar/class/edit.vue
View file @ e529026e
......@@ -11,23 +11,21 @@
<Input v-model="entity.shiftName"></Input>
</FormItem>
</Col>
<Col :span="24">
<!-- <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">
</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>
<TimePicker format="HH:mm" v-model="entity.shiftStart" placeholder="选择时间段" style="width: 130px"></TimePicker>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('shiftEnd')" prop="shiftEnd">
<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>
......@@ -44,7 +42,8 @@ export default {
disabled: false,
entity: {},
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }]
shiftWorkSchedCode: [{ required: true, message: "请填写班次编号", trigger: "blur" }],
shiftName: [{ required: true, message: "请填写班次名称", trigger: "blur" }],
}
};
},
......
pages/basicData/calendar/class/index.vue
View file @ e529026e
......@@ -19,7 +19,7 @@
</template>
</DataGrid>
<Modal v-model="addModal" title="新增" footer-hide>
<Add @on-close="cancel" @on-ok="addOk" />
<Add ref="addModal" @on-close="cancel" @on-ok="addOk" />
</Modal>
<Modal v-model="editModal" title="编辑" footer-hide>
<Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
......@@ -86,7 +86,7 @@ data() {
this.tableHeight = window.innerHeight - 230
},
mounted() {
console.log(this);
// console.log(this);
window.onresize = () => {///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight
......@@ -101,6 +101,7 @@ data() {
addOk() {
this.$refs.grid.load()
this.addModal = false
this.$refs.addModal.entity = {}
this.detailModal = false
this.editModal = false;
this.curId = 0;
......@@ -136,6 +137,7 @@ data() {
cancel() {
this.curId = 0;
this.addModal = false
this.$refs.addModal.entity = {}
this.detailModal = false
this.editModal = false;
this.deletedlModal = false;
......
pages/basicData/calendar/holiday/add.vue
View file @ e529026e
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="24">
<FormItem :label="l('holidayId')" prop="holidayId">
<Input v-model="entity.holidayId" style="width: 90%"></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('holidayName')" prop="holidayName">
<Input v-model="entity.holidayName" style="width: 90%"></Input>
......
pages/basicData/calendar/holiday/edit.vue
View file @ e529026e
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="24">
<FormItem :label="l('holidayId')" prop="holidayId">
<Input v-model="entity.holidayId" style="width: 90%"></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('holidayName')" prop="holidayName">
<Input v-model="entity.holidayName" style="width: 90%"></Input>
......
pages/basicData/calendar/holiday/index.vue
View file @ e529026e
......@@ -74,7 +74,7 @@ export default {
{
key: 'holidayId',
title: this.l('holidayId'),
hide: true,
high: true,
align: 'left'
},
{
......
pages/basicData/calendar/overtime/add.vue
View file @ e529026e
......@@ -2,12 +2,17 @@
<Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Row>
<Col :span="24">
<FormItem :label="l('title')" prop="title">
<Input v-model="entity.title"></Input>
<FormItem :label="l('holidayCalId')" prop="holidayCalId">
<Input v-model="entity.holidayCalId"></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('holidayTitle')" prop="holidayId">
<FormItem :label="l('holidayCalName')" prop="holidayCalName">
<Input v-model="entity.holidayCalName"></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('mesHolidayTitles')" prop="holidayId">
<Select v-model="entity.holidayId" multiple @on-change="getItems">
<Option
v-for="item in orderCatList"
......@@ -69,12 +74,12 @@ export default {
titles.push(u.title+"("+u.startendTime+")")
})
let parme = {
title:this.entity.title,
holidayTitle:titles.join(),
holidayId:this.entity.holidayId.join(),
holidayCalId:this.entity.holidayCalId,
holidayCalName:this.entity.holidayCalName,
mesHolidayTitles:titles.join(),
mesHolidayIds:this.entity.holidayId.join(),
}
Api.create(parme)
.then((r) => {
Api.create(parme).then((r) => {
this.disabled = false
if (r.success) {
this.$Message.success('保存成功')
......
pages/basicData/calendar/overtime/api.js
View file @ e529026e
import Api from '@/plugins/request'
export default {
index: `${systemUrl}/calendarovertime/paged`,
index: `${systemUrl}/mesholidaycal/paged`,
paged (params) {
return Api.post(`${systemUrl}/calendarovertime/paged`, params)
return Api.post(`${systemUrl}/mesholidaycal/paged`, params)
},
getlist (params) {
return Api.get(`${systemUrl}/calendarovertime/getselectclass`, params)
return Api.get(`${systemUrl}/mesholidaycal/getselectclass`, params)
},
getWeekTypeList (params) {
return Api.post(`${systemUrl}/calendarweektype/list`, params)
......@@ -17,17 +17,17 @@ export default {
return Api.get(`${systemUrl}/calendarweektype/getcurrentset`, params)
},
get (params) {
return Api.get(`${systemUrl}/calendarovertime/get`, params)
return Api.get(`${systemUrl}/mesholidaycal/get`, params)
},
create (params) {
return Api.post(`${systemUrl}/calendarovertime/create`, params)
return Api.post(`${systemUrl}/mesholidaycal/create`, params)
},
update (params) {
return Api.post(`${systemUrl}/calendarovertime/update`, params)
return Api.put(`${systemUrl}/mesholidaycal/update`, params)
},
//删除：
delete (params) {
return Api.delete(`${systemUrl}/calendarovertime/delete`, {
return Api.delete(`${systemUrl}/mesholidaycal/delete`, {
params: params
})
}
......
pages/basicData/calendar/overtime/edit.vue
View file @ e529026e
......@@ -2,12 +2,17 @@
<Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Row>
<Col :span="24">
<FormItem :label="l('title')" prop="title">
<Input v-model="entity.title"></Input>
<FormItem :label="l('holidayCalId')" prop="holidayCalId">
<Input v-model="entity.holidayCalId"></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('holidayTitle')" prop="classId">
<FormItem :label="l('holidayCalName')" prop="holidayCalName">
<Input v-model="entity.holidayCalName"></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('mesHolidayTitles')" prop="classId">
<Select v-model="entity.classId" @on-change="getItems" multiple>
<Option
v-for="item in orderCatList"
......@@ -58,8 +63,8 @@ export default {
load(v) {
Api.get({ id: v }).then((r) => {
let dataForm = r.result
if (dataForm.holidayId) {
let ids = dataForm.holidayId.split(',')
if (dataForm.mesHolidayIds) {
let ids = dataForm.mesHolidayIds.split(',')
var uids = []
ids.map((u) => {
uids.push(parseInt(u))
......@@ -81,9 +86,9 @@ export default {
this.selectItems.map((u) => {
titles.push(u.title + '(' + u.startendTime + ')')
})
this.entity.holidayTitle = titles.join()
var data = this.$u.clone(this.entity)
data.holidayId = this.entity.classId.join()
data.mesHolidayTitles = titles.join()
data.mesHolidayIds = this.entity.classId.join()
Api.update(data)
.then((r) => {
this.disabled = false
......
pages/basicData/calendar/overtime/index.vue
View file @ e529026e
......@@ -90,80 +90,52 @@ 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: 'holidayCalId',
title: this.l('holidayCalId'),
high: true,
align: 'left'
},
{
key: 'creatorUserId',
title: this.l('creatorUserId'),
hide: true,
key: 'holidayCalName',
title: this.l('holidayCalName'),
high: true,
align: 'left'
},
{
key: 'lastModificationTime',
title: this.l('lastModificationTime'),
hide: true,
key: 'mesHolidayTitles',
title: this.l('mesHolidayTitles'),
high: true,
align: 'left'
},
{
key: 'lastModifierUserId',
title: this.l('lastModifierUserId'),
key: 'mesHolidayIds',
title: this.l('mesHolidayIds'),
hide: true,
align: 'left'
},
{
key: 'isDeleted',
title: this.l('isDeleted'),
key: 'creationTime',
title: this.l('creationTime'),
hide: true,
align: 'left'
},
{
key: 'deletionTime',
title: this.l('deletionTime'),
key: 'creatorUserId',
title: this.l('creatorUserId'),
hide: true,
align: 'left'
},
{
key: 'deleterUserId',
title: this.l('deleterUserId'),
key: 'lastModificationTime',
title: this.l('lastModificationTime'),
hide: true,
align: 'left'
},
{
key: 'title',
title: this.l('title'),
align: 'left',
easy: true,
high: true
},
{
key: 'restType',
title: this.l('restType'),
align: 'left',
hide: true,
high: true
},
{
key: 'holidayId',
title: this.l('holidayId'),
align: 'left',
hide: true,
high: true
},
{
key: 'holidayTitle',
title: this.l('holidayTitle'),
align: 'left',
high: true
},
{
key: 'status',
title: this.l('status'),
key: 'lastModifierUserId',
title: this.l('lastModifierUserId'),
align: 'left',
hide: true,
high: true
hide: true
},
{
title: '操作',
......
pages/basicData/calendar/work/add.vue
View file @ e529026e
......@@ -53,8 +53,9 @@ export default {
},
selectItems:[],//选中的加班日历
rules: {
title: [{ required: true, message: '请填写日历名称', trigger: 'blur' }],
calendarClassId: [
calId: [{ required: true, message: '请填写日历编号', trigger: 'blur' }],
calName: [{ required: true, message: '请填写日历名称', trigger: 'blur' }],
mesShiftWorkSchedIds: [
{ required: true, type: 'array', min: 1, message: '请选择关联班次', trigger: 'change' },
]
}
......
pages/basicData/calendar/work/edit.vue
View file @ e529026e
......@@ -2,12 +2,17 @@
<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="classId" >
<FormItem :label="l('calName')" prop="calName">
<Input v-model="entity.calName" placeholder="请填写日历名称"></Input>
</FormItem>
</Col>
<Col span="24">
<FormItem :label="l('shiftName')" prop="classId">
<Select v-model="entity.classId" multiple @on-change="getItems">
<Option
v-for="item in orderCatList"
......@@ -53,12 +58,13 @@ export default {
load(v) {
Api.get({ id: v }).then((r) => {
let dataForm = r.result
if(dataForm.calendarClassId){
let ids = dataForm.calendarClassId.split(',')
if(dataForm.mesShiftWorkSchedIds){
let ids = dataForm.mesShiftWorkSchedIds.split(',')
var uids=[];
ids.map(u=>{
uids.push(parseInt(u))
})
console.warn(uids)
this.getItems(uids);
dataForm.classId=uids;
}else{
......@@ -70,15 +76,19 @@ export default {
},
selectList() {
Api.getlist().then((res) => {
console.log(res)
this.orderCatList = res.result
})
},
getItems(v) {
//获取所有选中项;
var items = this.orderCatList.filter((u) => {
console.log(u.id)
return v.indexOf(u.id) > -1
})
this.selectItems = items
console.log(this.selectItems)
},
getHours() {
let sum = 0
......@@ -95,10 +105,10 @@ export default {
this.selectItems.map(u=>{
titles.push(u.title+"("+u.startendTime+")")
})
this.entity.calendarClassTitle=titles.join();
this.entity.shiftName=titles.join();
var data=this.$u.clone(this.entity);
data.calendarClassId=this.entity.classId.join();
data.workHours=this.getHours();
data.mesShiftWorkSchedIds=this.entity.classId.join();
data.workingLong=this.getHours();
Api.update(data)
.then((r) => {
this.disabled = false
......
pages/basicData/calendar/work/index.vue
View file @ e529026e
......@@ -27,7 +27,7 @@
<Button @click="deleteMore" class="span ml20"><Icon type="md-close"/>批量删除</Button>
</div>
<Modal v-model="addModal" ref="addmodal" title="新增" footer-hide>
<Add @on-close="cancel" @on-ok="addOk" />
<Add ref="addModal" @on-close="cancel" @on-ok="addOk" />
</Modal>
<Modal v-model="editModal" title="编辑" footer-hide>
<Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
......@@ -160,6 +160,7 @@ export default {
addOk() {
this.$refs.grid.load()
this.addModal = false
this.$refs.addModal.entity = {}
this.editModal = false
this.curId = 0
},
......@@ -194,6 +195,7 @@ export default {
cancel() {
this.curId = 0
this.addModal = false
this.$refs.addModal.entity = {}
this.detailModal = false
this.editModal = false
this.deletedlModal = false
......
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