From 4e4aaf7b1b8dc57377e9cdc8c90e53c41f835e6f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 12 六月 2024 10:33:50 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pakStore/stockAdjust.js | 2 +-
src/main/webapp/views/deviceOperate/jarOperate.html | 31 ++++++++++++++++++++++++-------
2 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index 41c6a04..1791bf9 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -5,7 +5,7 @@
var matCodeLayerIdx;
function getCol() {
var cols = [
- // {fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
+ {fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'batch', align: 'center',title: '绠卞彿锛堢紪杈戯級', edit: true, style: 'font-weight:bold'}
];
diff --git a/src/main/webapp/views/deviceOperate/jarOperate.html b/src/main/webapp/views/deviceOperate/jarOperate.html
index bf94b37..bc23edb 100644
--- a/src/main/webapp/views/deviceOperate/jarOperate.html
+++ b/src/main/webapp/views/deviceOperate/jarOperate.html
@@ -38,7 +38,7 @@
<el-card class="box-card">
<div slot="header" class="clearfix" style="display: flex;justify-content: space-between;align-items: center">
<span>纭寲搴撲綅</span>
- <el-button style="" type="primary" plain size="medium">鍘嗗彶浠诲姟</el-button>
+ <el-button style="" type="primary" plain size="medium" @click="historicalTasks()">鍘嗗彶浠诲姟</el-button>
</div>
<div v-if="currentIndex == null">
<el-empty description="璇烽�夋嫨璁惧"></el-empty>
@@ -47,15 +47,13 @@
<el-table border :data="item" highlight-current-row max-height="350" style="width: 100%">
<el-table-column property="jarId" label="纭寲缃�">
</el-table-column>
- <el-table-column property="wrkNo" label="宸ヤ綔鍙�">
+ <el-table-column property="jarWrkNo" label="宸ヤ綔鍙�">
</el-table-column>
- <el-table-column property="jarMode" label="妯″紡">
+ <el-table-column property="status" label="鐘舵��">
</el-table-column>
- <el-table-column property="region" label="鍖哄煙">
+ <el-table-column property="matnr" label="鐗╂枡鐮�">
</el-table-column>
- <el-table-column property="jarCode" label="浠ｅ彿">
- </el-table-column>
- <el-table-column property="jarErr" label="寮傚父浠ｇ爜">
+ <el-table-column property="maktx" label="鐗╂枡鍚嶇О">
</el-table-column>
</el-table>
</div>
@@ -154,6 +152,25 @@
},
methods: {
+ historicalTasks(){
+ let that = this
+ if (that.currentIndex != null){
+ $.ajax({
+ url: baseUrl + "/basJarMastLog/historicalTasks/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data:{
+ id: that.tableData[that.currentIndex].jarNo
+ },
+ success: function (res) {
+ that.item = res.data
+ console.log(that.item)
+ }
+ });
+ }
+
+ },
staTova(sta,end){
let that = this
that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
--
Gitblit v1.9.1