up
This commit is contained in:
@@ -60,9 +60,9 @@
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="生产炉号" prop="machineryName">
|
||||
<el-form-item label="生产炉号" prop="machineryNo">
|
||||
<el-input
|
||||
v-model="queryParams.machineryName"
|
||||
v-model="queryParams.machineryNo"
|
||||
placeholder="请输入生产炉号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
@@ -92,7 +92,8 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- 2024 12 19 需求五 -->
|
||||
<el-table-column label="炉号" width="180" prop="machineryName"> </el-table-column>
|
||||
<el-table-column label="炉子" width="180" prop="machineryName"> </el-table-column>
|
||||
<el-table-column label="炉号" width="180" prop="machineryNo"> </el-table-column>
|
||||
<!-- 2024 12 19 需求五 -->
|
||||
<el-table-column label="班组" width="180" prop="teamName"> </el-table-column>
|
||||
<el-table-column label="工单编码" width="180" prop="workorderCode">
|
||||
|
@@ -531,6 +531,8 @@ export default {
|
||||
"mes/pro/machineryJob/exportExcel",
|
||||
{
|
||||
...this.queryParams,
|
||||
startTime: this.dateRange[0],
|
||||
endTime: this.dateRange[1],
|
||||
},
|
||||
`生产记录.xlsx`
|
||||
);
|
||||
|
@@ -209,7 +209,7 @@
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
|
||||
<!-- <el-table-column label="工单数量" align="center" prop="quantity" />
|
||||
<!--<el-table-column label="工单数量" align="center" prop="quantity" />
|
||||
<el-table-column label="调整数量" align="center" prop="quantityChanged" />
|
||||
<el-table-column
|
||||
label="已生产数量"
|
||||
@@ -217,7 +217,7 @@
|
||||
width="100px"
|
||||
prop="quantityProduced"
|
||||
/>-->
|
||||
<el-table-column label="批次号" align="center" width="100px" prop="batchCode" />
|
||||
<el-table-column label="炉号" align="center" width="100px" prop="machineryNo" />
|
||||
<el-table-column label="客户编码" align="center" prop="clientCode" />
|
||||
<el-table-column
|
||||
label="客户名称"
|
||||
@@ -443,10 +443,26 @@
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<!-- <el-col :span="8">
|
||||
<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="班组" prop="teamName">
|
||||
<el-input
|
||||
v-model="form.teamName"
|
||||
:disabled="form.status !== 'CONFIRMED'"
|
||||
placeholder="请选择班组"
|
||||
>
|
||||
<el-button
|
||||
slot="append"
|
||||
@click="handleSelectTeam"
|
||||
icon="el-icon-search"
|
||||
></el-button>
|
||||
</el-input>
|
||||
<TeamSelect ref="teamSelect" @onSelected="onTeamSelected"> </TeamSelect>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
@@ -471,22 +487,6 @@
|
||||
<el-input v-model="form.machineryNo" placeholder="请输入炉号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="班组" prop="teamName">
|
||||
<el-input
|
||||
v-model="form.teamName"
|
||||
:disabled="form.status !== 'CONFIRMED'"
|
||||
placeholder="请选择班组"
|
||||
>
|
||||
<el-button
|
||||
slot="append"
|
||||
@click="handleSelectTeam"
|
||||
icon="el-icon-search"
|
||||
></el-button>
|
||||
</el-input>
|
||||
<TeamSelect ref="teamSelect" @onSelected="onTeamSelected"> </TeamSelect>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row v-if="form.orderSource == 'ORDER'">
|
||||
<el-col :span="12">
|
||||
|
@@ -146,19 +146,19 @@
|
||||
prop="itemName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
<el-table-column
|
||||
label="产品物料编码"
|
||||
align="center"
|
||||
prop="itemCode"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
<el-table-column
|
||||
label="规格型号"
|
||||
align="center"
|
||||
prop="specification"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
<el-table-column
|
||||
label="合计重量"
|
||||
align="center"
|
||||
prop="quantityRecived"
|
||||
|
Reference in New Issue
Block a user