From e6f956dec25d1e273ef3f27da42f0db29284a4c0 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期六, 17 五月 2025 14:28:15 +0800
Subject: [PATCH] 1
---
WebTM/views/工资管理/员工技能清单/HR_EmployeeSkillBill.html | 76
WebTM/views/基础资料/公用基础资料/Gy_MaterTypeEdit.html | 133
WebTM/views/生产管理/日计划报表/JIT_FuHeFenXiReport.html | 217 +
WebTM/views/生产管理/欠料运算/JIT_MaterialLevelShorAnalysis.html | 2
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 52
WebTM/views/基础资料/公用基础资料/Gy_WorkStationList.html | 351 +
WebTM/views/工资管理/员工技能清单/HR_EmployeeSkillBillList.html | 90
WebTM/views/基础资料/生产基础资料/Gy_PostSkillList.html | 13
WebTM/views/基础资料/公用基础资料/Gy_Unit.html | 323 +-
WebTM/views/基础资料/生产基础资料/Gy_WorkShiftList.html | 17
WebTM/views/工资管理/岗位技能清单/HR_PostSkillBillList.html | 110
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_WorkStationList.html | 196 +
WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html | 842 +++--
WebTM/views/基础资料/工资基础资料/Gy_WorkTypeList.html | 13
WebTM/views/领料发货/领料出库/Kf_MateOutBillLEdit.html | 2
WebTM/views/生产管理/班次开班单/Sc_ShiftsBeginInfoBillList.html | 27
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 46
WebTM/views/生产管理/宝工排产/JIT_PickUpCalculate_BaoGong.html | 2
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Post.html | 92
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Unit.html | 264 +
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Warehouse.html | 114
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 22
WebTM/views/生产管理/宝工排产/JIT_DayPlanPlatForm.html | 36
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList.html | 31
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList_S.html | 36
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html | 17
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_PostSkillList.html | 37
WebTM/WebTM.csproj | 5
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA_XiaBao.html | 2638 ++++++++++++++++++
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBill_Excel.html | 4
WebTM/views/基础资料/生产基础资料/Gy_Post.html | 4
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm_TK.html | 108
WebTM/views/home/console_Mobile.html | 12
WebTM/views/基础资料/公用基础资料/Gy_MaterType.html | 448 +-
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBillList_PDA_XiaBao.html | 558 +++
WebTM/views/生产管理/生产计划平台/Sc_ShopCalendar.html | 3
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 58
WebTM/WebTM.csproj.user | 2
WebTM/views/生产管理/班次开班单/Sc_ShiftsBeginInfoBill_Add_Edit.html | 70
WebTM/views/系统管理/组织架构设置/Gy_DutyList.html | 19
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatFormImport_SS.html | 4
WebTM/views/工资管理/岗位技能清单/HR_PostSkillBill.html | 103
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm.html | 107
WebTM/views/基础资料/生产基础资料/Gy_WorkShiftEdit.html | 56
WebTM/views/生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBill_Excel.html | 4
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 10
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatFormImport_SS_Sec.html | 397 ++
WebTM/views/生产管理/日计划报表/JIT_FuHeFenXiReportDetail.html | 728 +++++
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Department.html | 157
49 files changed, 7,317 insertions(+), 1,339 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index ce19f89..276517c 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -335,8 +335,10 @@
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_CheckList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBillList_Mould_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBillList_PDA_XiaBao.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBill_CusBar_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBill_Mould_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBill_PDA_XiaBao.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepInBill_Mould_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepInBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepOutBillList_Mould_PDA.html" />
@@ -578,6 +580,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainRuleBill_Excel.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainRuleBillList_PDA.html" />
<Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatForm.html" />
+ <Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatFormImport_SS_Sec.html" />
<Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatFormImport_SS.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\Cg_PODemandPlanConfigBillReportForLack.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\Gy_RoutingBillReportForLack.html" />
@@ -603,6 +606,8 @@
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴_PDA\璐ㄩ噺姹囨姤\Sc_QualityReportBill_PDA.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴鍔熻兘椤礬Gy_ButtonList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind_Button.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBill_Excel.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘JIT_FuHeFenXiReportDetail.html" />
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysis.html" />
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisDetailReport.html" />
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisReport.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 980f848..e33a50f 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
- <ProjectView>ProjectFiles</ProjectView>
+ <ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA_XiaBao.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA_XiaBao.html"
new file mode 100644
index 0000000..06fb715
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA_XiaBao.html"
@@ -0,0 +1,558 @@
+锘�<!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">
+ <!--寮曠敤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>
+</head>
+<body>
+ <div class="layui-fluid">
+ <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-tab" lay-filter="tab-Kf_MoveStockBillList_PDA_XiaBao">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+ <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--缂撳瓨鍒楄〃-->
+ <div class="layui-tab-item">
+ <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="dj-table" lay-filter="dj-table"></table>
+ </div>
+ </div>
+ </div>
+ <!--宸蹭笂浼犲垪琛�-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding: 10px; margin: 0px">
+ <div class="layui-row" style="margin-top: -10px;">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px; float: right;">
+ <button type="button" lay-submit="" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+ <button type="button" lay-submit="" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+ </div>
+ <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="Uploaded-table" lay-filter="Uploaded-table"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+ <div class="layui-col-xs2" style="margin-left:0px">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+ </div>
+ <div class="layui-col-xs2" style="margin-left:5px">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+ </div>
+ <div class="layui-col-xs2" style="margin-left:5px">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+ </div>
+ <div class="layui-col-xs2" style="margin-left:5px">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+ </div>
+ </div>
+ <!--澶辫触鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs" hidden controls>
+ <source src="../../video/jingbao.wav" type="audio/ogg">
+ </audio>
+ </div>
+ <!--鎴愬姛鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs2" hidden controls>
+ <source src="../../video/success.wav" type="audio/ogg">
+ </audio>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ var HBillType = '1207'
+ var HMaker = sessionStorage["HUserName"]
+ var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
+ var HBillNo = $('#HBillNo').val()
+ var HSourceBillNo = $('#HSourceBillNo').val()
+ var listOption = []; //缂撳瓨鍒楄〃
+ var Uploadedoption = []; //宸蹭笂浼犲垪琛�
+ var columns = "";
+ var Uploadedcolumns = "";
+ var MvarReportTitle = "鐩存帴璋冩嫧鍗曠紦瀛樺垪琛�";
+ var HModName = "Kf_MoveStockBillList_PDA_XiaBao";
+ var ModRightName = "CE_MoveStock2"; //妯″潡鏉冮檺鍙傛暟
+ var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+ var UploadedtitleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login_pda.html"; });
+ }
+
+ //#region 鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+
+ //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+ CheckModRight();
+
+ function CheckModRight() {
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/CheckModRight_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "ModRightName": ModRightName, "HUserName": HMaker },
+ success: function (d) {
+ if (d.count == 1) {
+ }
+ else {
+ layer.msg(d.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () { parent.location.href = "../../../views/index_Mobile.html"; });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ layer.closeAll("loading");
+ }
+ //#endregion
+
+ //澶辫触鎻愮ず闊�
+ function playSound() {
+ console.log("playSound");
+ var audio = document.getElementById("cs");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
+ //鎴愬姛鎻愮ず闊�
+ function playSound_OK() {
+ console.log("playSound_OK");
+ var audio = document.getElementById("cs2");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ //榛樿鏄剧ず椤甸潰
+ element.tabChange('tab-Kf_MoveStockBillList_PDA_XiaBao', '1');
+ set_InitGrid(); //鍒濆鍖栬〃鏍�
+ //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+ DisTempEntryList();
+ //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+ DisUploadedList();
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //缂撳瓨鍒楄〃
+ listOption = {
+ elem: '#dj-table'
+ //, toolbar: '#toolbarDemo'
+ //, totalRow: true
+ , height: 'full-150'
+ , page: true //寮�鍚垎椤�
+ , cellMinWidth: 90
+ , limit: 50
+ };
+
+ //宸蹭笂浼犲垪琛�
+ Uploadedoption = {
+ elem: '#Uploaded-table'
+ //, toolbar: '#toolbarDemo'
+ //, totalRow: true
+ , height: 'full-280'
+ , page: true //寮�鍚垎椤�
+ , cellMinWidth: 90
+ , limit: 20
+ };
+ }
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(dj-table)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".layui-table-body tr ").attr({ "style": "background:" }); //鍏朵粬tr鎭㈠鍘熸牱
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //閫変腑琛屾牱寮�
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //閫変腑radio鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ })
+
+ table.on('row(Uploaded-table)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".layui-table-body tr ").attr({ "style": "background:" }); //鍏朵粬tr鎭㈠鍘熸牱
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //閫変腑琛屾牱寮�
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //閫変腑radio鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ })
+ //#endregion
+
+ //#endregion
+
+
+ //#region 缂栬緫鍔熻兘鎺т欢
+
+ form.on('submit(cmdModify)', function () {
+ var checkStatus = table.checkStatus('dj-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鐩存帴璋冩嫧鍗�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBill_PDA_XiaBao.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+ , resize: false
+ , cancel: function () {
+ $(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ else {
+ layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+ }
+ });
+
+ //#endregion
+
+
+ //#region 鍒犻櫎鍔熻兘鎺т欢
+
+ form.on('submit(cmdDelete)', function () {
+ var checkStatus = table.checkStatus('dj-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+ layer.load(3)
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_New_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType, "HMaker": HMaker, "MvarReportTitle": MvarReportTitle },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+ DisTempEntryList();
+ });
+ }
+ else {
+ playSound();
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ layer.closeAll("loading");
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ });
+
+ //#endregion
+
+
+ //#region 鍒锋柊鍔熻兘鎺т欢
+
+ form.on('submit(cmdRefresh)', function () {
+ //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+ DisTempEntryList();
+ });
+
+ //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+ function DisTempEntryList() {
+ layer.load(3)
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_Other_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID, "HSubBillType": '1243' },
+ 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: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ default:
+
+ if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left' });
+ }
+ }
+ }
+ }
+ columns = col;
+ listOption.cols = [columns];
+ listOption.data = result.data;
+ //listOption.totalRow = true;
+ table.cache['dj-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 }
+ ]];
+ listOption.data = data;
+ //listOption.totalRow = true;
+ table.render(listOption);
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ layer.closeAll("loading");
+ }
+
+ //#endregion
+
+
+ //#region 閫�鍑哄姛鑳芥帶浠�
+
+ form.on('submit(cmdCancel)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.location.href = "../../../views/index_Mobile.html";
+ });
+ })
+
+ //#endregion
+
+
+ //#region 鏌ヨ鍔熻兘鎺т欢
+
+ form.on('submit(cmdQuery)', function () {
+ HBillNo = $("#HBillNo").val();
+ HSourceBillNo = $("#HSourceBillNo").val();
+ //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+ DisUploadedList();
+ });
+
+ //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+ function DisUploadedList() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_User_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+ 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)) {
+ UploadedtitleData[key] = result.list[key].ColmCols;
+ }
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'radio' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, UploadedtitleData) > -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: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ default:
+
+ if (data[i].name == '鏁伴噺') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 80 });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
+ }
+ }
+ }
+ }
+ Uploadedcolumns = col;
+ Uploadedoption.cols = [Uploadedcolumns];
+ Uploadedoption.data = result.data;
+ //Uploadedoption.totalRow = true;
+ table.cache['Uploaded-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(Uploadedoption);
+ }
+ else {
+ Uploadedoption.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 }
+ ]];
+ Uploadedoption.data = data;
+ //Uploadedoption.totalRow = true;
+ table.render(Uploadedoption);
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+
+ //#endregion
+
+
+ //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+ form.on('submit(cmdRescind)', function () {
+ var checkStatus = table.checkStatus('Uploaded-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.load(3)
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_DeleteICStockBillAndWMS_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType, "HMaker": HMaker, "MvarReportTitle": MvarReportTitle },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ element.tabChange('tab-Kf_MoveStockBillList_PDA_XiaBao', '1');
+ //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+ DisTempEntryList();
+ //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+ DisUploadedList();
+ });
+ }
+ else {
+ playSound();
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ layer.closeAll("loading");
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+ }
+ });
+
+ //#endregion
+
+ });
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html"
new file mode 100644
index 0000000..94d3abf
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html"
@@ -0,0 +1,2638 @@
+锘�<!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">
+ <!--寮曠敤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>涓撶敤璋冩嫧</span>
+ </div>
+ <div class="layui-form-item" style="padding:15px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs6">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width: 30px;padding-left: 0px;">鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs9">
+ <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-col-xs6">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width: 30px; margin-left: 8px; padding-left: 0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs5">
+ <input type="number" name="HQty" id="HQty" lay-verify="HQty" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ <div class="layui-col-xs4">
+ <button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn" id="HBarCode-BT" style="width: 45px; margin-left: 8px;padding-left:12px">OK</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
+ <div class="layui-col-xs6">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HSCWHName" id="HSCWHName" lay-verify="HSCWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HSCWHID" id="HSCWHID" lay-verify="HSCWHID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" lay-filter="HSCWHID-BT" class="layui-btn" id="HSCWHID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
+ </div>
+ </div>
+ <div class="layui-col-xs6">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HOutStockPlaceName" id="HOutStockPlaceName" lay-verify="HOutStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HOutStockPlaceID" id="HOutStockPlaceID" lay-verify="HOutStockPlaceID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" lay-filter="HSCSpID-BT" class="layui-btn" id="HSCSpID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab layui-col-xs12" style="margin-top:5px;" lay-filter="tab-Kf_MoveStockBill_PDA_XiaBao">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;">閫夋嫨婧愬崟</li>
+ <li lay-id="2" style="padding:1px;">琛ㄥご淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鐗╂枡淇℃伅</li>
+ <li lay-id="4" style="padding:1px;">鏉＄爜淇℃伅</li>
+ <li lay-id="5" style="padding:1px;">涓嬫灦淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--閫夋嫨婧愬崟-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟绫诲瀷</label>
+ </div>
+ <div class="layui-col-xs9">
+ <select name="HMainSourceBillType" id="HMainSourceBillType">
+ <option value="1243">璋冩嫧鐢宠鍗�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+ </div>
+ <div class="layui-col-xs9">
+ <div class="layui-col-xs8">
+ <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="cmdHSourceBillNo" class="layui-btn" id="cmdHSourceBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
+ </button>
+ </div>
+ <div class="layui-col-xs2" style="float: right;">
+ <button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冩嫧绫诲瀷</label>
+ </div>
+ <div class="layui-col-xs9">
+ <select lay-filter="HStockStyle" name=" HStockStyle" id="HStockStyle">
+ <option value="璺ㄧ粍缁囪皟鎷�">璺ㄧ粍缁囪皟鎷�</option>
+ <option value="缁勭粐鍐呰皟鎷�">缁勭粐鍐呰皟鎷�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撳簱</label>
+ </div>
+ <div class="layui-col-xs9">
+ <div class="layui-col-xs10" style="padding-right: 15px;">
+ <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" style="width: 45px; margin-left: -5px; padding-left: 12px">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撲綅</label>
+ </div>
+ <div class="layui-col-xs9">
+ <div class="layui-col-xs10" style="padding-right: 15px;">
+ <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" style="width: 45px; margin-left: -5px; padding-left: 12px">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆缁勭粐</label>
+ </div>
+ <div class="layui-col-xs9">
+ <select lay-filter="HStockInOrgID" name=" HStockInOrgID" id="HStockInOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭缁勭粐</label>
+ </div>
+ <div class="layui-col-xs9">
+ <select lay-filter="HStockOutOrgID" name=" HStockOutOrgID" id="HStockOutOrgID" disabled>
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:70px;padding-left:0px;">鍗曟嵁瀛愮被鍨�</label>
+ </div>
+ <div class="layui-col-xs9">
+ <select name=" HBillSubType" id="HBillSubType">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏃ユ湡</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input name="HDate" id="HDate" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍒跺崟浜�</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁ID</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ </div>
+ </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="HKeeperName" id="HKeeperName" lay-verify="HKeeperName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HKeeperID" id="HKeeperID" lay-verify="HKeeperID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HKeeperID-BT" class="layui-btn" id="HKeeperID-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="HSecManagerName" id="HSecManagerName" lay-verify="HSecManagerName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HSecManagerID" id="HSecManagerID" lay-verify="HSecManagerID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HSecManagerID-BT" class="layui-btn" id="HSecManagerID-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="HDeptName" id="HDeptName" lay-verify="HDeptName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HDeptID-BT" class="layui-btn" id="HDeptID-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="HSupName" id="HSupName" lay-verify="HSupName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HSupID-BT" class="layui-btn" id="HSupID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鐗╂枡淇℃伅-->
+ <div class="layui-tab-item">
+ <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 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:40px;padding-left:0px;">鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HBarCode_B" id="HBarCode_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </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:40px;padding-left:0px;">鐗╂枡</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HMaterName_B" id="HMaterName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </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:40px;padding-left:0px;">瑙勬牸</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HMaterModel_B" id="HMaterModel_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </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:40px;padding-left:0px;">鎵规</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HBatchNo_B" id="HBatchNo_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </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:40px;padding-left:0px;">鍗曚綅</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HUnitName_B" id="HUnitName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </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:40px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HQty_B" id="HQty_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </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:40px;padding-left:0px;">瀹归噺</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HTMQty_B" id="HTMQty_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2" style="margin-left:-10px">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撳簱</label>
+ </div>
+ <div class="layui-col-xs10" style="margin-left:10px">
+ <input type="text" name="HWHName_B" id="HWHName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2" style="margin-left:-10px">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撲綅</label>
+ </div>
+ <div class="layui-col-xs10" style="margin-left:10px">
+ <input type="text" name="HSPName_B" id="HSPName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2" style="margin-left:-10px">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撳簱</label>
+ </div>
+ <div class="layui-col-xs10" style="margin-left:10px">
+ <input type="text" name="HSCWHName_B" id="HSCWHName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2" style="margin-left:-10px">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撲綅</label>
+ </div>
+ <div class="layui-col-xs10" style="margin-left:10px">
+ <input type="text" name="HSCSPName_B" id="HSCSPName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--涓嬫灦淇℃伅-->
+ <div class="layui-tab-item">
+ <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="FIFOList-table" lay-filter="FIFOList-table"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+ <button type="button" lay-submit="" lay-filter="cmdSaver" class="layui-btn" id="cmdSaver">鎻愪氦</button>
+ <button type="button" lay-submit="" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+ <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+ <button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+ </div>
+ </div>
+
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="HBillType" id="HBillType">
+ <input type="hidden" name="HBillerID" id="HBillerID">
+ <input type="hidden" name="HRedBlueFlag" id="HRedBlueFlag">
+ <input type="hidden" name="HSourceBillListCtl" id="HSourceBillListCtl">
+ <!--澶辫触鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs" hidden controls>
+ <source src="../../video/jingbao.wav" type="audio/ogg">
+ </audio>
+ </div>
+ <!--鎴愬姛鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs2" hidden controls>
+ <source src="../../video/success.wav" type="audio/ogg">
+ </audio>
+ </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 HInterID = $('#HInterID').val()
+ var HBillNo = $('#HBillNo').val()
+ var HBillType = '1207'
+ var HRedBlueFlag = false
+ var HMaker = sessionStorage["HUserName"]
+ var HBillerID = sessionStorage["HBillerID"]
+ var HStockInOrgID = sessionStorage["OrganizationID"] //璋冨叆缁勭粐ID
+ var HStockOutOrgID = sessionStorage["OrganizationID"] //璋冨嚭缁勭粐ID
+ var HStockOrgID = sessionStorage["OrganizationID"] //鐧诲叆缁勭粐ID
+ var HSourceFlag = false //鏄惁宸叉壂鐮佹爣蹇�
+ var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+ var listOption = [];
+ var FIFOListOption = [];
+ var columns = "";
+ var HModName = "Kf_MoveStockBill_PDA_XiaBao";
+ var ModRightName = "CE_MoveStock2"; //妯″潡鏉冮檺鍙傛暟
+ var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+ var params = get_UrlVars();
+ var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+ var HInterID_Temp = params[params[1]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁ID
+
+ //#endregion
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login_pda.html"; });
+ }
+
+ //#region 鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+
+ //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+ CheckModRight();
+
+ function CheckModRight() {
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/CheckModRight_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "ModRightName": ModRightName, "HUserName": HMaker },
+ success: function (d) {
+ if (d.count == 1) {
+ }
+ else {
+ layer.msg(d.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () { parent.location.href = "../../../views/index_Mobile.html"; });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ layer.closeAll("loading");
+ }
+ //#endregion
+
+ //澶辫触鎻愮ず闊�
+ function playSound() {
+ console.log("playSound");
+ var audio = document.getElementById("cs");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
+ //鎴愬姛鎻愮ず闊�
+ function playSound_OK() {
+ console.log("playSound_OK");
+ var audio = document.getElementById("cs2");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿璋冨叆璋冨嚭浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�佺粍缁囩瓑锛� new
+ $("#HWHID").val(sessionStorage["HSCWHID"]);
+ $("#HWHName").val(sessionStorage["HSCWHName"]);
+ $("#HSCWHID").val(sessionStorage["HWHID"]);
+ $("#HSCWHName").val(sessionStorage["HWHName"]);
+ $("#HDeptID").val(sessionStorage["HDeptID"]);
+ $("#HDeptName").val(sessionStorage["HDept"]);
+ $("#HSecManagerID").val(sessionStorage["HSecManagerID"]);
+ $("#HSecManagerName").val(sessionStorage["HSecManager"]);
+ $("#HKeeperID").val(sessionStorage["HKeeperID"]);
+ $("#HKeeperName").val(sessionStorage["HKeeper"]);
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillerID").val(sessionStorage["HBillerID"]);
+ $("#HStockInOrgID").val(sessionStorage["OrganizationID"]);
+ $("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
+ $("#HBillType").val("1207");
+ $("#HRedBlueFlag").val("false");
+ if (sessionStorage["HSCWHID"]!=0 && sessionStorage["HSCWHSPFlag"]) {
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").attr("disabled", "disabled");
+ $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+ $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").attr("disabled", "disabled");
+ $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+
+ //榛樿鏄剧ず椤甸潰
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '1');
+ set_InitDate(); //鍒濆鍖栬〃鍗曟椂闂�
+ set_InitBillSubType(); //鑾峰彇鍗曟嵁瀛愮被鍨�
+ set_InitStockOrgID(); //鑾峰彇璋冨叆璋冨嚭缁勭粐
+ 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 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
+ FIFOListOption.data = data;
+ table.render(FIFOListOption);
+
+ //鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
+ var pFocus = $("#HBarCode");
+ pFocus.select();
+ pFocus.focus(); //鑾峰彇鍏夋爣
+ }
+
+ //鍒濆鍖栬〃鍗曟椂闂存彃浠�
+ function set_InitDate() {
+ //甯歌鐢ㄦ硶
+ laydate.render({
+ elem: '#HDate'
+ });
+ }
+ //鑾峰彇鍗曟嵁瀛愮被鍨�
+ function set_InitBillSubType() {
+ var HBillSubType = '';
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetBillSubType_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HBillSubType += '<option value="' + data[i].HNumber + '">' + data[i].HName + '</option>';
+ }
+ $("#HBillSubType").append(HBillSubType);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ })
+ }
+ //鑾峰彇璋冨叆璋冨嚭缁勭粐
+ function set_InitStockOrgID() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HStockInOrgID").append(Organization);
+ $("#HStockInOrgID").val(HStockInOrgID)
+ $("#HStockOutOrgID").append(Organization);
+ $("#HStockOutOrgID").val(HStockOutOrgID)
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ })
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ listOption = {
+ elem: '#wl-table'
+ //, toolbar: '#toolbarDemo'
+ , totalRow: true
+ , height: 'full-60'
+ , cellMinWidth: 90
+ , limit: 200
+ };
+
+ //涓嬫灦淇℃伅
+ FIFOListOption = {
+ elem: '#FIFOList-table'
+ //, toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true }
+ , { field: 'HQtyMust', title: '涓嬫灦鏁伴噺', width: 90 }
+ , { field: 'HWhName', title: '浠撳簱', width: 150 }
+ , { field: 'HSPName', title: '浠撲綅', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HMaterID', title: 'HMaterID', width: 150, hide: true }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 150 }
+ , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+ , { field: 'HAuxPropID', title: 'HAuxPropID', width: 150, hide: true }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
+ }
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(wl-table)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".layui-table-body tr ").attr({ "style": "background:" }); //鍏朵粬tr鎭㈠鍘熸牱
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //閫変腑琛屾牱寮�
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //閫変腑radio鏍峰紡
+ $(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) {
+ HSourceFlag = true;
+ }
+ //浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡
+ else if (OperationType == 2) {
+ RoadBillMain(HInterID_Temp);
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+ //璋冨叆璋冨嚭缁勭粐涓庣櫥鍏ョ粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍏ヨ皟鍑轰粨搴撲粨浣嶆暟鎹�
+ if (HStockInOrgID != HStockOrgID) {
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ }
+ if (HStockOutOrgID != HStockOrgID) {
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HSCWHName").select();
+ $("#HSCWHName").focus();
+ }
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ HSourceFlag = true;
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '3');
+ }
+ else {
+ //鑾峰彇鏈�澶у崟鎹甀D銆佸崟鎹彿
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBillType": HBillType },
+ success: function (d) {
+ if (d.count == 1) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ HInterID = $('#HInterID').val()
+ HBillNo = $('#HBillNo').val()
+ }
+ else {
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+ HSourceFlag = false;
+ }
+
+ function RoadBillMain(HInterID_Temp)//鍔犺浇琛ㄥご
+ {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetSourceBill_Temp_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID_Temp, "HBillType": HBillType },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ HInterID = $('#HInterID').val()
+ HBillNo = $('#HBillNo').val()
+ //鑾峰彇婧愬崟绫诲瀷
+ if (d.data[0].HSourceBillType == "1402") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鍙戣揣閫氱煡鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else if (d.data[0].HSourceBillType == "1243") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '璋冩嫧鐢宠鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else if (d.data[0].HSourceBillType == "3720") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇鐢ㄦ枡娓呭崟' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else if (d.data[0].HSourceBillType == "1604") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '濮斿鐢ㄦ枡娓呭崟' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else if (d.data[0].HSourceBillType == "1214") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇鍙戞枡閫氱煡鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else if (d.data[0].HSourceBillType == "3721") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇澶囨枡鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else if (d.data[0].HSourceBillType == "1242") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鍑哄簱鐢宠鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鎵嬪伐褰曞叆' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+
+ $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
+ //闈炲婧愬崟妯″紡
+ if (d.data[0].HMulSourceBill == 0) {
+ $("#HSourceBillNo").attr("disabled", "disabled");
+ $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ if (d.data[0].HDeptID != 0) {
+ $("#HDeptID").val(d.data[0].HDeptID);
+ $("#HDeptName").val(d.data[0].HDeptName);
+ }
+ $("#HSupID").val(d.data[0].HCusID);
+ $("#HSupName").val(d.data[0].HCusName);
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HStockStyle").val(d.data[0].HStockStyle);
+ $("#HStockStyle").attr("disabled", true);
+ $("#HStockInOrgID").val(d.data[0].HStockInOrgID);
+ $("#HStockInOrgID").attr("disabled", true);
+ $("#HStockOutOrgID").val(d.data[0].HStockOutOrgID);
+ $("#HStockOutOrgID").attr("disabled", true);
+ form.render('select');
+ HStockInOrgID = $('#HStockInOrgID').val()
+ HStockOutOrgID = $('#HStockOutOrgID').val()
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ })
+ }
+
+ //#endregion
+
+ //#region 鍩虹璧勬枡閫夋嫨
+
+ //#region 璋冨嚭浠撳簱
+ //鎵弿璋冨嚭浠撳簱鏉＄爜
+ $('#HSCWHName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ var HSCWHName = $('#HSCWHName').val()
+ if (HSCWHName == '') {
+ playSound();
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ layer.msg("璋冨嚭浠撳簱鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSCWHName").select();
+ $("#HSCWHName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetWarehouse_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HSCWHName, "HStockOrgID": HStockOutOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HSCWHID").val(result.data[0].HItemID);
+ $("#HSCWHName").val(result.data[0].HName);
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ if (result.data[0].HSPFlag == 0) {
+ $("#HOutStockPlaceName").attr("disabled", "disabled");
+ $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSCWHName").select();
+ $("#HSCWHName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //璋冨嚭浠撳簱鎸夐挳
+ form.on('submit(HSCWHID-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=HSCWHID&HOrgID=' + HStockOutOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 璋冨嚭浠撲綅
+ //鎵弿璋冨嚭浠撲綅鏉＄爜
+ $('#HOutStockPlaceName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ //璋冨嚭浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if ($("#HSCWHName").val() == '') {
+ $("#HSCWHID").val("0");
+ }
+ var sHSCWHID = $("#HSCWHID").val()
+ var HOutStockPlaceName = $('#HOutStockPlaceName').val()
+ if (HOutStockPlaceName == '') {
+ playSound();
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ layer.msg("璋冨嚭浠撲綅鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HOutStockPlaceName").select();
+ $("#HOutStockPlaceName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetStockPlace_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HOutStockPlaceName, "HWhID": sHSCWHID, "HStockOrgID": HStockOutOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HOutStockPlaceName").val(result.data[0].HName);
+ $("#HOutStockPlaceID").val(result.data[0].HItemID);
+ $("#HSCWHName").val(result.data[0].HWhName);
+ $("#HSCWHID").val(result.data[0].HWHID);
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HOutStockPlaceName").select();
+ $("#HOutStockPlaceName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //璋冨嚭浠撲綅鎸夐挳
+ form.on('submit(HSCSpID-BT)', function () {
+ //璋冨嚭浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if ($("#HSCWHName").val() == '') {
+ $("#HSCWHID").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=' + $("#HSCWHID").val() + '&Type=HOSpID&HOrgID=' + HStockOutOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 璋冨叆浠撳簱
+ //鎵弿璋冨叆浠撳簱鏉＄爜
+ $('#HWHName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
+ layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ });
+ return;
+ }
+ 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: 'auto', 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": HStockInOrgID },
+ 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_MoveStockBill_PDA_XiaBao', '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: 'auto', 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 () {
+ if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
+ layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ });
+ return;
+ }
+ 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=' + HStockInOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 璋冨叆浠撲綅
+ //鎵弿璋冨叆浠撲綅鏉＄爜
+ $('#HStockPlaceName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
+ layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ });
+ return;
+ }
+ //璋冨叆浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨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: 'auto', 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": HStockInOrgID },
+ 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_MoveStockBill_PDA_XiaBao', '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: 'auto', 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 () {
+ if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
+ layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ });
+ return;
+ }
+ //璋冨叆浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨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=' + HStockInOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 淇濈鍛�
+ //鎵弿淇濈鍛樻潯鐮�
+ $('#HKeeperName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ var HKeeperName = $('#HKeeperName').val()
+ if (HKeeperName == '') {
+ playSound();
+ $("#HKeeperID").val("0");
+ $("#HKeeperName").val("");
+ layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HKeeperName").select();
+ $("#HKeeperName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetEmployee_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HKeeperName },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HKeeperID").val(result.data[0].HItemID);
+ $("#HKeeperName").val(result.data[0].HName);
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '2');
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HKeeperID").val("0");
+ $("#HKeeperName").val("");
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HKeeperName").select();
+ $("#HKeeperName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //淇濈鍛樻寜閽�
+ form.on('submit(HKeeperID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鑱屽憳鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 楠屾敹鍛�
+ //鎵弿楠屾敹鍛樻潯鐮�
+ $('#HSecManagerName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ var HSecManagerName = $('#HSecManagerName').val()
+ if (HSecManagerName == '') {
+ playSound();
+ $("#HSecManagerID").val("0");
+ $("#HSecManagerName").val("");
+ layer.msg("楠屾敹鍛樻潯鐮佷负绌猴紒", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSecManagerName").select();
+ $("#HSecManagerName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetEmployee_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HSecManagerName },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HSecManagerID").val(result.data[0].HItemID);
+ $("#HSecManagerName").val(result.data[0].HName);
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '2');
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HSecManagerID").val("0");
+ $("#HSecManagerName").val("");
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSecManagerName").select();
+ $("#HSecManagerName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //楠屾敹鍛樻寜閽�
+ form.on('submit(HSecManagerID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鑱屽憳鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 閮ㄩ棬
+ //鎵弿閮ㄩ棬鏉＄爜
+ $('#HDeptName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ var HDeptName = $('#HDeptName').val()
+ if (HDeptName == '') {
+ playSound();
+ $("#HDeptID").val("0");
+ $("#HDeptName").val("");
+ layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HDeptName").select();
+ $("#HDeptName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetDepartment_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HDeptName },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HDeptID").val(result.data[0].HItemID);
+ $("#HDeptName").val(result.data[0].HName);
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '2');
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HDeptID").val("0");
+ $("#HDeptName").val("");
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HDeptName").select();
+ $("#HDeptName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //閮ㄩ棬鎸夐挳
+ form.on('submit(HDeptID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '閮ㄩ棬鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 瀹㈡埛
+ //鎵弿瀹㈡埛鏉＄爜
+ $('#HSupName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ var HSupName = $('#HSupName').val()
+ if (HSupName == '') {
+ playSound();
+ $("#HSupID").val("0");
+ $("#HSupName").val("");
+ layer.msg("瀹㈡埛鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSupName").select();
+ $("#HSupName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetCustomer_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HSupName, "HStockOrgID": HStockOutOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HSupID").val(result.data[0].HItemID);
+ $("#HSupName").val(result.data[0].HName);
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '2');
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HSupID").val("0");
+ $("#HSupName").val("");
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSupName").select();
+ $("#HSupName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //瀹㈡埛鎸夐挳
+ form.on('submit(HSupID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '瀹㈡埛鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_CustomerListNew.html?HStockOrgID=' + HStockOutOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#endregion
+
+
+ //#region 鍔熻兘鎺т欢
+
+ //#region 鎻愪氦
+ form.on('submit(cmdSaver)', function (data) {
+ //浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佸鎴锋枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+ if ($("#HWHName").val() == '') {
+ $("#HWHID").val("0");
+ data.field.HWHID = $('#HWHID').val()
+ }
+ if ($("#HStockPlaceName").val() == '') {
+ $("#HStockPlaceID").val("0");
+ data.field.HStockPlaceID = $('#HStockPlaceID').val()
+ }
+ if ($("#HSCWHName").val() == '') {
+ $("#HSCWHID").val("0");
+ data.field.HWHID = $('#HSCWHID').val()
+ }
+ if ($("#HOutStockPlaceName").val() == '') {
+ $("#HOutStockPlaceID").val("0");
+ data.field.HStockPlaceID = $('#HOutStockPlaceID').val()
+ }
+ if ($("#HKeeperName").val() == '') {
+ $("#HKeeperID").val("0");
+ data.field.HKeeperID = $('#HKeeperID').val()
+ }
+ if ($("#HSecManagerName").val() == '') {
+ $("#HSecManagerID").val("0");
+ data.field.HSecManagerID = $('#HSecManagerID').val()
+ }
+ if ($("#HDeptName").val() == '') {
+ $("#HDeptID").val("0");
+ data.field.HDeptID = $('#HDeptID').val()
+ }
+ if ($("#HSupName").val() == '') {
+ $("#HSupID").val("0");
+ data.field.HSupID = $('#HSupID').val()
+ }
+
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = table.cache['wl-table'];
+ if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
+ {
+ layer.load(3);
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/WEBSController/set_SaveMoveStockBill_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "oMain": sMainStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ layer.confirm(data.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板','鍏抽棴'],
+ btn2: function () {
+ if (OperationType == 2) {
+ parent.location.href = "../../WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBillList_PDA.html";
+ }
+ else {
+ parent.location.href = "../../../views/index_Mobile.html";
+ }
+ }//鍏抽棴
+ }
+ , function () {
+ location.replace('Kf_MoveStockBill_PDA_XiaBao.html?OperationType=1&HInterID=0');
+ });//鏂板
+ }
+ else {
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ layer.closeAll("loading");
+ return;
+ }
+ });
+
+ //#endregion
+
+ //#region 缂栬緫
+
+ form.on('submit(cmdModify)', function () {//缂栬緫
+ var checkStatus = table.checkStatus('wl-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length == 1) {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏄庣粏鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?HInterID=' + data[0].HInterID + '&HMaterID =' + data[0].HMaterID + '&HBillType =' + data[0].HBillType, 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , end: function () {
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ })
+ }
+ else {
+ layer.msg('璇峰厛閫夋嫨涓�琛岃褰曪紝杩涜缂栬緫锛�');
+ }
+ });
+
+
+ //#endregion
+
+ //#region 鍒犻櫎
+
+ form.on('submit(cmdDelete)', function () {
+ var checkStatus = table.checkStatus('wl-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length == 1) {
+ layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+ var sMaterID = data[0].HMaterID
+ var sAuxPropID = data[0].HAuxPropID
+ var sMTONo = data[0].HMTONo
+ var sSourceInterID = data[0].HSourceInterID
+ var sSourceEntryID = data[0].HSourceEntryID
+
+ layer.load(3)
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": HBillType },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ });
+ }
+ else {
+ playSound();
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ layer.closeAll("loading");
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+ }
+ });
+
+ //#endregion
+
+ //#region 閫�鍑�
+
+ form.on('submit(cmdCancel)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ //鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬侊紙鏇存柊 HlineStatus =1锛�
+ $.ajax({
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_FIFO_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillType": HBillType },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ 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";
+ }
+ }
+ else {
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ });
+ })
+
+ //#endregion
+
+ //#endregion
+
+
+ //#region 婧愬崟閫夋嫨
+
+ form.on('submit(cmdHSourceBillNo)', function () {
+ var HSourceTitle = "";
+ var HSourceBillType = $("#HMainSourceBillType").val()
+ if (HSourceBillType == '1402') {
+ HSourceTitle = "鍙戣揣閫氱煡鍗�";
+ }
+ else if (HSourceBillType == '1243') {
+ HSourceTitle = "璋冩嫧鐢宠鍗�";
+ }
+ else if (HSourceBillType == '3720') {
+ HSourceTitle = "鐢熶骇鐢ㄦ枡娓呭崟";
+ }
+ else if (HSourceBillType == '1604') {
+ HSourceTitle = "濮斿鐢ㄦ枡娓呭崟";
+ }
+ else if (HSourceBillType == '1214') {
+ HSourceTitle = "鐢熶骇鍙戞枡閫氱煡鍗�";
+ }
+ else if (HSourceBillType == '3721') {
+ HSourceTitle = "鐢熶骇澶囨枡鍗�";
+ }
+ else if (HSourceBillType == '1242') {
+ HSourceTitle = "鍑哄簱鐢宠鍗�";
+ }
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: HSourceTitle + '鍒楄〃'//鏍囬
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/鍏叡椤甸潰/Kf_SourceBillEditDlg_PDA.html?HBillType =' + HBillType + '&HSourceBillType =' + HSourceBillType + '&HStockOrgID =' + HStockOrgID, 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , end: function () {
+ if ($("#HSourceBillListCtl").val() == '1') {
+ GetMeesageBySourceBillNo();
+ $("#HSourceBillListCtl").val("0"); //鐢ㄤ簬鍖哄垎婧愬崟鍒楄〃鐣岄潰鍏抽棴鐘舵�侊紙1涓鸿繑鍥烇紝0涓洪��鍑猴級
+ }
+ }
+ })
+ });
+
+ //#endregion
+
+
+ //#region 鎵弿婧愬崟鏉＄爜
+
+ //鎵弿婧愬崟鏉＄爜
+ $('#HSourceBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageBySourceBillNo();
+ }
+ });
+
+ //婧愬崟鎸夐挳
+ form.on('submit(HSourceBillNo-BT)', function (data) {
+ GetMeesageBySourceBillNo();
+ });
+
+ //鎵弿婧愬崟鏉＄爜
+ function GetMeesageBySourceBillNo(obj) {
+ var HSourceBillNo = $('#HSourceBillNo').val()
+ var HSourceBillType = $("#HMainSourceBillType").val()
+ layer.load(3)
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_SourceBarCode_MoveStock_XiaBao_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "HMaker": HMaker, "HFIFOWhID": 0, "HOWNERID": HStockOutOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ playSound_OK();
+ HSourceFlag = true;
+ $("#HSupName").val(result.data.hSupNameField);
+ $("#HSupID").val(result.data.hSupIDField);
+ if (result.data.hDeptIDField != 0) {
+ $("#HDeptID").val(result.data.hDeptIDField);
+ $("#HDeptName").val(result.data.hDeptNameField);
+ }
+
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ if (result.data.hMulSourceFlagField == 0) {
+ $("#HSourceBillNo").attr("disabled", "disabled");
+ $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ $("#HStockStyle").val(result.data.hStockStyleField);
+ $("#HStockStyle").attr("disabled", "disabled");
+ $("#HStockInOrgID").val(result.data.hStockInOrgIDField);
+ $("#HStockInOrgID").attr("disabled", "disabled");
+ $("#HStockOutOrgID").val(result.data.hStockOutOrgIDField);
+ $("#HStockOutOrgID").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ form.render('select');
+ HStockInOrgID = $('#HStockInOrgID').val()
+ HStockOutOrgID = $('#HStockOutOrgID').val()
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '3');
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ //璋冨叆璋冨嚭缁勭粐涓庣櫥鍏ョ粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍏ヨ皟鍑轰粨搴撲粨浣嶆暟鎹�
+ if (HStockInOrgID != HStockOrgID) {
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ }
+ if (HStockOutOrgID != HStockOrgID) {
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HSCWHName").select();
+ $("#HSCWHName").focus();
+ }
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '1');
+ $("#HSourceBillNo").select();
+ $("#HSourceBillNo").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ layer.closeAll("loading");
+ }
+
+ //#endregion
+
+
+ //#region 鎵弿鐗╂枡鏉＄爜
+
+ //鎵弿鏉＄爜
+ $('#HBarCode').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageByBarCode();
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+ }
+ });
+
+ //鏉＄爜鎸夐挳
+ form.on('submit(HBarCode-BT)', function (data) {
+ GetMeesageByBarCode();
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+ });
+
+ //鎵潯鐮�
+ function GetMeesageByBarCode(obj) {
+ //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+ if ($("#HWHName").val() == '') {
+ $("#HWHID").val("0");
+ }
+ if ($("#HStockPlaceName").val() == '') {
+ $("#HStockPlaceID").val("0");
+ }
+ if ($("#HSCWHName").val() == '') {
+ $("#HSCWHID").val("0");
+ }
+ if ($("#HOutStockPlaceName").val() == '') {
+ $("#HOutStockPlaceID").val("0");
+ }
+ var sOldBarCode = $('#HBarCode').val()
+ var HDeleteFlag = sOldBarCode.substring(0, 1);
+ var sBarCode = sOldBarCode.slice(1);
+ var sHWHID = $("#HWHID").val()
+ var sHSPID = $("#HStockPlaceID").val()
+ var sHSCWHID = $("#HSCWHID").val()
+ var sHSCSPID = $("#HOutStockPlaceID").val()
+ var sHQty = $("#HQty").val()
+ var sSourceBillNo = $("#HSourceBillNo").val()
+ var sSourceBillType = $("#HMainSourceBillType").val()
+
+ if (HDeleteFlag == "*") {
+ if (sBarCode == "") {
+ playSound();
+ layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ return;
+ }
+ else {
+ $('#HBarCode').val("");
+ }
+ layer.load(3)
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillType": HBillType, "HBarCode": sBarCode },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ playSound_OK();
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(data.Message, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ playSound();
+ layer.msg('閿欒' + err, {
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ });
+ layer.closeAll("loading");
+ }
+ else {
+ var sBarCode = $('#HBarCode').val()
+ if (sBarCode == '') {
+ playSound();
+ layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ return;
+ }
+ if (sBarCode != "") {
+ $('#HBarCode').val("");
+ }
+ if (sHQty == "") {
+ sHQty = 0;
+ }
+ layer.load(3)
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_AddSource_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sBarCode": sBarCode, "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": sHSCWHID, "HSCSPID": sHSCSPID, "HQty": sHQty, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sSourceBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
+ success: function (result) {
+ if (result.count == 1) {
+ playSound_OK();
+ if (result.data.hBarTypeField == '浠撳簱鏉＄爜') {
+ $("#HSCWHName").val(result.data.hWhNameField);
+ $("#HSCWHID").val(result.data.hWhIDField);
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceID").val("0");
+ if (result.data.hSPFlagField == 0) {
+ $("#HOutStockPlaceName").attr("disabled", "disabled");
+ $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ return;//缁撴潫
+ }
+ else if (result.data.hBarTypeField == '浠撲綅鏉＄爜') {
+ $("#HOutStockPlaceName").val(result.data.hSPNameField);
+ $("#HOutStockPlaceID").val(result.data.hSPIDField);
+ $("#HSCWHName").val(result.data.hWhNameField);
+ $("#HSCWHID").val(result.data.hWhIDField);
+ return;//缁撴潫
+ }
+ else if (result.data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
+ $("#HDeptName").val(result.data.hDeptNameField);
+ $("#HDeptID").val(result.data.hDeptIDField);
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '2');//璺宠浆椤电
+ return;//缁撴潫
+ }
+ else if (result.data.hBarTypeField == '婧愬崟鏉＄爜') {
+ HSourceFlag = true;
+ $("#HSupName").val(result.data.hSupNameField);
+ $("#HSupID").val(result.data.hSupIDField);
+ if (result.data.hDeptIDField != 0) {
+ $("#HDeptID").val(result.data.hDeptIDField);
+ $("#HDeptName").val(result.data.hDeptNameField);
+ }
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ if (result.data.hSourceBillTypeField == "1402") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鍙戣揣閫氱煡鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+ else if (result.data.hSourceBillTypeField == "1243") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '璋冩嫧鐢宠鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+ else if (result.data.hSourceBillTypeField == "3720") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇鐢ㄦ枡娓呭崟' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+ else if (result.data.hSourceBillTypeField == "1604") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '濮斿鐢ㄦ枡娓呭崟' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+ else if (result.data.hSourceBillTypeField == "1214") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇鍙戞枡閫氱煡鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+ else if (result.data.hSourceBillTypeField == "3721") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇澶囨枡鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+ else if (result.data.hSourceBillTypeField == "1242") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鍑哄簱鐢宠鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+ else {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '-1' >" + '鎵嬪伐褰曞叆' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+ if (result.data.hMulSourceFlagField == 0) {
+ $("#HSourceBillNo").attr("disabled", "disabled");
+ $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ $("#HStockStyle").val(result.data.hStockStyleField);
+ $("#HStockStyle").attr("disabled", "disabled");
+ $("#HStockInOrgID").val(result.data.hStockInOrgIDField);
+ $("#HStockInOrgID").attr("disabled", "disabled");
+ $("#HStockOutOrgID").val(result.data.hStockOutOrgIDField);
+ $("#HStockOutOrgID").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ form.render('select');
+ HStockInOrgID = $('#HStockInOrgID').val()
+ HStockOutOrgID = $('#HStockOutOrgID').val()
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ //璋冨叆璋冨嚭缁勭粐涓庣櫥鍏ョ粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍏ヨ皟鍑轰粨搴撲粨浣嶆暟鎹�
+ if (HStockInOrgID != HStockOrgID) {
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ }
+ if (HStockOutOrgID != HStockOrgID) {
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HSCWHName").select();
+ $("#HSCWHName").focus();
+ }
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '3');
+ }
+ //鐗╂枡鏉＄爜
+ else {
+ if (HSourceFlag == true) {
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '3');
+ }
+ else {
+ HSourceFlag = true;
+ $("#HSupName").val(result.data.hSupNameField);
+ $("#HSupID").val(result.data.hSupIDField);
+ if (result.data.hDeptIDField != 0) {
+ $("#HDeptID").val(result.data.hDeptIDField);
+ $("#HDeptName").val(result.data.hDeptNameField);
+ }
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '璋冩嫧鐢宠鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+
+ if (result.data.hMulSourceFlagField == 0) {
+ $("#HSourceBillNo").attr("disabled", "disabled");
+ $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ $("#HStockStyle").val(result.data.hStockStyleField);
+ $("#HStockStyle").attr("disabled", "disabled");
+ $("#HStockInOrgID").val(result.data.hStockInOrgIDField);
+ $("#HStockInOrgID").attr("disabled", "disabled");
+ $("#HStockOutOrgID").val(result.data.hStockOutOrgIDField);
+ $("#HStockOutOrgID").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ form.render('select');
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ //璋冨叆璋冨嚭缁勭粐涓庣晫闈㈡墍閫夌粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍏ヨ皟鍑轰粨搴撲粨浣嶆暟鎹�
+ if (HStockInOrgID != $('#HStockInOrgID').val()) {
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ }
+ if (HStockOutOrgID != $('#HStockOutOrgID').val()) {
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HSCWHName").select();
+ $("#HSCWHName").focus();
+ }
+ HStockInOrgID = $('#HStockInOrgID').val()
+ HStockOutOrgID = $('#HStockOutOrgID').val()
+
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '3');
+ }
+ }
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ playSound();
+ layer.msg("閿欒锛�" + err, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ });
+ layer.closeAll("loading");
+ }
+ }
+
+ //#endregion
+
+
+ //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
+
+ function DisBillEntryList() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
+ 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', totalRowText: '鍚堣' });
+ 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 if (data[i].name == '鐗╂枡浠ｇ爜') {
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'left', 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':
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ default:
+
+ if (data[i].name == '鏁伴噺' || data[i].name == '婧愬崟鏁伴噺' || data[i].name == '鏉＄爜涓暟') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
+ } else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
+ }
+ }
+ }
+ }
+ columns = col;
+ listOption.cols = [columns];
+ listOption.data = result.data.Materlist;
+ listOption.totalRow = true;
+ table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(listOption);
+ if (result.data.FIFOlist.length != 0) {
+ if (result.data.FIFOlist[0].HMaterID != 0) {
+ FIFOListOption.data = result.data.FIFOlist;
+ table.cache['FIFOList-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(FIFOListOption);
+ }
+ }
+
+ //鏉＄爜淇℃伅
+ $("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);
+ if ($("#HBarCode_B").val() == '') {
+ $("#HMaterName_B").val("");
+ $("#HMaterModel_B").val("");
+ $("#HBatchNo_B").val("");
+ $("#HUnitName_B").val("");
+ $("#HQty_B").val("");
+ $("#HTMQty_B").val("");
+ $("#HWHName_B").val("");
+ $("#HSPName_B").val("");
+ $("#HSCWHName_B").val("");
+ $("#HSCSPName_B").val("");
+ }
+ else {
+ $("#HMaterName_B").val(result.data.BarCodeDetailslist[0].HMaterName);
+ $("#HMaterModel_B").val(result.data.BarCodeDetailslist[0].HMaterModel);
+ $("#HBatchNo_B").val(result.data.BarCodeDetailslist[0].HBatchNo);
+ $("#HUnitName_B").val(result.data.BarCodeDetailslist[0].HUnitName);
+ $("#HQty_B").val(result.data.BarCodeDetailslist[0].HQty);
+ $("#HTMQty_B").val(result.data.BarCodeDetailslist[0].HTMQty);
+ $("#HWHName_B").val(result.data.BarCodeDetailslist[0].HWHName);
+ $("#HSPName_B").val(result.data.BarCodeDetailslist[0].HSPName);
+ $("#HSCWHName_B").val(result.data.BarCodeDetailslist[0].HSCWHName);
+ $("#HSCSPName_B").val(result.data.BarCodeDetailslist[0].HSCSPName);
+ }
+ }
+ 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 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
+
+ //鏉＄爜淇℃伅
+ $("#HBarCode_B").val("");
+ $("#HMaterName_B").val("");
+ $("#HMaterModel_B").val("");
+ $("#HBatchNo_B").val("");
+ $("#HUnitName_B").val("");
+ $("#HQty_B").val("");
+ $("#HTMQty_B").val("");
+ $("#HWHName_B").val("");
+ $("#HSPName_B").val("");
+ $("#HSCWHName_B").val("");
+ $("#HSCSPName_B").val("");
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+
+ //#endregion
+
+
+ //#region 閫夋嫨璋冩嫧绫诲瀷
+ form.on('select(HStockStyle)', function (data) {
+ if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�') {
+ $("#HStockInOrgID").attr("disabled", false);
+ form.render('select');
+ //娓呯┖璋冨叆浠撳簱浠撲綅鏁版嵁
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ }
+ else {
+ $("#HStockInOrgID").val(sessionStorage["OrganizationID"]);
+ $("#HStockInOrgID").attr("disabled", true);
+ form.render('select');
+ if (HStockInOrgID != $('#HStockInOrgID').val()) {
+ HStockInOrgID = $('#HStockInOrgID').val()
+ //娓呯┖璋冨叆浠撳簱浠撲綅鏁版嵁
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ }
+ }
+ });
+
+ //#endregion
+
+
+ //#region 閫夋嫨璋冨叆缁勭粐
+ form.on('select(HStockInOrgID)', function (data) {
+ HStockInOrgID = $('#HStockInOrgID').val()
+ //娓呯┖璋冨叆浠撳簱浠撲綅鏁版嵁
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ });
+
+ //#endregion
+
+
+
+ });
+
+ //浠ヤ笂涓簂ayui妯″潡
+ //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖璋冨嚭浠撳簱淇℃伅
+ function GetHSCWHNAMEValue(obj)
+ {
+ if (obj.length > 0) {
+ $("#HSCWHName").val(obj[0].HName);
+ $("#HSCWHID").val(obj[0].HItemID);
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceID").val("0");
+ if (obj[0].HSPFlag == 0) {
+ $("#HOutStockPlaceName").attr("disabled", "disabled");
+ $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ }
+ }
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖璋冨嚭浠撲綅淇℃伅
+ function GetHOutStockPlaceIDValue(obj) {
+ if (obj.length > 0) {
+ $("#HOutStockPlaceName").val(obj[0].HName);
+ $("#HOutStockPlaceID").val(obj[0].HItemID);
+ $("#HSCWHName").val(obj[0].HWhName);
+ $("#HSCWHID").val(obj[0].HWHID);
+ }
+ }
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖璋冨叆浠撳簱淇℃伅
+ 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);
+ }
+ }
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖淇濈淇℃伅
+ function GetHKeeperValue(obj) {
+ if (obj.length > 0) {
+ $("#HKeeperName").val(obj[0].HName);
+ $("#HKeeperID").val(obj[0].HItemID);
+ }
+ }
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖楠屾敹淇℃伅
+ function GetHSecManagerValue(obj) {
+ if (obj.length > 0) {
+ $("#HSecManagerName").val(obj[0].HName);
+ $("#HSecManagerID").val(obj[0].HItemID);
+ }
+ }
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖閮ㄩ棬淇℃伅
+ function GetHDeptNameValue(obj) {
+ if (obj.length > 0) {
+ $("#HDeptName").val(obj[0].HName);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
+ }
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖瀹㈡埛淇℃伅
+ function GetHSupValue(obj) {
+ if (obj.length > 0) {
+ $("#HSupName").val(obj[0].HName);
+ $("#HSupID").val(obj[0].HItemID);
+ }
+ }
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖婧愬崟鍗曞彿
+ function GetHSourceBillValue(obj) {
+ if (obj.length > 0) {
+ $("#HSourceBillNo").val(obj[0].鍗曟嵁鍙�);
+ $("#HSourceBillListCtl").val("1");
+ }
+ }
+
+ //鍗曟嵁涓婁紶鍓嶅垽鏂�
+ function AllowLoadData(sSubStr) {
+ if (HInterID == 0) {
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (HBillNo == '') {
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (sSubStr.length == 0) {
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ //鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
+ else {
+ var s = 0;
+ for (var i = 0; i <= sSubStr.length - 1; i++) {
+ if (sSubStr[i].鏁伴噺 > 0) {
+ s = 1;
+ }
+ }
+ if (s == 0) {
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ }
+ return true;
+ }
+ </script>
+
+</body>
+</html>
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index 7ceb063..03eca5e 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -159,6 +159,12 @@
<cite style="white-space:pre-wrap">ERP鍙婃椂搴撳瓨鏌ヨ</cite>
</a>
</li>
+ <li class="layui-col-xs3">
+ <a href="../WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBill_PDA_XiaBao.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-template-1"></i>
+ <cite style="white-space:pre-wrap">涓撶敤璋冩嫧</cite>
+ </a>
+ </li>
</ul>
</div>
</div>
@@ -360,6 +366,12 @@
<cite style="white-space:pre-wrap">瀹㈡埛鏉＄爜鎵爜璁板綍鍗�</cite>
</a>
</li>
+ <li class="layui-col-xs3">
+ <a href="../WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBillList_PDA_XiaBao.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-template-1"></i>
+ <cite style="white-space:pre-wrap">涓撶敤璋冩嫧缂撳瓨</cite>
+ </a>
+ </li>
</ul>
</div>
</div>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index 9a2d54d..ef6f3c2 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -202,7 +202,7 @@
var closeType = params[params[3]]; //鍏抽棴绫诲瀷
}
-
+ var OptionData = [];
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -1780,7 +1780,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
, btn1: function (index, layero) {
@@ -1805,8 +1805,16 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
-
- }
+ if (OptionData.length > 0) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HEmpID": OptionData[0].HItemID
+ , "HEmpNumber": OptionData[0].鑱屽憳浠ｇ爜
+ , "HEmpName": OptionData[0].鑱屽憳鍚嶇О
+ })
+ OptionData = [];
+ }
+ }
});
}
//鐝粍浠ｇ爜
@@ -1958,6 +1966,12 @@
});
+
+ //鎿嶄綔鍛�
+ function GetHEmpValue(obj) {
+ OptionData = obj;
+ }
+
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Department.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Department.html"
index 6c99be9..a517fba 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Department.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Department.html"
@@ -13,6 +13,7 @@
<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>
<style>
.layui-form-item .layui-inline {
margin-top: 5px;
@@ -34,6 +35,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
</div>
</div>
@@ -42,6 +44,7 @@
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
<li>鍏朵粬淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -71,7 +74,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">绂佺敤鏍囪</label>
<div class="layui-input-inline">
- <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
+ <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤" disabled>
<input type="hidden" value="false" name="HStopflag" id="HStopflag">
</div>
</div>
@@ -96,27 +99,89 @@
</div>
</div>
- <div class="layui-tab-item">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璐熻矗浜�</label>
- <div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HEmpID" id="HEmpID" value="0">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <div class="layui-tab-item">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璐熻矗浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏉″舰鐮侊細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HBarCode" id="HBarCode" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏄惁鐢熶骇杞﹂棿锛�</label>
+ <div class="layui-input-inline">
+ <select name="HWorkShopFlag" id="HWorkShopFlag" lay-verify="HWorkShopFlag">
+ <option value="true">鏄�</option>
+ <option value="false">鍚�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閮ㄩ棬浜烘暟锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HEmpQtys" id="HEmpQtys" autocomplete="off" value="0">
+ </div>
+ </div>
+ <input id="HItemID" name="HItemID" type="hidden" />
+ <!--<input id="HParentID" name="HParentID" type="hidden" value="0" />-->
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+ </div>
</div>
</div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏉″舰鐮侊細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HBarCode" id="HBarCode" autocomplete="off">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HStopDate" id="HStopDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
</div>
- <input id="HItemID" name="HItemID" type="hidden" />
- <!--<input id="HParentID" name="HParentID" type="hidden" value="0" />-->
</div>
</div>
+ </div>
</div>
</div>
</form>
@@ -173,6 +238,21 @@
$("#HItemID").val(0);
//绂佺敤缁勭粐閫夐」
$("#HUSEORGID").attr("disabled", true);
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ } else if (OperationType == 2) {//澶嶅埗
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ $("#HItemID").val(0);
+ $("#HNumber").val('');
+ $("#HName").val('');
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HCheckEmp").val('');
+ $("#HCheckDate").val('');
+ $("#HStopEmp").val('');
+ $("#HStopDate").val('');
}
else if (OperationType == 3) {//缂栬緫
//绂佺敤缁勭粐閫夐」
@@ -239,6 +319,11 @@
set_SaveBill(data);
});
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
+
//#endregion
@@ -284,6 +369,7 @@
$.ajax({
url: GetWEBURL() + "Gy_Department/cx",
type: "GET",
+ async: false,
data: {
"HInterID": linterid
},
@@ -317,6 +403,14 @@
//, "HCreateDate": data.鍒涘缓鏃ユ湡
//, "HUpDater": data.淇敼浜�
//, "HUpDateDate": data.淇敼鏃ユ湡
+ , "HMakeEmp": data["鍒涘缓浜�"]
+ , "HMakeDate": data["鍒涘缓鏃ユ湡"] == null ? "" : Format(new Date(data["鍒涘缓鏃ユ湡"]), "yyyy-MM-dd")
+ , "HCheckEmp": data["瀹℃牳浜�"]
+ , "HCheckDate": data["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+ , "HStopEmp": data["绂佺敤浜�"]
+ , "HStopDate": data["绂佺敤鏃ユ湡"] == null ? "" : Format(new Date(data["绂佺敤鏃ユ湡"]), "yyyy-MM-dd")
+ , "HEmpQtys": data["閮ㄩ棬浜烘暟"]
+ , "HWorkShopFlag": (data["鏄惁鐢熶骇杞﹂棿"]+"")
});
layer.close(ajaxLoad);
} else {
@@ -330,6 +424,31 @@
});
}
//#endregion
+
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Department/AuditGy_Department',
+ type: "GET",
+ data: { "HInterID": $("#HItemID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
@@ -383,7 +502,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鑱屽憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?HType=HEmp', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -414,6 +533,10 @@
//浠ヤ笂鏄痩ayui妯″潡
});
+ function GetHEmpValue(obj) {
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Unit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Unit.html"
index 6ffbfe6..4eecdb8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Unit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Unit.html"
@@ -20,19 +20,20 @@
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
-
+
</div>
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <!--<ul class="layui-tab-title">
- <li class="layui-this">鍩烘湰淇℃伅</li>-->
- <!--<li>鍏朵粬淇℃伅</li>-->
- <!--</ul>-->
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
+ </ul>
<h1 style="text-align:center;"><b>璁￠噺鍗曚綅</b></h1>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -62,7 +63,7 @@
<div class="layui-col-xs4">
<label class="layui-form-label">鎹㈢畻姣斿垪锛�</label>
<div class="layui-input-inline">
- <input type="text" name="HRate" id="HRate" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="HRate" id="HRate" lay-verify="" autocomplete="off" class="layui-input" value="1">
</div>
</div>
@@ -74,9 +75,19 @@
</div>
</div>
<div class="layui-col-xs4">
+ <label class="layui-form-label">璁￠噺鍗曚綅缁�</label>
+ <div class="layui-input-inline">
+ <input type="text" readonly name="HUnitGroupName" id="HUnitGroupName" class="layui-input" value="" style="float: left; width: 150px;">
+ <input type="hidden" name="HUnitGroupID" id="HUnitGroupID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitGroupList" id="HUnitGroupList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
<label class="layui-form-label"> 绂佺敤鏍囧織:</label>
<div class="layui-input-inline">
- <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="">
+ <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="" disabled>
<input type="hidden" value="false" name="HStopflag" id="HStopflag">
</div>
</div>
@@ -95,6 +106,54 @@
</div>
</div>
</div>
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HStopDate" id="HStopDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -109,6 +168,9 @@
<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/PageTitle.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script>
//鑾峰彇鍙傛暟
@@ -126,7 +188,7 @@
var params = getUrlVars();
- var hID = params[params[0]];//缂栬緫鏌ョ湅
+ /*var hID = params[params[0]];//缂栬緫鏌ョ湅*/
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -138,6 +200,14 @@
, table = layui.table
, form = layui.form
, element = layui.element;
+
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var hID = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ }
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
@@ -179,6 +249,14 @@
, "HStandard": data.榛樿鏍囪
, "HStopflag": data.绂佺敤鏍囪
, "HRemark": data.澶囨敞
+ , "HUnitGroupID": data.HUnitGroupID
+ , "HUnitGroupName": data.璁￠噺鍗曚綅缁勫悕绉�
+ , "HMakeEmp": data["鍒涘缓浜�"]
+ , "HMakeDate": data["鍒涘缓鏃ユ湡"] == null ? "" : Format(new Date(data["鍒涘缓鏃ユ湡"]), "yyyy-MM-dd")
+ , "HCheckEmp": data["瀹℃牳浜�"]
+ , "HCheckDate": data["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+ , "HStopEmp": data["绂佺敤浜�"]
+ , "HStopDate": data["绂佺敤鏃ユ湡"] == null ? "" : Format(new Date(data["绂佺敤鏃ユ湡"]), "yyyy-MM-dd")
});
} else {
@@ -198,14 +276,28 @@
var shijian = year + "-" + month + "-" + day;
//鍒ゆ柇鏄惁鏂板
- if (hID == 1) {
+ if (OperationType == 1) {
//id new
$("#HItemID").val(0);
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ } else if (OperationType == 2) {//澶嶅埗
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(hID);
+ $("#HItemID").val(0);
+ $("#HNumber").val('');
+ $("#HName").val('');
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HCheckEmp").val('');
+ $("#HCheckDate").val('');
+ $("#HStopEmp").val('');
+ $("#HStopDate").val('');
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
$("#HItemID").val(hID);//淇敼鏃朵富琛↖D
RoadBillMain(hID);
-
/* RoadBillSub(linterid);*/
}
//绂佺敤鏍囧織
@@ -218,83 +310,32 @@
$("#HStandard").val(data.elem.checked);
});
- //閫夋嫨浜у搧寮圭獥
- form.on('submit(HMateria-BT)', function () {//浜у搧
+ //閫夋嫨璁￠噺鍗曚綅缁�
+ form.on('submit(HUnitGroupList)', function () {//閫夋嫨璁￠噺鍗曚綅缁�
layer.open({
type: 2
- , area: ['80%', '80%']
- , title: '鐗╂枡'
- , shade: 0.6 //閬僵閫忔槑搴�
- //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
- , resize: false
- , cancel: function (index, layero) {
- }
- })
- });
- //閫夋嫨宸ュ簭
- form.on('submit(HProc-BT)', function () {//閫夋嫨宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , cancel: function (index, layero) {
- }
- })
- });
-
- //閫夋嫨渚涘簲鍟�
- form.on('submit(HSupID-BT)', function () {//閫夋嫨渚涘簲鍟�
- layer.open({
- type: 2
- , area: ['666px', '666px']
- , title: '渚涘簲鍟嗗垪琛�'
+ , area: ['90%', '90%']//澶у皬
+ , title: '璁￠噺鍗曚綅缁勫垪琛�'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitGroup.html', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
}
- })
- });
-
- //閫夋嫨閮ㄩ棬
- form.on('submit(HDepart-BT)', function () {//閫夋嫨閮ㄩ棬
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '閮ㄩ棬鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
- , resize: false
- , cancel: function (index, layero) {
+ , 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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HUnitGroupName").val(checkStatus.data[0].璁￠噺鍗曚綅缁�);
+ $("#HUnitGroupID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
- })
- });
- //閫夋嫨鍗曚綅
- form.on('submit(HUnitID-BT)', function () {//閫夋嫨鍗曚綅
- layer.open({
- type: 2
- , area: ['666px', '666px']
- , title: '鍗曚綅鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
+ , btn2: function (index, layero) { }
})
});
@@ -358,12 +399,16 @@
form.on('submit(Exit)', function (data) {//閫�鍑�
});
-
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
form.on('submit(Cancel)', function () {
//sessionStorage["SourceFlag"] = false;
if (hID == null || hID == 0) {
- parent.location.href = "../../../views/index.html"
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
}
else {
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
@@ -389,6 +434,10 @@
layer.msg("璇疯緭鍏ユ崲绠楁瘮渚嬶紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+ if (!(/^(0(\.\d+)?|([1-9]\d*)(\.\d+)?)$/.test($("#HRate").val()) && parseFloat($("#HRate").val()) > 0)) {
+ layer.msg("璇疯緭鍏ュぇ浜�0鐨勬崲绠楁瘮渚嬶紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
var HRate = $("#HRate").val();
sMainStr += ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] + ';' + HRate;
@@ -403,6 +452,17 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ $("#HItemID").val(data.data);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function (index) {
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ layer.close(index);
+ set_CheckBillNoLayer();
+ }
+ else {
+ layer.close(index);
+ }
+ });
}
else {
f_alert(data.Message);
@@ -433,6 +493,52 @@
}
});
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Unit/AuditGy_Unit',
+ type: "GET",
+ data: { "HInterID": $("#HItemID").val(), "Type": 1, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ //瀹℃牳鏃犲脊妗�
+ function set_CheckBillNoLayer() {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Unit/AuditGy_Unit',
+ type: "GET",
+ data: { "HInterID": $("#HItemID").val(), "Type": 1, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg("瀹℃牳鎴愬姛", { icon: 1 });
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ }
});
//瀹氫箟鍏ㄥ眬鍙橀噺
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
index 75b9a13..2c15334 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
@@ -13,6 +13,8 @@
<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/PageTitle.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<style>
.layui-form-item .layui-inline {
margin-top: 5px;
@@ -34,6 +36,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
</div>
</div>
@@ -42,6 +45,7 @@
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
<li>鍏朵粬淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -83,7 +87,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">浠撳簱绫诲瀷</label>
<div class="layui-input-inline">
- <select name="HWarehouseType" id="HWarehouseType" lay-verify="required" >
+ <select name="HWarehouseType" id="HWarehouseType" lay-verify="required">
<option value="鐢熶骇浠撳簱" selected="selected">鐢熶骇浠撳簱</option>
<option value="妯″叿浠撳簱">妯″叿浠撳簱</option>
</select>
@@ -95,7 +99,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">绂佺敤鏍囪</label>
<div class="layui-input-inline">
- <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
+ <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤" disabled>
<input type="hidden" value="false" name="HStopflag" id="HStopflag">
</div>
</div>
@@ -146,6 +150,53 @@
</div>
</div>
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HStopDate" id="HStopDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ </div>
</div>
<input id="HItemID" name="HItemID" type="hidden" value="0" />
<input id="HBarCode" name="HBarCode" type="hidden" value="0" />
@@ -208,6 +259,21 @@
$("#HItemID").val(0);
//绂佺敤缁勭粐閫夐」
$("#HUSEORGID").attr("disabled", true);
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ } else if (OperationType == 2) {//澶嶅埗
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ $("#HItemID").val(0);
+ $("#HNumber").val('');
+ $("#HName").val('');
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HCheckEmp").val('');
+ $("#HCheckDate").val('');
+ $("#HStopEmp").val('');
+ $("#HStopDate").val('');
}
else if (OperationType == 3) {//缂栬緫
//绂佺敤缁勭粐閫夐」
@@ -289,7 +355,10 @@
form.on('submit(set_SaveBill)', function (data) {
set_SaveBill(data);
});
-
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
//#endregion
@@ -334,6 +403,7 @@
$.ajax({
url: GetWEBURL() + "Gy_Warehouse/cx",
type: "GET",
+ async: false,
data: {
"HInterID": linterid
},
@@ -385,6 +455,12 @@
//, "HMaker": data.HMaker
//, "HCreateDate": data.鍒涘缓鏃ユ湡
, "HUpDater": sessionStorage["HUserName"]
+ , "HMakeEmp": data["鍒涘缓浜�"]
+ , "HMakeDate": data["鍒涘缓鏃ユ湡"] == null ? "" : Format(new Date(data["鍒涘缓鏃ユ湡"]), "yyyy-MM-dd")
+ , "HCheckEmp": data["瀹℃牳浜�"]
+ , "HCheckDate": data["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+ , "HStopEmp": data["绂佺敤浜�"]
+ , "HStopDate": data["绂佺敤鏃ユ湡"] == null ? "" : Format(new Date(data["绂佺敤鏃ユ湡"]), "yyyy-MM-dd")
//, "HUpDateDate": data.淇敼鏃ユ湡
});
layer.close(ajaxLoad);
@@ -399,6 +475,32 @@
});
}
//#endregion
+
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Warehouse/AuditGy_Warehouse',
+ type: "GET",
+ data: { "HInterID": $("#HItemID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
@@ -450,7 +552,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鑱屽憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -481,6 +583,10 @@
//浠ヤ笂鏄痩ayui妯″潡
});
+ function GetHEmpValue(obj) {
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkStationList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkStationList.html"
index eccab37..ced410a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkStationList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkStationList.html"
@@ -35,58 +35,115 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
</div>
</div>
<div class="layui-form-item" style="padding-top: 10px;">
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸ヤ綅浠ｇ爜</label>
- <div class="layui-input-inline">
- <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
- <input type="hidden" name="HUSEORGID" id="HUSEORGID" value="">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ヤ綅浠ｇ爜</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
+ <input type="hidden" name="HUSEORGID" id="HUSEORGID" value="">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ヤ綅鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍔╄鐮侊細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">绂佺敤鏍囪</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
+ <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍒涘缓缁勭粐</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID" autocomplete="off" placeholder="" class="layui-input" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ <input id="HItemID" name="HItemID" type="hidden" value="0" />
+ <input id="HBarCode" name="HBarCode" type="hidden" value="0" />
+ <input id="HParentID" name="HParentID" type="hidden" value="0" />
+ <input id="HUpDater" name="HUpDater" type="hidden" value="0" />
+ <input id="HShortNumber" name="HShortNumber" type="hidden" />
</div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸ヤ綅鍚嶇О</label>
- <div class="layui-input-inline">
- <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍔╄鐮侊細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒涘缓浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒涘缓鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeTime" id="HMakeTime" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HStopTime" id="HStopTime" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HCheckTime" id="HCheckTime" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">绂佺敤鏍囪</label>
- <div class="layui-input-inline">
- <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
- <input type="hidden" value="false" name="HStopflag" id="HStopflag">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍒涘缓缁勭粐</label>
- <div class="layui-input-inline">
- <input type="text" name="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID" autocomplete="off" placeholder="" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
- </div>
- </div>
- </div>
- </div>
- <input id="HItemID" name="HItemID" type="hidden" value="0" />
- <input id="HBarCode" name="HBarCode" type="hidden" value="0" />
- <input id="HParentID" name="HParentID" type="hidden" value="0" />
- <input id="HUpDater" name="HUpDater" type="hidden" value="0" />
- <input id="HShortNumber" name="HShortNumber" type="hidden" />
+
+
+ </div>
+
</form>
</div>
</div>
@@ -134,6 +191,16 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$("#HItemID").val(0);
+ $("#HMakeEmp").val(sessionStorage["HMaker"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
+ $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+ } else if (OperationType == 2) {//澶嶅埗
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ $("#HItemID").val(0);
+ $("#HNumber").val('');
+ $("#HName").val('');
+ $("#HMakeEmp").val(sessionStorage["HMaker"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
+ $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
}
else if (OperationType == 3) {//缂栬緫
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
@@ -151,7 +218,6 @@
}
$("#HUSEORGID").val(sessionStorage["OrganizationID"]);
$("#HCREATEORGID").val(sessionStorage["OrganizationID"])
- $('#HMakeTime').val(Format(new Date(), "yyyy-MM-dd"))
//#endregion
@@ -176,11 +242,42 @@
form.on('submit(set_SaveBill)', function (data) {
set_SaveBill(data);
});
-
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
//#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var HInterID = $("#HItemID").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_WorkStation/AuditGy_WorkStation", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
//#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
function get_LoginIs() {
@@ -199,6 +296,7 @@
$.ajax({
url: GetWEBURL() + "Gy_WorkStationBill/cx",
type: "GET",
+ async:false,
data: {
"HInterID": linterid
},
@@ -217,6 +315,12 @@
, "HHelpCode": data.鍔╄鐮�
, "HRemark": data.澶囨敞
, "HCREATEORGID": data.鍒涘缓缁勭粐
+ , "HMakeEmp": data.鍒涘缓浜� == "" ? sessionStorage["HMaker"] : data.鍒涘缓浜�
+ , "HMakeTime": data.鍒涘缓鏃ユ湡 == null ? "" : Format(new Date(data.鍒涘缓鏃ユ湡), "yyyy-MM-dd")
+ , "HStopEmp": data.绂佺敤浜�
+ , "HStopTime": data.绂佺敤鏃ユ湡 == null ? "" : Format(new Date(data.绂佺敤鏃ユ湡), "yyyy-MM-dd")
+ , "HCheckEmp": data.瀹℃牳浜�
+ , "HCheckTime": data.瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd")
});
layer.close(ajaxLoad);
} else {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index 299ccfa..068e7f0 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -148,6 +148,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></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="set_AddNew" id="set_add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_show"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn_audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
@@ -224,6 +225,9 @@
switch (obj.event) {
//鏂板
case 'set_AddNew': set_AddNew();
+ break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
@@ -651,6 +655,34 @@
}
//#endregion
+ //#region 澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶嶅埗-閮ㄩ棬鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Department.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
//#region 缂栬緫
function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -674,7 +706,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1&&data[0].瀹℃牳浜�==="") {
var ItemID = data[0].HItemID.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -706,7 +738,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
@@ -1166,8 +1198,14 @@
var addSWhere = "";
if (openType != "undefined" && HOrgName != "undefined") {
- addSWhere = " and 绂佺敤鏍囪 = '' and 瀹℃牳浜� !=''";
- Organization = HOrgName.toString();
+ if (openType == 1) {
+ /*addSWhere = " and 绂佺敤鏍囪 = '' and 瀹℃牳浜� !='' and 杞﹂棿鏍囪 = 'Y' " ;*/
+ addSWhere = " and 绂佺敤鏍囪 = '' and 杞﹂棿鏍囪 = 'Y' ";
+ Organization = HOrgName.toString();
+ } else {
+ addSWhere = " and 绂佺敤鏍囪 = '' ";
+ Organization = HOrgName.toString();
+ }
}
return addSWhere;
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 71e5d01..32d1696 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -49,15 +49,16 @@
<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>
- <div class="layui-inline">
- <label class="layui-form-label">鑱屽憳浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-inline">
+ <label class="layui-form-label">鑱屽憳浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
@@ -147,6 +148,7 @@
<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
<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-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
@@ -218,8 +220,7 @@
//鍔犺浇鏁版嵁鍒扮綉鏍�
//鏍规嵁椤甸潰鐨勬墦寮�鏂瑰紡锛屽垽鏂繃婊ゆ潯浠舵槸鍚﹂渶瑕佽繘琛岄澶栫殑娣诲姞
- addSWhereByOpenType();
- get_Display(sWhere);
+ get_FastQuery();
//#endregion
@@ -234,6 +235,9 @@
//鏂板鎸夐挳
case 'btn-Add':
set_AddNew();
+ break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
break;
case 'btn-Edit':
set_ShowBill();
@@ -698,6 +702,34 @@
}
//#endregion
+ //#region 澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶嶅埗-鑱屽憳璁剧疆'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
//#region 缂栬緫鍗曟嵁
function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -999,7 +1031,7 @@
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgID = params[params[1]];
var DeptName = params[params[2]];
- if (openType != "undefined") {
+ if (typeof (openType) != "undefined") {
sWhere += " and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' ";
DeptName = decodeURI(DeptName);//瀵筓RI 杩涜瑙ｇ爜
if (DeptName != "undefined") {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html"
index 5bcc6ab..9ccb07a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html"
@@ -36,14 +36,16 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
</div>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
- <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
- <li lay-id="3" style="padding:1px;">闄勪欢涓婁紶</li>
+ <li lay-id="2" style="padding:1px;">浜轰簨淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鍏朵粬淇℃伅</li>
+ <li lay-id="4" style="padding:1px;">闄勪欢涓婁紶</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -79,364 +81,31 @@
</div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鎬у埆</label>
- <div class="layui-input-inline">
- <div class="layui-form">
- <div class="layui-form-item">
- <select name="HSex" id="HSex" lay-verify="HSex">
- <option value="鐢�">鐢�</option>
- <option value="濂�">濂�</option>
- </select>
- </div>
- </div>
-
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍑虹敓骞存湀</label>
- <div class="layui-input-inline">
- <!--<input class="layui-input" name="HBirthDay" id="HBirthDay" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">-->
- <input type="date" class="layui-input" name="HBirthDay" id="HBirthDay" style="width:190px;">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">骞撮緞</label>
- <div class="layui-input-inline">
- <input type="text" name="HAge" id="HAge" lay-verify="HAge" autocomplete="off" class="layui-input">
- </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ョ</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HWorkTypeName" id="HWorkTypeName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWorkTypeID" id="HWorkTypeID" value="0">
+ <input type="hidden" name="HWorkTypeNumber" id="HWorkTypeNumber" value="">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkTypeID-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">绫嶈疮</label>
- <div class="layui-input-inline">
- <input type="text" name="HBlighty" id="HBlighty" lay-verify="HBlighty" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">姘戞棌</label>
- <div class="layui-input-inline">
- <input type="text" name="HNation" id="HNation" lay-verify="HNation" autocomplete="off" class="layui-input">
- </div>
- </div>
-
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鎴风睄绫诲埆</label>
- <div class="layui-input-inline">
- <div class="layui-form">
- <div class="layui-form-item">
- <select name="HBlightyType" id="HBlightyType" lay-verify="HBlightyType">
- <option value="鏈湴">鏈湴</option>
- <option value="澶栧湴">澶栧湴</option>
- </select>
- </div>
- </div>
- </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏍哥畻鏂瑰紡</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCTPrjName" readonly id="HCTPrjName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HCTPrjID" id="HCTPrjID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCTPrjID-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏀挎不闈㈣矊</label>
- <div class="layui-input-inline">
- <div class="layui-form">
- <div class="layui-form-item">
- <select name="HGovStatus" id="HGovStatus" lay-verify="HGovStatus">
- <option value="缇や紬">缇や紬</option>
- <option value="鍥㈠憳">鍥㈠憳</option>
- <option value="鍏氬憳">鍏氬憳</option>
- <option value="鍏朵粬鍏氭淳">鍏朵粬鍏氭淳</option>
- </select>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">瀛﹀巻</label>
- <div class="layui-input-inline">
-
- <div class="layui-form">
- <div class="layui-form-item">
- <select name="HKnowLev" id="HKnowLev" lay-verify="HKnowLev">
- <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>
- </select>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">濠氬Щ鐘跺喌</label>
- <div class="layui-input-inline">
- <div class="layui-form">
- <div class="layui-form-item">
- <select name="HMarr" id="HMarr" lay-verify="HMarr">
- <option value="鏈">鏈</option>
- <option value="宸插">宸插</option>
- <option value="绂诲紓">绂诲紓</option>
- </select>
- </div>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">妗ｆ缂栧彿</label>
- <div class="layui-input-inline">
- <input type="text" name="HArchivesNo" id="HArchivesNo" lay-verify="HArchivesNo" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鑱岀О</label>
- <div class="layui-input-inline">
- <input type="text" name="HProTitleID" id="HProTitleID" lay-verify="HProTitleID" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">钖祫绛夌骇</label>
- <div class="layui-input-inline">
- <input type="text" name="HSalaryLev" id="HSalaryLev" lay-verify="HSalaryLev" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">姣曚笟瀛︽牎</label>
- <div class="layui-input-inline">
- <input type="text" name="HGradSchool" id="HGradSchool" lay-verify="HGradSchool" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">姣曚笟鏃堕棿</label>
- <div class="layui-input-inline">
- <input type="date" class="layui-input" name="HGradDate" id="HGradDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">瀹胯垗</label>
- <div class="layui-input-inline">
- <input type="text" name="HDormName" id="HDormName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HDormID" id="HDormID" value="0">
- <input type="hidden" name="HDormNumber" id="HDormNumber" value="">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HDormID-BT" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
-
- </div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">澶栬姘村钩</label>
- <div class="layui-input-inline">
- <div class="layui-form">
- <div class="layui-form-item">
- <select name="HEngLev" id="HEngLev" lay-verify="HEngLev">
- <option value="鏃�">鏃�</option>
- <option value="涓�鑸�">涓�鑸�</option>
- <option value="鐔熸倝">鐔熸倝</option>
- <option value="绮鹃��">绮鹃��</option>
- </select>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璁＄畻鏈烘按骞�</label>
- <div class="layui-input-inline">
- <div class="layui-form">
- <div class="layui-form-item">
- <select name="HCompLev" id="HCompLev" lay-verify="HCompLev">
- <option value="鏃�">鏃�</option>
- <option value="涓�鑸�">涓�鑸�</option>
- <option value="鐔熸倝">鐔熸倝</option>
- <option value="绮鹃��">绮鹃��</option>
- </select>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓撲笟</label>
- <div class="layui-input-inline">
- <input type="text" name="HSpec" id="HSpec" lay-verify="HSpec" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs8 layui-inline">
- <label class="layui-form-label" style="width: 12.5%;">鐜颁綇鍦板潃</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HNowAdd" id="HNowAdd" autocomplete="off" style=" width: 90%;">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鐢靛瓙閭</label>
- <div class="layui-input-inline">
- <input type="text" name="HEmail" id="HEmail" lay-verify="HEmail" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs8 layui-inline">
- <label class="layui-form-label" style="width: 12.5%;">瀹跺涵鍦板潃</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HHomeAdd" id="HHomeAdd" autocomplete="off" style=" width: 90%;">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閭斂缂栫爜</label>
- <div class="layui-input-inline">
- <input type="text" name="HPostalCode" id="HPostalCode" lay-verify="HPostalCode" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs8 layui-inline">
- <label class="layui-form-label" style="width: 12.5%;">鍘熷叕鍙�</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HOldCompany" id="HOldCompany" autocomplete="off" style=" width: 90%;">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鑱旂郴鐢佃瘽</label>
- <div class="layui-input-inline">
- <input type="text" name="HLinkPhone" id="HLinkPhone" lay-verify="HLinkPhone" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鎵嬫満鍙风爜</label>
- <div class="layui-input-inline">
- <input type="text" name="HMobilePhone" id="HMobilePhone" lay-verify="HMobilePhone" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鐢ㄥ伐绫诲瀷</label>
- <div class="layui-input-inline">
- <div class="layui-form">
- <div class="layui-form-item">
- <select name="HWorkType" id="HWorkType" lay-verify="HWorkType">
- <option value="涓存椂宸�">涓存椂宸�</option>
- <option value="鍚堝悓宸�">鍚堝悓宸�</option>
- <option value="椤跺矖宸�">椤跺矖宸�</option>
- <option value="鍏朵粬">鍏朵粬</option>
- </select>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸ョ</label>
- <div class="layui-input-inline">
- <input type="text" name="HWorkTypeName" id="HWorkTypeName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HWorkTypeID" id="HWorkTypeID" value="0">
- <input type="hidden" name="HWorkTypeNumber" id="HWorkTypeNumber" value="">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkTypeID-BT" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">杩涘巶鏃ユ湡</label>
- <div class="layui-input-inline">
- <input type="date" class="layui-input" name="HInComDate" id="HInComDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">杞鏃ユ湡</label>
- <div class="layui-input-inline">
- <input type="date" class="layui-input" name="HRelDate" id="HRelDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">淇濋櫓璇佺紪鍙�</label>
- <div class="layui-input-inline">
- <input type="text" name="HInsuranceNo" id="HInsuranceNo" lay-verify="HInsuranceNo" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍙備繚</label>
- <div class="layui-input-inline">
- <div class="layui-form">
- <div class="layui-form-item">
- <select name="HInsuranceStatus" id="HInsuranceStatus" lay-verify="HInsuranceStatus">
- <option value="true">鏄�</option>
- <option value="false">鍚�</option>
- </select>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍙備繚鏃ユ湡</label>
- <div class="layui-input-inline">
- <input type="date" class="layui-input" name="HInsuranceDate" id="HInsuranceDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍚堝悓鍒版湡鏃ユ湡</label>
- <div class="layui-input-inline">
- <input type="date" class="layui-input" name="HContractEDate" id="HContractEDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍚堝悓寮�濮嬫棩鏈�</label>
- <div class="layui-input-inline">
- <input type="date" class="layui-input" name="HContractBDate" id="HContractBDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍚堝悓鏈熼檺</label>
- <div class="layui-input-inline">
- <input type="text" name="HContractYear" id="HContractYear" lay-verify="HContractYear " autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">绂昏亴鏃ユ湡</label>
- <div class="layui-input-inline">
- <input type="date" class="layui-input" name="HDimissionDate" id="HDimissionDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏆備綇璇佸埌鏈熸棩</label>
- <div class="layui-input-inline">
- <input type="date" class="layui-input" name="HStayCardEDate" id="HStayCardEDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏍哥畻鏂瑰紡</label>
- <div class="layui-input-inline">
- <input type="text" name="HCTPrjName" readonly id="HCTPrjName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HCTPrjID" id="HCTPrjID" value="0">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HCTPrjID-BT" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鑱屽憳绯绘暟</label>
- <div class="layui-input-inline">
- <input type="text" name="HEmpRate" id="HEmpRate" lay-verify="HEmpRate" autocomplete="off" class="layui-input">
- </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鑱屽憳绯绘暟</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HEmpRate" id="HEmpRate" lay-verify="HEmpRate" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-row">
@@ -475,20 +144,7 @@
</div>
</div>
</div>
- <div class="layui-row">
- <!--<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璐濆＋杈鹃儴闂�</label>
- <div class="layui-input-inline">
- <input type="text" name="BSTDeptName" id="BSTDeptName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="BSTDeptID" id="BSTDeptID" value="0">
- <input type="hidden" name="BSTDeptNumber" id="BSTDeptNumber" value="">
- <button type="button" lay-submit="" class="layui-btn" lay-filter=" " style="width:40px;background-color:#CDCDCD">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>-->
- </div>
<div class="layui-row">
<div class="layui-col-xs8 layui-inline">
<label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
@@ -497,31 +153,388 @@
</div>
</div>
</div>
- <div class="layui-row">
- <div class="layui-col-xs8 layui-inline">
- <label class="layui-form-label" style="width: 12.5%;">绂昏亴鍘熷洜</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HDimissionReason" id="HDimissionReason" autocomplete="off" style=" width: 90%;">
+
+
+
+ </div>
+ </div>
+ <!--浜轰簨淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏀挎不闈㈣矊</label>
+ <div class="layui-input-inline">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HGovStatus" id="HGovStatus" lay-verify="HGovStatus">
+ <option value="缇や紬">缇や紬</option>
+ <option value="鍥㈠憳">鍥㈠憳</option>
+ <option value="鍏氬憳">鍏氬憳</option>
+ <option value="鍏朵粬鍏氭淳">鍏朵粬鍏氭淳</option>
+ </select>
+ </div>
</div>
</div>
</div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浼犵湡鍙风爜</label>
- <div class="layui-input-inline">
- <input type="text" name="HFax" id="HFax" lay-verify="HFax " autocomplete="off" class="layui-input">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瀛﹀巻</label>
+ <div class="layui-input-inline">
+
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HKnowLev" id="HKnowLev" lay-verify="HKnowLev">
+ <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>
+ </select>
+ </div>
</div>
</div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">绛剧害</label>
- <div class="layui-input-inline">
- <div class="layui-form">
- <div class="layui-form-item">
- <select name="HSignStatus" id="HSignStatus" lay-verify="HSignStatus">
- <option value="true">鏄�</option>
- <option value="false">鍚�</option>
- </select>
- </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">濠氬Щ鐘跺喌</label>
+ <div class="layui-input-inline">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HMarr" id="HMarr" lay-verify="HMarr">
+ <option value="鏈">鏈</option>
+ <option value="宸插">宸插</option>
+ <option value="绂诲紓">绂诲紓</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">妗ｆ缂栧彿</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HArchivesNo" id="HArchivesNo" lay-verify="HArchivesNo" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鑱岀О</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProTitleID" id="HProTitleID" lay-verify="HProTitleID" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">钖祫绛夌骇</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSalaryLev" id="HSalaryLev" lay-verify="HSalaryLev" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">姣曚笟瀛︽牎</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HGradSchool" id="HGradSchool" lay-verify="HGradSchool" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">姣曚笟鏃堕棿</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HGradDate" id="HGradDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瀹胯垗</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HDormName" id="HDormName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HDormID" id="HDormID" value="0">
+ <input type="hidden" name="HDormNumber" id="HDormNumber" value="">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDormID-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">澶栬姘村钩</label>
+ <div class="layui-input-inline">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HEngLev" id="HEngLev" lay-verify="HEngLev">
+ <option value="鏃�">鏃�</option>
+ <option value="涓�鑸�">涓�鑸�</option>
+ <option value="鐔熸倝">鐔熸倝</option>
+ <option value="绮鹃��">绮鹃��</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璁＄畻鏈烘按骞�</label>
+ <div class="layui-input-inline">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HCompLev" id="HCompLev" lay-verify="HCompLev">
+ <option value="鏃�">鏃�</option>
+ <option value="涓�鑸�">涓�鑸�</option>
+ <option value="鐔熸倝">鐔熸倝</option>
+ <option value="绮鹃��">绮鹃��</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">涓撲笟</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSpec" id="HSpec" lay-verify="HSpec" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" style="width: 12.5%;">鐜颁綇鍦板潃</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HNowAdd" id="HNowAdd" autocomplete="off" style=" width: 90%;">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鐢靛瓙閭</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HEmail" id="HEmail" lay-verify="HEmail" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" style="width: 12.5%;">瀹跺涵鍦板潃</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HHomeAdd" id="HHomeAdd" autocomplete="off" style=" width: 90%;">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閭斂缂栫爜</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HPostalCode" id="HPostalCode" lay-verify="HPostalCode" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" style="width: 12.5%;">鍘熷叕鍙�</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HOldCompany" id="HOldCompany" autocomplete="off" style=" width: 90%;">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鑱旂郴鐢佃瘽</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HLinkPhone" id="HLinkPhone" lay-verify="HLinkPhone" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鎵嬫満鍙风爜</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMobilePhone" id="HMobilePhone" lay-verify="HMobilePhone" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鐢ㄥ伐绫诲瀷</label>
+ <div class="layui-input-inline">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HWorkType" id="HWorkType" lay-verify="HWorkType">
+ <option value="涓存椂宸�">涓存椂宸�</option>
+ <option value="鍚堝悓宸�">鍚堝悓宸�</option>
+ <option value="椤跺矖宸�">椤跺矖宸�</option>
+ <option value="鍏朵粬">鍏朵粬</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">杩涘巶鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HInComDate" id="HInComDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">杞鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HRelDate" id="HRelDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">淇濋櫓璇佺紪鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HInsuranceNo" id="HInsuranceNo" lay-verify="HInsuranceNo" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍙備繚</label>
+ <div class="layui-input-inline">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HInsuranceStatus" id="HInsuranceStatus" lay-verify="HInsuranceStatus">
+ <option value="true">鏄�</option>
+ <option value="false">鍚�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍙備繚鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HInsuranceDate" id="HInsuranceDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍚堝悓鍒版湡鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HContractEDate" id="HContractEDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍚堝悓寮�濮嬫棩鏈�</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HContractBDate" id="HContractBDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍚堝悓鏈熼檺</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HContractYear" id="HContractYear" lay-verify="HContractYear " autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">绂昏亴鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HDimissionDate" id="HDimissionDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏆備綇璇佸埌鏈熸棩</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HStayCardEDate" id="HStayCardEDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+
+ </div>
+
+ <div class="layui-row">
+
+ <!--<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璐濆＋杈鹃儴闂�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="BSTDeptName" id="BSTDeptName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="BSTDeptID" id="BSTDeptID" value="0">
+ <input type="hidden" name="BSTDeptNumber" id="BSTDeptNumber" value="">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter=" " style="width:40px;background-color:#CDCDCD">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>-->
+ </div>
+
+ <div class="layui-row">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" style="width: 12.5%;">绂昏亴鍘熷洜</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HDimissionReason" id="HDimissionReason" autocomplete="off" style=" width: 90%;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浼犵湡鍙风爜</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HFax" id="HFax" lay-verify="HFax " autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">绛剧害</label>
+ <div class="layui-input-inline">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HSignStatus" id="HSignStatus" lay-verify="HSignStatus">
+ <option value="true">鏄�</option>
+ <option value="false">鍚�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鎬у埆</label>
+ <div class="layui-input-inline">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HSex" id="HSex" lay-verify="HSex">
+ <option value="鐢�">鐢�</option>
+ <option value="濂�">濂�</option>
+ </select>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍑虹敓骞存湀</label>
+ <div class="layui-input-inline">
+ <!--<input class="layui-input" name="HBirthDay" id="HBirthDay" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">-->
+ <input type="date" class="layui-input" name="HBirthDay" id="HBirthDay" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">骞撮緞</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HAge" id="HAge" lay-verify="HAge" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">绫嶈疮</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HBlighty" id="HBlighty" lay-verify="HBlighty" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">姘戞棌</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HNation" id="HNation" lay-verify="HNation" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鎴风睄绫诲埆</label>
+ <div class="layui-input-inline">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HBlightyType" id="HBlightyType" lay-verify="HBlightyType">
+ <option value="鏈湴">鏈湴</option>
+ <option value="澶栧湴">澶栧湴</option>
+ </select>
</div>
</div>
</div>
@@ -803,6 +816,15 @@
$("#HContractYear").val(0);
$("#HDimissionDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
$("#HStayCardEDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
+ } else if (OperationType == 2) {//澶嶅埗
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ $("#HItemID").val(0);
+ $("#HNumber").val('');
+ $("#HName").val('');
+ //鏂囦欢閫夋嫨鍒濆鍖�
+ PicUpload();
+ getFile();
}
else if (OperationType == 3) {//缂栬緫
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
@@ -898,8 +920,36 @@
form.on('submit(set_SaveBill)', function (data) {
set_SaveBill(data);
});
-
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
//#endregion
+
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Employee/AuditGy_Employee',
+ type: "GET",
+ data: { "HInterID": $("#HItemID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
//#region 閫夋嫨鑱屽姟鏂规硶
function get_checkDuty() {
@@ -960,7 +1010,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ョ鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../../views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_WorkTypeList.html?Type=HWorkType', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_WorkTypeList.html?Type=HWorkType&type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -985,7 +1035,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鏍哥畻鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../../views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ClassTimePrjList.html?Type=HClassTimePrj', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ClassTimePrjList.html?Type=HClassTimePrj&Type=2', 'yes']
//, content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -1012,7 +1062,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&Org=' + sessionStorage["Organization"] , 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1039,7 +1089,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宀椾綅鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Post.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Post.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1448,8 +1498,8 @@
layer.msg(data.Message, { icon: 1 });
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
//淇濆瓨鍚庢祻瑙�
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ //var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ //parent.layer.close(index); //鍐嶆墽琛屽叧闂�
}
else {
layer.alert(data.Message, { icon: 5 });
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterType.html"
index 44d8b2f..0aab23e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterType.html"
@@ -8,7 +8,17 @@
<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/layui/layui1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/HideButton_New.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+ <style>
+ /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+ .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ background: #aef0f7;
+ }
+ </style>
</head>
<body>
<div class="layui-fluid">
@@ -24,13 +34,13 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浠ｇ爜</label>
+ <label class="layui-form-label">鐗╂枡鍒嗙被浠ｇ爜</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍚嶇О</label>
+ <label class="layui-form-label">鐗╂枡鍒嗙被鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
</div>
@@ -76,7 +86,7 @@
</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>
<div class="layui-row" style="margin-top:5px">
@@ -136,23 +146,33 @@
</div>
</div>
</div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div id="TreeTable" class="demo-tree demo-tree-box" style="width:99.5%;"></div>
+ </div>
+ <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 75%">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-iconlayuiiconfileb"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layuiiconlayuiicon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+ <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></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="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
</form>
@@ -167,7 +187,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','tree'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -177,8 +197,12 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
+ , tree = layui.tree;
var sWhere = "";
-
+ var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+ var HBillType = "Gy_MaterType";
+ var sql = "";
+ var HMaterTypeID = 0; //鐗╂枡鍒嗙被鑺傜偣id
//#region 銆愯繃婊ゆ柟妗堛��
//杩囨护鏉′欢鐨刢lass绫�
var HClassTag = "ForFilteringSchemes";
@@ -207,6 +231,34 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //瓒呴摼鎺�
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+
+
+ if (obj.event == '鐗╂枡鍒嗙被浠ｇ爜') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� ''銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var linterid = data.HItemID.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Gy_MaterTypeEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+ end: function () { //褰撳叧闂椂璋冪敤
+ get_FastQuery(table, option);
+ }
+ , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -218,6 +270,9 @@
break;
case 'btn-Edit':
set_ShowBill();
+ break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
break;
case 'btn-Delete':
set_DeleteBill();
@@ -260,7 +315,11 @@
break;
//鍒楄缃�
case 'set_HideColumn':
- get_HideColumn();
+ get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+ break;
+ //鎸夐挳璁剧疆
+ case 'set_HideButton':
+ get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
break;
};
});
@@ -295,8 +354,11 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栨爲褰㈠浘
+ get_Display_Tree()
+
//鏌ヨ
- get_Display(sWhere);
+ get_FastQuery();
Organ();
}
//#endregion
@@ -329,31 +391,31 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 800
+ , height: 'full-80'
, page: true
, limits: [50, 500, 5000, 20000]
, limit: 50
, cellMinWidth: 90
, cols: [[
- { type: 'checkbox', fixed: 'left' }
- , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
- , { field: '浠ｇ爜', title: '浠ｇ爜' }
- , { field: '鍚嶇О', title: '鍚嶇О' }
- , { field: '鐭唬鐮�', title: '鐭唬鐮�' }
- , { field: '绛夌骇', title: '绛夌骇' }
- , { field: '鏈骇鏍囧織', title: '鏈骇鏍囧織' }
- , { field: '绂佺敤鏍囧織', title: '绂佺敤鏍囧織' }
- , { field: '澶囨敞', title: '澶囨敞' }
- , { field: '浣跨敤鐘舵��', title: '浣跨敤鐘舵��' }
- , { field: '鍒涘缓浜�', title: '鍒涘缓浜�' }
- , { field: '寤虹珛鏃堕棿', title: '寤虹珛鏃堕棿' }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
- , { field: '瀹℃牳鏃堕棿', title: '瀹℃牳鏃堕棿' }
- , { field: '淇敼浜�', title: '淇敼浜�' }
- , { field: '淇敼鏃堕棿', title: '淇敼鏃堕棿' }
- , { field: '绂佺敤浜�', title: '绂佺敤浜�' }
- , { field: '绂佺敤鏃堕棿', title: '绂佺敤鏃堕棿' }
- , { field: '浣跨敤缁勭粐', title: '浣跨敤缁勭粐' }
+ //{ type: 'checkbox', fixed: 'left' }
+ //, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ //, { field: '浠ｇ爜', title: '浠ｇ爜' }
+ //, { field: '鍚嶇О', title: '鍚嶇О' }
+ //, { field: '鐭唬鐮�', title: '鐭唬鐮�' }
+ //, { field: '绛夌骇', title: '绛夌骇' }
+ //, { field: '鏈骇鏍囧織', title: '鏈骇鏍囧織' }
+ //, { field: '绂佺敤鏍囧織', title: '绂佺敤鏍囧織' }
+ //, { field: '澶囨敞', title: '澶囨敞' }
+ //, { field: '浣跨敤鐘舵��', title: '浣跨敤鐘舵��' }
+ //, { field: '鍒涘缓浜�', title: '鍒涘缓浜�' }
+ //, { field: '寤虹珛鏃堕棿', title: '寤虹珛鏃堕棿' }
+ //, { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+ //, { field: '瀹℃牳鏃堕棿', title: '瀹℃牳鏃堕棿' }
+ //, { field: '淇敼浜�', title: '淇敼浜�' }
+ //, { field: '淇敼鏃堕棿', title: '淇敼鏃堕棿' }
+ //, { field: '绂佺敤浜�', title: '绂佺敤浜�' }
+ //, { field: '绂佺敤鏃堕棿', title: '绂佺敤鏃堕棿' }
+ //, { field: '浣跨敤缁勭粐', title: '浣跨敤缁勭粐' }
]]
};
}
@@ -363,7 +425,7 @@
function set_ClearQuery() {
$("#HNumber").val("");
$("#HName").val("");
- $("#HOrgName").val(sessionStorage["OrganizationName"]);
+ $("#HOrgName").val(sessionStorage["Organization"]);
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0"); $("#ColContent2").val("");
@@ -390,11 +452,54 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization},
success: function (data1) {
if (data1.count == 1) {
- option.data = data1.data
+ 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' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ 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: false, 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: '鐗╂枡鍒嗙被浠ｇ爜', templet: function (d) {
+ return '<span style="color: blue;">' + d.鐗╂枡鍒嗙被浠ｇ爜 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120 });
+ }
+ }
+ }
+ option.cols = [col];
+ option.data = data1.data;
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+
ins = table.render(option);
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+ //鍒锋柊鎸夐挳鏄剧ず
+ Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
layer.close(ajaxLoad);
if ($("#ColName option").length < 1) {
@@ -493,12 +598,15 @@
sWhere += " and " + ColName2 + " " + com2;
}
if (HNumber) {
- sWhere += " and 浠ｇ爜 like '%" + HNumber + "%'";
+ sWhere += " and 鐗╂枡鍒嗙被浠ｇ爜 like '%" + HNumber + "%'";
}
if (HName) {
- sWhere += " and 鍚嶇О like '%" + HName + "%'";
+ sWhere += " and 鐗╂枡鍒嗙被鍚嶇О like '%" + HName + "%'";
}
-
+ //鐗╂枡鑺傜偣sql
+ if (sql != "") {
+ sWhere += sql;
+ }
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -528,7 +636,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�=="") {
var ItemID = data[0].HItemID.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -559,7 +667,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
//#endregion
@@ -632,13 +740,41 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鍏敤鍩虹璧勬枡/Gy_MaterTypeEdit.html?hID=' + hID
+ , content: '../鍏敤鍩虹璧勬枡/Gy_MaterTypeEdit.html?OperationType=3&linterid=' + hID
, resize: false
, cancel: function () {
}
})
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶嶅埗-鐗╂枡鍒嗙被'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Gy_MaterTypeEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ }
+ })
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
@@ -718,132 +854,11 @@
//#endregion
+
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
get_Display(sWhere);
- }
- //#endregion
-
- //#region 闅愯棌鍒楄缃�
- function get_HideColumn() {
- var colName = "";
- var contentUrl = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- colName += option.cols[0][i]["title"] + ",";
- }
- var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
- var urlLen = urlStr.split('/');
- for (var i = 0; i < urlLen.length - 4; i++) {
- contentUrl += "../";
- }
- colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
- contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "闅愯棌鍒楄缃�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["50%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: [contentUrl, "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",
- data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.data.length != 0) {
-
-
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- /* var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
-
- dataCol = data1.data[0].HGridString.split(',');
-
- for (var i = 0; i < option.cols[0].length - 2; i++) {
- if (dataCol[i]) {
- var dataCols = dataCol[i].split('|');
- }
- //闅愯棌鍒�
- 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 (data1.data[0].HColumnWidth != 0) {
- // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
- //} else {
- // option.cols[0][i + 1]["width"] = "";
- //}
- //鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
- option.cols[0][i + 1]["hide"] = false;
- }
- //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
- 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;
- }
- }
-
- //鍙栨秷鍐荤粨鍒�
- 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";
- }
- }
- table.render(option);
- } else {
- table.render(option);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- })
}
//#endregion
@@ -864,6 +879,95 @@
form.render('select');
}
//#endregion
+
+ // 鏍戠姸鍥炬煡璇�
+ function get_Display_Tree() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_MaterType/Gy_MaterTypeTreeListByLevel',
+ type: "GET",
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+ var data = JSON.parse(data1.data);
+ MenuMain(data);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ function MenuMain(data) {
+ var liStr = '[';
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ for (var i = 0; i < data.length; i++) {
+ // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
+ if (data[i].children != null && data[i].children.length > 0) {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+ // 閬嶅巻鑾峰彇瀛愯彍鍗�
+ for (var k = 0; k < data[i].children.length; k++) {
+ liStr += getChildMenu(data[i].children[k], 0);
+ }
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += ']},';
+ } else {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+ }
+ };
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += "]";
+ var treeTable = JSON.parse(liStr);
+ tree.render({
+ elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
+ , data: treeTable
+ , onlyIconControl: true
+ , click: function (obj) {
+ //楂樹寒鍙樿壊
+ $(".layui-tree-set").removeClass('layui-tree-set-active');
+ obj.elem.addClass('layui-tree-set-active');
+
+ var data = obj.data; //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+ if (data.id == "100") {
+ sql = " and HParentID=0 ";
+ HMaterTypeID = 0;
+ } else if (data.id == "0") {
+ sql = "";
+ HMaterTypeID = 0;
+ } else {
+ sql = " and HParentID='" + data.id + "' ";
+ HMaterTypeID = data.id;
+ }
+ get_FastQuery()
+ }
+ });
+ }
+
+ // 閫掑綊鐢熸垚瀛愯彍鍗�
+ function getChildMenu(subMenu, num) {
+ num++;
+ var subStr = '';
+ if (subMenu.children != null && subMenu.children.length > 0) {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+ for (var j = 0; j < subMenu.children.length; j++) {
+ subStr += getChildMenu(subMenu.children[j], num);
+ if (j + 1 == subMenu.children.length) {
+ subStr = subStr.substring(0, subStr.length - 1);
+ }
+ }
+ subStr += ']},';
+ } else {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+ }
+ return subStr;
+ }
+
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeEdit.html"
index 1057507..db0cbb0 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeEdit.html"
@@ -9,6 +9,9 @@
<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/PageTitle.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
@@ -47,6 +50,7 @@
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
</ul>
<h1 style="text-align:center;"><b>鐗╂枡鍒嗙被</b></h1>
<div class="layui-tab-content">
@@ -87,7 +91,7 @@
<div class="layui-inline">
<label class="layui-form-label">浣跨敤鐘舵�侊細</label>
<div class="layui-input-inline">
- <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+ <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag" disabled>
<option value="鏈娴�" selected>鏈娴�</option>
<option value="鏈娇鐢�">鏈娇鐢�</option>
<option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
@@ -97,7 +101,7 @@
<div class="layui-inline">
<label class="layui-form-label">浣跨敤缁勭粐锛�*</label>
<div class="layui-input-inline">
- <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID" disabled>
</select>
</div>
</div>
@@ -112,14 +116,78 @@
<div class="layui-inline">
<label class="layui-form-label">绂佺敤鏍囧織锛�</label>
<div class="layui-input-inline">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁绂佺敤">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁绂佺敤" disabled>
<input type="hidden" name="UnitType" id="UnitType">
</div>
</div>
</div>
</div>
</div>
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+ </div>
</div>
</div>
</div>
@@ -149,22 +217,46 @@
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
-
- //鑾峰彇 閫掑叆鍙傛暟
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
var params = getUrlVars();
- var hID = params[params[0]];//缂栬緫鏌ョ湅
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var hID = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ }
//鍒濆鍖栫晫闈�
set_ClearBill();
- if (hID == null || hID == 0) {
+ if (OperationType==1) {
//id new
$("#HItemID").val(0);
- }
- else {//濡傛灉缂栬緫淇敼鍒欒蛋涓嬮潰
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ } else if (OperationType == 2) {//澶嶅埗
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(hID);
+ $("#HItemID").val(0);
+ $("#HNumber").val('');
+ $("#HName").val('');
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HUpDater").val('');
+ $("#HUpDateDate").val('');
+ $("#HChecker").val('');
+ $("#HCheckDate").val('');
+ $("#HCloseMan").val('');
+ $("#HCloseDate").val('');
+ }else {//濡傛灉缂栬緫淇敼鍒欒蛋涓嬮潰
$("#HItemID").val(hID);
//淇敼鏃朵富琛↖D
RoadBillMain(hID);
+
+ $("#HUpDater").val(sessionStorage["HUserName"]);
+ $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
}
//#endregion
@@ -215,27 +307,28 @@
/*var sWhere = " and HParentID=0 ";*/
var sWhere = "";
if (hID != "" && hID != null) {
- sWhere += " and HItemID!=" + hID;
+ sWhere += " and HItemID!=" + hID + " and 瀹℃牳浜�!='' and 绂佺敤鏍囧織=0 ";
}
$.ajax({
url: GetWEBURL() + '/Gy_MaterType/Gy_MaterTypeList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
success: function (data1) {
var Parent = '<option style="color:blue;" value="0">鏃�</option>';
if (data1.count == 1) {
var data = data1.data;
for (var i = 0; i < data.length; i++) {
- Parent += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].鍚嶇О + '</option>';
+ Parent += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].鐗╂枡鍒嗙被鍚嶇О + '</option>';
}
$("#HParentID").append(Parent);
form.render('select');
} else {
- layer.close(ajaxLoad);
+
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
- layer.close(ajaxLoad);
+
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
})
@@ -305,6 +398,7 @@
$.ajax({
url: GetWEBURL() + "Gy_MaterType/Gy_MaterTypeList",
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -312,14 +406,23 @@
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HItemID": data.HItemID
- , "HNumber": data.浠ｇ爜
- , "HName": data.鍚嶇О
+ , "HNumber": data.鐗╂枡鍒嗙被浠ｇ爜
+ , "HName": data.鐗╂枡鍒嗙被鍚嶇О
, "HHelpCode": data.HHelpCode
, "HParentID": data.HParentID
, "HUseFlag": data.浣跨敤鐘舵��
, "HUSEORGID": data.HUSEORGID
, "HRemark": data.澶囨敞
, "HStopflag": data.绂佺敤鏍囧織
+ , "HMaker": data["鍒涘缓浜�"]
+ , "HMakeDate": data["寤虹珛鏃堕棿"] == null ? "" : Format(new Date(data["寤虹珛鏃堕棿"]), "yyyy-MM-dd")
+ , "HUpDater": data["淇敼浜�"]
+ , "HUpDateDate": data["淇敼鏃堕棿"] == null ? "" : Format(new Date(data["淇敼鏃堕棿"]), "yyyy-MM-dd")
+ , "HChecker": data["瀹℃牳浜�"]
+ , "HCheckDate": data["瀹℃牳鏃堕棿"] == null ? "" : Format(new Date(data["瀹℃牳鏃堕棿"]), "yyyy-MM-dd")
+ , "HCloseMan": data["绂佺敤浜�"]
+ , "HCloseDate": data["绂佺敤鏃堕棿"] == null ? "" : Format(new Date(data["绂佺敤鏃堕棿"]), "yyyy-MM-dd")
+
});
$("#HParentID").val(data.HParentID);
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
index 573470b..0cd70a5 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
@@ -9,7 +9,7 @@
<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>
- <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/HideButton_New.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -44,15 +44,16 @@
<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>
- <div class="layui-inline">
- <label class="layui-form-label">鍗曚綅浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曚綅浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
@@ -80,14 +81,69 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
</div>
</div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;" class="ForFilteringSchemes">
+ <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="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;" class="ForFilteringSchemes">
+ <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="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
</div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
+ <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="CheckBill"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AbandonCheck"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
@@ -112,6 +168,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/layui/zgqlayui.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -131,6 +188,7 @@
var sWhere = "";
var option = [];
var Organization = sessionStorage["Organization"]
+ var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
var HModName = "Gy_Unit";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID","HParentID"];
@@ -143,7 +201,7 @@
//#region 銆愯繃婊ゆ柟妗堛��
- //杩囨护鏉′欢鐨刢lass绫�
+ //杩囨护鏉′欢鐨刢lass绫�
var HClassTag = "ForFilteringSchemes";
//妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
window.HModuleName = "璁￠噺鍗曚綅鍒楄〃";
@@ -184,8 +242,6 @@
set_InitGrid();
//鏌ヨ
get_FastQuery()
- //杩囨护鏂规鏌ヨ
- get_DefaultModule();
}
//#endregion
@@ -268,17 +324,17 @@
, limit: 50
, cellMinWidth: 90
}
+
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
ins = table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
- var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- var HBillType = "Gy_Unit";
- Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
-
+ Display_HideButton(set_HideButton_ID, HModName, HModName, sessionStorage["HUserName"]);
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ get_DefaultModule();//鍔犺浇鏂规
}
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -299,6 +355,9 @@
//鏂板
case 'set_AddNew': set_AddNew();
break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
case 'btn-getCheckData':
var data = checkStatus.data;
layer.alert(JSON.stringify(data));
@@ -316,7 +375,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html?hID=' + hID
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html?OperationType=3&linterid=' + hID
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -331,7 +390,7 @@
case 'set_DeleteBill':
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�=="") {
var ItemID = data[0].HItemID.toString();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
@@ -359,7 +418,7 @@
});
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
break;
//瀹℃牳鎸夐挳
@@ -384,7 +443,7 @@
break;
//鍒楄缃�
case 'set_HideColumn':
- get_HideColumn();
+ get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
break;
//淇濆瓨鏂规
case 'set_SaveScheme': set_SaveScheme();
@@ -394,9 +453,7 @@
break;
//鎸夐挳璁剧疆
case 'set_HideButton':
- var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- var HBillType = "Gy_Unit";
- get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ get_HideButton(set_HideButton_ID, HModName, HModName, sessionStorage["HUserName"]);//绗簩涓弬鏁板簲涓築illType鍩虹璧勬枡绫诲瀷鏃燘illType鐢∕odname琛ㄧず
break;
};
});
@@ -418,7 +475,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html?hID=' + hID
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html?OperationType=2&linterid=' + hID
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -445,7 +502,7 @@
break;
}
-
+
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
});
@@ -462,7 +519,7 @@
table.render(option);
});
-
+
function btnrowDouble(obj) {
var index = parent.layer.getFrameIndex(window.name);
var data = obj.data;
@@ -534,7 +591,33 @@
}
//#endregion
-
+ //#region 澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶嶅埗-璁￠噺鍗曚綅鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
//#region 蹇�熻繃婊�
@@ -544,6 +627,12 @@
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
if (ColName != 0 && Comparator != 0) {
var com = "";
switch (Comparator) {
@@ -565,6 +654,48 @@
}
sWhere += " and " + ColName + " " + com;
}
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
if (HNumber) {
sWhere += " and 璁￠噺鍗曚綅浠ｇ爜 like '%" + HNumber + "%'";
}
@@ -583,6 +714,12 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
form.render('select');
sWhere = "";
@@ -592,124 +729,6 @@
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
});
-
- //#region 闅愯棌鍒楄缃�
- function get_HideColumn() {
- var colName = "";
- var contentUrl = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- colName += option.cols[0][i]["title"] + ",";
- }
- var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
- var urlLen = urlStr.split('/');
- for (var i = 0; i < urlLen.length - 4; i++) {
- contentUrl += "../";
- }
- colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
- contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "闅愯棌鍒楄缃�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["50%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: [contentUrl, "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",
- data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.data.length != 0) {
-
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
- dataCol = data1.data[0].HGridString.split(',');
-
- for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
- //闅愯棌鍒�
- 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 (data1.data[0].HColumnWidth != 0) {
- // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
- //} else {
- // option.cols[0][i + 1]["width"] = "";
- //}
- //鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
- option.cols[0][i + 1]["hide"] = false;
- }
- //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
- 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;
- }
- }
-
- //鍙栨秷鍐荤粨鍒�
- 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";
- }
- }
- table.render(option);
- } else {
- table.render(option);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- })
- }
- //#endregion
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -814,7 +833,11 @@
}
}
$("#ColName").empty();
+ $("#ColName1").empty();
+ $("#ColName2").empty();
$("#ColName").append(Organization);
+ $("#ColName1").append(Organization);
+ $("#ColName2").append(Organization);
form.render('select');
}
//#endregion
@@ -845,7 +868,7 @@
if (HOrgName != "undefined") {
Organization = HOrgName.toString();
}
-
+
}
return addSWhere;
}
@@ -915,7 +938,7 @@
for (var i = 0; i < Filter.length; i++) {
HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
- HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
index 6d40f94..fa97079 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
@@ -49,15 +49,17 @@
<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>
- <div class="layui-inline">
- <label class="layui-form-label">浠撳簱浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
+
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
@@ -148,6 +150,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></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="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
@@ -225,6 +228,9 @@
//鏂板
case 'set_AddNew': set_AddNew();
break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
break;
@@ -287,6 +293,12 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
form.render('select');
sWhere = "";
@@ -706,6 +718,34 @@
}
//#endregion
+ //#region 澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶嶅埗-璁￠噺鍗曚綅鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Warehouse.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
//#region 缂栬緫
function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -730,7 +770,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�==="") {
var ItemID = data[0].HItemID.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -763,7 +803,7 @@
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkStationList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkStationList.html"
index c4ead8c..96b323f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkStationList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkStationList.html"
@@ -15,7 +15,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/HideButton.js"></script>
-
+ <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -78,12 +78,69 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
</div>
</div>
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <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>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <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>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
</div>
</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="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="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
@@ -151,13 +208,47 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+
+
+ if (obj.event == '宸ヤ綅浠ｇ爜') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� ''銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var linterid = data.HItemID.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkStationList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+ end: function () { //褰撳叧闂椂璋冪敤
+ get_FastQuery(table, option);
+ }
+ , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
//鏂板
case 'set_AddNew': set_AddNew();
break;
-
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
break;
@@ -199,7 +290,7 @@
case 'get_Exit': Pub_Close(2);
break;
//鍒楄缃�
- case 'set_HideColumn': get_HideColumn();
+ case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
break;
};
});
@@ -212,6 +303,12 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
form.render('select');
sWhere = "";
@@ -284,6 +381,12 @@
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if (data[i].name == '宸ヤ綅浠ｇ爜') {//娣诲姞瓒呴摼鎺�
+ 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) {
@@ -309,10 +412,10 @@
, limit: 50
, cellMinWidth: 90
}
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
table.render(option);
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
layer.close(ajaxLoad);
if ($("#ColName option").length < 1) {
@@ -339,7 +442,12 @@
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
-
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
if (ColName != 0 && Comparator != 0) {
var com = "";
switch (Comparator) {
@@ -361,6 +469,48 @@
}
sWhere += " and " + ColName + " " + com;
}
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
if (HNumber) {
sWhere += " and 宸ヤ綅浠ｇ爜 like '%" + HNumber + "%'";
}
@@ -377,10 +527,69 @@
function set_ClearQuery() {
$("#HNumber").val("");
$("#HName").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
sWhere = "";
}
//#endregion
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Gy_WorkStation_Query";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ //(鍙傛暟涓�锛氳〃鏍糹d)
+ table.exportFile('mainTable', option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶嶅埗-宸ヤ綅鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkStationList.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
//#region 鏂板
function set_AddNew() {
@@ -419,7 +628,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�==='') {
var ItemID = data[0].HItemID.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -452,7 +661,7 @@
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
@@ -559,128 +768,6 @@
}
//#endregion
- //#region 闅愯棌鍒楄缃�
- function get_HideColumn() {
- var colName = "";
- var contentUrl = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- colName += option.cols[0][i]["title"] + ",";
- }
- var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
- var urlLen = urlStr.split('/');
- for (var i = 0; i < urlLen.length - 4; i++) {
- contentUrl += "../";
- }
- colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
- contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "闅愯棌鍒楄缃�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["50%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: [contentUrl, "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鍒锋柊鎸夐挳鏄剧ず
- var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- var HBillType = "Gy_WorkStation";
- Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
- //#endregion
- //#region 鏄剧ず鍒楁暟鎹�
- function DisPlay_HideColumn() {
- $.ajax({
- url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
- type: "GET",
- data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.data.length != 0) {
-
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
- dataCol = data1.data[0].HGridString.split(',');
-
- for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
- //闅愯棌鍒�
- 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 (data1.data[0].HColumnWidth != 0) {
- // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
- //} else {
- // option.cols[0][i + 1]["width"] = "";
- //}
- //鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
- option.cols[0][i + 1]["hide"] = false;
- }
- //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
- 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;
- }
- }
-
- //鍙栨秷鍐荤粨鍒�
- 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";
- }
- }
- table.render(option);
- } else {
- table.render(option);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- })
- }
- //#endregion
-
//#region 鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
@@ -691,6 +778,10 @@
}
$("#ColName").empty();
$("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
form.render('select');
}
//#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeList.html"
index 2244de3..74b2261 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeList.html"
@@ -963,6 +963,19 @@
}
//#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var addSWhere = "";
+ if (typeof (openType) != "undefined") {
+ addSWhere = " and 绂佺敤鏍囪 = '' and 瀹℃牳浜�!='' ";
+ }
+ return addSWhere;
+ }
+ //#endregion
+
//#region 銆愯繃婊ゆ柟妗堛��
//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Post.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Post.html"
index 53aad68..9adb333 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Post.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Post.html"
@@ -25,6 +25,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -58,46 +59,48 @@
</div>
</div>
</div>
+
<div class="layui-form-item">
+
<div class="layui-inline">
- <label class="layui-form-label" >浣跨敤缁勭粐锛�</label>
- <div class="layui-input-inline">
- <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
- </select>
+ <label class="layui-form-label" style="width: 120px"> 澶囨敞锛�</label>
+ <div class="layui-input-inline" style="width: 550px">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鍒涘缓缁勭粐锛�</label>
- <div class="layui-input-inline">
- <select name="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" >浣跨敤鐘舵�侊細</label>
- <div class="layui-input-inline">
- <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag" readonly>
- <option value="鏈娴�" selected>鏈娴�</option>
- <option value="鏈娇鐢�">鏈娇鐢�</option>
- <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" style="width: 120px"> 绂佺敤鏍囧織:</label>
<div class="layui-input-inline">
<input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
</div>
</div>
-
</div>
+ <!--<div class="layui-form-item">
+
+ </div>-->
<div class="layui-form-item">
- <div class="layui-col-xs11">
- <label class="layui-form-label"> 澶囨敞锛�</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label>
+ <div class="layui-input-inline">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">鍒涘缓缁勭粐锛�</label>
+ <div class="layui-input-inline">
+ <select name="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label>
+ <div class="layui-input-inline">
+ <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag" readonly>
+ <option value="鏈娴�" selected>鏈娴�</option>
+ <option value="鏈娇鐢�">鏈娇鐢�</option>
+ <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+ </select>
</div>
</div>
</div>
@@ -249,7 +252,10 @@
Pub_Close(1);
}
});
-
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
//鐩戝惉鎻愪氦
form.verify({
numberOrEmpty: function (value, item) {
@@ -265,6 +271,34 @@
//#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var HInterID = $("#HItemID").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_BadReason/AuditGy_Post", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+
//鍒濆鍖栫晫闈�
function set_ClearBill() {
$("#HUSEORGID").attr("disabled", true);
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PostSkillList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PostSkillList.html"
index b5fd8db..0535bc3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PostSkillList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PostSkillList.html"
@@ -25,6 +25,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -257,6 +258,10 @@
}
});
});
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
//閫�鍑�
form.on('submit(Exit)', function (data) {//
if (linterid == undefined) {
@@ -297,6 +302,34 @@
//#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var HInterID = $("#HItemID").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_BadReason/AuditGy_PostSkill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
//鍒濆鍖栫晫闈�
function set_ClearBill() {
@@ -375,7 +408,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鍛樺伐琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Post.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Post.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -403,7 +436,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ュ簭琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Post.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Post.html"
index 2d0c5d0..36db509 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Post.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Post.html"
@@ -704,7 +704,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�==='') {
var HItemID = data[0].HItemID.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
@@ -733,7 +733,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
//#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html"
index 124c819..49f2568 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html"
@@ -700,7 +700,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�==='') {
var HItemID = data[0].HItemID.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
@@ -729,7 +729,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
//#endregion
@@ -835,10 +835,15 @@
//鑾峰彇鍙傛暟
var params = get_UrlVars();
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HProcID = params[params[1]];//瀵瑰簲宸ュ簭
+ var result = ""
if (typeof (openType) != "undefined") {
- return " and 绂佺敤鏍囧織 != '鏄�' and ISNULL(瀹℃牳浜�,'') != '' ";
+ result += " and 绂佺敤鏍囧織 != '鏄�' and ISNULL(瀹℃牳浜�,'') != '' ";
+ if (typeof (HProcID) != "undefined" && HProcID != "0") {
+ result += " and HProcID=" + HProcID
+ }
}
- return "";
+ return result;
}
//#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftEdit.html"
index 209e9e6..9269946 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftEdit.html"
@@ -18,6 +18,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<style>
.layui-form-item .layui-inline {
margin-top: 5px;
@@ -38,6 +39,7 @@
<div style="padding: 10px; ">
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Save" id="btn_Save">淇濆瓨</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Cancel" id="btn_Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
</div>
<div class="layui-tab" lay-filter="tab-Gy_ShiftsEdit">
<ul class="layui-tab-title" lay-filter="tab-all">
@@ -259,6 +261,7 @@
, form = layui.form
, element = layui.element;
var HInterID = $('#HInterID').val();
+ var HModName = "Gy_WorkShifEdit"
var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
//#endregion
@@ -292,6 +295,8 @@
});
get_InitGrid();
+ //璁剧疆琛ㄦ牸鏍煎紡
+ DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
} else if (OperationType == 2) {
//淇敼鏃朵富琛↖D
@@ -306,12 +311,14 @@
$("#HStopTime").val("");
$("#HCheckTime").val("");
$("#HItemID").val(0);
+ DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
}
else if (OperationType == 3) { //缂栬緫
$("#HInterID").val(HInterID);//淇敼鏃朵富琛↖D
get_InitGrid();
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(HInterID);
+ DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -422,7 +429,7 @@
, area: ['90%', '90%']//澶у皬
, title: "宸ヤ綔涓績鍒楄〃" //鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html?Htype=2", "yes"]
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -451,7 +458,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Htype=2&Organization=' + sessionStorage["Organization"], 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -533,7 +540,7 @@
break;
//鍒楄缃�
case 'set_HideColumn':
- get_HideColumn();
+ get_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
break;
//涓婁竴琛�
case 'btn_up':
@@ -684,11 +691,45 @@
//#endregion
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
+
//#region 閫�鍑�
form.on('submit(btn_Cancel)', function () {
Pub_Close(1);
});
//#endregion
+
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var HInterID = $("#HItemID").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_ShiftsController/AuditGy_Shifts", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+
//#region 瀛愯〃鍒濆鍖�
function get_InitGrid() {
@@ -700,7 +741,7 @@
, height: 400
, cols: [[
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+ , { type: 'numbers',field:'搴忓彿', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
, { field: 'HSNO', title: '搴忓彿', edit: 'text', totalRow: true }
, { field: 'HStartDate', title: '寮�濮嬫椂闂�', event: "HStartDate" }
, { field: 'HEndDate', title: '缁撴潫鏃堕棿', event: "HEndDate" }
@@ -753,7 +794,7 @@
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
console.log("绱㈠紩涓�:" + rowIndex);
- if (rowIndex === '0') {
+ if (rowIndex === '0' && option.data.length===1) {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
var oldData = table.cache["mainTable"];
@@ -796,6 +837,11 @@
$("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(obj[0].HItemID);
}
+ function GetWorkCenterValue(obj) //杩斿洖宸ヤ綔涓績
+ {
+ $("#HWorkCenterName").val(obj[0].宸ヤ綔涓績鍚嶇О);
+ $("#HWorkCenterID").val(obj[0].HItemID);
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftList.html"
index c244159..277d278 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftList.html"
@@ -231,6 +231,8 @@
set_StockOrg();
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鏌ヨ
+ get_FastQuery();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -293,9 +295,8 @@
, title: '鐝-缂栬緫'
, shift: 0 //寮瑰嚭鍔ㄧ敾
, content: '../鐢熶骇鍩虹璧勬枡/Gy_WorkShiftEdit.html?OperationType=3&HInterID=' + HInterID
- , btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
- end: function (index, layero, that) {
+ ,end: function (index, layero, that) {
//鍒锋柊椤甸潰
$("#btn_Search").trigger('click');
}
@@ -397,9 +398,8 @@
, title: '鐝-鏂板'
, shift: 0 //寮瑰嚭鍔ㄧ敾
, content: '../鐢熶骇鍩虹璧勬枡/Gy_WorkShiftEdit.html?OperationType=1&HInterID='
- , btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
- end: function (index, layero, that) {
+ ,end: function (index, layero, that) {
//鍒锋柊椤甸潰
$("#btn_Search").trigger('click');
}
@@ -419,9 +419,8 @@
, title: '鐝-缂栬緫'
, shift: 0 //寮瑰嚭鍔ㄧ敾
, content: '../鐢熶骇鍩虹璧勬枡/Gy_WorkShiftEdit.html?OperationType=3&HInterID=' + HInterID
- , btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
- end: function (index, layero, that) {
+ ,end: function (index, layero, that) {
//鍒锋柊椤甸潰
$("#btn_Search").trigger('click');
}
@@ -436,7 +435,7 @@
function btn_Delete() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�==='') {
var HInterID = data[0].HInterID.toString();
layer.confirm("纭瑕佸垹闄ら�変腑琛屾暟鎹紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -466,7 +465,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
//#endregion
@@ -880,7 +879,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery();
+ //get_FastQuery();
form.render("select");
}
},
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBill.html"
index ec993fb..acc9c5d 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBill.html"
@@ -55,6 +55,7 @@
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+ <input type="hidden" name="HInnerBillNo" id="HInnerBillNo" lay-verify="HInnerBillNo">
</div>
</div>
<div class="layui-inline">
@@ -115,19 +116,6 @@
</button>
</div>
</div>
-
- </div>
- <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;">
- <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
<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;">
@@ -138,10 +126,28 @@
</button>
</div>
</div>
+ </div>
+ <div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍐呴儴璁㈠崟鍙�</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </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="text" class="layui-input" name="HInnerBillNo" lay-verify="HInnerBillNo" id="HInnerBillNo">
+ <input type="text" class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName">
+ </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="text" class="layui-input" name="HMaterModel" lay-verify="HMaterModel" id="HMaterModel">
</div>
</div>
</div>
@@ -884,7 +890,8 @@
$("#HMaterID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
$("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);//閮ㄩ棬鍚嶇О
-
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);//
+ $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);//
table.render(option);
layer.closeAll();
}
@@ -905,7 +912,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ュ簭琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?openType=2', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?openType=2&HProcID=' + $("#HProcID").val(), 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1179,21 +1186,40 @@
var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
-
- if (checkStatus.data[0].鍏抽棴浜� == null || checkStatus.data[0].鍏抽棴浜� == "") {
+ if (checkStatus.data.length === 1) {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HPostSkillid": checkStatus.data[0].HItemID
, "HPostSkillNumber": checkStatus.data[0].宀椾綅鎶�鑳戒唬鐮�
, "HPostSkillName": checkStatus.data[0].宀椾綅鎶�鑳藉悕绉�
-
+
})
+ layer.close(index);//鍏抽棴寮圭獥
} else {
- layer.msg("璇ヤ换鍔″凡鍏抽棴锛岃閲嶆柊閫夋嫨!");
+ //(澶氶�夎)
+ //灏嗗師鏈夎〃浣撴暟鎹啓鍏ユ暟缁�
+ var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) {
+ if (tableBak[i]["HPostSkillid"] != 0 && tableBak[i]["HPostSkillid"] != "" && tableBak[i]["HPostSkillid"] != undefined && tableBak[i]["HPostSkillid"] != null) {
+ buttonArr.push(tableBak[i]); //濡傛灉鍏抽敭瀛楁涓嶄负绌猴紝鍒欏皢涔嬪墠鐨勬暟鎹瓨鍌�
+ }
+ }
+ //灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ buttonArr.push({
+ "HPostSkillid": checkStatus.data[i].HItemID, "HPostSkillNumber": checkStatus.data[i].宀椾綅鎶�鑳戒唬鐮�, "HPostSkillName": checkStatus.data[i].宀椾綅鎶�鑳藉悕绉�, "HRemark": "", "HSkillLev": "1", "HTrainDate": Format(new Date(), "yyyy-MM-dd"), "HSourceInterID": "0"
+ , "HSourceEntryID": "0"
+ , "HSourceBillNo": ""
+ , "HSourceBillType": "" });
+ }
+ // 閲嶆柊娓叉煋琛ㄦ牸锛屾洿鏂版暟鎹�
+ table.reload('mainTable', {
+ data: buttonArr
+ });
}
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -1255,6 +1281,8 @@
function GetGyMaterial(obj) {
$("#HMaterID").val(obj.HItemID);//鐗╂枡id
$("#HMaterName").val(obj.鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+ $("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);//鐗╂枡浠ｇ爜
+ $("#HMaterModel").val(obj.瑙勬牸鍨嬪彿);//瑙勬牸鍨嬪彿
}
//宸ュ簭
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBillList.html"
index ec4c4fb..e27d5ea 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBillList.html"
@@ -33,6 +33,17 @@
</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="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+ </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-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;">
@@ -51,25 +62,16 @@
<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
</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: 185px;">
+ <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
<div class="layui-row" style="margin-top:10px;margin-left:5%;">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
- </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: 185px;">
- <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes" lay-verify="HOrgID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </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 class="layui-inline" style="margin-left:5px;">
@@ -239,6 +241,35 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鍗曟嵁鍙疯秴閾炬帴
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+
+
+ if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� ''銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../宸ヨ祫绠＄悊/鍛樺伐鎶�鑳芥竻鍗�/HR_EmployeeSkillBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+ end: function () { //褰撳叧闂椂璋冪敤
+ get_FastQuery(2);
+ }
+ , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
//#region 澶村伐鍏锋爮浜嬩欢
@@ -434,6 +465,12 @@
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+ 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) {
@@ -567,14 +604,13 @@
if (HOrgID) {
sWhere += " and HOrgID = '" + HOrgID + "'";
}
- if (number==2) {
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
- }
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
- }
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
}
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ }
+
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
@@ -723,7 +759,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].鐘舵��==="鍒涘缓") {
var HInterID = data[0].hmainid.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -755,7 +791,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html"
index f655d21..a52c875 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html"
@@ -64,18 +64,6 @@
</div>
</div>
<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;">
- <input type="text" class="layui-input" lay-verify="HPostName" name="HPostName" id="HPostName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HPostID" id="HPostID" lay-verify="HPostID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPost" id="btnSearchHPost" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- </div>
- <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;">
<input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -85,16 +73,9 @@
</button>
</div>
</div>
- <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;">
- <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
+
+ </div>
+ <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;">
@@ -103,6 +84,40 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
+ </div>
+ </div>
+ <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;">
+ <input type="text" class="layui-input" lay-verify="HPostName" name="HPostName" id="HPostName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HPostID" id="HPostID" lay-verify="HPostID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPost" id="btnSearchHPost" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <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;">
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+ </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="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -715,7 +730,8 @@
$("#HMaterID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
$("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);//閮ㄩ棬鍚嶇О
-
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);//
+ $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);//
table.render(option);
layer.closeAll();
}
@@ -993,28 +1009,49 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_PostSkillList.html', "yes"]
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_PostSkillList.html?HType=2&HProcID=' + $("#HProcID").val(), "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("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
-
- if (checkStatus.data[0].鍏抽棴浜� == null || checkStatus.data[0].鍏抽棴浜� == "") {
+ if (checkStatus.data.length === 1) {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HPostSkillid": checkStatus.data[0].HItemID
, "HPostSkillNumber": checkStatus.data[0].宀椾綅鎶�鑳戒唬鐮�
, "HPostSkillName": checkStatus.data[0].宀椾綅鎶�鑳藉悕绉�
-
+
})
+ layer.close(index);//鍏抽棴寮圭獥
} else {
- layer.msg("璇ヤ换鍔″凡鍏抽棴锛岃閲嶆柊閫夋嫨!");
+ //(澶氶�夎)
+ //灏嗗師鏈夎〃浣撴暟鎹啓鍏ユ暟缁�
+ var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) {
+ if (tableBak[i]["HPostSkillid"] != 0 && tableBak[i]["HPostSkillid"] != "" && tableBak[i]["HPostSkillid"] != undefined && tableBak[i]["HPostSkillid"] != null) {
+ buttonArr.push(tableBak[i]); //濡傛灉鍏抽敭瀛楁涓嶄负绌猴紝鍒欏皢涔嬪墠鐨勬暟鎹瓨鍌�
+ }
+ }
+ //灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ buttonArr.push({
+ "HPostSkillid": checkStatus.data[i].HItemID, "HPostSkillNumber": checkStatus.data[i].宀椾綅鎶�鑳戒唬鐮�, "HPostSkillName": checkStatus.data[i].宀椾綅鎶�鑳藉悕绉�, "HRemark": "", "HSkillLev": "1", "HSourceInterID": "0"
+ , "HSourceEntryID": "0"
+ , "HSourceBillNo": ""
+ , "HSourceBillType": "" });
+ }
+ // 閲嶆柊娓叉煋琛ㄦ牸锛屾洿鏂版暟鎹�
+ table.reload('mainTable', {
+ data: buttonArr
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
+
+
+
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -1187,6 +1224,8 @@
function GetGyMaterial(obj) {
$("#HMaterID").val(obj.HItemID);//鐗╂枡id
$("#HMaterName").val(obj.鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+ $("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);//鐗╂枡鍚嶇О
+ $("#HMaterModel").val(obj.瑙勬牸鍨嬪彿);//鐗╂枡鍚嶇О
}
//宸ュ簭
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html"
index 80255eb..d8c60a1 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html"
@@ -33,6 +33,16 @@
</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="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+ </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-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;">
@@ -51,26 +61,30 @@
<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
</div>
</div>
- <div class="layui-row" style="margin-top:10px;margin-left:5%;">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
- </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: 185px;">
- <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes" lay-verify="HOrgID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
</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>
+
+ <div class="layui-row" style="margin-top:10px;margin-left:5%;">
+
+ <!--<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes" lay-verify="HOrgID">-->
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ <!--</select>
+ </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 class="layui-inline" style="margin-left:5px;">
<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
@@ -107,12 +121,12 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
+ <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;" class="ForFilteringSchemes">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
@@ -127,19 +141,19 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;" class="ForFilteringSchemes">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
@@ -154,7 +168,7 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -239,6 +253,36 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鍗曟嵁鍙疯秴閾炬帴
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+
+
+ if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� ''銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../宸ヨ祫绠＄悊/宀椾綅鎶�鑳芥竻鍗�/HR_PostSkillBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+ end: function () { //褰撳叧闂椂璋冪敤
+ get_FastQuery(2);
+ }
+ , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 澶村伐鍏锋爮浜嬩欢
@@ -386,7 +430,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_FastQuery(1);
+ get_FastQuery(2);
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -432,6 +476,12 @@
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+ 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) {
@@ -718,7 +768,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].鐘舵��==="鍒涘缓") {
var HInterID = data[0].hmainid.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -750,7 +800,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
@@ -927,7 +977,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery(1)
+ //get_FastQuery(1)
form.render("select");
}
}, error: function () {
@@ -1088,7 +1138,7 @@
}
, end: function () {
if (HIsClose_Manual != true) {
- get_FastQuery()
+ get_FastQuery(2)
form.render("select");
}
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
index 440d099..f48231c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
@@ -27,7 +27,7 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">鐢熶骇璁㈠崟閫夊崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAddICMO" id="btnAddICMO">娣诲姞璁㈠崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">鍑嗗</button>
+ <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">鍑嗗</button>-->
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProPC" id="btnProPC">鎺掍骇</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLock" id="btnLock">閿佸畾</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">瑙ｉ攣</button>
@@ -303,13 +303,14 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>鎵归噺濉厖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverUp"><i class="layui-icon layui-icon-delete"></i>涓婄Щ</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverDown"><i class="layui-icon layui-icon-delete"></i>涓嬬Щ</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Priority"><i class="layui-icon layui-icon-delete"></i>浼樺厛绾�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyAsc"><i class="layui-icon layui-icon-delete"></i>鍑嗗鎺掑簭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyWorkQty"><i class="layui-icon layui-icon-delete"></i>鍑嗗(鍚屾浜ц兘)</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Souce"><i class="layui-icon layui-icon-delete"></i>閫変骇绾�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Emp"><i class="layui-icon layui-icon-delete"></i>閫夋搷浣滃伐</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -349,6 +350,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ soulTable: 'soulTable'
}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'soulTable','jquery'], function () {
//#region 鍏敤鍙橀噺
@@ -584,6 +586,16 @@
//鍑嗗鎺掑簭
case 'set_ReadyAsc':
set_ReadyAsc();
+ break;
+ //鍑嗗鍚屾浜ц兘
+ case 'set_ReadyWorkQty':
+ layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function (index, layero) {
+ get_btnReady(data);
+ layer.close(index);
+ }
+ })
break;
//閫変骇绾�
case 'set_Souce':
@@ -1025,10 +1037,10 @@
var ajaxLoad = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
- url: GetWEBURL() + '/Gy_Department/list',
+ url: GetWEBURL() + '/Gy_Department/cx',
type: "GET",
async: false,
- data: { "sWhere": "and HItemID = " + HWorkShopID, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
+ data: { "HInterID": HWorkShopID },
success: function (data1) {
if (data1.count == 1) {
$("#HWorkShopID").val(HWorkShopID);
@@ -1060,7 +1072,7 @@
Organ();
//鍒濆鍖栬〃鏍�
set_InitGrid();
- get_FastQuery(1);
+ get_FastQuery(2);
get_FastQuery_ICMO();
}
//#region 鍒濆鍖栦笅鎷夊垪琛� 鎺掍骇鏃堕棿
@@ -1733,7 +1745,32 @@
, cellMinWidth: 90
, cols: [columns]
, limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
- , even: true
+ , contextmenu: {
+ // 琛ㄦ牸鍐呭鍙抽敭鑿滃崟閰嶇疆
+ body: [
+ {
+ name: '澶嶅埗',
+ icon: 'layui-icon layui-icon-template',
+ click: function (obj) {
+ soulTable.copy(obj.text)
+ layer.msg('澶嶅埗鎴愬姛锛�')
+ }
+ },
+ {
+ name: '琛�-钃濊壊',
+ click: function (obj) {
+ obj.trElem.css('background', '#01AAED')
+ }
+ },
+ {
+ name: '绾㈣壊',
+ click: function (obj) {
+ obj.elem.css('color', 'red')
+ }
+ }
+ ]
+ }
+ , even: true//琛屾嫋鎷�
, rowDrag: {/*trigger: 'row',*/
done: function (obj) {
// 瀹屾垚鏃讹紙鏉惧紑鏃讹級瑙﹀彂
@@ -1762,17 +1799,17 @@
}
, done: function (res, page, count) {
soulTable.render(this);
- $('.layui-table thead').on('click', 'th', function () {
- // 鑾峰彇鐐瑰嚮鐨勮〃澶寸殑 field 鍊�
- var field = $(this).data('field');
- set_InitGrid1(field);
- sWhere = {
- HORGID: sessionStorage["OrganizationID"]
- , HBEGINDATE: field
- , HENDDATE: field
- }
- //get_Display_3(JSON.stringify(sWhere));
- });
+ //$('.layui-table thead').on('click', 'th', function () {
+ // // 鑾峰彇鐐瑰嚮鐨勮〃澶寸殑 field 鍊�
+ // var field = $(this).data('field');
+ // set_InitGrid1(field);
+ // sWhere = {
+ // HORGID: sessionStorage["OrganizationID"]
+ // , HBEGINDATE: field
+ // , HENDDATE: field
+ // }
+ // //get_Display_3(JSON.stringify(sWhere));
+ //});
//res.data.forEach(function (item, index) {
// if (data1.data.DataColor != undefined) {
// var sj = data1.data.DataColor;
@@ -2035,7 +2072,7 @@
, area: ['100%', '100%']
, title: 'Excel瀵煎叆'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html?OperationType=1'
+ , content: '../涓夊崌鎺掍骇/JIT_DayPlanPlatFormImport_SS_Sec.html?OperationType=1'
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -2048,7 +2085,7 @@
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
- , title: 'Excel瀵煎叆'
+ , title: '浜ゆ湡瀵煎叆'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../涓夊崌鎺掍骇/JIT_DayPlanPlatFormImport_SS.html?OperationType=1'
, end: function () {
@@ -2574,10 +2611,10 @@
//鍑嗗
- function get_btnReady() {
- var data = table.cache["mainTable"];
+ function get_btnReady(data) {
+ /*var data = table.cache["mainTable"];*/
var HTotalDataList = [[]];
-
+ var ajaxData;
var index = 0;
var countEveryGroup = 50;
for (var i = 0; i < data.length; i++) {
@@ -2585,7 +2622,8 @@
return layer.msg("璇峰厛杩涜淇濆瓨!!")
}
if (isNaN(data[i]["HSourceID"])) {
- return layer.msg("閫夋嫨鐢熶骇璧勬簮!!")
+ data[i]["HSourceID"] = 0
+ /*return layer.msg("閫夋嫨鐢熶骇璧勬簮!!")*/
}
if ((index / countEveryGroup).toFixed(0)*1 == HTotalDataList.length) {
@@ -2605,22 +2643,26 @@
HICOMNum = HTotalDataList[t];
$.ajax({
- url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData',
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData_SS',
async: false,
type: "GET",
data: { "SWhere": HICOMNum.toString() },
success: function (data1) {
if (data1.count == 1) {
+ ajaxData = data1.data;
for (var i = 0; i < data1.data.length; i++) {
for (var j = 0; j < option.data.length; j++) {
if (data1.data[i]["HICMOInterID"] == option.data[j]["HICMOInterID"] && data1.data[i]["HICMOEntryID"] == option.data[j]["HICMOEntryID"]) {
option.data[j]["灏忔椂浜ц兘"] = data1.data[i]["灏忔椂浜ц兘"];
+ option.data[j]["HSourceID"] = data1.data[i]["HSourceID"];
+ option.data[j]["鐢熶骇璧勬簮"] = data1.data[i]["鐢熶骇璧勬簮"];
option.data[j]["鐢熶骇鍛ㄦ湡"] = data1.data[i]["鐢熶骇鍛ㄦ湡"];
option.data[j]["寮�宸ヤ綑閲�"] = data1.data[i]["寮�宸ヤ綑閲�"];
option.data[j]["鏈�杩熷紑宸ユ棩鏈�"] = data1.data[i]["鏈�杩熷紑宸ユ棩鏈�"];
option.data[j]["鏈�杩熷畬宸ユ棩鏈�"] = data1.data[i]["鏈�杩熷畬宸ユ棩鏈�"];
option.data[j]["璁㈠崟闇�姹傛暟閲�"] = data1.data[i]["璁㈠崟闇�姹傛暟閲�"];
option.data[j]["璁㈠崟浜よ揣鏈�"] = data1.data[i]["璁㈠崟浜よ揣鏈�"] < "2020-01-01 0:00:00" ? "1900-01-01" : data1.data[i]["璁㈠崟浜よ揣鏈�"];
+
break;
}
}
@@ -2670,10 +2712,10 @@
}
table.render(option);
- set_Priority();
- data = table.cache["mainTable"];
- for (var i = 0; i < data.length; i++) {
- if (parseFloat(data[i]["灏忔椂浜ц兘"]) == 0 || parseFloat(data[i]["灏忔椂浜ц兘"]) == null || parseFloat(data[i]["灏忔椂浜ц兘"]) == undefined) {
+ /*set_Priority();*/
+ /*data = table.cache["mainTable"];*/
+ for (var i = 0; i < ajaxData.length; i++) {
+ if (parseFloat(ajaxData[i]["灏忔椂浜ц兘"]) == 0 || parseFloat(ajaxData[i]["灏忔椂浜ц兘"]) == null || parseFloat(ajaxData[i]["灏忔椂浜ц兘"]) == undefined) {
msg += "绗�" + (i + 1) + '琛岋紝灏忔椂浜ц兘鏈缃紝璇锋牳瀵规暟鎹��' + '</br>' + '1.鐗╂枡鏈坊鍔犲伐鑹鸿矾绾�' + '</br>' + '2.宸ヨ壓璺嚎涓湭璁剧疆灏忔椂浜ц兘' + '</br>' + '3.鐢熶骇璧勬簮鏈缃崟鐝伐鏃�' + '</br>' + '4.鐢熶骇璧勬簮涓粦瀹氬伐浣滀腑蹇冧笌宸ヨ壓璺嚎涓缃殑宸ヤ綔涓績涓嶄竴鑷�';
}
}
@@ -2960,8 +3002,10 @@
iRow = i + 1;
//灏嗘暟鎹帓鍒扮綉鏍间腑
SetInfoToGrid(option, dsSub, null, (iRow - 1), iLeftQty, sWorkQty, false, HPlanDay);
-
- set_AddNew1(option.data[i]);
+ //鑻ュ伐鍗曡閿佸畾浜嗚烦杩囦繚瀛樺唴瀹�
+ if (option.data[i]["閿佸畾宸ュ崟"] == "鍚�") {
+ set_AddNew1(option.data[i]);
+ }
}
bFind = true;
}
@@ -3651,7 +3695,8 @@
if (num >= data.length) {
break;
}
- if (option.data[i]["LAY_CHECKED"] == true) {
+ if ($.grep(data, function (item) {
+ return item.hmainid === option.data[i].hmainid;}).length > 0) {
option.data[i]["HSourceID"] = OptionData[0].HItemID;
option.data[i]["鐢熶骇璧勬簮"] = OptionData[0].鐢熶骇璧勬簮鍚嶇О;
num += 1;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatFormImport_SS.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatFormImport_SS.html"
index 10a2573..2c1f94e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatFormImport_SS.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatFormImport_SS.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>鐢熶骇鏃ヨ鍒掑鍏�</title>
+ <title>鐢熶骇鏃ヨ鍒掍氦鏈熷鍏�</title>
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
@@ -275,7 +275,7 @@
obj.del();
table.cache["mainTable"].splice(rowIndex, 1); //鈶″交搴曠Щ闄ゅ厓绱狅紝浠庣紦瀛橀噷绉婚櫎杩欎竴琛�
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
- table.reload(option);
+ table.render(option);
layer.close(index);
});
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatFormImport_SS_Sec.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatFormImport_SS_Sec.html"
new file mode 100644
index 0000000..cfb001f
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatFormImport_SS_Sec.html"
@@ -0,0 +1,397 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鐢熶骇鏃ヨ鍒掑鍏�</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <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>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <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="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 75px;" disabled>
+ </div>
+ </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: 185px;">
+ <select name="HOrderType" id="HOrderType" lay-verify="HOrderType">
+ <option value="鐢熶骇璁㈠崟">鐢熶骇璁㈠崟</option>
+ <option value="濮斿璁㈠崟">濮斿璁㈠崟</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="hidden" name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
+
+ //#region 鍏叡鍙橀噺
+
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , excel = layui.excel
+ , upload = layui.upload
+ , element = layui.element;
+
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj);//琛屽唴蹇嵎閿瓫閫�
+ //#region 淇敼鏃堕棿
+ var data = obj.data;
+ //鏃ヨ鍒掔敓浜ф棩鏈�
+ if (obj.event == 'HPlanEndDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ }
+ });
+ }
+ //#endregion
+
+ });
+
+ //鏂囦欢涓婁紶
+ upload.render({
+ elem: '#UpLoad',
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_SS_Sec',
+ contentType: 'application/json',
+ exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ before: function (data) {
+ loadIndex = layer.load(2);
+ },
+ done: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(loadIndex);
+ } else {
+ layer.close(loadIndex);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ debugger
+ layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+ }
+ });
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ if (OperationType == 1) {
+ Pub_Close(1);
+ }
+ else {
+ Pub_Close(2);
+ }
+ })
+
+ //瀵煎叆 淇濆瓨鏁版嵁
+ form.on('submit(btnSave)', function (data) {
+ if (table.cache["mainTable"] != null) {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+ }
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+
+ //#endregion
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+
+ var myDate = new Date();
+ var yyyy = myDate.getFullYear();
+ var MM = myDate.getMonth() + 1;
+ var dd = myDate.getDate();
+ var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
+ var columns = [];
+ var HBEGINDATE = new Date(new Date($("#HDate").val())).getDate(); //鑾峰彇寮�濮嬫棩鏈熷ぉ鏁�
+
+ columns.push({ type: 'checkbox', fixed: 'left' });
+ columns.push({ field: 'HMaterID', title: 'HMaterID', width: 150, hide: true });
+ columns.push({ field: 'hmainid', title: 'hmainid', width: 150, hide: true });
+ columns.push({ field: 'ICMOBillHInterID', title: 'ICMOBillHInterID', width: 150, hide: true });
+ columns.push({ field: 'ICMOBillHEntryID', title: 'ICMOBillHEntryID', width: 150, hide: true });
+ columns.push({ field: '瀹㈡埛璁㈠崟鍙�', title: '瀹㈡埛璁㈠崟鍙�', width: 200, edit: true });
+ columns.push({ field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 150, edit: true });
+ columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', edit: 'text' });
+ columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�' });
+ columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
+ columns.push({ field: '鐢熶骇璧勬簮缂栫爜', title: '鐢熶骇璧勬簮', edit: 'text', event: "HSourceID" });
+ columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, event: "HPlanEndDate", edit: true });
+
+ var k = 0;//鏀堕泦寰幆娆℃暟
+ var Days = 45;
+ for (var j = 0; j <= (Days - k); j++) {
+ columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true })
+ //璺ㄥ勾鐨勮瘽 浼氫粠涓�鏈堜竴鍙峰紑濮�
+ if (MM == 12 && (HBEGINDATE + j) == 31) {
+ yyyy += 1;
+ MM = 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ HBEGINDATE = 0;
+ k += j;
+ j = 0;
+ } else if ((HBEGINDATE + j) == SumMonth) { //璺ㄦ湀 鏈堟暟鍔犱竴 澶╂暟浠庝竴寮�濮�
+ HBEGINDATE = 0;
+ MM += 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ k += j;
+ j = 0;
+ }
+ }
+
+ //for (var i = 0; i <= (SumMonth - dd); i++) {
+ // columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'MM.dd'), edit: 'text', width:80 })
+ //}
+ //for (var i = 1; i <= dd; i++) {
+ // columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'MM.dd'), edit: 'text', width: 80 })
+ //}
+ columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
+
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-190'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , cols: [columns]
+ };
+ table.render(option);
+ }
+
+ //瀵煎叆(淇濆瓨)
+ function set_AddNew(data) {
+
+ var num = [];
+
+ //鍒ゆ柇鏄惁鏈夊鍏ユ潈闄愶紝濡傛灉鏈夊垯灏嗘�昏杞﹂棿涔嬪墠鐨勬棩璁″垝宸ュ崟浣滃簾
+ if (!set_ModCheck("Sc_WorkBillSortBill_Edit")) {
+ layer.msg("瀵煎叆澶辫触锛佹棤瀵煎叆鏉冮檺锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+
+ var HDataSub = [];
+ var index = layer.load();
+ layer.msg("寮�濮嬪鍏�");
+ //JIT瀵煎叆璁″垝锛屾瘡娆″鍏�100琛屾暟鎹�,鍙慨鏀筰鐨勮嚜澧炲�煎喅瀹氭瘡娆″惊鐜鍏ョ殑琛屾暟
+ for (var i = 0; i < option.data.length; i += 100) {
+ HDataSub = option.data.slice(i, i + 100)
+
+ data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(HDataSub);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_btnSave_SS_Sec",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.msg("鎻愪氦鎴愬姛");
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ layer.close(index);
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ obj.del();
+ table.cache["mainTable"].splice(rowIndex, 1); //鈶″交搴曠Щ闄ゅ厓绱狅紝浠庣紦瀛橀噷绉婚櫎杩欎竴琛�
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ });
+ }
+ }
+
+ //琛屽唴鍒犻櫎蹇嵎閿�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //鐢熶骇璧勬簮
+ if (obj.event == "HSourceID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐢熶骇璧勬簮鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html", "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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HSourceID": checkStatus.data[0].HItemID
+ , "鐢熶骇璧勬簮缂栫爜": checkStatus.data[0].鐢熶骇璧勬簮浠ｇ爜
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ obj.event = "";
+ return false;
+ }
+
+ })
+ }
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+
+ //#region 鏉冮檺鍒ゅ畾
+ function set_ModCheck(ModRightNameCheck) {
+ var Permission = false;
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ Permission = true;
+ } else {
+ //layer.alert("褰撳墠妯″潡娌℃湁鏌ヨ鏉冮檺!", { icon: 5 });
+ }
+ }, error: function (e) {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ return Permission;
+ }
+ //#endregion
+
+ //#endregion
+
+ });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
index fce9c21..a925f6b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
@@ -13,6 +13,26 @@
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/SetColumn.js"></script>
+ <style>
+ .loader {
+ border: 8px solid #f3f3f3; /* Light grey */
+ border-top: 8px solid #3498db; /* Blue */
+ border-radius: 50%;
+ width: 50px;
+ height: 50px;
+ animation: spin 2s linear infinite;
+ }
+
+ @keyframes spin {
+ 0% {
+ transform: rotate(0deg);
+ }
+
+ 100% {
+ transform: rotate(360deg);
+ }
+ }
+ </style>
</head>
<body>
<div class="layui-fluid">
@@ -783,7 +803,7 @@
shadeClose: false, // 鐐瑰嚮閬僵鍖哄煙锛屼笉鍏抽棴寮瑰眰
maxmin: false, // 涓嶅厑璁稿叏灞忔渶灏忓寲
anim: 0, // 0-6 鐨勫姩鐢诲舰寮忥紝-1 涓嶅紑鍚�
- content: '<div style="padding: 12px;">姝ｅ湪杩愮畻,璇疯�愬績绛夊緟!!!</div>'
+ content: '<div style="padding: 12px;">姝ｅ湪杩愮畻,璇疯�愬績绛夊緟!!!<div class="loader" style="height:10px;width:10px;"></div></div>'
});
setTimeout(function () {
get_btnProPC(HWorkShopID);
@@ -1463,7 +1483,19 @@
console.log(table.cache["mainTable"]) // 鏀瑰姩鍚庢暟鎹储寮�
- option.data = table.cache["mainTable"];
+
+ var data = table.cache["mainTable"];
+ for (var i = 0; i < data.length; i++) {
+ data[i]["浼樺厛绾�"] = ((i + 1) * 5);
+ }
+ option.data = data;
+
+ table.reload('mainTable', {
+ data: option.data
+ });
+
+ //table.render(option);
+ //option.data = table.cache["mainTable"];
}
}
, sort: function (obj) { // 鎺掑簭浜嬩欢
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_PickUpCalculate_BaoGong.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_PickUpCalculate_BaoGong.html"
index 95f28ee..b7e49e2 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_PickUpCalculate_BaoGong.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_PickUpCalculate_BaoGong.html"
@@ -107,7 +107,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&HOrgName=' + HOrgName, 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=1&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Excel.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Excel.html"
index 4264965..3ce2f76 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Excel.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Excel.html"
@@ -88,6 +88,9 @@
url: GetWEBURL() + '/Cg_PODemandPlanConfigBill/Cg_PODemandPlanConfigBill_Excel',
contentType: 'application/json',
exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ before: function (data) {
+ loadIndex = layer.load(2);
+ },
//data: {
// "WorkBookName": function () {
// return $("#WorkBookName").val();
@@ -108,6 +111,7 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
+ layer.close(loadIndex);
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Excel.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Excel.html"
index f2d8dba..bafd8b7 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Excel.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Excel.html"
@@ -88,6 +88,9 @@
url: GetWEBURL() + '/Sc_JIT_ComplementGoodBill/Sc_JIT_ComplementGoodBill_Excel',
contentType: 'application/json',
exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ before: function (data) {
+ loadIndex = layer.load(2);
+ },
//data: {
// "WorkBookName": function () {
// return $("#WorkBookName").val();
@@ -108,6 +111,7 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
+ layer.close(loadIndex);
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/JIT_FuHeFenXiReport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/JIT_FuHeFenXiReport.html"
index a09d422..dc7fe1a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/JIT_FuHeFenXiReport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/JIT_FuHeFenXiReport.html"
@@ -34,7 +34,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">宸ュ簭鍚嶇О</label>
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭鍒嗙被</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HProcTotalName" id="HProcTotalName">
</div>
@@ -134,6 +134,7 @@
<div class="layui-btn-container">
<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" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Export" id="get_Export"><i class="layui-icon layui-icon-form"></i>瀵煎嚭</button>
</div>
</script>
</form>
@@ -164,6 +165,8 @@
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+
//#endregion
@@ -178,10 +181,13 @@
var checkStatus = table.checkStatus(obj.config.id);
switch (obj.event) {
//閫�鍑烘寜閽�
- case 'get_Exit': Pub_Close(2);
+ case 'btn-exit': Pub_Close(2);
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
+ break;
+ //瀵煎嚭
+ case "get_Export": get_Export();
break;
};
});
@@ -221,13 +227,51 @@
})
//#endregion
+
+ //#region 鍙屽嚮鏌ョ湅鏄庣粏
+ table.on('rowDouble(mainTable)', function (obj) {
+ //閫変腑楂樹寒 鍙屽嚮琛�
+ obj.tr.find(':checkbox').prop('checked', true);
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = true;
+ }
+ });
+
+ var HProcType = obj.data["宸ュ簭鍒嗙被"];
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '璐熻嵎鍒嗘瀽鎶ヨ〃鏄庣粏'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/JIT_FuHeFenXiReportDetail.html?Type=Detail&HProcType=' + encodeURIComponent(HProcType)
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ //$("#btnSearch").trigger('click');
+ }
+ , cancel: function () {
+
+ }
+ })
+ });
+ //#endregion
+
//#region 姝ら〉闈㈡墍鏈夋柟娉�
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ //get_Display(sWhere);
+
+ get_FastQuery();
}
//#endregion
@@ -247,64 +291,137 @@
//#endregion
//#region 鏌ヨ
- function get_Display(sWhere) {
- var index = layer.load(0, { shade: false });
- var ajaxLoad = layer.load();
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
+ //function get_Display(sWhere) {
+ // var index = layer.load(0, { shade: false });
+ // var ajaxLoad = layer.load();
+ // //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ // $.ajax({
- url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_FuHeFenXiReport',
+ // url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_FuHeFenXiReport',
+ // type: "GET",
+ // data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // var data = [];
+ // var col = [];
+ // //缁欑┖鐨勬暟缁勮祴鍊�
+ // 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' });
+ // for (var i = 0; i < data.length; i++) {
+ // // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ // 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:
+ // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ // }
+ // }
+ // }
+
+ // //鍔ㄦ�佹樉绀哄垪鍚�
+ // option = {
+ // elem: '#mainTable'
+ // , toolbar: '#toolbarDemo'
+ // , cols: [col]
+ // , data: data1.data
+ // , height: 'full-80'
+ // , page: true
+ // , limits: [50, 500, 5000, 20000]
+ // , limit: 50
+ // , cellMinWidth: 90
+ // }
+ // table.render(option);
+ // ////鍒锋柊鎸夐挳鏄剧ず
+ // //var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ // //var HBillType = "Gy_Post";
+ // //Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ // //鍒锋柊琛ㄦ牸鏁版嵁
+ // DisPlay_HideColumn();
+
+ // layer.close(ajaxLoad);
+ // if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
+ // ColFilter();
+ // }
+
+ // //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 });
+ // }
+ // });
+ // layer.close(index);
+ //}
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(sql) {
+ var ajaxLoad = layer.load();
+ var ModRightNameCheck = "";
+ $.ajax({
+ url: GetWEBURL() + '/CommonModel/searchMethod',
+ async:false,
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck },
success: function (data1) {
if (data1.count == 1) {
+ var totalArray = [];
var data = [];
var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
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' });
+ //col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
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 {
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 });
+ 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: 120 });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
}
}
}
- //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cols: [col]
- , data: data1.data
- , height: 'full-80'
- , page: true
- , limits: [50, 500, 5000, 20000]
- , limit: 50
- , cellMinWidth: 90
- }
- table.render(option);
+ option.cols = [col];
+ option.data = data1.data;
+ ins = table.render(option);
+
////鍒锋柊鎸夐挳鏄剧ず
//var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- //var HBillType = "Gy_Post";
+ //var HBillType = "JIT_FuHeFenXiReport";
//Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+ //DisPlay_HideColumn();
layer.close(ajaxLoad);
+
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
ColFilter();
}
@@ -319,7 +436,7 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- layer.close(index);
+
}
//#endregion
@@ -404,11 +521,15 @@
}
if (HProcTotalName) {
- sWhere += " and 宸ュ簭鍚嶇О like ''%" + HProcTotalName + "%''";
+ sWhere += " and 宸ュ簭鍒嗙被 like ''%" + HProcTotalName + "%''";
}
+
+ var sql = "exec h_p_FuHeFenXiReport 2,'" + sWhere + "'";
+
+ get_Display(sql);
- get_Display(sWhere);
+ //get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
@@ -433,7 +554,39 @@
sWhere = "";
}
//#endregion
-
+
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ //var ModRightNameCheck = "Cg_PODemandPlanConfigBillReportForLack_ExportExcel";
+
+ ////閫昏緫瀹℃牳鏂规硶
+ //$.ajax({
+ // type: "GET",
+ // url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ // data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ // success: function (result) {
+ // if (result.count == 1) {
+ // var addExportStr = ["渚涘簲鍟嗕唬鐮�"];
+ // var data = option.data;
+ // for (var i = 0; i < data.length; i++) {
+ // for (var j = 0; j < addExportStr.length; j++) {
+ // var temp = data[i][addExportStr[j]].indexOf("'");
+ // if (temp != 0) {
+ // data[i][addExportStr[j]] = "'" + data[i][addExportStr[j]];
+ // }
+ // }
+ // }
+ table.exportFile(ins.config.id, option.data, "xls");
+ // } else {
+ // layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+ }
+ //#endregion
//#endregion
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/JIT_FuHeFenXiReportDetail.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/JIT_FuHeFenXiReportDetail.html"
new file mode 100644
index 0000000..48b25ae
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/JIT_FuHeFenXiReportDetail.html"
@@ -0,0 +1,728 @@
+锘�<!DOCTYPE html>
+<html>
+<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">
+ <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>
+ <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>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</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" style="width: 85px;">宸ュ簭鍒嗙被</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProcTotalName" id="HProcTotalName">
+ </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" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" 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="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <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>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <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>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
+ </div>
+ </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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Export" id="get_Export"><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'], 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
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "h_p_JIT_FuHeFenXiReport";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = [];
+
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //閫�鍑烘寜閽�
+ case 'btn-exit': Pub_Close(1);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ //瀵煎嚭
+ case "get_Export": get_Export();
+ break;
+ };
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+ //#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
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ //get_Display(sWhere);
+
+ get_FastQuery();
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limits: [50, 500, 5000, 20000]
+ , limit: 50
+ , cellMinWidth: 90
+
+ };
+ }
+ //#endregion
+
+ //#region 鏌ヨ
+ //function get_Display(sWhere) {
+ // var index = layer.load(0, { shade: false });
+ // var ajaxLoad = layer.load();
+ // //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ // $.ajax({
+
+ // url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_FuHeFenXiReport',
+ // type: "GET",
+ // data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // var data = [];
+ // var col = [];
+ // //缁欑┖鐨勬暟缁勮祴鍊�
+ // 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' });
+ // for (var i = 0; i < data.length; i++) {
+ // // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ // 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:
+ // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ // }
+ // }
+ // }
+
+ // //鍔ㄦ�佹樉绀哄垪鍚�
+ // option = {
+ // elem: '#mainTable'
+ // , toolbar: '#toolbarDemo'
+ // , cols: [col]
+ // , data: data1.data
+ // , height: 'full-80'
+ // , page: true
+ // , limits: [50, 500, 5000, 20000]
+ // , limit: 50
+ // , cellMinWidth: 90
+ // }
+ // table.render(option);
+ // ////鍒锋柊鎸夐挳鏄剧ず
+ // //var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ // //var HBillType = "Gy_Post";
+ // //Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ // //鍒锋柊琛ㄦ牸鏁版嵁
+ // DisPlay_HideColumn();
+
+ // layer.close(ajaxLoad);
+ // if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
+ // ColFilter();
+ // }
+
+ // //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 });
+ // }
+ // });
+ // layer.close(index);
+ //}
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(sql) {
+ var ajaxLoad = layer.load();
+ var ModRightNameCheck = "";
+ $.ajax({
+ url: GetWEBURL() + '/CommonModel/searchMethod',
+ async:false,
+ type: "GET",
+ data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var totalArray = [];
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ 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' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ 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 {
+ 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: 120 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = data1.data;
+ ins = table.render(option);
+
+ ////鍒锋柊鎸夐挳鏄剧ず
+ //var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ //var HBillType = "JIT_FuHeFenXiReport";
+ //Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ //DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
+ ColFilter();
+ }
+
+ //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 HProcTotalName = $("#HProcTotalName").val();
+
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
+
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like''%" + ColContent + "%''";
+ break;
+ case "8":
+ com = "like''%" + ColContent + "''";
+ break;
+ case "9":
+ com = "like''" + ColContent + "%''";
+ break;
+ case "10":
+ com = "not like''%" + ColContent + "%''";
+ break;
+ default:
+ com = "" + Comparator + "''" + ColContent + "''";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like''%" + ColContent1 + "%''";
+ break;
+ case "8":
+ com1 = "like''%" + ColContent1 + "''";
+ break;
+ case "9":
+ com1 = "like''" + ColContent1 + "%''";
+ break;
+ case "10":
+ com1 = "not like''%" + ColContent1 + "%''";
+ break;
+ default:
+ com1 = "" + Comparator1 + "''" + ColContent1 + "''";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like''%" + ColContent2 + "%''";
+ break;
+ case "8":
+ com2 = "like''%" + ColContent2 + "''";
+ break;
+ case "9":
+ com2 = "like''" + ColContent2 + "%''";
+ break;
+ case "10":
+ com2 = "not like''%" + ColContent2 + "%''";
+ break;
+ default:
+ com2 = "" + Comparator + "''" + ColContent + "''";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
+
+ if (HProcTotalName) {
+ sWhere += " and 宸ュ簭鍒嗙被 like ''%" + HProcTotalName + "%''";
+ }
+
+ //鍒ゆ柇鏄惁鏄叾瀹冮〉闈㈡墦寮�鐨勶紝闄勫姞杩囨护鏉′欢
+ addSWhereByOpenType();
+
+ var sql = "exec h_p_FuHeFenXiReport 1,'" + sWhere + "'";
+
+ get_Display(sql);
+
+ //get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆蹇�熸煡璇�
+ function set_ClearQuery() {
+
+ $("#HProcTotalName").val("");
+
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0")
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");;
+ form.render('select');
+
+ $("#btnSearch").click();
+ sWhere = "";
+ }
+ //#endregion
+
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ //var ModRightNameCheck = "Cg_PODemandPlanConfigBillReportForLack_ExportExcel";
+
+ ////閫昏緫瀹℃牳鏂规硶
+ //$.ajax({
+ // type: "GET",
+ // url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ // data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ // success: function (result) {
+ // if (result.count == 1) {
+ // var addExportStr = ["渚涘簲鍟嗕唬鐮�"];
+ // var data = option.data;
+ // for (var i = 0; i < data.length; i++) {
+ // for (var j = 0; j < addExportStr.length; j++) {
+ // var temp = data[i][addExportStr[j]].indexOf("'");
+ // if (temp != 0) {
+ // data[i][addExportStr[j]] = "'" + data[i][addExportStr[j]];
+ // }
+ // }
+ // }
+ table.exportFile(ins.config.id, option.data, "xls");
+ // } else {
+ // layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+ }
+ //#endregion
+
+
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HProcType = params[params[1]];
+ if (typeof (openType) != "undefined") {
+ if (openType == "Detail") {
+ sWhere += " and 宸ュ簭鍒嗙被= ''" + decodeURIComponent(HProcType) + "''";
+ }
+ }
+ }
+ //#endregion
+ //#endregion
+
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "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",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ 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 (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ 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;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ 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";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
index 2b3fb61..67f1aaf 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
@@ -254,7 +254,8 @@
}
}
- columns.push({ field: '鎻愭枡璁″垝鍚堣', title: '鎻愭枡璁″垝鍚堣', filter: true });
+ columns.push({
+ field: '鎻愭枡璁″垝鍚堣', title: '鎻愭枡璁″垝鍚堣', filter: true });
option = {
elem: '#mainTable'
@@ -306,7 +307,7 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- option.data = result.data;
+ option.data = addTotalField(result.data);
//鍒楄缃�
DisPlay_HideColumnForPlan(HModName, sessionStorage["HUserName"], option);
ins = table.render(option);
@@ -458,6 +459,32 @@
form.render('select');
}
+ function addTotalField(arr) {
+ return arr.map(obj => {
+ // 鍒涘缓鏂板璞★紝閬垮厤淇敼鍘熷璞�
+ const newObj = { ...obj };
+
+ // 璁＄畻绗﹀悎鏃ユ湡鏍煎紡鐨勫瓧娈靛�肩殑鍚堣
+ let total = 0;
+ for (const [key, value] of Object.entries(obj)) {
+ if (isValidDate(key)) {
+ // 纭繚鍊兼槸鏁板瓧绫诲瀷
+ const numValue = Number(value);
+ if (!isNaN(numValue)) {
+ total += numValue;
+ }
+ }
+ }
+ // 澶勭悊娴偣鏁扮簿搴﹂棶棰�
+ const roundedTotal = parseFloat(total.toFixed(2));
+
+ // 娣诲姞鎻愭枡璁″垝鍚堣瀛楁
+ newObj['鎻愭枡璁″垝鍚堣'] = roundedTotal;
+
+ return newObj;
+ });
+ }
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
index 7fbbd55..9b18112 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
@@ -182,8 +182,9 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栨棩鏈�
- $("#HBEGINDATE").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
- $("#HENDDATE").val(Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + 30), "yyyy-MM-dd"));//鑷�
+ $("#HBEGINDATE").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 25), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
+ var HEndDate = Format(new Date().setDate(new Date().getDate() + 25), "yyyy-MM-dd");
+ $("#HENDDATE").val(HEndDate);//鑷�
//鐢熶骇缁勭粐鍔犺浇
Organ();
@@ -212,18 +213,21 @@
columns.push({ field: 'FNUMBER', title: '鐗╂枡缂栫爜', sort: true, filter: true });
columns.push({ field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅', sort: true, filter: true });
columns.push({ field: 'TQSUM', title: '鎻愭枡鎷栨湡鏁伴噺', sort: true, totalRow: true, filter: true });
+ columns.push({ field: 'TQSUM', title: '鎻愭枡鎷栨湡鏁伴噺', sort: true, totalRow: true, filter: true });
+ columns.push({ field: '閫炬湡鎻愭枡鎬诲拰', title: '閫炬湡鎻愭枡鎬诲拰', sort: true, totalRow: true, filter: true });
+ columns.push({ field: '鎻愭枡鎬诲拰', title: '鎻愭枡鎬诲拰', sort: true, totalRow: true, filter: true });
//鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
- var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//寮�濮嬫椂闂�
+ var time1 = Date.parse(new Date());//寮�濮嬫椂闂�
var time2 = Date.parse(new Date($("#HENDDATE").val()));//缁撴潫鏃堕棿
var Days = Math.abs(parseInt((time2 - time1) / 1000 / 3600 / 24));
//鑾峰彇骞�
- var yyyy = new Date($("#HBEGINDATE").val()).getFullYear();
+ var yyyy = new Date().getFullYear();
//鑾峰彇鏈堜唤
- var MM = new Date($("#HBEGINDATE").val()).getMonth() + 1;
+ var MM = new Date().getMonth() + 1;
//鑾峰彇寮�濮嬫湀浠界殑鏈�澶уぉ鏁�
var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸�
//鑾峰彇寮�濮嬫棩鏈熺殑澶╂暟
- var HBEGINDATE = new Date(new Date($("#HBEGINDATE").val())).getDate(); //鑾峰彇寮�濮嬫棩鏈熷ぉ鏁�
+ var HBEGINDATE = new Date(new Date()).getDate(); //鑾峰彇寮�濮嬫棩鏈熷ぉ鏁�
var k = 0;//鏀堕泦寰幆娆℃暟
for (var j = 0; j <= (Days - k); j++) {
@@ -244,7 +248,25 @@
j = 0;
}
}
- columns.push({ field: '鎻愭枡璁″垝鍚堣', title: '鎻愭枡璁″垝鍚堣', filter: true });
+ columns.push({
+ field: '鎻愭枡璁″垝鍚堣', title: '鎻愭枡璁″垝鍚堣', filter: true, templet: function (d) {
+ //console.log(d); // 寰楀埌褰撳墠琛屾暟鎹�
+ //console.log(this); // 寰楀埌琛ㄥご褰撳墠鍒楅厤缃」
+ //console.log(d.LAY_NUM);
+ let sum = 0;
+
+ // 閬嶅巻鏁版嵁瀵硅薄鐨勬墍鏈夊睘鎬�
+ for (let key in d) {
+ // 妫�鏌ュ垪鍚嶆槸鍚︾鍚� isValidDate 鏉′欢
+ if (isValidDate(key)) {
+ // 灏� null/undefined 杞负 0
+ sum += d[key] ? parseFloat(d[key]) : 0;
+ }
+ }
+
+ return sum; // 淇濈暀涓や綅灏忔暟
+ }
+ });
option = {
elem: '#mainTable'
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysis.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysis.html"
index 209f115..6d0f586 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysis.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysis.html"
@@ -252,7 +252,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&HOrgName=' + HOrgName, 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=1&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBillList.html"
index 924c567..42956d3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBillList.html"
@@ -32,18 +32,19 @@
</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="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">
<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" style="width: 85px;">鍗曟嵁鍙�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <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">
@@ -382,6 +383,8 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鏌ヨ
+ get_FastQuery();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -639,6 +642,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_ShiftsBeginInfoBill/get锘縎c_ShiftsBeginInfoBillListPage',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
success: function (data1) {
option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
@@ -662,7 +666,10 @@
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} 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>'
+ } });
}
else {
switch (data[i].Type) {
@@ -994,9 +1001,9 @@
//褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
var data = data1.data;
//褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
- HInterID_Choose = data[0].HInterID;
+ HInterID_Choose = data[0].hmainid;
//杩囨护鏂规鍐呯爜
- HInterID = data[0].HInterID
+ HInterID = data[0].hmainid
//杩囨护鏂规鍚嶇О
HDefaultFilter = data[0].鏂规鍚嶇О
//杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
@@ -1019,7 +1026,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery(1)
+ //get_FastQuery(1)
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBill_Add_Edit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBill_Add_Edit.html"
index f4b6e5f..2753e29 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBill_Add_Edit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBill_Add_Edit.html"
@@ -29,6 +29,7 @@
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
<div style="padding: 2px; ">
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
@@ -123,6 +124,12 @@
<label class="layui-form-label" style="width: 85px;">搴斿埌宀椾汉鏁�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" class="layui-input" lay-verify="HStdEmpQty" name="HStdEmpQty" id="HStdEmpQty" value="">
+ </div>
+ </div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹炲埌宀椾汉鏁�<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" lay-verify="HRelEmpQty" name="HRelEmpQty" id="HRelEmpQty" value="">
</div>
</div>
<div class="layui-col-xs3 layui-inline">
@@ -311,7 +318,7 @@
$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栨棩鏈�
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
-
+ GetDefValByUser();
}
else if (OperationType == 2) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //澶嶅埗
OperationType = 1;
@@ -323,6 +330,14 @@
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HUpDater").val('');
+ $("#HUpDateDate").val('');
+ $("#HChecker").val('');
+ $("#HCheckDate").val('');
+ $("#HCloseMan").val('');
+ $("#HCloseDate").val('');
+ $("#HDeleteMan").val('');
+ $("#HDeleteDate").val('');
//鍒濆鍖栨棩鏈�
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
}
@@ -387,6 +402,11 @@
}
});
//#endregion
+
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(1);
+ });
//#region 閫�鍑�
form.on('submit(btnEdit)', function (data) {
@@ -548,7 +568,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鑱屽憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker&openType=2', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -802,6 +822,7 @@
, "HGroupLeaderID": data[0]["HGroupLeaderID"]
, "HGroupLeaderName": data[0]["鐝粍闀�"]
, "HStdEmpQty": data[0]["搴斿埌宀椾汉鏁�"]
+ , "HRelEmpQty": data[0]["瀹炲埌宀椾汉鏁�"]
, "HPlanShutdownTimes": data[0]["璁″垝鍋滃伐鏃堕暱"]
, "HRemark": data[0]["琛ㄥご澶囨敞"]
@@ -836,6 +857,39 @@
})
}
//#endregion
+
+ //#region 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
+ function GetDefValByUser() {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationInBill/GetDefValByUser",
+ type: "GET",
+ async: false,
+ data: { "Czybm": sessionStorage["Czybm"], "Czymc": sessionStorage["HUserName"] },
+ success: function (result) {
+ var data = result.data[0];
+
+ form.val("formData", {
+ //"HSourceID": data.HSourceID,
+ //"HSourceName": data.鐢熶骇璧勬簮鍚嶇О,
+ "HDeptID": data["HDeptID"]
+ , "HDeptName": data["閮ㄩ棬鍚嶇О"]
+ , "HWorkCenterID": data["HWorkCenterID"]
+ , "HWorkCenterName": data["宸ヤ綔涓績鍚嶇О"]
+ , "HSourceID": data["HSourceID"]
+ , "HSourceName": data["鐢熶骇璧勬簮鍚嶇О"]
+ , "HGroupID": data["HGroupID"]
+ , "HGroupName": data["鐢熶骇鐝粍鍚嶇О"]
+ });
+ layer.close(index);
+ }
+ , error: function () {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触");
+ }
+ })
+ }
+ //#endregion
//#region 闈炵┖楠岃瘉
function AllowLoadData(data) {
@@ -920,7 +974,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=&openType=2', "yes"]
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -962,6 +1016,16 @@
}
, btn2: function (index, layero) { }
, end: function () {
+
+ if (typeof (OptionData[0].HItemID) != "undefined") {
+ obj.update({
+ "HWorkEmpID": OptionData[0].HItemID
+ , "HWorkEmpNumber": OptionData[0].鑱屽憳浠ｇ爜
+ , "HWorkEmpName": OptionData[0].鑱屽憳鍚嶇О
+
+ })
+ }
+ OptionData = "";
}
});
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
index fc1ea34..7263036 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
@@ -260,6 +260,7 @@
//瀵煎叆(淇濆瓨)
function set_AddNew(data) {
+ var msgError = "";
var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
@@ -319,19 +320,27 @@
success: function (data) {
if (data.count == 1) {
layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
+ /* layer.msg("鎻愪氦鎴愬姛");*/
}
else {
layer.close(index);
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ msgError += data.Message + "锛�";
+ //layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
error: function (err) {
layer.close(index);
- layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ msgError += err + "锛�";
+ //layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
- }
+ }
+
+ if (msgError.length == 0) {
+ layer.msg("鎻愪氦鎴愬姛");
+ } else {
+ layer.msg(msgError, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
}
//琛屽唴鍒犻櫎
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html"
index f8cfdf5..cd8dcd8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html"
@@ -1298,7 +1298,7 @@
layer.close(ajaxLoad);
if (HinterID_S.length > 0) {
get_Display_1(HinterID_S);
- get_Display_2(HinterID_S)
+ get_Display_2(HinterID_S);
}
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
@@ -2207,6 +2207,12 @@
if (HCount > 50000) {
break;
}
+
+ if (option.data[i].閿佸畾宸ュ崟 == "鏄�") {
+ HArrIndex_PC.push(i);
+ continue;
+ }
+
var old_date = new Date();
//element.progress('demo', (i + 1) * HProgress + '%')
@@ -3078,15 +3084,30 @@
//灏嗘暟鎹帓绋嬪埌缃戞牸
function SetInfoToGrid(grd, ds, dsPre, iRow, sLeftQty, sWorkQty, bAddFlag, HPlanDay) {
+ var dsindex = 0;
+ var HPCDate_Reset = "";
//鍒ゆ柇褰撳墠鐢熶骇璧勬簮宸茬粡鎺掍骇鍒板摢涓棩鏈熶簡锛屽綋鍓嶇敓浜ц祫婧愯繕鏈変骇鑳界殑鏈�杩戞棩鏈熶笌褰撳墠璁㈠崟鐨勬帓浜ф棩鏈熶笉绗︼紝鍒欓噸缃綋鍓嶆帓浜ф棩鏈�
if (Format(ds[0]["鏃ユ湡"], 'yyyy/MM/dd') != Format(HPCDate, 'yyyy/MM/dd')) {
+
+ for (var i = 0; i < ds.length; i++) {
+ if (Format(ds[i]["鏃ユ湡"], 'yyyy/MM/dd') >= Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd') || HArrIndex_PC.length == option.data.length || HArrIndex.length + HArrIndex_PC.length == option.data.length) {
+ //鐢ㄦ潵閲嶇疆褰撳墠鎺掍骇鏃ユ湡锛堟湁浜涜鍗曞紑宸ユ棩鏈熼潬鍚庯紝瑕佸厛鎶婂悗闈㈡棩鏈熺殑璧勬簮宸ユ椂鍗犵敤锛屾帓浜х粨鏉熷悗鍦ㄦ妸鏃ユ湡璋冨洖鍒版病琚帓浜х殑鏃ユ湡锛�
+ if (i != 0) {
+ HPCDate_Reset = ds[0]["鏃ユ湡"];
+ }
+
+ //鍖归厤璁㈠崟閫傚悎鐨勬帓浜ф棩鏈�
+ dsindex = i;
+ break;
+ }
+ }
//褰撳墠鐢熶骇璧勬簮鍓╀綑浜ц兘鏈�杩戠殑鏃ユ湡婊¤冻鏈�鏃╁紑宸ユ棩鏈燂紝鍒欓噸缃帓浜ф棩鏈熶负褰撳墠鐢熶骇璧勬簮鍓╀綑浜ц兘鏈�杩戠殑鏃ユ湡
- if (Format(ds[0]["鏃ユ湡"], 'yyyy/MM/dd') >= Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd') || HArrIndex_PC.length == option.data.length || HArrIndex.length + HArrIndex_PC.length == option.data.length) {
+ if (Format(ds[dsindex]["鏃ユ湡"], 'yyyy/MM/dd') >= Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd') || HArrIndex_PC.length == option.data.length || HArrIndex.length + HArrIndex_PC.length == option.data.length) {
if (HArrIndex.length + HArrIndex_PC.length == option.data.length) {
HPCDate = Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd');
} else {
- HPCDate = Format(ds[0]["鏃ユ湡"], 'yyyy/MM/dd');
+ HPCDate = Format(ds[dsindex]["鏃ユ湡"], 'yyyy/MM/dd');
}
//濡傛灉鏄渶鍚庝竴绗旇鍗曞湪鎺掍骇锛屽垯閲嶇疆鎺掍骇鏃ユ湡涓烘渶鏃╁紑宸ユ棩鏈燂紙涓嬫柟浼氬垽鏂紝涓嶄細瓒呬骇鑳芥帓浜э級
@@ -3094,7 +3115,6 @@
HPCDate = Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd');
}
} else { //褰撳墠鏃ユ湡涓嶇鍚堣鍗曠殑鏈�鏃╁紑宸ユ棩鏈燂紝鍒欐妸璁㈠崟閲嶆柊鍔犲叆寰呮帓浜у垪琛�
-
//灏嗕笅鏍囧姞鍏ユ湭鎺掍骇璁㈠崟鏁扮粍
if (HArrIndex.indexOf(iRow) == -1) {
HArrIndex.push(iRow);
@@ -3314,7 +3334,12 @@
//oSub.iRow = iRow;
//oSub.iCol = j;
//option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
- HPCDate = Format(grd.cols[0][j].field, 'yyyy/MM/dd');//璧嬪�兼帓浜ф棩鏈�
+
+ if (HPCDate_Reset != "") {
+ HPCDate = HPCDate_Reset;
+ } else {
+ HPCDate = Format(grd.cols[0][j].field, 'yyyy/MM/dd');//璧嬪�兼帓浜ф棩鏈�
+ }
HIsPriority = false;
break;
@@ -3794,6 +3819,13 @@
//鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
var num = [];
for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i].鐗╂枡鍚嶇О.indexOf("\"") != -1 || option.data[i].鐗╂枡鍚嶇О.indexOf(";") != -1) {
+ option.data[i].鐗╂枡鍚嶇О = option.data[i].鐗╂枡鍚嶇О.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+ if (option.data[i].瑙勬牸鍨嬪彿.indexOf("\"") != -1 || option.data[i].瑙勬牸鍨嬪彿.indexOf(";") != -1) {
+ option.data[i].瑙勬牸鍨嬪彿 = option.data[i].瑙勬牸鍨嬪彿.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+
if (option.data[i] != "") {
if (parseFloat(option.data[i]["鎷嗗崟鏁伴噺"]) == 0) {
return layer.msg("绗�" + (i + 1) + "琛�,鎷嗕骇鏁伴噺鏈夎,璇烽噸鏂拌緭鍏�!");
@@ -3806,42 +3838,50 @@
}
}
- //var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(num);
- var sMainSub = sSubStr +"&鍜�" + sessionStorage["HUserName"];
-
+ var HDataSub = [];
var index = layer.load();
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBill_btnSave",
- async: HAsync,
- data: { "sMainSub": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) {
- if ($("#HWorkShopID").val() == 0) {
- get_FastQuery(1);
- HAsync = true;
+
+ //JIT瀵煎叆璁″垝锛屾瘡娆″鍏�100琛屾暟鎹�,鍙慨鏀筰鐨勮嚜澧炲�煎喅瀹氭瘡娆″惊鐜鍏ョ殑琛屾暟
+ for (var i = 0; i < option.data.length; i += 100) {
+ HDataSub = option.data.slice(i, i + 100)
+ console.log("寮�濮嬩繚瀛樺墠" + i + "鏉¤鍗�");
+
+ var sSubStr = JSON.stringify(HDataSub);
+ var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBill_btnSave",
+ async: HAsync,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ //layer.close(index);
+ //layer.msg("淇濆瓨鎴愬姛");
}
else {
- get_FastQuery(2);
+ //layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
HAsync = true;
}
- layer.close(index);
- layer.msg("淇濆瓨鎴愬姛");
- }
- else {
- layer.close(index);
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ },
+ error: function (err) {
+ //layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
HAsync = true;
}
- },
- error: function (err) {
- layer.close(index);
- layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- HAsync = true;
- }
- });
+ });
+ }
+ layer.close(index);
+ if ($("#HWorkShopID").val() == 0) {
+ get_FastQuery(1);
+ HAsync = true;
+ }
+ else {
+ get_FastQuery(2);
+ HAsync = true;
+ }
}
function set_AddNew1(num) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
index edf9d53..906d133 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
@@ -317,11 +317,12 @@
function set_InitGrid(Year,Month,num) {
var SumMonth = new Date(Year, Month, 0).getDate(); //鍔ㄦ�佽幏鍙栨湀澶╂暟
var col = [];
+ var HWeekARR = ["鏃�", "涓�", "浜�", "涓�", "鍥�", "浜�", "鍏�"];//鑾峰彇浠婂ぉ鏄槦鏈熷嚑鐢紝鍦╰itle澶勬嫾鎺�
var colData = "{";
col.push({ field: "鏈堜唤", title: "鏈堜唤", width: 60 })
colData += "\"鏈堜唤\":\"" + Month+"鏈圽",";
for (var j = 1; j <= SumMonth; j++) {
- col.push({ field: Format(Year + '/' + Month + '/' + j, 'yyyy-MM-dd'), title: Format(Year + '/' + Month + '/' + j, 'dd'), width: 50, edit: 'text' })
+ col.push({ field: Format(Year + '/' + Month + '/' + j, 'yyyy-MM-dd'), title: Format(Year + '/' + Month + '/' + j, 'dd') + '(' + HWeekARR[new Date(Format(Year + '/' + Month + '/' + j, 'yyyy-MM-dd')).getDay()]+')', width: 70, edit: 'text' })
colData += "\"" + Format(Year + '/' + Month + '/' + j, 'yyyy-MM-dd') + "\":\"" + num + "\",";
}
colData = colData.substr(0, colData.length - 1);
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyList.html"
index 6fda3e1..e7919ac 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyList.html"
@@ -219,7 +219,8 @@
set_InitGrid();
//鏌ヨ
get_Display(sWhere);
- get_Display1(sWhere);
+ //get_Display1(sWhere);
+ get_FastQuery()
}
// 鍒濆鍖栬〃鏍兼柟娉�
@@ -427,7 +428,7 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
-
+ sWhere += addSWhereByOpenType();
get_Display1(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -591,6 +592,20 @@
})
//#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ addsWhere=""
+ if (typeof (openType) != "undefined") {
+ addsWhere += " and 绂佺敤鏍囪 = ''";
+ }
+ return addsWhere;
+
+ }
+ //#endregion
+
//#region 鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
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 9b28a56..04fb572 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"
@@ -1403,7 +1403,7 @@
case 'HWorkQty': //绾﹀綋绯绘暟
if (localStorage["HBenchmarkValue"] != undefined && localStorage["HBenchmarkValue"] != null && data.HWorkQty > 0) {
obj.update({
- HYDCoefficient: (localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6)
+ HYDCoefficient: !isNaN(parseFloat((localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6) : 0
});
}
break;
@@ -2277,7 +2277,7 @@
option.data[i]["宸ユ"] = checkStatus.data[j]["宸ユ鍚嶇О"];
option.data[i]["鏍囧噯宸ヤ环"] = checkStatus.data[j]["鏍囧噯宸ヤ环"];
option.data[i]["HWorkQty"] = option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["鏍囧噯宸ヤ环"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"];
- option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / (option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["鏍囧噯宸ヤ环"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"])).toFixed(6)//绾﹀綋绯绘暟=鍩哄噯鍊�/灏忔椂浜ц兘
+ option.data[i]["HYDCoefficient"] = !isNaN(parseFloat((localStorage["HBenchmarkValue"] / (option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["鏍囧噯宸ヤ环"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"])).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / (option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["鏍囧噯宸ヤ环"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"])).toFixed(6) : 0;//绾﹀綋绯绘暟=鍩哄噯鍊�/灏忔椂浜ц兘
j++;
}
}
@@ -2312,7 +2312,7 @@
, "宸ユ": OptionData[0].宸ユ鍚嶇О
, "鏍囧噯宸ヤ环": OptionData[0].鏍囧噯宸ヤ环
, "HWorkQty": obj.data.HProcPrice != 0 ? (OptionData[0].鏍囧噯宸ヤ环 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty
- , "HYDCoefficient": (localStorage["HBenchmarkValue"] / (obj.data.HProcPrice != 0 ? (OptionData[0].鏍囧噯宸ヤ环 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty)).toFixed(6)
+ , "HYDCoefficient": !isNaN(parseFloat((localStorage["HBenchmarkValue"] / (obj.data.HProcPrice != 0 ? (OptionData[0].鏍囧噯宸ヤ环 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty)).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / (obj.data.HProcPrice != 0 ? (OptionData[0].鏍囧噯宸ヤ环 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty)).toFixed(6) : 0
})
OptionData = [];
@@ -2712,7 +2712,7 @@
option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
option.data[i]["宸ユ"] = data.data[j]["宸ユ鍚嶇О"];
option.data[i]["鏍囧噯宸ヤ环"] = WorkCente[j]["鏍囧噯宸ヤ环"];
- option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6);
+ option.data[i]["HYDCoefficient"] = !isNaN(parseFloat((localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6) : 0;
j++;
}
@@ -2753,7 +2753,7 @@
option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
option.data[i]["宸ユ"] = data.data[j]["宸ユ鍚嶇О"];
option.data[i]["鏍囧噯宸ヤ环"] = WorkCente[j]["鏍囧噯宸ヤ环"];
- option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6);
+ option.data[i]["HYDCoefficient"] = !isNaN(parseFloat((localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6) : 0;
j++;
}
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
index b448c66..86a0f7d 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
@@ -1612,7 +1612,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
--
Gitblit v1.9.1