质量问题修改

yangwl
zhaoxiaolin 11 months ago
parent f32774ca91
commit f441ae9a81

@ -72,4 +72,12 @@ export function getProjectInfoList(query) {
method: 'get', method: 'get',
params: query params: query
}); });
} }
//方案下拉
export function getProjectOptions(query) {
return request({
url: '/quality/checkTypeProject/getProjectOptions',
method: 'get',
params: query
});
}

@ -24,4 +24,20 @@ export function getWorkcenterList() {
url: '/quality/staticTable/getWorkcenterList', url: '/quality/staticTable/getWorkcenterList',
method: 'get' method: 'get'
}); });
} }
export function getXJCheckTableList(query) {
return request({
url: '/quality/staticTable/getXJCheckTableList',
method: 'get',
params: query
});
}
export function getXJCheckTableDetail(query) {
return request({
url: '/quality/staticTable/getXJCheckTableDetail',
method: 'get',
params: query
});
}

@ -92,7 +92,7 @@
@click="handleDelete" @click="handleDelete"
v-hasPermi="['mes:reportWork:remove']" v-hasPermi="['mes:reportWork:remove']"
>删除</el-button> >删除</el-button>
</el-col>--> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@ -103,7 +103,7 @@
@click="handleReportHz" @click="handleReportHz"
v-hasPermi="['mes:reportWork:report']" v-hasPermi="['mes:reportWork:report']"
>报工详情</el-button> >报工详情</el-button>
</el-col> </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"

@ -18,6 +18,18 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="检测方案名称">
<el-select v-model="queryParams.projectType" filterable placeholder="请选择检测方案">
<el-option
v-for="item in projectTypeOptions"
:key="item.projectTypeCode"
:label="item.projectTypeName"
:value="item.projectTypeCode">
</el-option>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button> <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 icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
@ -76,7 +88,7 @@
</template> </template>
<script> <script>
import { getProjectInfoList } from "@/api/quality/checkTypeProject"; import { getProjectInfoList,getProjectOptions } from "@/api/quality/checkTypeProject";
export default { export default {
name: "itemSelectUser", name: "itemSelectUser",
dicts: ["qc_rule_prop"], dicts: ["qc_rule_prop"],
@ -107,25 +119,32 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
groupId:null, groupId:null,
materialCode:null, materialCode:null,
typeCode:null typeCode:null
} },
projectTypeOptions:[]
}; };
}, },
created() { created() {
//this.getList(); this.getProjectList();
}, },
methods: { methods: {
//
getProjectList() {
getProjectOptions(this.queryParams).then(response => {
this.projectTypeOptions = response;
});
},
init(groupId,materialCode,typeId){ init(groupId,materialCode,typeId){
this.queryParams.groupId = groupId; this.queryParams.groupId = groupId;
this.queryParams.materialCode = materialCode; this.queryParams.materialCode = materialCode;
this.queryParams.typeCode = typeId; this.queryParams.typeCode = typeId;
this.getList(); this.getList();
}, },
/** 查询表格列表*/ /** 查询表格列表*/
getList() { getList() {
this.loading = true; this.loading = true;

@ -1,41 +1,33 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px" class="edit-el-form"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px" class="edit-el-form">
<el-form-item label="订单编码" prop="workorderCodeSap"> <el-form-item label="订单编码" prop="orderNo">
<el-input <el-input
v-model="queryParams.workorderCodeSap" v-model="queryParams.orderNo"
placeholder="请输入订单编码" placeholder="请输入订单编码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="产品编号" prop="productCode"> <el-form-item label="产品编号" prop="materialCode">
<el-input <el-input
v-model="queryParams.productCode" v-model="queryParams.materialCode"
placeholder="请输入产品编号" placeholder="请输入产品编号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="产品名称" prop="productName"> <el-form-item label="批次编码" prop="incomeBatchNo">
<el-input <el-input
v-model="queryParams.productName" v-model="queryParams.incomeBatchNo"
placeholder="请输入产品名称" placeholder="请输入批次编码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="规格型号" prop="productSpc"> <el-form-item label="工单生产日期" prop="incomeTime">
<el-input
v-model="queryParams.productSpc"
placeholder="请输入规格型号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="工单生产日期" prop="productDate">
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.productDate" v-model="queryParams.incomeTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择工单生产日期" placeholder="请选择工单生产日期"
@ -62,38 +54,6 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes:prepare:add']"
>新增</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:prepare: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:prepare:remove']"
>删除</el-button>
</el-col> -->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
@ -104,45 +64,26 @@
v-hasPermi="['mes:prepare:export']" v-hasPermi="['mes:prepare:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
:disabled="single"
icon="el-icon-download"
size="mini"
@click="showPrint"
v-hasPermi="['mes:prepare:export']"
>打印预览</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="prepareList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="prepareList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column prop="date" label="生产日期" width="100" align="center"/> <el-table-column prop="orderNo" label="订单编码" width="130" align="center"/>
<el-table-column prop="date" label="产品名称" width="150" align="center"/> <el-table-column label="订单批次" align="center" prop="incomeBatchNo" width="180">
<el-table-column prop="date" label="产品编码" width="150" align="center"/> <template slot-scope="scope">
<el-table-column prop="date" label="订单编码" width="150" align="center"/> <el-button
<el-table-column prop="date" label="订单批次" width="150" align="center"/> type="text"
<el-table-column label="上午" align="center" > @click="handleDetail(scope.row)"
<el-table-column prop="name" label="8:00-9:00" width="120" align="center"/> >{{scope.row.incomeBatchNo}}</el-button>
<el-table-column prop="name" label="9:00-10:00" width="120" align="center"/> </template>
<el-table-column prop="name" label="10:00-11:00" width="120" align="center"/> </el-table-column>
<el-table-column prop="name" label="11:00-12:00" width="120" align="center"/> <el-table-column prop="incomeTime" label="生产日期" width="100" align="center"/>
</el-table-column> <el-table-column prop="materialName" label="产品名称"align="center"/>
<el-table-column label="下午" align="center" > <el-table-column prop="materialCode" label="产品编码" width="150" align="center"
<el-table-column prop="name" label="13:30-14:30" width="120" align="center"/> :formatter="productCodeFormate"/>
<el-table-column prop="name" label="14:30-15:30" width="120" align="center"/> <el-table-column prop="quality" label="数量" width="80" align="center"/>
<el-table-column prop="name" label="15:30-16:30" width="120" align="center"/> <el-table-column prop="unit" label="单位" width="80" align="center"/>
<el-table-column prop="name" label="16:30-17:30" width="120" align="center"/>
</el-table-column>
<el-table-column label="加班" align="center" >
<el-table-column prop="name" label="12:30-13:30" width="120" align="center"/>
<el-table-column prop="name" label="18:00-19:00" width="120" align="center"/>
<el-table-column prop="name" label="19:00-20:00" width="120" align="center"/>
<el-table-column prop="name" label="20:00-21:00" width="120" align="center"/>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
@ -153,311 +94,162 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改备料单对话框 --> <!-- 报工详情 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="titleReport" :visible.sync="openReport" width="1400px">
<el-form ref="form" :model="form" :rules="rules" label-width="110px"> <el-table v-loading="loading" :data="pOrderTableList" ref="myPOrderTable"
<el-form-item label="工单编码" prop="workorderCode"> >
<el-input v-model="form.workorderCode" placeholder="请输入工单编码" /> <el-table-column label="id" align="center" prop="recordId" v-if="false"/>
</el-form-item> <el-table-column label="序号" type="index" align="center" :index="indexMethod"/>
<el-form-item label="工单名称" prop="workorderName"> <el-table-column label="项目名称" width="160" align="left" prop="ruleName" :show-overflow-tooltip="true" />
<el-input v-model="form.workorderName" placeholder="请输入工单名称" /> <el-table-column label="上午" align="center" >
</el-form-item> <el-table-column prop="column080090" label="8:00-9:00" width="80" align="center"/>
<el-form-item label="父工单" prop="parentOrder"> <el-table-column prop="column090100" label="9:00-10:00" width="90" align="center"/>
<el-input v-model="form.parentOrder" placeholder="请输入父工单" /> <el-table-column prop="column100110" label="10:00-11:00" width="100" align="center"/>
</el-form-item> <el-table-column prop="column110120" label="11:00-12:00" width="100" align="center"/>
<el-form-item label="订单编码" prop="orderCode"> </el-table-column>
<el-input v-model="form.orderCode" placeholder="请输入订单编码" /> <el-table-column label="下午" align="center" >
</el-form-item> <el-table-column prop="column123133" label="13:30-14:30" width="100" align="center"/>
<el-form-item label="产品编号" prop="productCode"> <el-table-column prop="column133143" label="14:30-15:30" width="100" align="center"/>
<el-input v-model="form.productCode" placeholder="请输入产品编号" /> <el-table-column prop="column143153" label="15:30-16:30" width="100" align="center"/>
</el-form-item> <el-table-column prop="column153163" label="16:30-17:30" width="100" align="center"/>
<el-form-item label="产品名称" prop="productName"> </el-table-column>
<el-input v-model="form.productName" placeholder="请输入产品名称" /> <el-table-column label="加班" align="center" >
</el-form-item> <el-table-column prop="column163173" label="12:30-13:30" width="100" align="center"/>
<el-form-item label="规格型号" prop="productSpc"> <el-table-column prop="column180190" label="18:00-19:00" width="100" align="center"/>
<el-input v-model="form.productSpc" placeholder="请输入规格型号" /> <el-table-column prop="column190200" label="19:00-20:00" width="100" align="center"/>
</el-form-item> <el-table-column prop="column200210" label="20:00-21:00" width="100" align="center"/>
<el-form-item label="配料计划明细id" prop="wetDetailPlanId"> </el-table-column>
<el-input v-model="form.wetDetailPlanId" placeholder="请输入配料计划明细id" /> </el-table>
</el-form-item>
<el-form-item label="工单生产日期" prop="productDate" >
<el-date-picker clearable
v-model="form.productDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择工单生产日期"
style="width:350px">
</el-date-picker>
</el-form-item>
<el-form-item label="班次" prop="shiftId">
<el-input v-model="form.shiftId" placeholder="请输入班次" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="工厂编码" prop="factoryCode">
<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button @click="cancel"></el-button>
<el-button @click="cancel"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 打印预览弹出层 -->
<el-dialog
title="备料信息"
:visible.sync="printDialogVisible"
width="1000px"
>
<div id="printFrom" class="my-print-box">
<el-form :ref="formRef" :model="form" :rules="validateRules">
<!-- 表头-工单信息 -->
<el-row class="my-print-head">
<el-col :offset="10" :span="5">生产订单备料单(订单物料)</el-col>
</el-row>
<!-- 导航栏 -->
<el-row class="my-print-nav">
<el-col :span="4">工厂:{{printData.factory}}</el-col>
<el-col :span="4">工作中心:{{printData.workCenter}}</el-col>
<el-col :span="4">生产日期:{{printData.productDate}}</el-col>
<el-col :span="4">打印日期:{{printData.printDate}}</el-col>
<el-col :span="4">页次: 1/ 1</el-col>
</el-row>
<!-- 主数据 -->
<el-table
v-if="refreshNewWorkerTable"
v-loading="newWorkerLoading"
class="my-print-table"
:data="printData.workTable"
border
style="width: 100%">
<el-table-column
type="index"
label="序号"
width="50">
</el-table-column>
<el-table-column
prop="materialCode"
label="料号"
width="170">
</el-table-column>
<el-table-column
prop="materialName"
label="物料描述"
width="240">
</el-table-column>
<el-table-column
prop="unit"
width="50"
label="单位">
</el-table-column>
<el-table-column
prop="workorderCode"
width="120"
label="生产订单">
</el-table-column>
<el-table-column
prop="quantity"
label="请领数量">
</el-table-column>
<el-table-column
prop="fundQuanlity"
label="欠领数量">
</el-table-column>
<el-table-column
prop="routeCode"
width="80"
label="实发数量">
</el-table-column>
<el-table-column
prop="recoil"
label="反冲物料">
</el-table-column>
</el-table>
<br/>
<!-- 底部 -->
<el-row class="my-print-foot">
<el-col :offset="1" :span="3">发料人:</el-col>
<el-col :offset="2" :span="3">收料人:</el-col>
<el-col :offset="2" :span="3">白色:车间联</el-col>
<el-col :offset="1" :span="3">蓝色:仓库联</el-col>
<el-col :offset="1" :span="3">红色:财务联</el-col>
</el-row>
<el-row class="my-print-foot">
<el-col :offset="1" :span="3">SAP-No:{{printData.SAPNo}}</el-col>
<el-col :offset="1" :span="3">Z-PM-F-030-A.2</el-col>
</el-row>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="handlePrint(printData)"> </el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listPrepare, getPrepare, delPrepare, addPrepare, updatePrepare } from "@/api/mes/prepare"; import { getXJCheckTableList,getXJCheckTableDetail } from "@/api/quality/qcTable";
import {printPrepareByCode} from "@/api/mes/prepareDetail";
import moment from "moment/moment"; import moment from "moment/moment";
export default { export default {
name: "Prepare", name: "Prepare",
// components: {Detail}, // components: {Detail},
data() { data() {
return { return {
newWorkerLoading: false, newWorkerLoading: false,
refreshNewWorkerTable:true, refreshNewWorkerTable:true,
// //
selectPrepare:[], selectPrepare:[],
// //
formRef: 'form', formRef: 'form',
validateRules: [], validateRules: [],
printData: { printData: {
printable: 'printFrom', printable: 'printFrom',
ignore: ['no-print'], ignore: ['no-print'],
workCenter: "暂无数据", workCenter: "暂无数据",
SAPNo: null, SAPNo: null,
manufacture: null, manufacture: null,
auditor: null, auditor: null,
printDate: null, printDate: null,
factory: null, factory: null,
productDate: null, incomeTime: null,
workTable: [], workTable: [],
},
printDialogVisible: false,
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
prepareList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
workorderCode: null,
workorderName: null,
parentOrder: null,
orderId: null,
orderCode: null,
productId: null,
productCode: null,
prodType: null,
productName: null,
productSpc: null,
wetDetailPlanId: null,
productDate: null,
shiftId: null,
ancestors: null,
status: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
factoryCode: null
}, },
printDialogVisible: false,
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
prepareList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
checkNo: null,
workorderName: null,
parentOrder: null,
orderId: null,
orderCode: null,
productId: null,
productCode: null,
prodType: null,
productName: null,
productSpc: null,
wetDetailPlanId: null,
incomeTime: null,
incomeBatchNo:null,
status: null,
factoryCode: null
},
options: [{ options: [{
status: "L0", status: "L0",
label: '待确认' label: '待确认'
}, { }, {
status: "L1", status: "L1",
label: '已确认' label: '已确认'
}], }],
// //
form: {}, form: {},
// //
rules: { rules: {
workorderCode: [ checkNo: [
{ required: true, message: "工单编码不能为空", trigger: "blur" } { required: true, message: "工单编码不能为空", trigger: "blur" }
], ],
parentOrder: [ parentOrder: [
{ required: true, message: "父工单不能为空", trigger: "blur" } { required: true, message: "父工单不能为空", trigger: "blur" }
], ],
orderId: [ orderId: [
{ required: true, message: "订单id不能为空", trigger: "blur" } { required: true, message: "订单id不能为空", trigger: "blur" }
], ],
productCode: [ productCode: [
{ required: true, message: "产品编号不能为空", trigger: "blur" } { required: true, message: "产品编号不能为空", trigger: "blur" }
], ],
productName: [ productName: [
{ required: true, message: "产品名称不能为空", trigger: "blur" } { required: true, message: "产品名称不能为空", trigger: "blur" }
], ],
} },
openReport : false,
titleReport : "工单报工详情"
}; };
}, },
created() { created() {
this.getDate();
this.getList(); this.getList();
}, },
methods: { methods: {
// /**获取默认查询时间段**/
handlePrint(params) { getDate() {
printJS({ let start = this.Fungetdate (0)
printable: params.printable, // 'printFrom', // id this.queryParams.incomeTime =start
type: params.type || 'html', },
maxWidth: 1500, // Fungetdate (num) {
font_size: "",// var dd = new Date();
header: params.header, // '', dd.setDate(dd.getDate() + num);
targetStyles: ['*'], var y = dd.getFullYear();
style: '@page {margin:0 10mm};', // - var m = dd.getMonth() + 1;//
ignoreElements: params.ignore || [], // ['no-print'] var d = dd.getDate();
properties: params.properties || null return y + "-" + m +"-"+d;
}) },
},
// indexMethod(index){
showPrint() { return index+1 ;
// },
this.printData.workCenter = "暂无数据";
this.printData.printDate = null;
this.printData.workTable = [];
this.printData.factory = null;
this.printData.productDate = null;
//
this.printDialogVisible = true;
this.newWorkerLoading = true // true
this.refreshNewWorkerTable = false // refreshProTablefalse
printPrepareByCode(this.selectPrepare[0].workorderCode).then(response => {
console.log(response.data)
this.printData.factory = response.data.mesPrepareDetailList[0].factoryCode
this.printData.productDate = response.data.mesPrepareDetailList[0].productDate
this.printData.printDate = moment(new Date()).format('YYYY-MM-DD')
this.printData.workTable = response.data.mesPrepareDetailList
this.refreshNewWorkerTable = true // refreshProTabletrue
this.newWorkerLoading = false // false
})
},
//
// handlePrepareDetail(){
// this.$refs.detail.showFlag = true;
// },
//
indexMethod(index){
return index+1 ;
},
/** 查询备料单列表 */ /** 查询备料单列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listPrepare(this.queryParams).then(response => { getXJCheckTableList(this.queryParams).then(response => {
this.prepareList = response.rows; this.prepareList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -466,13 +258,14 @@ export default {
// //
cancel() { cancel() {
this.open = false; this.open = false;
this.openReport = false;
this.reset(); this.reset();
}, },
// //
reset() { reset() {
this.form = { this.form = {
prepareId: null, prepareId: null,
workorderCode: null, checkNo: null,
workorderName: null, workorderName: null,
parentOrder: null, parentOrder: null,
orderId: null, orderId: null,
@ -483,15 +276,8 @@ export default {
productName: null, productName: null,
productSpc: null, productSpc: null,
wetDetailPlanId: null, wetDetailPlanId: null,
productDate: null, incomeTime: null,
shiftId: null, incomeBatchNo:null,
ancestors: null,
status: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
@ -553,15 +339,22 @@ export default {
} }
}); });
}, },
/** 删除按钮操作 */ //
handleDelete(row) { productCodeFormate(row, column, cellValue){
const prepareIds = row.prepareId || this.ids; return cellValue.slice(7,18); //
this.$modal.confirm('是否确认删除备料单编号为"' + prepareIds + '"的数据项?').then(function() { },
return delPrepare(prepareIds); /** 报工详情按钮操作 */
}).then(() => { handleDetail(row) {
this.getList(); this.reset();
this.$modal.msgSuccess("删除成功"); let sr = row;
}).catch(() => {});
this.queryParams.incomeBatchNo = sr.incomeBatchNo;
getXJCheckTableDetail(this.queryParams).then(response => {
this.pOrderTableList = response;
this.openReport = true;
this.titleReport = "过程巡检详情";
});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {

Loading…
Cancel
Save