From d4066580b24114d16ef00b496821a9c963e9366d Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 08 九月 2021 08:40:04 +0800
Subject: [PATCH] 报工台上料防错扫码接口
---
WebTM/views/设备管理/Sb_EquipDotCheckPlanBillList.html | 104 ++++++++++++++++++++++-----------------------------
1 files changed, 45 insertions(+), 59 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
index 100fb9b..863570f 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
@@ -37,7 +37,7 @@
<option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
</select>
</div>
- </div>-->
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -49,32 +49,31 @@
<div class="layui-input-block">
<input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫椂闂�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃堕棿</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
- </div>
- </div>
+ </div>-->
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-colla-content">
+ <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>-->
+ <!--<div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
<span>鍏朵粬鏉′欢></span>
</div>
</div>
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫椂闂�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
+ </div>
+ </div>
+ </div>-->
</div>
-
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
@@ -117,7 +116,6 @@
, laypage = layui.laypage
, laydate = layui.laydate
, util = layui.util
- //鏌ヨ鏉′欢
var sWhere = "";
var index = layer.load(0);
var option = [];
@@ -126,7 +124,7 @@
//鍒濆鍖栭〉闈㈠姞杞�
set_ClearBill();
-
+
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -215,14 +213,14 @@
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 ,templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
, { field: '璁惧浠ｇ爜', title: '璁惧浠ｇ爜', width: 200 }
, { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200, hide: true }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200, hide: true }
- , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
- , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+ , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200 }
+ , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200 }
, { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅', width: 200 }
, { field: '鐐规鍛ㄦ湡', title: '鐐规鍛ㄦ湡', width: 200 }
, { field: '鎽樿', title: '鎽樿', width: 200 }
@@ -238,16 +236,16 @@
, { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115, hide: true }
, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115 }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
+ , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
, { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
- , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
, { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
@@ -256,36 +254,23 @@
]]
};
}
+
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- //$("#HBillType").val("");//鍗曟嵁绫诲瀷
- $("#HBillNo").val("");//鍗曟嵁鍙�
- $("#HSourceBillNo").val("");//婧愬崟鍙�
- $("#HCreateBy").val("");//鍒跺崟浜�
- $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
- $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
- sWhere = "";
- $("#btnSearch").click();
+ $("#HNumber").val("");
+ $("#HName").val("");
}
//蹇�熻繃婊�
function get_FastQuery(table, option) {
- //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
- var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
- var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
- var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
- if (HBillNo) {
- sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
- }
- if (HCreateBy) {
- sWhere += " and 鍒跺崟浜� like '%" + HCreateBy + "%'";
- }
- if (BenginHCreateDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
- }
- if (EndHCreateDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + EndHCreateDate + "'";
- }
+ //var HNumber = $("#HNumber").val();
+ //var HName = $("#HName").val();
+ //if (HNumber) {
+ // sWhere += " and 鑱屽憳浠ｇ爜 like '%" + HNumber + "%'";
+ //}
+ //if (HName) {
+ // sWhere += " and 鑱屽憳鍚嶇О like '%" + HName + "%'";
+ //}
+ var index = layer.load(0);
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -299,7 +284,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../璁惧绠＄悊/Sb_EquipDotCheckPlanBillEdit.html??OperationType=1&linterid=&HSouceBillType=',
+ content: '../璁惧绠＄悊/Sb_EquipDotCheckPlanBillEdit.html',
end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -314,7 +299,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var linterid = data[0].hmainid.toString();
+ var hID = data[0].hmainid.toString();
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
@@ -323,7 +308,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../璁惧绠＄悊/Sb_EquipDotCheckPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , content: '../璁惧绠＄悊/Sb_EquipDotCheckPlanBillEdit.html?hID=' + hID
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
@@ -375,6 +360,7 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
}
+
//#endregion
});
--
Gitblit v1.9.1