From 17ce02ec6fefa4e8b9ac870e2b52dea0942f5597 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 05 十二月 2024 09:40:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/taskReliability/ModelRbd.vue | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/web/src/views/modules/taskReliability/ModelRbd.vue b/web/src/views/modules/taskReliability/ModelRbd.vue
index 3b7d39b..62e621e 100644
--- a/web/src/views/modules/taskReliability/ModelRbd.vue
+++ b/web/src/views/modules/taskReliability/ModelRbd.vue
@@ -3,7 +3,7 @@
<el-row :gutter="5">
<el-col :span="5">
<div class="fa-card-a" style="margin-right: 5px;height: calc(100vh - 123px)">
- <product-model-tree @on-selected="onProductSelected" showXdy="true"/>
+ <product-model-tree ref="ProductModelTree" @on-selected="onProductSelected" @on-default="onDefault" showXdy="true" :isShow="false"/>
</div>
</el-col>
<el-col :span="19">
@@ -26,13 +26,14 @@
</el-form-item>
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
- border @selection-change="table.selectionChangeHandle">
+ border @selection-change="table.selectionChangeHandle"
+ :header-cell-style="{'text-align':'center'}">
<el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="modelName" label="妯″瀷鍚嶇О"/>
<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">
@@ -43,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>
@@ -62,16 +63,18 @@
data() {
return {
dialogVisible2: false,
+ title:'',
dataForm: {
modelName: '',
modelState:'',
productId: '',
modelTag: '',
+ shipId: '',
}
}
},
mounted() {
-
+ this.$refs.ProductModelTree.getProductList()
},
components: {
ProductModelTree,
@@ -80,15 +83,21 @@
},
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()
+ },
+ onDefault(defaultId){
+ this.dataForm.productId = defaultId
this.$refs.tableObj.query()
},
drawRBD(row) {
this.dialogVisible2 = true
+ this.title=row.modelName + '妯″瀷璁捐'
this.$nextTick(() => {
this.$refs.rbdEditImg.init(row)
})
--
Gitblit v1.9.1