From c59bcfa4429a5d67842ebaa492db1fa11a3e97fc Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 10 七月 2025 09:21:25 +0800
Subject: [PATCH] 输送线异常提示
---
src/main/webapp/views/taskWrkLog/taskWrkLog.html | 75 +++++++++++++++++++++++++++++++------
1 files changed, 62 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
index a8831d4..12757f6 100644
--- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -23,31 +23,41 @@
<el-form-item label="">
<el-input v-model="tableSearchParam.wrk_no" placeholder="宸ヤ綔鍙�"></el-input>
</el-form-item>
+ <el-form-item label="">
+ <el-input v-model="tableSearchParam.barcode" placeholder="鏉＄爜"></el-input>
+ </el-form-item>
+ <el-form-item label="">
+ <el-input v-model="tableSearchParam.start_point" placeholder="璧峰浣�"></el-input>
+ </el-form-item>
+ <el-form-item label="">
+ <el-input v-model="tableSearchParam.target_point" placeholder="鐩爣浣�"></el-input>
+ </el-form-item>
<el-form-item>
<el-button type="primary" @click="getTableData">鏌ヨ</el-button>
<el-button type="primary" @click="resetParam">閲嶇疆</el-button>
</el-form-item>
</el-form>
<el-table ref="singleTable" :data="tableData" style="width: 100%;">
- <el-table-column label="鎿嶄綔" width="100">
- <template slot-scope="scope">
- <el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">
- <el-button icon="el-icon-more" size="mini" type="primary"></el-button>
- <el-dropdown-menu slot="dropdown">
- <el-dropdown-item command="showCommand">鏌ョ湅鎸囦护</el-dropdown-item>
- </el-dropdown-menu>
- </el-dropdown>
- </template>
- </el-table-column>
+<!-- <el-table-column label="鎿嶄綔" width="100">-->
+<!-- <template slot-scope="scope">-->
+<!-- <el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">-->
+<!-- <el-button icon="el-icon-more" size="mini" type="primary"></el-button>-->
+<!-- <el-dropdown-menu slot="dropdown">-->
+<!-- <el-dropdown-item command="resubmitTheTask">閲嶆柊涓婃姤浠诲姟瀹岀粨</el-dropdown-item>-->
+<!-- <el-dropdown-item command="showCommand">鏌ョ湅鎸囦护</el-dropdown-item>-->
+<!-- </el-dropdown-menu>-->
+<!-- </el-dropdown>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column property="taskNo" label="浠诲姟鍙�">
</el-table-column>
<el-table-column property="status$" label="浠诲姟鐘舵��">
</el-table-column>
<el-table-column property="wrkNo" label="宸ヤ綔鍙�">
</el-table-column>
- <el-table-column property="createTime$" label="浠诲姟鏃堕棿">
+ <el-table-column property="createTime$" label="鍒涘缓鏃堕棿" width="150">
</el-table-column>
- <el-table-column property="durationTime" label="鎸佺画鏃堕暱">
+ <el-table-column property="completeTime$" label="瀹屾垚鏃堕棿" width="150">
</el-table-column>
<el-table-column property="ioType$" label="浠诲姟绫诲瀷">
</el-table-column>
@@ -58,6 +68,10 @@
<el-table-column property="wrkSts$" label="宸ヤ綔鐘舵��">
</el-table-column>
<el-table-column property="crnNo" label="鍫嗗灈鏈哄彿">
+ </el-table-column>
+ <el-table-column property="barcode" label="鏉＄爜">
+ </el-table-column>
+ <el-table-column property="type" label="涓嬮檷楂樺害">
</el-table-column>
</el-table>
@@ -154,6 +168,11 @@
},
handleCommand(command, row) {
switch (command) {
+
+ case "resubmitTheTask":
+ //閲嶆柊涓婃姤浠诲姟瀹岀粨
+ this.resubmitTheTask(row)
+ break;
case "showCommand":
//鏌ョ湅鎸囦护
this.showCommand(row)
@@ -169,10 +188,40 @@
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
- content: 'commandManage.html?taskNo=' + row.taskNo + "&wrkNo=" + wrkNo,
+ content: 'commandManageLog.html?taskNo=' + row.taskNo + "&wrkNo=" + wrkNo,
success: function(layero, index) {}
});
},
+ resubmitTheTask(row){
+ //閲嶆柊涓婃姤浠诲姟瀹岀粨
+ let that = this
+ $.ajax({
+ url: baseUrl + "/taskWrkLog/resubmitTheTask/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ taskNo: row.taskNo
+ },
+ method: 'POST',
+ success: function(res) {
+ if (res.code == 200) {
+ that.$message({
+ message: "鍙栨秷鎴愬姛",
+ type: 'success'
+ });
+ that.getTableData()
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ },
}
})
</script>
--
Gitblit v1.9.1