From 2c4e339508f78a215518a8a12af34ca0b1564d44 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 31 十月 2025 13:07:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/验收入库/委外入库/Kf_EntrustInBillList.html | 160 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 105 insertions(+), 55 deletions(-)
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html"
index beebad5..5b6cf92 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>濮斿鍏ュ簱鍗曞垪琛�</title>
@@ -23,6 +24,7 @@
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -39,78 +41,92 @@
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
- <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
+ lay-filter="HInitTimeCycle" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">缁撴潫鏃ユ湡</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo" style="width:190px;">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <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>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
- <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content">
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HDeptID" id="HDeptID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HDeptID"
+ id="HDeptID" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="MaterialCode" id="MaterialCode" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="MaterialCode" id="MaterialCode" style="width:190px;">
</div>
</div>
<!--<hr />-->
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="MaterialName" id="MaterialName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="MaterialName" id="MaterialName" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">瑙勬牸鍨嬪彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="SpecificationModel" id="SpecificationModel" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="SpecificationModel" id="SpecificationModel" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">婧愬崟鍗曞彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HSourceBillNo" id="HSourceBillNo" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HSourceBillNo" id="HSourceBillNo" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">浠撳簱</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="Warehouse" id="Warehouse" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="Warehouse"
+ id="Warehouse" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍒跺崟浜�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="Hmaker" id="Hmaker" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="Hmaker"
+ id="Hmaker" style="width:190px;">
</div>
</div>
@@ -119,19 +135,25 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes"
+ lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
+ lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <= </option>
+ <option value="<">
+ < </option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -139,7 +161,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
@@ -147,19 +170,25 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
+ lay-filter="Comparator1" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <= </option>
+ <option value="<">
+ < </option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -167,7 +196,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
@@ -175,19 +205,25 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
+ lay-filter="Comparator2" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <= </option>
+ <option value="<">
+ < </option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -195,7 +231,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -230,13 +267,13 @@
</div>
</div>
</div>
-
+
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
@@ -260,7 +297,7 @@
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1210";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
- var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+ var HPageTitle = get_PageTitle(HModuleType) || document.title;
//#endregion
var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//#region 銆愯繃婊ゆ柟妗堛��
@@ -294,7 +331,7 @@
//鍒犻櫎
case 'set_DeleteBill':
var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
+ , data = checkStatus.data;
if (checkStatus.data.length === 1) {
var InterID = data[0].hmainid.toString();
//閫昏緫鍒犻櫎鏂规硶
@@ -374,7 +411,7 @@
};
});
- //#endregion
+ //#endregion
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
@@ -409,7 +446,7 @@
}
});
- //#endregion
+ //#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -433,10 +470,10 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ get_FastQuery()
//浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
- ColFilter();
+ // ColFilter();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -457,7 +494,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ' ' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , content: './Kf_EntrustInBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
, resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
end: function () { //褰撳叧闂椂璋冪敤
@@ -469,14 +506,15 @@
})
}
});
- //#endregion
+ //#endregion
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
function get_Display(sWhere) {
var index = layer.load();
- $.ajax({
+ $.ajax({
url: GetWEBURL() + '/Kf_EntrustInBill/GetEntrustInBill',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -496,7 +534,11 @@
else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
} else if (data[i].name == '鍗曟嵁鍙�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
} else {
switch (data[i].Type) {
//int
@@ -526,13 +568,18 @@
}
option.data = data1.data;
+ DisPlay_HideColumn()
table.render(option);
- layer.close(index);
+ if($("#ColName option").length < 1){
+ ColFilter()
+ }
+
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
var HBillType = "1210";
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ layer.close(index);
} else {
layer.close(index);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -540,9 +587,11 @@
}, error: function () {
layer.close(index);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }, complete: function () {
+ DisPlay_HideColumn();
}
});
- DisPlay_HideColumn();
+
}
//闅愯棌鍒楄缃�
function get_HideColumn() {
@@ -1138,10 +1187,10 @@
$("#ColName").append(Organization);
$("#ColName1").empty();
$("#ColName1").append(Organization);
- $("#ColName2").empty();
+ $("#ColName2").empty();
$("#ColName2").append(Organization);
-
-
+
+
form.render('select');
}
//#endregion
@@ -1188,7 +1237,7 @@
//鎵ц鏌ヨ鏂规硶
- get_FastQuery();
+ // get_FastQuery();
} else {
$('#HBeginDate').prop('disabled', false);
$('#HEndDate').prop('disabled', false);
@@ -1202,8 +1251,8 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- //get_FastQuery()
- //form.render("select");
+ // get_FastQuery()
+ form.render("select");
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -1372,7 +1421,7 @@
//#endregion
- //浠ヤ笂鏄痩ayui妯″潡
+ //浠ヤ笂鏄痩ayui妯″潡
})
@@ -1416,4 +1465,5 @@
//#endregion
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
--
Gitblit v1.9.1