排班结果修改

This commit is contained in:
z 2026-04-14 11:27:32 +08:00
parent 79e97ce31b
commit cb409eaf0d
3 changed files with 48 additions and 35 deletions

View File

@ -7,6 +7,7 @@
class="JNPF-dialog JNPF-dialog_center"
lock-scroll
width="1000px"
@close="close()"
>
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px" label-position="right" >
@ -24,17 +25,17 @@
</div>
<el-table :data="dataForm.shiftConfigEntityList" size="mini">
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="班组" prop="classGroup" align="center">
<template slot-scope="scope">
<JnpfSelect v-model="scope.row.classGroup" placeholder="请选择" clearable :options="classGroupOptions" :props="classGroupProps"> </JnpfSelect>
</template>
</el-table-column>
<el-table-column label="班次" prop="classRate" align="center">
<template slot-scope="scope">
<JnpfSelect v-model="scope.row.classRate" placeholder="请选择" clearable :options="classRateOptions" :props="classRateProps"> </JnpfSelect>
</template>
</el-table-column>
<el-table-column label="班组" prop="classGroup" align="center">
<template slot-scope="scope">
<JnpfSelect v-model="scope.row.classGroup" placeholder="请选择" clearable :options="classGroupOptions" :props="classGroupProps"> </JnpfSelect>
</template>
</el-table-column>
<el-table-column label="开始时间" prop="bgnDtime" align="center">
<template slot-scope="scope">
@ -85,7 +86,7 @@
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
<el-button @click="visible = false"> </el-button>
<el-button @click="close()"> </el-button>
</span>
</el-dialog>
@ -255,7 +256,10 @@
this.initData()
},
close() {
this.visible = false
this.$emit('refresh', true)
},
select() {
let newArr = this.selectedData.filter(o => {

View File

@ -28,7 +28,6 @@
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change="sortChange" :span-method="arraySpanMethod" border>
<el-table-column prop="classGroup" label="班组" align="center"> </el-table-column>
<el-table-column prop="classRate" label="班次" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.classRate == '1'"></el-tag>
@ -36,6 +35,8 @@
<el-tag v-else-if="scope.row.classRate == '3'"></el-tag>
</template>
</el-table-column>
<el-table-column prop="classGroup" label="班组" align="center"> </el-table-column>
<el-table-column prop="chgClassType" label="倒班类型" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.chgClassType == '1'">四班三倒</el-tag>

View File

@ -3,13 +3,22 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-row :gutter="16">
<el-col :span="6">
<el-form-item label="年月">
<el-form-item label="排班年月">
<JnpfDatePicker v-model="query.years" format="yyyy-MM" startPlaceholder="开始日期"
endPlaceholder="结束日期" clearable>
</JnpfDatePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="6">
<el-form-item label="倒班类型">
<JnpfSelect v-model="query.chgClassType" placeholder="请选择倒班类型" clearable :options="options" :props="props"> </JnpfSelect>
@ -18,17 +27,16 @@
<el-col :span="6">
<el-form-item label="开始日期">
<JnpfDatePicker v-model="query.bgnDtime" format="yyyy-MM-dd" startPlaceholder="开始日期"
endPlaceholder="结束日期" :startTime="todayDate">
endPlaceholder="结束日期" :startTime="todayDate" clearable>
</JnpfDatePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
<el-button type="success" icon="icon-ym el-icon-data-line" @click="debouncedGenerated()" :loading="generatedLoading" :disabled="generatedLoading">生成排班结果 </el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-row>
<div class="JNPF-common-layout-main JNPF-flex-main">