From f7430b5ce170d64489ebb3bc82026a4f10745505 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 30 十二月 2025 16:03:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/WMS扫码模块/委外补料/Kf_EntrustReplenishOutBill_Check_PDA.html | 139 +
WebTM/views/WMS扫码模块/库存转移/kf_InventoryTransfer.html | 179 -
WebTM/views/WMS扫码模块/其他入库/Kf_OtherInBill_Check_PDA.html | 4
WebTM/views/基础资料/公用基础资料/xmlLBM_xiaoweizutuo.aspx.designer.cs | 26
WebTM/views/WMS扫码模块/其他出库/Kf_OtherOutBill_Check_PDA.html | 139 +
WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBill_Check_PDA.html | 4
WebTM/views/WMS扫码模块/生产补料/Kf_MateReplenishOutBill_Check_PDA.html | 131 +
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_Check_PDA.html | 139 +
WebTM/views/WMS扫码模块/委外领料/Kf_EntrustOutBill_Check_PDA.html | 139 +
WebTM/views/质量管理/检验申请单/QC_RequestCheckBillList.html | 1369 ++++++++++++++++++
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_Check_PDA.html | 469 +++++
WebTM/views/WMS扫码模块/生产入库/Kf_ProductInBill_Check_PDA.html | 4
WebTM/WebTM.csproj | 2
WebTM/views/质量管理/检验申请单/QC_Add_Edit_RequestCheckBillList.html | 1591 +++++++++++++++++++++
15 files changed, 4,086 insertions(+), 253 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 536cd79..dd69725 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -863,6 +863,8 @@
<Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\QC_SpcCenterlineList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞QC_Add_Edit_PatrolProcCheckBill_XW.html" />
<Content Include="views\璐ㄩ噺绠＄悊\寮傚父鍙嶉\OA_ErrMsgBackSelfQuery_BGT.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\妫�楠岀敵璇峰崟\QC_Add_Edit_RequestCheckBillList.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\妫�楠岀敵璇峰崟\QC_RequestCheckBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鐜妫�娴嬪崟\QC_EnvironmentTestDotCheckBillList_PDA.html" />
<Content Include="views\璐ㄩ噺绠＄悊\妫�楠屽彇鏍疯繕鏍峰崟\QC_Add_BackSampleCheckBill_PDA.html" />
<Content Include="views\璐ㄩ噺绠＄悊\妫�楠屽彇鏍疯繕鏍峰崟\QC_Add_TakeSampleCheckBill_PDA.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index cc6fe6e..abae271 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -2,12 +2,12 @@
function GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:81/API/"; //闄堥晲鍝叉湰鍦伴厤缃�
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
//var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Check_PDA.html"
index 99b05fd..b54fb47 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Check_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Check_PDA.html"
@@ -888,6 +888,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_OtherInBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1067,7 +1068,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
playSound_OK();
@@ -1114,6 +1115,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_OtherInBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Check_PDA.html"
index feda1fc..4e01ca4 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Check_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Check_PDA.html"
@@ -81,7 +81,8 @@
<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="3" style="padding:1px;">涓嬫灦淇℃伅</li>
+ <li lay-id="4" style="padding:1px;">鏉＄爜淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--琛ㄥご淇℃伅-->
@@ -96,10 +97,10 @@
<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 class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" 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>-->
+ <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" 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="HBillNo-BT" class="layui-btn" id="HBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
</div>
@@ -147,6 +148,15 @@
<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-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>
@@ -296,6 +306,7 @@
var HSourceBarCodeCtl = "N" //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
var listOption = [];
+ var FIFOListOption = [];
var columns = "";
var HModName = "Kf_OtherOutBill_Check_PDA";
var ModRightName = "CE_OtherOutCheck"; //妯″潡鏉冮檺鍙傛暟
@@ -397,6 +408,8 @@
]];
listOption.data = data;
table.render(listOption);
+ FIFOListOption.data = data;
+ table.render(FIFOListOption);
//鍏夋爣榛樿鍦ㄥ崟鎹彿浣嶇疆涓�
var pFocus = $("#HBillNo");
@@ -417,6 +430,30 @@
layer.closeAll("loading");
}
};
+
+ //涓嬫灦淇℃伅
+ FIFOListOption = {
+ elem: '#FIFOList-table'
+ //, toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 80, totalRow: true }
+ , { field: '涓嬫灦鏁伴噺', title: '涓嬫灦鏁伴噺', width: 90 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 150 }
+ , { field: '浠撲綅', title: '浠撲綅', width: 150 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: '鎺у埗鍊�', title: '鎺у埗鍊�', width: 150 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
}
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -774,14 +811,33 @@
form.on('submit(cmdCancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- if (OperationType == 2) {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- }
- else {
- parent.location.href = "../../../views/index_Mobile.html";
- }
+ //鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬侊紙鏇存柊 HlineStatus =1锛�
+ $.ajax({
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_UPDateFIFOTmp_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
+ 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: "娓╅Θ鎻愮ず" });
+ }
+ });
});
})
@@ -888,6 +944,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_OtherOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1067,7 +1124,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
playSound_OK();
@@ -1114,6 +1171,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_OtherOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1154,6 +1212,52 @@
$("#HQty").val("");
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
+ }
+ //鍚敤鍏堣繘鍏堝嚭浠呮彁绀烘帶鍒讹紝鏉＄爜涓嶅湪鍏堣繘鍏堝嚭鍒楄〃涓椂鎻愮ず
+ else if (result.count == 2) {
+ playSound();
+ element.tabChange('tab-Kf_MateReplenishOutBill_Check_PDA', '2');
+ layer.confirm(result.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鍏佽', '涓嶅厑璁�'],
+ btn2: function () {
+ }//鍏抽棴
+ }
+ , function () {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) {
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
+ layer.closeAll();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ 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();
+ });
+ }
+ });
+ });//娓呯┖
}
else {
playSound();
@@ -1241,6 +1345,13 @@
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);
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\350\241\245\346\226\231/Kf_EntrustReplenishOutBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\350\241\245\346\226\231/Kf_EntrustReplenishOutBill_Check_PDA.html"
index 563c980..722d345 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\350\241\245\346\226\231/Kf_EntrustReplenishOutBill_Check_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\350\241\245\346\226\231/Kf_EntrustReplenishOutBill_Check_PDA.html"
@@ -81,7 +81,8 @@
<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="3" style="padding:1px;">涓嬫灦淇℃伅</li>
+ <li lay-id="4" style="padding:1px;">鏉＄爜淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--琛ㄥご淇℃伅-->
@@ -96,10 +97,10 @@
<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 class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" 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>-->
+ <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" 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="HBillNo-BT" class="layui-btn" id="HBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
</div>
@@ -147,6 +148,15 @@
<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-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>
@@ -296,6 +306,7 @@
var HSourceBarCodeCtl = "N" //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
var listOption = [];
+ var FIFOListOption = [];
var columns = "";
var HModName = "Kf_EntrustReplenishOutBill_Check_PDA";
var ModRightName = "CE_EntrustReplenishOutCheck"; //妯″潡鏉冮檺鍙傛暟
@@ -397,6 +408,8 @@
]];
listOption.data = data;
table.render(listOption);
+ FIFOListOption.data = data;
+ table.render(FIFOListOption);
//鍏夋爣榛樿鍦ㄥ崟鎹彿浣嶇疆涓�
var pFocus = $("#HBillNo");
@@ -417,6 +430,30 @@
layer.closeAll("loading");
}
};
+
+ //涓嬫灦淇℃伅
+ FIFOListOption = {
+ elem: '#FIFOList-table'
+ //, toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 80, totalRow: true }
+ , { field: '涓嬫灦鏁伴噺', title: '涓嬫灦鏁伴噺', width: 90 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 150 }
+ , { field: '浠撲綅', title: '浠撲綅', width: 150 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: '鎺у埗鍊�', title: '鎺у埗鍊�', width: 150 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
}
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -774,14 +811,33 @@
form.on('submit(cmdCancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- if (OperationType == 2) {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- }
- else {
- parent.location.href = "../../../views/index_Mobile.html";
- }
+ //鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬侊紙鏇存柊 HlineStatus =1锛�
+ $.ajax({
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_UPDateFIFOTmp_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
+ 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: "娓╅Θ鎻愮ず" });
+ }
+ });
});
})
@@ -888,6 +944,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_EntrustReplenishOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1067,7 +1124,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
playSound_OK();
@@ -1114,6 +1171,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_EntrustReplenishOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1154,6 +1212,52 @@
$("#HQty").val("");
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
+ }
+ //鍚敤鍏堣繘鍏堝嚭浠呮彁绀烘帶鍒讹紝鏉＄爜涓嶅湪鍏堣繘鍏堝嚭鍒楄〃涓椂鎻愮ず
+ else if (result.count == 2) {
+ playSound();
+ element.tabChange('tab-Kf_MateReplenishOutBill_Check_PDA', '2');
+ layer.confirm(result.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鍏佽', '涓嶅厑璁�'],
+ btn2: function () {
+ }//鍏抽棴
+ }
+ , function () {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) {
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
+ layer.closeAll();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ 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();
+ });
+ }
+ });
+ });//娓呯┖
}
else {
playSound();
@@ -1241,6 +1345,13 @@
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);
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_Check_PDA.html"
index 5357fab..e2e725a 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_Check_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_Check_PDA.html"
@@ -81,7 +81,8 @@
<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="3" style="padding:1px;">涓嬫灦淇℃伅</li>
+ <li lay-id="4" style="padding:1px;">鏉＄爜淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--琛ㄥご淇℃伅-->
@@ -96,10 +97,10 @@
<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 class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" 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>-->
+ <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" 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="HBillNo-BT" class="layui-btn" id="HBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
</div>
@@ -147,6 +148,15 @@
<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-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>
@@ -296,6 +306,7 @@
var HSourceBarCodeCtl = "N" //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
var listOption = [];
+ var FIFOListOption = [];
var columns = "";
var HModName = "Kf_EntrustOutBill_Check_PDA";
var ModRightName = "CE_EntrustOutCheck"; //妯″潡鏉冮檺鍙傛暟
@@ -397,6 +408,8 @@
]];
listOption.data = data;
table.render(listOption);
+ FIFOListOption.data = data;
+ table.render(FIFOListOption);
//鍏夋爣榛樿鍦ㄥ崟鎹彿浣嶇疆涓�
var pFocus = $("#HBillNo");
@@ -417,6 +430,30 @@
layer.closeAll("loading");
}
};
+
+ //涓嬫灦淇℃伅
+ FIFOListOption = {
+ elem: '#FIFOList-table'
+ //, toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 80, totalRow: true }
+ , { field: '涓嬫灦鏁伴噺', title: '涓嬫灦鏁伴噺', width: 90 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 150 }
+ , { field: '浠撲綅', title: '浠撲綅', width: 150 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: '鎺у埗鍊�', title: '鎺у埗鍊�', width: 150 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
}
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -774,14 +811,33 @@
form.on('submit(cmdCancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- if (OperationType == 2) {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- }
- else {
- parent.location.href = "../../../views/index_Mobile.html";
- }
+ //鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬侊紙鏇存柊 HlineStatus =1锛�
+ $.ajax({
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_UPDateFIFOTmp_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
+ 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: "娓╅Θ鎻愮ず" });
+ }
+ });
});
})
@@ -888,6 +944,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_EntrustOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1067,7 +1124,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
playSound_OK();
@@ -1114,6 +1171,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_EntrustOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1154,6 +1212,52 @@
$("#HQty").val("");
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
+ }
+ //鍚敤鍏堣繘鍏堝嚭浠呮彁绀烘帶鍒讹紝鏉＄爜涓嶅湪鍏堣繘鍏堝嚭鍒楄〃涓椂鎻愮ず
+ else if (result.count == 2) {
+ playSound();
+ element.tabChange('tab-Kf_MateReplenishOutBill_Check_PDA', '2');
+ layer.confirm(result.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鍏佽', '涓嶅厑璁�'],
+ btn2: function () {
+ }//鍏抽棴
+ }
+ , function () {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) {
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
+ layer.closeAll();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ 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();
+ });
+ }
+ });
+ });//娓呯┖
}
else {
playSound();
@@ -1241,6 +1345,13 @@
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);
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
index 7e13a3d..6ba0856 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
@@ -299,19 +299,20 @@
// 鍚敤灏忚溅淇℃伅1鍜�2
$('#HCarBarCode').removeAttr('disabled');
$('#HCarBarCode_2').removeAttr('disabled');
-
+ $('#HBarCode').removeAttr('disabled');
// 绂佺敤鍏朵粬瀛楁
$('#HWHName').attr('disabled', 'disabled');
$('#HStockPlaceName').attr('disabled', 'disabled');
$('#HWHName_2').attr('disabled', 'disabled');
$('#HStockPlaceName_2').attr('disabled', 'disabled');
- $('#HBarCode').attr('disabled', 'disabled');
+ //$('#HBarCode').attr('disabled', 'disabled');
$('#HWHID-BT').addClass('layui-btn-disabled').attr('disabled', true);
$('#HSpID-BT').addClass('layui-btn-disabled').attr('disabled', true);
$('#HWHID-BT_2').addClass('layui-btn-disabled').attr('disabled', true);
$('#HSpID-BT_2').addClass('layui-btn-disabled').attr('disabled', true);
layer.msg("宸插惎鐢ㄥ皬杞﹁浆绉绘ā寮忥細灏忚溅淇℃伅1鍜�2鍙互杈撳叆/鎵弿", { icon: 1 });
+ clearTableData();
break;
case 'warehouse': // 浠撳簱杞Щ
@@ -325,12 +326,14 @@
$('#HSpID-BT').removeClass('layui-btn-disabled').attr('disabled', false);
$('#HWHID-BT_2').removeClass('layui-btn-disabled').attr('disabled', false);
$('#HSpID-BT_2').removeClass('layui-btn-disabled').attr('disabled', false);
+ $('#HCarBarCode').removeAttr('disabled');
// 绂佺敤灏忚溅淇℃伅
- $('#HCarBarCode').attr('disabled', 'disabled');
+ // $('#HCarBarCode').attr('disabled', 'disabled');
$('#HCarBarCode_2').attr('disabled', 'disabled');
layer.msg("宸插惎鐢ㄤ粨搴撹浆绉绘ā寮忥細浠撳簱浠撲綅1銆�2鍜岀墿鏂欐潯鐮佸彲浠ヨ緭鍏�/鎵弿", { icon: 1 });
+ clearTableData();
break;
case 'car_warehouse': // 灏忚溅-浠撳簱杞Щ
@@ -350,6 +353,7 @@
$('#HSpID-BT_2').addClass('layui-btn-disabled').attr('disabled', true);
layer.msg("宸插惎鐢ㄥ皬杞�-浠撳簱杞Щ妯″紡锛氬皬杞︿俊鎭�1銆佷粨搴撲粨浣�1鍜岀墿鏂欐潯鐮佸彲浠ヨ緭鍏�/鎵弿", { icon: 1 });
+ clearTableData();
break;
}
@@ -387,6 +391,16 @@
//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
CheckModRight();
+
+ function clearTableData() {
+ // 娓呯┖琛ㄦ牸鏁版嵁
+ listOption.data = [];
+ currentTableData = [];
+ table.reload('wl-table', {
+ data: []
+ });
+ // table.render(listOption);
+ }
function CheckModRight() {
layer.load(3);
$.ajax({
@@ -484,9 +498,11 @@
, { field: '鐗╂枡鏉＄爜', title: '鐗╂枡鏉＄爜', width: 100 }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
- , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 100 }
- , { field: '鏉＄爜涓暟', title: '鏉＄爜涓暟', width: 100 }
+ , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 100 }
+ , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О', width: 100 }
+ , { field: '浠撲綅浠ｇ爜', title: '浠撲綅浠ｇ爜', width: 100 }
+ , { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', width: 100 }
+ , { field: '灏忚溅鏉＄爜', title: '灏忚溅鏉＄爜', width: 100 }
]];
listOption.data = data;
table.render(listOption);
@@ -560,7 +576,7 @@
//$("#HBarCode").select();
//$("#HBarCode").focus();
//鏄剧ず琛ㄤ綋鏄庣粏
- DisBillEntryList();
+ DisBillEntryList_CarMaterial();
HSourceFlag = true;
element.tabChange('tab-Kf_MaterialUpperBill_PDA', '2');
}
@@ -802,49 +818,11 @@
$("#HCarBarCode").focus();
});
return;
- }
+ }
+ element.tabChange('tab-Kf_MaterialUpperBill_PDA', '2');
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList_CarMaterial();
layer.load(3)
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/WEBSController/Get_BarCode_WorkShop_Json",
- async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HBarCode": sBarCode, "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "SourceFlag": HSourceFlag, "HSourceBillType": sSourceBillType, "HCarBarCode": sCarBarCode, "HStockOrgID": HStockOrgID },
- success: function (result) {
- if (result.count == 1) {
- playSound_OK();
- if (sBarCode.startsWith("GXLX")) {
- $("#HMainSourceBillNo").val(sBarCode);
- $("#HSourceBillNo").val(sBarCode);
- }
-
- if (HSourceFlag != true) {
- HSourceFlag = true;
- }
- element.tabChange('tab-Kf_MaterialUpperBill_PDA', '2');
- //鏄剧ず琛ㄤ綋鏄庣粏
- 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");
}
@@ -1065,6 +1043,7 @@
if (result.count == 1) {
playSound_OK();
layer.alert("搴撳瓨杞Щ鎴愬姛");
+ clearTableData();
}
else {
playSound();
@@ -1167,13 +1146,14 @@
$("#HBarCode").focus(); //鑾峰彇鍏夋爣
});
- //鎵弿灏忚溅鏉＄爜
- $('#HCarBarCode').on('keydown', function (event) {
- if (event.keyCode == 13) {
- //$("#HBarCode").select();
- //$("#HBarCode").focus(); //鑾峰彇鍏夋爣
- }
- });
+ ////鎵弿灏忚溅鏉＄爜
+ //$('#HCarBarCode').on('keydown', function (event) {
+ // if (event.keyCode == 13) {
+ // GetMeesageByCarBarCode();
+ // //$("#HBarCode").select();
+ // //$("#HBarCode").focus(); //鑾峰彇鍏夋爣
+ // }
+ //});
//缁戝畾
function BindBetweenCarHw(obj) {
@@ -1249,89 +1229,17 @@
$("#HBarCode").val("");
}
- //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
- function DisBillList() {
- $.ajax({
- type: "GET",
- url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
- async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "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)) {
- 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 {
- 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 == '鐗╂枡浠ｇ爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
- } 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);
- }
- 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 }
- ]];
- listOption.data = data;
- table.render(listOption);
- }
- },
- complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
- });
- }
-
- //#endregion
//#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
function DisBillEntryList_CarMaterial() {
+ var HCarBarCode = $("#HCarBarCode").val();
$.ajax({
type: "GET",
- url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+ url: GetWEBURL() + '/WEBSController/GetMaterIDByCarBarCode',
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
+ data: { "CarBarCode": HCarBarCode},
success: function (result) {
var data = [];
var col = [];
@@ -1383,11 +1291,14 @@
else {
listOption.cols = [[
{ field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '鐗╂枡鏉＄爜', title: '鐗╂枡鏉＄爜', width: 100 }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
- , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 100 }
- , { field: '鏉＄爜涓暟', title: '鏉＄爜涓暟', width: 100 }
+ , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 100 }
+ , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О', width: 100 }
+ , { field: '浠撲綅浠ｇ爜', title: '浠撲綅浠ｇ爜', width: 100 }
+ , { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', width: 100 }
+ , { field: '灏忚溅鏉＄爜', title: '灏忚溅鏉＄爜', width: 100 }
]];
listOption.data = data;
table.render(listOption);
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_Check_PDA.html"
index e8ed329..7bd02b4 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_Check_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_Check_PDA.html"
@@ -888,6 +888,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_ProductInBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1067,7 +1068,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
playSound_OK();
@@ -1114,6 +1115,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_ProductInBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
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\241\245\346\226\231/Kf_MateReplenishOutBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_Check_PDA.html"
index 6e26c99..58f9fc6 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_Check_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_Check_PDA.html"
@@ -81,7 +81,8 @@
<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="3" style="padding:1px;">涓嬫灦淇℃伅</li>
+ <li lay-id="4" style="padding:1px;">鏉＄爜淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--琛ㄥご淇℃伅-->
@@ -147,6 +148,15 @@
<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-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>
@@ -296,6 +306,7 @@
var HSourceBarCodeCtl = "N" //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
var listOption = [];
+ var FIFOListOption = [];
var columns = "";
var HModName = "Kf_MateReplenishOutBill_Check_PDA";
var ModRightName = "CE_MateReplenishOutCheck"; //妯″潡鏉冮檺鍙傛暟
@@ -397,6 +408,8 @@
]];
listOption.data = data;
table.render(listOption);
+ FIFOListOption.data = data;
+ table.render(FIFOListOption);
//鍏夋爣榛樿鍦ㄥ崟鎹彿浣嶇疆涓�
var pFocus = $("#HBillNo");
@@ -417,6 +430,30 @@
layer.closeAll("loading");
}
};
+
+ //涓嬫灦淇℃伅
+ FIFOListOption = {
+ elem: '#FIFOList-table'
+ //, toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 80, totalRow: true }
+ , { field: '涓嬫灦鏁伴噺', title: '涓嬫灦鏁伴噺', width: 90 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 150 }
+ , { field: '浠撲綅', title: '浠撲綅', width: 150 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: '鎺у埗鍊�', title: '鎺у埗鍊�', width: 150 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
}
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -774,14 +811,33 @@
form.on('submit(cmdCancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- if (OperationType == 2) {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- }
- else {
- parent.location.href = "../../../views/index_Mobile.html";
- }
+ //鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬侊紙鏇存柊 HlineStatus =1锛�
+ $.ajax({
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_UPDateFIFOTmp_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
+ 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: "娓╅Θ鎻愮ず" });
+ }
+ });
});
})
@@ -888,6 +944,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_MateReplenishOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1067,7 +1124,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
playSound_OK();
@@ -1114,6 +1171,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_MateReplenishOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1154,6 +1212,52 @@
$("#HQty").val("");
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
+ }
+ //鍚敤鍏堣繘鍏堝嚭浠呮彁绀烘帶鍒讹紝鏉＄爜涓嶅湪鍏堣繘鍏堝嚭鍒楄〃涓椂鎻愮ず
+ else if (result.count == 2) {
+ playSound();
+ element.tabChange('tab-Kf_MateReplenishOutBill_Check_PDA', '2');
+ layer.confirm(result.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鍏佽', '涓嶅厑璁�'],
+ btn2: function () {
+ }//鍏抽棴
+ }
+ , function () {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) {
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
+ layer.closeAll();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ 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();
+ });
+ }
+ });
+ });//娓呯┖
}
else {
playSound();
@@ -1241,6 +1345,13 @@
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);
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_Check_PDA.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_Check_PDA.html"
index 800a3e7..3d7d37b 100644
--- "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_Check_PDA.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_Check_PDA.html"
@@ -57,6 +57,32 @@
<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-row" style="margin-top: 5px; margin-bottom: 0px;">
+ <div class="layui-col-xs6">
+ <div class="layui-col-xs4">
+ <label class="layui-form-label" style="width:56px;padding-left:0px;">璋冨叆浠撳簱</label>
+ </div>
+ <div class="layui-col-xs5">
<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>
@@ -65,10 +91,10 @@
</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 class="layui-col-xs4">
+ <label class="layui-form-label" style="width:56px;padding-left:0px;">璋冨叆浠撲綅</label>
</div>
- <div class="layui-col-xs6">
+ <div class="layui-col-xs5">
<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>
@@ -81,7 +107,8 @@
<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="3" style="padding:1px;">涓嬫灦淇℃伅</li>
+ <li lay-id="4" style="padding:1px;">鏉＄爜淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--琛ㄥご淇℃伅-->
@@ -96,10 +123,10 @@
<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 class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" 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>-->
+ <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" 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="HBillNo-BT" class="layui-btn" id="HBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
</div>
@@ -156,6 +183,15 @@
<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-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>
@@ -322,10 +358,13 @@
var HBillNo = $('#HBillNo').val()
var HBillType = '1207'
var HMaker = sessionStorage["HUserName"]
- var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
+ var HStockInOrgID = sessionStorage["OrganizationID"] //璋冨叆缁勭粐ID
+ var HStockOutOrgID = sessionStorage["OrganizationID"] //璋冨嚭缁勭粐ID
+ var HStockOrgID = sessionStorage["OrganizationID"] //鐧诲叆缁勭粐ID
var HSourceBarCodeCtl = "N" //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
var listOption = [];
+ var FIFOListOption = [];
var columns = "";
var HModName = "Kf_MoveStockBill_Check_PDA";
var ModRightName = "CE_MoveStockCheck"; //妯″潡鏉冮檺鍙傛暟
@@ -432,6 +471,8 @@
]];
listOption.data = data;
table.render(listOption);
+ FIFOListOption.data = data;
+ table.render(FIFOListOption);
//鍏夋爣榛樿鍦ㄥ崟鎹彿浣嶇疆涓�
var pFocus = $("#HBillNo");
@@ -452,6 +493,30 @@
layer.closeAll("loading");
}
};
+
+ //涓嬫灦淇℃伅
+ FIFOListOption = {
+ elem: '#FIFOList-table'
+ //, toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 80, totalRow: true }
+ , { field: '涓嬫灦鏁伴噺', title: '涓嬫灦鏁伴噺', width: 90 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 150 }
+ , { field: '浠撲綅', title: '浠撲綅', width: 150 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: '鎺у埗鍊�', title: '鎺у埗鍊�', width: 150 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
}
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -505,8 +570,179 @@
//#region 鍩虹璧勬枡閫夋嫨
- //#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(result.data[0].HSPID);
+ $("#HOutStockPlaceName").val(result.data[0].HSPName);
+ 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) {
var HWHName = $('#HWHName').val()
@@ -518,7 +754,7 @@
$("#HStockPlaceName").val("");
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
- layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
+ layer.msg("璋冨叆浠撳簱鏉＄爜涓虹┖锛�", {
icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
@@ -532,7 +768,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/GetWarehouse_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HBarCode": HWHName, "HStockOrgID": HStockOrgID },
+ data: { "HBarCode": HWHName, "HStockOrgID": HStockInOrgID },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
$("#HWHID").val(result.data[0].HItemID);
@@ -547,6 +783,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
}
+ element.tabChange('tab-Kf_MoveStockBill_PDA', '2');
//鍏夋爣鏄剧ず鍒版潯鐮佷笂
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -573,7 +810,7 @@
}
});
- //浠撳簱鎸夐挳
+ //璋冨叆浠撳簱鎸夐挳
form.on('submit(HWHID-BT)', function () {
layer.open({
type: 2
@@ -582,7 +819,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockInOrgID + '', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -592,11 +829,11 @@
//#endregion
- //#region 浠撲綅
- //鎵弿浠撲綅鏉＄爜
+ //#region 璋冨叆浠撲綅
+ //鎵弿璋冨叆浠撲綅鏉＄爜
$('#HStockPlaceName').on('keydown', function (event) {
if (event.keyCode == 13) {
- //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ //璋冨叆浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
if ($("#HWHName").val() == '') {
$("#HWHID").val("0");
}
@@ -608,7 +845,7 @@
$("#HWHName").val("");
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
- layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
+ layer.msg("璋冨叆浠撲綅鏉＄爜涓虹┖锛�", {
icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
@@ -622,13 +859,14 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/GetStockPlace_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HBarCode": HStockPlaceName, "HWhID": sHWHID, "HStockOrgID": HStockOrgID },
+ 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', '2');
//鍏夋爣鏄剧ず鍒版潯鐮佷笂
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -653,9 +891,9 @@
}
});
- //浠撲綅鎸夐挳
+ //璋冨叆浠撲綅鎸夐挳
form.on('submit(HSpID-BT)', function () {
- //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ //璋冨叆浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
if ($("#HWHName").val() == '') {
$("#HWHID").val("0");
}
@@ -666,7 +904,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + $("#HWHID").val() + '&Type=HSpID&HOrgID=' + HStockOrgID + '', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + $("#HWHID").val() + '&Type=HSpID&HOrgID=' + HStockInOrgID + '', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -809,14 +1047,33 @@
form.on('submit(cmdCancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- if (OperationType == 2) {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- }
- else {
- parent.location.href = "../../../views/index_Mobile.html";
- }
+ //鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬侊紙鏇存柊 HlineStatus =1锛�
+ $.ajax({
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_UPDateFIFOTmp_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
+ 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: "娓╅Θ鎻愮ず" });
+ }
+ });
});
})
@@ -907,6 +1164,28 @@
$('#HBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
$('#cmdHBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
HInterID = $('#HInterID').val()
+ //璋冨叆缁勭粐涓嶅悓鏃讹紝娓呯┖璋冨叆浠撳簱浠撲綅
+ 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);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ //璋冨嚭缁勭粐涓嶅悓鏃讹紝娓呯┖璋冨嚭浠撳簱浠撲綅
+ if (HStockOutOrgID != $('#HStockOutOrgID').val()) {
+ 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);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+
//鏉＄爜鏍稿鏍囪
if (result.data.hSourceBarCodeFlagField) {
$("input[name='chkHBarflag'][value='" + result.data.hSourceBarCodeFlagField + "']").attr("checked", true);
@@ -927,6 +1206,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_MoveStockBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1004,6 +1284,12 @@
//鎵潯鐮�
function GetMeesageByBarCode(obj) {
//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+ if ($("#HSCWHName").val() == '') {
+ $("#HSCWHID").val("0");
+ }
+ if ($("#HOutStockPlaceName").val() == '') {
+ $("#HOutStockPlaceID").val("0");
+ }
if ($("#HWHName").val() == '') {
$("#HWHID").val("0");
}
@@ -1013,6 +1299,8 @@
var sOldBarCode = $('#HBarCode').val()
var HDeleteFlag = sOldBarCode.substring(0, 1);
var sBarCode = sOldBarCode.slice(1);
+ var sHSCWHID = $("#HSCWHID").val()
+ var sHSCSPID = $("#HOutStockPlaceID").val()
var sHWHID = $("#HWHID").val()
var sHSPID = $("#HStockPlaceID").val()
var sHQty = $("#HQty").val()
@@ -1106,39 +1394,45 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHSCWHID, "HSPID": sHSCSPID, "HSCWHID": sHWHID, "HSCSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
playSound_OK();
if (result.data.hBarTypeField == '浠撳簱鏉＄爜') {
- $("#HWHName").val(result.data.hWhNameField);
- $("#HWHID").val(result.data.hWhIDField);
- $("#HStockPlaceName").val(result.data.hSPNameField);
- $("#HStockPlaceID").val(result.data.hSPIDField);
+ $("#HSCWHName").val(result.data.hWhNameField);
+ $("#HSCWHID").val(result.data.hWhIDField);
+ $("#HOutStockPlaceName").val(result.data.hSPNameField);
+ $("#HOutStockPlaceID").val(result.data.hSPIDField);
if (result.data.hSPFlagField == 0) {
- $("#HStockPlaceName").attr("disabled", "disabled");
- $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $("#HOutStockPlaceName").attr("disabled", "disabled");
+ $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
}
else {
- $("#HStockPlaceName").removeAttr("disabled");
- $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
}
return;//缁撴潫
}
else if (result.data.hBarTypeField == '浠撲綅鏉＄爜') {
- $("#HStockPlaceName").val(result.data.hSPNameField);
- $("#HStockPlaceID").val(result.data.hSPIDField);
- $("#HWHName").val(result.data.hWhNameField);
- $("#HWHID").val(result.data.hWhIDField);
+ $("#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 == '婧愬崟鏉＄爜') {
$('#HInterID').val(result.data.hInterIDField)
$('#HBillNo').val(result.data.hBillNoField)
+ $("#HStockOutOrgID").val(result.data.hStockOutOrgIDField)
+ $("#HStockOutOrgName").val(result.data.hStockOutOrgNameField)
+ $("#HStockInOrgID").val(result.data.hStockInOrgIDField)
+ $("#HStockInOrgName").val(result.data.hStockInOrgNameField)
$("#HBillNo").attr("disabled", "disabled");
$('#HBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
$('#cmdHBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
HInterID = $('#HInterID').val()
+ HStockInOrgID = $('#HStockInOrgID').val()
+ HStockOutOrgID = $('#HStockOutOrgID').val()
//鏉＄爜鏍稿鏍囪
if (result.data.hSourceBarCodeFlagField) {
$("input[name='chkHBarflag'][value='" + result.data.hSourceBarCodeFlagField + "']").attr("checked", true);
@@ -1153,6 +1447,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_MoveStockBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1193,6 +1488,52 @@
$("#HQty").val("");
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
+ }
+ //鍚敤鍏堣繘鍏堝嚭浠呮彁绀烘帶鍒讹紝鏉＄爜涓嶅湪鍏堣繘鍏堝嚭鍒楄〃涓椂鎻愮ず
+ else if (result.count == 2) {
+ playSound();
+ element.tabChange('tab-Kf_MateReplenishOutBill_Check_PDA', '2');
+ layer.confirm(result.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鍏佽', '涓嶅厑璁�'],
+ btn2: function () {
+ }//鍏抽棴
+ }
+ , function () {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHSCWHID, "HSPID": sHSCSPID, "HSCWHID": sHWHID, "HSCSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) {
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
+ layer.closeAll();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ 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();
+ });
+ }
+ });
+ });//娓呯┖
}
else {
playSound();
@@ -1280,6 +1621,13 @@
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);
@@ -1356,9 +1704,34 @@
//浠ヤ笂涓簂ayui妯″潡
//姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
- //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖浠撳簱淇℃伅
- function GetHWHValue(obj)
- {
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖璋冨嚭浠撳簱淇℃伅
+ function GetHSCWHNAMEValue(obj) {
+ if (obj.length > 0) {
+ $("#HSCWHName").val(obj[0].HName);
+ $("#HSCWHID").val(obj[0].HItemID);
+ $("#HOutStockPlaceName").val(obj[0].HSPName);
+ $("#HOutStockPlaceID").val(obj[0].HSPID);
+ 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);
@@ -1374,7 +1747,7 @@
}
}
}
- //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖浠撲綅淇℃伅
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖璋冨叆浠撲綅淇℃伅
function GetHSpValue(obj) {
if (obj.length > 0) {
$("#HStockPlaceName").val(obj[0].HName);
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Check_PDA.html"
index 7906e9e..6abe91c 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Check_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Check_PDA.html"
@@ -888,6 +888,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_POStockInBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1067,7 +1068,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
playSound_OK();
@@ -1114,6 +1115,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_POStockInBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Check_PDA.html"
index c4cf852..7271b31 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Check_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Check_PDA.html"
@@ -81,7 +81,8 @@
<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="3" style="padding:1px;">涓嬫灦淇℃伅</li>
+ <li lay-id="4" style="padding:1px;">鏉＄爜淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--琛ㄥご淇℃伅-->
@@ -96,10 +97,10 @@
<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 class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" 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>-->
+ <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" 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="HBillNo-BT" class="layui-btn" id="HBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
</div>
@@ -147,6 +148,15 @@
<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-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>
@@ -296,6 +306,7 @@
var HSourceBarCodeCtl = "N" //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
var listOption = [];
+ var FIFOListOption = [];
var columns = "";
var HModName = "Kf_SellOutBill_Check_PDA";
var ModRightName = "CE_SellOutCheck"; //妯″潡鏉冮檺鍙傛暟
@@ -397,6 +408,8 @@
]];
listOption.data = data;
table.render(listOption);
+ FIFOListOption.data = data;
+ table.render(FIFOListOption);
//鍏夋爣榛樿鍦ㄥ崟鎹彿浣嶇疆涓�
var pFocus = $("#HBillNo");
@@ -417,6 +430,30 @@
layer.closeAll("loading");
}
};
+
+ //涓嬫灦淇℃伅
+ FIFOListOption = {
+ elem: '#FIFOList-table'
+ //, toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 80, totalRow: true }
+ , { field: '涓嬫灦鏁伴噺', title: '涓嬫灦鏁伴噺', width: 90 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 150 }
+ , { field: '浠撲綅', title: '浠撲綅', width: 150 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: '鎺у埗鍊�', title: '鎺у埗鍊�', width: 150 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
}
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -774,14 +811,33 @@
form.on('submit(cmdCancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- if (OperationType == 2) {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- }
- else {
- parent.location.href = "../../../views/index_Mobile.html";
- }
+ //鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬侊紙鏇存柊 HlineStatus =1锛�
+ $.ajax({
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_UPDateFIFOTmp_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
+ 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: "娓╅Θ鎻愮ず" });
+ }
+ });
});
})
@@ -888,6 +944,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_SellOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1067,7 +1124,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
playSound_OK();
@@ -1114,6 +1171,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_SellOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1154,6 +1212,52 @@
$("#HQty").val("");
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
+ }
+ //鍚敤鍏堣繘鍏堝嚭浠呮彁绀烘帶鍒讹紝鏉＄爜涓嶅湪鍏堣繘鍏堝嚭鍒楄〃涓椂鎻愮ず
+ else if (result.count == 2) {
+ playSound();
+ element.tabChange('tab-Kf_MateReplenishOutBill_Check_PDA', '2');
+ layer.confirm(result.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鍏佽', '涓嶅厑璁�'],
+ btn2: function () {
+ }//鍏抽棴
+ }
+ , function () {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) {
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
+ layer.closeAll();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ 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();
+ });
+ }
+ });
+ });//娓呯┖
}
else {
playSound();
@@ -1241,6 +1345,13 @@
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);
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/xmlLBM_xiaoweizutuo.aspx.designer.cs" "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/xmlLBM_xiaoweizutuo.aspx.designer.cs"
new file mode 100644
index 0000000..0fbed46
--- /dev/null
+++ "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/xmlLBM_xiaoweizutuo.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_xiaoweizutuo
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\347\224\263\350\257\267\345\215\225/QC_Add_Edit_RequestCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\347\224\263\350\257\267\345\215\225/QC_Add_Edit_RequestCheckBillList.html"
new file mode 100644
index 0000000..435867d
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\347\224\263\350\257\267\345\215\225/QC_Add_Edit_RequestCheckBillList.html"
@@ -0,0 +1,1591 @@
+锘�<!DOCTYPE html>
+<html>
+
+<head>
+ <meta 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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <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/PageTitle.js"></script>
+ <style type="text/css">
+ /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+ /*end*/
+ .layui-form-label {
+ width: 100px;
+ }
+
+ .layui-input-inline {
+ width: 200px;
+ }
+ </style>
+</head>
+
+<body>
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="Copy">
+ 澶嶅埗
+ </button>
+ <button type="button" id="addnew-btn"
+ class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="Add">
+ 鏂板
+ </button>
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="Saver">
+ 淇濆瓨
+ </button>
+ <button type="button" id="exit-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="Exit">
+ 閫�鍑�
+ </button>
+ <button type="button" id="preview-btn"
+ class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="planview">
+ 棰勮
+ </button>
+ <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="print">
+ 鎵撳嵃
+ </button>
+ </div>
+ </div>
+
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <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>
+ </ul>
+ <h1 style="text-align:center;"><b>妫�楠岀敵璇峰崟</b></h1>
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">
+ 鍗曟嵁鍙�<label style="color:red">
+ *
+ </label>
+ </label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HBillNo" lay-verify="HBillNo"
+ id="HBillNo" readonly="readonly" autocomplete="off">
+ <input id="HInterID" name="HInterID" type="hidden" />
+ <input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
+ <input id="HBillType" name="HBillType" type="hidden" value="7525" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">
+ 鏃ユ湡<label style="color:red">
+ *
+ </label>
+ </label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDate" id="HDate" autocomplete="off"
+ model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">
+ 閮ㄩ棬<label style="color:red">
+ *
+ </label>
+ </label>
+ <div class="layui-input-inline">
+ <input type="text" name="HDeptName" id="HDeptName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input"
+ value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="Department" 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-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">
+ 鎵瑰彿<label style="color:red">
+ *
+ </label>
+ </label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HBatchNo" lay-verify="HBatchNo"
+ id="HBatchNo" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">
+ 鐢宠浜�<label style="color:red">
+ *
+ </label>
+ </label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCheckEmpName" id="HCheckEmpName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HCheckEmp" id="HCheckEmp"
+ class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="btnSearchHCheckEmp" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+
+ <label class="layui-form-label">
+ 宸ュ簭<label style="color:red">
+ *
+ </label>
+ </label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProcName" id="HProcName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HProcID" id="HProcID" class="layui-input"
+ value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="btnSearchHProc" 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-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">
+ 鐢熶骇璧勬簮
+ </label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSourceName" id="HSourceName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSourceID" id="HSourceID" class="layui-input"
+ value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="btnSearchHSource" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">
+ 鐢熶骇鐝粍
+ </label>
+ <div class="layui-input-inline">
+ <input type="text" name="HGroupName" id="HGroupName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input"
+ value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="btnSearchHGroup" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">
+ 鐢熶骇鐝
+ </label>
+ <div class="layui-input-inline">
+ <input type="text" name="HShiftsName" id="HShiftsName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HShiftsID" id="HShiftsID" class="layui-input"
+ value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="btnSearchHShifts" 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-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">
+ 妫�楠岀被鍨�<label style="color:red">
+ *
+ </label>
+ </label>
+ <div class="layui-input-inline">
+ <select name="HTestType" id="HTestType" >
+ <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 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="HSourceOrgID" id="HSourceOrgID" class="ForFilteringSchemes" lay-verify="HSourceOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </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; width: 185px;">
+ <select name="HInspectOrgID" id="HInspectOrgID" class="ForFilteringSchemes" lay-verify="HInspectOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline" style="width: 500px;">
+ <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark"
+ id="HRemark"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹℃牳浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HChecker" id="HChecker" readonly
+ class="layui-input" value="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCheckDate" id="HCheckDate" readonly
+ class="layui-input" value="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒跺崟浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMaker" id="HMaker" readonly
+ class="layui-input" value="">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMakeDate" id="HMakeDate" readonly
+ class="layui-input" value="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">淇敼浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HUpDater" id="HUpDater" readonly
+ class="layui-input" value="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">淇敼鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HUpDateDate" id="HUpDateDate" readonly
+ class="layui-input" value="">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟绫诲瀷</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMainSourceBillType" id="HMainSourceBillType" readonly
+ class="layui-input" value="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" readonly
+ class="layui-input" value="">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鐘舵��</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HBillStatusText" id="HBillStatusText" readonly
+ class="layui-input" value="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍏抽棴浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCloseMan" id="HCloseMan" readonly
+ class="layui-input" value="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍏抽棴鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCloseDate" id="HCloseDate" readonly
+ class="layui-input" value="">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏄庣粏淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </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-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InsertLine"><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="btn-Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><i class="layui-icon layui-icon-form"></i>涓嬬Щ</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+ </div>
+ </script>
+
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <script>
+ var OptionData = []
+ 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;
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "7525";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) || $("h1").html();
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+
+ //#region 纭鎿嶄綔绫诲瀷锛屽苟鑾峰彇瀵瑰簲鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var closeType = params[params[3]]; //鍏抽棴绫诲瀷
+ }
+ //#endregion
+ Organ();
+ //鏌ヨ鏉′欢
+ var option = [];
+ var sWhere = "";
+ var sBillType = "7525";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //#region 鍒濆鍖栬〃鍗曟彃浠�
+ set_InitFrom();
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //#endregion
+
+ //#region 鍒ゆ柇鎿嶄綔绫诲瀷骞跺垵濮嬪寲鐣岄潰
+ if (OperationType == 1) {//鏃犳簮鏂板
+ set_AddFNew();
+
+ }
+
+ else if (OperationType == 3) {//缂栬緫
+ set_EditFromGrid(linterid);
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+ //#endregion
+ //#endregion
+
+ //#region 鐩戝惉锛氳Е鍙戜簨浠�
+ //#region 瀛愯〃锛氬ご宸ュ叿鏍忔寜閽Е鍙戜簨浠�
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ var AddRow = table.cache['mainTable'];
+ var NewRow = {
+ "HMaterID": 0,
+ "HMaterCode": "",
+ "HMaterName": "",
+ "HMaterSpec": "",
+ "HUnitID": 0,
+ "HUnitCode": "",
+ "HUnitName": "",
+ "HQty": 0,
+ "HSampleDamageQty": 0,
+ "HSourceInterID": 0,
+ "HSourceEntryID": 0,
+ "HSourceBillNo": "",
+ "HSourceBillType": "",
+ "HRelationQty": 0,
+ "HRelationMoney": 0,
+ "HRemark": ""
+ };
+
+ switch (obj.event) {
+
+ //鏂板涓�琛�
+ case 'btn-AddLine': btnAddLine(NewRow);
+ break;
+ //澶嶅埗涓�琛�
+ case 'btn-CopyLine': btnCopyLine(data);
+ break;
+ //鎸囧畾浣嶇疆涓嬫彃鍏ヤ竴琛�
+ case 'btn-InsertLine': btnInsertLine(NewRow)
+ break;
+ //涓婄Щ
+ case 'btn-Up': btn_up();
+ break;
+ //涓嬬Щ
+ case 'btn-Under': btn_under();
+ break;
+ }
+ });
+ //#endregion
+
+
+
+ //#region 琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
+ //#endregion
+
+ //#region 閫夋嫨寮圭獥瑙﹀彂浜嬩欢
+ //#region 閫夋嫨閮ㄩ棬寮圭獥
+ form.on('submit(Department)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '閮ㄩ棬鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ });
+ //#endregion
+
+ //#region 閫夋嫨鐢宠浜哄脊绐�
+ form.on('submit(btnSearchHCheckEmp)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢宠浜哄垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HCheckEmp', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HCheckEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ $("#HCheckEmp").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ });
+ //#endregion
+
+ //#region 閫夋嫨宸ュ簭寮圭獥
+ form.on('submit(btnSearchHProc)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim'
+ , area: ['90%', '90%']
+ , title: '宸ュ簭鍒楄〃'
+ , shift: 2
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?Type=2&excludeUsed=true']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ var selectedProcessID = checkStatus.data[0].HItemID;
+ var selectedProcessName = checkStatus.data[0].宸ュ簭鍚嶇О;
+
+ // 鍦ㄥ脊绐椾腑閫夋嫨宸ュ簭鍚庯紝鐩存帴璁剧疆锛屼繚瀛樻椂鍐嶆鏌�
+ $("#HProcID").val(selectedProcessID);
+ $("#HProcName").val(selectedProcessName);
+ layer.close(index);
+ }
+ , btn2: function (index, layero) { }
+ , end: function () { }
+ });
+ });
+ //#endregion
+
+ //#region 閫夋嫨鐢熶骇璧勬簮寮圭獥
+ form.on('submit(btnSearchHSource)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璧勬簮鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=&openType=2', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ });
+ //#endregion
+
+ //#region 閫夋嫨鐢熶骇鐝粍寮圭獥
+ form.on('submit(btnSearchHGroup)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐝粍鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup&openType=2', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ });
+ //#endregion
+
+ //#region 閫夋嫨鐢熶骇鐝寮圭獥
+ form.on('submit(btnSearchHShifts)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢熶骇鐝鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+ $("#HShiftsID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ });
+ //#endregion
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ 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>';
+ }
+ $("#HSourceOrgID").append(Organization);
+ $("#HSourceOrgID").val(sessionStorage["OrganizationID"]);
+ $("#HInspectOrgID").append(Organization);
+ $("#HInspectOrgID").val(sessionStorage["OrganizationID"]);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+
+
+
+
+ //#region 鏂板
+ form.on('submit(Add)', function (data) {
+ clear();
+ OperationType = 1;
+ set_AddFNew();
+ //璇诲彇鏈湴瀛樺偍鏁版嵁锛屾牴鎹笂娆¤缃垵濮嬪寲鏁版嵁
+ get_ReadConfigFile();
+ });
+ //#endregion
+
+ //#region 淇濆瓨
+ form.on('submit(Saver)', function (data) {
+ var refSav = "";
+ if (OperationType == 1 || OperationType == 2) {
+ refSav = "Add";
+ }
+ if (OperationType == 3) {
+ refSav = "Update";
+ }
+ data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];
+
+ if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/QC_RequestCheckBill/SaveRequestCheckBill", //淇敼涓烘楠岀敵璇峰崟鐨勪繚瀛樻帴鍙�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ //璁板綍鏈淇濆瓨鐨勬暟鎹紝鐢ㄤ簬涓嬩竴娆℃搷浣滄椂鍒濆鍖栫殑鏁版嵁
+ get_WriteConfigFile();
+ });
+ }
+ else {
+ f_alert(data.Message);
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
+ });
+ //#endregion
+
+ //#region 閫�鍑�
+ form.on('submit(Exit)', function (data) {
+ Pub_Close(1);
+ });
+ //#endregion
+
+ //#region 棰勮
+ form.on("submit(planview)", function (data) {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=QC_RequestCheckBill', 'yes']
+ , resize: false
+ })
+ });
+ //#endregion
+
+ //#region 鎵撳嵃
+ form.on("submit(print)", function (data) {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=QC_RequestCheckBill', 'yes']
+ , resize: false
+ })
+ });
+ //#endregion
+
+ //#region 鐩戝惉鍗曞厓鏍肩紪杈�
+ table.on('edit(mainTable)', function (obj) {
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+
+ switch (field) {
+ case "HQty": //鏁伴噺
+ value = isNaN(value) ? 0 : value;
+ obj.update({
+ HQty: value
+ });
+ break;
+ case "HSampleDamageQty": //鐮村潖鎬у疄楠屾暟閲�
+ value = isNaN(value) ? 0 : value;
+ obj.update({
+ HSampleDamageQty: value
+ });
+ break;
+ case "HRelationQty": //鍏宠仈鏁伴噺
+ value = isNaN(value) ? 0 : value;
+ obj.update({
+ HRelationQty: value
+ });
+ break;
+ case "HRelationMoney": //鍏宠仈閲戦
+ value = isNaN(value) ? 0 : value;
+ obj.update({
+ HRelationMoney: value
+ });
+ break;
+ default:
+ }
+ });
+ //#endregion
+
+
+
+ //#region 娓呯┖鐣岄潰
+ function clear() {
+ $("#HDeptID").val("0");
+ $("#HDeptName").val("");
+ $("#HBatchNo").val("");
+ $("#HCheckEmp").val("0");
+ $("#HCheckEmpName").val("");
+ $("#HProcID").val("0");
+ $("#HProcName").val("");
+ $("#HSourceID").val("0");
+ $("#HSourceName").val("");
+ $("#HGroupID").val("0");
+ $("#HGroupName").val("");
+ $("#HShiftsID").val("0");
+ $("#HShiftsName").val("");
+ $("#HTestType").val("");
+ $("#HSourceOrgID").val("0");
+ $("#HSourceOrgName").val("");
+ $("#HInspectOrgID").val("0");
+ $("#HInspectOrgName").val("");
+ $("#HRemark").val("");
+
+ //鍏朵粬淇℃伅娓呯┖
+ $("#HChecker").val("");
+ $("#HCheckDate").val("");
+ $("#HUpDater").val("");
+ $("#HUpDateDate").val("");
+ $("#HMainSourceBillType").val("");
+ $("#HMainSourceBillNo").val("");
+ $("#HBillStatusText").val("");
+ $("#HCloseMan").val("");
+ $("#HCloseDate").val("");
+
+ form.render('select');
+ }
+ //#endregion
+
+ //#region 鏃ユ湡鏍煎紡鍖�
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+ //#endregion
+
+
+
+ //#region 瀛樺偍閰嶇疆鏂囦欢
+ function get_WriteConfigFile() {
+ //娓呯┖鏈湴瀛樺偍鐨勬暟鎹�
+ localStorage.removeItem("QC_RequestCheckBillEdit");
+ var data = {
+ HDeptID: $("#HDeptID").val()
+ , HDeptName: $("#HDeptName").val()
+ , HCheckEmp: $("#HCheckEmp").val()
+ , HCheckEmpName: $("#HCheckEmpName").val()
+ , HProcID: $("#HProcID").val()
+ , HProcName: $("#HProcName").val()
+ }
+ //鏈湴瀛樺偍
+ localStorage.setItem("QC_RequestCheckBillEdit", JSON.stringify(data));
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鍗曟彃浠�
+ function set_InitFrom() {
+ laydate.render({
+ elem: '#HDate'
+ });
+ }
+ //#endregion
+
+ //#region 鑾峰彇鏈�澶у崟鎹彿
+ function get_MAXNum() {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
+ type: "GET",
+ data: { "HBillType": sBillType },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ linterid = $("#HInterID").val();
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栨槑缁嗚〃鏍�
+ function set_InitGrid() {
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 80 }
+ , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
+ , { field: 'HMaterCode', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 120 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', width: 120 }
+ , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
+ , { field: 'HUnitCode', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitCode', width: 100, hide: true }
+ , { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
+ , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'HSampleDamageQty', title: '鐮村潖鎬у疄楠屾暟閲�', edit: 'text', width: 120 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 120 }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'HRelationMoney', title: '鍏宠仈閲戦', edit: 'text', width: 100 }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 150 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 80 }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: false
+ , cellMinWidth: 80
+ , height: 400
+ , cols: [columns]
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , done: function (res, curr, count) {
+ }
+ };
+ }
+ //#endregion
+
+ //#region 鏃犳簮鍗曟柊澧�
+ function set_AddFNew() {
+ //鑾峰彇鏈�澶у崟鎹彿
+ get_MAXNum();
+ option.data = [{
+ "HMaterID": 0,
+ "HMaterCode": "",
+ "HMaterName": "",
+ "HMaterSpec": "",
+ "HUnitID": 0,
+ "HUnitCode": "",
+ "HUnitName": "",
+ "HQty": 0,
+ "HSampleDamageQty": 0,
+ "HSourceBillNo": "",
+ "HSourceBillType": "",
+ "HRelationQty": 0,
+ "HRelationMoney": 0,
+ "HRemark": ""
+ }];
+ table.render(option);
+ }
+ //#endregion
+
+ //#region 澶嶅埗
+ function set_CopyFromGrid(linterid) {
+ option.data = [{
+ "HMaterID": 0,
+ "HMaterCode": "",
+ "HMaterName": "",
+ "HMaterSpec": "",
+ "HUnitID": 0,
+ "HUnitCode": "",
+ "HUnitName": "",
+ "HQty": 0,
+ "HSampleDamageQty": 0,
+ "HSourceBillNo": "",
+ "HSourceBillType": "",
+ "HRelationQty": 0,
+ "HRelationMoney": 0,
+ "HRemark": ""
+ }];
+ set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
+ set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
+ table.render(option);
+
+ //瑕嗙洊鍗曟嵁鍐呯爜銆佸崟鎹彿銆佹棩鏈�
+ get_MAXNum();
+ }
+ //#endregion
+
+ //#region 缂栬緫
+ function set_EditFromGrid(linterid) {
+ option.data = [{
+ "HMaterID": 0,
+ "HMaterCode": "",
+ "HMaterName": "",
+ "HMaterSpec": "",
+ "HUnitID": 0,
+ "HUnitCode": "",
+ "HUnitName": "",
+ "HQty": 0,
+ "HSampleDamageQty": 0,
+ "HSourceBillNo": "",
+ "HSourceBillType": "",
+ "HRelationQty": 0,
+ "HRelationMoney": 0,
+ "HRemark": ""
+ }];
+ set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
+ set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
+ table.render(option);
+ }
+ //#endregion
+
+
+ //#region 缂栬緫鑾峰彇琛ㄥご
+ function set_EditForm(linterid) {
+ $.ajax({
+ url: GetWEBURL() + "/QC_RequestCheckBill/GetRequestCheckBillDetail",
+ async: false,
+ type: "GET",
+ data: {
+ "HID": linterid
+ },
+ success: function (result) {
+ if (result.code == 1) {
+ // 璋冭瘯锛氭煡鐪嬫暟鎹粨鏋�
+ console.log("琛ㄥご鏁版嵁:", result.data);
+
+ // 鏍规嵁浣犳彁渚涚殑缁撴瀯锛屾暟鎹湪 h_v_Sc_MouldProdInHouseBillList[0] 涓�
+ var data = result.data.h_v_Sc_MouldProdInHouseBillList[0];
+ form.val("component-form-group", {
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDate(data.鏃ユ湡)
+ , "HBatchNo": data.鎵瑰彿
+ , "HCheckEmp": data.鐢宠浜篒D
+ , "HCheckEmpName": data.鐢宠浜哄鍚�
+ , "HProcID": data.宸ュ簭ID // 杩欓噷浣跨敤 "宸ュ簭ID"
+ , "HProcName": data.宸ュ簭鍚嶇О // 杩欓噷浣跨敤 "宸ュ簭鍚嶇О"
+ , "HDeptName": data.閮ㄩ棬鍚嶇О
+ , "HDeptID": data.閮ㄩ棬ID
+ , "HSourceID": data.鐢熶骇璧勬簮ID
+ , "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
+ , "HGroupID": data.鐢熶骇鐝粍ID
+ , "HGroupName": data.鐢熶骇鐝粍鍚嶇О
+ , "HShiftsID": data.鐢熶骇鐝ID
+ , "HShiftsName": data.鐢熶骇鐝鍚嶇О
+ , "HTestType": data.妫�楠岀被鍨�
+ , "HSourceOrgID": data.鏉ユ簮缁勭粐ID
+ , "HInspectOrgID": data.璐ㄦ缁勭粐ID
+ , "HRemark": data.琛ㄥご澶囨敞
+ , "HChecker": data.瀹℃牳浜�
+ , "HCheckDate": data.瀹℃牳鏃ユ湡 ? formatDate(data.瀹℃牳鏃ユ湡) : ""
+ , "HMaker": data.鍒跺崟浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 ? formatDate(data.鍒跺崟鏃ユ湡) : ""
+ , "HUpDater": data.淇敼浜�
+ , "HUpDateDate": data.淇敼鏃ユ湡 ? formatDate(data.淇敼鏃ユ湡) : ""
+ , "HMainSourceBillType": data.婧愬崟绫诲瀷
+ , "HMainSourceBillNo": data.婧愬崟鍙�
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 ? formatDate(data.鍏抽棴鏃ユ湡) : ""
+ });
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+
+
+
+
+ //#region 缂栬緫鑾峰彇琛ㄤ綋
+
+ function set_EditGrid(linterid) {
+ $("#HInterID").val(linterid);
+
+ $.ajax({
+ url: GetWEBURL() + '/QC_RequestCheckBill/GetRequestCheckBillDetail',
+ async: false,
+ type: "GET",
+ data: { "HID": linterid },
+ success: function (result) {
+ if (result.code == 1) {
+ console.log("瀹屾暣鐨勮繑鍥炴暟鎹�:", result);
+
+ // 鏍规嵁瀹為檯鏁版嵁缁撴瀯璋冩暣
+ var subTableData = result.data.h_v_Sc_MouldProdInHouseBillList;
+
+ if (subTableData && subTableData.length > 0) {
+ var mappedData = subTableData.map(function (item) {
+ console.log("鏄庣粏椤规暟鎹�:", item); // 璋冭瘯锛氭煡鐪嬪叿浣撴湁鍝簺瀛楁
+
+ return {
+ "HMaterID": item.鐗╂枡ID || item.HMaterID || 0,
+ "HMaterCode": item.鐗╂枡浠ｇ爜 || item.HMaterNumber || item.HMaterCode || "",
+ "HMaterName": item.鐗╂枡鍚嶇О || item.HMaterName || "",
+ "HMaterSpec": item.瑙勬牸鍨嬪彿 || item.HMaterModel || "",
+ "HUnitID": item.璁￠噺鍗曚綅ID || item.HUnitID || 0,
+ "HUnitCode": item.璁￠噺鍗曚綅浠ｇ爜 || item.HUnitNumber || item.HUnitCode || "",
+ "HUnitName": item.璁￠噺鍗曚綅 || item.HUnitName || "",
+ "HQty": item.鏁伴噺 || item.HQty || 0,
+ "HSampleDamageQty": item.鐮村潖鎬у疄楠屾暟閲� || item.HSampleDamageQty || 0,
+ "HSourceBillNo": item.婧愬崟鍗曞彿 || item.HSourceBillNo || "",
+ "HSourceBillType": item.婧愬崟绫诲瀷 || item.HSourceBillType || "",
+ "HRelationQty": item.鍏宠仈鏁伴噺 || item.HRelationQty || 0,
+ "HRelationMoney": item.鍏宠仈閲戦 || item.HRelationMoney || 0,
+ "HRemark": item.琛ㄤ綋澶囨敞 || item.HRemark || ""
+ };
+ });
+
+ console.log("鏄犲皠鍚庣殑鏁版嵁:", mappedData); // 璋冭瘯锛氭煡鐪嬫槧灏勭粨鏋�
+
+ option.data = mappedData;
+ } else {
+ // 濡傛灉娌℃湁鏁版嵁锛屾樉绀虹┖琛�
+ option.data = [{
+ "HMaterID": 0,
+ "HMaterCode": "",
+ "HMaterName": "",
+ "HMaterSpec": "",
+ "HUnitID": 0,
+ "HUnitCode": "",
+ "HUnitName": "",
+ "HQty": 0,
+ "HSampleDamageQty": 0,
+ "HSourceBillNo": "",
+ "HSourceBillType": "",
+ "HRelationQty": 0,
+ "HRelationMoney": 0,
+ "HRemark": ""
+ }];
+ }
+
+ table.render(option);
+ } else {
+ layer.alert(result.msg, { icon: 5 });
+ }
+ },
+ error: function (xhr, status, error) {
+ layer.close();
+ layer.alert("鎺ュ彛璇锋眰澶辫触! " + error, { icon: 5 });
+ }
+ });
+ }
+
+ //#endregion
+
+ //#region 鍦ㄦ湯灏惧鍔犱竴琛�
+ function btnAddLine(NewRow) {
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ layer.msg('澧炲姞涓�琛屾垚鍔燂紒')
+ }
+ //#endregion
+
+ //#region 鍦ㄦ寚瀹氳涓嬫彃鍏ヤ竴琛�
+ function btnInsertLine(NewRow) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var tables = []; //瀛樺偍鎻掑叆涓�琛屽悗鐨勮〃鏍兼暟鎹�
+ //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+ var rowList = table.cache['mainTable'];
+ for (var i = 0; i < rowList.length; i++) { //閬嶅巻琛ㄦ牸鐨勮
+ tables.push(option.data[i]);
+ if (rowList[i].LAY_CHECKED == true) { //鑾峰彇閫変腑琛岀殑浣嶇疆
+ tables.push(NewRow);
+ }
+ }
+ option.data = tables;
+ table.render(option);
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 澶嶅埗涓�琛�
+ function btnCopyLine(data) {
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ }
+ }
+ //#endregion
+
+ //#region 涓婄Щ
+ function btn_up() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length == 1) {
+ var tables = [];
+ //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+ var rowList = table.cache['mainTable'];
+ for (var i = 0; i < rowList.length; i++) { //閬嶅巻琛ㄦ牸鐨勮
+ if (rowList[i].LAY_CHECKED == true) { //鑾峰彇閫変腑琛岀殑浣嶇疆
+ //濡傛灉鏄涓�琛屼笂绉伙紝鍒欏け璐ュ苟鎻愰啋
+ if (i == 0) {
+ layer.msg("绗竴琛屾暟鎹棤娉曚笂绉伙紒");
+ return;
+ }
+ tables.push(option.data[i - 1]);
+ data[0].LAY_CHECKED = true;
+ option.data[i - 1] = data[0];
+ option.data[i] = tables[0];
+ table.render(option);
+ break;
+ }
+ }
+ } else {
+ layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
+ }
+ }
+ //#endregion
+
+ //#region 涓嬬Щ
+ function btn_under() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length == 1) {
+ var tables = [];
+ //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+ var rowList = table.cache['mainTable'];
+ for (var i = 0; i < rowList.length; i++) { //閬嶅巻琛ㄦ牸鐨勮
+ if (rowList[i].LAY_CHECKED == true) { //鑾峰彇閫変腑琛岀殑浣嶇疆
+ //濡傛灉鏄渶鍚庝竴琛屼笅绉伙紝鍒欏け璐ュ苟鎻愰啋
+ if (i == option.data.length - 1) {
+ layer.msg("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉伙紒");
+ return;
+ }
+
+ tables.push(option.data[i + 1]);
+ data[0].LAY_CHECKED = true;
+ option.data[i + 1] = data[0];
+ option.data[i] = tables[0];
+ table.render(option);
+ break;
+ }
+ }
+ } else {
+ layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
+ }
+ }
+ //#endregion
+
+ //#region 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1);
+ option.data = oldData;
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+ //#endregion
+
+ //#region 琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+
+ // 鐗╂枡淇℃伅 濡傛灉鍦ㄧ墿鏂欎唬鐮佸垪鎸塅7
+ if (obj.event === 'HMaterCode') {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim',
+ title: '鐗╂枡鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?selectMode=1', 'yes'], // 娣诲姞鍙傛暟
+ btn: ['纭畾', '鍙栨秷'],
+ btn1: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+
+ if (checkStatus.data.length === 0) {
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ return;
+ }
+
+ var selectedData = checkStatus.data[0];
+ var HMaterID = selectedData.HItemID;
+
+ // 鑾峰彇鐗╂枡璇︾粏淇℃伅
+ $.ajax({
+ url: GetWEBURL() + "/QC_RequestCheckBill/getMaterialByMaterID",
+ async: false,
+ type: "GET",
+ data: { "HMaterID": HMaterID },
+ success: function (result) {
+ if (result.code == 1) {
+ var materialData = result.data[0];
+ obj.update({
+ HMaterID: HMaterID,
+ HMaterCode: materialData.HMaterNumber,
+ HMaterName: materialData.HMaterName,
+ HMaterSpec: materialData.HMaterModel,
+ HUnitID: materialData.HUnitID,
+ HUnitCode: materialData.HUnitNumber,
+ HUnitName: materialData.HUnitName
+ });
+
+ layer.close(index);
+ } else {
+ layer.msg('鑾峰彇鐗╂枡淇℃伅澶辫触: ' + result.msg);
+ }
+ },
+ error: function () {
+ layer.msg('鑾峰彇鐗╂枡淇℃伅澶辫触');
+ }
+ });
+ },
+ btn2: function (index, layero) {
+ // 鍙栨秷鎸夐挳
+ },
+ success: function (layero, index) {
+ // 寮圭獥鎴愬姛鍥炶皟
+ }
+ });
+ }
+
+
+ obj.event = "";
+ return false;
+ }
+ })
+ }
+ //#endregion
+
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
+ }
+
+ //#region 闈炵┖楠岃瘉
+ function AllowLoadData(sSubStr) {
+ var Result = true;
+
+ //#region 涓昏〃鏍￠獙
+ var ref = /^\d+(\.\d+)?$/;
+ var temp = "";
+
+ if ($("#HBillNo").val() == '' || $("#HBillNo").val() == null) {
+ layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+ if ($("#HDate").val() == '' || $("#HDate").val() == null) {
+ layer.msg("鏃ユ湡涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+ if ($("#HDeptID").val() == '0' || $("#HDeptID").val() == null) {
+ layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+ if ($("#HBatchNo").val() == '' || $("#HBatchNo").val() == null) {
+ layer.msg("鎵瑰彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+ if ($("#HCheckEmp").val() == '0' || $("#HCheckEmp").val() == null) {
+ layer.msg("鐢宠浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+ if ($("#HProcID").val() == '0' || $("#HProcID").val() == null) {
+ layer.msg("宸ュ簭涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+ if ($("#HTestType").val() == '' || $("#HTestType").val() == null) {
+ layer.msg("妫�楠岀被鍨嬩笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+ if ($("#HSourceOrgID").val() == '0' || $("#HSourceOrgID").val() == null) {
+ layer.msg("鏉ユ簮缁勭粐涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+ if ($("#HInspectOrgID").val() == '0' || $("#HInspectOrgID").val() == null) {
+ layer.msg("璐ㄦ缁勭粐涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ //#endregion
+
+ //#region 瀛愯〃鏍￠獙
+ if (typeof (sSubStr) == "undefined" || sSubStr == "") {
+ layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HMaterID == "0") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HUnitID == "0") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁￠噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ temp = sSubStr[i].HQty + "";
+ if (temp == "" || temp * 1 == "0") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏁伴噺涓虹┖鎴栦负0!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ } else if (!ref.test(temp)) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏁伴噺璇疯緭鍏ラ潪璐熸暟!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+ }
+ else {
+ return Result = true;
+ }
+ //#endregion
+
+ //#region 瀛愯〃鍏抽敭瀛楁閲嶅妫�楠�
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ temp = option.data[i]["HMaterID"];
+ if ($.inArray(temp, num) != -1) {
+ layer.msg("绗�" + (i + 1) + "琛岋細鐗╂枡閲嶅锛岃閲嶆柊閫夋嫨锛�");
+ console.log(option);
+ return Result = false;
+ }
+ num.push(temp);
+ }
+ //#endregion
+
+ return Result;
+ }
+ //#endregion
+
+ //#region 鏍规嵁鐗╂枡ID鑾峰彇鐗╂枡璇︾粏淇℃伅
+ function getMaterialByMaterID(HMaterID) {
+ var resultData = {};
+ $.ajax({
+ url: GetWEBURL() + "QC_RequestCheckBill/getMaterialByMaterID",
+ async: false,
+ type: "GET",
+ data: {
+ "HMaterID": HMaterID
+ },
+ success: function (result) {
+ if (result.code == 1) {
+ var data = result.data;
+ resultData = data[0];
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ return resultData;
+ }
+
+ //#endregion
+ });
+
+ //鍙屽嚮杩斿洖鐗╂枡
+ function GetGyMaterial(data) {
+ OptionData[0] = data
+ }
+ //鍙屽嚮杩斿洖璁￠噺鍗曚綅
+ function GetGyUnit(data) {
+ OptionData[0] = data
+ }
+
+ //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟
+ function dealDoubleToFixed(data) {
+ //鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
+ var dotLength = 6;
+
+ //鍒ゆ柇鏄惁瀛樺湪灏忔暟鐐瑰強鍏剁储寮曚綅缃�
+ data = data + "";
+ var index = data.indexOf(".");
+
+ //澶勭悊鏁版嵁骞惰繑鍥�
+ if (index < 0) {
+ return data * 1;
+ } else {
+ //鑾峰彇灏忔暟浣嶆暟
+ var length = data.length - index - 1;
+ if (length <= dotLength) {
+ return data * 1;
+ } else {
+ data = data * 1;
+ return data.toFixed(dotLength) * 1;
+ }
+ }
+ }
+ //#endregion
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\347\224\263\350\257\267\345\215\225/QC_RequestCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\347\224\263\350\257\267\345\215\225/QC_RequestCheckBillList.html"
new file mode 100644
index 0000000..7f9f9b1
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\347\224\263\350\257\267\345\215\225/QC_RequestCheckBillList.html"
@@ -0,0 +1,1369 @@
+锘�<!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">
+ <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>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+ <style type="text/css">
+ <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">鏃ユ湡闂撮殧</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">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" id="HBillNo"
+ style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
+ style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
+ </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" 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-colla-content">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒跺崟浜�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" id="HMaker"
+ style="width:190px;">
+ </div>
+ </div>
+ <div style="display:block;">
+
+ </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="ColName" id="ColName" class="ForFilteringSchemes"
+ lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
+ lay-filter="Comparator" style="width:190px;">
+ <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="ColContent" id="ColContent">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护1</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" lay-filter="Comparator1"
+ class="ForFilteringSchemes" 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-bottom: 10px ">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护2</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" lay-filter="Comparator2"
+ class="ForFilteringSchemes" 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" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-reload" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Audit" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-DeAudit" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Close" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-DeClose" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Drop" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-DeDrop" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-exit" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , soulTable = layui.soulTable
+
+ //#region 鍏叡鍙橀噺
+ //鏌ヨ鏉′欢
+ var sWhere = " where 1 = 1 ";
+ var option = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ var Name = "QC_RequestCheckBill";
+ var HModName = "QC_RequestCheckBill";
+ //#endregion
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "7525";
+ var HPageTitle = "妫�楠岀敵璇峰崟";
+ //#endregion
+ var titleData = ["鍗曟嵁ID", "hsubid", "HInterID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ //#region 銆愯繃婊ゆ柟妗堛��
+ //杩囨护鏉′欢鐨刢lass绫�
+ var HClassTag = "ForFilteringSchemes";
+ //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+ window.HModuleName = "妫�楠岀敵璇峰崟缁存姢";
+ //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+ window.HDefaultFilter = "";
+ //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+ window.HInterID_Choose = 0;
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ set_ClearBill();
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板鎸夐挳
+ case 'btn-Add': set_AddNew();
+ break;
+
+ //缂栬緫鎸夐挳
+ case 'btn-Edit': set_ShowBill();
+ break;
+ //鍒犻櫎鎸夐挳
+ case 'btn-Delete': set_DeleteBill();
+ break;
+ //鎵撳嵃
+ case 'btn-print': get_PrintReport();
+ break;
+ //鍒锋柊
+ case 'btn-reload': set_Refresh();
+ break;
+ //瀹℃牳鎸夐挳 锛�0:瀹℃牳銆�1:鍙嶅鏍革級
+ case 'btn-Audit':
+ set_CheckBill(0);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(1);
+ break;
+ //鍏抽棴鎸夐挳 锛�0:鍏抽棴銆�1:鍙嶅叧闂級
+ case 'btn-Close':
+ set_CloseBill(0);
+ break;
+ //鍙嶅叧闂寜閽�
+ case 'btn-DeClose':
+ set_CloseBill(1);
+ break;
+ //浣滃簾鎸夐挳 锛�0:浣滃簾銆�1:鍙嶄綔搴燂級
+ case 'btn-Drop':
+ set_DropBill(0);
+ break;
+ //鍙嶄綔搴熸寜閽�
+ case 'btn-DeDrop':
+ set_DropBill(1);
+ break;
+ //閫�鍑�
+ case 'btn-exit':
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ //鎸夐挳璁剧疆
+ case 'set_HideButton':
+ var btns = document.getElementsByTagName("button");
+ var HBillType = "7525";
+ get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ //淇濆瓨鏂规
+ case 'set_SaveScheme': set_SaveScheme();
+ break;
+ //璇诲彇鏂规
+ case 'set_ReadScheme': set_ReadScheme();
+ break;
+ };
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery(table, option);
+ });
+ //#endregion
+
+ //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ function set_ClearBill() {
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery()
+
+ //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+ get_DefaultModule();
+ }
+
+ //#region 鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ var columns = [
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
+ , { field: 'hmainid', title: '鍗曟嵁ID', hide: true, sort: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(new Date(d.鏃ユ湡), 'yyyy-MM-dd')}}</div>", sort: true }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 160, sort: true }
+ , { field: 'HBillTypeName', title: '鍗曟嵁绫诲瀷', width: 160, sort: true }
+ , { field: 'HDeptName', title: '閮ㄩ棬', width: 160, sort: true }
+ , { field: 'HSupplyName', title: '渚涘簲鍟�', width: 160, sort: true }
+ , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160, sort: true }
+ , { field: 'HMaker', title: '鍒跺崟浜�', width: 160, sort: true }
+ , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 160, templet: "<div>{{d.HMakeDate ==null ?'':layui.util.toDateString(d.HMakeDate, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: 'HChecker', title: '瀹℃牳浜�', width: 160, sort: true }
+ , { field: 'HCheckDate', title: '瀹℃牳鏃ユ湡', width: 160, templet: "<div>{{d.HCheckDate ==null ?'':layui.util.toDateString(d.HCheckDate, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: 'HCloseMan', title: '鍏抽棴浜�', width: 160, sort: true }
+ , { field: 'HCloseDate', title: '鍏抽棴鏃ユ湡', width: 160, templet: "<div>{{d.HCloseDate ==null ?'':layui.util.toDateString(d.HCloseDate, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: 'HDeleteMan', title: '浣滃簾浜�', width: 160, sort: true }
+ , { field: 'HDeleteDate', title: '浣滃簾鏃ユ湡', width: 160, templet: "<div>{{d.HDeleteDate ==null ?'':layui.util.toDateString(d.HDeleteDate, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: 'HRemark', title: '澶囨敞', width: 160, sort: true }
+ ];
+
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ , cellMinWidth: 120
+ , totalRow: true
+ , limit: 50
+ , height: 'full-50'
+ , cols: [columns]
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ };
+ }
+ //#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
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery(table, option) {
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HMaker = $("#HMaker").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 = "" + Comparator2 + "'" + ColContent2 + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
+ }
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ }
+ if (HBillNo) {
+ sWhere += " and HBillNo like '%" + HBillNo + "%'";
+ }
+ if (HMaker) {
+ sWhere += " and HMaker like '%" + HMaker + "%'";
+ }
+
+ var index = layer.load(0);
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = " where 1 = 1 ";
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");
+ $("#HMaker").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0")
+ $("#ColContent1").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0")
+ $("#ColContent2").val("");
+ form.render('select');
+ ColFilter();
+
+ sWhere = " where 1 = 1 ";
+ }
+ //#endregion
+
+ //#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+
+ //鍗曟嵁鍙疯秴閾炬帴
+ if (obj.event == 'HBillNo') {
+ var linterid = data.hmainid.toString();
+ var content = 'QC_RequestCheckBillEdit.html?OperationType=3&linterid=' + linterid + '&closeType=1'
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , closeBtn: 1
+ , shade: 0.6
+ , maxmin: true
+ , anim: 0
+ , content: content
+ , resize: false,
+ end: function () {
+ get_FastQuery(table, option);
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+ //#endregion
+
+ //#region 鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var wait = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + '/QC_RequestCheckBill/GetRequestCheckBillList',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.code == "1") {
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
+
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true });
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } else if (data[i].name == '鍗曟嵁鍙�') {
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else {
+ switch (data[i].Type) {
+ 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 HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 800
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ }
+ DataList = data1.data;
+ option.data = data1.data;
+ DisPlay_HideColumn()
+ ins = table.render(option);
+
+ if ($("#ColName option").length < 1) {
+ ColFilter()
+ }
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button");
+ var HBillType = "7525";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }, complete: () => {
+ //鍒楄缃�
+ DisPlay_HideColumn();
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏂板
+ function set_AddNew() {
+ var content = 'QC_Add_Edit_RequestCheckBillList.html?OperationType=1&linterid=&closeType=1'
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim',
+ title: '鏂板' + HPageTitle,
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: content,
+ end: function () {
+ $("#btnSearch").trigger('click');
+ },
+ success: function (layero, index) {
+ }
+ });
+ }
+ //#endregion
+
+
+
+ //#region 缂栬緫鍗曟嵁
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+ var content = 'QC_Add_Edit_RequestCheckBillList.html?OperationType=3&linterid=' + linterid + '&closeType=1'
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , closeBtn: 1
+ , shade: 0.6
+ , maxmin: true
+ , anim: 0
+ , content: content
+ , resize: false,
+ end: function () {
+ $("#btnSearch").trigger('click');
+ }
+ , cancel: function () {
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/QC_RequestCheckBill/set_DeleteBill",
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.code == "1") {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $("#btnSearch").trigger('click');
+ });
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+ //#endregion
+
+ //#region 鎵撳嵃
+ function get_PrintReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=QC_RequestCheckBill', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function set_Refresh() {
+ $("#btnSearch").trigger('click');
+ }
+ //#endregion
+
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ var url = "";
+ if (num == 0) {
+ url = GetWEBURL() + "/QC_RequestCheckBill/set_CheckBill";
+ } else {
+ url = GetWEBURL() + "/QC_RequestCheckBill/set_AbandonCheck";
+ }
+
+ $.ajax({
+ type: "GET",
+ url: url,
+ data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.code == "1") {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $("#btnSearch").trigger('click');
+ });
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/QC_RequestCheckBill/CloseRequestCheckBill",
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.code == "1") {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $("#btnSearch").trigger('click');
+ });
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+ function set_DropBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/QC_RequestCheckBill/DeleteRequestCheckBill",
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.code == "1") {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $("#btnSearch").trigger('click');
+ });
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹綔搴燂紒');
+ }
+ }
+ //#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" });
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');
+ $(obj.tr.selector).attr({ "style": "background:" });
+ }
+
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#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" });
+
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = true;
+ }
+ });
+
+ var linterid = obj.data["hmainid"];
+ var content = 'QC_Add_Edit_RequestCheckBillList.html?OperationType=3&linterid=' + linterid + '&closeType=1'
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , closeBtn: 1
+ , shade: 0.6
+ , maxmin: true
+ , anim: 0
+ , content: content
+ , resize: false,
+ end: function () {
+ $("#btnSearch").trigger('click');
+ }
+ , cancel: function () {
+ }
+ })
+ });
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim"
+ , title: "闅愯棌鍒楄缃�"
+ , closeBtn: 1
+ , shift: 2
+ , area: ["50%", "90%"]
+ , maxmin: true
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ var dataCol = [];
+ var titleData = ["鍗曟嵁ID", "hsubid", "hmainid"];
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (i >= dataCol.length) {
+ continue;
+ }
+ 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 (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);
+ }
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button");
+ var HBillType = "7525";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "QC_RequestCheckBill_ExportExcel";
+
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck",
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+ for (var i = 0; i < valueList.length; i++) {
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+
+ $("#HInitTimeCycle").empty();
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+ form.render('select');
+
+ $("#HInitTimeCycle").val("29");
+ }
+ //#endregion
+
+ //#region 銆愯繃婊ゆ柟妗堛��
+ //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+ function get_DefaultModule() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ async: false,
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data;
+ HInterID_Choose = data[0].hmainid;
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ var HRemark = data[0].澶囨敞
+
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ get_FastQuery()
+ form.render("select");
+ } else {
+ document.getElementById("HFilterScheme_Now").style.display = "none";
+ form.render("select");
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //淇濆瓨鏂规
+ function set_SaveScheme() {
+ var index = layer.open()
+ var HIsClose_Manual = false;
+ var Filter = document.getElementsByClassName(HClassTag);
+
+ var HFilterIdList = "";
+ var HFilterIdLists = "";
+ var HValue = "";
+ var HElement_type = "";
+
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id;
+ HFilterIdLists += Filter[i].id + ",";
+ HValue += $("#" + HFilterIdList).val() + ",";
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";
+ }
+
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ if (HDefaultFilter == "") {
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , cancel: function () {
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery();
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ }
+ })
+ layer.close(index)
+ } else {
+ layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+ title: "鎿嶄綔鎻愮ず",
+ icon: 0,
+ btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+ }, function (index, layero) {
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , end: function () {
+ get_FastQuery()
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ })
+ layer.close(index)
+ }, function (index) {
+ var Filter_Edit = document.getElementsByClassName(HClassTag);
+ HFilterIdList = "";
+ HFilterIdLists = "";
+ HValue = "";
+ HElement_type = "";
+ for (var i = 0; i < Filter_Edit.length; i++) {
+ HFilterIdList = Filter_Edit[i].id;
+ HFilterIdLists += Filter_Edit[i].id + ",";
+ HValue += $("#" + HFilterIdList).val() + ",";
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";
+ }
+
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Xt_FastICScheme/save",
+ async: true,
+ data: { "oMain": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ }
+ });
+ layer.close(index)
+ }, function (index) {
+ layer.alert('鍙栨秷')
+ layer.close(index)
+ });
+ }
+ }
+
+ //璇诲彇鏂规
+ function set_ReadScheme() {
+ var HIsClose_Manual = false;
+ var Filter = document.getElementsByClassName(HClassTag);
+
+ var HFilterIdList = "";
+ var HFilterIdLists = "";
+ var HValue = "";
+ var HElement_type = "";
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id;
+ HFilterIdLists += Filter[i].id + ",";
+ HValue += $("#" + HFilterIdList).val() + ",";
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";
+ }
+
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '杩囨护鏂规鍒楄〃'
+ , shift: 0
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+ , cancel: function () {
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery()
+ form.render("select");
+ }
+ }
+ })
+ }
+ //#endregion
+
+ //#endregion
+ });
+
+ //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+ function HFilterScheme(obj) {
+ var HInterID = obj[0].hmainid;
+ HInterID_Choose = obj[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data;
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ var HRemark = data[0].澶囨敞
+
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ HInterID = data[0].hmainid
+
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+
+ </script>
+</body>
+
+</html>
\ No newline at end of file
--
Gitblit v1.9.1