Merge remote-tracking branch 'origin/master'

master
陈恒杰 1 year ago
commit 2c26c687a4

@ -162,3 +162,11 @@ export function getWorkOrder(query) {
params: query
});
}
// 查询入库订单列表
export function getProductWorkOrder(query) {
return request({
url: '/quality/qcIncome/getProductWorkOrder',
method: 'get',
params: query
});
}

@ -0,0 +1,9 @@
import request from '@/utils/request'
export function listCheck(query) {
return request({
url: '/quality/qcProCheck/list',
method: 'get',
params: query
});
}

@ -643,7 +643,8 @@ export default {
attr3: null,
attr4: null,
workorderCode: null,
parentOrder:null
parentOrder:null,
uploadStatus:"0"
},
//
form: {
@ -940,15 +941,16 @@ export default {
},
/** 报工详情按钮操作 */
handleReportHz(row) {
this.reset();
let sr = this.selectRow[0];
let sr = row;
if(sr.uploadStatus =='sap报工成功'){
this.optType = 'view'
}else{
this.optType = ''
}
this.queryParams.workorderCode = sr.workorderCode;
//
this.queryParams.parentOrder = '0';
@ -964,7 +966,7 @@ export default {
this.sOrderTableList = response;
this.openReport = true;
this.titleReport = "工单报工详情";
this.queryParams.workorderCode = '';
});
},
handleEdit(index, row) {
@ -993,7 +995,7 @@ export default {
/** 报工损耗按钮操作 */
handleConsumeHz(row) {
this.reset();
let sr = this.selectRow[0];
let sr = row;
if(sr.uploadStatus =='sap报工成功'){
this.optType = 'view'
@ -1016,6 +1018,8 @@ export default {
this.sConsumeTableList = response;
this.openConsume = true;
this.titleConsume = "工单报工物料损耗详情";
this.queryParams.workorderCode = '';
});
},
//

@ -130,7 +130,7 @@
>
<el-table-column width="150" label="订单号" align="center" prop="orderCode"/>
<el-table-column width="180" label="物料号" align="center" prop="prodCode"
<el-table-column width="130" label="物料号" align="center" prop="prodCode"
:formatter="productCodeFormate"
/>
<el-table-column width="200" label="物料名称" align="center" prop="prodDesc"/>

@ -121,8 +121,8 @@
>
<el-table-column width="100" label="计划工厂编码" prop="factoryCode"/>
<el-table-column width="" label="订单类型" align="center" prop="orderType" v-if="false"/>
<el-table-column width="200" label="订单号" align="center" prop="orderCode"/>
<el-table-column width="180" label="物料号" align="center" prop="prodCode"/>
<el-table-column width="130" label="订单号" align="center" prop="orderCode"/>
<el-table-column width="130" label="物料号" align="center" prop="prodCode"/>
<el-table-column width="200" label="物料名称" align="center" prop="prodDesc"/>
<el-table-column width="90" label="订单数量" align="center" prop="quantity"/>
<el-table-column width="90" label="已拆分数量" align="center" prop="quantitySplit"/>

@ -32,10 +32,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品名称" prop="productName">
<el-form-item label="产品编码" prop="productCode">
<el-input
v-model="queryParams.productName"
placeholder="请输入产品名称"
v-model="queryParams.productCode"
placeholder="请输入子单产品编码"
clearable
@keyup.enter.native="handleQuery"
/>
@ -181,18 +181,18 @@
</el-table-column>
<el-table-column label="工单ID" align="center" prop="workorderId" v-if="false"/>
<el-table-column width="150" label="子工单编号" align="center" prop="workorderCode"/>
<el-table-column width="130" label="母订单新编码" align="center" prop="pworkorderCodeSap"/>
<el-table-column width="130" label="母产品编码" align="center" prop="pproductCode" :formatter="productCodeFormate"/>
<el-table-column width="300" label="母产品名称" align="center" prop="pproductName" :show-overflow-tooltip="true"/>
<el-table-column width="130" label="子工单编号" align="center" prop="workorderCode"/>
<el-table-column label="订单id" align="center" prop="orderId" v-if="false"/>
<el-table-column width="150" label="子订单旧编码" align="center" prop="orderCode"/>
<el-table-column width="150" label="子订单新编码" align="center" prop="workorderCodeSap"/>
<el-table-column width="130" label="子订单旧编码" align="center" prop="orderCode"/>
<el-table-column width="130" label="子订单新编码" align="center" prop="workorderCodeSap"/>
<el-table-column label="产品ID" align="center" prop="productId" v-if="false"/>
<el-table-column width="180" label="子产品编码" align="center" prop="productCode"
<el-table-column width="130" label="子产品编码" align="center" prop="productCode"
:formatter="productCodeFormate"
/>
<el-table-column width="300" label="子产品名称" align="center" prop="productName"/>
<el-table-column width="150" label="母订单新编码" align="center" prop="pworkorderCodeSap"/>
<el-table-column width="300" label="母产品名称" align="center" prop="pproductName"/>
<el-table-column width="300" label="子产品名称" align="center" prop="productName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="productSpc" v-if="false"/>
<el-table-column width="50" label="单位" align="center" prop="unit"/>
<!--
@ -227,7 +227,7 @@
</template>
</el-table-column>
<!-- <el-table-column label="备注" align="center" prop="remark" />-->
<el-table-column label="产品类型" align="center" prop="prodType">
<el-table-column label="产品类型" align="center" prop="prodType" v-if="false">
<template slot-scope="scope">
<dict-tag :options="dict.type.product_type" :value="scope.row.prodType"/>
</template>

@ -83,7 +83,7 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
<el-table-column label="订单号" align="center" prop="orderNo" width="150"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
<el-table-column label="收货数量" align="center" prop="quality" />
<el-table-column label="单位" align="center" prop="unit" />
@ -119,7 +119,7 @@
@pagination="getList"
/>
<!-- 添加或修改来料检验对话框 -->
<!-- 打印来料检验对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
<el-row>
<el-col :span="20">
@ -143,18 +143,18 @@
</el-col>
<el-col :span="8">
<el-form-item label="来料类别" prop="factoryCode">
<el-input v-model="form.factoryCode" placeholder="请输入检验任务编号" disabled/>
<el-input v-model="form.factoryCode" placeholder="请输入来料类别" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="来料批号" prop="incomeBatchNo">
<el-form-item label="生产批号" prop="incomeBatchNo">
<el-input v-model="form.incomeBatchNo" placeholder="请输入来料批号" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="物料编码" prop="materialCode">
<el-form-item label="物料编码" prop="materialCode">
<el-input v-model="form.materialCode" placeholder="请选择物料编码" disabled />
</el-form-item>
</el-col>
@ -171,14 +171,14 @@
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="供应商名称" prop="supplierName">
<el-form-item label="供应单位" prop="supplierName">
<el-input v-model="form.supplierName" placeholder="请选择供应商名称" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="料数量" prop="quality">
<el-form-item label="料数量" prop="quality">
<el-input type="number" v-model="form.quality" placeholder="请输入物料数量" disabled/>
</el-form-item>
</el-col>
@ -201,6 +201,25 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="抽检数量" prop="sampleQuality">
<el-input v-model="form.sampleQuality" placeholder="请选择抽样数量" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="报告编号" prop="checkNo">
<el-input v-model="form.checkNo" placeholder="请选择报告编号" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="报检日期" prop="createTime">
<el-input v-model="form.createTime" placeholder="请输入报检日期" disabled>
{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="检验日期" prop="checkTime">
@ -209,11 +228,11 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="检验编号" prop="checkNo">
<el-input v-model="form.checkNo" placeholder="请输入检验编号" disabled/>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<el-form-item label="产品提报人" prop="checkManName">
<el-input v-model="form.checkManName" placeholder="请输入OEM产品提报人" disabled/>
@ -225,14 +244,15 @@
<!-- 检验项目明细 -->
<el-table v-loading="loading" :data="checkProjectList" >
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="检验规则编号" align="center" type="index" width="100"/>
<el-table-column label="检验规则名称" align="center" prop="ruleName" />
<el-table-column label="标准" align="center" prop="checkStandard" />
<el-table-column label="号" align="center" type="index" width="100"/>
<el-table-column label="检验项目" align="center" prop="ruleName" />
<el-table-column label="标准要求" align="center" prop="checkStandard" width="200"/>
<el-table-column label="上差值" align="center" prop="upperDiff" />
<el-table-column label="下差值" align="center" prop="downDiff" />
<el-table-column label="抽检数量" align="center" prop="sampleNum" />
<el-table-column label="单位" align="center" prop="unitCode" />
<el-table-column label="检验值" align="center" prop="actualValue" />
<el-table-column label="结果" align="center" prop="status" >
<el-table-column label="实测结果" align="center" prop="actualValue" width="200"/>
<el-table-column label="判定" align="center" prop="status" >
<template slot-scope="scope">
<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
</template>

@ -83,7 +83,7 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
<el-table-column label="订单号" align="center" prop="orderNo" width="150"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
<el-table-column label="收货数量" align="center" prop="quality" />
<el-table-column label="单位" align="center" prop="unit" />

@ -83,7 +83,7 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
<el-table-column label="订单号" align="center" prop="orderNo" width="150"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
<el-table-column label="收货数量" align="center" prop="quality" />
<el-table-column label="单位" align="center" prop="unit" />
@ -119,7 +119,7 @@
@pagination="getList"
/>
<!-- 添加或修改来料检验对话框 -->
<!-- 打印成品检验对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
<el-row>
<el-col :span="20">
@ -147,19 +147,19 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="来料批号" prop="incomeBatchNo">
<el-input v-model="form.incomeBatchNo" placeholder="请输入来料批号" disabled/>
<el-form-item label="生产批号" prop="incomeBatchNo">
<el-input v-model="form.incomeBatchNo" placeholder="请输入生产批号" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="物料编码" prop="materialCode">
<el-form-item label="产品编码" prop="materialCode">
<el-input v-model="form.materialCode" placeholder="请选择物料编码" disabled />
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="物料名称" prop="materialName">
<el-form-item label="产品名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请选择物料名称" disabled />
</el-form-item>
</el-col>
@ -178,7 +178,7 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="物料数量" prop="quality">
<el-form-item label="生产数量" prop="quality">
<el-input type="number" v-model="form.quality" placeholder="请输入物料数量" disabled/>
</el-form-item>
</el-col>
@ -203,10 +203,13 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="检验日期" prop="checkTime">
<el-input v-model="form.checkTime" placeholder="请输入检验日期" disabled>
{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
</el-input>
<el-form-item label="抽样地点" prop="checkLoc">
<el-input v-model="form.checkNo" placeholder="请输入检验编号" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检验依据" prop="checkNo">
<el-input v-model="form.checkManName" placeholder="请输入检验依据" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
@ -214,6 +217,22 @@
<el-input v-model="form.checkNo" placeholder="请输入检验编号" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="报检日期" prop="createTime">
<el-input v-model="form.checkTime" placeholder="请输入报检日期" disabled>
{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检验日期" prop="checkTime">
<el-input v-model="form.checkTime" placeholder="请输入检验日期" disabled>
{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="产品提报人" prop="checkManName">
<el-input v-model="form.checkManName" placeholder="请输入OEM产品提报人" disabled/>
@ -225,14 +244,15 @@
<!-- 检验项目明细 -->
<el-table v-loading="loading" :data="checkProjectList" >
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="检验规则编号" align="center" type="index" width="100"/>
<el-table-column label="检验规则名称" align="center" prop="ruleName" />
<el-table-column label="标准" align="center" prop="checkStandard" />
<el-table-column label="号" align="center" type="index" width="100"/>
<el-table-column label="检验项目" align="center" prop="ruleName" />
<el-table-column label="标准要求" align="center" prop="checkStandard" width="200"/>
<el-table-column label="上差值" align="center" prop="upperDiff" />
<el-table-column label="下差值" align="center" prop="downDiff" />
<el-table-column label="抽检数量" align="center" prop="sampleNum" />
<el-table-column label="单位" align="center" prop="unitCode" />
<el-table-column label="检验值" align="center" prop="actualValue" />
<el-table-column label="结果" align="center" prop="status" >
<el-table-column label="实测结果" align="center" prop="actualValue" width="200"/>
<el-table-column label="判定" align="center" prop="status" >
<template slot-scope="scope">
<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
</template>

@ -0,0 +1,188 @@
<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="workorderCode">
<el-input
v-model="queryParams.workorderCode"
placeholder="请输入工单编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品编码" prop="productCode">
<el-input
v-model="queryParams.productCode"
placeholder="请输入产品编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备编码" prop="machineCode">
<el-input
v-model="queryParams.machineCode"
placeholder="请输入设备编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label-width="100px" label="循环范围开始" prop="planLoopStart">
<el-date-picker
v-model="queryParams.createTimeArray"
type="datetimerange"
:picker-options="pickerOptions"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd HH:mm:ss"
align="right">
</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="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['quality:qcProCheck:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="checkList" border :span-method="objectSpanMethod">
<el-table-column label="烘房编码" align="center" prop="machineCode"/>
<el-table-column label="烘房名称" align="center" prop="machineName"/>
<el-table-column label="合格数量" align="center" prop="acceptanceNumber"/>
<el-table-column label="不合格数量" align="center" prop="unqualifiedNumber"/>
<el-table-column label="合格率" align="center" prop="passRate"/>
</el-table>
</div>
</template>
<script>
import { listCheck} from "@/api/quality/qcProCheck";
export default {
name: "qcProCheck",
data() {
return {
//
pickerOptions: {
shortcuts: [{
text: '最近一周',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近一个月',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近三个月',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit('pick', [start, end]);
}
}]
},
rowNum : 1,
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
checkList: [],
//
title: "",
//
open: false,
//
queryParams: {
createTimeArray: [],
workorderCode:null,
productCode:null,
machineCode:null,
createTimeStart:null,
createTimeEnd:null,
},
//
form: {},
};
},
created() {
this.getList();
},
methods: {
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
},
/** 查询【请填写功能名称】列表 */
getList() {
this.loading = true;
listCheck(this.queryParams).then(response => {
this.checkList = response;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
createTimeArray: [],
workorderCode:null,
productCode:null,
machineCode:null,
createTimeStart:null,
createTimeEnd:null,
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.queryParams.createTimeArray = [];
this.handleQuery();
},
/** 导出按钮操作 */
handleExport() {
this.download('quality/qcProCheck/export', {
...this.queryParams
}, `qcProCheck_${new Date().getTime()}.xlsx`)
}
}
};
</script>

@ -397,7 +397,7 @@
import { listWarehousing, getWarehousing, delWarehousing, addWarehousing, updateWarehousing } from "@/api/quality/warehousing";
import { getBatchList} from "@/api/quality/qcProduce";
import { getCheckTypes } from "@/api/quality/qcProduce";
import ItemSelectWorkOrder from "./selectWorkOrder.vue";
import ItemSelectWorkOrder from "./selectProductWorkOrder.vue";
import ItemSelectMaterial from "../qcIncome/selectMaterial.vue";
import ItemSelectLoc from "./selectLoc.vue";
import ItemSelectUser from "../qcIncome/selectUser.vue";

@ -56,7 +56,7 @@
</template>
<script>
import { getWorkOrder } from "@/api/quality/income";
import { getProductWorkOrder } from "@/api/quality/income";
export default {
name: "itemSelectWorkOrder",
data() {
@ -99,7 +99,7 @@ export default {
/** 查询表格列表*/
getList() {
this.loading = true;
getWorkOrder(this.queryParams).then(response => {
getProductWorkOrder(this.queryParams).then(response => {
this.itemList = response.rows;
this.total = response.total;
this.loading = false;
Loading…
Cancel
Save