对接ERP2.7
部分页面修改
This commit is contained in:
1 parent
22bfe9d015
commit
59f2af943b
17 files changed
+770
-887
No files matched your search
@@ -39,8 +39,8 @@
|
||||
<a-input v-model="form.processName" />
|
||||
</a-form-item>
|
||||
|
||||
<a-form-item field="sourceCode" label="单号">
|
||||
<a-select v-model="form.sourceCode" placeholder="请选择单号" allow-search ref="sourceCodeRef" @@change="orderSelect">
|
||||
<a-form-item field="sourceCode" label="生产单号">
|
||||
<a-select v-model="form.sourceCode" placeholder="请选择生产单号" allow-search ref="sourceCodeRef" @@change="orderSelect">
|
||||
<a-option v-for="item in orderOptions"
|
||||
:key="item.value"
|
||||
:value="item.value">
|
||||
@@ -48,7 +48,9 @@
|
||||
</a-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
|
||||
<a-form-item label="客户单号" field="billCode">
|
||||
<a-input v-model="form.billCode" ref="billCodeRef" placeholder="请输入客户单号"/>
|
||||
</a-form-item>
|
||||
<a-form-item field="type" label="小托盘类型" >
|
||||
<a-radio-group v-model="form.type" type="button">
|
||||
<a-radio
|
||||
@@ -110,6 +112,7 @@
|
||||
const palletCodeRef = ref(null);
|
||||
const materialCodeRef = ref(null);
|
||||
const sourceCodeRef = ref(null);
|
||||
const billCodeRef = ref(null);
|
||||
const numInput = ref(null);
|
||||
const operatorIdRef = ref(null);
|
||||
const operatorInfoRef = ref(null);
|
||||
@@ -119,6 +122,7 @@
|
||||
palletCodeRef,
|
||||
materialCodeRef,
|
||||
sourceCodeRef,
|
||||
billCodeRef,
|
||||
numInput,
|
||||
operatorIdRef,
|
||||
operatorInfoRef
|
||||
@@ -139,6 +143,7 @@
|
||||
operatorId: '',
|
||||
processId: '',
|
||||
processName:'',
|
||||
processCode:'',
|
||||
name:'',
|
||||
type:'',
|
||||
qty:null,
|
||||
@@ -164,7 +169,10 @@
|
||||
{ required: true, message: '请选择托盘类型', trigger: ['change', 'blur'] }
|
||||
],
|
||||
//sourceCode: [
|
||||
//{ required: true, message: '请选择单据', trigger: ['change', 'blur'] }
|
||||
//{ required: true, message: '请选择生产单据', trigger: ['change', 'blur'] }
|
||||
//],
|
||||
//billCode: [
|
||||
//{ required: true, message: '请输入客户单据', trigger: ['change', 'blur'] }
|
||||
//],
|
||||
processId: [
|
||||
{ required: true, message: '请选择工序', trigger: ['change', 'blur'] }
|
||||
@@ -199,8 +207,9 @@
|
||||
|
||||
const processSelect = (value) => {
|
||||
form.processName = processOptions.value.find(item => item.value === value).processName;
|
||||
form.processCode = processOptions.value.find(item => item.value === value).processCode;
|
||||
// 选择工序后,加载订单列表
|
||||
loadOrdersByMaterial(form.materialCode);
|
||||
loadOrdersByMaterial(form.materialCode,form.processCode);
|
||||
focusNext('sourceCodeRef');
|
||||
}
|
||||
|
||||
@@ -210,17 +219,14 @@
|
||||
}
|
||||
|
||||
// 根据物料加载订单列表
|
||||
const loadOrdersByMaterial = (materialCode) => {
|
||||
if (!materialCode) {
|
||||
form.sourceCode = '';
|
||||
orderOptions.value = [];
|
||||
return;
|
||||
}
|
||||
const loadOrdersByMaterial = (materialCode,batch) => {
|
||||
form.sourceCode = '';
|
||||
form.orderId = '';
|
||||
orderOptions.value = [];
|
||||
$.ajax({
|
||||
type: "post",
|
||||
dataType: "json",
|
||||
data: { materialCode: materialCode },
|
||||
data: { materialCode: materialCode,batch: batch},
|
||||
url: "/receipt/ReceiptIn/GetOrdersByMaterial",
|
||||
success: (json) => {
|
||||
if (json.Code == 200) {
|
||||
@@ -532,6 +538,7 @@
|
||||
palletCodeRef,
|
||||
materialCodeRef,
|
||||
sourceCodeRef,
|
||||
billCodeRef,
|
||||
numInput,
|
||||
operatorIdRef,
|
||||
operatorInfoRef,
|
||||
|
||||
@@ -33,16 +33,21 @@
|
||||
$refs.sourceCodeSelect.focus();
|
||||
})"/>/>
|
||||
</a-form-item>
|
||||
<a-form-item field="sourceCode" label="订单号">
|
||||
<a-form-item field="sourceCode" label="生产订单">
|
||||
<a-select
|
||||
v-model="formData.sourceCode"
|
||||
:options="orderOptions"
|
||||
placeholder="请选择订单号"
|
||||
placeholder="请选择生产订单"
|
||||
allow-search
|
||||
ref="sourceCodeSelect"
|
||||
@@change="handleOrderSelect">
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
|
||||
<a-form-item label="客户单号" field="billCode">
|
||||
<a-input v-model="formData.billCode" placeholder="请输入客户单号"/>
|
||||
</a-form-item>
|
||||
|
||||
<a-form-item field="companyCode" label="公司">
|
||||
<a-auto-complete
|
||||
v-model="formData.companyCode"
|
||||
@@ -184,7 +189,7 @@
|
||||
dataIndex: 'Batch',
|
||||
},
|
||||
{
|
||||
title: '订单号',
|
||||
title: '客户订单',
|
||||
dataIndex: 'SourceCode',
|
||||
},
|
||||
{
|
||||
@@ -209,6 +214,7 @@
|
||||
materialSpec: '',
|
||||
batch: '',
|
||||
sourceCode: '',
|
||||
billCode:'',
|
||||
orderId: '',
|
||||
companyCode: '',
|
||||
qty: null
|
||||
@@ -336,12 +342,9 @@
|
||||
|
||||
// 根据物料加载订单列表
|
||||
loadOrdersByMaterial(materialCode) {
|
||||
if (!materialCode) {
|
||||
this.formData.sourceCode = '';
|
||||
this.orderOptions = [];
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
this.formData.sourceCode = '';
|
||||
this.formData.orderId = '';
|
||||
this.orderOptions = [];
|
||||
const postData = new URLSearchParams();
|
||||
postData.append('materialCode', materialCode);
|
||||
@@ -351,6 +354,7 @@
|
||||
const json = response.data;
|
||||
if (json.Code == 200) {
|
||||
this.orderOptions = json.Data || [];
|
||||
|
||||
if (this.orderOptions.length === 0) {
|
||||
this.$message.warning('该物料暂无关联订单');
|
||||
}
|
||||
@@ -407,6 +411,7 @@
|
||||
MaterialSpec: this.formData.materialSpec,
|
||||
Batch: this.formData.batch,
|
||||
SourceCode: this.formData.sourceCode,
|
||||
BillCode: this.formData.billCode,
|
||||
OrderId: this.formData.orderId,
|
||||
CompanyCode: this.formData.companyCode,
|
||||
Qty: this.formData.qty
|
||||
@@ -447,6 +452,7 @@
|
||||
this.formData.materialSpec = '';
|
||||
this.formData.batch = '';
|
||||
this.formData.sourceCode = '';
|
||||
this.formData.billCode = '';
|
||||
this.formData.orderId = '';
|
||||
this.formData.companyCode = '';
|
||||
this.formData.qty = null;
|
||||
|
||||
Reference in new issue
Block a user