|
|
|
|
@ -9,63 +9,8 @@
|
|
|
|
|
@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-form-item label="任务创建时间" prop="checkTimeArray" label-width="120px">
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="queryParams.checkTimeArray"
|
|
|
|
|
format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
|
@ -124,6 +69,17 @@
|
|
|
|
|
v-hasPermi="['quality:qcInventory:export']"
|
|
|
|
|
>导出</el-button>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="1.5">
|
|
|
|
|
<el-button
|
|
|
|
|
type="danger"
|
|
|
|
|
plain
|
|
|
|
|
icon="el-icon-magic-stick"
|
|
|
|
|
size="mini"
|
|
|
|
|
:disabled="single"
|
|
|
|
|
@click="handleUpdate"
|
|
|
|
|
v-hasPermi="['quality:qcInventory:edit']"
|
|
|
|
|
>审核编辑</el-button>
|
|
|
|
|
</el-col>
|
|
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
@ -131,20 +87,18 @@
|
|
|
|
|
<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="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">
|
|
|
|
|
<el-table-column label="检验任务编号" align="center" prop="checkNo" width="100"/>
|
|
|
|
|
<el-table-column label="库存批次号" align="center" prop="incomeBatchNo" width="100"/>
|
|
|
|
|
<el-table-column label="物料号" align="center" prop="materialCode" width="80"/>
|
|
|
|
|
<el-table-column label="物料名称" align="center" prop="materialName" width="100"/>
|
|
|
|
|
<el-table-column label="仓库编码" align="center" prop="supplierCode" width="90"/>
|
|
|
|
|
<el-table-column label="仓库名称" align="center" prop="supplierName" width="90"/>
|
|
|
|
|
<el-table-column label="检测地点" align="center" prop="checkLoc" width="100"/>
|
|
|
|
|
<el-table-column label="创建时间" align="center" prop="checkTime" width="100">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<span>{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
|
|
<span>{{ parseTime(scope.row.checkTime, '{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
|
|
|
|
|
@ -155,33 +109,12 @@
|
|
|
|
|
</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">
|
|
|
|
|
<el-table-column label="检验时间" align="center" prop="checkTime" width="100">
|
|
|
|
|
<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
|
|
|
|
|
@ -214,45 +147,29 @@
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item label="批次号" prop="incomeBatchNo">
|
|
|
|
|
<el-input v-model="form.incomeBatchNo" placeholder="请输入批次号">
|
|
|
|
|
</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-button slot="append" @click="handleSelectMaterial" 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="materialCode">
|
|
|
|
|
<el-input v-model="form.materialCode" placeholder="请输入物料号" disabled/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<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-row>
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="抽样数量" prop="sampleQuality">
|
|
|
|
|
<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量"/>
|
|
|
|
|
<el-form-item label="批次号" prop="incomeBatchNo">
|
|
|
|
|
<el-input v-model="form.incomeBatchNo" placeholder="请输入批次号">
|
|
|
|
|
</el-input>
|
|
|
|
|
</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-col :span="8">
|
|
|
|
|
<el-form-item label="入库时间" prop="incomeTime">
|
|
|
|
|
<el-input v-model="form.incomeTime" placeholder="" disabled/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
@ -283,11 +200,7 @@
|
|
|
|
|
<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">
|
|
|
|
|
@ -370,7 +283,7 @@ export default {
|
|
|
|
|
incomeTime: null,
|
|
|
|
|
checkLoc: null,
|
|
|
|
|
checkStatus: null,
|
|
|
|
|
checkManCode: null,
|
|
|
|
|
checkManCode: null,
|
|
|
|
|
checkManName: null,
|
|
|
|
|
checkTime: null,
|
|
|
|
|
checkResult: null,
|
|
|
|
|
@ -410,9 +323,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" }
|
|
|
|
|
],
|
|
|
|
|
|
zhaoxiaolin
4 months ago