From 28a7821e43bd5763739fe67384cfea6693b3500b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 08 九月 2020 13:19:26 +0800
Subject: [PATCH] Merge branches 'gdwcs' and 'jswcs' of https://gitee.com/luxiaotao1123/zy-wcs into jswcs
---
src/main/webapp/views/crn.html | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 1dc9e5a..bc1fd92 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -39,7 +39,6 @@
<thead>
<tr>
<th>鍫嗗灈鏈�</th>
- <th>浠诲姟鍙�</th>
<th>妯″紡</th>
<th>鐘舵��</th>
<th>鏈夌墿</th>
@@ -102,7 +101,7 @@
<span class="select-title">鍫嗗灈鏈哄彿</span>
<div class="select-container">
<label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>
-<!-- <label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>-->
+ <label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -257,19 +256,18 @@
for (var i=1;i<=table.length;i++){
var tr = tableEl.find("tr").eq(i);
setVal(tr.children("td").eq(0), table[i-1].crnNo);
- setVal(tr.children("td").eq(1), table[i-1].workNo);
- setVal(tr.children("td").eq(2), table[i-1].statusType);
- setVal(tr.children("td").eq(3), table[i-1].status);
- setVal(tr.children("td").eq(4), table[i-1].loading);
- setVal(tr.children("td").eq(5), table[i-1].bay);
- setVal(tr.children("td").eq(6), table[i-1].lev);
- setVal(tr.children("td").eq(7), table[i-1].xorigin);
- setVal(tr.children("td").eq(8), table[i-1].yorigin);
- setVal(tr.children("td").eq(9), table[i-1].forkOffset);
- setVal(tr.children("td").eq(10), table[i-1].xlocation);
- setVal(tr.children("td").eq(11), table[i-1].ylocation);
- setVal(tr.children("td").eq(12), table[i-1].stop);
- setVal(tr.children("td").eq(13), table[i-1].warnCode);
+ setVal(tr.children("td").eq(1), table[i-1].statusType);
+ setVal(tr.children("td").eq(2), table[i-1].status);
+ setVal(tr.children("td").eq(3), table[i-1].loading);
+ setVal(tr.children("td").eq(4), table[i-1].bay);
+ setVal(tr.children("td").eq(5), table[i-1].lev);
+ setVal(tr.children("td").eq(6), table[i-1].xorigin);
+ setVal(tr.children("td").eq(7), table[i-1].yorigin);
+ setVal(tr.children("td").eq(8), table[i-1].forkOffset);
+ setVal(tr.children("td").eq(9), table[i-1].xlocation);
+ setVal(tr.children("td").eq(10), table[i-1].ylocation);
+ setVal(tr.children("td").eq(11), table[i-1].stop);
+ setVal(tr.children("td").eq(12), table[i-1].warnCode);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -466,7 +464,6 @@
var html = "";
for (var i = 0; i < line; i ++){
html += " <tr>\n" +
- " <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
--
Gitblit v1.9.1