From a9bf1966f94955f542d39147fb1539befe2b4eec Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期四, 09 五月 2024 17:57:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/taskReliability/TaskPhase.vue | 74 ++++++++++++++++++++++++++-----------
1 files changed, 52 insertions(+), 22 deletions(-)
diff --git a/web/src/views/modules/taskReliability/TaskPhase.vue b/web/src/views/modules/taskReliability/TaskPhase.vue
index f1f2dd8..9abdaaf 100644
--- a/web/src/views/modules/taskReliability/TaskPhase.vue
+++ b/web/src/views/modules/taskReliability/TaskPhase.vue
@@ -1,41 +1,46 @@
<template>
<div>
- <el-row :gutter="10">
- <el-col :span="6">
- <div class="fa-card-a">
- <task @onTaskSelected="onTaskSelected"/>
+ <el-row :gutter="5">
+ <el-col :span="7">
+ <div class="fa-card-a" style="margin-right: 5px;">
+ <task @onTaskSelected="onTaskSelected" ref="task"/>
</div>
</el-col>
- <el-col :span="12">
- <div class="mod-taskReliability-taskPhase}">
+ <el-col :span="11">
+ <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/"
+ @dataLoaded="dataLoaded"
:paging='false' 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.taskId" type="add" @click="add()"/>
+ <zt-button v-if="dataForm.taskId" 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}"
- border @row-click="selectPhase" @selection-change="table.selectionChangeHandle">
+ <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
+
+ @row-click="selectPhase" @selection-change="table.selectionChangeHandle">
<el-table-column type="selection" width="40" align="center"/>
- <el-table-column prop="phaseName" label="浠诲姟闃舵鍚嶇О"/>
- <el-table-column prop="phaseDuration" label="闃舵鏃堕暱"/>
- <el-table-column prop="phaseSpeed" label="闃舵鏃堕��"/>
- <el-table-column prop="phaseSort" label="闃舵椤哄簭"/>
- <zt-table-column-handle :table="table"
- delete-perm="taskReliability::delete"/>
+ <el-table-column prop="phaseName" label="闃舵鍚嶇О" align="center"/>
+ <el-table-column prop="phaseDurationRate" label="闃舵鏃堕暱姣�" align="right"/>
+ <el-table-column prop="phaseSpeed" label="闃舵鏃堕��" align="right"/>
+ <!--<el-table-column prop="phaseSort" label="闃舵椤哄簭" align="center"/>-->
+ <el-table-column prop="operatConditDuration" label="宸ュ喌鏃堕暱鍒嗛厤" align="center"/>
+ <zt-table-column-handle :table="table" edit-perm="testReviewComment:update"
+ delete-perm="taskReliability::delete">
+ <template v-slot="{row}">
+ <zt-table-button type="primary" @click="openEditWin(row)">淇敼</zt-table-button>
+ </template>
+ </zt-table-column-handle>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
- <add-or-update @refreshDataList="table.query" ref="AddOrUpdate"/>
+ <add-or-update @refreshDataList="refreshData" ref="AddOrUpdate"/>
</zt-table-wraper>
</div>
</el-col>
<el-col :span="6">
- <div class="fa-card-a">
- <task-phase-model ref="model"/>
- </div>
+ <task-phase-model @getList="refreshData" ref="model"/>
</el-col>
</el-row>
</div>
@@ -50,9 +55,12 @@
data() {
return {
dataForm: {
+ id:'',
taskId: '',
productId: ''
- }
+ },
+ dataList: [],
+ time: null
}
},
components: {
@@ -61,10 +69,32 @@
AddOrUpdate
},
methods: {
+ refreshData(){
+ this.$refs.tableObj.query()
+ this.$refs.task.$refs.tableObj.query()
+ },
+ dataLoaded(data) {
+ this.time = null
+ this.dataList = data
+ for (let i = 0; i < this.dataList.length; i++) {
+ this.time = this.time + Number(this.dataList[i].phaseDurationRate)
+ }
+ console.log(this.time)
+ },
add() {
+ console.log(this.time)
this.$refs.AddOrUpdate.$refs.dialog.init(null, {
taskId: this.dataForm.taskId,
- productId: this.dataForm.productId
+ productId: this.dataForm.productId,
+ time: this.time
+ })
+ },
+ openEditWin(row){
+ console.log(row)
+ this.$refs.AddOrUpdate.$refs.dialog.init(row.id, {
+ taskId: this.dataForm.taskId,
+ productId: this.dataForm.productId,
+ time: this.time
})
},
onTaskSelected(row) {
--
Gitblit v1.9.1