DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2025-08-15 10:12:54 +08:00
parent 7f0b243c7f f3b2ac1f29
commit f9e1aad096
12 changed files with 1265 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsInspectionCommissionBo.java
View File

@@ -1,5 +1,6 @@
package com.klp.mes.is.domain.bo;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -57,11 +58,13 @@ public class IsInspectionCommissionBo extends BaseEntity {
/**
* 委托日期
*/
@DateTimeFormat("yyyy-MM-dd")
private Date commissionDate;
/**
* 要求完成日期
*/
@DateTimeFormat("yyyy-MM-dd")
private Date deadline;
/**

3
klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsInspectionTaskBo.java
View File

@@ -1,5 +1,6 @@
package com.klp.mes.is.domain.bo;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -42,11 +43,13 @@ public class IsInspectionTaskBo extends BaseEntity {
/**
* 任务开始时间
*/
@DateTimeFormat("yyyy-MM-dd")
private Date startTime;
/**
* 任务完成时间
*/
@DateTimeFormat("yyyy-MM-dd")
private Date endTime;
/**

4
klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsSampleInventoryBo.java
View File

@@ -1,5 +1,6 @@
package com.klp.mes.is.domain.bo;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -42,11 +43,13 @@ public class IsSampleInventoryBo extends BaseEntity {
/**
* 入库时间
*/
@DateTimeFormat("yyyy-MM-dd")
private Date storageTime;
/**
* 有效期至
*/
@DateTimeFormat("yyyy-MM-dd")
private Date expirationDate;
/**
@@ -62,6 +65,7 @@ public class IsSampleInventoryBo extends BaseEntity {
/**
* 最后更新时间
*/
@DateTimeFormat("yyyy-MM-dd")
private Date lastUpdate;
/**

4
klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionCommissionVo.java
View File

@@ -1,6 +1,8 @@
package com.klp.mes.is.domain.vo;
import java.util.Date;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
@@ -68,12 +70,14 @@ public class IsInspectionCommissionVo {
/**
* 委托日期
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelProperty(value = "委托日期")
private Date commissionDate;
/**
* 要求完成日期
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelProperty(value = "要求完成日期")
private Date deadline;

4
klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionTaskVo.java
View File

@@ -1,6 +1,8 @@
package com.klp.mes.is.domain.vo;
import java.util.Date;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
@@ -49,12 +51,14 @@ public class IsInspectionTaskVo {
/**
* 任务开始时间
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelProperty(value = "任务开始时间")
private Date startTime;
/**
* 任务完成时间
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelProperty(value = "任务完成时间")
private Date endTime;

5
klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsSampleInventoryVo.java
View File

@@ -1,6 +1,8 @@
package com.klp.mes.is.domain.vo;
import java.util.Date;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
@@ -49,12 +51,14 @@ public class IsSampleInventoryVo {
/**
* 入库时间
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelProperty(value = "入库时间")
private Date storageTime;
/**
* 有效期至
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelProperty(value = "有效期至")
private Date expirationDate;
@@ -74,6 +78,7 @@ public class IsSampleInventoryVo {
/**
* 最后更新时间
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelProperty(value = "最后更新时间")
private Date lastUpdate;

44
klp-ui/src/api/mes/is/inspectionCommission.js Normal file
View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询检验委托单表列表
export function listInspectionCommission(query) {
return request({
url: '/is/inspectionCommission/list',
method: 'get',
params: query
})
}
// 查询检验委托单表详细
export function getInspectionCommission(commissionId) {
return request({
url: '/is/inspectionCommission/' + commissionId,
method: 'get'
})
}
// 新增检验委托单表
export function addInspectionCommission(data) {
return request({
url: '/is/inspectionCommission',
method: 'post',
data: data
})
}
// 修改检验委托单表
export function updateInspectionCommission(data) {
return request({
url: '/is/inspectionCommission',
method: 'put',
data: data
})
}
// 删除检验委托单表
export function delInspectionCommission(commissionId) {
return request({
url: '/is/inspectionCommission/' + commissionId,
method: 'delete'
})
}

44
klp-ui/src/api/mes/is/inspectionTask.js Normal file
View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询检验任务表列表
export function listInspectionTask(query) {
return request({
url: '/is/inspectionTask/list',
method: 'get',
params: query
})
}
// 查询检验任务表详细
export function getInspectionTask(taskId) {
return request({
url: '/is/inspectionTask/' + taskId,
method: 'get'
})
}
// 新增检验任务表
export function addInspectionTask(data) {
return request({
url: '/is/inspectionTask',
method: 'post',
data: data
})
}
// 修改检验任务表
export function updateInspectionTask(data) {
return request({
url: '/is/inspectionTask',
method: 'put',
data: data
})
}
// 删除检验任务表
export function delInspectionTask(taskId) {
return request({
url: '/is/inspectionTask/' + taskId,
method: 'delete'
})
}

44
klp-ui/src/api/mes/is/sampleInventory.js Normal file
View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询样品库存表列表
export function listSampleInventory(query) {
return request({
url: '/is/sampleInventory/list',
method: 'get',
params: query
})
}
// 查询样品库存表详细
export function getSampleInventory(sampleId) {
return request({
url: '/is/sampleInventory/' + sampleId,
method: 'get'
})
}
// 新增样品库存表
export function addSampleInventory(data) {
return request({
url: '/is/sampleInventory',
method: 'post',
data: data
})
}
// 修改样品库存表
export function updateSampleInventory(data) {
return request({
url: '/is/sampleInventory',
method: 'put',
data: data
})
}
// 删除样品库存表
export function delSampleInventory(sampleId) {
return request({
url: '/is/sampleInventory/' + sampleId,
method: 'delete'
})
}

351
klp-ui/src/views/mes/is/inspectionCommission/index.vue Normal file
View File

@@ -0,0 +1,351 @@
<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="commissionNo">
<el-input
v-model="queryParams.commissionNo"
placeholder="请输入委托单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="委托单位ID" prop="clientId">
<el-input
v-model="queryParams.clientId"
placeholder="请输入委托单位ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="样品名称" prop="sampleName">
<el-input
v-model="queryParams.sampleName"
placeholder="请输入样品名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="样品数量" prop="quantity">
<el-input
v-model="queryParams.quantity"
placeholder="请输入样品数量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="要求完成日期" prop="deadline">
<el-date-picker clearable
v-model="queryParams.deadline"
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>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="inspectionCommissionList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="委托单ID" align="center" prop="commissionId" v-if="false"/>
<el-table-column label="委托单号" align="center" prop="commissionNo" />
<el-table-column label="委托单位ID" align="center" prop="clientId" />
<el-table-column label="样品名称" align="center" prop="sampleName" />
<el-table-column label="样品类型" align="center" prop="sampleType" />
<el-table-column label="样品数量" align="center" prop="quantity" />
<el-table-column label="检验项目" align="center" prop="inspectionItems" />
<el-table-column label="委托日期" align="center" prop="commissionDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.commissionDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="要求完成日期" align="center" prop="deadline" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.deadline, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="备注" align="center" prop="remark" />
<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="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="委托单号" prop="commissionNo">
<el-input v-model="form.commissionNo" placeholder="请输入委托单号" />
</el-form-item>
<el-form-item label="委托单位ID" prop="clientId">
<el-input v-model="form.clientId" placeholder="请输入委托单位ID" />
</el-form-item>
<el-form-item label="样品名称" prop="sampleName">
<el-input v-model="form.sampleName" placeholder="请输入样品名称" />
</el-form-item>
<el-form-item label="样品数量" prop="quantity">
<el-input v-model="form.quantity" placeholder="请输入样品数量" />
</el-form-item>
<el-form-item label="委托日期" prop="commissionDate">
<el-date-picker clearable
v-model="form.commissionDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择委托日期">
</el-date-picker>
</el-form-item>
<el-form-item label="要求完成日期" prop="deadline">
<el-date-picker clearable
v-model="form.deadline"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择要求完成日期">
</el-date-picker>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listInspectionCommission, getInspectionCommission, delInspectionCommission, addInspectionCommission, updateInspectionCommission } from "@/api/mes/is/inspectionCommission";
export default {
name: "InspectionCommission",
data() {
return {
// 按钮loading
buttonLoading: false,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 检验委托单表表格数据
inspectionCommissionList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
commissionNo: undefined,
clientId: undefined,
sampleName: undefined,
sampleType: undefined,
quantity: undefined,
inspectionItems: undefined,
deadline: undefined,
status: undefined,
},
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询检验委托单表列表 */
getList() {
this.loading = true;
listInspectionCommission(this.queryParams).then(response => {
this.inspectionCommissionList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
commissionId: undefined,
commissionNo: undefined,
clientId: undefined,
sampleName: undefined,
sampleType: undefined,
quantity: undefined,
inspectionItems: undefined,
commissionDate: undefined,
deadline: undefined,
status: undefined,
delFlag: undefined,
createTime: undefined,
createBy: undefined,
updateTime: undefined,
updateBy: undefined,
remark: undefined
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.commissionId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加检验委托单表";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.loading = true;
this.reset();
const commissionId = row.commissionId || this.ids
getInspectionCommission(commissionId).then(response => {
this.loading = false;
this.form = response.data;
this.open = true;
this.title = "修改检验委托单表";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.buttonLoading = true;
if (this.form.commissionId != null) {
updateInspectionCommission(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
} else {
addInspectionCommission(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const commissionIds = row.commissionId || this.ids;
this.$modal.confirm('是否确认删除检验委托单表编号为"' + commissionIds + '"的数据项？').then(() => {
this.loading = true;
return delInspectionCommission(commissionIds);
}).then(() => {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
}).finally(() => {
this.loading = false;
});
},
/** 导出按钮操作 */
handleExport() {
this.download('is/inspectionCommission/export', {
...this.queryParams
}, `inspectionCommission_${new Date().getTime()}.xlsx`)
}
}
};
</script>

382
klp-ui/src/views/mes/is/inspectionTask/index.vue Normal file
View File

@@ -0,0 +1,382 @@
<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="taskNo">
<el-input
v-model="queryParams.taskNo"
placeholder="请输入任务单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="关联委托单ID" prop="commissionId">
<el-input
v-model="queryParams.commissionId"
placeholder="请输入关联委托单ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="负责人" prop="assignedTo">
<el-input
v-model="queryParams.assignedTo"
placeholder="请输入负责人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="任务开始时间" prop="startTime">
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择任务开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="任务完成时间" prop="endTime">
<el-date-picker clearable
v-model="queryParams.endTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择任务完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="检验结果" prop="result">
<el-input
v-model="queryParams.result"
placeholder="请输入检验结果"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="检验结论" prop="conclusion">
<el-input
v-model="queryParams.conclusion"
placeholder="请输入检验结论"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="优先级" prop="priority">
<el-input
v-model="queryParams.priority"
placeholder="请输入优先级"
clearable
@keyup.enter.native="handleQuery"
/>
</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>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="inspectionTaskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务ID" align="center" prop="taskId" v-if="false"/>
<el-table-column label="任务单号" align="center" prop="taskNo" />
<el-table-column label="关联委托单ID" align="center" prop="commissionId" />
<el-table-column label="负责人" align="center" prop="assignedTo" />
<el-table-column label="任务开始时间" align="center" prop="startTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="任务完成时间" align="center" prop="endTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="检验结果" align="center" prop="result" />
<el-table-column label="检验结论" align="center" prop="conclusion" />
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="优先级" align="center" prop="priority" />
<el-table-column label="备注" align="center" prop="remark" />
<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="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="任务单号" prop="taskNo">
<el-input v-model="form.taskNo" placeholder="请输入任务单号" />
</el-form-item>
<el-form-item label="关联委托单ID" prop="commissionId">
<el-input v-model="form.commissionId" placeholder="请输入关联委托单ID" />
</el-form-item>
<el-form-item label="负责人" prop="assignedTo">
<el-input v-model="form.assignedTo" placeholder="请输入负责人" />
</el-form-item>
<el-form-item label="任务开始时间" prop="startTime">
<el-date-picker clearable
v-model="form.startTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择任务开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="任务完成时间" prop="endTime">
<el-date-picker clearable
v-model="form.endTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择任务完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="检验结果" prop="result">
<el-input v-model="form.result" placeholder="请输入检验结果" />
</el-form-item>
<el-form-item label="检验结论" prop="conclusion">
<el-input v-model="form.conclusion" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="优先级" prop="priority">
<el-input v-model="form.priority" placeholder="请输入优先级" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listInspectionTask, getInspectionTask, delInspectionTask, addInspectionTask, updateInspectionTask } from "@/api/mes/is/inspectionTask";
export default {
name: "InspectionTask",
data() {
return {
// 按钮loading
buttonLoading: false,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 检验任务表表格数据
inspectionTaskList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
taskNo: undefined,
commissionId: undefined,
assignedTo: undefined,
startTime: undefined,
endTime: undefined,
result: undefined,
conclusion: undefined,
status: undefined,
priority: undefined,
},
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询检验任务表列表 */
getList() {
this.loading = true;
listInspectionTask(this.queryParams).then(response => {
this.inspectionTaskList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
taskId: undefined,
taskNo: undefined,
commissionId: undefined,
assignedTo: undefined,
startTime: undefined,
endTime: undefined,
result: undefined,
conclusion: undefined,
status: undefined,
priority: undefined,
delFlag: undefined,
createTime: undefined,
createBy: undefined,
updateTime: undefined,
updateBy: undefined,
remark: undefined
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.taskId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加检验任务表";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.loading = true;
this.reset();
const taskId = row.taskId || this.ids
getInspectionTask(taskId).then(response => {
this.loading = false;
this.form = response.data;
this.open = true;
this.title = "修改检验任务表";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.buttonLoading = true;
if (this.form.taskId != null) {
updateInspectionTask(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
} else {
addInspectionTask(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const taskIds = row.taskId || this.ids;
this.$modal.confirm('是否确认删除检验任务表编号为"' + taskIds + '"的数据项？').then(() => {
this.loading = true;
return delInspectionTask(taskIds);
}).then(() => {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
}).finally(() => {
this.loading = false;
});
},
/** 导出按钮操作 */
handleExport() {
this.download('is/inspectionTask/export', {
...this.queryParams
}, `inspectionTask_${new Date().getTime()}.xlsx`)
}
}
};
</script>

377
klp-ui/src/views/mes/is/sampleInventory/index.vue Normal file
View File

@@ -0,0 +1,377 @@
<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="关联委托单ID" prop="commissionId">
<el-input
v-model="queryParams.commissionId"
placeholder="请输入关联委托单ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="存放位置" prop="location">
<el-input
v-model="queryParams.location"
placeholder="请输入存放位置"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="当前库存量" prop="currentQuantity">
<el-input
v-model="queryParams.currentQuantity"
placeholder="请输入当前库存量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库时间" prop="storageTime">
<el-date-picker clearable
v-model="queryParams.storageTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择入库时间">
</el-date-picker>
</el-form-item>
<el-form-item label="有效期至" prop="expirationDate">
<el-date-picker clearable
v-model="queryParams.expirationDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择有效期至">
</el-date-picker>
</el-form-item>
<el-form-item label="操作人" prop="operatorId">
<el-input
v-model="queryParams.operatorId"
placeholder="请输入操作人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="最后更新时间" prop="lastUpdate">
<el-date-picker clearable
v-model="queryParams.lastUpdate"
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>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="sampleInventoryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="样品ID" align="center" prop="sampleId" v-if="false"/>
<el-table-column label="关联委托单ID" align="center" prop="commissionId" />
<el-table-column label="存放位置" align="center" prop="location" />
<el-table-column label="当前库存量" align="center" prop="currentQuantity" />
<el-table-column label="入库时间" align="center" prop="storageTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.storageTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="有效期至" align="center" prop="expirationDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.expirationDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="操作人" align="center" prop="operatorId" />
<el-table-column label="最后更新时间" align="center" prop="lastUpdate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.lastUpdate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<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="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="关联委托单ID" prop="commissionId">
<el-input v-model="form.commissionId" placeholder="请输入关联委托单ID" />
</el-form-item>
<el-form-item label="存放位置" prop="location">
<el-input v-model="form.location" placeholder="请输入存放位置" />
</el-form-item>
<el-form-item label="当前库存量" prop="currentQuantity">
<el-input v-model="form.currentQuantity" placeholder="请输入当前库存量" />
</el-form-item>
<el-form-item label="入库时间" prop="storageTime">
<el-date-picker clearable
v-model="form.storageTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择入库时间">
</el-date-picker>
</el-form-item>
<el-form-item label="有效期至" prop="expirationDate">
<el-date-picker clearable
v-model="form.expirationDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择有效期至">
</el-date-picker>
</el-form-item>
<el-form-item label="操作人" prop="operatorId">
<el-input v-model="form.operatorId" placeholder="请输入操作人" />
</el-form-item>
<el-form-item label="最后更新时间" prop="lastUpdate">
<el-date-picker clearable
v-model="form.lastUpdate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择最后更新时间">
</el-date-picker>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listSampleInventory, getSampleInventory, delSampleInventory, addSampleInventory, updateSampleInventory } from "@/api/mes/is/sampleInventory";
export default {
name: "SampleInventory",
data() {
return {
// 按钮loading
buttonLoading: false,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 样品库存表表格数据
sampleInventoryList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
commissionId: undefined,
location: undefined,
currentQuantity: undefined,
storageTime: undefined,
expirationDate: undefined,
status: undefined,
operatorId: undefined,
lastUpdate: undefined,
},
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询样品库存表列表 */
getList() {
this.loading = true;
listSampleInventory(this.queryParams).then(response => {
this.sampleInventoryList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
sampleId: undefined,
commissionId: undefined,
location: undefined,
currentQuantity: undefined,
storageTime: undefined,
expirationDate: undefined,
status: undefined,
operatorId: undefined,
lastUpdate: undefined,
delFlag: undefined,
createTime: undefined,
createBy: undefined,
updateTime: undefined,
updateBy: undefined,
remark: undefined
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.sampleId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加样品库存表";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.loading = true;
this.reset();
const sampleId = row.sampleId || this.ids
getSampleInventory(sampleId).then(response => {
this.loading = false;
this.form = response.data;
this.open = true;
this.title = "修改样品库存表";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.buttonLoading = true;
if (this.form.sampleId != null) {
updateSampleInventory(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
} else {
addSampleInventory(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const sampleIds = row.sampleId || this.ids;
this.$modal.confirm('是否确认删除样品库存表编号为"' + sampleIds + '"的数据项？').then(() => {
this.loading = true;
return delSampleInventory(sampleIds);
}).then(() => {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
}).finally(() => {
this.loading = false;
});
},
/** 导出按钮操作 */
handleExport() {
this.download('is/sampleInventory/export', {
...this.queryParams
}, `sampleInventory_${new Date().getTime()}.xlsx`)
}
}
};
</script>