Yangwl
/
LanJu_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

质量来料检验测试联调

Browse Source
master
zhaoxiaolin 12 months ago
parent dcf77c4de4
commit 7c7b208117
4 changed files with 99 additions and 86 deletions
Show Stats Download Patch File Download Diff File

14
src/api/quality/income.js
Unescape Escape View File

@ -120,11 +120,12 @@ export function commitActualValue(recordId, actualValues) {
} }
//审核结果提交 //审核结果提交
export function commitCheckResult(recordId,typeCode,checkType) { export function commitCheckResult(recordId,typeCode,checkType,orderNo) {
const data = { const data = {
recordId, recordId,
typeCode, typeCode,
checkType checkType,
orderNo
} }
return request({ return request({
url: '/quality/qcIncome/commitCheckResult', url: '/quality/qcIncome/commitCheckResult',
@ -143,3 +144,12 @@ export function getDefectList(defectType) {
data: data data: data
}); });
} }
// 查询人员列表
export function getLLWorkOrder(query) {
return request({
url: '/quality/qcIncome/getLLWorkOrder',
method: 'get',
params: query
});
}

16
src/views/quality/qcIncome/checkProjectType.vue
Unescape Escape View File

@ -16,7 +16,14 @@
<el-table-column label="检测规则Id" align="left" prop="recordId" :show-overflow-tooltip="true" v-if="false"/> <el-table-column label="检测规则Id" align="left" prop="recordId" :show-overflow-tooltip="true" v-if="false"/>
<el-table-column label="检测规则编码" align="left" prop="projectNo" :show-overflow-tooltip="true" width="120"/> <el-table-column label="检测规则编码" align="left" prop="projectNo" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="检验规则名称" align="left" prop="ruleName" :show-overflow-tooltip="true" width="120"/> <el-table-column label="检验规则名称" align="left" prop="ruleName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="检验规则属性" align="left" prop="propertyCode" :show-overflow-tooltip="true" width="120"/> <el-table-column label="检验规则属性" align="left" prop="propertyCode" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<dict-tag
:options="dict.type.qc_rule_prop"
:value="scope.row.propertyCode"
/>
</template>
</el-table-column>
<el-table-column label="检验方式" align="left" prop="checkMode" :show-overflow-tooltip="true" /> <el-table-column label="检验方式" align="left" prop="checkMode" :show-overflow-tooltip="true" />
<el-table-column label="检验工具" align="left" prop="checkTool" :show-overflow-tooltip="true" /> <el-table-column label="检验工具" align="left" prop="checkTool" :show-overflow-tooltip="true" />
<el-table-column label="检验标准" align="left" prop="checkStandard" :show-overflow-tooltip="true" /> <el-table-column label="检验标准" align="left" prop="checkStandard" :show-overflow-tooltip="true" />
@ -98,7 +105,7 @@
import { getCkeckProjectList,changeCheckDetailStatus,commitActualValue,commitCheckResult,getDefectList } from "@/api/quality/income"; import { getCkeckProjectList,changeCheckDetailStatus,commitActualValue,commitCheckResult,getDefectList } from "@/api/quality/income";
export default { export default {
name: "itemSelectUser", name: "itemSelectUser",
dicts: ["check_result"], dicts: ["check_result","qc_rule_prop"],
data() { data() {
return { return {
showFlag:false, showFlag:false,
@ -150,7 +157,7 @@ export default {
methods: { methods: {
getDefect(){ getDefect(){
getDefectList('defect_produce').then(response => { getDefectList('defect_in').then(response => {
this.defectList = response; this.defectList = response;
}); });
}, },
@ -160,6 +167,7 @@ export default {
this.queryParams.belongTo = this.data.recordId; this.queryParams.belongTo = this.data.recordId;
this.typeCode = typeCode; this.typeCode = typeCode;
this.checkType = this.data.checkType; this.checkType = this.data.checkType;
this.orderNo = this.data.orderNo;
this.getList(); this.getList();
}, },
@ -188,7 +196,7 @@ export default {
//提交整体检测结果 //提交整体检测结果
submitBomForm() { submitBomForm() {
commitCheckResult(this.queryParams.belongTo,this.typeCode,this.checkType).then(response => { commitCheckResult(this.queryParams.belongTo,this.typeCode,this.checkType,this.orderNo).then(response => {
this.$modal.msgSuccess("检测完成"); this.$modal.msgSuccess("检测完成");
this.$emit('saveCheck'); this.$emit('saveCheck');
this.showFlag = false; this.showFlag = false;

70
src/views/quality/qcIncome/index.vue
Unescape Escape View File

@ -138,7 +138,7 @@
<el-table-column label="物料号" align="center" prop="materialCode" width="170"/> <el-table-column label="物料号" align="center" prop="materialCode" width="170"/>
<el-table-column label="物料名称" align="center" prop="materialName" 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="quality" />
<el-table-column label="不合格数量" align="center" prop="noOkQuality" /> <el-table-column label="不合格数量" align="center" prop="noOkQuality" width="120"/>
<el-table-column label="单位" align="center" prop="unit" /> <el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="供应商编码" align="center" prop="supplierCode" width="120"/> <el-table-column label="供应商编码" align="center" prop="supplierCode" width="120"/>
<el-table-column label="供应商名称" align="center" prop="supplierName" width="240"/> <el-table-column label="供应商名称" align="center" prop="supplierName" width="240"/>
@ -215,22 +215,29 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="来料批次号" prop="incomeBatchNo"> <el-form-item label="检验类型" prop="checkType" >
<el-input v-model="form.incomeBatchNo" placeholder="请输入来料批次号" /> <el-select v-model="form.checkType" placeholder="请选择检验类型" style="width: 100%;">
<el-option
v-for="dict in checkTypes"
:key="dict.id"
:label="dict.checkName"
:value="dict.id"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="订单号" prop="orderNo"> <el-form-item label="订单号" prop="orderNo">
<el-input v-model="form.orderNo" placeholder="请输入订单号" /> <el-input v-model="form.orderNo" placeholder="请输入订单号">
<el-button slot="append" @click="handleSelectWorkOrder" icon="el-icon-search"></el-button>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="物料名称" prop="materialName"> <el-form-item label="物料名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请选择物料名称"> <el-input v-model="form.materialName" placeholder="请选择物料名称"/>
<el-button slot="append" @click="handleSelectMaterial" icon="el-icon-search"></el-button>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -240,15 +247,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="检验类型" prop="checkType" > <el-form-item label="来料批次号" prop="incomeBatchNo">
<el-select v-model="form.checkType" placeholder="请选择检验类型" style="width: 100%;"> <el-input v-model="form.incomeBatchNo" placeholder="请输入来料批次号" />
<el-option
v-for="dict in checkTypes"
:key="dict.id"
:label="dict.checkName"
:value="dict.id"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -325,11 +325,11 @@
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--产品物料选择弹窗--> <!--订单选择弹窗-->
<ItemSelectMaterial <ItemSelectWorkOrder
ref="itemSelectMaterial" ref="itemSelectWorkOrder"
@onSelected="onSelectMaterial" @onSelected="onSelectWorkOrder"
></ItemSelectMaterial> ></ItemSelectWorkOrder>
<!--供应商选择弹窗--> <!--供应商选择弹窗-->
<ItemSelectSupplier <ItemSelectSupplier
ref="itemSelectSupplier" ref="itemSelectSupplier"
@ -351,14 +351,14 @@
<script> <script>
import { listIncome, getIncome, delIncome, addIncome, updateIncome ,changeIncomeStatus} from "@/api/quality/income"; import { listIncome, getIncome, delIncome, addIncome, updateIncome ,changeIncomeStatus} from "@/api/quality/income";
import { getCheckTypes } from "@/api/quality/qcProduce"; import { getCheckTypes } from "@/api/quality/qcProduce";
import ItemSelectMaterial from "./selectMaterial.vue"; import ItemSelectWorkOrder from "./selectLLWorkOrder.vue";
import ItemSelectSupplier from "./selectSupplier.vue"; import ItemSelectSupplier from "./selectSupplier.vue";
import ItemSelectUser from "./selectUser.vue"; import ItemSelectUser from "./selectUser.vue";
import ItemSelectProject from "./checkProjectType.vue"; import ItemSelectProject from "./checkProjectType.vue";
import moment from 'moment'; import moment from 'moment';
export default { export default {
name: "Income", name: "Income",
components: { ItemSelectMaterial,ItemSelectSupplier,ItemSelectUser,ItemSelectProject}, components: { ItemSelectWorkOrder,ItemSelectSupplier,ItemSelectUser,ItemSelectProject},
dicts: ["unit","check_status","check_result"], dicts: ["unit","check_status","check_result"],
data() { data() {
return { return {
@ -414,6 +414,9 @@ export default {
checkTypes:[], checkTypes:[],
// 表单校验 // 表单校验
rules: { rules: {
checkType:[
{ required: true, message: "检验类型不能为空", trigger: "blur" }
],
incomeBatchNo: [ incomeBatchNo: [
{ required: true, message: "来料批次号不能为空", trigger: "blur" } { required: true, message: "来料批次号不能为空", trigger: "blur" }
], ],
@ -611,14 +614,21 @@ export default {
}); });
}, },
/**物料选择弹出框**/ /**工单选择弹出框**/
handleSelectMaterial() { handleSelectWorkOrder() {
this.$refs.itemSelectMaterial.showFlag = true; this.$refs.itemSelectWorkOrder.showFlag = true;
}, },
//物料选择确认 //工单选择确认
onSelectMaterial(obj) { onSelectWorkOrder(obj) {
this.form.materialCode = obj.code; this.form.orderNo = obj.orderNo;
this.form.materialName = obj.name; this.form.materialName = obj.materialName;
this.form.materialCode = obj.materialCode;
this.form.quality = obj.quality;
this.form.incomeBatchNo = obj.incomeBatchNo;
this.form.unit = obj.unit;
this.form.supplierCode = obj.supplierCode;
this.form.supplierName = obj.supplierName;
this.form.incomeTime = obj.incomeTime;
}, },
/**供应商选择弹出框**/ /**供应商选择弹出框**/

77
src/views/quality/qcProduce/index.vue
Unescape Escape View File

@ -242,56 +242,62 @@
<el-input v-model="form.checkNo" placeholder="请输入检验任务编号" disabled/> <el-input v-model="form.checkNo" placeholder="请输入检验任务编号" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="批次号" prop="incomeBatchNo"> <el-form-item label="检验类型" prop="checkType" >
<el-input v-model="form.incomeBatchNo" placeholder="请输入批次号" /> <el-select v-model="form.checkType" placeholder="请选择检验类型" style="width: 100%;">
<el-option
v-for="dict in checkTypes"
:key="dict.id"
:label="dict.checkName"
:value="dict.id"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="订单号" prop="orderNo"> <el-form-item label="工单号" prop="orderNo">
<el-input v-model="form.orderNo" placeholder="请输入订单号" /> <el-input v-model="form.orderNo" placeholder="请输入工单号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="物料名称" prop="materialName"> <el-form-item label="物料名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请选择物料名称"> <el-input v-model="form.materialName" placeholder="请选择物料名称"/>
<el-button slot="append" @click="handleSelectMaterial" icon="el-icon-search"></el-button>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <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-input v-model="form.materialCode" placeholder="请输入物料号"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="检验类型" prop="checkType" > <el-form-item label="生产数量" prop="quality">
<el-select v-model="form.checkType" placeholder="请选择检验类型" style="width: 100%;"> <el-input type="number" v-model="form.quality" placeholder="请输入生产数量" disabled/>
<el-option
v-for="dict in checkTypes"
:key="dict.id"
:label="dict.checkName"
:value="dict.id"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row
<el-col :span="8"> <el-col :span="8">
<el-form-item label="生产数量" prop="quality"> <el-form-item label="批次号" prop="incomeBatchNo">
<el-input type="number" v-model="form.quality" placeholder="请输入生产数量" /> <el-input v-model="form.incomeBatchNo" placeholder="请输入批次号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="抽样数量" prop="sampleQuality"> <el-form-item label="生产时间" prop="incomeTime">
<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量" /> <el-date-picker clearable
v-model="form.incomeTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择生产时间">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单位" prop="unit" > <el-form-item label="单位" prop="unit" >
<el-select v-model="form.unit" placeholder="请选择单位" style="width: 100%;"> <el-select v-model="form.unit" placeholder="请选择单位" style="width: 100%;">
@ -336,13 +342,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="生产时间" prop="incomeTime"> <el-form-item label="抽样数量" prop="sampleQuality">
<el-date-picker clearable <el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量" />
v-model="form.incomeTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择生产时间">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -371,11 +372,6 @@
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--产品物料选择弹窗-->
<ItemSelectMaterial
ref="itemSelectMaterial"
@onSelected="onSelectMaterial"
></ItemSelectMaterial>
<!--工作中心(车间)选择弹窗--> <!--工作中心(车间)选择弹窗-->
<ItemSelectWorkCenter <ItemSelectWorkCenter
ref="itemSelectWorkCenter" ref="itemSelectWorkCenter"
@ -397,13 +393,12 @@
<script> <script>
import { listQcProduce, getQcProduce, delQcProduce, addQcProduce, updateQcProduce,getCheckTypes,changeProduceStatus } from "@/api/quality/qcProduce"; import { listQcProduce, getQcProduce, delQcProduce, addQcProduce, updateQcProduce,getCheckTypes,changeProduceStatus } from "@/api/quality/qcProduce";
import moment from 'moment'; import moment from 'moment';
import ItemSelectMaterial from "../qcIncome/selectMaterial.vue";
import ItemSelectWorkCenter from "./selectWorkCenter.vue"; import ItemSelectWorkCenter from "./selectWorkCenter.vue";
import ItemSelectUser from "../qcIncome/selectUser.vue"; import ItemSelectUser from "../qcIncome/selectUser.vue";
import ItemSelectProject from "../qcIncome/checkProjectType.vue"; import ItemSelectProject from "../qcIncome/checkProjectType.vue";
export default { export default {
name: "QcProduce", name: "QcProduce",
components: { ItemSelectMaterial,ItemSelectWorkCenter,ItemSelectUser,ItemSelectProject}, components: { ItemSelectWorkCenter,ItemSelectUser,ItemSelectProject},
dicts: ["unit","check_status","check_result"], dicts: ["unit","check_status","check_result"],
data() { data() {
return { return {
@ -660,16 +655,6 @@ export default {
}); });
}, },
/**物料选择弹出框**/
handleSelectMaterial() {
this.$refs.itemSelectMaterial.showFlag = true;
},
//物料选择确认
onSelectMaterial(obj) {
this.form.materialCode = obj.code;
this.form.materialName = obj.name;
},
/**工作中心选择弹出框**/ /**工作中心选择弹出框**/
handleSelectWorkCenter() { handleSelectWorkCenter() {
this.$refs.itemSelectWorkCenter.showFlag = true; this.$refs.itemSelectWorkCenter.showFlag = true;

Write Preview
Loading…
Cancel
Save