|
|
@@ -75,6 +75,10 @@
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :span="12">
|
|
|
+ <a-form-model-item label="选择设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
|
|
|
+ <j-search-select-tag v-model="model.equipmentid" dict="tpm_equipment,equipmentname,id" style="width: 100%" :disabled="true"/>
|
|
|
+ <!-- <a-button type="primary" icon="search" /> -->
|
|
|
+ </a-form-model-item>
|
|
|
</a-col>
|
|
|
<!-- <a-col :span="24">
|
|
|
<a-form-model-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" prop="upkeepdesc">
|
|
|
@@ -106,7 +110,7 @@
|
|
|
bordered
|
|
|
rowKey="id"
|
|
|
:columns="columns"
|
|
|
- :dataSource="model.cmmsUpkeepItemDtoList"
|
|
|
+ :dataSource="model.cmmsUpkeepItemList"
|
|
|
:pagination="false"
|
|
|
class="j-table-force-nowrap">
|
|
|
</a-table>
|
|
|
@@ -135,7 +139,7 @@
|
|
|
data () {
|
|
|
return {
|
|
|
model:{
|
|
|
- cmmsUpkeepItemDtoList: []
|
|
|
+ cmmsUpkeepItemList: []
|
|
|
},
|
|
|
labelCol: {
|
|
|
xs: { span: 24 },
|
|
|
@@ -218,7 +222,20 @@
|
|
|
this.edit(this.modelDefault);
|
|
|
},
|
|
|
edit (record) {
|
|
|
- this.model = Object.assign({}, record);
|
|
|
+ // this.model = Object.assign({}, record);
|
|
|
+ getAction(this.url.queryById, record).then((res) => {
|
|
|
+ console.log(88,res)
|
|
|
+ this.model = res.result
|
|
|
+ // this.model.cmmsUpkeepItemDtoList = this.model.cmmsUpkeepItemDtoList.map((res) => {
|
|
|
+ // return {
|
|
|
+ // id: id,
|
|
|
+ // itemcode: res.itemcode,
|
|
|
+ // itemname: res.itemname,
|
|
|
+ // itemcontent: res.itemcontent,
|
|
|
+ // remark: res.remark
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ })
|
|
|
this.visible = true;
|
|
|
},
|
|
|
submitForm () {
|
wyh