Merge remote-tracking branch 'origin/master'
commit
2fc8225884
@ -0,0 +1,362 @@
|
|||||||
|
<template>
|
||||||
|
<div class="app-container">
|
||||||
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
|
||||||
|
<el-row>
|
||||||
|
<el-form-item label="收料通知单号" prop="billNo">
|
||||||
|
<el-input v-model="queryParams.billNo" placeholder="请点击右侧检索收料通知单" style="width:400px;" disabled>
|
||||||
|
<el-button slot="append" icon="el-icon-search" @click="handlePurchaseReceiveBill"></el-button>
|
||||||
|
</el-input>
|
||||||
|
</el-form-item>
|
||||||
|
</el-row>
|
||||||
|
<el-form-item label="采购订单编号" prop="poNo">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.poNo"
|
||||||
|
placeholder="请输入采购订单编号"
|
||||||
|
clearable
|
||||||
|
@keyup.enter.native="handleQuery"
|
||||||
|
disabled
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
|
||||||
|
<el-form-item label="可用标识" v-if="queryParams.mergeFlag!==null" prop="mergeFlag">
|
||||||
|
<el-radio-group v-model="queryParams.mergeFlag">
|
||||||
|
<el-radio label="1" value="1" >
|
||||||
|
是
|
||||||
|
</el-radio>
|
||||||
|
<el-radio label="" value="" >
|
||||||
|
否
|
||||||
|
</el-radio>
|
||||||
|
</el-radio-group>
|
||||||
|
</el-form-item>
|
||||||
|
|
||||||
|
<el-form-item label="可用标识" v-if="queryParams.mergeFlag===null" prop="singleFlag">
|
||||||
|
<el-radio-group v-model="queryParams.singleFlag">
|
||||||
|
<el-radio label="1" value="1" >
|
||||||
|
是
|
||||||
|
</el-radio>
|
||||||
|
<el-radio label="" value="" >
|
||||||
|
否
|
||||||
|
</el-radio>
|
||||||
|
</el-radio-group>
|
||||||
|
</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="orderBindList"
|
||||||
|
@selection-change="handleSelectionChange"
|
||||||
|
:current-row-key="selectedRowId"
|
||||||
|
ref="purchaseOrderRef"
|
||||||
|
row-key="rowKey"
|
||||||
|
>
|
||||||
|
<el-table-column label="选择" width="50" v-if="isSingleSelect">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-radio v-model="selectedRowId" :label="scope.row.purchaseOrderId+'-'+scope.row.orderBindId" @change="handleSelect(scope.row)">
|
||||||
|
{{scope.row.i}}
|
||||||
|
</el-radio>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
type="selection"
|
||||||
|
width="55"
|
||||||
|
:reserve-selection="true"
|
||||||
|
v-if="!isSingleSelect"
|
||||||
|
></el-table-column>
|
||||||
|
<el-table-column label="采购订单ID" align="center" prop="purchaseOrderId" />
|
||||||
|
<el-table-column label="采购订单" align="center" prop="poNo" />
|
||||||
|
<el-table-column label="物料编码" align="center" prop="materialCode" />
|
||||||
|
<el-table-column label="物料名称" align="center" prop="materialName" />
|
||||||
|
<el-table-column label="物料规格" align="center" prop="materialSpec"/>
|
||||||
|
<el-table-column label="规格参数" align="center" prop="specificationParameter"/>
|
||||||
|
<el-table-column label="常备物料" align="center" prop="alwaysFlag">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<dict-tag :options="dict.type.mes_material_bind_flag" :value="scope.row.alwaysFlag"/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<!-- <el-table-column label="绑定数量" align="center" prop="bindAmount" />-->
|
||||||
|
<!-- <el-table-column label="条码数量" align="center" prop="barcodeAmount" />-->
|
||||||
|
<el-table-column label="采购数量" align="center" prop="orderAmount" />
|
||||||
|
<el-table-column label="可用数量" align="center" prop="relateSaleOrderAmount" />
|
||||||
|
<el-table-column label="销售订单" align="center" prop="saleOrderCode" />
|
||||||
|
<el-table-column label="成品编码" align="center" prop="productCode" />
|
||||||
|
<el-table-column label="成品名称" align="center" prop="productName" />
|
||||||
|
<el-table-column label="成品规格" align="center" prop="productSpec"/>
|
||||||
|
<el-table-column label="销售数量" align="center" prop="saleOrderAmount" />
|
||||||
|
</el-table>
|
||||||
|
|
||||||
|
<pagination
|
||||||
|
v-show="total>0"
|
||||||
|
:total="total"
|
||||||
|
:page.sync="queryParams.pageNum"
|
||||||
|
:limit.sync="queryParams.pageSize"
|
||||||
|
@pagination="getList"
|
||||||
|
/>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- 选择收料通知单对话框 -->
|
||||||
|
<el-dialog title="选择收料通知单信息" :visible.sync="purchaseReceiveBillOpen" append-to-body>
|
||||||
|
<select-purchase-receive-bill ref="purchaseOrderRef" v-if="purchaseReceiveBillOpen"></select-purchase-receive-bill>
|
||||||
|
<div slot="footer" class="dialog-footer">
|
||||||
|
<el-button
|
||||||
|
type="primary" @click="submitPurchaseReceiveBillForm">确 定</el-button>
|
||||||
|
<el-button @click="purchaseReceiveBillOpen = false">取 消</el-button>
|
||||||
|
</div>
|
||||||
|
</el-dialog>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import {
|
||||||
|
getPurchaseOrdersWithBind
|
||||||
|
} from "@//api/mes/purchaseOrder";
|
||||||
|
import selectPurchaseReceiveBill from '@//views/mes/purchaseReceiveBill/selectPurchaseReceiveBill.vue';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: "OrderBind",
|
||||||
|
dicts: ['active_flag', 'order_status', 'document_status','mes_material_bind_flag'],
|
||||||
|
components: {
|
||||||
|
'select-purchase-receive-bill': selectPurchaseReceiveBill,
|
||||||
|
},
|
||||||
|
props: {
|
||||||
|
defineData: {
|
||||||
|
type: Object,
|
||||||
|
default: {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
// 遮罩层
|
||||||
|
loading: false,
|
||||||
|
// 选中数组
|
||||||
|
ids: [],
|
||||||
|
// 非单个禁用
|
||||||
|
single: true,
|
||||||
|
// 非多个禁用
|
||||||
|
multiple: true,
|
||||||
|
// 显示搜索条件
|
||||||
|
showSearch: true,
|
||||||
|
// 总条数
|
||||||
|
total: 0,
|
||||||
|
// 采购订单信息表格数据
|
||||||
|
orderBindList: [],
|
||||||
|
// 弹出层标题
|
||||||
|
title: "",
|
||||||
|
// 是否显示弹出层
|
||||||
|
open: false,
|
||||||
|
selectionVisible:false,
|
||||||
|
// 查询参数
|
||||||
|
queryParams: {
|
||||||
|
pageNum: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
erpId: null,
|
||||||
|
fentryId: null,
|
||||||
|
poNo: null,
|
||||||
|
documentStatus: null,
|
||||||
|
materialId: null,
|
||||||
|
materialCode: null,
|
||||||
|
materialName: null,
|
||||||
|
materialSpec: null,
|
||||||
|
specificationParameter: null,
|
||||||
|
orderAmount: null,
|
||||||
|
completeAmount: null,
|
||||||
|
approveDate: null,
|
||||||
|
erpModifyDate: null,
|
||||||
|
planDeliveryDate: null,
|
||||||
|
beginDate: null,
|
||||||
|
endDate: null,
|
||||||
|
orderStatus: null,
|
||||||
|
completeDate: null,
|
||||||
|
isFlag: null,
|
||||||
|
mergeFlag: null,
|
||||||
|
singleFlag: null,
|
||||||
|
alwaysFlag:""
|
||||||
|
},
|
||||||
|
// 表单参数
|
||||||
|
form: {},
|
||||||
|
// 表单校验
|
||||||
|
rules: {
|
||||||
|
materialCode: [
|
||||||
|
{required: true, message: "物料编码不能为空", trigger: "blur"}
|
||||||
|
],
|
||||||
|
orderAmount: [
|
||||||
|
{required: true, message: "订单计划数量不能为空", trigger: "blur"}
|
||||||
|
],
|
||||||
|
isFlag: [
|
||||||
|
{required: true, message: "是否标识不能为空", trigger: "change"}
|
||||||
|
],
|
||||||
|
},
|
||||||
|
columns: [
|
||||||
|
{key: 0, label: `主键标识`, visible: true},
|
||||||
|
{key: 1, label: `ERP主键信息`, visible: false},
|
||||||
|
{key: 2, label: `金蝶ERP订单明细ID`, visible: false},
|
||||||
|
{key: 3, label: `采购订单编号`, visible: true},
|
||||||
|
{key: 4, label: `单据状态`, visible: false},
|
||||||
|
{key: 5, label: `物料ID`, visible: false},
|
||||||
|
{key: 6, label: `物料编码`, visible: true},
|
||||||
|
{key: 7, label: `物料名称`, visible: true},
|
||||||
|
{key: 8, label: `订单计划数量`, visible: true},
|
||||||
|
{key: 9, label: `完成采购数量`, visible: false},
|
||||||
|
{key: 10, label: `审核日期`, visible: false},
|
||||||
|
{key: 11, label: `ERP最后修改日期`, visible: false},
|
||||||
|
{key: 12, label: `计划交货日期`, visible: false},
|
||||||
|
{key: 13, label: `计划开始日期`, visible: false},
|
||||||
|
{key: 14, label: `计划结束日期`, visible: false},
|
||||||
|
{key: 15, label: `订单状态`, visible: false},
|
||||||
|
{key: 16, label: `完成日期`, visible: false},
|
||||||
|
{key: 17, label: `是否标识`, visible: false},
|
||||||
|
{key: 18, label: `备注`, visible: false},
|
||||||
|
{key: 19, label: `创建人`, visible: false},
|
||||||
|
{key: 20, label: `创建时间`, visible: false},
|
||||||
|
{key: 21, label: `更新人`, visible: false},
|
||||||
|
{key: 22, label: `更新时间`, visible: false},
|
||||||
|
],
|
||||||
|
selectedRows:[],
|
||||||
|
selectedRow:null,
|
||||||
|
selectedRowId:null,
|
||||||
|
isSingleSelect:false,
|
||||||
|
purchaseReceiveBillOpen:false,
|
||||||
|
ALWAYS_FLAG:{
|
||||||
|
YES:"1",
|
||||||
|
NO:"0"
|
||||||
|
}
|
||||||
|
};
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
this.getData();
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
getData() {
|
||||||
|
if (this.defineData.mergeFlag) {
|
||||||
|
this.selectionVisible = true;
|
||||||
|
this.queryParams.mergeFlag = "1";
|
||||||
|
this.queryParams.singleFlag = null;
|
||||||
|
this.isSingleSelect = false;
|
||||||
|
}else{
|
||||||
|
this.selectionVisible = false;
|
||||||
|
this.queryParams.singleFlag ="1";
|
||||||
|
this.queryParams.mergeFlag = null;
|
||||||
|
this.isSingleSelect = false;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
/** 查询采购订单信息列表 */
|
||||||
|
getList() {
|
||||||
|
if(this.queryParams.billNo==null ||this.queryParams.billNo==='') {
|
||||||
|
this.$modal.msgWarning("请先选择收料通知单");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.loading = true;
|
||||||
|
getPurchaseOrdersWithBind(this.queryParams).then(response => {
|
||||||
|
response.rows.forEach(e => {
|
||||||
|
if(e.orderBindId){
|
||||||
|
e.relateSaleOrderAmount = e.bindAmount - e.barcodeAmount;
|
||||||
|
}
|
||||||
|
e.receiveBillId = this.queryParams.receiveBillId;
|
||||||
|
// 添加rowKey作为唯一标识
|
||||||
|
e.rowKey = e.purchaseOrderId + '-' + e.orderBindId;
|
||||||
|
});
|
||||||
|
|
||||||
|
this.orderBindList = response.rows;
|
||||||
|
this.total = response.total;
|
||||||
|
this.loading = false;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
// 取消按钮
|
||||||
|
cancel() {
|
||||||
|
this.open = false;
|
||||||
|
this.reset();
|
||||||
|
},
|
||||||
|
// 表单重置
|
||||||
|
reset() {
|
||||||
|
this.form = {
|
||||||
|
purchaseOrderId: null,
|
||||||
|
erpId: null,
|
||||||
|
fentryId: null,
|
||||||
|
poNo: null,
|
||||||
|
documentStatus: null,
|
||||||
|
materialId: null,
|
||||||
|
materialCode: null,
|
||||||
|
materialName: null,
|
||||||
|
orderAmount: null,
|
||||||
|
completeAmount: null,
|
||||||
|
approveDate: null,
|
||||||
|
erpModifyDate: null,
|
||||||
|
planDeliveryDate: null,
|
||||||
|
beginDate: null,
|
||||||
|
endDate: null,
|
||||||
|
orderStatus: null,
|
||||||
|
completeDate: null,
|
||||||
|
isFlag: null,
|
||||||
|
remark: 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();
|
||||||
|
},
|
||||||
|
//选中列赋值
|
||||||
|
handleRowClick(row) {
|
||||||
|
this.selectedRow = row
|
||||||
|
this.selectedRowId = row.purchaseOrderId+"-"+row.orderBindId;
|
||||||
|
//alert(this.selectedRowId);
|
||||||
|
},
|
||||||
|
handleSelect(row){
|
||||||
|
this.selectedRow = row;
|
||||||
|
this.selectedRow.receiveBillId = this.queryParams.receiveBillId;
|
||||||
|
this.selectedRowId = row.purchaseOrderId+"-"+row.orderBindId;
|
||||||
|
// 滚动到选中行
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.$refs.purchaseOrderRef.setCurrentRow(row);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
// 多选框选中数据
|
||||||
|
handleSelectionChange(selection) {
|
||||||
|
this.ids = selection.map(item => item.purchaseOrderId)
|
||||||
|
this.selectedRows = selection.map(item => item)
|
||||||
|
this.single = selection.length !== 1
|
||||||
|
this.multiple = !selection.length
|
||||||
|
},
|
||||||
|
|
||||||
|
handlePurchaseReceiveBill() {
|
||||||
|
this.purchaseReceiveBillOpen = true;
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
submitPurchaseReceiveBillForm() {
|
||||||
|
let selectedRow = this.$refs.purchaseOrderRef.selectedRow;
|
||||||
|
this.$set(this.queryParams, "receiveBillId", null);
|
||||||
|
this.$set(this.queryParams, "billNo", null);
|
||||||
|
this.$set(this.queryParams, "poNo", null);
|
||||||
|
this.$set(this.queryParams, "materialId", null);
|
||||||
|
|
||||||
|
this.$set(this.queryParams, "receiveBillId", selectedRow.receiveBillId);
|
||||||
|
this.$set(this.queryParams, "billNo", selectedRow.billNo);
|
||||||
|
this.$set(this.queryParams, "poNo", selectedRow.poNo);
|
||||||
|
this.$set(this.queryParams, "materialId", selectedRow.materialId);
|
||||||
|
|
||||||
|
this.getList();
|
||||||
|
this.purchaseReceiveBillOpen = false;
|
||||||
|
},
|
||||||
|
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
Loading…
Reference in New Issue