From 158e131a569a6d6ec5d40cf9ae42c61eb29d3d7a Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 01 十一月 2024 17:42:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/WMS扫码模块/库存查询/KF_ICInventoryByCLD_PDA.html | 527 +++++++++++++++++++++
WebTM/views/工资管理/工资报表/Pay_PaymentMonthSumReport.html | 8
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillList.html | 22
WebTM/views/计划管理/工艺路线/Gy_RoutingBillCheckQuery.html | 14
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html | 22
WebTM/views/工资管理/工资报表/Pay_PaymentTimeSumReport.html | 8
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 5
WebTM/views/index_Mobile.html | 4
WebTM/views/home/console.html | 29 +
WebTM/views/工资管理/工资报表/Pay_PaymentPieceSumReport.html | 8
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 51 +
WebTM/views/Baseset/基础资料/Gy_GetProductionTeamList.html | 3
WebTM/views/工资管理/工资报表/Pay_PaymentDayCheckReport.html | 8
WebTM/views/home/console_Mobile.html | 4
WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBill_PDA.html | 101 ++-
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/工资管理/工资报表/Pay_PaymentEntryReport.html | 598 ++++++++++++++++++++++++
WebTM/views/车间管理/报表分析/Mes_OrderProcFlowAllReport_ICMO.html | 6
WebTM/views/工资管理/工资报表/Pay_PayWorkShopSumReport.html | 8
WebTM/WebTM.csproj | 2
20 files changed, 1,340 insertions(+), 92 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 46b8479..bdd5222 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -284,6 +284,7 @@
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBillList_BarCodeList.html" />
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventoryByCLD_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鎵爜楠岃瘉\Gy_BarCodeConfirmBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鎵爜楠岃瘉\Gy_BarCodeConfirmBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鎵爜楠岃瘉\Gy_BarCodeConfirmBillList.html" />
@@ -414,6 +415,7 @@
<Content Include="views\鍩虹璧勬枡\閫氱敤鍩虹璧勬枡\Gy_CommonBaseData.html" />
<Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_GridView_Hide_New.html" />
<Content Include="views\宸ヨ祫绠＄悊\瀹氶鐢宠\Pay_ProcPriceRequestBillCheckQuery.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentEntryReport.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PayWorkShopSumReport.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentDayCheckReport.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentMonthSumReport.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 21527c9..dea1ae5 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,11 +3,11 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8082/API/";*/ //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
/* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/*var WEBURL = "http://localhost:8082/LuBaoAPI/"; */ //浣欐�濇澃鏈湴閰嶇疆
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProductionTeamList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProductionTeamList.html"
index 5e8e3b1..3252ad9 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProductionTeamList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProductionTeamList.html"
@@ -81,7 +81,6 @@
}
parent.layer.close(index);
});
- RoadQuery($('#Value').val());
table.render({
elem: '#mainTable'
// , url: '/demo/table/user/'
@@ -97,6 +96,8 @@
, limits: [50, 500, 5000, 50000],
limit: 50
});
+ RoadQuery($('#Value').val());
+
///鍔犺浇鏄剧ず鏁版嵁
function RoadQuery(Where) {
var Value = " and HUSEORGID = " + sessionStorage["OrganizationID"] + "";
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventoryByCLD_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventoryByCLD_PDA.html"
new file mode 100644
index 0000000..61f2d73
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventoryByCLD_PDA.html"
@@ -0,0 +1,527 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>ERP鍙婃椂搴撳瓨鏌ヨ</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style>
+ .layui-col-xs8 {
+ width: 55.666667%;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding:0">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div style="background-color:#0085E8;">
+ <span style="color: white;"><i class="layui-icon layui-icon-form"></i>ERP鍙婃椂搴撳瓨鏌ヨ</span>
+ </div>
+ <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
+ <button type="button" lay-submit="" lay-filter="cmdSearch" class="layui-btn layui-btn-radius" id="cmdSearch">鏌ヨ</button>
+ <button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn layui-btn-radius layui-btn-danger" id="cmdCancel">閫�鍑�</button>
+ </div>
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ </div>
+ <div class="layui-colla-content" style="padding: 6px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HWHName" id="HWHName" lay-verify="HWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HWHID-BT" class="layui-btn" id="HWHID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HSpID-BT" class="layui-btn" id="HSpID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab layui-col-xs12" lay-filter="tab-KF_ICInventoryByCLD_PDA">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;">鍙婃椂搴撳瓨淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鍙婃椂搴撳瓨淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+ <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+ var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
+ var listOption = [];
+ var columns = "";
+ var HModName = "KF_ICInventoryByCLD_PDA";
+ var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+ var params = get_UrlVars();
+ var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //1涓虹洿鎺ユā鍧楁墦寮� 2涓轰粠鍏朵粬妯″潡璺宠浆鎵撳紑
+ var HMaterNumber = params[params[1]]; //鐗╂枡浠ｇ爜
+
+ //#endregion
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ set_InitGrid(); //鍒濆鍖栬〃鏍�
+
+ var data = [];
+ listOption.cols = [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 100 }
+ , { field: '浠撲綅', title: '浠撲綅', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '鎵规', title: '鎵规', width: 100 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 100 }
+ , { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 100 }
+ , { field: '鏈夋晥鏈熻嚦', title: '鏈夋晥鏈熻嚦', width: 100 }
+ , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
+
+ if (OperationType == 2) {
+ //杩斿洖鐗╂枡浠ｇ爜
+ $("#HBarCode").val(HMaterNumber);
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //鏉＄爜淇℃伅
+ listOption = {
+ elem: '#wl-table'
+ //, toolbar: '#toolbarDemo'
+ //, totalRow: true
+ , height: 'full-60'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ };
+ }
+
+ //#endregion
+
+
+ //#region 鍩虹璧勬枡閫夋嫨
+
+ //#region 浠撳簱
+ //鎵弿浠撳簱鏉＄爜
+ $('#HWHName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ var HWHName = $('#HWHName').val()
+ if (HWHName == '') {
+ playSound();
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetWarehouse_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HWHName, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HWHID").val(result.data[0].HItemID);
+ $("#HWHName").val(result.data[0].HName);
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ if (result.data[0].HSPFlag == 0) {
+ $("#HStockPlaceName").attr("disabled", "disabled");
+ $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ element.tabChange('tab-Kf_POStockInBill_PDA', '2');
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //浠撳簱鎸夐挳
+ form.on('submit(HWHID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撳簱鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 浠撲綅
+ //鎵弿浠撲綅鏉＄爜
+ $('#HStockPlaceName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if ($("#HWHName").val() == '') {
+ $("#HWHID").val("0");
+ }
+ var sHWHID = $("#HWHID").val()
+ var HStockPlaceName = $('#HStockPlaceName').val()
+ if (HStockPlaceName == '') {
+ playSound();
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HStockPlaceName").select();
+ $("#HStockPlaceName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetStockPlace_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HStockPlaceName, "HWhID": sHWHID, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HStockPlaceName").val(result.data[0].HName);
+ $("#HStockPlaceID").val(result.data[0].HItemID);
+ $("#HWHName").val(result.data[0].HWhName);
+ $("#HWHID").val(result.data[0].HWHID);
+ element.tabChange('tab-Kf_POStockInBill_PDA', '2');
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HStockPlaceName").select();
+ $("#HStockPlaceName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //浠撲綅鎸夐挳
+ form.on('submit(HSpID-BT)', function () {
+ //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if ($("#HWHName").val() == '') {
+ $("#HWHID").val("0");
+ }
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撲綅鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + $("#HWHID").val() + '&Type=HSpID&HOrgID=' + HStockOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#endregion
+
+
+ //#region 鎵弿鐗╂枡鏉＄爜
+
+ //鎵弿鏉＄爜
+ $('#HBarCode').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ DisBillEntryList();
+ layer.closeAll("loading");
+ }
+ });
+
+ //#endregion
+
+
+ //#region 鍔熻兘鎺т欢
+
+ //#region 鏌ヨ
+ form.on('submit(cmdSearch)', function (data) {
+ DisBillEntryList();
+ layer.closeAll("loading");
+ });
+
+ function DisBillEntryList() {
+ //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+ if ($("#HWHName").val() == '') {
+ $("#HWHID").val("0");
+ }
+ if ($("#HStockPlaceName").val() == '') {
+ $("#HStockPlaceID").val("0");
+ }
+ var sHBarCode = $('#HBarCode').val()
+ var sHWHID = $("#HWHID").val()
+ var sHSPID = $("#HStockPlaceID").val()
+
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/KF_ICInventoryByMaterID/GetBillEntry_TmpList_Pack1',
+ async: true, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": sHBarCode, "sHWHID": sHWHID, "sHSPID": sHSPID, "HOWNERID": HStockOrgID, "sWhere": '' },
+ success: function (result) {
+ var data = [];
+ var col = [];
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in result.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(result.list[key].ColmCols)) {
+ titleData[key] = result.list[key].ColmCols;
+ }
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'radio' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+
+ if (data[i].name == '浠撳簱') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 120 });
+ } else if (data[i].name == '鐗╂枡浠ｇ爜' || data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿' || data[i].name == '缁勭粐') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 180 });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+ }
+ }
+ }
+ }
+ columns = col;
+ listOption.cols = [columns];
+ listOption.data = result.data;
+ //listOption.totalRow = true;
+ table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(listOption);
+ }
+ else {
+ listOption.cols = [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 100 }
+ , { field: '浠撲綅', title: '浠撲綅', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '鎵规', title: '鎵规', width: 100 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 100 }
+ , { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 100 }
+ , { field: '鏈夋晥鏈熻嚦', title: '鏈夋晥鏈熻嚦', width: 100 }
+ , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+ ]];
+ listOption.data = data;
+ //listOption.totalRow = true;
+ table.render(listOption);
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+
+ //#endregion
+
+ //#region 閫�鍑�
+ form.on('submit(cmdCancel)', function () {
+ //layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ if (OperationType == 2) {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ //parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ }
+ else {
+ parent.location.href = "../../../views/index_Mobile.html";
+ }
+ //});
+ })
+
+ //#endregion
+
+ //#endregion
+
+ });
+
+ //浠ヤ笂涓簂ayui妯″潡
+ //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖浠撳簱淇℃伅
+ function GetHWHValue(obj) {
+ if (obj.length > 0) {
+ $("#HWHName").val(obj[0].HName);
+ $("#HWHID").val(obj[0].HItemID);
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceID").val("0");
+ if (obj[0].HSPFlag == 0) {
+ $("#HStockPlaceName").attr("disabled", "disabled");
+ $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ }
+ }
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖浠撲綅淇℃伅
+ function GetHSpValue(obj) {
+ if (obj.length > 0) {
+ $("#HStockPlaceName").val(obj[0].HName);
+ $("#HStockPlaceID").val(obj[0].HItemID);
+ $("#HWHName").val(obj[0].HWhName);
+ $("#HWHID").val(obj[0].HWHID);
+ }
+ }
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_PDA.html"
index b4d37ee..b740570 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_PDA.html"
@@ -129,38 +129,6 @@
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs2">
- <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
- </div>
- <div class="layui-col-xs10">
- <div class="layui-col-xs10">
- <input type="text" name="HWHName" id="HWHName" lay-verify="HWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
- <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
- </div>
- <div class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="HWHID-BT" class="layui-btn" id="HWHID-BT">...</button>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs2">
- <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
- </div>
- <div class="layui-col-xs10">
- <div class="layui-col-xs10">
- <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
- <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
- </div>
- <div class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="HSpID-BT" class="layui-btn" id="HSpID-BT">...</button>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs2">
<label class="layui-form-label" style="width:30px;padding-left:0px;">淇濈</label>
</div>
<div class="layui-col-xs10">
@@ -236,6 +204,38 @@
</div>
<!--鐗╂枡淇℃伅-->
<div class="layui-tab-item">
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HWHName" id="HWHName" lay-verify="HWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HWHID-BT" class="layui-btn" id="HWHID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HSpID-BT" class="layui-btn" id="HSpID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ </div>
<div class="layui-row">
<div class="layui-col-xs12">
<div class="layui-form-item" style="padding:0px;margin:0px"></div>
@@ -547,6 +547,32 @@
$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
})
//#endregion
+
+ //#region 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+ table.on('tool(wl-table)', function (obj) {
+ var data = obj.data;
+
+ //鐗╂枡浠ｇ爜瓒呴摼鎺�
+ if (obj.event == '鐗╂枡浠ｇ爜') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鐗╂枡浠ｇ爜'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var HMaterNumber = data.鐗╂枡浠ｇ爜.toString(); //澹版槑鍙橀噺HMaterNumber 涓� data.鐗╂枡浠ｇ爜
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '鍙婃椂搴撳瓨淇℃伅' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1 //鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../WMS鎵爜妯″潡/搴撳瓨鏌ヨ/KF_ICInventoryByCLD_PDA.html?OperationType=2&HMaterNumber=' + HMaterNumber //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+ end: function () { //褰撳叧闂椂璋冪敤
+ }
+ , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ }
+ })
+ }
+ });
+ //#endregion
//鍒ゆ柇鏄惁鏂板锛岃幏鍙栨渶澶у崟鎹彿
if (HInterID != 0) {
@@ -1687,8 +1713,13 @@
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else {
+ } else if (data[i].name == '鐗╂枡浠ｇ爜') {
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else {
switch (data[i].Type) {
//int
case 'DateTime':
@@ -1698,6 +1729,8 @@
if (data[i].name == '鏁伴噺' || data[i].name == '婧愬崟鏁伴噺' || data[i].name == '鏉＄爜涓暟') {
col.push({ field: data[i].id, title: data[i].name, align: 'center', totalRow: true });
+ } else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 180 });
} else {
col.push({ field: data[i].id, title: data[i].name, align: 'center' });
}
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index fd33618..c385896 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -198,10 +198,10 @@
<div carousel-item="">
<ul class="layui-row layui-col-space10 layui-this">
<li class="layui-col-xs6">
- <a href="javascript:void(0);">
+ <a lay-href="../views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillCheckQuery.html">
<!--<a lay-href="app/content/comment.html" class="layadmin-backlog-body">-->
- <h3>寰呭鍗曟嵁</h3>
- <p><cite>0</cite></p>
+ <h3>宸ヨ壓寰呭鍗曟嵁</h3>
+ <p id="needCheckNumber"><cite>0</cite></p>
</a>
</li>
<li class="layui-col-xs6">
@@ -288,6 +288,7 @@
get_Display();
get_Notices();
+ getNeedCheckRouting();
}
//椤甸潰鍏跺畠鏂规硶
@@ -449,6 +450,28 @@
});
layer.close(index);
}
+
+ function getNeedCheckRouting() {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Routing/NeedChecklist",
+ type: "GET",
+ async: false,
+ data: { "user": sessionStorage["HUserName"], "userid": sessionStorage["Czybm"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ const uniqueHinterIDs = new Set(data1.data.map(item => item.hmainid));
+ const uniqueHinterIDCount = uniqueHinterIDs.size;
+ $("#needCheckNumber").text(uniqueHinterIDCount);
+ if (data1.data.length != 0) {
+ $("#needCheckNumber").css("color", "red");
+ }
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
});
</script>
</body>
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index 7263ee6..843de24 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -107,9 +107,9 @@
</li>
<li class="layui-col-xs3">
- <a href="../浠撳瓨绠＄悊/鏉＄爜搴撳瓨/KF_ICInventoryByMaterID.html" target="main_self_frame">
+ <a href="../WMS鎵爜妯″潡/搴撳瓨鏌ヨ/KF_ICInventoryByCLD_PDA.html" target="main_self_frame">
<i class="layui-icon layui-icon-find-fill"></i>
- <cite>搴撳瓨鏌ヨ</cite>
+ <cite>ERP鍙婃椂搴撳瓨鏌ヨ</cite>
</a>
</li>
<li class="layui-col-xs3">
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index e1876ea..9cc20ed 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -663,9 +663,9 @@
</a>
</dd>
<dd>
- <a href="浠撳瓨绠＄悊/鏉＄爜搴撳瓨/KF_ICInventoryByMaterID.html" target="main_self_frame" style="color: aqua;">
+ <a href="WMS鎵爜妯″潡/搴撳瓨鏌ヨ/KF_ICInventoryByCLD_PDA.html" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 搴撳瓨鏌ヨ
+ ERP鍙婃椂搴撳瓨鏌ヨ
</a>
</dd>
<dd>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PayWorkShopSumReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PayWorkShopSumReport.html"
index 670d659..4cd091c 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PayWorkShopSumReport.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PayWorkShopSumReport.html"
@@ -275,12 +275,12 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-180'
- , page: true
+ , height: 'full-80'
+ , page: false
, cellMinWidth: 90
, totalRow: true
- , limit: 50
- , limits: [50, 500, 5000, 20000]
+ , limit: Number.MAX_VALUE
+ //, limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
soulTable.render(this);
}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentDayCheckReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentDayCheckReport.html"
index ccdd26f..872238a 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentDayCheckReport.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentDayCheckReport.html"
@@ -324,12 +324,12 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-180'
- , page: true
+ , height: 'full-80'
+ , page: false
, cellMinWidth: 90
, totalRow: true
- , limit: 50
- , limits: [50, 500, 5000, 20000]
+ , limit: Number.MAX_VALUE
+ //, limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
soulTable.render(this);
}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentEntryReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentEntryReport.html"
new file mode 100644
index 0000000..0d705f2
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentEntryReport.html"
@@ -0,0 +1,598 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>绯荤粺璁′欢鎶ヨ〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block">
+ <select name="HDeptID" id="HDeptID" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐝粍<label style="color:red"></label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HGroupName" id="HGroupName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
+ <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鑱屽憳</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="float:left;width:150px;" readonly>
+ <input type="hidden" class="layui-input" name="HEmpID" id="HEmpID" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="HBDate" id="HBDate" style="width:150px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="HEDate" id="HEDate" style="width:150px;">
+ </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>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , soulTable = layui.soulTable
+ var ins;
+ var sWhere = "";
+ var option = [];
+ var HModName = "Pay_PaymentEntryReport";
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ get_FastQuery();
+ });
+
+ //#region 閫夋嫨鐝粍鎸夐挳
+ form.on('submit(HGroupList)', function () {
+ get_checkGroup();
+ });
+ //#endregion
+
+ //#region 閫夋嫨鑱屽憳
+ form.on('submit(HEmpList)', function () {
+ get_checkEmp()
+ });
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);//鑾峰彇閫変腑琛� 鏁版嵁
+ switch (obj.event) {
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
+ case 'btn-reload':
+ get_FastQuery();
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ default:
+ break;
+ }
+ });
+
+ //#endregion
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ get_Dept();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ $("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鏌ヨ
+ get_FastQuery(1);
+ }
+ //#endregion
+
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-80'
+ , page: true
+ , cellMinWidth: 90
+ , totalRow: true
+ , limit: 5000
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ , cols: [[]]
+ };
+ }
+
+ //鐢熶骇杞﹂棿
+ function get_Dept() {
+ //鑾峰彇杞﹂棿鍒�
+ var HDeptID = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HDeptID += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
+ }
+ $("#HDeptID").append(HDeptID);
+
+ if (sessionStorage["HDeptID"] != "0") {
+ $("#HDeptID").val(sessionStorage["HDeptID"]);
+ //鐢ㄦ埛缁戝畾鐨勮溅闂翠笉瀛樺湪锛屽垯榛樿鏄剧ず鍏ㄩ儴杞﹂棿
+ if ($("#HDeptID").val() == null || $("#HDeptID").val() == undefined) {
+ $("#HDeptID").val(0);
+ }
+ }
+
+ //$("#HDeptName").val("0");
+
+ form.render('select');
+
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ $("#HEDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+ $("#HDeptID").val(0); //閮ㄩ棬
+ $("#HEmpID").val(0); //鑱屽憳
+ $("#HEmpName").val("");
+ $("#HGroupID").val(0); //鐝粍
+ $("#HGroupName").val("");
+ form.render('select');
+ sWhere = "";
+ }
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load(0, { shade: false });
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Pay_PaymentEntryReport/list',
+ type: "GET",
+ data: { sWhere: sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ 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: '鍗曟嵁鍙�' });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ option.cols = [col]
+ option.data = data1.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+
+ DisPlay_HideColumn();
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBDate = $("#HBDate").val();//寮�濮嬫椂闂�
+ var HEDate = $("#HEDate").val();//缁撴潫鏃堕棿
+ var HDeptID = $("#HDeptID").val();
+ var HEmpID = $("#HEmpID").val();
+ var HGroupID = $("#HGroupID").val();
+ sWhere = "'" + HBDate + "','" + HEDate + "','" + HDeptID + "','" + HGroupID + "','" + HEmpID + "'";
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閫夋嫨鑱屽憳
+ function get_checkEmp() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鑱屽憳',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpList', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+
+
+
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Pay_PaymentEntryReportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = option.data
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 閫夋嫨鐝粍
+ function get_checkGroup() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐝粍鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index]; //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable"); //鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(checkStatus.data[0].HItemID);
+
+ layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () {
+ }
+ })
+ }
+
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+ newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+ dataCol = data1.data[0].HGridString.split(',');
+ //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ if (dataCol.length == option.cols[0].length - 1) {
+ //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ for (var j = 0; j < option.cols[0].length - 1; j++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[j].split('|');
+ //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ newCols[0].push(option.cols[0][i + 1]);
+ }
+ }
+ }
+ //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ if (dataCol.length == newCols[0].length - 1) {
+ option.cols = newCols;
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ }
+ }
+ ins = table.render(option);
+ } else {
+ ins = table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ //table.on('row(mainTable)', function (obj) {
+ // //閫変腑琛屾敼鍙橀鑹�
+ // var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ // obj.tr.find(':checkbox').prop('checked', flag);
+ // if (flag) {
+ // obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ // $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ // } else {
+ // obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ // $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ // }
+ // //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ // layui.each(table.cache.mainTable, function (i, l) {
+ // if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ // l.LAY_CHECKED = flag;
+ // }
+ // });
+ //})
+ //#endregion
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ function GetHEmpListValue(obj) { //杩斿洖鑱屽憳
+ $("#HEmpID").val(obj.HItemID);
+ $("#HEmpName").val(obj.鑱屽憳鍚嶇О);
+ }
+ function GetHGroupValue(obj) //杩斿洖鐝粍
+ {
+ $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(obj[0].HItemID);
+ }
+
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentMonthSumReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentMonthSumReport.html"
index 69e16b4..5c6bb51 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentMonthSumReport.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentMonthSumReport.html"
@@ -324,12 +324,12 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-180'
- , page: true
+ , height: 'full-80'
+ , page: false
, cellMinWidth: 90
, totalRow: true
- , limit: 50
- , limits: [50, 500, 5000, 20000]
+ , limit: Number.MAX_VALUE
+ //, limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
soulTable.render(this);
}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentPieceSumReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentPieceSumReport.html"
index 38367dd..d270818 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentPieceSumReport.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentPieceSumReport.html"
@@ -227,12 +227,12 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-180'
- , page: true
+ , height: 'full-80'
+ , page: false
, cellMinWidth: 90
, totalRow: true
- , limit: 50
- , limits: [50, 500, 5000, 20000]
+ , limit: Number.MAX_VALUE
+ //, limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
soulTable.render(this);
}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentTimeSumReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentTimeSumReport.html"
index cf63f24..c5f0170 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentTimeSumReport.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PaymentTimeSumReport.html"
@@ -275,12 +275,12 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-180'
- , page: true
+ , height: 'full-80'
+ , page: false
, cellMinWidth: 90
, totalRow: true
- , limit: 50
- , limits: [50, 500, 5000, 20000]
+ , limit: Number.MAX_VALUE
+ //, limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
soulTable.render(this);
}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
index 8628113..a2f61f7 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
@@ -56,6 +56,18 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
</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="HGroupName" id="HGroupName">
+ </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="HEmpName" id="HEmpName">
+ </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>
@@ -892,6 +904,8 @@
$("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
$("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
$("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HGroupName").val("");
+ $("#HEmpName").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
@@ -921,6 +935,8 @@
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HGroupName = $("#HGroupName").val();//鐝粍
+ var HEmpName = $("#HEmpName").val();//鑱屽憳
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -1004,6 +1020,12 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HGroupName) {
+ sWhere += " and 鐝粍 like '%" + HGroupName + "%'";
+ }
+ if (HEmpName) {
+ sWhere += " and 鑱屽憳鍚嶇О like '%" + HEmpName + "%'";
+ }
get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
index 7ac8c49..2dd25df 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
@@ -56,6 +56,18 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
</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="HGroupName" id="HGroupName">
+ </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="HEmpName" id="HEmpName">
+ </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>
@@ -907,6 +919,8 @@
$("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
$("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
$("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HGroupName").val("");
+ $("#HEmpName").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
@@ -936,6 +950,8 @@
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HGroupName = $("#HGroupName").val();//鐝粍
+ var HEmpName = $("#HEmpName").val();//鑱屽憳
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -1019,6 +1035,12 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HGroupName) {
+ sWhere += " and 鐝粍 like '%" + HGroupName + "%'";
+ }
+ if (HEmpName) {
+ sWhere += " and 鑱屽憳鍚嶇О like '%" + HEmpName + "%'";
+ }
get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
index 215f3b1..cc7e971 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
@@ -321,7 +321,7 @@
$("#HSourceBillNo").val("");
$("#HMaterNumber").val("");
sWhere = "";
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
break;
//浣滃簾鎸夐挳
@@ -607,7 +607,8 @@
//do something
page = obj.curr;
size = obj.limit;
- get_DisplayPage("");
+ // 鍋囪鎸夐挳鏈変竴涓狪D涓�"myButton"
+ $("#btnSearch").trigger("click");
}
}
}
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 60ed9ee..7655ab5 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -98,7 +98,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">宸ヨ壓璺嚎鍚嶇О<label style="color:red"> * </label></label>
+ <label class="layui-form-label" style="width: 90px;">宸ヨ壓璺嚎鍚嶇О*</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" lay-verify="HName" name="HName" id="HName">
</div>
@@ -108,7 +108,7 @@
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜*</label>
- <div class="layui-input-block" style="margin-left: 77px;">
+ <div class="layui-input-block" style="margin-left: 83px;">
<input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -133,7 +133,7 @@
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁￠噺鍗曚綅*</label>
- <div class="layui-input-block" style="margin-left: 77px;">
+ <div class="layui-input-block" style="margin-left: 83px;">
<input type="text" class="layui-input" name="HUnitName" lay-verify="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnUnit" id="btnUnit" style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -151,11 +151,19 @@
</div>
</div>
<div class="layui-inline">
- <div class="layui-input-block" style="margin-left: 96px;">
+ <div class="layui-input-block" style="margin-left: 0px;">
<input type="checkbox" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" checked title="鏄惁榛樿宸ヨ壓">
<input type="hidden" value="true" name="HStandard" id="HStandard" lay-verify="HStandard">
<!--<input type="checkbox" name="checkboxHUseFlag" id="checkboxHUseFlag" title="鏄惁鍚敤" lay-skin="primary" lay-filter="checkboxHUseFlag">
<input type="hidden" value="false" name="HUseFlag" id="HUseFlag">-->
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐*</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
</div>
</div>
</div>
@@ -173,13 +181,20 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
+ <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 20px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">澶辨晥鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
+ <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style=" width: 500px;">
</div>
</div>
<!--<div class="layui-inline">
@@ -248,26 +263,26 @@
</div>-->
</div>
<div class="layui-row">
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">澶囨敞</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
<input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style=" width: 500px;">
</div>
- </div>
+ </div>-->
</div>
<div class="layui-row">
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁勭粐*</label>
<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">-->
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
+ <!--</select>
</div>
- </div>
+ </div>-->
</div>
</div>
</div>
@@ -545,7 +560,7 @@
//鍒濆琛ㄦ牸鏁版嵁
var rowdata = [{
- "HProcNo": "10", "HProcID_S": 0, "HProcType": "涓诲伐搴�", "HCenterID_S": 0, "HCenterID_SName": ""
+ "HProcNo": "10", "HProcID_S": 0, "HProcType": "涓诲伐搴�", "HCenterID_S": 0, "HCenterID_SName": "","宸ュ簭浠ｇ爜":""
, "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
, "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "宸ュ簭": "","宸ユ":""
, "HProcID": 0, "宸ヤ綔涓績浠ｇ爜": "", "HCenterID": 0, "宸ヤ綔涓績": "", "HSupID": 0
@@ -573,12 +588,13 @@
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, totalRow: true
//, cellMinWidth: 120
- , height: 400
+ , height: 450
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', field: '搴忓彿', title: '搴忓彿', totalRow: true }
, { field: 'HProcNo', title: '娴佹按鍙�', edit: 'text' }
- , { field: 'HProcID', title: '宸ュ簭ID', hide: true }//, hide: true
+ , { field: 'HProcID', title: '宸ュ簭ID', hide: true }//, hide: true
+ , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜'}
, { field: '宸ュ簭', title: '宸ュ簭', edit: 'text', event: "CheckHProcID" }//f7
, { field: 'HProcID_S', title: '宸ユID', hide: true }//, hide: true
, { field: '宸ユ', title: '宸ユ', edit: 'text', event: "CheckHProcMulID" }//f7
@@ -1827,6 +1843,7 @@
var j = 0;
for (var i = (NowNum - 1); i < option.data.length; i++) {
option.data[i]["宸ュ簭"] = WorkCente[j]["宸ュ簭鍚嶇О"];
+ option.data[i]["宸ュ簭浠ｇ爜"] = ProcessNumber[j].substring(1, ProcessNumber[j].length - 1);
option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
option.data[i]["宸ヤ綔涓績"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
@@ -1839,7 +1856,7 @@
//鍦ㄤ笅鏂规坊鍔犳柊鐨勮〃鏍兼暟鎹�
for (var i = 0; i < num; i++) {
option.data.push({
- "HProcNo": (table.cache["mainTable"].length + i + 1) * 10, "HProcID_S": 0, "HProcType": "涓诲伐搴�", "HCenterID_S": 0, "HCenterID_SName": ""
+ "HProcNo": (table.cache["mainTable"].length + i + 1) * 10, "HProcID_S": 0, "HProcType": "涓诲伐搴�", "HCenterID_S": 0, "HCenterID_SName": "", "宸ュ簭浠ｇ爜": ProcessNumber[j].substring(1, ProcessNumber[j].length - 1)
, "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
, "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "宸ュ簭": WorkCente[j]["宸ュ簭鍚嶇О"]
, "HProcID": WorkCente[j]["HProcID"], "宸ヤ綔涓績浠ｇ爜": WorkCente[j]["宸ヤ綔涓績浠ｇ爜"], "HCenterID": WorkCente[j]["HCenterID"], "宸ヤ綔涓績": WorkCente[j]["宸ヤ綔涓績鍚嶇О"], "HSupID": 0
@@ -1863,6 +1880,7 @@
var j = 0;
for (var i = (NowNum - 1); i < (NowNum - 1) + ProcessNumber.length; i++) {
option.data[i]["宸ュ簭"] = WorkCente[j]["宸ュ簭鍚嶇О"];
+ option.data[i]["宸ュ簭浠ｇ爜"] = ProcessNumber[j].substring(1, ProcessNumber[j].length - 1);
option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
option.data[i]["宸ヤ綔涓績"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
@@ -1894,6 +1912,7 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"宸ュ簭": OptionData[0].宸ュ簭鍚嶇О
+ , "宸ュ簭浠ｇ爜": OptionData[0].宸ュ簭浠ｇ爜
, "HProcID": OptionData[0].HItemID
, "宸ヤ綔涓績": OptionData[0].宸ヤ綔涓績
, "HCenterID": OptionData[0].HWorkCenterID
@@ -2283,7 +2302,7 @@
for (var i = 0; i < d.data.length; i++) {
rowdata.push(
{
- "HProcNo": d.data[i].宸ュ簭鍙�, "HProcID_S": d.data[i].宸ユ, "HProcType": d.data[i].宸ュ簭绫诲瀷, "HCenterID_S": d.data[i].HCenterID_S, "HCenterID_SName": d.data[i].浜х嚎涓績
+ "HProcNo": d.data[i].宸ュ簭鍙�, "HProcID_S": d.data[i].宸ユ, "HProcType": d.data[i].宸ュ簭绫诲瀷, "HCenterID_S": d.data[i].HCenterID_S, "HCenterID_SName": d.data[i].浜х嚎涓績, "宸ュ簭浠ｇ爜": d.data[i].宸ュ簭浠ｇ爜
, "HWorkQty_S": d.data[i].浜х嚎浜ц兘, "HSubStdEmpQty_S": d.data[i].浜х嚎浜烘暟, "HMouldNo": d.data[i].妯″叿缂栧彿, "HChangeMould": d.data[i].鎹㈡ā鏃堕棿, "HPackStd": d.data[i].鍛ㄨ浆绠辨爣鍑�
, "HPack": d.data[i].鍛ㄨ浆绠�, "HPutArea": d.data[i].鏆傛斁鍖�, "HMyWorkDays": d.data[i].鐢熶骇鍛ㄦ湡, "HMyFixWorkDays": d.data[i].鍥哄畾鐢熶骇澶╂暟, "宸ュ簭": d.data[i].宸ュ簭, "宸ユ": d.data[i].宸ユ鍚嶇О
, "HProcID": d.data[i].HProcID, "宸ヤ綔涓績浠ｇ爜": d.data[i].宸ヤ綔涓績浠ｇ爜, "HCenterID": d.data[i].HCenterID, "宸ヤ綔涓績": d.data[i].宸ヤ綔涓績鍚嶇О, "HSupID": d.data[i].HSupID
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html"
index 6743298..579822f 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html"
@@ -88,12 +88,12 @@
<h1 style="text-align:center;margin-bottom:7px;margin-top:7px;"><b>宸ヨ壓璺嚎鏌ヨ</b></h1>
<div class="layui-tab layui-tab-card" lay-filter="table">
<ul class="layui-tab-title">
- <li class="layui-this">鎴戝垱寤虹殑</li>
- <li>闇�瑕佹垜瀹℃牳鐨�</li>
+ <li>鎴戝垱寤虹殑</li>
+ <li class="layui-this">闇�瑕佹垜瀹℃牳鐨�</li>
<li>鎴戝凡瀹℃牳鐨�</li>
</ul>
<div class="layui-tab-content" style="">
- <div class="layui-tab-item layui-show">
+ <div class="layui-tab-item ">
<script type="text/html" id="toolbarDemoSend">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -108,7 +108,7 @@
</script>
<table class="" id="mainTableSend" lay-filter="mainTableSend"></table>
</div>
- <div class="layui-tab-item ">
+ <div class="layui-tab-item layui-show">
<script type="text/html" id="toolbarDemoNeedCheck">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -176,7 +176,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(1);
+ get_Display(2);
//get_Display(2);
//get_Display(3);
//#endregion
@@ -493,7 +493,7 @@
var url = "";
var user = sessionStorage["HUserName"];
if (type == 1) {
- var sWhere = "and 鍒跺崟浜� = '" + user + "'"
+ var sWhere = "and 鍒跺崟浜� = '" + user + "'" + " and 宸ュ簭浠ｇ爜 != '9999' and HBillSubType<>'SUB'" + "and 瀹℃牳浜� = ''"
url = '/LEMS/MES_Gy_RoutingBillList_Json';
userData = { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3301" };
@@ -609,7 +609,7 @@
option = optionNeedCheck;
}
else if (type == 3) {
- optionChecked.data = data1.data;
+ optionChecked.data = data1.data.slice(0, 1000);//鑾峰彇鍓�1000
//璁剧疆鍒楄〃鍚屼竴涓崟鎹彧鏈夌涓�鏉℃暟鎹樉绀轰富琛ㄤ俊鎭紝鍏跺畠璁板綍鍙樉绀哄瓙琛ㄤ俊鎭�
//鑾峰彇瀛愯〃鍒楁暟鎹�
var colList = [];
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_ICMO.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_ICMO.html"
index 0374de6..f4b8fd3 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_ICMO.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_ICMO.html"
@@ -50,12 +50,12 @@
</button>
</div>
</div>
- <!--<div class="layui-inline">
+ <div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="txtHDeptName" style="width:190px;">
</div>
- </div>-->
+ </div>
<div class="layui-inline">
<div class="layui-input-block">
<input type="checkbox" name="chkHShowUnFinish" id="chkHShowUnFinish" lay-skin="primary" lay-filter="chkHShowUnFinish" title="鍙樉绀烘湭瀹屽伐">
@@ -323,7 +323,7 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
- sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" ;
+ sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'" ;
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
--
Gitblit v1.9.1