From 195bb5267a6ece13363303e177fee7d1fa3941aa Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 19 十一月 2024 15:25:25 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/taskReliability/Task.vue | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/web/src/views/modules/taskReliability/Task.vue b/web/src/views/modules/taskReliability/Task.vue
index fb627c9..9de2f70 100644
--- a/web/src/views/modules/taskReliability/Task.vue
+++ b/web/src/views/modules/taskReliability/Task.vue
@@ -3,7 +3,7 @@
<div style="margin: 10px 0">
<zt-select v-model="dataForm.productId" placeholder="璇烽�夋嫨浜у搧鑺傜偣" :datas="productList" @change="onProductSelected"/>
</div>
- <zt-table-wraper ref="tableObj" query-url="/taskReliability/Task/page" defaultNotQuery="true" :paging='false'
+ <zt-table-wraper @dataLoaded="dataLoaded" ref="tableObj" query-url="/taskReliability/Task/page" defaultNotQuery="true" :paging='false'
delete-url="/taskReliability/Task/"
v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
@@ -11,6 +11,7 @@
<zt-button v-if="dataForm.productId" type="add" @click="add()"/>
<zt-button v-if="dataForm.productId" type="delete" @click="table.deleteHandle()"/>
<el-button v-if="dataForm.productId" type="primary" @click="openDialog()">浜岄」鍒嗗竷鍙傛暟</el-button>
+ <el-button v-if="dataForm.productId" type="primary" @click="openDialog2()">涓嶅彲淇澶囩被鍨�</el-button>
</el-form-item>
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
@@ -19,15 +20,19 @@
@row-click="selectTask"
@selection-change="table.selectionChangeHandle">
<el-table-column type="selection" width="40" align="center"/>
- <el-table-column prop="taskName" label="浠诲姟鍚嶇О" align="center"/>
+ <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="taskDuration" label="浠诲姟鎬绘椂闀�" align="right" />
+<!-- <el-table-column prop="taskStaus" label="鐘舵��" align="center" >
+
+ </el-table-column>-->
<zt-table-column-handle :table="table"
- delete-perm="taskReliability::delete"/>
+ delete-perm="taskReliability::delete" width="100"/>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<add-or-update @refreshDataList="table.query" ref="AddOrUpdate"/>
- <task-bino-param ref="taskBinoParam"></task-bino-param>
+ <task-bino-param ref="taskBinoParam"></task-bino-param>
+ <task-repair-param ref="taskRepairParam"></task-repair-param>
</zt-table-wraper>
</div>
</template>
@@ -35,6 +40,7 @@
<script>
import AddOrUpdate from './Task-AddOrUpdate'
import TaskBinoParam from "./TaskBinoParam";
+ import TaskRepairParam from "./TaskRepairParam";
export default {
name: 'Task',
@@ -50,6 +56,7 @@
}
},
components: {
+ TaskRepairParam,
TaskBinoParam,
AddOrUpdate
},
@@ -65,7 +72,14 @@
},
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("璇烽�夋嫨鍏蜂綋浠诲姟")
+ }
+ },
+ openDialog2() {
+ if (this.dataForm.id) {
+ this.$refs.taskRepairParam.$refs.dialog.init(null, {taskId: this.dataForm.id})
} else {
this.$alert("璇烽�夋嫨鍏蜂綋浠诲姟")
}
@@ -83,18 +97,22 @@
let res = await this.$http.get('/basicInfo/XhProductModel/getTaskProductList')
this.productList = res.data
console.log(this.productList, ' async getTaskProductList()')
+ this.onProductSelected(this.productList[0])
},
onProductSelected(data) {
console.log(data, ' onProductSelected(data)')
this.dataForm.productId = data.id
this.$refs.tableObj.query()
},
+ dataLoaded(dataList) {
+ this.selectTask(dataList[0])
+ },
tableRowClassName(
{
row,
rowIndex
}) {
- if (row.id == this.currentId) {
+ if (row.id === this.currentId) {
return 'select-row';
} else {
return 'not-select-row';
--
Gitblit v1.9.1