|
|
|
|
@ -1,6 +1,18 @@
|
|
|
|
|
<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="checkType">
|
|
|
|
|
<el-select v-model="queryParams.checkType" clearable 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 label="任务编号" prop="checkNo">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.checkNo"
|
|
|
|
|
@ -43,7 +55,7 @@
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>-->
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="仓库名称" prop="supplierName">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.supplierName"
|
|
|
|
|
@ -51,7 +63,7 @@
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-form-item>-->
|
|
|
|
|
<el-form-item label="入库时间" prop="incomeTimeArray">
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="queryParams.incomeTimeArray"
|
|
|
|
|
@ -131,7 +143,7 @@
|
|
|
|
|
v-hasPermi="['quality:qcWarehousing:edit']"
|
|
|
|
|
>修改</el-button>
|
|
|
|
|
</el-col>
|
|
|
|
|
<!-- <el-col :span="1.5">
|
|
|
|
|
<el-col :span="1.5">
|
|
|
|
|
<el-button
|
|
|
|
|
type="danger"
|
|
|
|
|
plain
|
|
|
|
|
@ -141,7 +153,7 @@
|
|
|
|
|
@click="handleDelete"
|
|
|
|
|
v-hasPermi="['quality:qcWarehousing:remove']"
|
|
|
|
|
>删除</el-button>
|
|
|
|
|
</el-col>-->
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="1.5">
|
|
|
|
|
<el-button
|
|
|
|
|
type="warning"
|
|
|
|
|
@ -166,15 +178,16 @@
|
|
|
|
|
}}</el-button>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<!--<el-table-column label="批次号" align="center" prop="incomeBatchNo" width="200" :show-overflow-tooltip="true"/>-->
|
|
|
|
|
<el-table-column label="订单号" align="center" prop="orderNo" width="130"/>
|
|
|
|
|
<el-table-column label="批次号" align="center" prop="incomeBatchNo" width="200" :show-overflow-tooltip="true"/>
|
|
|
|
|
<el-table-column label="检验节点" align="center" prop="checkName" />
|
|
|
|
|
<el-table-column label="物料号" align="center" prop="materialCode" width="170" />
|
|
|
|
|
<el-table-column label="物料名称" align="center" prop="materialName" width="250" :show-overflow-tooltip="true"/>
|
|
|
|
|
<el-table-column label="数量" align="center" prop="quality" />
|
|
|
|
|
<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="120"/>
|
|
|
|
|
<el-table-column label="入库时间" align="center" prop="incomeTime" width="180">
|
|
|
|
|
<el-table-column label="车间编码" align="center" prop="supplierCode" width="120"/>
|
|
|
|
|
<el-table-column label="车间名称" align="center" prop="supplierName" width="120"/>
|
|
|
|
|
<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>
|
|
|
|
|
@ -205,14 +218,6 @@
|
|
|
|
|
@click="handleCheckProject(scope.row)"
|
|
|
|
|
v-hasPermi="['quality:qcWarehousing:edit']"
|
|
|
|
|
>检验</el-button>
|
|
|
|
|
<!--
|
|
|
|
|
<el-button
|
|
|
|
|
size="mini"
|
|
|
|
|
type="text"
|
|
|
|
|
icon="el-icon-delete"
|
|
|
|
|
@click="handleDelete(scope.row)"
|
|
|
|
|
v-hasPermi="['quality:qcWarehousing:remove']"
|
|
|
|
|
>删除</el-button>-->
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</el-table>
|
|
|
|
|
@ -321,6 +326,7 @@
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<!--
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item label="仓库名称" prop="supplierName">
|
|
|
|
|
<el-input v-model="form.supplierName" placeholder="请选择仓库名称">
|
|
|
|
|
@ -332,8 +338,19 @@
|
|
|
|
|
<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="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-row>
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
@ -370,11 +387,16 @@
|
|
|
|
|
ref="itemSelectMaterial"
|
|
|
|
|
@onSelected="onSelectMaterial"
|
|
|
|
|
></ItemSelectMaterial>
|
|
|
|
|
<!--仓库选择弹窗-->
|
|
|
|
|
<!--仓库选择弹窗
|
|
|
|
|
<ItemSelectLoc
|
|
|
|
|
ref="itemSelectLoc"
|
|
|
|
|
@onSelected="onSelectLoc"
|
|
|
|
|
></ItemSelectLoc>
|
|
|
|
|
></ItemSelectLoc>-->
|
|
|
|
|
<!--工作中心(车间)选择弹窗-->
|
|
|
|
|
<ItemSelectWorkCenter
|
|
|
|
|
ref="itemSelectWorkCenter"
|
|
|
|
|
@onSelected="onSelectWorkCenter"
|
|
|
|
|
></ItemSelectWorkCenter>
|
|
|
|
|
<!--人员选择弹窗-->
|
|
|
|
|
<ItemSelectUser
|
|
|
|
|
ref="itemSelectUser"
|
|
|
|
|
@ -392,16 +414,18 @@
|
|
|
|
|
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 "./selectProductWorkOrder.vue";
|
|
|
|
|
//import ItemSelectWorkOrder from "./selectProductWorkOrder.vue";
|
|
|
|
|
import ItemSelectWorkOrder from "../qcProduce/selectWorkOrder.vue";
|
|
|
|
|
import ItemSelectWorkCenter from "../qcProduce/selectWorkCenter";
|
|
|
|
|
import ItemSelectMaterial from "../qcIncome/selectMaterial.vue";
|
|
|
|
|
import ItemSelectLoc from "./selectLoc.vue";
|
|
|
|
|
//import ItemSelectLoc from "./selectLoc.vue";
|
|
|
|
|
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: "Warehousing",
|
|
|
|
|
components: { ItemSelectMaterial,ItemSelectLoc,ItemSelectUser,ItemSelectProject,ItemSelectWorkOrder},
|
|
|
|
|
components: { ItemSelectMaterial,ItemSelectWorkCenter,ItemSelectUser,ItemSelectProject,ItemSelectWorkOrder},
|
|
|
|
|
dicts: ["unit","check_status","check_result"],
|
|
|
|
|
data() {
|
|
|
|
|
return {
|
|
|
|
|
@ -476,9 +500,9 @@ export default {
|
|
|
|
|
incomeTime: [
|
|
|
|
|
{ required: true, message: "入库时间不能为空", trigger: "blur" }
|
|
|
|
|
],
|
|
|
|
|
checkManName: [
|
|
|
|
|
{ required: true, message: "检测人不能为空", trigger: "blur" }
|
|
|
|
|
],
|
|
|
|
|
//checkManName: [
|
|
|
|
|
// { required: true, message: "检测人不能为空", trigger: "blur" }
|
|
|
|
|
//],
|
|
|
|
|
checkLoc: [
|
|
|
|
|
{ required: true, message: "检测地点不能为空", trigger: "blur" }
|
|
|
|
|
]
|
|
|
|
|
@ -677,6 +701,7 @@ export default {
|
|
|
|
|
this.form.quality = obj.quality;
|
|
|
|
|
this.form.unit = obj.unit;
|
|
|
|
|
this.form.incomeTime = obj.incomeTime;
|
|
|
|
|
this.form.checkLoc = obj.checkLocName;
|
|
|
|
|
getBatchList(obj.workorderCode).then(response => {
|
|
|
|
|
this.batchList = response;
|
|
|
|
|
});
|
|
|
|
|
@ -691,6 +716,16 @@ export default {
|
|
|
|
|
this.form.materialName = obj.name;
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
/**工作中心选择弹出框**/
|
|
|
|
|
handleSelectWorkCenter() {
|
|
|
|
|
this.$refs.itemSelectWorkCenter.showFlag = true;
|
|
|
|
|
},
|
|
|
|
|
//工作中心选择确认
|
|
|
|
|
onSelectWorkCenter(obj) {
|
|
|
|
|
this.form.supplierCode = obj.code;
|
|
|
|
|
this.form.supplierName = obj.name;
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
/**仓库选择弹出框**/
|
|
|
|
|
handleSelectLoc() {
|
|
|
|
|
this.$refs.itemSelectLoc.showFlag = true;
|
|
|
|
|
|
zhaoxiaolin
6 months ago