From 9c3ee278c31a79e2e36b635651cef0b2dd431260 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 22 九月 2025 16:55:57 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WCS/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue"
index ced7068..4949ad6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue"
@@ -3,7 +3,7 @@
<vol-box
v-model="showDetialBox"
:lazy="true"
- width="1200px"
+ width="1400px"
:padding="15"
title="浠诲姟璇︽儏"
>
@@ -81,21 +81,26 @@
<el-table-column type="index" width="50"> </el-table-column>
<el-table-column prop="taskNum" label="浠诲姟鍙�" width="90">
</el-table-column>
- <el-table-column prop="taskState" label="浠诲姟鐘舵��" width="90">
+ <!-- <el-table-column prop="taskState" label="浠诲姟鐘舵��" width="90">
+ </el-table-column> -->
+ <el-table-column prop="taskStateremark" label="涓嬩竴鎵ц鐘舵��" width="90">
</el-table-column>
- <el-table-column prop="currentAddress" label="褰撳墠浣嶇疆" width="90">
+ <el-table-column prop="rgvTaskTyperemark" label="RGV涓嬩竴鎵ц鐘舵��" width="90">
</el-table-column>
- <el-table-column prop="nextAddress" label="涓嬩竴浣嶇疆" width="90">
+ <el-table-column prop="currentAddress" label="褰撳墠鎵ц鐐�" width="90">
+ </el-table-column>
+ <el-table-column prop="nextAddress" label="涓嬩竴鎵ц鐐�" width="90">
</el-table-column>
<el-table-column prop="isManual" label="鏄惁浜哄伐鎿嶄綔" width="120">
</el-table-column>
<el-table-column prop="isNormal" label="鏄惁姝ｅ父" width="90">
</el-table-column>
- <el-table-column prop="description" label="鎻忚堪"> </el-table-column>
+
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" width="180">
</el-table-column>
- <el-table-column prop="remark" label="澶囨敞" width="180">
- </el-table-column>
+ <el-table-column prop="description" label="鎻忚堪"> </el-table-column>
+ <!-- <el-table-column prop="remark" label="澶囨敞" width="180">
+ </el-table-column> -->
</el-table>
</div>
</div>
@@ -105,6 +110,7 @@
<script>
import VolBox from "@/components/basic/VolBox.vue";
+
export default {
components: { VolBox },
data() {
@@ -130,7 +136,7 @@
} else {
this.getDetailDatas();
}
-
+
this.$emit("parentCall", ($vue) => {
var previousButton = $vue.buttons.find((x) => x.value == "Previous");
this.previousShow = previousButton != null;
@@ -150,6 +156,10 @@
if (!x.status) return this.$message.error(x.message);
this.steps = x.data.list;
this.active = x.data.active;
+
+ this.row.taskState=this.steps[this.active-1].title;
+ this.row.currentAddress=x.data.curradd;
+ this.row.nextAddress=x.data.nextadd;
});
},
getDetailDatas() {
@@ -162,6 +172,7 @@
.then((x) => {
if (!x.status) return this.$message.error(x.message);
this.tableData = x.data;
+
});
},
previous() {
@@ -175,6 +186,7 @@
if (!x.status) return this.$message.error(x.message);
this.$message.success("鎿嶄綔鎴愬姛");
this.getSteps();
+ this.getDetailDatas();
});
},
recovery(){
@@ -188,12 +200,13 @@
if (!x.status) return this.$message.error(x.message);
this.$message.success("鎿嶄綔鎴愬姛");
this.getSteps();
+ this.getDetailDatas();
});
},
next() {
this.http
.post(
- "/api/Task/UpdateTaskStatusToNext?taskNum=" + this.row.taskNum,
+ "/api/Task/NextStepeXecuted?taskNum=" + this.row.taskNum,
{},
true
)
@@ -201,6 +214,7 @@
if (!x.status) return this.$message.error(x.message);
this.$message.success("鎿嶄綔鎴愬姛");
this.getSteps();
+ this.getDetailDatas();
});
},
switchView() {
@@ -212,6 +226,17 @@
this.height = "200px";
}
},
+ getPageData(){
+ this.http
+ .post(
+ "/api/Task/getPageData",
+ {},
+ true
+ )
+ .then((x) => {
+ console.log('杩涜鍒锋柊')
+ });
+ },
tableRowClassName({ row, rowIndex }) {
if (!row.isNormal) {
return "error-row";
--
Gitblit v1.9.3