From f7b24a4603135f583deb3978938172dec0ae2577 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 10 八月 2023 16:23:17 +0800
Subject: [PATCH] 任务日志
---
src/main/java/com/zy/asrs/service/TaskWrkLogService.java | 8
src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java | 12 +
src/main/webapp/views/taskWrkLog/taskWrkLog.html | 181 +++++++++++++++
src/main/resources/mapper/TaskWrkLogMapper.xml | 30 ++
src/main/java/com/zy/asrs/controller/TaskWrkLogController.java | 123 ++++++++++
src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java | 12 +
src/main/java/com/zy/asrs/entity/TaskWrkLog.java | 313 ++++++++++++++++++++++++++
7 files changed, 679 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
new file mode 100644
index 0000000..05f445f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
@@ -0,0 +1,123 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.TaskWrkLog;
+import com.zy.asrs.service.TaskWrkLogService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class TaskWrkLogController extends BaseController {
+
+ @Autowired
+ private TaskWrkLogService taskWrkLogService;
+
+ @RequestMapping(value = "/taskWrkLog/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(taskWrkLogService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/taskWrkLog/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<TaskWrkLog> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(taskWrkLogService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/taskWrkLog/add/auth")
+ @ManagerAuth
+ public R add(TaskWrkLog taskWrkLog) {
+ taskWrkLogService.insert(taskWrkLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/taskWrkLog/update/auth")
+ @ManagerAuth
+ public R update(TaskWrkLog taskWrkLog){
+ if (Cools.isEmpty(taskWrkLog) || null==taskWrkLog.getId()){
+ return R.error();
+ }
+ taskWrkLogService.updateById(taskWrkLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/taskWrkLog/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ taskWrkLogService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/taskWrkLog/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<TaskWrkLog> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("taskWrkLog"));
+ convert(map, wrapper);
+ List<TaskWrkLog> list = taskWrkLogService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/taskWrkLogQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<TaskWrkLog> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<TaskWrkLog> page = taskWrkLogService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (TaskWrkLog taskWrkLog : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", taskWrkLog.getId());
+ map.put("value", taskWrkLog.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/taskWrkLog/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<TaskWrkLog> wrapper = new EntityWrapper<TaskWrkLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != taskWrkLogService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(TaskWrkLog.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
new file mode 100644
index 0000000..e01d5a5
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
@@ -0,0 +1,313 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasWrkIotypeService;
+import com.zy.asrs.entity.BasWrkIotype;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasWrkStatusService;
+import com.zy.asrs.entity.BasWrkStatus;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("wcs_task_wrk_log")
+public class TaskWrkLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * wms浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "wms浠诲姟鍙�")
+ @TableField("task_no")
+ private String taskNo;
+
+ /**
+ * 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷
+ */
+ @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷 ")
+ private Integer status;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "浠诲姟鍙�")
+ @TableField("wrk_no")
+ private Integer wrkNo;
+
+ /**
+ * 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
+ */
+ @ApiModelProperty(value= "浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 浠诲姟绫诲瀷
+ */
+ @ApiModelProperty(value= "浠诲姟绫诲瀷")
+ @TableField("io_type")
+ private Integer ioType;
+
+ /**
+ * 浼樺厛绾�
+ */
+ @ApiModelProperty(value= "浼樺厛绾�")
+ @TableField("io_pri")
+ private Double ioPri;
+
+ /**
+ * 璧风偣
+ */
+ @ApiModelProperty(value= "璧风偣")
+ @TableField("start_point")
+ private String startPoint;
+
+ /**
+ * 缁堢偣
+ */
+ @ApiModelProperty(value= "缁堢偣")
+ @TableField("target_point")
+ private String targetPoint;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("modi_user")
+ private Long modiUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("modi_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date modiTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value= "鏉＄爜")
+ private String barcode;
+
+ /**
+ * 娲惧彂鏃堕棿
+ */
+ @ApiModelProperty(value= "娲惧彂鏃堕棿")
+ @TableField("assign_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date assignTime;
+
+ /**
+ * 鎵ц鏃堕棿
+ */
+ @ApiModelProperty(value= "鎵ц鏃堕棿")
+ @TableField("execute_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date executeTime;
+
+ /**
+ * 瀹岀粨鏃堕棿
+ */
+ @ApiModelProperty(value= "瀹岀粨鏃堕棿")
+ @TableField("complete_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date completeTime;
+
+ /**
+ * 鍙栨秷鏃堕棿
+ */
+ @ApiModelProperty(value= "鍙栨秷鏃堕棿")
+ @TableField("cancel_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date cancelTime;
+
+ /**
+ * 宸ヤ綔鐘舵��
+ */
+ @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @TableField("wrk_sts")
+ private Integer wrkSts;
+
+ /**
+ * 鍫嗗灈鏈哄彿
+ */
+ @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @TableField("crn_no")
+ private Integer crnNo;
+
+ /**
+ * 鎸囦护鎵ц姝ュ簭
+ */
+ @ApiModelProperty(value= "鎸囦护鎵ц姝ュ簭")
+ @TableField("command_step")
+ private Integer commandStep;
+
+ @ApiModelProperty(value= "")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ public TaskWrkLog() {}
+
+ public TaskWrkLog(String taskNo,Integer status,Integer wrkNo,Date createTime,Integer ioType,Double ioPri,String startPoint,String targetPoint,Long modiUser,Date modiTime,String memo,String barcode,Date assignTime,Date executeTime,Date completeTime,Date cancelTime,Integer wrkSts,Integer crnNo,Integer commandStep) {
+ this.taskNo = taskNo;
+ this.status = status;
+ this.wrkNo = wrkNo;
+ this.createTime = createTime;
+ this.ioType = ioType;
+ this.ioPri = ioPri;
+ this.startPoint = startPoint;
+ this.targetPoint = targetPoint;
+ this.modiUser = modiUser;
+ this.modiTime = modiTime;
+ this.memo = memo;
+ this.barcode = barcode;
+ this.assignTime = assignTime;
+ this.executeTime = executeTime;
+ this.completeTime = completeTime;
+ this.cancelTime = cancelTime;
+ this.wrkSts = wrkSts;
+ this.crnNo = crnNo;
+ this.commandStep = commandStep;
+ }
+
+// TaskWrkLog taskWrkLog = new TaskWrkLog(
+// null, // wms浠诲姟鍙�
+// null, // 浠诲姟鐘舵��
+// null, // 浠诲姟鍙�
+// null, // 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
+// null, // 浠诲姟绫诲瀷
+// null, // 浼樺厛绾�
+// null, // 璧风偣
+// null, // 缁堢偣
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 澶囨敞
+// null, // 鏉＄爜
+// null, // 娲惧彂鏃堕棿
+// null, // 鎵ц鏃堕棿
+// null, // 瀹岀粨鏃堕棿
+// null, // 鍙栨秷鏃堕棿
+// null, // 宸ヤ綔鐘舵��
+// null, // 鍫嗗灈鏈哄彿
+// null, // 鎸囦护鎵ц姝ュ簭
+
+// );
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "鎺ユ敹";
+ case 2:
+ return "娲惧彂";
+ case 3:
+ return "瀹岀粨";
+ case 4:
+ return "鍙栨秷";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getIoType$(){
+ BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
+ BasWrkIotype basWrkIotype = service.selectById(this.ioType);
+ if (!Cools.isEmpty(basWrkIotype)){
+ return String.valueOf(basWrkIotype.getIoDesc());
+ }
+ return null;
+ }
+
+ public String getModiUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getModiTime$(){
+ if (Cools.isEmpty(this.modiTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ }
+
+ public String getAssignTime$(){
+ if (Cools.isEmpty(this.assignTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.assignTime);
+ }
+
+ public String getExecuteTime$(){
+ if (Cools.isEmpty(this.executeTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.executeTime);
+ }
+
+ public String getCompleteTime$(){
+ if (Cools.isEmpty(this.completeTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
+ }
+
+ public String getCancelTime$(){
+ if (Cools.isEmpty(this.cancelTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.cancelTime);
+ }
+
+ public String getWrkSts$(){
+ BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
+ BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
+ if (!Cools.isEmpty(basWrkStatus)){
+ return String.valueOf(basWrkStatus.getWrkDesc());
+ }
+ return null;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java
new file mode 100644
index 0000000..66c793e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.TaskWrkLog;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface TaskWrkLogMapper extends BaseMapper<TaskWrkLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/TaskWrkLogService.java b/src/main/java/com/zy/asrs/service/TaskWrkLogService.java
new file mode 100644
index 0000000..7a9515f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/TaskWrkLogService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.TaskWrkLog;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface TaskWrkLogService extends IService<TaskWrkLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java
new file mode 100644
index 0000000..c705e81
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.TaskWrkLogMapper;
+import com.zy.asrs.entity.TaskWrkLog;
+import com.zy.asrs.service.TaskWrkLogService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("taskWrkLogService")
+public class TaskWrkLogServiceImpl extends ServiceImpl<TaskWrkLogMapper, TaskWrkLog> implements TaskWrkLogService {
+
+}
diff --git a/src/main/resources/mapper/TaskWrkLogMapper.xml b/src/main/resources/mapper/TaskWrkLogMapper.xml
new file mode 100644
index 0000000..3a3ab06
--- /dev/null
+++ b/src/main/resources/mapper/TaskWrkLogMapper.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.TaskWrkLogMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.TaskWrkLog">
+ <id column="id" property="id" />
+ <result column="task_no" property="taskNo" />
+ <result column="status" property="status" />
+ <result column="wrk_no" property="wrkNo" />
+ <result column="create_time" property="createTime" />
+ <result column="io_type" property="ioType" />
+ <result column="io_pri" property="ioPri" />
+ <result column="start_point" property="startPoint" />
+ <result column="target_point" property="targetPoint" />
+ <result column="modi_user" property="modiUser" />
+ <result column="modi_time" property="modiTime" />
+ <result column="memo" property="memo" />
+ <result column="barcode" property="barcode" />
+ <result column="assign_time" property="assignTime" />
+ <result column="execute_time" property="executeTime" />
+ <result column="complete_time" property="completeTime" />
+ <result column="cancel_time" property="cancelTime" />
+ <result column="wrk_sts" property="wrkSts" />
+ <result column="crn_no" property="crnNo" />
+ <result column="command_step" property="commandStep" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
new file mode 100644
index 0000000..a8831d4
--- /dev/null
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -0,0 +1,181 @@
+<!DOCTYPE html>
+<html lang="en">
+
+ <head>
+ <meta charset="UTF-8">
+ <title>浠诲姟绠＄悊</title>
+ <link rel="stylesheet" href="../../static/wcs/css/element.css">
+ <script type="text/javascript" src="../../static/wcs/js/jquery/jquery-3.3.1.min.js"></script>
+ <script type="text/javascript" src="../../static/wms/layui/layui.js"></script>
+ <script type="text/javascript" src="../../static/wcs/js/common.js"></script>
+ <script type="text/javascript" src="../../static/wcs/js/vue.min.js"></script>
+ <script type="text/javascript" src="../../static/wcs/js/element.js"></script>
+ </head>
+
+ <body>
+ <div id="app" style="display: flex;justify-content: center;flex-wrap: wrap;">
+ <div style="width: 100%;">
+ <el-card class="box-card">
+ <el-form :inline="true" :model="tableSearchParam" class="demo-form-inline">
+ <el-form-item label="">
+ <el-input v-model="tableSearchParam.task_no" placeholder="浠诲姟鍙�"></el-input>
+ </el-form-item>
+ <el-form-item label="">
+ <el-input v-model="tableSearchParam.wrk_no" 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 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>
+ <el-table-column property="durationTime" label="鎸佺画鏃堕暱">
+ </el-table-column>
+ <el-table-column property="ioType$" label="浠诲姟绫诲瀷">
+ </el-table-column>
+ <el-table-column property="startPoint" label="璧风偣浣嶇疆">
+ </el-table-column>
+ <el-table-column property="targetPoint" label="缁堢偣浣嶇疆">
+ </el-table-column>
+ <el-table-column property="wrkSts$" label="宸ヤ綔鐘舵��">
+ </el-table-column>
+ <el-table-column property="crnNo" label="鍫嗗灈鏈哄彿">
+ </el-table-column>
+ </el-table>
+
+ <div style="margin-top: 10px;">
+ <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+ :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper" :total="pageTotal">
+ </el-pagination>
+ </div>
+ </el-card>
+ </div>
+ </div>
+ <script>
+ var $layui = layui.config({
+ base: baseUrl + "/static/wms/layui/lay/modules/"
+ }).use(['layer', 'form'], function() {})
+
+ var app = new Vue({
+ el: '#app',
+ data: {
+ tableData: [],
+ currentPage: 1,
+ pageSizes: [16, 30, 50, 100, 150, 200],
+ pageSize: 16,
+ pageTotal: 0,
+ tableSearchParam: {
+ task_no: null,
+ status: null,
+ wrk_no: null
+ }
+ },
+ created() {
+ this.init()
+ },
+ methods: {
+ init() {
+ let taskNo = getQueryVariable('taskNo')
+ let wrkNo = getQueryVariable('wrkNo')
+ if (taskNo != false) {
+ this.tableSearchParam.task_no = taskNo
+ }
+ if (wrkNo != false) {
+ this.tableSearchParam.wrk_no = wrkNo
+ }
+
+ this.getTableData()
+ },
+ getTableData() {
+ let that = this;
+ let data = this.tableSearchParam
+ data.curr = this.currentPage
+ data.limit = this.pageSize
+ $.ajax({
+ url: baseUrl + "/taskWrkLog/list/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: data,
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'GET',
+ success: function(res) {
+ if (res.code == 200) {
+ that.tableData = res.data.records
+ that.pageTotal = res.data.total
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ },
+ handleSizeChange(val) {
+ console.log(`姣忛〉 ${val} 鏉);
+ this.pageSize = val
+ this.getTableData()
+ },
+ handleCurrentChange(val) {
+ console.log(`褰撳墠椤�: ${val}`);
+ this.currentPage = val
+ this.getTableData()
+ },
+ resetParam() {
+ this.tableSearchParam = {
+ task_no: null,
+ status: null,
+ wrk_no: null
+ }
+ this.getTableData()
+ },
+ handleCommand(command, row) {
+ switch (command) {
+ case "showCommand":
+ //鏌ョ湅鎸囦护
+ this.showCommand(row)
+ break;
+ }
+ },
+ showCommand(row) {
+ let wrkNo = row.wrkNo == null ? "" : row.wrkNo
+ //鏌ョ湅鎸囦护
+ $layui.layer.open({
+ type: 2,
+ title: '鎸囦护绠＄悊',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: 'commandManage.html?taskNo=' + row.taskNo + "&wrkNo=" + wrkNo,
+ success: function(layero, index) {}
+ });
+ },
+ }
+ })
+ </script>
+ </body>
+
+</html>
--
Gitblit v1.9.1