From 7b02e5ed98cab7df7c52949c5bba298d1060329b Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期四, 09 五月 2024 14:50:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/taskReliability/Task.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/web/src/views/modules/taskReliability/Task.vue b/web/src/views/modules/taskReliability/Task.vue
index 53dc7af..634b2ce 100644
--- a/web/src/views/modules/taskReliability/Task.vue
+++ b/web/src/views/modules/taskReliability/Task.vue
@@ -1,23 +1,23 @@
<template>
<div class="mod-taskReliability-task}">
- <div>
- 浜у搧鑺傜偣锛�
- <zt-select v-model="dataForm.productId" :datas="productList" @change="onProductSelected"/>
+ <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' delete-url="/taskReliability/Task/"
v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
- <zt-button type="add" @click="add()" />
- <zt-button type="delete" @click="table.deleteHandle()"/>
+ <zt-button v-if="dataForm.productId" type="add" @click="add()" />
+ <zt-button v-if="dataForm.productId" type="delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
- <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}"
+ <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
@row-click="selectTask"
- border @selection-change="table.selectionChangeHandle">
+ @selection-change="table.selectionChangeHandle">
<el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="taskName" label="浠诲姟鍚嶇О"/>
- <el-table-column prop="taskSort" label="浠诲姟椤哄簭"/>
+ <!--<el-table-column prop="taskSort" label="浠诲姟椤哄簭" align="center"/>-->
+ <el-table-column prop="taskDuration" label="浠诲姟鎬绘椂闀�" align="right"/>
<zt-table-column-handle :table="table"
delete-perm="taskReliability::delete"/>
</el-table>
@@ -36,6 +36,7 @@
return {
productList: [],
dataForm: {
+ id:'',
productId: ''
}
}
--
Gitblit v1.9.1