采购入库和销售出库的检验单移动到行上

This commit is contained in:
yinjinlu-pc\尹金路 2023-10-10 18:16:25 +08:00
parent 89c0ae8756
commit 99087c671b
4 changed files with 109 additions and 23 deletions

View File

@ -105,7 +105,6 @@
</template>
</el-table-column>
<el-table-column label="入库单名称" align="center" prop="recptName" :show-overflow-tooltip="true"/>
<el-table-column label="检验单编号" align="center" width="180px" prop="iqcCode" />
<el-table-column label="供应商名称" align="center" prop="vendorName" :show-overflow-tooltip="true"/>
<el-table-column label="入库日期" align="center" prop="recptDate" width="180">
<template slot-scope="scope">
@ -210,14 +209,6 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="来料检验单" prop="iqcCode">
<el-input v-model="form.iqcCode" readonly="readonly" placeholder="请选择来料检验单" >
<el-button slot="append" @click="handleSelectIqc" icon="el-icon-search"></el-button>
</el-input>
<IqcSelect ref="iqcSelect" @onSelected="onIqcSelected"></IqcSelect>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="供应商" prop="vendorName">
<el-input v-model="form.vendorName" readonly="readonly" placeholder="请选择供应商" >
@ -236,6 +227,9 @@
</el-cascader>
</el-form-item>
</el-col>
<el-col :span="8">
</el-col>
</el-row>
<el-row>
<el-col :span="24">

View File

@ -41,6 +41,12 @@
<span>{{ parseTime(scope.row.expireDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="是否检验" align="center" prop="iqcCheck">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.iqcCheck"/>
</template>
</el-table-column>
<el-table-column label="检验单编号" width="120" align="center" prop="iqcCode" />
<el-table-column label="操作" align="center" width="100px" v-if="optType != 'view'" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -115,7 +121,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="8">
<el-form-item label="入库仓库" prop="warehouseId">
<el-cascader v-model="warehouseInfo"
:options="warehouseOptions"
@ -125,6 +131,33 @@
</el-cascader>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否检验">
<el-radio-group v-model="form.iqcCheck" disabled v-if="optType=='view'">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
<el-radio-group v-model="form.iqcCheck" v-else>
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span ="8">
<el-form-item v-if="form.iqcCheck == 'Y'" label="来料检验单" prop="iqcCode">
<el-input v-model="form.iqcCode" readonly="readonly" placeholder="请选择来料检验单" >
<el-button slot="append" @click="handleSelectIqc" icon="el-icon-search"></el-button>
</el-input>
<IqcSelect ref="iqcSelect" @onSelected="onIqcSelected"></IqcSelect>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
@ -145,10 +178,12 @@
<script>
import { listItemrecptline, getItemrecptline, delItemrecptline, addItemrecptline, updateItemrecptline } from "@/api/mes/wm/itemrecptline";
import ItemSelect from "@/components/itemSelect/single.vue";
import IqcSelect from "@/components/iqcSelect/single.vue";
import {getTreeList} from "@/api/mes/wm/warehouse"
export default {
name: "Itemrecptline",
components :{ItemSelect},
dicts: ['sys_yes_no'],
components :{ItemSelect,IqcSelect},
props:{
recptId: null,
optType: null,
@ -294,6 +329,9 @@ export default {
areaId: this.areaId,
areaCode: null,
areaName: null,
iqcCheck: 'N',
iqcId: null,
iqcCode: null,
expireDate: null,
remark: null,
attr1: null,
@ -362,6 +400,17 @@ export default {
this.form.unitOfMeasure = obj.unitOfMeasure;
}
},
//IQC
handleSelectIqc(){
this.$refs.iqcSelect.showFlag = true;
},
//IQC
onIqcSelected(obj){
if(obj != undefined && obj != null){
this.form.iqcId = obj.iqcId;
this.form.iqcCode = obj.iqcCode;
}
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {

View File

@ -97,7 +97,6 @@
</template>
</el-table-column>
<el-table-column label="出库单名称" width="150px" align="center" prop="salseName" />
<el-table-column label="出货检验单" width="150px" align="center" prop="oqcCode" />
<el-table-column label="销售订单编号" width="120px" align="center" prop="soCode" />
<el-table-column label="客户编码" align="center" prop="clientCode" />
<el-table-column label="客户名称" align="center" prop="clientName" />
@ -175,14 +174,6 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="出货检验单" prop="oqcCode">
<el-input v-model="form.oqcCode" placeholder="请输入出货检验单" >
<el-button slot="append" @click="handleSelectOqc" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
<OqcSelectSingle ref="oqcSelect" @onSelected="onOqcSelected"></OqcSelectSingle>
</el-col>
<el-col :span="8">
<el-form-item label="销售订单编号" prop="soCode">
<el-input v-model="form.soCode" placeholder="请输入销售订单编号" />
@ -196,13 +187,14 @@
<ClientSelect ref="clientSelect" @onSelected="onClientSelected" > </ClientSelect>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="客户名称" prop="clientName">
<el-input v-model="form.clientName" readonly="readonly"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="出库日期" prop="salseDate">
<el-date-picker clearable

View File

@ -47,6 +47,12 @@
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
<el-table-column label="库区名称" align="center" prop="locationName" />
<el-table-column label="库位名称" align="center" prop="areaName" />
<el-table-column label="是否检验" align="center" prop="iqcCheck">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.oqcCheck"/>
</template>
</el-table-column>
<el-table-column label="检验单编号" width="120" align="center" prop="oqcCode" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@ -134,6 +140,35 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="是否检验">
<el-radio-group v-model="form.oqcCheck" disabled v-if="optType=='view'">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
<el-radio-group v-model="form.oqcCheck" v-else>
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item v-if="form.oqcCheck == 'Y'" label="出货检验单" prop="oqcCode">
<el-input v-model="form.oqcCode" placeholder="请输入出货检验单" >
<el-button slot="append" @click="handleSelectOqc" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
<OqcSelectSingle ref="oqcSelect" @onSelected="onOqcSelected"></OqcSelectSingle>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
@ -153,9 +188,11 @@
<script>
import { listProductsalseline, getProductsalseline, delProductsalseline, addProductsalseline, updateProductsalseline } from "@/api/mes/wm/productsalseline";
import StockSelect from "@/components/stockSelect/single.vue"
import OqcSelectSingle from "@/components/oqcSelect/single.vue"
export default {
name: "Productsalseline",
components: {StockSelect},
dicts: ['sys_yes_no'],
components: {StockSelect,OqcSelectSingle},
props: {
salseId: null,
optType: null,
@ -271,6 +308,9 @@ export default {
areaId: this.areaId,
areaCode: null,
areaName: null,
oqcCheck: 'N',
oqcId: null,
oqcCode: null,
remark: null,
attr1: null,
attr2: null,
@ -381,6 +421,17 @@ export default {
this.form.quantityMax = obj.quantityOnhand;
}
},
//OQC
handleSelectOqc(){
this.$refs.oqcSelect.showFlag = true;
},
//OQC
onOqcSelected(obj){
if(obj != undefined && obj != null){
this.form.oqcId = obj.oqcId;
this.form.oqcCode = obj.oqcCode;
}
},
}
};
</script>