From 1351034482501073f628b87cdb6c4722a01283ba Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 18 十一月 2025 16:48:17 +0800
Subject: [PATCH] *
---
src/main/webapp/views/taskWrkLog/taskWrkLog.html | 103 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 98 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
index a1a20e5..a4a739f 100644
--- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -29,9 +29,21 @@
<el-select v-model="tableSearchParam.status" placeholder="浠诲姟鐘舵��">
<el-option label="鎺ユ敹" value="1"></el-option>
<el-option label="娲惧彂" value="2"></el-option>
- <el-option label="瀹岀粨" value="3"></el-option>
+ <el-option label="瀹岀粨" value="5"></el-option>
<el-option label="鍙栨秷" value="4"></el-option>
+ <el-option label="鎵嬪姩瀹岀粨" value="7"></el-option>
+ <el-option label="鍑哄簱鍒拌緭閫佺嚎" value="9"></el-option>
</el-select>
+ </el-form-item>
+ <el-form-item label="">
+ <el-date-picker
+ v-model="tableSearchParam.datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ type="datetimerange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getTableData">鏌ヨ</el-button>
@@ -46,7 +58,8 @@
<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-item command="showCommand">鏌ョ湅鎸囦护</el-dropdown-item>-->
+ <el-dropdown-item command="changeCommand">淇敼</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
@@ -79,7 +92,7 @@
</el-table-column>
<el-table-column property="wrkSts$" label="宸ヤ綔鐘舵��">
</el-table-column>
- <el-table-column property="crnNo" label="鍫嗗灈鏈哄彿">
+ <el-table-column property="crnNo" label="宸烽亾鍙�">
</el-table-column>
<el-table-column property="barcode" label="鏉＄爜">
</el-table-column>
@@ -95,6 +108,22 @@
</div>
</el-card>
</div>
+
+
+ <el-dialog :title="taskWrkFormTitle" :visible.sync="taskWrkFormVisible">
+ <el-form :model="taskWrkForm">
+ <el-form-item label="璧风偣浣嶇疆" :label-width="taskWrkFormLabelWidth">
+ <el-input v-model="taskWrkForm.startPoint" autocomplete="off"></el-input>
+ </el-form-item>
+ <el-form-item label="缁堢偣浣嶇疆" :label-width="taskWrkFormLabelWidth">
+ <el-input v-model="taskWrkForm.targetPoint" autocomplete="off"></el-input>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="taskWrkFormVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="taskWrkFormConfirm">纭� 瀹�</el-button>
+ </div>
+ </el-dialog>
</div>
<script>
var $layui = layui.config({
@@ -113,8 +142,24 @@
tableSearchParam: {
task_no: null,
status: null,
- wrk_no: null
- }
+ wrk_no: null,
+ datetime: null
+ },
+ taskWrkFormVisible: false,
+ addTaskFormVisible: false,
+ taskWrkForm: {},
+ addTaskForm: {
+ taskNo:"9001",
+ ioType:"0",
+ taskPriority:1,
+ barcode:"10000001",
+ startPoint:"1000",
+ targetPoint:"F-F01-01-01-01",
+ memo:"cs"
+ },
+ taskWrkFormTitle: '',
+ taskWrkFormLabelWidth: '80px',
+ addTaskFormLabelWidth: '80px',
},
created() {
this.init()
@@ -137,6 +182,10 @@
let data = this.tableSearchParam
data.curr = this.currentPage
data.limit = this.pageSize
+ if (this.tableSearchParam.datetime != null) {
+ data.datetime = null
+ data.create_time = this.tableSearchParam.datetime[0] + " - " + this.tableSearchParam.datetime[1]
+ }
$.ajax({
url: baseUrl + "/taskWrkLog/list/auth",
headers: {
@@ -343,6 +392,10 @@
//鏌ョ湅鎸囦护
this.showCommand(row)
break;
+ case "changeCommand":
+ //淇敼鎸囦护
+ this.changeCommand(row);
+ break
}
},
showCommand(row) {
@@ -358,6 +411,46 @@
success: function(layero, index) {}
});
},
+ changeCommand(row) {
+ //淇敼鎸囦护
+ this.taskWrkFormVisible = true
+ this.taskWrkFormTitle = "浠诲姟锛�" + row.taskNo
+ this.taskWrkForm = row
+ },
+ taskWrkFormConfirm() {
+ //淇敼鎸囧畾浠诲姟鏁版嵁
+ let that = this
+ $.ajax({
+ url: baseUrl + "/taskWrkLog/updatePoint/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ taskNo: this.taskWrkForm.taskNo,
+ wrkNo: this.taskWrkForm.wrkNo,
+ 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