|
|
@@ -32,12 +32,12 @@
|
|
|
style="width: 100%;"
|
|
|
>
|
|
|
<el-table-column type="index" width="60"></el-table-column>
|
|
|
- <el-table-column prop="equipmentNo" label="云模盒编号" width="120" sortable></el-table-column>
|
|
|
+ <el-table-column prop="equipmentNo" label="云模盒编号" width="130" sortable></el-table-column>
|
|
|
<el-table-column label="电量" width="80" sortable></el-table-column>
|
|
|
<el-table-column prop="useLife" label="倒计时" width="100" sortable></el-table-column>
|
|
|
- <el-table-column prop="equipmentName" label="模具名称" width="100" sortable></el-table-column>
|
|
|
- <el-table-column label="模具编号" width="120" sortable></el-table-column>
|
|
|
- <el-table-column prop="belongCompanyId" label="资产方" width="120" sortable></el-table-column>
|
|
|
+ <el-table-column prop="equipmentName" label="模具名称" sortable></el-table-column>
|
|
|
+ <el-table-column label="模具编号" sortable></el-table-column>
|
|
|
+ <el-table-column prop="belongCompanyId" label="资产方" sortable></el-table-column>
|
|
|
<el-table-column label="模具状态" width="100" sortable>
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="scope.row.isUse == 0">未启用</span>
|
|
|
@@ -105,6 +105,9 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="使用年限">
|
|
|
+ <el-input v-model="newAllocation.useLife" autocomplete="off" placeholder="请填写"></el-input>
|
|
|
+ </el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button @click.native="addFormVisible = false">取消</el-button>
|
|
|
@@ -260,7 +263,8 @@ export default {
|
|
|
this.port.base.editMould,
|
|
|
{
|
|
|
equipmentNo: this.newAllocation.equipmentNo,
|
|
|
- belongCompanyId: this.newAllocation.belongCompanyId
|
|
|
+ belongCompanyId: this.newAllocation.belongCompanyId,
|
|
|
+ useLife: this.newAllocation.useLife
|
|
|
},
|
|
|
res => {
|
|
|
this.addLoading = false;
|
|
|
@@ -335,11 +339,9 @@ export default {
|
|
|
//启用设备
|
|
|
enable(index) {
|
|
|
this.allocations[index].isUse = 1;
|
|
|
- //启用设备调用
|
|
|
this.http.post(
|
|
|
this.port.base.enableMould,
|
|
|
{
|
|
|
- //数是瞎写的
|
|
|
id: this.allocations[index].id,
|
|
|
isUse: 1
|
|
|
},
|
|
|
@@ -349,7 +351,7 @@ export default {
|
|
|
message: "修改成功",
|
|
|
type: "success"
|
|
|
});
|
|
|
- this.getRoles();
|
|
|
+ this.getMoulds();
|
|
|
} else {
|
|
|
this.$message({
|
|
|
message: res.msg,
|
