From 9ccfd089b6cac9f8ba0cb7cadfee01857a715f0d Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期六, 12 十月 2024 10:34:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/taskReliability/ModelRbd.vue | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/web/src/views/modules/taskReliability/ModelRbd.vue b/web/src/views/modules/taskReliability/ModelRbd.vue
index b4432ac..62e621e 100644
--- a/web/src/views/modules/taskReliability/ModelRbd.vue
+++ b/web/src/views/modules/taskReliability/ModelRbd.vue
@@ -33,7 +33,7 @@
<el-table-column prop="modelTag" label="妯″瀷鏍囪瘑"/>
<el-table-column prop="quoteNum" label="琚紩鐢ㄦ暟" align="center"/>
<el-table-column prop="modelState" label="妯″瀷鐘舵��" align="center"/>
- <el-table-column prop="modelDataState" label="妯″瀷鏁版嵁鐘舵��" align="center"/>
+ <!-- <el-table-column prop="modelDataState" label="妯″瀷鏁版嵁鐘舵��" align="center"/>-->
<el-table-column prop="remark" label="澶囨敞"/>
<zt-table-column-handle :table="table"
delete-perm="taskReliability::delete" :has-view="false" width="180px">
@@ -44,7 +44,7 @@
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<add-or-update @refreshDataList="table.query" ref="AddOrUpdate"/>
- <el-dialog v-dialogDrag title="妯″瀷璁捐" top="1vh" width='95%' :visible.sync="dialogVisible2" v-if="dialogVisible2">
+ <el-dialog v-dialogDrag :title="title" top="1vh" width='95%' :visible.sync="dialogVisible2" v-if="dialogVisible2">
<RBDEditImg ref="rbdEditImg" @refreshDataList="table.query"></RBDEditImg>
</el-dialog>
</zt-table-wraper>
@@ -63,11 +63,13 @@
data() {
return {
dialogVisible2: false,
+ title:'',
dataForm: {
modelName: '',
modelState:'',
productId: '',
modelTag: '',
+ shipId: '',
}
}
},
@@ -81,10 +83,11 @@
},
methods: {
add() {
- this.$refs.AddOrUpdate.$refs.dialog.init(null, this.dataForm.productId)
+ this.$refs.AddOrUpdate.$refs.dialog.init(null, {productId:this.dataForm.productId,shipId:this.dataForm.shipId})
},
onProductSelected(data) {
this.dataForm.productId = data.id
+ this.dataForm.shipId = data.shipId
console.log(data, 'onProductSelected(data)')
this.$refs.tableObj.query()
},
@@ -94,6 +97,7 @@
},
drawRBD(row) {
this.dialogVisible2 = true
+ this.title=row.modelName + '妯″瀷璁捐'
this.$nextTick(() => {
this.$refs.rbdEditImg.init(row)
})
--
Gitblit v1.9.1