|
@@ -26,7 +26,7 @@
|
|
|
</template>
|
|
|
</avue-form>
|
|
|
</trade-card>
|
|
|
- <trade-card title="商品信息" v-loading="loadingBtn">
|
|
|
+ <trade-card title="设备信息" v-loading="loadingBtn">
|
|
|
<avue-crud ref="crud" :option="optionList" :data="data" :table-loading="loading" @saveColumn="saveColumn"
|
|
|
@resetColumn="resetColumn" :cell-style="cellStyle">
|
|
|
<template slot="headerSerial">
|
|
@@ -39,6 +39,13 @@
|
|
|
placeholder="请输入" size="small" :controls="false" style="width:100%;"></el-input>
|
|
|
<span v-else>{{ row.code }}</span>
|
|
|
</template>
|
|
|
+
|
|
|
+ <template slot="remarks" slot-scope="{ row, index }">
|
|
|
+ <el-input v-if="row.$cellEdit" v-model="row.remarks"
|
|
|
+ placeholder="请输入" size="small" :controls="false" style="width:100%;"></el-input>
|
|
|
+ <span v-else>{{ row.remarks }}</span>
|
|
|
+ </template>
|
|
|
+
|
|
|
<template slot="exitDate" slot-scope="{ row, index }">
|
|
|
<el-date-picker
|
|
|
v-if="row.$cellEdit"
|
|
@@ -185,7 +192,7 @@ export default {
|
|
|
disabled: false,
|
|
|
column: [
|
|
|
{
|
|
|
- label: "客户名称",
|
|
|
+ label: "客户",
|
|
|
prop: "corpId",
|
|
|
|
|
|
rules: [
|
|
@@ -198,16 +205,8 @@ export default {
|
|
|
span: 16,
|
|
|
},
|
|
|
{
|
|
|
- label: "编号",
|
|
|
- prop: "sysNo",
|
|
|
- search: true,
|
|
|
- overHidden: true,
|
|
|
- disabled:true,
|
|
|
- span: 8,
|
|
|
- },
|
|
|
- {
|
|
|
- label: "联系人",
|
|
|
- prop: "contacts",
|
|
|
+ label: "电话",
|
|
|
+ prop: "contactsTel",
|
|
|
search: true,
|
|
|
overHidden: true,
|
|
|
span: 8,
|
|
@@ -220,9 +219,8 @@ export default {
|
|
|
],
|
|
|
},
|
|
|
{
|
|
|
- label: "联系电话",
|
|
|
- prop: "contactsTel",
|
|
|
- search: true,
|
|
|
+ label: "地址",
|
|
|
+ prop: "address",
|
|
|
overHidden: true,
|
|
|
span: 8,
|
|
|
rules: [
|
|
@@ -234,8 +232,9 @@ export default {
|
|
|
],
|
|
|
},
|
|
|
{
|
|
|
- label: "地址",
|
|
|
- prop: "address",
|
|
|
+ label: "联系人",
|
|
|
+ prop: "contacts",
|
|
|
+ search: true,
|
|
|
overHidden: true,
|
|
|
span: 8,
|
|
|
rules: [
|
|
@@ -246,6 +245,19 @@ export default {
|
|
|
}
|
|
|
],
|
|
|
},
|
|
|
+
|
|
|
+
|
|
|
+ {
|
|
|
+ label: "编号",
|
|
|
+ prop: "sysNo",
|
|
|
+ search: true,
|
|
|
+ overHidden: true,
|
|
|
+ disabled:true,
|
|
|
+ span: 8,
|
|
|
+ },
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
{
|
|
|
label: "设备数量",
|
|
|
prop: "equipmentNumber",
|
|
@@ -678,6 +690,7 @@ export default {
|
|
|
cname:item.cname,
|
|
|
code:item.code,
|
|
|
brand:item.brand,
|
|
|
+ brandId:item.brandId,
|
|
|
specs:item.specs,
|
|
|
remarks:item.remarks,
|
|
|
goodsTypeId:item.goodsTypeId,
|
|
@@ -687,9 +700,11 @@ export default {
|
|
|
maintenanceDate:item.maintenanceDate?item.maintenanceDate + ' 00:00:00':item.maintenanceDate,
|
|
|
repairReportDate:item.repairReportDate,
|
|
|
url:item.url?item.url:null,
|
|
|
+ factoryId:item.factoryId?item.factoryId:null,
|
|
|
+ factoryName:item.factoryName?item.factoryName:null,
|
|
|
+ categoryitem:item.categoryitem?item.categoryitem:null
|
|
|
}
|
|
|
})
|
|
|
- console.log(arr,633)
|
|
|
const obj = {
|
|
|
id:this.form.id?this.form.id:null,
|
|
|
corpId:this.form.corpId,
|
|
@@ -781,6 +796,8 @@ export default {
|
|
|
this.data.push({
|
|
|
$cellEdit: true,
|
|
|
storageId: this.form.storageId,
|
|
|
+ factoryId:item.corpId,
|
|
|
+ factoryName:item.corpName,
|
|
|
...item
|
|
|
})
|
|
|
}
|
|
@@ -790,10 +807,13 @@ export default {
|
|
|
this.data.push({
|
|
|
$cellEdit: true,
|
|
|
storageId: this.form.storageId,
|
|
|
+ factoryId:item.corpId,
|
|
|
+ factoryName:item.corpName,
|
|
|
...item
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
+ console.log(this.data,802)
|
|
|
this.form.equipmentNumber = this.data.length
|
|
|
this.productVisible = false
|
|
|
},
|