|
|
@ -154,8 +154,8 @@
|
|
|
|
<el-row>
|
|
|
|
<el-row>
|
|
|
|
<!-- 选择产线 -->
|
|
|
|
<!-- 选择产线 -->
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-form-item label="选择产线:">
|
|
|
|
<el-form-item label="选择机型:">
|
|
|
|
<el-select size="small" v-model="form.prodLineCode" placeholder="请选择产线">
|
|
|
|
<el-select size="small" v-model="form.prodLineCode" placeholder="请选择成型机">
|
|
|
|
<el-option v-for="item in proline" :key="item.key" :label="item.label" :value="item.key"></el-option>
|
|
|
|
<el-option v-for="item in proline" :key="item.key" :label="item.label" :value="item.key"></el-option>
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
@ -224,7 +224,7 @@
|
|
|
|
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
|
|
|
|
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<el-table-column width="60" align="center" label="序号" type="index" :index="indexMethod"></el-table-column>
|
|
|
|
<el-table-column width="60" align="center" label="序号" type="index" :index="indexMethod"></el-table-column>
|
|
|
|
<el-table-column width="120" align="center" prop="prodLineCode" label="产线"></el-table-column>
|
|
|
|
<el-table-column width="120" align="center" prop="prodLineCode" label="成型机"></el-table-column>
|
|
|
|
<el-table-column width="300" align="center" prop="workorderCode" label="工单号"></el-table-column>
|
|
|
|
<el-table-column width="300" align="center" prop="workorderCode" label="工单号"></el-table-column>
|
|
|
|
<el-table-column width="120" align="center" prop="quantitySplit" label="数量"></el-table-column>
|
|
|
|
<el-table-column width="120" align="center" prop="quantitySplit" label="数量"></el-table-column>
|
|
|
|
<el-table-column align="center" prop="batchCodeList" label="批次号"></el-table-column>
|
|
|
|
<el-table-column align="center" prop="batchCodeList" label="批次号"></el-table-column>
|
|
|
@ -378,7 +378,10 @@
|
|
|
|
shiftId: null,
|
|
|
|
shiftId: null,
|
|
|
|
formFields: [],
|
|
|
|
formFields: [],
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.formFields = [],
|
|
|
|
this.formFields = [{
|
|
|
|
|
|
|
|
batchCode: '',
|
|
|
|
|
|
|
|
batchQuantity: ''
|
|
|
|
|
|
|
|
}],
|
|
|
|
// 获取该订单下最新订单列表
|
|
|
|
// 获取该订单下最新订单列表
|
|
|
|
getOrderList(id).then(response => {
|
|
|
|
getOrderList(id).then(response => {
|
|
|
|
if(response.code == 500){
|
|
|
|
if(response.code == 500){
|
|
|
@ -403,7 +406,14 @@
|
|
|
|
};
|
|
|
|
};
|
|
|
|
// 设置最新数据
|
|
|
|
// 设置最新数据
|
|
|
|
this.splitData = response.data;
|
|
|
|
this.splitData = response.data;
|
|
|
|
|
|
|
|
// 在获取到新的数据后执行以下代码
|
|
|
|
|
|
|
|
this.workerLoading = true; // 设置加载状态为true,表示正在加载
|
|
|
|
|
|
|
|
this.refreshWorkerTable = false; // 先将refreshProTable设置为false,隐藏表格
|
|
|
|
|
|
|
|
this.$nextTick(() => {
|
|
|
|
|
|
|
|
// 使用$nextTick来等待DOM更新完成
|
|
|
|
|
|
|
|
this.refreshWorkerTable = true; // 立即将refreshProTable设置为true,显示表格
|
|
|
|
|
|
|
|
this.workerLoading = false; // 设置加载状态为false,表示加载完成
|
|
|
|
|
|
|
|
});
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -644,7 +654,7 @@
|
|
|
|
});
|
|
|
|
});
|
|
|
|
//初始化日期为默认今天
|
|
|
|
//初始化日期为默认今天
|
|
|
|
this.form.productDate = new Date();
|
|
|
|
this.form.productDate = new Date();
|
|
|
|
//获取线体和班次
|
|
|
|
//获取成型机和班次
|
|
|
|
getprodLineShift().then(response => {
|
|
|
|
getprodLineShift().then(response => {
|
|
|
|
this.proline = response.data.lines;
|
|
|
|
this.proline = response.data.lines;
|
|
|
|
this.workShift = response.data.shifts;
|
|
|
|
this.workShift = response.data.shifts;
|
|
|
|