From 68ad4cf704c0a7c575936455d07e3e2f53fefbc4 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 26 三月 2021 14:29:26 +0800
Subject: [PATCH] 1.0.5 1.小太阳需求改动
---
src/main/webapp/views/pda/combPro.html | 6
src/main/webapp/views/pda/stockIn.html | 2
src/main/java/com/zy/asrs/entity/CombBillQueryVo.java | 7 +
src/main/resources/mapper/LocNormalMapper.xml | 21 +++
src/main/java/com/zy/asrs/controller/MobileController.java | 22 ++++
src/main/java/com/zy/asrs/service/LocNormalService.java | 2
src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java | 4
src/main/java/com/zy/asrs/controller/LocNormalController.java | 4
src/main/java/com/zy/asrs/mapper/LocNormalMapper.java | 2
src/main/webapp/views/pda/locNormalMove.html | 5
src/main/webapp/views/pda/stockOut.html | 24 ++++
src/main/webapp/views/salesOrder/salesOrder.html | 18 +-
src/main/webapp/views/pda/locNormalIn.html | 59 +++++++++++
src/main/webapp/static/js/salesOrder/salsesOrder.js | 34 ++++--
src/main/webapp/views/pda/locNormalOut.html | 34 ++++--
15 files changed, 192 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index 6fc012c..cb1c130 100644
--- a/src/main/java/com/zy/asrs/controller/LocNormalController.java
+++ b/src/main/java/com/zy/asrs/controller/LocNormalController.java
@@ -166,9 +166,9 @@
@RequestMapping(value = "/locNormal/pda/out/query")
@ManagerAuth(memo = "pda鍑哄簱鏌ヨ")
@Transactional
- public R locNormalPdaOutQuery(String matnr, String warehouse) {
+ public R locNormalPdaOutQuery(String matnr, String warehouse, String billNo) {
List<LocNormal> list = new ArrayList<>();
- list = locNormalService.pdaLocNormalQuery(matnr, warehouse);
+ list = locNormalService.pdaLocNormalQuery(matnr, warehouse, billNo);
return R.ok(list);
}
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 7aecf61..c56e2b5 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -69,7 +69,9 @@
@RequestMapping("/locDetl")
@ManagerAuth
public R getLocDetl(@RequestParam(required = false)String locNo,
- @RequestParam(required = false)String matNo){
+ @RequestParam(required = false)String matNo,
+ @RequestParam(required = false)String supplier
+ ){
if (!Cools.isEmpty(locNo)) {
LocMast locMast = locMastService.selectById(locNo);
if (null == locMast || !"F".equals(locMast.getLocSts())) {
@@ -102,6 +104,20 @@
});
return R.ok().add(res);
}
+ if (!Cools.isEmpty(supplier)) {
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("supplier", supplier).orderBy("appe_time", false));
+ List<MobileLocDetlVo> res = new ArrayList<>();
+ locDetls.forEach(locDetl -> {
+ MobileLocDetlVo vo = new MobileLocDetlVo();
+ vo.setLocNo(locDetl.getLocNo());
+ vo.setMatnr(locDetl.getMatnr());
+ vo.setMaktx(locDetl.getMaktx());
+ vo.setCount(locDetl.getAnfme());
+ res.add(vo);
+ });
+ return R.ok().add(res);
+ }
return R.parse(BaseRes.PARAM);
}
@@ -120,6 +136,10 @@
vo.setMatName(waitPakin.getMaktx());
vo.setCount(waitPakin.getAnfme());
vo.setMnemonic(waitPakin.getMnemonic());
+ vo.setSupplier(waitPakin.getSupplier());
+ vo.setAltme(waitPakin.getAltme());
+ vo.setType(waitPakin.getType());
+ vo.setLgnum(waitPakin.getLgnum());
vos.add(vo);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/CombBillQueryVo.java b/src/main/java/com/zy/asrs/entity/CombBillQueryVo.java
index cc270eb..d27cd69 100644
--- a/src/main/java/com/zy/asrs/entity/CombBillQueryVo.java
+++ b/src/main/java/com/zy/asrs/entity/CombBillQueryVo.java
@@ -18,4 +18,11 @@
private String mnemonic;
+ private String supplier;
+
+ private String lgnum;
+
+ private String type;
+
+ private String altme;
}
diff --git a/src/main/java/com/zy/asrs/mapper/LocNormalMapper.java b/src/main/java/com/zy/asrs/mapper/LocNormalMapper.java
index 573a9f4..b88ca82 100644
--- a/src/main/java/com/zy/asrs/mapper/LocNormalMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocNormalMapper.java
@@ -28,7 +28,7 @@
public void pdaLocNormalIn(List<LocNormal> list);
- public List<LocNormal> pdaLocNormalQuery(@Param("matnr") String matnr, @Param("warehouse") String warehouse);
+ public List<LocNormal> pdaLocNormalQuery(@Param("matnr") String matnr, @Param("warehouse") String warehouse, @Param("billNo") String billNo);
public void pdaLocNormalOut1(@Param("id") Integer id,@Param("matnr") String matnr, @Param("modiUser") Long modiUser, @Param("modiTime") Date modiTime, @Param("warehouse") String warehouse);
diff --git a/src/main/java/com/zy/asrs/service/LocNormalService.java b/src/main/java/com/zy/asrs/service/LocNormalService.java
index ef15103..16a5b0b 100644
--- a/src/main/java/com/zy/asrs/service/LocNormalService.java
+++ b/src/main/java/com/zy/asrs/service/LocNormalService.java
@@ -21,7 +21,7 @@
public void pdaLocNormalIn(List<LocNormal> list);
- public List<LocNormal> pdaLocNormalQuery(String matnr, String warehouse);
+ public List<LocNormal> pdaLocNormalQuery(String matnr, String warehouse, String billNo);
public void pdaLocNormalOut(List<LocNormal> list);
diff --git a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
index 88eb0f6..4d32ff0 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
@@ -46,8 +46,8 @@
}
@Override
- public List<LocNormal> pdaLocNormalQuery(String matnr, String warehouse) {
- return baseMapper.pdaLocNormalQuery(matnr, warehouse);
+ public List<LocNormal> pdaLocNormalQuery(String matnr, String warehouse, String billNo) {
+ return baseMapper.pdaLocNormalQuery(matnr, warehouse, billNo);
}
@Override
diff --git a/src/main/resources/mapper/LocNormalMapper.xml b/src/main/resources/mapper/LocNormalMapper.xml
index 3a2faf0..83fc826 100644
--- a/src/main/resources/mapper/LocNormalMapper.xml
+++ b/src/main/resources/mapper/LocNormalMapper.xml
@@ -60,17 +60,30 @@
<insert id="pdaLocNormalIn">
BEGIN
<foreach collection="list" item="item" index="index">
- INSERT INTO asr_loc_normal (matnr, maktx, anfme, warehouse, state, appe_user, appe_time)
+ INSERT INTO asr_loc_normal (matnr, maktx, anfme, mnemonic, supplier, warehouse, state, lgnum, type, altme,
+ appe_user, appe_time)
VALUES (#{item.matnr,jdbcType=VARCHAR}, #{item.maktx,jdbcType=VARCHAR}, #{item.anfme,jdbcType=DECIMAL},
- #{item.warehouse,jdbcType=VARCHAR}, '1', #{item.appeUser,jdbcType=DECIMAL},
- #{item.appeTime,jdbcType=TIMESTAMP})
+ #{item.mnemonic, jdbcType=VARCHAR}, #{item.supplier, jdbcType=VARCHAR},
+ #{item.warehouse,jdbcType=VARCHAR}, '1',
+ #{item.lgnum, jdbcType=VARCHAR}, #{item.type, jdbcType=VARCHAR},
+ #{item.altme, jdbcType=VARCHAR},
+ #{item.appeUser,jdbcType=DECIMAL},#{item.appeTime,jdbcType=TIMESTAMP})
</foreach>
END;
</insert>
<select id="pdaLocNormalQuery" resultMap="BaseResultMap">
select id, matnr,maktx, warehouse,anfme from asr_loc_normal
- where warehouse = #{warehouse,jdbcType=VARCHAR} and matnr =#{matnr,jdbcType=VARCHAR}
+ where 1 = 1
+ <if test="warehouse != null and warehouse != ''">
+ and warehouse = #{warehouse,jdbcType=VARCHAR}
+ </if>
+ <if test="matnr != null and matnr != ''">
+ and matnr =#{matnr,jdbcType=VARCHAR}
+ </if>
+ <if test="billNo != null and billNo != ''">
+ and supplier = #{billNo, jdbcType=VARCHAR}
+ </if>
and state = '1' COLLATE Chinese_PRC_CS_AS
</select>
diff --git a/src/main/webapp/static/js/salesOrder/salsesOrder.js b/src/main/webapp/static/js/salesOrder/salsesOrder.js
index ffa4cfd..df18260 100644
--- a/src/main/webapp/static/js/salesOrder/salsesOrder.js
+++ b/src/main/webapp/static/js/salesOrder/salsesOrder.js
@@ -3,11 +3,18 @@
function getCol() {
var cols = [];
cols.push(
- {field: 'orderNo', align: 'center', title: '璁㈠崟缂栧彿'}
- , {field: 'col1', align: 'center', title: '璁㈠崟鍚嶇О'}
- , {field: 'col2', align: 'center', title: '璁㈠崟璇︽儏'}
- , {field: 'col3', align: 'center', title: '璁㈠崟瀹㈡埛'}
- , {field: 'col4', align: 'center', title: '璁㈠崟鐘舵��'}
+ {field: 'orderCode', align: 'center', title: '璁㈠崟缂栧彿'}
+ , {field: 'orderDate', align: 'center', title: '璁㈠崟鏃ユ湡'}
+ , {field: 'invCode', align: 'center', title: '鐗╂枡缂栫爜'}
+ , {field: 'invName', align: 'center', title: '鐗╂枡鍚嶇О'}
+ , {field: 'invStd', align: 'center', title: '瑙勬牸鍨嬪彿'}
+ , {field: 'invUnit', align: 'center', title: '鍗曚綅'}
+ , {field: 'orderQty', align: 'center', title: '璁㈠崟鏁伴噺'}
+ , {field: 'izMrp', align: 'center', title: '鏄惁mrp璁＄畻', hide: true}
+ , {field: 'productQty', align: 'center', title: '鐢熶骇浠诲姟鍗曟暟閲�'}
+ , {field: 'izReceive', align: 'center', title: '鏄惁鏀舵枡', hide: true}
+ , {field: 'inQty', align: 'center', title: '浜ф垚鍝佸叆搴撴暟閲�'}
+ , {field: 'outQty', align: 'center', title: '鍙戣揣鏁伴噺'}
, {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80}
);
return cols;
@@ -28,11 +35,18 @@
// url: baseUrl+'/matCode/list/auth',
data: [
{
- "orderNo": 20210315000001,
- "col1": "瑗跨彮鐗檟x 210315鍙�",
- "col2": "鍏板崥鍩哄凹绔ヨ溅 5000鍙�",
- "col3": "瑗跨彮鐗檟x鍎跨鐜╁叿鍏徃",
- "col4": "鐢熶骇涓�",
+ "orderCode": 20210315000001,
+ "orderDate": "2021-03-26 13:40",
+ "invCode": "CPXXX00123",
+ "invName": "鍏板崥鍩哄凹鎺堟潈鍎跨杞�",
+ "invStd": "21脳25",
+ "invUnit": "杈�",
+ "orderQty": 300,
+ "izMrp": "鍚�",
+ "productQty": 150,
+ "izReceive": "鏄�",
+ "inQty": 50,
+ "outQty": 0,
}
],
page: true,
diff --git a/src/main/webapp/views/pda/combPro.html b/src/main/webapp/views/pda/combPro.html
index 93a6cb2..268cd00 100644
--- a/src/main/webapp/views/pda/combPro.html
+++ b/src/main/webapp/views/pda/combPro.html
@@ -56,12 +56,12 @@
<!-- 澶撮儴 -->
<header>
<div class="layui-input-inline" style="margin-top: 5px">
- <label class="layui-form-label"> 鍗曞彿</label>
- <input class="layui-input" id="billNo" oninput="find(this)" placeholder="鎵爜 / 杈撳叆" autocomplete="off" style="width: 70%; height: 40px; margin-right: 0;">
+ <label class="layui-form-label" style="margin-left: 16px">鍗曞彿</label>
+ <input class="layui-input" id="billNo" oninput="find(this)" placeholder="鎵爜 / 杈撳叆" autocomplete="off" style="width: 175px; height: 40px; margin-right: 0;">
</div>
<div class="layui-input-inline">
<label class="layui-form-label">鎵樼洏鐮�</label>
- <input class="layui-input" type="number" id="code" onkeyup="findCode(this)" oninput="if(value.length>8)value=value.slice(0,8)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
+ <input class="layui-input" style="width: 175px;" type="number" id="code" onkeyup="findCode(this)" oninput="if(value.length>8)value=value.slice(0,8)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
</div>
</header>
diff --git a/src/main/webapp/views/pda/locNormalIn.html b/src/main/webapp/views/pda/locNormalIn.html
index 2342429..6de0418 100644
--- a/src/main/webapp/views/pda/locNormalIn.html
+++ b/src/main/webapp/views/pda/locNormalIn.html
@@ -21,8 +21,16 @@
<header class="layui-form">
<div>
<div class="layui-input-inline">
+ <label class="layui-form-label">鍗曞彿</label>
+ <div class="layui-input-inline" style="width: 175px">
+ <input id="billNo" class="layui-input" autocomplete="off" oninput="find(this)">
+ </div>
+ </div>
+ </div>
+ <div>
+ <div class="layui-input-inline">
<label class="layui-form-label">搴撳尯</label>
- <div class="layui-input-inline" style="margin-left: 5px;width: 180px">
+ <div class="layui-input-inline" style="width: 175px">
<select id="uuid">
<option value="">璇烽�夋嫨</option>
</select>
@@ -62,6 +70,8 @@
var $ = layui.jquery;
var layer = layui.layer;
var form = layui.form;
+
+ document.getElementById("billNo").focus();
tableIns = table.render({
elem: '#chooseData',
@@ -168,6 +178,11 @@
maktx: item.matName,
anfme: item.count,
warehouse: barcode,
+ mnemonic: item.mnemonic,
+ supplier: item.supplier,
+ lgnum: item.lgnum,
+ type: item.type,
+ altme: item.altme,
});
});
@@ -183,7 +198,7 @@
async: false,
success: function (res) {
if (res.code === 200) {
- reset();
+ reset(true);
tips("缁勬墭鎴愬姛")
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
@@ -192,8 +207,45 @@
}
},
});
+ }
+ /**
+ * 鏍规嵁閫氱煡鍗曞彿鏌ヨ鐗╂枡璇︽儏
+ */
+ function find(el) {
+ var billNo = el.value;
+ if (isEmpty(billNo)) {
+ return;
+ }
+ // 璧嬪�煎墠娓呯┖琛ㄦ牸
+ matData = [];
+ tableIns.reload({data: matData});
+ $.ajax({
+ url: baseUrl + "/mobile/bill/query/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ billNo: billNo
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ if (res.data != null) {
+ console.log('鍗曞彿鏁版嵁', res.data);
+ var data = res.data;
+ if (data.length > 0) {
+ for (var i = 0; i < data.length; i++) {
+ addTableData(data[i]);
+ }
+ }
+ }
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/pda";
+ } else {
+ tips(res.msg, true)
+ }
+ }
+ });
}
/**
@@ -230,6 +282,9 @@
matData = [];
tableIns.reload({data: matData});
layer.closeAll();
+ $("#billNo").val("");
+ $("#uuid").val("");
+ layui.form.render('select');
}
</script>
</html>
\ No newline at end of file
diff --git a/src/main/webapp/views/pda/locNormalMove.html b/src/main/webapp/views/pda/locNormalMove.html
index 1abe4a7..383e33f 100644
--- a/src/main/webapp/views/pda/locNormalMove.html
+++ b/src/main/webapp/views/pda/locNormalMove.html
@@ -214,9 +214,10 @@
}
function reset() {
-// $('#warehouse1').val("");
-// $('#warehouse2').val("");
+ $('#warehouse1').val("");
+ $('#warehouse2').val("");
$('#matnr').val("");
+ layui.form.render('select');
tableIns.reload({data: []});
layer.closeAll();
}
diff --git a/src/main/webapp/views/pda/locNormalOut.html b/src/main/webapp/views/pda/locNormalOut.html
index aad7392..def0d04 100644
--- a/src/main/webapp/views/pda/locNormalOut.html
+++ b/src/main/webapp/views/pda/locNormalOut.html
@@ -48,13 +48,21 @@
<header class="layui-form">
<div class="layui-input-inline">
+ <label class="layui-form-label" style="margin-left: 32px">鍗曞彿</label>
+ <div class="layui-input-inline">
+ <input id="billNo" class="layui-input" autocomplete="off" oninput="findCode(this, 'billNo')"
+ style="width: 175px">
+ </div>
+ </div>
+ <div class="layui-input-inline">
<label class="layui-form-label">鐗╂枡缂栫爜</label>
- <input class="layui-input" id="matnr" onkeyup="findCode(this, 'matnr')" placeholder="鎵爜 / 杈撳叆" style="width: 65%"
+ <input class="layui-input" id="matnr" onkeyup="findCode(this, 'matnr')" placeholder="鎵爜 / 杈撳叆"
+ style="width: 175px"
autocomplete="off">
</div>
<div class="layui-input-inline">
- <label class="layui-form-label" style="margin-left: 28px">搴撳尯</label>
- <div class="layui-input-inline" style="margin-left: 5px;width: 180px">
+ <label class="layui-form-label" style="margin-left: 28px;">搴撳尯</label>
+ <div class="layui-input-inline" style="margin-left: 5px;width: 175px">
<select id="uuid" lay-filter="uuid">
<option value="">璇烽�夋嫨</option>
</select>
@@ -87,7 +95,8 @@
</div>
<div class="form-item">
<span>鍚嶇О</span>
- <textarea rows="2" style="width: 70%; resize: none" id="maktx2" type="text" disabled="disabled" readonly="readonly"></textarea>
+ <textarea rows="2" style="width: 70%; resize: none" id="maktx2" type="text" disabled="disabled"
+ readonly="readonly"></textarea>
</div>
<input id="index" type="text" disabled="disabled" style="display: none;">
<div class="form-item" style="margin-top: 5px; margin-bottom: 8px">
@@ -110,7 +119,7 @@
// 琛ㄦ牸鏁版嵁
var normalOutList = [];
window.onload = function () {
- document.getElementById("matnr").focus();
+ document.getElementById("billNo").focus();
}
/**
@@ -216,11 +225,12 @@
var warehouseBar;
var matnrBar;
+ var billNo;
/* 鎵爜銆佽緭鍏ュ簱鍖哄拰鐗╂枡缂栫爜 */
function findCode(el, type) {
warehouseBar = $('#uuid').val();
- ;
+ billNo = $("#billNo").val();
switch (type) {
case 'uuid':
// exist('uuid', 'locArea');
@@ -233,12 +243,12 @@
}
// 鍒ゆ柇搴撳尯鎴栬�呯墿鏂欑紪鐮侀兘涓嶄负绌�
- if (!warehouseBar || !matnrBar) {
- return;
- }
+// if (!warehouseBar || !matnrBar) {
+// return;
+// }
$.ajax({
- url: baseUrl + "/locNormal/pda/out/query?matnr=" + matnrBar + "&warehouse=" + warehouseBar,
+ url: baseUrl + "/locNormal/pda/out/query?matnr=" + (matnrBar ? matnrBar : "") + "&warehouse=" + (warehouseBar ? warehouseBar : "") + "&billNo=" + (billNo ? billNo : ""),
headers: {'token': localStorage.getItem('token')},
// contentType: 'application/json;charset=UTF-8',
method: 'GET',
@@ -348,7 +358,7 @@
if (res.code === 200) {
layer.msg("鍑哄簱鎴愬姛");
$("#matnr").val(null);
-// $("#uuid").val(null);
+ $("#billNo").val(null);
warehouseBar = null;
matnrBar = null;
normalOutList = [];
@@ -367,6 +377,8 @@
function reset() {
$("#uuid").val(null);
$("#matnr").val(null);
+ $("#billNo").val(null);
+ layui.form.render('select');
normalOutList = [];
tableIns.reload({data: normalOutList});
layer.closeAll();
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index afe65dd..9960cfb 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -91,7 +91,7 @@
<table class="layui-table" id="chooseData" lay-filter="chooseData"></table>
</main>
<!-- 灏鹃儴 -->
-<footer>
+<footer style="margin-top: -5px">
<div class="layui-btn-container" style="text-align: center; margin-bottom: 8px">
<button type="button" id="retrun-btn" class="layui-btn layui-btn-primary " onclick="back()" >杩斿洖</button>
</div>
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index dc59be6..0ab5c4d 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -24,6 +24,12 @@
<!-- 澶撮儴 -->
<header class="layui-form">
<div class="layui-input-inline">
+ <label class="layui-form-label">鍗曞彿</label>
+ <div class="layui-input-block">
+ <input class="layui-input" type="text" id="billNo" onkeyup="findByBillNo(this)" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-input-inline">
<label class="layui-form-label">鐗╂枡</label>
<div class="layui-input-block">
<input class="layui-input" type="text" id="matNo" onkeyup="findByMatNo(this)" autocomplete="off">
@@ -62,7 +68,7 @@
<script>
window.onload = function(){
- document.getElementById("matNo").focus();
+ document.getElementById("billNo").focus();
getOutBound();
}
@@ -87,13 +93,25 @@
$("#locNo").val("");
find(null, el.value);
}
- function find(locNo, matNo) {
+
+ /**
+ * 鏍规嵁閫氱煡鍗曞彿鏌ユ壘搴撳瓨鏄庣粏
+ * */
+ function findByBillNo(el) {
+ if (isEmpty(el.value)) {
+ return;
+ }
+ find(null, null, el.value);
+ }
+
+ function find(locNo, matNo, billNo) {
$.ajax({
url: baseUrl + "/mobile/locDetl",
headers: {'token': localStorage.getItem('token')},
data: {
locNo: locNo,
- matNo: matNo
+ matNo: matNo,
+ supplier: billNo,
},
method: 'POST',
success: function (res) {
diff --git a/src/main/webapp/views/salesOrder/salesOrder.html b/src/main/webapp/views/salesOrder/salesOrder.html
index 3a6d8c4..c82aa43 100644
--- a/src/main/webapp/views/salesOrder/salesOrder.html
+++ b/src/main/webapp/views/salesOrder/salesOrder.html
@@ -41,7 +41,7 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="orderNo" placeholder="璁㈠崟鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="orderCode" placeholder="璁㈠崟鍙�" autocomplete="off">
</div>
</div>
@@ -52,14 +52,14 @@
</div>
</div>
- <div class="layui-inline" style="width: 150px">
- <select id="orderState" name="orderState">
- <option value="">璁㈠崟鐘舵��</option>
- <option value="1">鍒濆</option>
- <option value="2">鎵ц涓�</option>
- <option value="3">缁撴潫</option>
- </select>
- </div>
+ <!--<div class="layui-inline" style="width: 150px">-->
+ <!--<select id="orderState" name="orderState">-->
+ <!--<option value="">璁㈠崟鐘舵��</option>-->
+ <!--<option value="1">鍒濆</option>-->
+ <!--<option value="2">鎵ц涓�</option>-->
+ <!--<option value="3">缁撴潫</option>-->
+ <!--</select>-->
+ <!--</div>-->
<div id="data-search-btn" class="layui-btn-container layui-form-item">
--
Gitblit v1.9.1