Skip to content

M
mes-ui
Commit 245a4d44 authored by 张海景's avatar 张海景
Browse files
Options

update:修改班组管理样式

parent cdfb1354
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 77 deletions
src/views/mes/cal/calendar/calendarType.vue
View file @ 245a4d44
<template>
<div class="app-container">
<el-container>
<el-aside width="150px">
<el-radio-group v-model="selectedType" class="x-fillitem el-group-list" @change="onSelected">
<el-aside width="200px">
<el-radio-group v-model="selectedType" class="x-fillitem el-group-list" @change="onSelected">
<el-radio-button
v-for="dict in dict.type.mes_calendar_type"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio-button>
>{{dict.label}}</el-radio-button>
</el-radio-group>
</el-aside>
<el-main>
......@@ -16,7 +16,7 @@
<div>
<el-row>
<el-col :span="6">
<div class="solar">
<div class="solar">
{{ data.day.split('-')[2] }}
</div>
</el-col>
......@@ -35,10 +35,10 @@
<el-button v-if="teamShift.orderNum ==2 && calendarDay.shiftType=='SHIFT_THREE'" type="warning" icon="el-icon-sunny">{{ teamShift.teamName }}</el-button>
<el-button v-if="teamShift.orderNum ==2 && calendarDay.shiftType=='SHIFT_TWO'" type="info" icon="el-icon-moon">{{ teamShift.teamName }}</el-button>
<el-button v-if="teamShift.orderNum ==3 && calendarDay.shiftType=='SHIFT_THREE'" type="info" icon="el-icon-moon">{{ teamShift.teamName }}</el-button>
</div>
</div>
</el-col>
</el-row>
</div>
</el-row>
</div>
</template>
</el-calendar>
</el-main>
......@@ -51,8 +51,8 @@ import { listCalholiday } from "@/api/mes/cal/calholiday";
import { listCalendars } from "@/api/mes/cal/calendar";
import calendar from '@/utils/calendar';
export default {
name: 'CalendarTypeView',
dicts:['mes_calendar_type'],
name: 'CalendarTypeView',
dicts:['mes_calendar_type'],
data(){
return {
// 遮罩层
......@@ -72,15 +72,15 @@ export default {
holidayType: null,
startTime: null,
endTime: null,
},
},
}
},
watch:{
date:{
handler(newVal,oldVal){
console.log(newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate());
this.teamShiftQueryParams.date = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();
this.loading = true;
this.teamShiftQueryParams.date = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();
this.loading = true;
listCalendars(this.teamShiftQueryParams).then(response =>{
this.calendarDayList = response.data;
this.loading = false;
......@@ -94,10 +94,10 @@ export default {
methods:{
/** 查询节假日设置列表 */
getList() {
this.loading = true;
this.loading = true;
this.holidayList =[];
this.workdayList =[];
let that = this;
let that = this;
listCalholiday(this.queryParams).then(response => {
if(response.data !=null){
response.data.forEach(theDay => {
......@@ -106,16 +106,16 @@ export default {
}else{
that.workdayList.push(theDay.theDay);
}
});
});
this.loading = false;
}
});
},
//点击班组类型
onSelected(calType){
this.loading = true;
this.loading = true;
this.teamShiftQueryParams.calendarType = calType;
this.teamShiftQueryParams.date = this.date;
this.teamShiftQueryParams.date = this.date;
listCalendars(this.teamShiftQueryParams).then(response =>{
this.calendarDayList = response.data;
this.loading = false;
......@@ -124,20 +124,20 @@ export default {
isFestival(slotDate, slotData) {
let solarDayArr = slotData.day.split('-');
let lunarDay = calendar.solar2lunar(solarDayArr[0], solarDayArr[1], solarDayArr[2])
// 公历节日\农历节日\农历节气
let festAndTerm = [];
festAndTerm.push(lunarDay.festival == null ? '' : ' ' + lunarDay.festival)
festAndTerm.push(lunarDay.lunarFestival == null ? '' : '' + lunarDay.lunarFestival)
festAndTerm.push(lunarDay.Term == null ? '' : '' + lunarDay.Term)
festAndTerm = festAndTerm.join('')
return festAndTerm != ''
},
solarDate2lunar(solarDate) {
var solar = solarDate.split('-')
var lunar = calendar.solar2lunar(solar[0], solar[1], solar[2])
var lunar = calendar.solar2lunar(solar[0], solar[1], solar[2])
let lunarMD = lunar.IMonthCn + lunar.IDayCn;
// 公历节日\农历节日\农历节气
let festAndTerm = [];
......@@ -145,9 +145,9 @@ export default {
festAndTerm.push(lunar.lunarFestival == null ? '' : '' + lunar.lunarFestival)
festAndTerm.push(lunar.Term == null ? '' : '' + lunar.Term)
festAndTerm = festAndTerm.join('')
return festAndTerm == '' ? lunarMD : festAndTerm
}
}
}
......@@ -204,4 +204,4 @@ export default {
.el-calendar-table .holiday {
background-color: #88E325;
}
</style>
\ No newline at end of file
</style>
src/views/mes/cal/calendar/team.vue
View file @ 245a4d44
<template>
<div class="app-container">
<el-container>
<el-aside width="150px">
<el-radio-group v-model="selectedType" class="x-fillitem el-group-list" @change="onSelected">
<el-aside width="200px">
<el-radio-group v-model="selectedType" class="x-fillitem el-group-list" @change="onSelected">
<el-radio-button
v-for="item in teamList"
:key="item.teamId"
:label="item.teamId"
>{{item.teamName}}</el-radio-button>
>{{item.teamName}}</el-radio-button>
</el-radio-group>
</el-aside>
<el-main>
......@@ -16,7 +16,7 @@
<div>
<el-row>
<el-col :span="6">
<div class="solar">
<div class="solar">
{{ data.day.split('-')[2] }}
</div>
</el-col>
......@@ -35,10 +35,10 @@
<el-button v-if="teamShift.orderNum ==2 && calendarDay.shiftType=='SHIFT_THREE'" type="warning" icon="el-icon-sunny">{{ teamShift.teamName }}</el-button>
<el-button v-if="teamShift.orderNum ==2 && calendarDay.shiftType=='SHIFT_TWO'" type="info" icon="el-icon-moon">{{ teamShift.teamName }}</el-button>
<el-button v-if="teamShift.orderNum ==3 && calendarDay.shiftType=='SHIFT_THREE'" type="info" icon="el-icon-moon">{{ teamShift.teamName }}</el-button>
</div>
</div>
</el-col>
</el-row>
</div>
</div>
</template>
</el-calendar>
</el-main>
......@@ -52,8 +52,8 @@ import { listCalholiday } from "@/api/mes/cal/calholiday";
import { listCalendars } from "@/api/mes/cal/calendar";
import calendar from '@/utils/calendar';
export default {
name: 'TeamView',
dicts:['mes_calendar_type'],
name: 'TeamView',
dicts:['mes_calendar_type'],
data(){
return {
// 遮罩层
......@@ -73,15 +73,15 @@ export default {
holidayType: null,
startTime: null,
endTime: null,
},
},
}
},
watch:{
date:{
handler(newVal,oldVal){
console.log(newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate());
this.teamShiftQueryParams.date = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();
this.loading = true;
this.teamShiftQueryParams.date = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();
this.loading = true;
listCalendars(this.teamShiftQueryParams).then(response =>{
this.calendarDayList = response.data;
this.loading = false;
......@@ -101,10 +101,10 @@ export default {
},
/** 查询节假日设置列表 */
getList() {
this.loading = true;
this.loading = true;
this.holidayList =[];
this.workdayList =[];
let that = this;
let that = this;
listCalholiday(this.queryParams).then(response => {
if(response.data !=null){
response.data.forEach(theDay => {
......@@ -113,14 +113,14 @@ export default {
}else{
that.workdayList.push(theDay.theDay);
}
});
});
this.loading = false;
}
});
},
//点击班组类型
onSelected(teamId){
this.loading = true;
this.loading = true;
this.teamShiftQueryParams.teamId = teamId;
this.teamShiftQueryParams.date = this.date;
listCalendars(this.teamShiftQueryParams).then(response =>{
......@@ -131,20 +131,20 @@ export default {
isFestival(slotDate, slotData) {
let solarDayArr = slotData.day.split('-');
let lunarDay = calendar.solar2lunar(solarDayArr[0], solarDayArr[1], solarDayArr[2])
// 公历节日\农历节日\农历节气
let festAndTerm = [];
festAndTerm.push(lunarDay.festival == null ? '' : ' ' + lunarDay.festival)
festAndTerm.push(lunarDay.lunarFestival == null ? '' : '' + lunarDay.lunarFestival)
festAndTerm.push(lunarDay.Term == null ? '' : '' + lunarDay.Term)
festAndTerm = festAndTerm.join('')
return festAndTerm != ''
},
solarDate2lunar(solarDate) {
var solar = solarDate.split('-')
var lunar = calendar.solar2lunar(solar[0], solar[1], solar[2])
var lunar = calendar.solar2lunar(solar[0], solar[1], solar[2])
let lunarMD = lunar.IMonthCn + lunar.IDayCn;
// 公历节日\农历节日\农历节气
let festAndTerm = [];
......@@ -152,9 +152,9 @@ export default {
festAndTerm.push(lunar.lunarFestival == null ? '' : '' + lunar.lunarFestival)
festAndTerm.push(lunar.Term == null ? '' : '' + lunar.Term)
festAndTerm = festAndTerm.join('')
return festAndTerm == '' ? lunarMD : festAndTerm
}
}
}
......@@ -211,4 +211,4 @@ export default {
.el-calendar-table .holiday {
background-color: #88E325;
}
</style>
\ No newline at end of file
</style>
src/views/mes/cal/plan/index.vue
View file @ 245a4d44
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="班组类型" prop="calendarType">
<el-select v-model="queryParams.calendarType" placeholder="请选择班组类型">
<el-option
......@@ -85,10 +85,10 @@
</el-row>
<el-table v-loading="loading" :data="calplanList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="计划编号" align="center" prop="planCode" >
<template slot-scope="scope">
<el-button
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:cal:calplan:query']"
......@@ -147,7 +147,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
......@@ -160,18 +160,17 @@
<el-dialog :title="title" v-loading="formLoading" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="计划编号" prop="planCode">
<el-input v-model="form.planCode" placeholder="请输入计划编号" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'" >
</el-switch>
<div style="display:flex;align-items: center;">
<el-input v-model="form.planCode" placeholder="请输入计划编号" />
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
style="width:175px;margin-left:10px;"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'" >
</el-switch>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -427,7 +426,7 @@ export default {
});
},
/** 提交按钮 */
submitForm() {
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.planId != null) {
......
src/views/mes/cal/team/index.vue
View file @ 245a4d44
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="班组类型" prop="calendarType">
<el-select v-model="queryParams.calendarType" placeholder="请选择班组类型">
<el-option
......@@ -83,7 +83,7 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="班组编号" align="center" prop="teamCode" >
<template slot-scope="scope">
<el-button
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:cal:team:query']"
......@@ -116,7 +116,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
......@@ -129,28 +129,28 @@
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="班组编号" prop="teamCode">
<el-input v-model="form.teamCode" placeholder="请输入班组编号" />
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
<div style="display:flex;align-items: center;">
<el-input v-model="form.teamCode" placeholder="请输入班组编号" />
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'" >
style="width:175px;margin-left:10px;"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'" >
</el-switch>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="班组名称" prop="teamName">
<el-input v-model="form.teamName" placeholder="请输入班组名称" />
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="12">
<el-form-item label="班组类型" prop="calendarType">
<el-select v-model="form.calendarType" placeholder="请选择班组类型">
<el-select style="width:100%;" v-model="form.calendarType" placeholder="请选择班组类型">
<el-option
v-for="dict in dict.type.mes_calendar_type"
:key="dict.value"
......@@ -166,7 +166,7 @@
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-form>
<el-divider v-if="form.teamId !=null" content-position="center">项目组成员</el-divider>
......
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