Merge remote-tracking branch 'origin/master'
mengjiao
3 months ago
commit
277ce34db9
@ -0,0 +1,63 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
|
||||
|
||||
// 查询辅助工时摊分列表
|
||||
export function listQty(query) {
|
||||
return request({
|
||||
url: '/mes/reportWorks/assistqty/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
}
|
||||
|
||||
// 查询辅助工时摊分详细
|
||||
export function getQty(id) {
|
||||
return request({
|
||||
url: '/mes/reportWorks/assistqty/' + id,
|
||||
method: 'get'
|
||||
});
|
||||
}
|
||||
|
||||
// 新增辅助工时摊分
|
||||
export function addQty(data) {
|
||||
return request({
|
||||
url: '/mes/reportWorks/assistqty',
|
||||
method: 'post',
|
||||
data: data
|
||||
});
|
||||
}
|
||||
|
||||
// 修改辅助工时摊分
|
||||
export function updateQty(data) {
|
||||
return request({
|
||||
url: '/mes/reportWorks/assistqty',
|
||||
method: 'put',
|
||||
data: data
|
||||
});
|
||||
}
|
||||
|
||||
// 删除辅助工时摊分
|
||||
export function delQty(id) {
|
||||
return request({
|
||||
url: '/mes/reportWorks/assistqty/' + id,
|
||||
method: 'delete'
|
||||
});
|
||||
}
|
||||
|
||||
// 辅助工时摊分方式报表列表
|
||||
export function listAssistHour(query) {
|
||||
return request({
|
||||
url: '/mes/reportWorks/assistqty/listAssistHour',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
}
|
||||
//生产效率报表
|
||||
export function listEfficiencyDayList(query) {
|
||||
return request({
|
||||
url: '/mes/reportWorks/assistqty/listEfficiencyDayList',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,288 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
|
||||
label-width="68px">
|
||||
<el-form-item label="生产日期" prop="productDate">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.productDate"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择生产日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
>新增
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
>修改
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
>删除
|
||||
</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="qtyList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column label="生产日期" align="center" prop="productDate" width="180">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="班长人数" align="center" prop="monitorQty"/>
|
||||
<el-table-column label="组长人数" align="center" prop="groupleaderQty"/>
|
||||
<el-table-column label="物料员人数" align="center" prop="materialQty"/>
|
||||
<el-table-column label="药管员人数" align="center" prop="pillMgrQty"/>
|
||||
<el-table-column label="配药员人数" align="center" prop="pillDisQty"/>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>修改
|
||||
</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
>删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<!-- 添加或修改辅助工时摊分对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
||||
<el-form-item label="生产日期" prop="productDate">
|
||||
<el-date-picker clearable
|
||||
v-model="form.productDate"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择生产日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="班长人数" prop="monitorQty">
|
||||
<el-input v-model="form.monitorQty" placeholder="请输入班长人数"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="组长人数" prop="groupleaderQty">
|
||||
<el-input v-model="form.groupleaderQty" placeholder="请输入组长人数"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="物料员人数" prop="materialQty">
|
||||
<el-input v-model="form.materialQty" placeholder="请输入物料员人数"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="药管员人数" prop="pillMgrQty">
|
||||
<el-input v-model="form.pillMgrQty" placeholder="请输入药管员人数"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="配药员人数" prop="pillDisQty">
|
||||
<el-input v-model="form.pillDisQty" placeholder="请输入配药员人数"/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listQty,getQty,delQty,addQty,updateQty } from "@/api/mes/report";
|
||||
|
||||
export default {
|
||||
name: "Assistqty",
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 辅助工时摊分表格数据
|
||||
qtyList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
factoryCode: null,
|
||||
productDate: null,
|
||||
monitorQty: null,
|
||||
groupleaderQty: null,
|
||||
materialQty: null,
|
||||
pillMgrQty: null,
|
||||
pillDisQty: null,
|
||||
attr1: null,
|
||||
attr2: null,
|
||||
attr3: null,
|
||||
attr4: null,
|
||||
},
|
||||
// 表单参数
|
||||
form: {
|
||||
}
|
||||
,
|
||||
// 表单校验
|
||||
rules: {
|
||||
}
|
||||
}
|
||||
;
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
/** 查询辅助工时摊分列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listQty(this.queryParams).then(response => {
|
||||
this.qtyList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
id: null,
|
||||
factoryCode: null,
|
||||
productDate: null,
|
||||
monitorQty: null,
|
||||
groupleaderQty: null,
|
||||
materialQty: null,
|
||||
pillMgrQty: null,
|
||||
pillDisQty: null,
|
||||
attr1: null,
|
||||
attr2: null,
|
||||
attr3: null,
|
||||
attr4: null,
|
||||
createBy: null,
|
||||
createTime: null,
|
||||
updateBy: null,
|
||||
updateTime: null
|
||||
}
|
||||
;
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.id)
|
||||
this.single = selection.length !== 1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "添加辅助工时摊分";
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
const id =
|
||||
row.id || this.ids
|
||||
getQty(id).then(response => {
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改辅助工时摊分";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate((valid) => {
|
||||
if (valid) {
|
||||
if (this.form.id != null) {
|
||||
updateQty(this.form).then((response) => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
} else {
|
||||
addQty(this.form).then((response) => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const ids = row.id || this.ids;
|
||||
this.$modal.confirm('是否确认删除"' + ids + '"的数据项？').then(function() {
|
||||
return delQty(ids);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -0,0 +1,251 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
|
||||
<el-form-item label="生产日期" prop="productDateStr" width="100px">
|
||||
<el-date-picker
|
||||
v-model="queryParams.productDateStr"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择生产日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="车间" prop="carCode">
|
||||
<el-input
|
||||
v-model="queryParams.carCode"
|
||||
placeholder="请输入车间名称"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="SAP产线编码" prop="lineCode">
|
||||
<el-input
|
||||
v-model="queryParams.lineCode"
|
||||
placeholder="请输入SAP产线编码"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="产品名称" prop="productName">
|
||||
<el-input
|
||||
v-model="queryParams.productName"
|
||||
placeholder="请输入产品名称"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<!--<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-user-solid"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['mes:pro:assistTable:manmgr']"
|
||||
>辅助人员管理</el-button>
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['mes:pro:assistTable:export']"
|
||||
>导出</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<!--
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>-->
|
||||
|
||||
<el-table v-loading="loading" :data="assistHourList" height="500px">
|
||||
<el-table-column type="index" width="50" align="center" :index="indexMethod" label="序号" fixed/>
|
||||
<el-table-column label="日期" align="center" prop="productDate" width="100px" fixed>
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="工厂" align="center" prop="factoryCode" fixed/>
|
||||
<el-table-column label="车间" align="center" prop="carCode" width="100px" fixed/>
|
||||
<el-table-column label="SAP产线编码" align="center" prop="lineCode" fixed/>
|
||||
<el-table-column label="产品名称" align="center" prop="productName" width="230px" fixed/>
|
||||
<el-table-column label="产品工时" align="center" prop="productHour" fixed/>
|
||||
<el-table-column label="工时占比" align="center" prop="hourRatio" fixed/>
|
||||
<el-table-column label="辅助工时合计" align="center" prop="assistHourSum" />
|
||||
<el-table-column label="班长" align="center">
|
||||
<el-table-column label="用人" align="center" prop="monitorQty" />
|
||||
<el-table-column label="工时" align="center" prop="monitorHour" />
|
||||
</el-table-column>
|
||||
<el-table-column label="组长" align="center">
|
||||
<el-table-column label="用人" align="center" prop="groupleaderQty" />
|
||||
<el-table-column label="工时" align="center" prop="groupLeaderHour" />
|
||||
</el-table-column>
|
||||
<el-table-column label="物料员" align="center">
|
||||
<el-table-column label="用人" align="center" prop="materialQty" />
|
||||
<el-table-column label="工时" align="center" prop="materialHour" />
|
||||
</el-table-column>
|
||||
<el-table-column label="药管员" align="center">
|
||||
<el-table-column label="用人" align="center" prop="pillMgrQty" />
|
||||
<el-table-column label="工时" align="center" prop="pillMgrHour" />
|
||||
</el-table-column>
|
||||
<el-table-column label="配药员" align="center">
|
||||
<el-table-column label="用人" align="center" prop="pillDisQty" />
|
||||
<el-table-column label="工时" align="center" prop="pillDisHour" />
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<!--
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>-->
|
||||
|
||||
<!-- 辅助人员维护 -->
|
||||
<el-dialog
|
||||
title="辅助人员维护"
|
||||
:visible.sync="openAssist"
|
||||
width="1160px"
|
||||
append-to-body
|
||||
>
|
||||
<Assistqty></Assistqty>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="cancel">关 闭</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listAssistHour} from "@/api/mes/report";
|
||||
import Assistqty from "./assistqty.vue";
|
||||
export default {
|
||||
name: "ProAssistTable",
|
||||
components: { Assistqty },
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: false,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 工艺附件管理表格数据
|
||||
assistHourList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
productDateStr:null,
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
fileName: null,
|
||||
fileAddress: null,
|
||||
sourceId: null,
|
||||
attr1: null,
|
||||
attr2: null,
|
||||
attr3: null,
|
||||
attr4: null,
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
},
|
||||
openAssist: false,
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getDate();
|
||||
|
||||
},
|
||||
methods: {
|
||||
/**获取默认查询时间段**/
|
||||
getDate() {
|
||||
let start = this.Fungetdate (0);
|
||||
this.queryParams.productDateStr = start;
|
||||
this.getList();
|
||||
},
|
||||
Fungetdate (num) {
|
||||
var dd = new Date();
|
||||
dd.setDate(dd.getDate() + num);
|
||||
var y = dd.getFullYear();
|
||||
var m = dd.getMonth() + 1;//获取当前月份的日期
|
||||
var d = dd.getDate();
|
||||
return y + "-" + m + "-" + d;
|
||||
},
|
||||
// 生成表头序号
|
||||
indexMethod(index) {
|
||||
return index + 1;
|
||||
},
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listAssistHour(this.queryParams).then(response => {
|
||||
this.assistHourList = response;
|
||||
//this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.openAssist = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
fileId: null,
|
||||
fileName: null,
|
||||
fileAddress: null,
|
||||
sourceId: null,
|
||||
remark: null,
|
||||
attr1: null,
|
||||
attr2: null,
|
||||
attr3: null,
|
||||
attr4: null,
|
||||
createBy: null,
|
||||
createTime: null,
|
||||
updateBy: null,
|
||||
updateTime: null
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.fileId)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.openAssist = true;
|
||||
},
|
||||
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('mes/reportWorks/assistqty/listAssistHourExport', {
|
||||
...this.queryParams
|
||||
}, `assistTable_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
Loading…
Reference in New Issue