|
|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
<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="checkNo">
|
|
|
|
|
<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="请输入检验任务编号"
|
|
|
|
|
@ -41,46 +41,25 @@
|
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="数量" prop="quality">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.quality"
|
|
|
|
|
placeholder="请输入数量"
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="单位" prop="unit">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.unit"
|
|
|
|
|
placeholder="请输入单位"
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="供应商编码" prop="supplierCode">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.supplierCode"
|
|
|
|
|
placeholder="请输入供应商编码"
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="供应商名称" prop="supplierName">
|
|
|
|
|
<el-form-item label="仓库名称" prop="supplierName">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.supplierName"
|
|
|
|
|
placeholder="请输入供应商名称"
|
|
|
|
|
placeholder="请输入仓库名称"
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="来料时间" prop="incomeTime">
|
|
|
|
|
<el-date-picker clearable
|
|
|
|
|
v-model="queryParams.incomeTime"
|
|
|
|
|
type="date"
|
|
|
|
|
value-format="yyyy-MM-dd"
|
|
|
|
|
placeholder="请选择来料时间">
|
|
|
|
|
<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"
|
|
|
|
|
@ -89,15 +68,7 @@
|
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="检测人工号" prop="checkManCode">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.checkManCode"
|
|
|
|
|
placeholder="请输入检测人工号"
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="检测人姓名" prop="checkManName">
|
|
|
|
|
<el-form-item label="检测人" prop="checkManName">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.checkManName"
|
|
|
|
|
placeholder="请输入检测人姓名"
|
|
|
|
|
@ -106,60 +77,28 @@
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="检验时间" prop="checkTime">
|
|
|
|
|
<el-date-picker clearable
|
|
|
|
|
v-model="queryParams.checkTime"
|
|
|
|
|
type="date"
|
|
|
|
|
value-format="yyyy-MM-dd"
|
|
|
|
|
placeholder="请选择检验时间">
|
|
|
|
|
<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 label="检验结果Y合格" prop="checkResult">
|
|
|
|
|
<el-input
|
|
|
|
|
<el-form-item label="检验结果" prop="checkResult">
|
|
|
|
|
<el-select
|
|
|
|
|
v-model="queryParams.checkResult"
|
|
|
|
|
placeholder="请输入检验结果Y合格"
|
|
|
|
|
placeholder="检验结果"
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="预留字段1" prop="attr1">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.attr1"
|
|
|
|
|
placeholder="请输入预留字段1"
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="预留字段2" prop="attr2">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.attr2"
|
|
|
|
|
placeholder="请输入预留字段2"
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="预留字段3" prop="attr3">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.attr3"
|
|
|
|
|
placeholder="请输入预留字段3"
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="预留字段4" prop="attr4">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.attr4"
|
|
|
|
|
placeholder="请输入预留字段4"
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="工厂编码" prop="factoryCode">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.factoryCode"
|
|
|
|
|
placeholder="请输入工厂编码"
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
|
>
|
|
|
|
|
<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>
|
|
|
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
|
|
@ -178,6 +117,7 @@
|
|
|
|
|
v-hasPermi="['quality:qcWarehousing:add']"
|
|
|
|
|
>新增</el-button>
|
|
|
|
|
</el-col>
|
|
|
|
|
<!--
|
|
|
|
|
<el-col :span="1.5">
|
|
|
|
|
<el-button
|
|
|
|
|
type="success"
|
|
|
|
|
@ -199,7 +139,7 @@
|
|
|
|
|
@click="handleDelete"
|
|
|
|
|
v-hasPermi="['quality:qcWarehousing:remove']"
|
|
|
|
|
>删除</el-button>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-col>-->
|
|
|
|
|
<el-col :span="1.5">
|
|
|
|
|
<el-button
|
|
|
|
|
type="warning"
|
|
|
|
|
@ -215,53 +155,65 @@
|
|
|
|
|
|
|
|
|
|
<el-table v-loading="loading" :data="warehousingList" @selection-change="handleSelectionChange">
|
|
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
|
|
<el-table-column label="id" align="center" prop="recordId" />
|
|
|
|
|
<el-table-column label="检验任务编号" align="center" prop="checkNo" />
|
|
|
|
|
<el-table-column label="批次号" align="center" prop="batchNo" />
|
|
|
|
|
<el-table-column label="订单号" align="center" prop="orderNo" />
|
|
|
|
|
<el-table-column label="物料号" align="center" prop="materialCode" />
|
|
|
|
|
<el-table-column label="物料名称" align="center" prop="materialName" />
|
|
|
|
|
<el-table-column label="id" align="center" prop="recordId" v-if="false"/>
|
|
|
|
|
<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
|
|
|
|
|
<el-table-column label="批次号" align="center" prop="batchNo" width="120"/>
|
|
|
|
|
<el-table-column label="订单号" align="center" prop="orderNo" 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="quality" />
|
|
|
|
|
<el-table-column label="单位" align="center" prop="unit" />
|
|
|
|
|
<el-table-column label="供应商编码" align="center" prop="supplierCode" />
|
|
|
|
|
<el-table-column label="供应商名称" align="center" prop="supplierName" />
|
|
|
|
|
<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}') }}</span>
|
|
|
|
|
<span>{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="检测地点" align="center" prop="checkLoc" />
|
|
|
|
|
<el-table-column label="检测状态" align="center" prop="checkStatus" />
|
|
|
|
|
<el-table-column label="检测人工号" align="center" prop="checkManCode" />
|
|
|
|
|
<el-table-column label="检测人姓名" align="center" prop="checkManName" />
|
|
|
|
|
<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}') }}</span>
|
|
|
|
|
<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" 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="检验结果Y合格" align="center" prop="checkResult" />
|
|
|
|
|
<el-table-column label="是否启用1启用0停用" align="center" prop="status" />
|
|
|
|
|
<el-table-column label="预留字段1" align="center" prop="attr1" />
|
|
|
|
|
<el-table-column label="预留字段2" align="center" prop="attr2" />
|
|
|
|
|
<el-table-column label="预留字段3" align="center" prop="attr3" />
|
|
|
|
|
<el-table-column label="预留字段4" align="center" prop="attr4" />
|
|
|
|
|
<el-table-column label="工厂编码" align="center" prop="factoryCode" />
|
|
|
|
|
<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="handleUpdate(scope.row)"
|
|
|
|
|
@click="handleCheckProject(scope.row)"
|
|
|
|
|
v-hasPermi="['quality:qcWarehousing:edit']"
|
|
|
|
|
>修改</el-button>
|
|
|
|
|
>检验</el-button>
|
|
|
|
|
<!--
|
|
|
|
|
<el-button
|
|
|
|
|
size="mini"
|
|
|
|
|
type="text"
|
|
|
|
|
icon="el-icon-delete"
|
|
|
|
|
@click="handleDelete(scope.row)"
|
|
|
|
|
v-hasPermi="['quality:qcWarehousing:remove']"
|
|
|
|
|
>删除</el-button>
|
|
|
|
|
>删除</el-button>-->
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</el-table>
|
|
|
|
|
@ -275,95 +227,155 @@
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
|
|
<!-- 添加或修改成品入库检验任务对话框 -->
|
|
|
|
|
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
|
|
|
<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="请输入检验任务编号" />
|
|
|
|
|
<el-input v-model="form.checkNo" placeholder="请输入检验任务编号" disabled/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="批次号" prop="batchNo">
|
|
|
|
|
<el-input v-model="form.batchNo" placeholder="请输入批次号" />
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item label="入库批次号" prop="batchNo">
|
|
|
|
|
<el-input v-model="form.batchNo" placeholder="请输入入库批次号" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item label="订单号" prop="orderNo">
|
|
|
|
|
<el-input v-model="form.orderNo" placeholder="请输入订单号" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="12">
|
|
|
|
|
<el-form-item label="物料名称" prop="materialName">
|
|
|
|
|
<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-col>
|
|
|
|
|
|
|
|
|
|
<el-col :span="12">
|
|
|
|
|
<el-form-item label="物料号" prop="materialCode">
|
|
|
|
|
<el-input v-model="form.materialCode" placeholder="请输入物料号" />
|
|
|
|
|
<el-input v-model="form.materialCode" placeholder="请输入物料号" disabled/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="物料名称" prop="materialName">
|
|
|
|
|
<el-input v-model="form.materialName" placeholder="请输入物料名称" />
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row>
|
|
|
|
|
<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-form-item label="数量" prop="quality">
|
|
|
|
|
<el-input v-model="form.quality" placeholder="请输入数量" />
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item label="入库数量" prop="quality">
|
|
|
|
|
<el-input type="number" v-model="form.quality" placeholder="请输入收货数量" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="单位" prop="unit">
|
|
|
|
|
<el-input v-model="form.unit" placeholder="请输入单位" />
|
|
|
|
|
</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-form-item label="供应商编码" prop="supplierCode">
|
|
|
|
|
<el-input v-model="form.supplierCode" placeholder="请输入供应商编码" />
|
|
|
|
|
</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="handleSelectLoc" icon="el-icon-search"></el-button>
|
|
|
|
|
</el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="供应商名称" prop="supplierName">
|
|
|
|
|
<el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item label="仓库编码" prop="supplierCode">
|
|
|
|
|
<el-input v-model="form.supplierCode" placeholder="请输入仓库编码" disabled/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="来料时间" prop="incomeTime">
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item label="入库时间" prop="incomeTime">
|
|
|
|
|
<el-date-picker clearable
|
|
|
|
|
v-model="form.incomeTime"
|
|
|
|
|
type="date"
|
|
|
|
|
value-format="yyyy-MM-dd"
|
|
|
|
|
placeholder="请选择来料时间">
|
|
|
|
|
type="datetime"
|
|
|
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
|
placeholder="请选择入库时间">
|
|
|
|
|
</el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="检测地点" prop="checkLoc">
|
|
|
|
|
<el-input v-model="form.checkLoc" placeholder="请输入检测地点" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="检测人工号" prop="checkManCode">
|
|
|
|
|
<el-input v-model="form.checkManCode" 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-input v-model="form.checkManName" placeholder="请选择检测人姓名">
|
|
|
|
|
<el-button slot="append" @click="handleSelectUser" icon="el-icon-search"></el-button>
|
|
|
|
|
</el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="检验时间" prop="checkTime">
|
|
|
|
|
<el-date-picker clearable
|
|
|
|
|
v-model="form.checkTime"
|
|
|
|
|
type="date"
|
|
|
|
|
value-format="yyyy-MM-dd"
|
|
|
|
|
placeholder="请选择检验时间">
|
|
|
|
|
</el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="检验结果Y合格" prop="checkResult">
|
|
|
|
|
<el-input v-model="form.checkResult" placeholder="请输入检验结果Y合格" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="预留字段1" prop="attr1">
|
|
|
|
|
<el-input v-model="form.attr1" placeholder="请输入预留字段1" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="预留字段2" prop="attr2">
|
|
|
|
|
<el-input v-model="form.attr2" placeholder="请输入预留字段2" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="预留字段3" prop="attr3">
|
|
|
|
|
<el-input v-model="form.attr3" placeholder="请输入预留字段3" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="预留字段4" prop="attr4">
|
|
|
|
|
<el-input v-model="form.attr4" placeholder="请输入预留字段4" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="工厂编码" prop="factoryCode">
|
|
|
|
|
<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item label="检测人工号" prop="checkManCode" >
|
|
|
|
|
<el-input v-model="form.checkManCode" placeholder="请输入检测人工号" disabled/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="删除标识1删除0正常" prop="delFlag">
|
|
|
|
|
<el-input v-model="form.delFlag" placeholder="请输入删除标识1删除0正常" />
|
|
|
|
|
</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>
|
|
|
|
|
<!--产品物料选择弹窗-->
|
|
|
|
|
<ItemSelectMaterial
|
|
|
|
|
ref="itemSelectMaterial"
|
|
|
|
|
@onSelected="onSelectMaterial"
|
|
|
|
|
></ItemSelectMaterial>
|
|
|
|
|
<!--仓库选择弹窗-->
|
|
|
|
|
<ItemSelectLoc
|
|
|
|
|
ref="itemSelectLoc"
|
|
|
|
|
@onSelected="onSelectLoc"
|
|
|
|
|
></ItemSelectLoc>
|
|
|
|
|
<!--人员选择弹窗-->
|
|
|
|
|
<ItemSelectUser
|
|
|
|
|
ref="itemSelectUser"
|
|
|
|
|
@onSelected="onSelectUser"
|
|
|
|
|
></ItemSelectUser>
|
|
|
|
|
<!--检验项目弹窗-->
|
|
|
|
|
<ItemSelectProject
|
|
|
|
|
ref="itemSelectProject"
|
|
|
|
|
@saveCheck="saveCheck"
|
|
|
|
|
></ItemSelectProject>
|
|
|
|
|
</div>
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
<script>
|
|
|
|
|
import { listWarehousing, getWarehousing, delWarehousing, addWarehousing, updateWarehousing } from "@/api/quality/warehousing";
|
|
|
|
|
|
|
|
|
|
import { getCheckTypes } from "@/api/quality/qcProduce";
|
|
|
|
|
import ItemSelectMaterial from "../qcIncome/selectMaterial.vue";
|
|
|
|
|
import ItemSelectLoc from "./selectLoc.vue";
|
|
|
|
|
import ItemSelectUser from "../qcIncome/selectUser.vue";
|
|
|
|
|
import ItemSelectProject from "../qcIncome/checkProjectType.vue";
|
|
|
|
|
import moment from 'moment';
|
|
|
|
|
export default {
|
|
|
|
|
name: "Warehousing",
|
|
|
|
|
components: { ItemSelectMaterial,ItemSelectLoc,ItemSelectUser,ItemSelectProject},
|
|
|
|
|
dicts: ["unit","check_status","check_result"],
|
|
|
|
|
data() {
|
|
|
|
|
return {
|
|
|
|
|
// 遮罩层
|
|
|
|
|
@ -386,6 +398,8 @@ export default {
|
|
|
|
|
open: false,
|
|
|
|
|
// 查询参数
|
|
|
|
|
queryParams: {
|
|
|
|
|
incomeTimeArray: [],
|
|
|
|
|
checkTimeArray: [],
|
|
|
|
|
pageNum: 1,
|
|
|
|
|
pageSize: 10,
|
|
|
|
|
checkNo: null,
|
|
|
|
|
@ -415,19 +429,80 @@ export default {
|
|
|
|
|
form: {},
|
|
|
|
|
// 表单校验
|
|
|
|
|
rules: {
|
|
|
|
|
factoryCode: [
|
|
|
|
|
{ required: true, message: "工厂编码不能为空", trigger: "blur" }
|
|
|
|
|
batchNo: [
|
|
|
|
|
{ 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:[]
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
created() {
|
|
|
|
|
this.getDate();
|
|
|
|
|
this.getList();
|
|
|
|
|
this.getCheckTypes();
|
|
|
|
|
},
|
|
|
|
|
methods: {
|
|
|
|
|
/****/
|
|
|
|
|
getCheckTypes() {
|
|
|
|
|
getCheckTypes('product').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.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');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(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');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
listWarehousing(this.queryParams).then(response => {
|
|
|
|
|
this.warehousingList = response.rows;
|
|
|
|
|
this.total = response.total;
|
|
|
|
|
@ -540,6 +615,56 @@ export default {
|
|
|
|
|
this.download('qcWarehousing/warehousing/export', {
|
|
|
|
|
...this.queryParams
|
|
|
|
|
}, `warehousing_${new Date().getTime()}.xlsx`)
|
|
|
|
|
},
|
|
|
|
|
// 数据状态修改
|
|
|
|
|
handleStatusChange(row) {
|
|
|
|
|
let text = row.status === "0" ? "停用" : "启用";
|
|
|
|
|
this.$modal.confirm('确认要"' + text + '""' + row.checkNo + '"吗？').then(function() {
|
|
|
|
|
return changeProduceStatus(row.recordId, row.status);
|
|
|
|
|
}).then(() => {
|
|
|
|
|
this.$modal.msgSuccess(text + "成功");
|
|
|
|
|
}).catch(function() {
|
|
|
|
|
row.status = row.status === "0" ? "1" : "0";
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
/**物料选择弹出框**/
|
|
|
|
|
handleSelectMaterial() {
|
|
|
|
|
this.$refs.itemSelectMaterial.showFlag = true;
|
|
|
|
|
},
|
|
|
|
|
//物料选择确认
|
|
|
|
|
onSelectMaterial(obj) {
|
|
|
|
|
this.form.materialCode = obj.code;
|
|
|
|
|
this.form.materialName = obj.name;
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
/**仓库选择弹出框**/
|
|
|
|
|
handleSelectLoc() {
|
|
|
|
|
this.$refs.itemSelectLoc.showFlag = true;
|
|
|
|
|
},
|
|
|
|
|
//仓库选择确认
|
|
|
|
|
onSelectLoc(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){
|
|
|
|
|
this.$refs.itemSelectProject.showFlag = true;
|
|
|
|
|
this.$refs.itemSelectProject.init(row,'product');
|
|
|
|
|
},
|
|
|
|
|
//提交检测结果
|
|
|
|
|
saveCheck(){
|
|
|
|
|
this.getList();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
zhaoxiaolin
1 year ago