fix:玻纤日志中子工序问题修改
This commit is contained in:
parent
7d3b8d3b46
commit
410e48a5d3
|
|
@ -64,7 +64,6 @@
|
||||||
v-model="processLists"
|
v-model="processLists"
|
||||||
:addTemplate="addTemplate"
|
:addTemplate="addTemplate"
|
||||||
placeholder="暂无数据"
|
placeholder="暂无数据"
|
||||||
@add="rowAdd"
|
|
||||||
>
|
>
|
||||||
<el-table-column label="工序">
|
<el-table-column label="工序">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
|
|
@ -101,6 +100,27 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="使用设备">
|
||||||
|
<template #default="scope">
|
||||||
|
<el-select
|
||||||
|
v-if="scope.row.isEdit"
|
||||||
|
v-model="scope.row.equipment"
|
||||||
|
placeholder="设备"
|
||||||
|
class="width-100"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in equipmentOtions"
|
||||||
|
:key="item.id"
|
||||||
|
:label="item.name"
|
||||||
|
:value="item.id"
|
||||||
|
>
|
||||||
|
</el-option>
|
||||||
|
</el-select>
|
||||||
|
<div v-else>
|
||||||
|
<span v-if="scope.row.equipment!==null">{{ scope.row.equipment_name}}</span>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="操作时间">
|
<el-table-column label="操作时间">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
|
|
@ -116,23 +136,6 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-form-item v-if="route_code=='pengma'" label="使用设备" prop="equipment">
|
|
||||||
<template #default="scope">
|
|
||||||
<el-select
|
|
||||||
v-model="scope.row.equipment"
|
|
||||||
placeholder="设备"
|
|
||||||
class="width-100"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="item in equipmentOtions"
|
|
||||||
:key="item.id"
|
|
||||||
:label="item.name"
|
|
||||||
:value="item.id"
|
|
||||||
>
|
|
||||||
</el-option>
|
|
||||||
</el-select>
|
|
||||||
</template>
|
|
||||||
</el-form-item>
|
|
||||||
<el-table-column label="班次"></el-table-column>
|
<el-table-column label="班次"></el-table-column>
|
||||||
<el-table-column label="创建时间"></el-table-column>
|
<el-table-column label="创建时间"></el-table-column>
|
||||||
<el-table-column label="操作" fixed="right" align="center" width="150px">
|
<el-table-column label="操作" fixed="right" align="center" width="150px">
|
||||||
|
|
@ -514,9 +517,10 @@ export default {
|
||||||
addTemplate:{
|
addTemplate:{
|
||||||
mlog: "",
|
mlog: "",
|
||||||
process: "",
|
process: "",
|
||||||
|
equipment: "",
|
||||||
handle_user: "",
|
handle_user: "",
|
||||||
handle_user_name: "",
|
|
||||||
work_start_time: "",
|
work_start_time: "",
|
||||||
|
handle_user_name: "",
|
||||||
isEdit: true,
|
isEdit: true,
|
||||||
},
|
},
|
||||||
qct:null,
|
qct:null,
|
||||||
|
|
@ -540,6 +544,7 @@ export default {
|
||||||
this.apiObj = this.$API.wpm.mlogb.list;
|
this.apiObj = this.$API.wpm.mlogb.list;
|
||||||
let userInfo = that.$TOOL.data.get("USER_INFO");
|
let userInfo = that.$TOOL.data.get("USER_INFO");
|
||||||
that.addTemplate.mlog = that.mlogItem.id;
|
that.addTemplate.mlog = that.mlogItem.id;
|
||||||
|
that.addTemplate.equipment = "";
|
||||||
that.addTemplate.handle_user = userInfo.id;
|
that.addTemplate.handle_user = userInfo.id;
|
||||||
that.addTemplate.handle_user_name = userInfo.name;
|
that.addTemplate.handle_user_name = userInfo.name;
|
||||||
that.addTemplate.work_start_time = this.$TOOL.dateFormat(new Date());
|
that.addTemplate.work_start_time = this.$TOOL.dateFormat(new Date());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue