Merge remote-tracking branch 'origin/master'
wws
11 months ago
commit
ae418f15ef
@ -0,0 +1,44 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询不合格处理列表
|
||||
export function listUnqualified(query) {
|
||||
return request({
|
||||
url: '/quality/unqualified/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
}
|
||||
|
||||
// 查询不合格处理详细
|
||||
export function getUnqualified(id) {
|
||||
return request({
|
||||
url: '/quality/unqualified/' + id,
|
||||
method: 'get'
|
||||
});
|
||||
}
|
||||
|
||||
// 新增不合格处理
|
||||
export function addUnqualified(data) {
|
||||
return request({
|
||||
url: '/quality/unqualified',
|
||||
method: 'post',
|
||||
data: data
|
||||
});
|
||||
}
|
||||
|
||||
// 修改不合格处理
|
||||
export function updateUnqualified(data) {
|
||||
return request({
|
||||
url: '/quality/unqualified',
|
||||
method: 'put',
|
||||
data: data
|
||||
});
|
||||
}
|
||||
|
||||
// 删除不合格处理
|
||||
export function delUnqualified(id) {
|
||||
return request({
|
||||
url: '/quality/unqualified/' + id,
|
||||
method: 'delete'
|
||||
});
|
||||
}
|
||||
@ -0,0 +1,365 @@
|
||||
<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="taskId">
|
||||
<el-input
|
||||
v-model="queryParams.taskId"
|
||||
placeholder="请输入所属任务编码"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="物料号" prop="materialCode">
|
||||
<el-input
|
||||
v-model="queryParams.materialCode"
|
||||
placeholder="请输入物料号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="物料名称" prop="materialName">
|
||||
<el-input
|
||||
v-model="queryParams.materialName"
|
||||
placeholder="请输入物料名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="检测地点" prop="checkLoc">
|
||||
<el-input
|
||||
v-model="queryParams.checkLoc"
|
||||
placeholder="请输入检测地点"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="检测人" prop="checkManName">
|
||||
<el-input
|
||||
v-model="queryParams.checkManName"
|
||||
placeholder="请输入检测人姓名"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="检验时间" prop="checkTime">
|
||||
<el-date-picker
|
||||
v-model="queryParams.checkTimeArray"
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
type="datetimerange"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="检验结果" prop="status">
|
||||
<el-select
|
||||
v-model="queryParams.status"
|
||||
placeholder="处理结果"
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in dict.type.do_result"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</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="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['quality:unqualified:edit']"
|
||||
>处理</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['quality:unqualified:export']"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="unqualifiedList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="id" align="center" prop="id" v-if="false"/>
|
||||
<el-table-column label="所属任务编码" align="center" prop="taskId" />
|
||||
<el-table-column label="0未处理" align="center" prop="status" />
|
||||
<el-table-column label="下一节点编码" align="center" prop="nextNodeCode" />
|
||||
<el-table-column label="下一节点名称" align="center" prop="nextNodeName" />
|
||||
<el-table-column label="不合格描述" align="center" prop="remark" />
|
||||
<el-table-column label="预留字段1" align="center" prop="attr1" />
|
||||
<el-table-column label="预留字段2" align="center" prop="attr2" />
|
||||
<el-table-column label="预留字段3" align="center" prop="attr3" />
|
||||
<el-table-column label="预留字段4" align="center" prop="attr4" />
|
||||
<el-table-column label="工厂编码" align="center" prop="factoryCode" />
|
||||
<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)"
|
||||
v-hasPermi="['quality:unqualified:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['quality:unqualified:remove']"
|
||||
>删除</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="taskId">
|
||||
<el-input v-model="form.taskId" placeholder="请输入归属任务编码" />
|
||||
</el-form-item>
|
||||
<el-form-item label="下一节点编码" prop="nextNodeCode">
|
||||
<el-input v-model="form.nextNodeCode" placeholder="请输入下一节点编码" />
|
||||
</el-form-item>
|
||||
<el-form-item label="下一节点名称" prop="nextNodeName">
|
||||
<el-input v-model="form.nextNodeName" placeholder="请输入下一节点名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="不合格描述" prop="remark">
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
||||
</el-form-item>
|
||||
<el-form-item label="预留字段1" prop="attr1">
|
||||
<el-input v-model="form.attr1" placeholder="请输入预留字段1" />
|
||||
</el-form-item>
|
||||
<el-form-item label="预留字段2" prop="attr2">
|
||||
<el-input v-model="form.attr2" placeholder="请输入预留字段2" />
|
||||
</el-form-item>
|
||||
<el-form-item label="预留字段3" prop="attr3">
|
||||
<el-input v-model="form.attr3" placeholder="请输入预留字段3" />
|
||||
</el-form-item>
|
||||
<el-form-item label="预留字段4" prop="attr4">
|
||||
<el-input v-model="form.attr4" placeholder="请输入预留字段4" />
|
||||
</el-form-item>
|
||||
<el-form-item label="工厂编码" prop="factoryCode">
|
||||
<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
|
||||
</el-form-item>
|
||||
<el-form-item label="删除标识1删除0正常" prop="delFlag">
|
||||
<el-input v-model="form.delFlag" placeholder="请输入删除标识1删除0正常" />
|
||||
</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 { listUnqualified, getUnqualified, delUnqualified, addUnqualified, updateUnqualified } from "@/api/quality/unqualified";
|
||||
import moment from 'moment';
|
||||
export default {
|
||||
name: "Unqualified",
|
||||
dicts: ["do_result"],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 不合格处理表格数据
|
||||
unqualifiedList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
checkTimeArray: [],
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
taskId: null,
|
||||
status: null,
|
||||
nextNodeCode: null,
|
||||
nextNodeName: null,
|
||||
attr1: null,
|
||||
attr2: null,
|
||||
attr3: null,
|
||||
attr4: null,
|
||||
factoryCode: null,
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
factoryCode: [
|
||||
{ required: true, message: "工厂编码不能为空", trigger: "blur" }
|
||||
],
|
||||
}
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getDate();
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
/**获取默认查询时间段**/
|
||||
getDate() {
|
||||
let start = this.Fungetdate (0)
|
||||
let end = this.Fungetdate (1)
|
||||
this.queryParams.checkTimeArray.push(start,end)
|
||||
},
|
||||
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+" 00:00:00";
|
||||
},
|
||||
|
||||
/** 查询不合格处理列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
|
||||
if(this.queryParams.checkTimeArray.length>0){
|
||||
this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
|
||||
this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
|
||||
}
|
||||
|
||||
listUnqualified(this.queryParams).then(response => {
|
||||
this.unqualifiedList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
id: null,
|
||||
taskId: null,
|
||||
status: null,
|
||||
nextNodeCode: null,
|
||||
nextNodeName: null,
|
||||
remark: null,
|
||||
attr1: null,
|
||||
attr2: null,
|
||||
attr3: null,
|
||||
attr4: null,
|
||||
createBy: null,
|
||||
createTime: null,
|
||||
updateBy: null,
|
||||
updateTime: null,
|
||||
factoryCode: null,
|
||||
delFlag: 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
|
||||
getUnqualified(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) {
|
||||
updateUnqualified(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
} else {
|
||||
addUnqualified(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 delUnqualified(ids);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('quality/unqualified/export', {
|
||||
...this.queryParams
|
||||
}, `unqualified_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
Loading…
Reference in New Issue