报工物料动态修改

yangwl
zhaoxiaolin 8 months ago
parent 4139d7a058
commit 4e3ccfbf0f

@ -273,3 +273,16 @@ export function getPutInOrderList(workorderCode) {
data: data
});
}
// 获取最新物料列表
export function getNewPrepareData(workorderCode) {
const data = {
workorderCode
}
return request({
url: '/mes/reportWork/getNewPrepareData',
method: 'post',
data: data
});
}

@ -60,6 +60,16 @@ export function getConsumeList(query) {
params: query
});
}
// 2.0查询各级报工损耗列表
export function getAllLevelConsumeList(query) {
return request({
url: '/mes/reportWorkConsume/getAllLevelConsumeList',
method: 'get',
params: query
});
}
// 提交报工物料损耗详细列表
export function submitConsumePS(data) {
return request({
@ -85,3 +95,5 @@ export function getBomList(query) {
params: query
});
}

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询市场不良检验任务列表
export function listQcMarket(query) {
return request({
url: '/quality/qcMarket/list',
method: 'get',
params: query
});
}
// 查询市场不良检验任务详细
export function getQcMarket(recordId) {
return request({
url: '/quality/qcMarket/' + recordId,
method: 'get'
});
}
// 新增市场不良检验任务
export function addQcMarket(data) {
return request({
url: '/quality/qcMarket',
method: 'post',
data: data
});
}
// 修改市场不良检验任务
export function updateQcMarket(data) {
return request({
url: '/quality/qcMarket',
method: 'put',
data: data
});
}
// 删除市场不良检验任务
export function delQcMarket(recordId) {
return request({
url: '/quality/qcMarket/' + recordId,
method: 'delete'
});
}

@ -61,7 +61,7 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!--<el-col :span="1.5">
<el-button
type="primary"
plain
@ -70,7 +70,7 @@
@click="handleAdd"
v-hasPermi="['mes:reportWork:add']"
>新增</el-button>
</el-col>
</el-col>-->
<!--<el-col :span="1.5">
<el-button
@ -446,7 +446,6 @@
</el-tab-pane>
<el-tab-pane label="物料损耗" name="second">
<div>
<!--<el-divider content-position="center">工单物料消耗明细</el-divider>-->
<ReportWorkConsume ref="child"
:workorderCode="form.workorderCode"
@onSelected="onSelectMaterial"
@ -506,9 +505,15 @@
</el-dialog>
<!-- 报工损耗 -->
<el-dialog :title="titleConsume" :visible.sync="openConsume" width="1200px">
<el-tabs v-model="activeName2" >
<el-tab-pane label="母工单用料损耗信息" name="pConsume">
<el-table v-loading="loading" :data="pConsumeTableList" ref="mypConsumeTable" @selection-change="pConsumeSelection">
<el-tabs v-model="activeNameC" >
<el-tab-pane
v-for="(item, index) in libConsumeTabs"
:key="index"
:label="item.title"
:name="item.libId"
>
<el-button size="mini" type="primary" @click="addConsumeTableRow(item.libList)"></el-button>
<el-table v-loading="loading" :data="item.libList" ref="mypConsumeTable" @selection-change="pConsumeSelection">
<el-table-column width="50" align="center" type="selection"/>
<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
<el-table-column label="工单编码" width="140" align="left" prop="workorderCode" :show-overflow-tooltip="true" />
@ -522,26 +527,17 @@
<el-table-column label="单位" width="50" align="center" prop="unit"/>
<el-table-column label="反冲标识" align="center" prop="recoil"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
</el-table>
</el-tab-pane>
<el-tab-pane label="子工单用料损耗信息" name="sConsume">
<el-table v-loading="loading" :data="sConsumeTableList" ref="mysConsumeTable" @selection-change="sConsumeSelection">
<el-table-column width="50" align="center" type="selection"/>
<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
<el-table-column label="工单编码" width="140" align="left" prop="workorderCode" :show-overflow-tooltip="true" />
<el-table-column label="物料编码" width="180" align="left" prop="materialCode" :show-overflow-tooltip="true" />
<el-table-column label="物料名称" width="280" align="left" prop="materialName" :show-overflow-tooltip="true" />
<el-table-column label="消耗数量" width="120" align="left" prop="quantity" :show-overflow-tooltip="true" >
<el-table-column fixed="right" label="操作" width="90">
<template slot-scope="scope">
<el-input type="number" size="small" v-model="scope.row.quantity" @change="handleEdit(scope.$index,scope.row)"></el-input>
<el-button @click.native.prevent="deleteBomRow(scope.$index, item.libList)"
size="small" type="danger" plain>
移除</el-button>
</template>
</el-table-column>
<el-table-column label="单位" width="50" align="center" prop="unit"/>
<el-table-column label="反冲标识" align="center" prop="recoil"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
</el-table>
</el-tab-pane>
<!--母工单产品bom参考-->
<!--工单产品bom参考-->
<el-tab-pane label="BOM组成参照" name="pBom">
<el-table v-loading="loading" :data="pBomTableList" ref="pBomTable"
row-key="materialCode"
@ -561,21 +557,7 @@
<el-table-column label="成本核算标识相关" align="center" prop="sanka" width="100"/>
</el-table>
</el-tab-pane>
<!--子工单产品bom参考
<el-tab-pane label="子工单BOM组成" name="sBom">
<el-table v-loading="loading" :data="sBomTableList" ref="sBomTable">
<el-table-column width="50" align="center" type="selection"/>
<el-table-column label="物料编码" width="160" align="left" prop="component"/>
<el-table-column label="物料名称" width="280" align="left" prop="componentName" :show-overflow-tooltip="true" />
<el-table-column label="物料组编码" width="100" align="left" prop="productGroup" />
<el-table-column label="物料组名称" width="100" align="center" prop="productGroupName" :show-overflow-tooltip="true" />
<el-table-column label="标准用量" align="center" prop="standardDosage"/>
<el-table-column label="损耗率" align="center" prop="lossRate" width="150"/>
<el-table-column label="损耗额" align="center" prop="lossAmount" width="150"/>
<el-table-column label="含损耗用量" align="center" prop="cilosses" width="150"/>
<el-table-column label="成本核算标识相关" align="center" prop="sanka" width="150"/>
</el-table>
</el-tab-pane>-->
</el-tabs>
<div slot="footer" class="dialog-footer">
@ -661,6 +643,11 @@
ref="itemSelectEquip"
@onSelected="onSelectEquip"
></ItemSelectEquip>
<!--最新领料单选择弹窗-->
<ItemSelectNewPrepare
ref="itemSelectNewPrepare"
@onSelected="onSelectNewPrepare"
></ItemSelectNewPrepare>
<!--母工单---->
<!-- 打印预览弹出层 -->
<el-dialog
@ -734,17 +721,18 @@ import { listReportWork, getReportWork, delReportWork, addReportWork, getWorkcen
getReportSAPList,submitReportPS,submitReportPSSAP,getCKList,
getPutInOrderList
} from "@/api/mes/reportWork";
import { getConsumeList,submitConsumePS,submitReportInfo,getBomList} from "@/api/mes/reportWorkConsume";
import { getConsumeList,submitConsumePS,submitReportInfo,getBomList,getAllLevelConsumeList} from "@/api/mes/reportWorkConsume";
import ReportWorkConsume from "./reportWorkConsume.vue";
import ItemSelectUser from "./selectUser.vue";
import ItemSelectWorkOrder from "./selectWorkOrder.vue";
import ItemSelectNewPrepare from "./selectNewPrepare.vue";
import ItemSelectEquip from "./selectEquip.vue";
import moment from 'moment';
import { getlistCK } from '@/api/wms/outorder'
export default {
name: "ReportWork",
dicts: ['report_type','report_sap_status'],
components: {ReportWorkConsume,ItemSelectUser,ItemSelectWorkOrder,ItemSelectEquip},
components: {ReportWorkConsume,ItemSelectUser,ItemSelectWorkOrder,ItemSelectEquip,ItemSelectNewPrepare},
data() {
return {
optType: undefined,
@ -765,6 +753,7 @@ export default {
//
reportWorkList: [],
libTabs:[],
libConsumeTabs:[],
pOrderTableList: [],
sOrderTableList: [],
pConsumeTableList: [],
@ -774,7 +763,7 @@ export default {
activeName0: 'first',
activeName: 'pOrder',
activeNameR: 'order1',
activeName2: 'pConsume',
activeNameC: 'consume1',
selectedWarehouse:'0004',
warehouseList: [],
// SAPCD:"",
@ -1050,6 +1039,7 @@ export default {
};
this.resetForm("form");
this.libTabs = [];
this.libConsumeTabs = [];
this.pOrderTableList = [];
this.sOrderTableList = [];
this.pReportRows = [];
@ -1087,42 +1077,42 @@ export default {
this.title = "添加报工记录";
this.optType = "add";
},
handleAddSAP(row) {
this.reset();
let sr = this.selectRow[0];
handleAddSAP(row) {
this.reset();
let sr = this.selectRow[0];
if(sr.uploadStatus =='1'){
this.optType = 'view'
}else{
this.optType = ''
}
if(sr.uploadStatus =='1'){
this.optType = 'view'
}else{
this.optType = ''
}
this.queryParams.workorderCode = sr.workorderCode;
// this.SAPCD=sr.workorderCodeSap;
//
this.queryParams.parentOrder = '0';
getReportSAPList(this.queryParams).then(response => {
this.pOrderTableList = response;
this.openReportSAP = true;
this.titleReport = "SAP收货";
});
this.queryParams.workorderCode = sr.workorderCode;
// this.SAPCD=sr.workorderCodeSap;
//
this.queryParams.parentOrder = '0';
getReportSAPList(this.queryParams).then(response => {
this.pOrderTableList = response;
this.openReportSAP = true;
this.titleReport = "SAP收货";
});
// let factoryCode = localStorage.getItem('USER_POOL_NAME_CURRENT').substring(3)
// let params = { factoryCode: factoryCode }; //
// let requestBody = JSON.stringify(params)// JSON
// getCKList(requestBody).then(response => {
// this.warehouseList = response;
// });
let factoryCode = localStorage.getItem('USER_POOL_NAME_CURRENT').substring(3)
let params = { factoryCode: factoryCode }; //
//let paramsJSON = JSON.stringify(params); // JSON
console.log(factoryCode)
getCKList(params).then(response => {
this.warehouseList = response.data
});
// let factoryCode = localStorage.getItem('USER_POOL_NAME_CURRENT').substring(3)
// let params = { factoryCode: factoryCode }; //
// let requestBody = JSON.stringify(params)// JSON
// getCKList(requestBody).then(response => {
// this.warehouseList = response;
// });
let factoryCode = localStorage.getItem('USER_POOL_NAME_CURRENT').substring(3)
let params = { factoryCode: factoryCode }; //
//let paramsJSON = JSON.stringify(params); // JSON
console.log(factoryCode)
getCKList(params).then(response => {
this.warehouseList = response.data
});
},
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
@ -1264,46 +1254,46 @@ export default {
this.getList();
});
},
submitReportSAP() {
this.reportRows = this.pReportRows.concat(this.sReportRows)
console.log(this.reportRows)
if ( this.reportRows==0) {
this.$modal.msgError(`请选择数据`);
return false;
}
this.reportRows.forEach(row => {
this.$set(row, 'whCode', this.selectedWarehouse);
});
console.log("仓库---"+this.selectedWarehouse)
const reportRowsJson = JSON.stringify(this.reportRows); // this.reportRowsJSON
this.loading = true;
submitReportPSSAP(reportRowsJson).then(response => {
this.$modal.msgSuccess("操作成功");
this.loading = false;
this.openReportSAP = false;
this.getList();
});
},
submitReportSAP() {
this.reportRows = this.pReportRows.concat(this.sReportRows)
console.log(this.reportRows)
if ( this.reportRows==0) {
this.$modal.msgError(`请选择数据`);
return false;
}
this.reportRows.forEach(row => {
this.$set(row, 'whCode', this.selectedWarehouse);
});
console.log("仓库---"+this.selectedWarehouse)
const reportRowsJson = JSON.stringify(this.reportRows); // this.reportRowsJSON
this.loading = true;
submitReportPSSAP(reportRowsJson).then(response => {
this.$modal.msgSuccess("操作成功");
this.loading = false;
this.openReportSAP = false;
this.getList();
});
},
/** 报工损耗按钮操作 */
handleConsumeHz(row) {
this.reset();
let sr = this.selectRow[0];
let sr = row;
if(sr.workorderCode==undefined){
sr = this.selectRow[0]
}
if(sr.uploadStatus =='1'){
this.optType = 'view'
}else{
this.optType = ''
}
this.queryParams.workorderCode = sr.workorderCode;
//
this.queryParams.parentOrder = '0';
getConsumeList(this.queryParams).then(response => {
this.pConsumeTableList = response;
this.openConsume = true;
this.titleConsume = "工单报工物料损耗详情";
});
//
this.queryParams.parentOrder = sr.workorderCode;
getConsumeList(this.queryParams).then(response => {
this.sConsumeTableList = response;
getAllLevelConsumeList(this.queryParams).then(response => {
this.libConsumeTabs= response;
this.openConsume = true;
this.titleConsume = "工单报工物料损耗详情";
this.queryParams.workorderCode = '';
});
@ -1313,12 +1303,7 @@ export default {
getBomList(this.queryParams).then(response => {
this.pBomTableList = this.handleTree(response, 'materialCode', 'pMaterialCode')
});
//BOM
//this.queryParams.parentOrder = sr.workorderCode;
//getBomList(this.queryParams).then(response => {
// this.sBomTableList = response;
// this.queryParams.workorderCode = '';
//});
},
//
pConsumeSelection(selection) {
@ -1436,6 +1421,25 @@ export default {
this.refreshNewWorkerTable = true // refreshProTabletrue
this.newWorkerLoading = false // false
})
},
//--
deleteBomRow(index, rows) {
rows.splice(index, 1);
},
//--
addConsumeTableRow(consumeList){
if(consumeList.length==0){
this.$modal.msgError(`上位机尚未填写损耗,不允许提前新增`);
return
}
this.$refs.itemSelectNewPrepare.showFlag = true;
this.$refs.itemSelectNewPrepare.init(consumeList[0].workorderCode);
},
//--
onSelectNewPrepare(obj) {
console.log(obj)
}
}
};

@ -0,0 +1,80 @@
<template>
<el-dialog title="最新领料单列表"
v-if="showFlag"
:visible.sync="showFlag"
:modal= false
width="1000px"
>
<el-row :gutter="20">
<el-col :span="24" :xs="24">
<el-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange">
<el-table-column width="50" align="center" type="selection"/>
<el-table-column label="物料编码" width="180" align="left" prop="materialCode" :show-overflow-tooltip="true" />
<el-table-column label="物料名称" width="260" align="left" prop="materialName" :show-overflow-tooltip="true" />
<el-table-column label="损耗数量" align="center" prop="quantity"/>
<el-table-column label="单位" align="center" prop="unit"/>
<el-table-column label="反冲物料标识X" align="center" prop="recoil"/>
</el-table>
</el-col>
</el-row>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitBomForm"> </el-button>
<el-button @click="showFlag=false"> </el-button>
</div>
</el-dialog>
</template>
<script>
import { getNewPrepareData } from "@/api/mes/reportWork";
export default {
name: "itemSelectUser",
data() {
return {
showFlag:false,
//
selectedRows: {},
//
single: true,
//
multiple: true,
//
showSearch: true,
// BOM
itemList: null,
workorderCode: undefined
};
},
created() {
},
methods: {
init(workorderCode){
this.workorderCode = workorderCode;
this.getList();
},
/** 查询表格列表*/
getList() {
this.loading = true;
getNewPrepareData(this.workorderCode).then(response => {
this.itemList = response;
this.loading = false;
}
);
},
//
handleBomSelectionChange(selection) {
this.selectionRow = selection
},
submitBomForm() {
this.$emit('onSelected', this.selectionRow);
this.showFlag = false;
}
}
};
</script>

@ -162,16 +162,6 @@
</template>
</el-table-column>
<el-table-column label="检验结果" align="center" prop="checkResult" />
<el-table-column label="是否启用" align="center" width="100">
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
active-value="1"
inactive-value="0"
@change="handleStatusChange(scope.row)"
></el-switch>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@ -258,7 +248,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="抽样数量" prop="sampleQuality">
<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量" />
<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量"/>
</el-form-item>
</el-col>
<el-col :span="6" v-for="(item,index) in form.defects" :key="index">

@ -0,0 +1,701 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="任务编号" prop="checkNo">
<el-input
v-model="queryParams.checkNo"
placeholder="请输入检验任务编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批次号" prop="incomeBatchNo">
<el-input
v-model="queryParams.incomeBatchNo"
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="checkResult">
<el-select
v-model="queryParams.checkResult"
placeholder="检验结果"
clearable
>
<el-option
v-for="dict in dict.type.check_result"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="生产时间" prop="incomeTimeArray">
<el-date-picker
v-model="queryParams.incomeTimeArray"
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="checkLoc">
<el-input
v-model="queryParams.checkLoc"
placeholder="请输入检测地点"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="检验时间" prop="checkTimeArray">
<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>
<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="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['quality:qcMarket: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="['quality:qcMarket: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="['quality:qcIncome: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="['quality:qcMarket:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="incomeList" @selection-change="handleSelectionChange">
<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="checkType" align="center" prop="checkType" 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="incomeBatchNo" width="120"/>
<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="noOkQuality" width="120"/>
<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="supplierName" width="240"/>
<el-table-column label="生产时间" align="center" prop="incomeTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="检测地点" align="center" prop="checkLoc" width="120"/>
<el-table-column label="检测状态" align="center" prop="checkStatus" >
<template slot-scope="scope">
<dict-tag
:options="dict.type.check_status"
:value="scope.row.checkStatus"
/>
</template>
</el-table-column>
<el-table-column label="检测人工号" align="center" prop="checkManCode" width="100"/>
<el-table-column label="检测人姓名" align="center" prop="checkManName" width="100"/>
<el-table-column label="检验时间" align="center" prop="checkTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="检验结果" align="center" prop="checkResult" />
<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="handleCheckProject(scope.row)"
v-hasPermi="['quality:qcIncome:edit']"
>检验</el-button>
<!--
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['quality:qcIncome: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="1000px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<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="checkType" >
<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-col>
<el-col :span="8">
<el-form-item label="订单号" prop="orderNo">
<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-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="产品名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请选择产品名称"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="产品号" prop="materialCode">
<el-input v-model="form.materialCode" placeholder="请输入产品号"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="生产数量" prop="quality">
<el-input type="number" v-model="form.quality" placeholder="请输入生产数量" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="生产时间" prop="incomeTime">
<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-col>
<el-col :span="8">
<el-form-item label="单位" prop="unit" >
<el-select v-model="form.unit" placeholder="请选择单位" style="width: 100%;">
<el-option
v-for="dict in dict.type.unit"
: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="incomeBatchNo">
<el-select v-model="form.incomeBatchNo" class="selectItem" placeholder="请选择批次" clearable>
<el-option v-for="(item,index) in batchList"
:key="index"
:label="item.batchCode"
:value="item.batchCode">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="抽样数量" prop="sampleQuality">
<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量" disabled/>
</el-form-item>
</el-col>
<el-col :span="6" v-for="(item,index) in form.defects" :key="index">
<el-form-item :label="item.defectSubclass" prop="">
<el-input type="number" v-model="item.noOkQuality" placeholder="请输入不合格数量" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="车间名称" prop="supplierName">
<el-input v-model="form.supplierName" placeholder="请输入所属车间名称" >
<el-button slot="append" @click="handleSelectWorkCenter" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="车间编码" prop="supplierCode">
<el-input v-model="form.supplierCode" placeholder="请输入所属车间编码" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="抽样数量" prop="sampleQuality">
<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="检测人姓名" prop="checkManName">
<el-input v-model="form.checkManName" placeholder="请选择检测人姓名">
<el-button slot="append" @click="handleSelectUser" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检测人工号" prop="checkManCode" >
<el-input v-model="form.checkManCode" placeholder="请输入检测人工号" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检测地点" prop="checkLoc">
<el-input v-model="form.checkLoc" placeholder="请输入检测地点" />
</el-form-item>
</el-col>
</el-row>
</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>
<!--订单选择弹窗-->
<ItemSelectWorkOrder
ref="itemSelectWorkOrder"
@onSelected="onSelectWorkOrder"
></ItemSelectWorkOrder>
<!--工作中心(车间)选择弹窗-->
<ItemSelectWorkCenter
ref="itemSelectWorkCenter"
@onSelected="onSelectWorkCenter"
></ItemSelectWorkCenter>
<!--人员选择弹窗-->
<ItemSelectUser
ref="itemSelectUser"
@onSelected="onSelectUser"
></ItemSelectUser>
<!--检验项目弹窗-->
<ItemSelectProject
ref="itemSelectProject"
@saveCheck="saveCheck"
></ItemSelectProject>
</div>
</template>
<script>
import { listQcMarket, getQcMarket, addQcMarket, updateQcMarket, delQcMarket } from "@/api/quality/qcMarket.js";
import { getCheckTypes,getBatchList } from "@/api/quality/qcProduce";
import ItemSelectWorkOrder from "../qcProduce/selectWorkOrder"
import ItemSelectWorkCenter from "../qcProduce/selectWorkCenter";
import ItemSelectUser from "../qcIncome/selectUser.vue";
import ItemSelectProject from "../qcIncome/checkProjectType.vue";
import moment from 'moment';
import { getDefectTypeListByDefectType } from "@/api/quality/defectType.js";
export default {
name: "Market",
components: { ItemSelectWorkOrder,ItemSelectWorkCenter,ItemSelectUser,ItemSelectProject},
dicts: ["unit","check_status","check_result"],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
incomeList: [],
defectTypeList: [],
//
title: "",
//
open: false,
//
queryParams: {
incomeTimeArray: [],
checkTimeArray: [],
pageNum: 1,
pageSize: 10,
checkNo: null,
incomeBatchNo: null,
orderNo: null,
materialCode: null,
materialName: null,
quality: null,
unit: null,
supplierCode: null,
supplierName: null,
incomeTime: null,
checkLoc: null,
checkStatus: null,
checkManCode: null,
checkManName: null,
checkTime: null,
checkResult: null,
status: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
factoryCode: null,
},
//
form: {},
checkTypes:[],
//
rules: {
checkType:[
{ required: true, message: "检验类型不能为空", trigger: "blur" }
],
incomeBatchNo: [
{ required: true, message: "批次号不能为空", trigger: "blur" }
],
orderNo: [
{ required: true, message: "订单号不能为空", trigger: "blur" }
],
materialName: [
{ required: true, message: "物料号不能为空", trigger: "blur" }
],
quality: [
{ required: true, message: "数量不能为空", trigger: "blur" }
],
unit: [
{ required: true, message: "单位不能为空", trigger: "blur" }
],
supplierName: [
{ required: true, message: "供应商不能为空", trigger: "blur" }
],
incomeTime: [
{ required: true, message: "来料时间不能为空", trigger: "blur" }
],
checkManName: [
{ required: true, message: "检测人不能为空", trigger: "blur" }
],
checkLoc: [
{ required: true, message: "检测地点不能为空", trigger: "blur" }
],
},
checkTypes:[],
batchList:[],
};
},
created() {
this.getDate();
this.getList();
this.getCheckTypes();
this.handleDefectType();
},
methods: {
/****/
getCheckTypes() {
getCheckTypes('market').then(response => {
this.checkTypes = response;
});
},
/**获取默认查询时间段**/
getDate() {
let start = this.Fungetdate (0)
let end = this.Fungetdate (1)
this.queryParams.incomeTimeArray.push(start,end)
//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.incomeTimeArray!=null && this.queryParams.incomeTimeArray.length>0){
this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
}else{
this.queryParams.incomeTimeStart = null;
this.queryParams.incomeTimeEnd = null;
}
if(this.queryParams.checkTimeArray!=null && 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');
}else{
this.queryParams.checkTimeStart = null;
this.queryParams.checkTimeEnd = null;
}
listQcMarket(this.queryParams).then(response => {
this.incomeList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
recordId: null,
checkNo: null,
incomeBatchNo: null,
orderNo: null,
materialCode: null,
materialName: null,
quality: null,
unit: null,
supplierCode: null,
supplierName: null,
incomeTime: null,
checkLoc: null,
checkStatus: null,
checkManCode: null,
checkManName: null,
checkTime: null,
checkResult: null,
status: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
factoryCode: null,
delFlag: null,
defects: []
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.recordId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.form.defects = this.defectTypeList;
this.open = true;
this.title = "添加市场不良检验";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const recordId = row.recordId || this.ids
getQcMarket(recordId).then(response => {
this.form = response.data;
if (this.form.defects == null) {
this.form.defects = this.defectTypeList;
}
this.open = true;
this.title = "修改市场不良检验";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.recordId != null) {
updateQcMarket(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addQcMarket(this.form).then(response => {
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const recordIds = row.recordId || this.ids;
this.$modal.confirm('是否确认删除市场不良检验编号为"' + recordIds + '"的数据项?').then(function() {
return delQcMarket(recordIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('quality/qcIncome/export', {
...this.queryParams
}, `income_${new Date().getTime()}.xlsx`)
},
//
handleStatusChange(row) {
let text = row.status === "0" ? "停用" : "启用";
this.$modal.confirm('确认要"' + text + '""' + row.checkNo + '"吗?').then(function() {
return changeIncomeStatus(row.recordId, row.status);
}).then(() => {
this.$modal.msgSuccess(text + "成功");
}).catch(function() {
row.status = row.status === "0" ? "1" : "0";
});
},
/**工单选择弹出框**/
handleSelectWorkOrder() {
this.$refs.itemSelectWorkOrder.showFlag = true;
},
//
onSelectWorkOrder(obj) {
this.form.orderNo = obj.workorderCode;
this.form.materialName = obj.materialName;
this.form.materialCode = obj.materialCode;
this.form.quality = obj.quality;
this.form.unit = obj.unit;
this.form.incomeTime = obj.incomeTime;
getBatchList(obj.workorderCode).then(response => {
this.batchList = response;
});
},
/**工作中心选择弹出框**/
handleSelectWorkCenter() {
this.$refs.itemSelectWorkCenter.showFlag = true;
},
//
onSelectWorkCenter(obj) {
this.form.supplierCode = obj.code;
this.form.supplierName = obj.name;
},
/**人员选择弹出框**/
handleSelectUser() {
this.$refs.itemSelectUser.showFlag = true;
},
//
onSelectUser(obj) {
this.form.checkManCode = obj.code;
this.form.checkManName = obj.name;
},
//
handleCheckProject(row){
if(row.checkStatus != '0'){
this.$modal.msgSuccess("已经完成检验");
return
}
this.$refs.itemSelectProject.showFlag = true;
this.$refs.itemSelectProject.init(row,'inventory');
},
//
saveCheck(){
this.getList();
},
handleDefectType() {
const defectType = "market"
getDefectTypeListByDefectType(defectType).then(response => {
this.defectTypeList = response.rows;
});
}
}
};
</script>

@ -196,16 +196,6 @@
</template>
</el-table-column>
<el-table-column label="检验结果" align="center" prop="checkResult" />
<el-table-column label="是否启用" align="center" width="100">
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
active-value="1"
inactive-value="0"
@change="handleStatusChange(scope.row)"
></el-switch>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button

Loading…
Cancel
Save