领料单头增加工作站显示,领料时间精确到分钟
This commit is contained in:
parent
8a00d82a45
commit
7c8fec11d0
@ -108,11 +108,12 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="领料单名称" align="center" prop="issueName" :show-overflow-tooltip="true"/>
|
<el-table-column label="领料单名称" align="center" prop="issueName" :show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="生产工单" align="center" prop="workorderCode" />
|
<el-table-column label="生产工单" align="center" prop="workorderCode" />
|
||||||
|
<el-table-column label="工作站" align="center" prop="workstationName" />
|
||||||
<el-table-column label="客户编号" align="center" prop="clientCode" />
|
<el-table-column label="客户编号" align="center" prop="clientCode" />
|
||||||
<el-table-column label="客户名称" align="center" prop="clientName" />
|
<el-table-column label="客户名称" align="center" prop="clientName" />
|
||||||
<el-table-column label="领料日期" align="center" prop="issueDate" width="180">
|
<el-table-column label="领料日期" align="center" prop="issueDate" width="180">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ parseTime(scope.row.issueDate, '{y}-{m}-{d}') }}</span>
|
<span>{{ parseTime(scope.row.issueDate, '{y}-{m}-{d} {h}:{i}') }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="单据状态" align="center" prop="status">
|
<el-table-column label="单据状态" align="center" prop="status">
|
||||||
@ -187,36 +188,13 @@
|
|||||||
<el-form-item label="领料日期" prop="issueDate">
|
<el-form-item label="领料日期" prop="issueDate">
|
||||||
<el-date-picker clearable
|
<el-date-picker clearable
|
||||||
v-model="form.issueDate"
|
v-model="form.issueDate"
|
||||||
type="date"
|
type="datetime"
|
||||||
value-format="yyyy-MM-dd"
|
default-time="12:00:00"
|
||||||
placeholder="请选择领料日期">
|
value-format="yyyy-MM-dd HH:mm"
|
||||||
|
placeholder="请选择领料日期时间">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
|
||||||
<el-form-item label="领料仓库">
|
|
||||||
<el-cascader v-model="warehouseInfo"
|
|
||||||
:options="warehouseOptions"
|
|
||||||
:props="warehouseProps"
|
|
||||||
@change="handleWarehouseChanged"
|
|
||||||
>
|
|
||||||
</el-cascader>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="8">
|
|
||||||
<el-form-item label="单据状态" prop="status">
|
|
||||||
<el-select v-model="form.status" disabled>
|
|
||||||
<el-option
|
|
||||||
v-for="dict in dict.type.mes_order_status"
|
|
||||||
:key="dict.value"
|
|
||||||
:label="dict.label"
|
|
||||||
:value="dict.value"
|
|
||||||
></el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
<el-row>
|
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="生产工单" prop="workorderCode">
|
<el-form-item label="生产工单" prop="workorderCode">
|
||||||
<el-input v-model="form.workorderCode" placeholder="请选择生产工单" >
|
<el-input v-model="form.workorderCode" placeholder="请选择生产工单" >
|
||||||
@ -225,6 +203,22 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<WorkorderSelect ref="woSelect" @onSelected="onWorkorderSelected"></WorkorderSelect>
|
<WorkorderSelect ref="woSelect" @onSelected="onWorkorderSelected"></WorkorderSelect>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
|
<el-form-item label="工作站" prop="workstationCode">
|
||||||
|
<el-input v-model="form.workstationCode" placeholder="请选择工作站" >
|
||||||
|
<el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button>
|
||||||
|
</el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<WorkstationSelect ref="wsSelect" @onSelected="onWorkstationSelected"> </WorkstationSelect>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="8">
|
||||||
|
<el-form-item label="工作站名称" prop="workstationName">
|
||||||
|
<el-input v-model="form.workstationName" readonly placeholder="请选择工作站" >
|
||||||
|
</el-input>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="客户编号" >
|
<el-form-item label="客户编号" >
|
||||||
<el-input v-model="form.clientCode" placeholder="请选择生产工单" >
|
<el-input v-model="form.clientCode" placeholder="请选择生产工单" >
|
||||||
@ -547,7 +541,6 @@ export default {
|
|||||||
},
|
},
|
||||||
onWorkorderSelected(row){
|
onWorkorderSelected(row){
|
||||||
if(row != undefined && row != null){
|
if(row != undefined && row != null){
|
||||||
debugger;
|
|
||||||
this.form.workorderId = row.workorderId;
|
this.form.workorderId = row.workorderId;
|
||||||
this.form.workorderCode = row.workorderCode;
|
this.form.workorderCode = row.workorderCode;
|
||||||
this.form.workorderName = row.workorderName;
|
this.form.workorderName = row.workorderName;
|
||||||
|
Loading…
Reference in New Issue
Block a user