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/Task.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/web/src/views/modules/taskReliability/Task.vue b/web/src/views/modules/taskReliability/Task.vue
index 281a62c..9de2f70 100644
--- a/web/src/views/modules/taskReliability/Task.vue
+++ b/web/src/views/modules/taskReliability/Task.vue
@@ -20,12 +20,12 @@
@row-click="selectTask"
@selection-change="table.selectionChangeHandle">
<el-table-column type="selection" width="40" align="center"/>
- <el-table-column prop="taskName" label="浠诲姟鍚嶇О" align="center" width="140"/>
+ <el-table-column prop="taskName" label="浠诲姟鍚嶇О" align="center" />
<!--<el-table-column prop="taskSort" label="浠诲姟椤哄簭" align="center"/>-->
- <el-table-column prop="taskDuration" label="浠诲姟鎬绘椂闀�" align="right" width="120"/>
- <el-table-column prop="taskStaus" label="鐘舵��" align="center" >
+ <el-table-column prop="taskDuration" label="浠诲姟鎬绘椂闀�" align="right" />
+<!-- <el-table-column prop="taskStaus" label="鐘舵��" align="center" >
- </el-table-column>
+ </el-table-column>-->
<zt-table-column-handle :table="table"
delete-perm="taskReliability::delete" width="100"/>
</el-table>
@@ -72,7 +72,7 @@
},
openDialog() {
if (this.dataForm.id) {
- this.$refs.taskBinoParam.$refs.dialog.init(null, {taskId: this.dataForm.id})
+ this.$refs.taskBinoParam.$refs.dialog.init(null, {taskId: this.dataForm.id,shipId :this.dataForm.productId})
} else {
this.$alert("璇烽�夋嫨鍏蜂綋浠诲姟")
}
--
Gitblit v1.9.1