|
|
@@ -37,7 +37,7 @@
|
|
|
<el-table-column prop="modelName" label="模具名称" sortable></el-table-column>
|
|
|
<el-table-column prop="modelNo" label="模具编号" width="120" align="center" sortable></el-table-column>
|
|
|
<el-table-column prop="companyName" label="公司名称" sortable></el-table-column>
|
|
|
- <el-table-column label="代理商" width="120" sortable></el-table-column>
|
|
|
+ <el-table-column prop="agent" label="代理商" width="120" sortable></el-table-column>
|
|
|
<el-table-column label="云模盒状态" align="center" width="120" sortable>
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="scope.row.isUse == 0">未启用</span>
|
|
|
@@ -134,31 +134,31 @@
|
|
|
class="demo-form-inline"
|
|
|
>
|
|
|
<el-form-item label="云模盒编号" prop="equipmentNo">
|
|
|
- <el-input v-model="newAllocation.equipmentNo" autocomplete="off" placeholder="请填写"></el-input>
|
|
|
+ <el-input v-model="newAllocation.equipmentNo" autocomplete="off" placeholder="请填写"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="所属公司" prop="belongCompanyId">
|
|
|
- <el-select
|
|
|
- v-model="newAllocation.belongCompanyId"
|
|
|
- filterable
|
|
|
- clearable
|
|
|
- placeholder="请选择"
|
|
|
- style="width: 202px"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in companies"
|
|
|
- :key="item.id"
|
|
|
- :label="item.companyName"
|
|
|
- :value="item.id"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
+ <el-select
|
|
|
+ v-model="newAllocation.belongCompanyId"
|
|
|
+ filterable
|
|
|
+ clearable
|
|
|
+ placeholder="请选择"
|
|
|
+ style="width: 202px"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in companies"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.companyName"
|
|
|
+ :value="item.id"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="使用年限" prop="useLife">
|
|
|
- <el-input
|
|
|
- v-model.number="newAllocation.useLife"
|
|
|
- type="age"
|
|
|
- autocomplete="off"
|
|
|
- placeholder="请填写"
|
|
|
- ></el-input>
|
|
|
+ <el-input
|
|
|
+ v-model.number="newAllocation.useLife"
|
|
|
+ type="age"
|
|
|
+ autocomplete="off"
|
|
|
+ placeholder="请填写"
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="代理商" prop="agent">
|
|
|
<el-input
|
|
|
@@ -326,10 +326,10 @@
|
|
|
this.http.post(
|
|
|
this.port.base.editMould,
|
|
|
{
|
|
|
- equipmentNo: this.newAllocation.equipmentNo,
|
|
|
- belongCompanyId: this.newAllocation.belongCompanyId,
|
|
|
- useLife: this.newAllocation.useLife
|
|
|
- //这里应该有代理商agent
|
|
|
+ equipmentNo: this.newAllocation.equipmentNo,
|
|
|
+ belongCompanyId: this.newAllocation.belongCompanyId,
|
|
|
+ useLife: this.newAllocation.useLife,
|
|
|
+ agent: this.newAllocation.agent
|
|
|
},
|
|
|
res => {
|
|
|
this.addLoading = false;
|
|
|
@@ -368,7 +368,7 @@
|
|
|
useLife: row.useLife,
|
|
|
equipmentNo: row.equipmentNo,
|
|
|
belongCompanyId: row.belongCompanyId,
|
|
|
- agent: ""//这里应该有代理商agent
|
|
|
+ agent: row.agent
|
|
|
};
|
|
|
},
|
|
|
|
|
|
@@ -382,8 +382,8 @@
|
|
|
equipmentNo: this.newAllocation.equipmentNo,
|
|
|
equipmentName: this.newAllocation.equipmentName,
|
|
|
belongCompanyId: this.newAllocation.belongCompanyId,
|
|
|
- useLife: this.newAllocation.useLife
|
|
|
- //这里应该有代理商agent
|
|
|
+ useLife: this.newAllocation.useLife,
|
|
|
+ agent: this.newAllocation.agent
|
|
|
},
|
|
|
res => {
|
|
|
this.editLoading = false;
|
Reiskuchen