From a8ce806c8a81f685fa9fafaa453820197ced9961 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 10 十二月 2024 10:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/taskReliability/TaskPhase.vue | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/web/src/views/modules/taskReliability/TaskPhase.vue b/web/src/views/modules/taskReliability/TaskPhase.vue
index b2915f7..2d49a1b 100644
--- a/web/src/views/modules/taskReliability/TaskPhase.vue
+++ b/web/src/views/modules/taskReliability/TaskPhase.vue
@@ -1,12 +1,12 @@
<template>
<div>
<el-row :gutter="5">
- <el-col :span="7">
+ <el-col :span="8">
<div class="fa-card-a" style="margin-right: 5px;">
<task @onTaskSelected="onTaskSelected" ref="task"/>
</div>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<div class="mod-taskReliability-taskPhase fa-card-a" style="margin-left: 5px;margin-right: 5px;">
<zt-table-wraper ref="tableObj" defaultNotQuery="true" query-url="/taskReliability/TaskPhase/page"
delete-url="/taskReliability/TaskPhase/"
@@ -24,12 +24,9 @@
<el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="phaseName" label="闃舵鍚嶇О" align="center"/>
<el-table-column prop="phaseDurationRate" label="闃舵鏃堕暱姣�" align="right" width="120"/>
- <el-table-column prop="remark" label="澶囨敞" align="right" width="200"/>
- <!-- <el-table-column prop="phaseSpeed" label="闃舵鏃堕��" align="right"/>-->
- <!--<el-table-column prop="phaseSort" label="闃舵椤哄簭" align="center"/>-->
- <!--<el-table-column prop="operatConditDuration" label="宸ュ喌鏃堕暱鍒嗛厤" align="center"/>-->
+ <el-table-column prop="remark" label="澶囨敞" align="center" width="100"/>
<zt-table-column-handle :table="table" edit-perm="testReviewComment:update"
- delete-perm="taskReliability::delete">
+ delete-perm="taskReliability::delete" width="100">
<template v-slot="{row}">
<zt-table-button type="primary" @click="openEditWin(row)">淇敼</zt-table-button>
</template>
@@ -41,7 +38,7 @@
</div>
</el-col>
<el-col :span="6">
- <task-phase-model @getList="refreshData" ref="model"/>
+ <task-phase-model ref="model"/>
</el-col>
</el-row>
</div>
@@ -74,7 +71,6 @@
methods: {
refreshData() {
this.$refs.tableObj.query()
- this.$refs.task.$refs.tableObj.query()
},
dataLoaded(data) {
this.time = null
@@ -85,7 +81,6 @@
console.log(this.time)
},
add() {
- console.log(this.time)
this.$refs.AddOrUpdate.$refs.dialog.init(null, {
taskId: this.dataForm.taskId,
productId: this.dataForm.productId,
--
Gitblit v1.9.1