From fe6e066b0970ed6c1dd23aa17fa65f16edbf513c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 23 五月 2024 14:05:46 +0800
Subject: [PATCH] #
---
src/main/webapp/views/taskWrk/taskWrk.html | 94 ++++++++++++++++++++++++++++------------------
1 files changed, 57 insertions(+), 37 deletions(-)
diff --git a/src/main/webapp/views/taskWrk/taskWrk.html b/src/main/webapp/views/taskWrk/taskWrk.html
index aaabdef..7886463 100644
--- a/src/main/webapp/views/taskWrk/taskWrk.html
+++ b/src/main/webapp/views/taskWrk/taskWrk.html
@@ -28,6 +28,13 @@
<el-option label="鍙栨秷" value="4"></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="">
+ <el-select v-model="tableSearchParam.io_type" placeholder="浠诲姟绫诲瀷">
+ <el-option label="鍏ュ簱" value="1"></el-option>
+ <el-option label="鍑哄簱" value="2"></el-option>
+ <el-option label="绉诲簱" value="3"></el-option>
+ </el-select>
+ </el-form-item>
<el-form-item style="width: 100px;" label="">
<el-input v-model="tableSearchParam.wrk_no" placeholder="宸ヤ綔鍙�"></el-input>
</el-form-item>
@@ -51,7 +58,7 @@
</el-form>
<el-table border ref="singleTable" :data="tableData" style="width: 100%;">
- <el-table-column sortable align="center" property="taskNo" label="浠诲姟鍙�" width="90">
+ <el-table-column fixed="left" sortable align="center" property="taskNo" label="浠诲姟鍙�" width="90">
</el-table-column>
<el-table-column sortable align="center" property="status$" label="浠诲姟鐘舵��" width="110">
</el-table-column>
@@ -67,7 +74,7 @@
</el-table-column>
<el-table-column sortable align="center" property="targetPoint" label="缁堢偣浣嶇疆">
</el-table-column>
- <el-table-column sortable align="center" property="wrkSts$" label="宸ヤ綔鐘舵��">
+ <el-table-column sortable align="center" property="wrkSts$" label="宸ヤ綔鐘舵��" width="150">
</el-table-column>
<el-table-column sortable align="center" property="barcode" label="鎵樼洏鐮�">
</el-table-column>
@@ -75,7 +82,12 @@
</el-table-column>
<el-table-column sortable align="center" property="ioPri$" label="浼樺厛绾�">
</el-table-column>
- <el-table-column label="鎿嶄綔" width="100" align="center">
+ <el-table-column sortable align="center" property="executeTime$" label="鍫嗗灈鏈哄紑濮嬫墽琛屾椂闂�">
+ </el-table-column>
+ <el-table-column sortable align="center" property="completeTime$" label="鍫嗗灈鏈虹粨鏉熸墽琛屾椂闂�">
+ </el-table-column>
+
+ <el-table-column fixed="right" label="鎿嶄綔" width="100" align="center">
<template slot-scope="scope">
<el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">
<el-button icon="el-icon-more" size="mini" type="primary"></el-button>
@@ -102,7 +114,7 @@
</el-card>
</div>
- <el-dialog :title="taskWrkFormTitle" :visible.sync="taskWrkFormVisible">
+ <el-dialog :title="taskWrkFormTitle" :visible.sync="taskWrkFormVisible" :before-close="handleClose">
<el-form :model="taskWrkForm">
<el-form-item label="璧风偣浣嶇疆" :label-width="taskWrkFormLabelWidth">
<el-input v-model="taskWrkForm.startPoint" autocomplete="off"></el-input>
@@ -147,6 +159,46 @@
this.init()
},
methods: {
+ handleClose(done) {
+ this.$confirm('纭鍏抽棴锛�')
+ .then(_ => {
+ done();
+ })
+ .catch(_ => {});
+ },
+ taskWrkFormConfirm() {
+ //淇敼鎸囧畾浠诲姟鏁版嵁
+ let that = this
+ $.ajax({
+ url: baseUrl + "/taskWrk/updatePoint/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ taskNo: this.taskWrkForm.taskNo,
+ startPoint: this.taskWrkForm.startPoint,
+ targetPoint: this.taskWrkForm.targetPoint,
+ },
+ method: 'POST',
+ success: function(res) {
+ if (res.code == 200) {
+ that.taskWrkFormVisible = false
+ that.$message({
+ message: "鏇存柊鎴愬姛",
+ type: 'success'
+ });
+ that.getTableData()
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ },
init() {
let taskNo = getQueryVariable('taskNo')
let wrkNo = getQueryVariable('wrkNo')
@@ -409,39 +461,7 @@
}
});
},
- taskWrkFormConfirm() {
- //淇敼鎸囧畾浠诲姟鏁版嵁
- let that = this
- $.ajax({
- url: baseUrl + "/taskWrk/updatePoint/auth",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- taskNo: this.taskWrkForm.taskNo,
- startPoint: this.taskWrkForm.startPoint,
- targetPoint: this.taskWrkForm.targetPoint,
- },
- method: 'POST',
- success: function(res) {
- if (res.code == 200) {
- that.taskWrkFormVisible = false
- 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