Skip to content

M
mes-ui
Commit 15678a44 authored by chenzj's avatar chenzj
Browse files
Options

过程检验加个时间查询

parent cf914daf
Show whitespace changes
Inline Side-by-side
Showing with 93 additions and 152 deletions
src/views/mes/qc/ipqc/index.vue
View file @ 15678a44
......@@ -2,57 +2,35 @@
<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="ipqcCode">
<el-input
v-model="queryParams.ipqcCode"
placeholder="请输入检验单编号"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.ipqcCode" placeholder="请输入检验单编号" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="检验类型" prop="ipqcType">
<el-select v-model="queryParams.ipqcType" placeholder="请选择检验类型" clearable>
<el-option
v-for="dict in dict.type.mes_ipqc_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-option v-for="dict in dict.type.mes_ipqc_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="工单编号" prop="workorderCode">
<el-input
v-model="queryParams.workorderCode"
placeholder="请输入工单编码"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.workorderCode" placeholder="请输入工单编码" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="产品物料编码" prop="sapItemCode">
<el-input
v-model="queryParams.sapItemCode"
placeholder="请输入产品物料编码"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.sapItemCode" placeholder="请输入产品物料编码" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="产品物料名称" prop="itemName">
<el-input
v-model="queryParams.itemName"
placeholder="请输入产品物料名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.itemName" placeholder="请输入产品物料名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="检测结果" prop="checkResult">
<el-select v-model="queryParams.checkResult" placeholder="请选择检验结果" clearable>
<el-option
v-for="dict in dict.type.mes_qc_result"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-option v-for="dict in dict.type.mes_qc_result" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="检测日期">
<el-date-picker v-model="daterangePurchaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
start-placeholder="开始日期" end-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>
......@@ -71,65 +49,42 @@
>新增</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['mes:qc:ipqc:edit']"
>修改</el-button>
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['mes:qc:ipqc:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['mes:qc:ipqc:remove']"
>删除</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['mes:qc:ipqc:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['mes:qc:ipqc:export']"
>导出</el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['mes:qc:ipqc:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="ipqcList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="检验单编号" width="150px" align="center" prop="ipqcCode" >
<el-table-column label="检验单编号" width="150px" align="center" prop="ipqcCode">
<template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:qc:ipqc:query']"
>{{scope.row.ipqcCode}}</el-button>
<el-button type="text" @click="handleView(scope.row)"
v-hasPermi="['mes:qc:ipqc:query']">{{ scope.row.ipqcCode }}</el-button>
</template>
</el-table-column>
<el-table-column label="检验类型" align="center" prop="ipqcType">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_ipqc_type" :value="scope.row.ipqcType"/>
<dict-tag :options="dict.type.mes_ipqc_type" :value="scope.row.ipqcType" />
</template>
</el-table-column>
<el-table-column label="工单编号" width="150px" align="center" prop="workorderCode" />
<el-table-column label="产品物料编码" width="120px" align="center" prop="sapItemCode" />
<el-table-column label="产品物料名称" width="150px" align="center" prop="itemName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="产品物料名称" width="150px" align="center" prop="itemName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true" />
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
<el-table-column label="检测数量" align="center" prop="quantityCheck" />
<el-table-column label="检测结果" align="center" prop="checkResult" >
<el-table-column label="检测结果" align="center" prop="checkResult">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_qc_result" :value="scope.row.checkResult"/>
<dict-tag :options="dict.type.mes_qc_result" :value="scope.row.checkResult" />
</template>
</el-table-column>
......@@ -141,38 +96,21 @@
<el-table-column label="检测人员" align="center" prop="inspector" />
<el-table-column label="单据状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" width="150" fixed="right" 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-if="scope.row.status =='PREPARE'"
v-hasPermi="['mes:qc:ipqc:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-if="scope.row.status =='PREPARE'"
v-hasPermi="['mes:qc:ipqc:remove']"
>删除</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-if="scope.row.status == 'PREPARE'" v-hasPermi="['mes:qc:ipqc:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-if="scope.row.status == 'PREPARE'" v-hasPermi="['mes:qc:ipqc: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"
/>
<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="960px" append-to-body>
......@@ -182,11 +120,9 @@
<el-form-item label="检验单编号" prop="ipqcCode">
<div style="display:flex;align-items: center;">
<el-input v-model="form.ipqcCode" placeholder="请输入检验单编号" />
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
style="width:175px;margin-left:10px;"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
<el-switch v-model="autoGenFlag" active-color="#13ce66" active-text="自动生成"
style="width:175px;margin-left:10px;" @change="handleAutoGenChange(autoGenFlag)"
v-if="optType != 'view' && form.status == 'PREPARE'">
</el-switch>
</div>
</el-form-item>
......@@ -201,22 +137,18 @@
<el-col :span="8">
<el-form-item label="检验类型" prop="ipqcType">
<el-select v-model="form.ipqcType" placeholder="请选择检验类型">
<el-option
v-for="dict in dict.type.mes_ipqc_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
<el-option v-for="dict in dict.type.mes_ipqc_type" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工单编码" prop="workorderCode">
<el-input v-if="form.ipqcId == null" v-model="form.workorderCode" placeholder="请选择生产工单" >
<el-input v-if="form.ipqcId == null" v-model="form.workorderCode" placeholder="请选择生产工单">
<el-button slot="append" icon="el-icon-search" @click="handleWorkorderSelect"></el-button>
</el-input>
<!--保存过则不允许修改工单，需要修改则删除重做-->
<el-input v-else v-model="form.workorderCode" >
<el-input v-else v-model="form.workorderCode">
</el-input>
</el-form-item>
<WorkorderSelect ref="woSelect" @onSelected="onWorkorderSelected"></WorkorderSelect>
......@@ -230,7 +162,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="工作中心编号" prop="workstationCode">
<el-input v-model="form.workstationCode" placeholder="请输入工作中心编号" >
<el-input v-model="form.workstationCode" placeholder="请输入工作中心编号">
<el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button>
</el-input>
</el-form-item>
......@@ -333,10 +265,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="检测日期" prop="inspectDate">
<el-date-picker clearable
v-model="form.inspectDate"
type="date"
value-format="yyyy-MM-dd"
<el-date-picker clearable v-model="form.inspectDate" type="date" value-format="yyyy-MM-dd"
placeholder="请选择检测日期">
</el-date-picker>
</el-form-item>
......@@ -344,12 +273,8 @@
<el-col :span="8">
<el-form-item label="检测结果" prop="checkResult">
<el-select v-model="form.checkResult" placeholder="请选择检验结果">
<el-option
v-for="dict in dict.type.mes_qc_result"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
<el-option v-for="dict in dict.type.mes_qc_result" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -367,14 +292,16 @@
</el-col>
</el-row>
</el-form>
<el-divider v-if="form.ipqcId !=null" content-position="center">检测项</el-divider>
<el-card shadow="always" v-if="form.ipqcId !=null" class="box-card">
<el-divider v-if="form.ipqcId != null" content-position="center">检测项</el-divider>
<el-card shadow="always" v-if="form.ipqcId != null" class="box-card">
<Ipqcline ref="lineRef" :ipqcId="form.ipqcId" :optType="optType"></Ipqcline>
</el-card>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>
<el-button type="success" @click="handleFinish" v-if="form.status =='PREPARE' && optType !='view' && form.ipqcId !=null">完成</el-button>
<el-button type="primary" @click="cancel" v-if="optType == 'view' || form.status != 'PREPARE'">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="form.status == 'PREPARE' && optType != 'view'">保
存</el-button>
<el-button type="success" @click="handleFinish"
v-if="form.status == 'PREPARE' && optType != 'view' && form.ipqcId != null">完成</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
......@@ -383,17 +310,18 @@
<script>
import { listIpqc, getIpqc, delIpqc, addIpqc, updateIpqc } from "@/api/mes/qc/ipqc";
import {genCode} from "@/api/system/autocode/rule"
import { genCode } from "@/api/system/autocode/rule"
import WorkorderSelect from "@/components/workorderSelect/single.vue"
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
import Ipqcline from "./line.vue"
import dayjs from 'dayjs';
export default {
name: "Ipqc",
components: {WorkorderSelect,WorkstationSelect,Ipqcline},
dicts: ['mes_ipqc_type','mes_qc_result','mes_order_status'],
components: { WorkorderSelect, WorkstationSelect, Ipqcline },
dicts: ['mes_ipqc_type', 'mes_qc_result', 'mes_order_status'],
data() {
return {
autoGenFlag:false,
autoGenFlag: false,
optType: undefined,
// 遮罩层
loading: true,
......@@ -405,6 +333,8 @@ export default {
multiple: true,
// 显示搜索条件
showSearch: true,
daterangePurchaseDate: [],
// 总条数
total: 0,
// 过程检验单表格数据
......@@ -487,12 +417,22 @@ export default {
};
},
created() {
this.setDate();
this.getList();
},
methods: {
//筛选日期设置默认值
setDate() {
this.daterangePurchaseDate = [dayjs().format('YYYY-MM-DD'), dayjs().add(7, 'day').format('YYYY-MM-DD')]
},
/** 查询过程检验单列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangePurchaseDate && '' != this.daterangePurchaseDate) {
this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0];
this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1];
}
listIpqc(this.queryParams).then(response => {
this.ipqcList = response.rows;
this.total = response.total;
......@@ -562,13 +502,14 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.daterangePurchaseDate = [];
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.ipqcId)
this.single = selection.length!==1
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
......@@ -590,7 +531,7 @@ export default {
});
},
//查看单据
handleView(row){
handleView(row) {
this.reset();
const ipqcIds = row.ipqcId
getIpqc(ipqcIds).then(response => {
......@@ -638,16 +579,16 @@ export default {
});
},
//点击完成
handleFinish(){
handleFinish() {
let that = this;
if(this.form.checkResult == null){
if (this.form.checkResult == null) {
this.$modal.msgError("请选择检测结果！");
return;
}
this.$refs["form"].validate(valid => {
if (valid) {
this.$modal.confirm('是否完成检验单编制？【完成后将不能更改】').then(function(){
this.$modal.confirm('是否完成检验单编制？【完成后将不能更改】').then(function () {
that.form.status = 'CONFIRMED';
that.submitForm();
that.open = false;
......@@ -659,12 +600,12 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ipqcIds = row.ipqcId || this.ids;
this.$modal.confirm('是否确认删除过程检验单编号为"' + ipqcIds + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除过程检验单编号为"' + ipqcIds + '"的数据项？').then(function () {
return delIpqc(ipqcIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}).catch(() => { });
},
/** 导出按钮操作 */
handleExport() {
......@@ -673,11 +614,11 @@ export default {
}, `ipqc_${new Date().getTime()}.xlsx`)
},
//选择生产工单
handleWorkorderSelect(){
handleWorkorderSelect() {
this.$refs.woSelect.showFlag = true;
},
onWorkorderSelected(row){
if(row != undefined && row != null){
onWorkorderSelected(row) {
if (row != undefined && row != null) {
debugger;
this.form.workorderId = row.workorderId;
this.form.workorderCode = row.workorderCode;
......@@ -690,23 +631,23 @@ export default {
}
},
handleWorkstationSelect(){
handleWorkstationSelect() {
this.$refs.wsSelect.showFlag = true;
},
onWorkstationSelected(row){
if(row != undefined && row != null){
onWorkstationSelected(row) {
if (row != undefined && row != null) {
this.form.workstationId = row.workstationId;
this.form.workstationCode = row.workstationCode;
this.form.workstationName = row.workstationName;
}
},
//自动生成编码
handleAutoGenChange(autoGenFlag){
if(autoGenFlag){
genCode('IPQC_CODE').then(response =>{
handleAutoGenChange(autoGenFlag) {
if (autoGenFlag) {
genCode('IPQC_CODE').then(response => {
this.form.ipqcCode = response;
});
}else{
} else {
this.form.ipqcCode = null;
}
}
......
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