mes/mes-lxsm-ui
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加到货通知单功能

Browse Source
This commit is contained in:
yinjinlu-pc\尹金路 2024-11-13 18:25:31 +08:00
parent 6f6d77bb72
commit 124bbc4a3e
14 changed files with 1272 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/api/mes/wm/arrivalnotice.js Normal file
View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询到货通知单列表
export function listArrivalnotice(query) {
return request({
url: '/mes/wm/arrivalnotice/list',
method: 'get',
params: query
})
}
// 查询到货通知单详细
export function getArrivalnotice(noticeId) {
return request({
url: '/mes/wm/arrivalnotice/' + noticeId,
method: 'get'
})
}
// 新增到货通知单
export function addArrivalnotice(data) {
return request({
url: '/mes/wm/arrivalnotice',
method: 'post',
data: data
})
}
// 修改到货通知单
export function updateArrivalnotice(data) {
return request({
url: '/mes/wm/arrivalnotice',
method: 'put',
data: data
})
}
// 删除到货通知单
export function delArrivalnotice(noticeId) {
return request({
url: '/mes/wm/arrivalnotice/' + noticeId,
method: 'delete'
})
}

44
src/api/mes/wm/arrivalnoticeline.js Normal file
View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询到货通知单行列表
export function listArrivalnoticeline(query) {
return request({
url: '/mes/wm/arrivalnoticeline/list',
method: 'get',
params: query
})
}
// 查询到货通知单行详细
export function getArrivalnoticeline(lineId) {
return request({
url: '/mes/wm/arrivalnoticeline/' + lineId,
method: 'get'
})
}
// 新增到货通知单行
export function addArrivalnoticeline(data) {
return request({
url: '/mes/wm/arrivalnoticeline',
method: 'post',
data: data
})
}
// 修改到货通知单行
export function updateArrivalnoticeline(data) {
return request({
url: '/mes/wm/arrivalnoticeline',
method: 'put',
data: data
})
}
// 删除到货通知单行
export function delArrivalnoticeline(lineId) {
return request({
url: '/mes/wm/arrivalnoticeline/' + lineId,
method: 'delete'
})
}

4
src/components/ImageUpload/index.vue
View File

@ -76,7 +76,7 @@ export default {
dialogImageUrl: "",
dialogVisible: false,
hideUpload: false,
baseUrl: process.env.VUE_APP_BASE_API,
baseUrl: '',//process.env.VUE_APP_BASE_API,
uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/uploadMinio", // 上传的图片服务器地址
headers: {
Authorization: "Bearer " + getToken(),
@ -93,6 +93,7 @@ export default {
// 然后将数组转为对象数组
this.fileList = list.map(item => {
if (typeof item === "string") {
debugger;
if (item.indexOf(this.baseUrl) === -1) {
item = { name: this.baseUrl + item, url: this.baseUrl + item };
} else {
@ -127,6 +128,7 @@ export default {
},
// 上传成功回调
handleUploadSuccess(res) {
debugger;
this.uploadList.push({ name: res.fileName, url: res.fileName });
if (this.uploadList.length === this.number) {
this.fileList = this.fileList.concat(this.uploadList);

4
src/components/RuoYi/Git/index.vue
View File

@ -6,10 +6,10 @@
<script>
export default {
name: 'RuoYiGit',
name: 'KTG-MES-Git',
data() {
return {
url: 'https://gitee.com/y_project/RuoYi-Vue'
url: 'https://gitee.com/kutangguo/ktg-mes'
}
},
methods: {

133
src/components/noticeSelect/lineSingle.vue Normal file
View File

@ -0,0 +1,133 @@
<template>
<el-dialog title="到货通知单选择"
v-if="showFlag"
:visible.sync="showFlag"
:modal= false
width="80%"
center
>
<el-table v-loading="loading" :data="arrivalnoticelineList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
<el-table-column width="50" align="center" >
<template v-slot="scope">
<el-radio v-model="selectedId" :label="scope.row.lineId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
</template>
</el-table-column>
<el-table-column label="物料编码" width="120px" align="center" prop="itemCode" />
<el-table-column label="物料名称" width="150px" align="center" prop="itemName" />
<el-table-column label="规格型号" align="center" prop="specification" />
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
<el-table-column label="到货数量" align="center" prop="quantityArrival" />
<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="合格数量" align="center" prop="quantityQuanlified" />
<el-table-column label="检验单号" align="center" prop="iqcCode" />
<el-table-column label="备注" align="center" prop="remark" />
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelect">确 定</el-button>
<el-button @click="showFlag=false">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { listArrivalnoticeline} from "@/api/mes/wm/arrivalnoticeline";
export default {
name: "Arrivalnoticeline",
dicts: ['sys_yes_no'],
props:{
noticeId: null
},
data() {
return {
showFlag:false,
// 遮罩层
loading: true,
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 到货通知单行表格数据
arrivalnoticelineList: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
noticeId: this.noticeId, itemId: null, itemCode: null, itemName: null, specification: null, unitOfMeasure: null, quantityArrival: null, quantityQuanlified: null, iqcCheck: null, iqcId: null, iqcCode: null, },
};
},
created() {
this.getList();
},
methods: {
/** 查询到货通知单行列表 */
getList() {
this.loading = true;
listArrivalnoticeline(this.queryParams).then(response => {
this.arrivalnoticelineList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//行双击选中
handleRowDbClick(row){
if(row){
this.selectedRow = row;
this.$emit('onSelected',this.selectedRow);
this.showFlag = false;
}
},
// 单选选中数据
handleRowChange(row) {
if(row){
this.selectedRow = row;
}
},
handleCurrent(row){
if(row){
this.selectedRow = row;
}
},
//确定选中
confirmSelect(){
if(this.selectedId ==null || this.selectedId==0){
this.$notify({
title:'提示',
type:'warning',
message: '请至少选择一条数据!'
});
return;
}
this.$emit('onSelected',this.selectedRow);
this.showFlag = false;
}
}
};
</script>

193
src/components/noticeSelect/single.vue Normal file
View File

@ -0,0 +1,193 @@
<template>
<el-dialog title="到货通知单选择"
v-if="showFlag"
:visible.sync="showFlag"
:modal= false
width="80%"
center
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="通知单编号" prop="noticeCode">
<el-input
v-model="queryParams.noticeCode"
placeholder="请输入通知单编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="通知单名称" prop="noticeName">
<el-input
v-model="queryParams.noticeName"
placeholder="请输入通知单名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="采购订单编号" prop="poCode">
<el-input
v-model="queryParams.poCode"
placeholder="请输入采购订单编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="供应商名称" prop="vendorName">
<el-input
v-model="queryParams.vendorName"
placeholder="请输入供应商名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="到货日期" prop="arrivalDate">
<el-date-picker clearable
v-model="queryParams.arrivalDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择到货日期">
</el-date-picker>
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
<el-option label="请选择字典生成" value="" />
</el-select>
</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-table v-loading="loading" :data="arrivalnoticeList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
<el-table-column width="50" align="center" >
<template v-slot="scope">
<el-radio v-model="selectedId" :label="scope.row.noticeId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
</template>
</el-table-column>
<el-table-column label="入库单编号" align="center" width="180px" prop="noticeCode" >
<template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:wm:arrivalnotice:query']"
>{{scope.row.noticeCode}}</el-button>
</template>
</el-table-column>
<el-table-column label="通知单名称" align="center" prop="noticeName" />
<el-table-column label="采购订单号" align="center" prop="poCode" />
<el-table-column label="供应商名称" width="200px" align="center" prop="vendorName" />
<el-table-column label="联系人" align="center" prop="contact" />
<el-table-column label="联系方式" align="center" prop="tel" />
<el-table-column label="到货日期" align="center" prop="arrivalDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.arrivalDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelect">确 定</el-button>
<el-button @click="showFlag=false">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { listArrivalnotice} from "@/api/mes/wm/arrivalnotice";
export default {
name: "ArrivalnoticeSelect",
data() {
return {
showFlag:false,
// 遮罩层
loading: true,
// 选中
selectedId: null,
selectedRow: undefined,
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 到货通知单表格数据
arrivalnoticeList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
noticeCode: null, noticeName: null, poCode: null, vendorId: null, vendorCode: null, vendorName: null, vendorNick: null, arrivalDate: null, status: 'APPROVED', },
};
},
created() {
this.getList();
},
methods: {
/** 查询到货通知单列表 */
getList() {
this.loading = true;
listArrivalnotice(this.queryParams).then(response => {
this.arrivalnoticeList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//行双击选中
handleRowDbClick(row){
if(row){
this.selectedRow = row;
this.$emit('onSelected',this.selectedRow);
this.showFlag = false;
}
},
// 单选选中数据
handleRowChange(row) {
if(row){
this.selectedRow = row;
}
},
handleCurrent(row){
if(row){
this.selectedRow = row;
}
},
//确定选中
confirmSelect(){
if(this.selectedId ==null || this.selectedId==0){
this.$notify({
title:'提示',
type:'warning',
message: '请至少选择一条数据!'
});
return;
}
this.$emit('onSelected',this.selectedRow);
this.showFlag = false;
}
}
}
</script>

19
src/views/mes/md/mditem/index.vue
View File

@ -269,7 +269,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="8">
<el-form-item label="是否启用">
<el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
<el-radio
@ -287,7 +287,18 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="8">
<el-form-item label="批次管理">
<el-switch
v-model="form.batchFlag"
active-text="是"
inactive-text="否"
active-value="Y"
inactive-value="N"
></el-switch>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="安全库存">
<el-radio-group v-model="form.safeStockFlag" disabled v-if="optType=='view'">
<el-radio
@ -334,7 +345,7 @@
<el-tab-pane label="BOM组成">
<ItemBom :optType="optType" :itemId="form.itemId"></ItemBom>
</el-tab-pane>
<el-tab-pane label="供应商"></el-tab-pane>
<el-tab-pane v-if="form.batchFlag =='Y'" label="批次属性"></el-tab-pane>
<el-tab-pane label="替代品"></el-tab-pane>
<el-tab-pane label="SIP">
<SIPTab :itemId="form.itemId" :optType="optType"></SIPTab>
@ -560,6 +571,8 @@ export default {
itemOrProduct: undefined,
enableFlag: 'Y',
safeStockFlag: 'N',
highValue: 'N',
batchFlag: 'Y',
barcodeUrl: null,
minStock: 0,
maxStock: 0,

12
src/views/mes/qc/iqc/iqc.vue
View File

@ -295,8 +295,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="本次检测数量" prop="quantityCheck">
<el-input :min="1" v-model="form.quantityCheck" placeholder="请输入本次检测数量" />
<el-form-item label="合格品数量" prop="quantityQualified">
<el-input :min="0" v-model="form.quantityQualified" placeholder="请输入合格品数量" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -347,7 +347,7 @@
</el-col>
</el-row>
<el-collapse accordion>
<el-collapse-item title="结果统计">
<el-collapse-item title="缺陷情况">
<el-row>
<el-col :span="8">
<el-form-item label="致命缺陷率" prop="crRate">
@ -457,6 +457,7 @@ export default {
quantityMaxUnqualified: null,
quantityRecived: null,
quantityCheck: null,
quantityQualified: null,
quantityUnqualified: null,
crRate: null,
majRate: null,
@ -466,7 +467,7 @@ export default {
minQuantity: null,
checkResult: null,
reciveDate: null,
inspectDate: null,
inspectDate: new Date(),
inspector: null,
status: null,
},
@ -490,9 +491,6 @@ export default {
quantityRecived: [
{ required: true, message: "本次接收数量不能为空", trigger: "blur" }
],
quantityCheck: [
{ required: true, message: "本次检测数量不能为空", trigger: "blur" }
],
reciveDate:[
{ required: true, message: "清选择来料日期", trigger: "blur" }
],

2
src/views/mes/qc/pendinginspect/index.vue
View File

@ -35,7 +35,7 @@
<el-table v-loading="loading" :data="pendingList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="单据编码" align="center" prop="sourceDocCode" />
<el-table-column label="来源单据编号" align="center" prop="sourceDocCode" />
<el-table-column label="检测项型" align="center" prop="qcType">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_qc_type" :value="scope.row.qcType"/>

29
src/views/mes/qc/pendinginspect/iqc.vue
View File

@ -27,7 +27,6 @@
<el-image fit="contain" v-else :src="prepareImg" />
</el-col>
</el-row>
<el-divider content-position="center">物料与供应商</el-divider>
<el-row>
<el-col :span="8">
<el-form-item label="产品物料编码" prop="itemCode">
@ -79,8 +78,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="本次检测数量" prop="quantityCheck">
<el-input :min="1" v-model="form.quantityCheck" placeholder="请输入本次检测数量" />
<el-form-item label="合格品数量" prop="quantityQualified">
<el-input-number :min="0" v-model="form.quantityQualified" placeholder="请输入合格品数量" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -131,7 +130,7 @@
</el-col>
</el-row>
<el-collapse accordion>
<el-collapse-item title="结果统计">
<el-collapse-item title="缺陷情况">
<el-row>
<el-col :span="8">
<el-form-item label="致命缺陷率" prop="crRate">
@ -200,23 +199,20 @@ export default {
form: {},
// 表单校验
rules: {
ipqcCode: [
{ required: true, message: "请输入或生产检验单编号", trigger: "blur" }
iqcCode: [
{ required: true, message: "请输入检验单编号", trigger: "blur" }
],
ipqcType: [
{ required: true, message: "请选择检验类型", trigger: "change" }
iqcName: [
{ required: true, message: "请输入检验单名称", trigger: "blur" }
],
workorderCode: [
{ required: true, message: "请选择生产工单", trigger: "blur" }
],
workstationCode: [
{ required: true, message: "请选择工作站", trigger: "blur" }
],
quantityCheck: [
{ required: true, message: "检测数量不能为空", trigger: "blur" }
checkResult: [
{ required: true, message: "请选择检测结果", trigger: "blur" }
],
quantityUnqualified: [
@ -244,7 +240,7 @@ export default {
this.form = {
iqcId: null,
iqcCode: null,
iqcName: null,
iqcName: '到货通知单【'+this.$route.params.sourceDocCode+'】检验单',
templateId: null,
sourceDocId: this.$route.params.sourceDocId,
sourceDocType: this.$route.params.sourceDocType,
@ -264,6 +260,7 @@ export default {
quantityMaxUnqualified: null,
quantityRecived: this.$route.params.quantityUncheck,
quantityCheck: null,
quantityQualified: null,
quantityUnqualified: null,
crRate: null,
majRate: null,
@ -273,7 +270,7 @@ export default {
minQuantity: null,
checkResult: null,
reciveDate: this.$route.params.recordTime,
inspectDate: null,
inspectDate: new Date(),
inspector: null,
status: "PREPARE",
remark: null,

431
src/views/mes/wm/arrivalnotice/index.vue Normal file
View File

@ -0,0 +1,431 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="通知单编号" prop="noticeCode">
<el-input
v-model="queryParams.noticeCode"
placeholder="请输入通知单编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="通知单名称" prop="noticeName">
<el-input
v-model="queryParams.noticeName"
placeholder="请输入通知单名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="采购订单编号" prop="poCode">
<el-input
v-model="queryParams.poCode"
placeholder="请输入采购订单编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="供应商名称" prop="vendorName">
<el-input
v-model="queryParams.vendorName"
placeholder="请输入供应商名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="到货日期" prop="arrivalDate">
<el-date-picker clearable
v-model="queryParams.arrivalDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择到货日期">
</el-date-picker>
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
<el-option label="请选择字典生成" value="" />
</el-select>
</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="['mes:wm:arrivalnotice: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="['mes:wm:arrivalnotice: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="['mes:wm:arrivalnotice:remove']"
>删除</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="arrivalnoticeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="入库单编号" align="center" width="180px" prop="noticeCode" >
<template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:wm:arrivalnotice:query']"
>{{scope.row.noticeCode}}</el-button>
</template>
</el-table-column>
<el-table-column label="通知单名称" align="center" prop="noticeName" />
<el-table-column label="采购订单号" align="center" prop="poCode" />
<el-table-column label="供应商名称" width="200px" align="center" prop="vendorName" />
<el-table-column label="联系人" align="center" prop="contact" />
<el-table-column label="联系方式" align="center" prop="tel" />
<el-table-column label="到货日期" align="center" prop="arrivalDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.arrivalDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="单据状态" align="center" prop="status" >
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_rn_status" :value="scope.row.status"/>
</template>
</el-table-column>
<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"
v-if="scope.row.status == 'PREPARE'"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:wm:arrivalnotice:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
v-if="scope.row.status == 'PREPARE'"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:wm:arrivalnotice: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="960px" 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="noticeCode">
<el-input v-model="form.noticeCode" placeholder="请输入入库单编号" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
</el-switch>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="通知单名称" prop="noticeName">
<el-input v-model="form.noticeName" placeholder="请输入通知单名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="采购订单编号" prop="poCode">
<el-input v-model="form.poCode" placeholder="请输入采购订单编号" />
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="供应商" prop="vendorName">
<el-input v-model="form.vendorName" readonly="readonly" placeholder="请选择供应商" >
<el-button slot="append" @click="handleSelectVendor" icon="el-icon-search"></el-button>
</el-input>
<VendorSelect ref="vendorSelect" @onSelected="onVendorSelected" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="到货日期" prop="arrivalDate">
<el-date-picker clearable
v-model="form.arrivalDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择到货日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="联系人" prop="contact">
<el-input v-model="form.contact" placeholder="请输入联系人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="联系方式" prop="tel">
<el-input v-model="form.tel" placeholder="请输入联系方式" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-divider v-if="form.noticeId !=null" content-position="center">物料信息</el-divider>
<el-card shadow="always" v-if="form.noticeId !=null" class="box-card">
<NoticeLine :noticeId="form.noticeId" :optType="optType"></NoticeLine>
</el-card>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
<el-button type="primary" @click="saveForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>
<el-button type="success" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' && form.noticeId !== null ">提 交</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listArrivalnotice, getArrivalnotice, delArrivalnotice, addArrivalnotice, updateArrivalnotice } from "@/api/mes/wm/arrivalnotice";
import {genCode} from "@/api/system/autocode/rule"
import VendorSelect from "@/components/vendorSelect/single.vue";
import NoticeLine from "./line.vue"
export default {
name: "Arrivalnotice",
dicts:['mes_rn_status'],
components :{VendorSelect,NoticeLine},
data() {
return {
autoGenFlag:false,
optType: undefined,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 到货通知单表格数据
arrivalnoticeList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
noticeCode: null, noticeName: null, poCode: null, vendorId: null, vendorCode: null, vendorName: null, vendorNick: null, arrivalDate: null, status: null, },
// 表单参数
form: {},
// 表单校验
rules: {
noticeCode: [
{ required: true, message: "入库单编号不能为空", trigger: "blur" }
],
noticeName: [
{ required: true, message: "入库单名称不能为空", trigger: "blur" }
],
vendorName: [
{ required: true, message: "请选择供应商", trigger: "blur" }
],
arrivalDate: [
{ required: true, message: "请选择到货日期", trigger: "blur" }
],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询到货通知单列表 */
getList() {
this.loading = true;
listArrivalnotice(this.queryParams).then(response => {
this.arrivalnoticeList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
noticeId: null, noticeCode: null, noticeName: null, poCode: null, vendorId: null, vendorCode: null, vendorName: null, vendorNick: null, arrivalDate: null, status: "PREPARE", remark: null, attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null };
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.noticeId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加到货通知单";
this.optType = "add";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const noticeId = row.noticeId || this.ids
getArrivalnotice(noticeId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改到货通知单";
this.optType = "edit";
});
},
handleView(row){
this.reset();
const noticeId = row.noticeId || this.ids
getArrivalnotice(noticeId).then(response => {
this.form = response.data;
this.open = true;
this.title = "查看到货通知单";
this.optType = "view";
});
},
/**
* 保存
*/
saveForm(){
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.noticeId != null) {
updateArrivalnotice(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addArrivalnotice(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.form.status = 'APPROVING';
if (this.form.noticeId != null) {
updateArrivalnotice(this.form).then(response => {
this.$modal.msgSuccess("提交成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const noticeIds = row.noticeId || this.ids;
this.$modal.confirm('是否确认删除到货通知单编号为"' + noticeIds + '"的数据项？').then(function() {
return delArrivalnotice(noticeIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('wm/arrivalnotice/export', {
...this.queryParams
}, `arrivalnotice_${new Date().getTime()}.xlsx`)
},
//供应商选择
handleSelectVendor(){
this.$refs.vendorSelect.showFlag = true;
},
//供应商选择弹出框
onVendorSelected(obj){
if(obj != undefined && obj != null){
this.form.vendorId = obj.vendorId;
this.form.vendorCode = obj.vendorCode;
this.form.vendorName = obj.vendorName;
this.form.vendorNick = obj.vendorNick;
}
},
//自动生成编码
handleAutoGenChange(autoGenFlag){
if(autoGenFlag){
genCode('ARRIVALNOTICE_CODE').then(response =>{
this.form.noticeCode = response;
});
}else{
this.form.noticeCode = null;
}
}
}
};
</script>

324
src/views/mes/wm/arrivalnotice/line.vue Normal file
View File

@ -0,0 +1,324 @@
<template>
<div class="app-container">
<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="['mes:wm:arrivalnotice: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="['mes:wm:arrivalnotice: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="['mes:wm:arrivalnotice:remove']"
>删除</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="arrivalnoticelineList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="物料编码" width="120px" align="center" prop="itemCode" />
<el-table-column label="物料名称" width="150px" align="center" prop="itemName" />
<el-table-column label="规格型号" align="center" prop="specification" />
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
<el-table-column label="到货数量" align="center" prop="quantityArrival" />
<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="合格数量" align="center" prop="quantityQuanlified" />
<el-table-column label="检验单号" align="center" prop="iqcCode" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" width="100px" 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)"
v-hasPermi="['mes:wm:arrivalnotice:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:wm:arrivalnotice: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="960px" 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="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择物料编码" >
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
</el-col>
<el-col :span="8">
<el-form-item label="物料名称" prop="itemName">
<el-input v-model="form.itemName" readonly="readonly" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单位" prop="unitOfMeasure">
<el-input v-model="form.unitOfMeasure" readonly="readonly" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<el-form-item label="规格型号" prop="specification">
<el-input v-model="form.specification" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="到货数量" prop="quantityArrival">
<el-input v-model="form.quantityArrival" placeholder="请输入到货数量" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="是否检验" prop="iqcCheck">
<el-radio-group v-model="form.iqcCheck">
<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" disabled >
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item v-if="form.iqcCheck == 'Y'" label="合格数量" prop="quantityQuanlified">
<el-input v-model="form.quantityQuanlified" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" 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>
</div>
</template>
<script>
import { listArrivalnoticeline, getArrivalnoticeline, delArrivalnoticeline, addArrivalnoticeline, updateArrivalnoticeline } from "@/api/mes/wm/arrivalnoticeline";
import ItemSelect from "@/components/itemSelect/single.vue";
import IqcSelect from "@/components/iqcSelect/single.vue";
export default {
name: "Arrivalnoticeline",
dicts: ['sys_yes_no'],
components :{ItemSelect,IqcSelect},
props:{
noticeId: null,
optType: null
},
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 到货通知单行表格数据
arrivalnoticelineList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
noticeId: this.noticeId, itemId: null, itemCode: null, itemName: null, specification: null, unitOfMeasure: null, quantityArrival: null, quantityQuanlified: null, iqcCheck: null, iqcId: null, iqcCode: null, },
// 表单参数
form: {},
// 表单校验
rules: {
itemId: [
{ required: true, message: "产品物料ID不能为空", trigger: "blur" }
], quantityArrival: [
{ required: true, message: "到货数量不能为空", trigger: "blur" }
], }
};
},
created() {
this.getList();
},
methods: {
/** 查询到货通知单行列表 */
getList() {
this.loading = true;
listArrivalnoticeline(this.queryParams).then(response => {
this.arrivalnoticelineList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
lineId: null, noticeId: this.noticeId, itemId: null, itemCode: null, itemName: null, specification: null, unitOfMeasure: null, quantityArrival: null, quantityQuanlified: null, iqcCheck: null, iqcId: null, iqcCode: null, remark: null, attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null };
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.lineId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加到货通知单行";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const lineId = row.lineId || this.ids
getArrivalnoticeline(lineId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改到货通知单行";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.lineId != null) {
updateArrivalnoticeline(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addArrivalnoticeline(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const lineIds = row.lineId || this.ids;
this.$modal.confirm('是否确认删除到货通知单行编号为"' + lineIds + '"的数据项？').then(function() {
return delArrivalnoticeline(lineIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('wm/arrivalnoticeline/export', {
...this.queryParams
}, `arrivalnoticeline_${new Date().getTime()}.xlsx`)
},
handleSelectProduct(){
this.$refs.itemSelect.showFlag = true;
},
//物料选择弹出框
onItemSelected(obj){
debugger;
if(obj != undefined && obj != null){
this.form.itemId = obj.itemId;
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
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;
}
},
}
};
</script>

52
src/views/mes/wm/itemrecpt/index.vue
View File

@ -191,20 +191,16 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="采购订单号" prop="poCode">
<el-input v-model="form.poCode" placeholder="请输入采购订单号" />
<el-form-item label="到货通知单" prop="noticeCode">
<el-input v-model="form.noticeCode" readonly="readonly" placeholder="请选择到货通知单" >
<el-button slot="append" @click="handleSelectNotice" icon="el-icon-search"></el-button>
</el-input>
<NoticeSelect ref="noticeSelect" @onSelected="onNoticeSelected"></NoticeSelect>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单据状态" prop="status">
<el-select v-model="form.status" disabled placeholder="请选择单据状态">
<el-option
v-for="dict in dict.type.mes_order_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
<el-form-item label="采购订单号" prop="poCode">
<el-input v-model="form.poCode" placeholder="请输入采购订单号" />
</el-form-item>
</el-col>
</el-row>
@ -218,14 +214,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="入库仓库">
<el-cascader v-model="warehouseInfo"
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
>
</el-cascader>
</el-form-item>
</el-col>
<el-col :span="8">
@ -241,7 +230,7 @@
</el-form>
<el-divider v-if="form.recptId !=null" content-position="center">物料信息</el-divider>
<el-card shadow="always" v-if="form.recptId !=null" class="box-card">
<Itemrecptline ref=line :recptId="form.recptId" :warehouseId="form.warehouseId" :locationId="form.locationId" :areaId="form.areaId" :optType="optType"></Itemrecptline>
<Itemrecptline ref=line :recptId="form.recptId" :noticeId="form.noticeId" :optType="optType"></Itemrecptline>
</el-card>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
@ -258,11 +247,12 @@ import {getTreeList} from "@/api/mes/wm/warehouse"
import {genCode} from "@/api/system/autocode/rule"
import VendorSelect from "@/components/vendorSelect/single.vue";
import IqcSelect from "@/components/iqcSelect/single.vue";
import NoticeSelect from "@/components/noticeSelect/single.vue"
import Itemrecptline from "./line.vue";
export default {
name: "Itemrecpt",
dicts:['mes_order_status'],
components :{VendorSelect,IqcSelect,Itemrecptline},
components :{VendorSelect,IqcSelect,Itemrecptline,NoticeSelect},
data() {
return {
//自动生成编码
@ -383,6 +373,8 @@ export default {
recptId: null,
recptCode: null,
recptName: null,
noticeId: null,
noticeCode: null,
iqcId: null,
iqcCode: null,
vendorId: null,
@ -398,7 +390,7 @@ export default {
areaId: null,
areaCode: null,
areaName: null,
recptDate: null,
recptDate: new Date(),
poCode: null,
status: "PREPARE",
remark: null,
@ -555,6 +547,22 @@ export default {
this.form.vendorNick = obj.vendorNick;
}
},
//到货通知单选择
handleSelectNotice(){
this.$refs.noticeSelect.showFlag = true;
},
//到货通知单选择弹出框
onNoticeSelected(obj){
debugger;
if(obj != undefined && obj != null){
this.form.noticeId = obj.noticeId;
this.form.noticeCode = obj.noticeCode;
this.form.poCode = obj.poCode;
this.form.vendorId = obj.vendorId;
this.form.vendorName = obj.vendorName;
this.form.vendorNick = obj.vendorNick;
}
},
//自动生成编码
handleAutoGenChange(autoGenFlag){
if(autoGenFlag){

82
src/views/mes/wm/itemrecpt/line.vue
View File

@ -36,17 +36,6 @@
<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="expireDate" width="180">
<template slot-scope="scope">
<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
@ -82,10 +71,12 @@
<el-col :span="8">
<el-form-item label="物料编码" prop="itemCode">
<el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择物料编码" >
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
<el-button v-if="noticeId !=null" slot="append" @click="handleSelectNoticeLine" icon="el-icon-search"></el-button>
<el-button v-else slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
<NoticeLineSelect v-if="noticeId !=null" ref="noticeLineSelect" :noticeId="noticeId" @onSelected="onNoticeLineSelectd"></NoticeLineSelect>
<ItemSelect v-else ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
</el-col>
<el-col :span="8">
<el-form-item label="物料名称" prop="itemName">
@ -105,8 +96,13 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="入库批次号" prop="batchCode">
<el-input v-model="form.batchCode" placeholder="请输入入库批次号" />
<el-form-item label="入库仓库" prop="warehouseId">
<el-cascader v-model="warehouseInfo"
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
>
</el-cascader>
</el-form-item>
</el-col>
<el-col :span="8">
@ -122,41 +118,12 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="入库仓库" prop="warehouseId">
<el-cascader v-model="warehouseInfo"
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
>
</el-cascader>
<el-form-item label="入库批次号" prop="batchCode">
<el-input v-model="form.batchCode" placeholder="请输入入库批次号" />
</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 :span="8">
</el-col>
</el-row>
<el-row>
@ -178,14 +145,16 @@
<script>
import { listItemrecptline, getItemrecptline, delItemrecptline, addItemrecptline, updateItemrecptline } from "@/api/mes/wm/itemrecptline";
import ItemSelect from "@/components/itemSelect/single.vue";
import NoticeLineSelect from "@/components/noticeSelect/lineSingle.vue"
import IqcSelect from "@/components/iqcSelect/single.vue";
import {getTreeList} from "@/api/mes/wm/warehouse"
export default {
name: "Itemrecptline",
dicts: ['sys_yes_no'],
components :{ItemSelect,IqcSelect},
components :{ItemSelect,IqcSelect,NoticeLineSelect},
props:{
recptId: null,
noticeId: null,
optType: null,
warehouseId: null,
locationId: null,
@ -313,6 +282,7 @@ export default {
this.form = {
lineId: null,
recptId: this.recptId,
noticeLineId: null,
itemId: null,
itemCode: null,
itemName: null,
@ -391,7 +361,6 @@ export default {
},
//物料选择弹出框
onItemSelected(obj){
debugger;
if(obj != undefined && obj != null){
this.form.itemId = obj.itemId;
this.form.itemCode = obj.itemCode;
@ -400,6 +369,21 @@ export default {
this.form.unitOfMeasure = obj.unitOfMeasure;
}
},
//选择到货通知单行
handleSelectNoticeLine(){
this.$refs.noticeLineSelect.showFlag = true;
},
onNoticeLineSelectd(obj){
if(obj != undefined && obj != null){
this.form.noticeLineId = obj.lineId;
this.form.itemId = obj.itemId;
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.quantityRecived = obj.quantityQuanlified;
}
},
//IQC检验单选择
handleSelectIqc(){
this.$refs.iqcSelect.showFlag = true;