|
@@ -97,17 +97,17 @@
|
|
<el-form ref="dataFormRef" :model="form" label-width="90px">
|
|
<el-form ref="dataFormRef" :model="form" label-width="90px">
|
|
<el-row :gutter="24">
|
|
<el-row :gutter="24">
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
- <el-form-item label="工单编码" prop="materialCode">
|
|
|
|
|
|
+ <el-form-item label="工单编码" prop="workOrderCode">
|
|
<el-input v-model="form.workOrderCode" disabled />
|
|
<el-input v-model="form.workOrderCode" disabled />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
- <el-form-item label="订单编码" prop="materialName">
|
|
|
|
|
|
+ <el-form-item label="订单编码" prop="orderCode">
|
|
<el-input v-model="form.orderCode" disabled />
|
|
<el-input v-model="form.orderCode" disabled />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
- <el-form-item label="订单名称" prop="materialModel">
|
|
|
|
|
|
+ <el-form-item label="订单名称" prop="orderName">
|
|
<el-input v-model="form.orderName" disabled />
|
|
<el-input v-model="form.orderName" disabled />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
@@ -131,7 +131,7 @@
|
|
</el-row>
|
|
</el-row>
|
|
<el-row :gutter="24">
|
|
<el-row :gutter="24">
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
- <el-form-item label="工单数量" prop="materialModel">
|
|
|
|
|
|
+ <el-form-item label="工单数量" prop="workOrderNum">
|
|
<el-input v-model="form.workOrderNum" disabled />
|
|
<el-input v-model="form.workOrderNum" disabled />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
@@ -210,17 +210,17 @@
|
|
<el-form ref="formRef" :model="form" label-width="90px">
|
|
<el-form ref="formRef" :model="form" label-width="90px">
|
|
<el-row :gutter="24">
|
|
<el-row :gutter="24">
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
- <el-form-item label="工单编码" prop="materialCode">
|
|
|
|
|
|
+ <el-form-item label="工单编码" prop="workOrderCode">
|
|
<el-input v-model="form.workOrderCode" disabled />
|
|
<el-input v-model="form.workOrderCode" disabled />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
- <el-form-item label="订单编码" prop="materialName">
|
|
|
|
|
|
+ <el-form-item label="订单编码" prop="orderCode">
|
|
<el-input v-model="form.orderCode" disabled />
|
|
<el-input v-model="form.orderCode" disabled />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
- <el-form-item label="订单名称" prop="materialModel">
|
|
|
|
|
|
+ <el-form-item label="订单名称" prop="orderName">
|
|
<el-input v-model="form.orderName" disabled />
|
|
<el-input v-model="form.orderName" disabled />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
@@ -244,7 +244,7 @@
|
|
</el-row>
|
|
</el-row>
|
|
<el-row :gutter="24">
|
|
<el-row :gutter="24">
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
- <el-form-item label="工单数量" prop="materialModel">
|
|
|
|
|
|
+ <el-form-item label="工单数量" prop="workOrderNum">
|
|
<el-input v-model="form.workOrderNum" disabled />
|
|
<el-input v-model="form.workOrderNum" disabled />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
@@ -502,7 +502,7 @@ option.value = Object.assign(option.value, {
|
|
message: "工单号不能为空",
|
|
message: "工单号不能为空",
|
|
trigger: "trigger",
|
|
trigger: "trigger",
|
|
},
|
|
},
|
|
- ],
|
|
|
|
|
|
+ ]/*,
|
|
click: ({ value, column }) => {
|
|
click: ({ value, column }) => {
|
|
if (column.boxType) {
|
|
if (column.boxType) {
|
|
dialog.visible = true;
|
|
dialog.visible = true;
|
|
@@ -512,8 +512,9 @@ option.value = Object.assign(option.value, {
|
|
if (value) {
|
|
if (value) {
|
|
checkInfo(value);
|
|
checkInfo(value);
|
|
}
|
|
}
|
|
- },
|
|
|
|
|
|
+ },*/
|
|
},
|
|
},
|
|
|
|
+
|
|
{
|
|
{
|
|
label: "物料编码",
|
|
label: "物料编码",
|
|
prop: "materialCode",
|
|
prop: "materialCode",
|