From fe7fbc8ddf932fccb620aacd05886690d749dd60 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 25 九月 2023 09:16:58 +0800
Subject: [PATCH] 生产订单列表-基础资料，作业指导书，审核、关闭、作废按钮，选物料带出单位
---
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 2
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 201 +++
WebTM/views/质量管理/巡检记录单/QC_PatrolProcCheckBillList.html | 4
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 1093 ++++++++++++++++++++
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 32
WebTM/views/生产管理/作业指导书/Gy_SOPBill_Video.html | 240 ++-
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html | 2
WebTM/views/基础资料/生产基础资料/Gy_SOPBillEdit.html | 17
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html | 192 +++
WebTM/views/生产管理/生产工位/Gy_SourceWorkStationSet.html | 49
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 556 +++++++--
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 310 +++--
WebTM/views/index.html | 7
WebTM/views/销售管理/退货通知单/Xs_SeOutStockBackBillList.html | 192 +++
WebTM/views/Baseset/基础资料/Sc_ICMOBillListView3.html | 147 ++
WebTM/WebTM.csproj | 6
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 127 ++
17 files changed, 2,796 insertions(+), 381 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 12189b1..6e24e5c 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -64,6 +64,8 @@
<Reference Include="System.EnterpriseServices" />
</ItemGroup>
<ItemGroup>
+ <Content Include="Files\OIP-C.jpg" />
+ <Content Include="Files\R-C.jpg" />
<Content Include="HtmlPage1.html" />
<Content Include="layuiadmin\ax\ax-response.css" />
<Content Include="layuiadmin\ax\ax.css" />
@@ -148,6 +150,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WWWasterWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WarehouseList_JIT.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\OtherOutRequestBillList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Sc_ICMOBillListView3.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Sc_ICMOBillListView2.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Sc_ProcessExchangeBillListView.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckItemListView.html" />
@@ -259,6 +262,7 @@
<Content Include="views\宸ヨ祫绠＄悊\璇峰亣鐢宠\Pay_OutApplyBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\璇峰亣鐢宠\Pay_OutApplyBillList.html" />
<Content Include="views\鏉＄爜鏄庣粏\Kf_BarCodeDetailQuery.html" />
+ <Content Include="views\鐢熶骇绠＄悊\浣滀笟鎸囧涔Gy_SOPBill_Video.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\Cg_PODemandPlanConfigBill_Excel.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘MaterialShorAnalysisReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇宸ヤ綅\Gy_SourceWorkStationSet.html" />
@@ -1350,6 +1354,7 @@
<Content Include="views\棰嗘枡鍙戣揣\鏀舵枡鍏ュ簱\Kf_ReciveBill_Fast.html" />
<Content Include="views\棰嗘枡鍙戣揣\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_Check_New.html" />
<Content Include="views\棰嗘枡鍙戣揣\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_CheckList_New.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\閿�鍞嚭搴揬Kf_SellOutBill.html" />
<Content Include="views\棰嗘枡鍙戣揣\閿�鍞嚭搴揬Kf_SellOutBill_CheckList_New.html" />
<Content Include="views\棰嗘枡鍙戣揣\閿�鍞嚭搴揬Kf_SellOutBill_Check_New.html" />
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBackBillEdit.html" />
@@ -1792,7 +1797,6 @@
</Compile>
</ItemGroup>
<ItemGroup>
- <Folder Include="Files\" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
</ItemGroup>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView3.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView3.html"
new file mode 100644
index 0000000..0c5722c
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView3.html"
@@ -0,0 +1,147 @@
+锘�<!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.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">
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 15px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护鍒�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">閫夋嫨</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCancel">鍙栨秷</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="mainTable"></table>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script>
+ //寮曠敤鐨勫崟鎹強妯″潡锛氬伐搴忔祦杞崱銆�
+ layui.use(['table', 'form', 'layer'], function () {
+ var table = layui.table
+ , form = layui.form
+ , layer = layui.layer;
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ var HSourceID = params[params[0]]; //鐢熶骇璧勬簮
+
+ form.on('submit(HQuery)', function () {//杩囨护浠诲姟鍗�
+ //var sMainStr = JSON.stringify(table.cache['mainTable']);
+ RoadQuery($('#Value').val());
+ });
+ form.on('submit(HCancel)', function () {//鍙栨秷
+ Pub_Close(1);
+ });
+ form.on('submit(FH)', function () {//閫夋嫨浠诲姟鍗�
+ //var sMainStr = JSON.stringify(table.cache['mainTable']);
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ parent.GetICMOBillValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ RoadQuery($('#Value').val());
+ table.render({
+ elem: '#mainTable'
+ // , url: '/demo/table/user/'
+ , data: []
+ , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'hmainid', width: 150, title: 'hmainid', hide: true }
+ , { field: 'HEntryID', width: 150, title: 'HEntryID', hide: true }
+ , { field: 'HEmpID', width: 150, title: 'HEmpID', hide: true }
+ , { field: 'HBomID', width: 150, title: 'HBomID', hide: true }
+ , { field: 'HRoutingInterID', width: 150, title: 'HRoutingInterID', hide: true }
+ , { field: 'hsubid', width: 150, title: 'hsubid', hide: true }
+ , { field: 'HMaterID', width: 150, title: 'HMaterID', hide: true }
+ , { field: 'HUnitID', width: 150, title: 'HUnitID', hide: true }
+ , { field: 'HAuxPropID', width: 150, title: 'HAuxPropID', hide: true }
+ , { field: 'HDeptID', width: 150, title: 'HDeptID', hide: true }
+ , { field: 'HEntryCusID', width: 150, title: 'HEntryCusID', hide: true }
+ , { field: 'HCenterID', width: 150, title: 'HCenterID', hide: true }
+ , { field: 'HSourceID_b', width: 150, title: 'HSourceID_b', hide: true }
+ , { field: '鍗曟嵁鍙�', width: 150, title: '鐢熶骇璁㈠崟' }
+ , { field: '鏃ユ湡', width: 150, title: '鏃ユ湡' }
+ , { field: '浜у搧浠ｇ爜', width: 200, title: '鐗╂枡浠ｇ爜' }
+ , { field: '浜у搧鍚嶇О', width: 200, title: '鐗╂枡鍚嶇О' }
+ , { field: '瑙勬牸鍨嬪彿', width: 200, title: '瑙勬牸鍨嬪彿' }
+ , { field: '璁″垝鐢熶骇鏁伴噺', width: 150, title: '鏃ヨ鍒掑崟鍙�' }
+ ]]
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ });
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadQuery(Where) {
+ var index = layer.load();
+ var Value = Where;
+ if (Value == null) {
+ Value = '';
+ }
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetSc_ICMOBillListView3",
+ async: true,
+ data: { "ICMOBill": Value, "OrganizationID": sessionStorage["OrganizationID"], "HSourceID": HSourceID },
+ //data: { "Value": Value },
+ success: function (result) {
+ if (result.count == 1) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+
+ }
+ });
+ layer.close(index);
+ }
+ else {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+
+ }
+ });
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (result) {
+ layer.close(index);
+ console.log(result);
+ //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+ }
+ });
+ };
+ });
+ </script>
+
+</body>
+</html>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 0773234..beed54e 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -641,6 +641,13 @@
<dd><a lay-href="鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_MESExecptFeedBackBillList.html">寮傚父鍙嶉鍗曠淮鎶�</a></dd>
</dl>
</dd>
+ <dd>
+ <a>瀹㈣瘔澶勭悊</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鍝佽川绠＄悊/瀹㈣瘔澶勭悊/Crm_CustomerAppealBill.html">瀹㈣瘔澶勭悊鍗�</a></dd>
+ <dd><a lay-href="鍝佽川绠＄悊/瀹㈣瘔澶勭悊/Crm_CustomerAppealBillList.html">瀹㈣瘔澶勭悊鍗曠淮鎶�</a></dd>
+ </dl>
+ </dd>
</dl>
</li>
<!--鍣ㄥ叿绠＄悊-->
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
index 372bf5d..9c89533 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
@@ -67,6 +67,7 @@
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" id="HBillNo" style="width:190px;">
+ <input type="hidden" name="HInterID" id="HInterID" class="layui-input" value="0">
</div>
</div>
<div class="layui-inline">
@@ -260,7 +261,17 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1 || OperationType == 2) {//鏃犳簮鏂板
//鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //鏃ユ湡
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3305' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HInterID").val(d.data[0].HInterID);
+ }
+ });
set_AddFNew();
set_AddFNew2();
PicUpload();
@@ -422,7 +433,7 @@
data.field.HRemark = HRemark;
var user = sessionStorage["HUserName"];
var oMain = JSON.stringify(data.field)
- var sMainSub = oMain + ';' + linterid + ';' + user;
+ var sMainSub = oMain + ';' + 0 + ';' + user;
if (HMaterNumber == "") {
layer.msg("浜у搧娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -648,7 +659,7 @@
, multiple: true
, auto: false
//, bindAction: '#testListAction' //鎸夋壄缁戝畾
- , data: { "HBillNo": $("#HBillNo").val(), "HRemark": $("#HRemark").val(), "HUserName": sessionStorage["HUserName"] }
+ , data: { "HBillNo": $("#HBillNo").val(), "HInterID": $("#HInterID").val(), "HUserName": sessionStorage["HUserName"] }
, choose: function (obj) {
var files = this.files = obj.pushFile(); //灏嗘瘡娆￠�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
document.getElementById("right_table").style.visibility = ''; //浣挎爣绛炬樉绀�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
index 0337141..93009f4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
@@ -54,7 +54,7 @@
<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Autoplay" style="background-color:#959393;margin-left:15px" id="auto">鑷姩鎾斁</button>
</div>
<div class="layui-inline">
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="HideVideo" style="background-color:#959393;margin-left:15px" id="auto">闅愯棌瑙嗛</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="HideVideo" style="background-color:#959393;margin-left:15px" id="HideVideo">闅愯棌瑙嗛</button>
</div>
<div class="layui-inline">
<h1 style="text-align: center;margin-left:100px"><b>宸ヤ綅浣滀笟鎸囧涔�</b></h1>
@@ -74,21 +74,30 @@
</ul>
</div>
</div> <!--top-end-->
- <div class="layui-colla-item">
- <!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
- <video controls width="250">
- <source src="/media/cc0-videos/flower.webm" type="video/webm" />
+ <div style="width:98%;height:570px;min-height:300px;position: relative;">
+ <!--//杞挱鍥�-->
+ <div class="layui-carousel" id="test1" style="position:absolute;">
+ <div carousel-item id="file">
+
+ </div>
+ </div>
+ <!--//瑙嗛-->
+ <div class="layui-colla-item" id="IsHide" style="z-index: 50;margin-left:912px;padding-top:385px;">
+ <video controls width="290" height="180">
+ <!--<source src="../../Files/yyh.qlv" type="video/webm" />
- <source src="/media/cc0-videos/flower.mp4" type="video/mp4" />
+ <source src="../../../Files/yyh.qlv" type="video/mp4" />
- Download the
- <a href="/media/cc0-videos/flower.webm">WEBM</a>
- or
- <a href="/media/cc0-videos/flower.mp4">MP4</a>
- video.
- </video>
+ Download the
+ <a href="/media/cc0-videos/flower.webm">WEBM</a>
+ or
+ <a href="/media/cc0-videos/flower.mp4">MP4</a>
+ video.-->
+ </video>
- </div>
+ </div>
+
+ </div>
</div>
<!--</form>-->
</div>
@@ -134,7 +143,10 @@
var option = [];
var option2 = [];
var arr = [];
- var HInterID;
+ var HInterID = 0;
+ var HID = 0;
+
+ var HSourceID = sessionStorage["HSourceID"];//鐢熶骇璧勬簮
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栬〃鏍�
@@ -171,27 +183,9 @@
});
//#endregion
- //#region 鍔犺浇鏁版嵁鍒扮綉鏍�
- //get_Display(sWhere);
-
- //閲囩敤寤舵椂鐨勬柟寮忕瓑寰呮暟鎹�
- get_Display(sWhere);
- setTimeout(function () { get_Display2(sWhere); }, 1000);
- setTimeout(function () { get_Display2(sWhere); }, 1000);
- setTimeout(function () { get_Display3(sWhere); }, 1000);
- setTimeout(function () { ins.reload({ autoplay: false }) }, 1500);
- //#endregion
-
- //#region 鑷姩鎾斁妯″紡涓嬭幏鍙栭〉闈俊鎭殑鏂规硶
- function set_LoadAgain() {
- get_Display(sWhere);
- setTimeout(function () { get_Display2(sWhere); }, 500);
- setTimeout(function () { get_Display2(sWhere); }, 500);
- setTimeout(function () { get_Display3(sWhere); }, 500);
- setTimeout(function () { ins.reload({ autoplay: false }) }, 1000);
- }
- //#endregion
-
+ //鑾峰彇褰撳墠鐢熶骇璧勬簮鐨勭敓浜ц鍗�
+ get_Display(sWhere, HID);
+
//#region 鍒ゆ柇鎿嶄綔绫诲瀷(杩欓噷娌＄敤鍒�)
if (OperationType == 1 || OperationType == 2) {//鏃犳簮鏂板
//鍒濆鍩烘湰淇℃伅璧嬪��
@@ -204,6 +198,40 @@
}
//#endregion
+ //#region 閫夊崟鍙�
+ form.on('submit(CheckTask)', function (data) {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ュ崟鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Sc_ICMOBillListView3.html?HSourceID=' + HSourceID, 'yes']
+ })
+ });
+
+ //#region 璁剧疆
+ form.on('submit(SetUp)', function (data) {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '璁剧疆'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鐢熶骇绠＄悊/鐢熶骇宸ヤ綅/Gy_SourceWorkStationSet.html?OperationType=5&linterid=' + HSourceID, 'yes']
+ })
+ });
+
+ //#region 闅愯棌瑙嗛
+ form.on('submit(HideVideo)', function (data) {
+ if (document.getElementById("HideVideo").innerHTML == "闅愯棌瑙嗛") {
+ document.getElementById("IsHide").style.display = "none";//闅愯棌瑙嗛
+ document.getElementById("HideVideo").innerHTML = "鏄剧ず瑙嗛";
+ } else {
+ document.getElementById("IsHide").style.display = "inherit";//闅愯棌瑙嗛
+ document.getElementById("HideVideo").innerHTML = "闅愯棌瑙嗛";
+ }
+ });
//#region 閫�鍑�
form.on('submit(Exit)', function (data) {
@@ -215,8 +243,9 @@
//鍏抽棴椤电
Pub_Close(1);
}
- });
- //#endregion
+ });
+
+ //#endregion
//#region 鏄惁鑷姩鎾斁
form.on('submit(Autoplay)', function (data) {
var num = 0;
@@ -350,15 +379,19 @@
}
};
}
- //#endregion
+ //#endregion
//#region 鍔犺浇缃戞牸
- function get_Display(sWhere) {
+ function get_Display(HSourceID, HID) {
var wait = layer.load();//閬僵
+ $("#file").html("");
+ $(".layui-carousel-ind").html("");
+
$.ajax({
- url: GetWEBURL() + '/Sc_ICMOBillStatus_Tmp/list',
+ url: GetWEBURL() + '/Sc_ICMOBill/list2',
type: "GET",
- data: { "sWhere": sessionStorage["HSourceID"], "user": sessionStorage["HUserName"] },
+ data: { "HSourceID": HSourceID, "user": sessionStorage["HUserName"], "HMainID": HID },
+
success: function (data1) {
if (data1.count == 1) {
if (data1.data[0]) {
@@ -366,57 +399,7 @@
}
option.data = data1.data;
table.render(option);
- layer.close(wait);
- } else {
- layer.close(wait);
- layer.alert(data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
- //鍔犺浇鍙充笅鏂圭綉鏍�
- function get_Display2(sWhere) {
- if (HInterID == "" || HInterID == null) {
- HInterID = 0;
- }
- var wait = layer.load();
- $.ajax({
- url: GetWEBURL() + '/Sc_ICMOBillStatus_Tmp/Filelist',
- type: "GET",
- data: { "sWhere": HInterID },
- success: function (data1) {
- if (data1.count == 1) {
- option2.data = data1.data;
- table.render(option2);
- layer.close(wait);
- } else {
- layer.close(wait);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
- }
- });
- }
-
- //鍔犺浇宸︿晶鏂囦欢
- function get_Display3(sWhere) {
- if (HInterID == "" || HInterID == null) {
- HInterID = 0;
- }
- $("#file").html("");
- $(".layui-carousel-ind").html("");
- $.ajax({
- url: GetWEBURL() + '/Sc_ICMOBillStatus_Tmp/Filelist',
- type: "GET",
- data: { "sWhere": HInterID },
- success: function (data1) {
- if (data1.count == 1) {
for (let i = 0; i < data1.data.length; i++) {
var html = '';
if (data1.data[i].鏂囦欢绫诲瀷 == '.jpeg' || data1.data[i].鏂囦欢绫诲瀷 == '.jpg') {
@@ -437,20 +420,83 @@
$("#file").append(html2);
}
ins.reload({ autoplay: false })
- //layer.close(wait);
+
+ layer.close(wait);
} else {
- //layer.close(wait);
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
}
}, error: function () {
- //layer.close(wait);
- layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
}
//#endregion
- //浠ヤ笂鏄痩ayui妯″潡
+
+ //瀹氫箟涓哄叏灞�鍙橀噺
+ window.get_Display_All = function (HSourceID, HMainID) {
+ var wait = layer.load();//閬僵
+ $("#file").html("");
+ $(".layui-carousel-ind").html("");
+
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ICMOBill/list2',
+ type: "GET",
+ data: { "HSourceID": HSourceID, "user": sessionStorage["HUserName"], "HMainID": HMainID },
+
+ success: function (data1) {
+ if (data1.count == 1) {
+ if (data1.data[0]) {
+ HInterID = data1.data[0].HInterID
+ }
+ option.data = data1.data;
+ table.render(option);
+
+ for (let i = 0; i < data1.data.length; i++) {
+ var html = '';
+ if (data1.data[i].鏂囦欢绫诲瀷 == '.jpeg' || data1.data[i].鏂囦欢绫诲瀷 == '.jpg') {
+ var FileName = data1.data[i].鏂囦欢鍚嶇О;
+ //html += '<img src=`../../../Files/${FileName}` style="width:100%;height:100%">'
+ html += '<div><img src=../../../Files/' + FileName + ' alt="" style="width:100%;height:100%"></div>'
+ $("#file").append(html);
+ }
+ if (data1.data[i].鏂囦欢绫诲瀷 == '.pdf') {
+ var FileName2 = data1.data[i].鏂囦欢鍚嶇О;
+ //<embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" />
+ html += '<div><embed src="../../../Files/' + FileName2 + '"' + ' type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" /></div>'
+ $("#file").append(html);
+ }
+ if (data1.data[i].鏂囦欢绫诲瀷 == null && data1.data[i].鏂囦欢鍚嶇О == null) {
+ var html2 = '<h1 style="text-align:center;line-height:570px;color:red;font-weight:bolder;">鏆傛湭涓婁紶鏂囦欢</h1>';
+ $("#file").append(html2);
+ }
+ }
+ if (data1.data.length == 0) {
+ var html2 = '<h1 style="text-align:center;color:red;font-weight:bolder;">鏆傛湭涓婁紶鏂囦欢</h1>';
+ $("#file").append(html2);
+ }
+ ins.reload({ autoplay: false })
+
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ };
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
});
+ //杩斿洖浠诲姟鍗曚俊鎭�
+ function GetICMOBillValue(obj) {
+ get_Display_All(obj[0].HSourceID_b, obj[0].hmainid);
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSet.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSet.html"
index 847c6a7..687e9d1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSet.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSet.html"
@@ -100,7 +100,7 @@
</div>
</div>
</div>
- <div class="layui-row">
+ <div class="layui-row" id="IsHide">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍒涘缓浜�</label>
<div class="layui-input-inline">
@@ -179,6 +179,10 @@
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(linterid);
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+ }
+ else if (OperationType == 5) {//璁剧疆
+ document.getElementById("IsHide").style.display = "none";//闅愯棌鍒涘缓浜猴紝鍒涘缓鏃堕棿瀛楁
+ RoadBillToSop(linterid);
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -297,6 +301,49 @@
}
//#endregion
+ //#region 浣滀笟鎸囧涔﹁缃姞杞芥暟鎹�
+ function RoadBillToSop(linterid) {
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ var ajaxLoad = layer.load();
+ sWhere = " and HSourceID = " + linterid
+ $.ajax({
+ url: GetWEBURL() + "Gy_SourceWorkStationSet_ToSop/Soplist",
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ if (result.data.length < 1) {
+ return;
+ };
+ var data = result.data[0];
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HItemID": data.HItemID
+ , "HMacAddr": data.MAC鍙�
+ , "HSourceID": data.HSourceID
+ , "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
+ , "HWorkStationID": data.HWorkStationID
+ , "HWorkStationName": data.宸ヤ綅鍚嶇О
+ , "HProcID": data.HProcID
+ , "HProcName": data.宸ュ簭鍚嶇О
+ , "HType": data.鍖归厤绫诲瀷
+ , "HVideo": data.鏄惁榛樿鎾斁瑙嗛 == "鏄�" ? 1 : 0
+ , "HRemark": data.澶囨敞
+ , "HCreateDate": Format(data.鍒涘缓鏃ユ湡, "yyyy-MM-dd")
+ , "HCreator": data.鍒涘缓浜�
+ });
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//#region 閫夋嫨鐢熶骇璧勬簮鏂规硶
function get_checkHSource() {
layer.open({
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
index aa4f271..aa65243 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
@@ -1043,7 +1043,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
type: "GET",
- data: { "CheckProjectID": HQCSchemeID_Patrol },
+ data: { "CheckProjectID": HQCSchemeID_Patrol,"HBatchQty": 0 },
success: function (result) {
if (result.code == 1) {
var rowdata = [];
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
index d851a4a..bb8e562 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
@@ -37,13 +37,13 @@
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-input-block" style="margin-left: 100px;">
<input type="text" class="layui-input" name="HDate1" id="HDate1">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-input-block" style="margin-left: 100px;">
<input type="text" class="layui-input" name="HDate2" id="HDate2">
</div>
</div>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index 85cada1..dd0d023 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -676,6 +676,8 @@
var isFristClick = true; //鏄惁棣栨鐐瑰嚮琛�
var isHavingCount = false; //妫�楠屽�艰〃鏍兼槸鍚︽湁鏁版嵁
var UnRightQty_isFied = 0; //鐢ㄤ簬鍒ゆ柇鏄惁鍚堟牸//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
+ var editIndex = 0;//缂栬緫涓嬫爣
+ var SampleNum = [];//鏍锋湰鏁伴噺
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
@@ -1215,19 +1217,19 @@
if (sSubTable[i].HSampleSchemeID == '') {
sSubTable[i].HSampleSchemeID = 0
}
- if (sSubTable[i].HSampleQty == '') {
+ if (sSubTable[i].HSampleQty == '' || sSubTable[i].HSampleQty == null) {
sSubTable[i].HSampleQty = 0
}
- if (sSubTable[i].HSampleDamageQty == '') {
+ if (sSubTable[i].HSampleDamageQty == '' || sSubTable[i].HSampleDamageQty == null) {
sSubTable[i].HSampleDamageQty = 0
}
- if (sSubTable[i].HAcceptQty == '') {
+ if (sSubTable[i].HAcceptQty == '' || sSubTable[i].HAcceptQty == null) {
sSubTable[i].HAcceptQty = 0
}
- if (sSubTable[i].HRejectQty == '') {
+ if (sSubTable[i].HRejectQty == '' || sSubTable[i].HRejectQty == null) {
sSubTable[i].HRejectQty = 0
}
- if (sSubTable[i].HSampleUnRightQty == '') {
+ if (sSubTable[i].HSampleUnRightQty == '' || sSubTable[i].HSampleUnRightQty == null) {
sSubTable[i].HSampleUnRightQty = 0
}
if (sSubTable[i].HUnitID == '') {
@@ -1281,6 +1283,128 @@
// console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
+ }
+ })
+
+ var ajaxLoad = layer.load();
+ var sWhere = " and hmainid=" + linterid;
+ $.ajax({
+ url: GetWEBURL() + "/QC_ProcessCheckBill/QC_ProcessCheckBillList",
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //var data = result.data.h_v_QC_Edit_FirstPieceCheckBillList[0];
+ var data = result.data[0];
+
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HInterID": data.hmainid
+ , "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDate(data.鏃ユ湡)
+ , "HSourceID": data.HSourceID
+ , "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
+ , "HICMOBillNo": data.浠诲姟鍗曞彿
+ , "HICMOQty": data.浠诲姟鍗曟暟閲�
+ , "HICMOInterID": data.HICMOInterID
+ , "HICMOEntryID": data.HICMOEntryID
+ , "HMaterID": data.HMaterID
+ , "HMaterName": data.鐗╂枡鍚嶇О
+ , "HProcExchQty": data.HProcExchQty
+ , "HProcExchBillNo": data.HProcExchBillNo
+ , "HProcExchInterID": data.HProcExchInterID
+ , "HProcExchEntryID": data.HProcExchEntryID
+ , "HFirstCheckEmp": data.HFirstCheckEmp
+ , "HFirstCheckEmpName": data.璐ㄦ鍛樺悕绉�
+ , "HQCSchemeID": data.妫�楠屾柟妗圛D
+ , "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
+ //, "HQCSchemeID": data.HManagerID
+ //, "HPSStyleID": data.HPSStyleID
+ , "HRemark": data.琛ㄥご澶囨敞
+ //, "HSSID": data.HSSID
+ , "HMaker": data.鍒跺崟浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡
+ , "HChecker": data.瀹℃牳浜�
+ , "HCheckDate": data.瀹℃牳鏃ユ湡
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HCloseDate": data.鍏抽棴鏃ユ湡
+ , "HUpDateDate": data.淇敼鏃ユ湡
+ , "HDeleteDate": data.浣滃簾鏃ユ湡
+ , "HSampleSchemeID": data.HSampleSchemeID
+ , "HSampleSchemeName": data.鎶芥牱鏂规鍚嶇О
+ , "HSampleQty": data.鏍锋湰閲�
+ , "HSampleQty2": data.鏍锋湰閲�
+ , "HSampleDamageQty": data.鏍锋湰鐮村潖鏁�
+ , "HSamplingType": data.鎶芥牱绫诲瀷
+ , "HAcceptQty": data.鍏佽鏁�
+ //, "HInspectResultToSee": data.浣滃簾鏃ユ湡 //妫�楠岀粨鏋�
+ , "HInspectionLevel": data.妫�楠屾按骞�
+ , "HRejectQty": data.鎷掔粷鏁�
+ , "HStrictness": data.涓ユ牸搴�
+ , "HSampleUnRightQty": data.鏍锋湰涓嶅悎鏍兼暟
+ , "HSampleUnRightQty2": data.鏍锋湰涓嶅悎鏍兼暟
+ , "HAQL": data.AQL
+ , "HUnitID": data.HUnitID
+ , "HUnit": data.鍗曚綅
+ , "HInspectValB": data.妫�娴嬪�煎熀纭�璧勬枡
+ , "HInspectVal": data.妫�娴嬪��
+ , "HTargetValB": data.鐩爣鍊煎熀纭�璧勬枡
+ , "HTargetVal": data.鐩爣鍊�
+ , "HUpLimit": data.涓婇檺鍊�
+ , "HDownLimit": data.涓嬮檺鍊�
+ , "HUpOffSet": data.涓婂亸宸�
+ , "HDownOffSet": data.涓嬪亸宸�
+ , "HEntryID": data.hsubid
+ , "HQCCheckItemName": data.妫�楠岄」鐩悕绉�
+ , "HQCCheckItemID": data.HQCCheckItemID
+ });
+ data = result.data;
+ //data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < data.length; i++) {
+ rowdata.push(
+ {
+ "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣�, "HQCStd": data[i].妫�楠屾爣鍑�,
+ "HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹,
+ "HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
+ "HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
+ "HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
+ "HInspectVal": data[i].妫�娴嬪��, "HTargetVal": data[i].鐩爣鍊�, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�, "HUpOffSet": data[i].涓婂亸宸�, "HDownOffSet": data[i].涓嬪亸宸�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�,
+ "HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": 0, "HRejectQty": data[i].鎷掔粷鏁�,
+ "HStrictness": 0, "HSampleUnRightQty": data[i].鏍锋湰涓嶅悎鏍兼暟, "HAQL": data[i].AQL, "HSamplingType": 0, "HSamplingType": data[i].鎶芥牱绫诲瀷, "HStrictness": data[i].涓ユ牸搴�
+
+ }
+ )
+ console.log(data[i].鐩爣鍊�);
+ SummaryIndex.push(i.toString());
+ }
+
+ option.data = rowdata;
+ table.render(option);
+ for (let j = 0; j < data.length; j++) {
+ $("#HResult" + (j + 1)).val(data[j].缁撹)
+ }
+ for (let j = 0; j < data.length; j++) {
+ $("#HAnalysisMethod" + (j + 1)).val(data[j].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[j].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3))
+ }
+ for (var i = 1; i <= data.length; i++) {
+ $('#HKeyInspect' + i + '').find("option[value='" + (data[i - 1].閲嶇偣妫�鏌� == "鍚�" ? false : true) + "']").attr("selected", true);
+ }
+ form.render('select');
+
+ //榛樿閫変腑鏈�鍚庝竴琛�
+ $("tr[data-index = " + (option.data.length - 1) + "] .layui-form-checkbox").dblclick();
+ //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
+ $("tr[data-index = " + (option.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
+
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
}
})
}
@@ -1571,28 +1695,51 @@
//#endregion
function get_CheckItem() {
+ var HBatchQty = $("#HProcExchQty").val();
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
type: "GET",
- data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val()},
+ data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty},
success: function (result) {
if (result.code == 1) {
var rowdata = [];
+ rowdata_Value = [];
var data = result.data;
for (var i = 0; i < result.data.length; i++) {
//瀛愯〃 璧嬪��
- rowdata.push({
- "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
- "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
- "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
- "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
- "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
- });
+ rowdata.push(
+ //{
+ //"HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
+ //"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
+ //"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
+ //"HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+ //"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+ //}
+ {
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["HResult"],
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "",
+ "HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁�,
+ "HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
+ }
+ );
+ SampleNum.push(data[i].鏍锋湰閲�);
}
+ //妫�楠岄」鐩�
+ for (let j = 1; j <= data[data.length - 1].鏍锋湰閲�; j++) {
+ rowdata_Value.push({
+ "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+ });
+ }
+ //妫�楠岄」鐩�
option.data = rowdata;
table.render(option);
-
+ //妫�楠屽��
+ option_Value.data = rowdata_Value;
+ console.log(JSON.stringify(option_Value.data));
+ table.render(option_Value);
+ //================================================
for (var i = 1; i <= result.data.length; i++) {
$('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
$('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
@@ -1610,7 +1757,7 @@
$("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
trindex = result.data.length - 1;
- $("#HEntryID").val() - 1
+ $("#HEntryID").val() - 1
}
}
})
@@ -2134,6 +2281,7 @@
//鑾峰彇褰撳墠鐐瑰嚮琛屼笅鏍�
var nowindex = $(obj.tr).attr("data-index");
+ editIndex = Number(nowindex) + Number(1);
LastIndex = nowindex;
$("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
@@ -2150,14 +2298,33 @@
//鑾峰彇鍗曞厓鏍兼楠屽�兼暟鎹�
var table_value = table.cache['ValueTable'];
- set_SaveValue(dataindex + 1);
- if (isHavingCount == false) {
- //鍒锋柊妫�楠屽�艰〃鏍�
- option_Value.data = [{
- "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
- }];
- table.render(option_Value);
+ //set_SaveValue(dataindex + 1);
+ //if (isHavingCount == false) {
+ // //鍒锋柊妫�楠屽�艰〃鏍�
+ // option_Value.data = [{
+ // "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+ // }];
+ // table.render(option_Value);
+ //}
+
+ if (OperationType == 3) {
+ set_SaveValue(Number(nowindex) + Number(1));
+ } else {
+ set_SaveValue(dataindex + 1);
}
+ if (isHavingCount == false && OperationType != 3) {
+ var row_value = [];
+ for (let i = 0; i < SampleNum[nowindex]; i++) {
+ row_value.push({
+ "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+ });
+ }
+ //鍒锋柊妫�楠屽�艰〃鏍�
+ option_Value.data = row_value;
+ table.render(option_Value);
+ console.log(option_Value.data);
+ }
+
//璧嬪�间笌鍥炴樉
Assignment(nowindex, dataindex);
if (isFristClick != true) {
@@ -2179,6 +2346,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--妫�楠屽��
$("#HInspectVal").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HInspectVal = $("#HInspectVal").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
//瀹氶噺鍒嗘瀽
@@ -2194,6 +2364,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--鐩爣鍊�
$("#HTargetVal").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HTargetVal = $("#HTargetVal").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
//====================璧嬪��/浼犲��===========================
@@ -2214,6 +2387,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓婇檺鍊�
$("#HUpLimit").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HUpLimit = $("#HUpLimit").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
@@ -2231,6 +2407,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓嬮檺鍊�
$("#HDownLimit").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HDownLimit = $("#HDownLimit").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
@@ -2248,6 +2427,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓婂亸宸�
$("#HUpOffSet").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HUpOffSet = $("#HUpOffSet").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
@@ -2265,6 +2447,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓嬪亸宸�
$("#HDownOffSet").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HDownOffSet = $("#HDownOffSet").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
@@ -2543,7 +2728,8 @@
//#region銆愯祴鍊间笌鍥炴樉銆�
function Assignment(nowindex, dataindex) {
- if (SummaryIndex.indexOf(nowindex) == -1) {
+ console.log(JSON.stringify(option.data));
+ if (SummaryIndex.indexOf(nowindex) == -1 && option.data[0].HSampleSchemeID == 0) {
var dataobj = {
HEntryID: $("#HEntryID").val(), //琛屽彿
HStatus: $("#HStatus").val(), //鐘舵��
@@ -2639,7 +2825,7 @@
$("#HSampleDamageQty").val("")
$("#HSampleQty").val("")
$("#HSampleQty2").val("")
- $("#HAcceptQty").val("")
+ $("#HAcceptQty").val("0")
$("#HInspectionLevel").val("")
$("#HRejectQty").val("")
$("#HStrictness").val("")
@@ -2666,81 +2852,169 @@
//鑾峰彇鏂囨湰妗嗗��
var maindata = table.cache['mainTable'];
- var dataobj = {
- HEntryID: $("#HEntryID").val(), //琛屽彿
- HStatus: $("#HStatus").val(), //鐘舵��
- HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
- HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
- //xxx: $("#xxx").val(),
- HUnitID: $("#HUnitID").val(), //鍗曚綅ID
- HUnit: $("#HUnit").val(), //鍗曚綅
- HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
- HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
- HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
- HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
- HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
- HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
- HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
- HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
- HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
- HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
- HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
- HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
- HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
- HAQL: $("#HAQL").val(), //AQL
- HSamplingType: $("#HSamplingType").val(),
+ if (OperationType == 3) {
+ $("[name='HEntryID']").val(Number(nowindex) + Number(1));
+ $("[name='HQCCheckItemName']").val(option.data[nowindex].妫�楠岄」鐩�);
- HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
- HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
- HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
- HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
- HUnitID: $("#HUnitID").val(), //鍗曚綅ID
- HUnitName: $("#HUnitName").val(), //鍗曚綅
- HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
- HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
- HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
- HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
- HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
- HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
- HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
- HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
- };
+ var dataobj = {
+ HEntryID: $("#HEntryID").val(), //琛屽彿
+ HStatus: $("#HStatus").val(), //鐘舵��
+ HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //鎶芥牱鏂规ID
+ HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //鎶芥牱鏂规
+ //xxx: $("#xxx").val(),
+ HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+ HUnit: option.data[nowindex].HUnit,//鍗曚綅
+ HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+ HTargetVal: option.data[nowindex].HTargetVal, //鐩爣鍊�
+ HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+ HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+ HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+ HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+ HSampleDamageQty: option.data[nowindex].HSampleDamageQty, //鏍锋湰鐮村潖鏁�
+ HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+ HAcceptQty: option.data[nowindex].HAcceptQty,//鍏佽鏁�
+ HInspectionLevel: option.data[nowindex].HInspectionLevel, //妫�楠屾按骞�
+ HRejectQty: option.data[nowindex].HRejectQty, //鎷掔粷鏁�
+ HStrictness: option.data[nowindex].HStrictness, //涓ユ牸搴�
+ HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty, //鏍锋湰涓嶅悎鏍兼暟
+ HAQL: option.data[nowindex].HAQL, //AQL
+ HSamplingType: option.data[nowindex].HSamplingType,
+
+ HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+ HInspectResultToSee: '', //妫�楠岀粨鏋�
+ HInspectResultToSee2: '', //妫�楠岀粨鏋�2
+ HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty,//鏍锋湰涓嶅悎鏍兼暟
+ HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+ HUnitName: option.data[nowindex].HUnit, //鍗曚綅
+ HInspectValB: option.data[nowindex].HInspectValB,//妫�楠屽�糏D
+ HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+ HTargetValB: option.data[nowindex].HTargetValB, //鐩爣鍊糏D
+ HTargetVal: option.data[nowindex].HTargetVal,//鐩爣鍊�
+ HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+ HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+ HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+ HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+ };
+ } else {
+ //var dataobj = {
+ // HEntryID: $("#HEntryID").val(), //琛屽彿
+ // HStatus: $("#HStatus").val(), //鐘舵��
+ // HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
+ // HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
+ // //xxx: $("#xxx").val(),
+ // HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+ // HUnit: $("#HUnit").val(), //鍗曚綅
+ // HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+ // HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+ // HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+ // HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+ // HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+ // HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+ // HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
+ // HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+ // HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
+ // HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
+ // HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
+ // HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
+ // HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+ // HAQL: $("#HAQL").val(), //AQL
+ // HSamplingType: $("#HSamplingType").val(),
+
+ // HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+ // HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
+ // HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
+ // HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+ // HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+ // HUnitName: $("#HUnitName").val(), //鍗曚綅
+ // HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
+ // HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+ // HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
+ // HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+ // HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+ // HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+ // HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+ // HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+ //};
+
+ var dataobj = {
+ HEntryID: $("#HEntryID").val(), //琛屽彿
+ HStatus: $("#HStatus").val(), //鐘舵��
+ HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //鎶芥牱鏂规ID
+ HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //鎶芥牱鏂规
+ //xxx: $("#xxx").val(),
+ HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+ HUnit: option.data[nowindex].HUnit,//鍗曚綅
+ HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+ HTargetVal: option.data[nowindex].HTargetVal, //鐩爣鍊�
+ HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+ HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+ HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+ HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+ HSampleDamageQty: option.data[nowindex].HSampleDamageQty, //鏍锋湰鐮村潖鏁�
+ HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+ HAcceptQty: option.data[nowindex].HAcceptQty,//鍏佽鏁�
+ HInspectionLevel: option.data[nowindex].HInspectionLevel, //妫�楠屾按骞�
+ HRejectQty: option.data[nowindex].HRejectQty, //鎷掔粷鏁�
+ HStrictness: option.data[nowindex].HStrictness, //涓ユ牸搴�
+ HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty, //鏍锋湰涓嶅悎鏍兼暟
+ HAQL: option.data[nowindex].HAQL, //AQL
+ HSamplingType: option.data[nowindex].HSamplingType,
+
+ HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+ HInspectResultToSee: '', //妫�楠岀粨鏋�
+ HInspectResultToSee2: '', //妫�楠岀粨鏋�2
+ HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty,//鏍锋湰涓嶅悎鏍兼暟
+ HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+ HUnitName: option.data[nowindex].HUnit, //鍗曚綅
+ HInspectValB: option.data[nowindex].HInspectValB,//妫�楠屽�糏D
+ HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+ HTargetValB: option.data[nowindex].HTargetValB, //鐩爣鍊糏D
+ HTargetVal: option.data[nowindex].HTargetVal,//鐩爣鍊�
+ HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+ HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+ HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+ HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+ };
+ }
+ //if (option.data[0].HSampleSchemeID == 0) {
//璧嬪�硷紝鍌ㄥ瓨鏁版嵁
- maindata[dataindex].HStatus = dataobj.HStatus;
- maindata[dataindex].HSampleSchemeID = dataobj.HSampleSchemeID;
- maindata[dataindex].HUnitID = dataobj.HUnitID;
- maindata[dataindex].HInspectVal = dataobj.HInspectVal;
- maindata[dataindex].HTargetVal = dataobj.HTargetVal;
- maindata[dataindex].HUpLimit = dataobj.HUpLimit;
- maindata[dataindex].HDownLimit = dataobj.HDownLimit;
- maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
- maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
- maindata[dataindex].HSampleDamageQty = dataobj.HSampleDamageQty;
- maindata[dataindex].HSampleSchemeName = dataobj.HSampleSchemeName;
- maindata[dataindex].HUnit = dataobj.HUnit;
- maindata[dataindex].HSampleQty = dataobj.HSampleQty;
- maindata[dataindex].HAcceptQty = dataobj.HAcceptQty;
- maindata[dataindex].HInspectionLevel = dataobj.HInspectionLevel;
- maindata[dataindex].HRejectQty = dataobj.HRejectQty;
- maindata[dataindex].HStrictness = dataobj.HStrictness;
- maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
- maindata[dataindex].HAQL = dataobj.HAQL;
- maindata[dataindex].HSamplingType = dataobj.HSamplingType;
+ maindata[nowindex].HStatus = dataobj.HStatus;
+ maindata[nowindex].HSampleSchemeID = dataobj.HSampleSchemeID;
+ maindata[nowindex].HUnitID = dataobj.HUnitID;
+ maindata[nowindex].HInspectVal = dataobj.HInspectVal;
+ maindata[nowindex].HTargetVal = dataobj.HTargetVal;
+ maindata[nowindex].HUpLimit = dataobj.HUpLimit;
+ maindata[nowindex].HDownLimit = dataobj.HDownLimit;
+ maindata[nowindex].HUpOffSet = dataobj.HUpOffSet;
+ maindata[nowindex].HDownOffSet = dataobj.HDownOffSet;
+ maindata[nowindex].HSampleDamageQty = dataobj.HSampleDamageQty;
+ maindata[nowindex].HSampleSchemeName = dataobj.HSampleSchemeName;
+ maindata[nowindex].HUnit = dataobj.HUnit;
+ maindata[nowindex].HSampleQty = dataobj.HSampleQty;
+ maindata[nowindex].HAcceptQty = dataobj.HAcceptQty;
+ maindata[nowindex].HInspectionLevel = dataobj.HInspectionLevel;
+ maindata[nowindex].HRejectQty = dataobj.HRejectQty;
+ maindata[nowindex].HStrictness = dataobj.HStrictness;
+ maindata[nowindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+ maindata[nowindex].HAQL = dataobj.HAQL;
+ maindata[nowindex].HSamplingType = dataobj.HSamplingType;
- maindata[dataindex].HSampleQty = dataobj.HSampleQty;
- maindata[dataindex].HInspectResultToSee = dataobj.HInspectResultToSee;
- maindata[dataindex].HInspectResultToSee2 = dataobj.HInspectResultToSee2;
- maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
- maindata[dataindex].HUnitID = dataobj.HUnitID;
- maindata[dataindex].HUnitName = dataobj.HUnitName;
- maindata[dataindex].HInspectValB = dataobj.HInspectValB;
- maindata[dataindex].HInspectVal = dataobj.HInspectVal;
- maindata[dataindex].HTargetValB = dataobj.HTargetValB;
- maindata[dataindex].HTargetVal = dataobj.HTargetVal;
- maindata[dataindex].HUpLimit = dataobj.HUpLimit;
- maindata[dataindex].HDownLimit = dataobj.HDownLimit;
- maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
- maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
+ maindata[nowindex].HSampleQty = dataobj.HSampleQty;
+ maindata[nowindex].HInspectResultToSee = dataobj.HInspectResultToSee;
+ maindata[nowindex].HInspectResultToSee2 = dataobj.HInspectResultToSee2;
+ maindata[nowindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+ maindata[nowindex].HUnitID = dataobj.HUnitID;
+ maindata[nowindex].HUnitName = dataobj.HUnitName;
+ maindata[nowindex].HInspectValB = dataobj.HInspectValB;
+ maindata[nowindex].HInspectVal = dataobj.HInspectVal;
+ maindata[nowindex].HTargetValB = dataobj.HTargetValB;
+ maindata[nowindex].HTargetVal = dataobj.HTargetVal;
+ maindata[nowindex].HUpLimit = dataobj.HUpLimit;
+ maindata[nowindex].HDownLimit = dataobj.HDownLimit;
+ maindata[nowindex].HUpOffSet = dataobj.HUpOffSet;
+ maindata[nowindex].HDownOffSet = dataobj.HDownOffSet;
+ //}
+
//鍥炴樉
$("#HSampleSchemeID").val(maindata[nowindex].HSampleSchemeID);
@@ -2788,45 +3062,55 @@
$("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
}
- var HInterID = $("#HInterID").val();
- var HEntryID = $("#HEntryID").val();
- isHavingCount = false;
//鍥炴樉妫�楠屽��
- $.ajax({
- url: GetWEBURL() + "/QC_ValueTable_ProcessCheck/getValueList",
- type: "GET",
- async: false,
- data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- isHavingCount = true
-
- var data = result.data;
-
- var rowdata = [];
- for (var i = 0; i < result.data.length; i++) {
- //瀛欒〃 璧嬪��
- rowdata.push({
- "HSEQ": data[i]["HSEQ"], "HInSpectResult": data[i]["HInSpectResult"], "HInSpectValueB": data[i]["HInSpectValueB"], "HInSpectValueT": data[i]["HInSpectValueT"], "HInSpectValue": data[i]["HInSpectValue"]
- });
- }
-
- option_Value.data = rowdata;
- table.render(option_Value);
- for (var i = 0; i < result.data.length; i++) {
- $('#HInSpectResult' + (i + 1)).find("option[value='" + result.data[i].HInSpectResult + "']").attr("selected", true);
- }
-
- IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
- form.render('select');
- } else {
- //layer.msg(result.code + result.Message, { icon: 5 });
- }
- }
- })
+ EchoValue();
}
}
//#endregion
+
+ //鍥炴樉妫�楠屽��
+ function EchoValue() {
+ var HInterID = $("#HInterID").val();
+ var HEntryID = OperationType == 3 ? editIndex : $("#HEntryID").val();
+ isHavingCount = false;
+ //鍥炴樉妫�楠屽��
+ $.ajax({
+ url: GetWEBURL() + "/QC_ValueTable_ProcessCheck/getValueList",
+ type: "GET",
+ async: false,
+ data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ isHavingCount = true
+
+ var data = result.data;
+
+ var rowdata = [];
+ for (var i = 0; i < result.data.length; i++) {
+ //瀛欒〃 璧嬪��
+ rowdata.push({
+ "HSEQ": data[i]["HSEQ"], "HInSpectResult": data[i]["HInSpectResult"], "HInSpectValueB": data[i]["HInSpectValueB"] == '' ? 0 : data[i]["HInSpectValueB"], "HInSpectValueT": data[i]["HInSpectValueT"] == '' ? 0 : data[i]["HInSpectValueT"], "HInSpectValue": data[i]["HInSpectValue"] == '' ? 0 : data[i]["HInSpectValue"]
+ });
+ }
+
+ option_Value.data = rowdata;
+ table.render(option_Value);
+ for (var i = 0; i < result.data.length; i++) {
+ $('#HInSpectResult' + (i + 1)).find("option[value='" + result.data[i].HInSpectResult + "']").attr("selected", true);
+ }
+
+ IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
+ form.render('select');
+ } else {
+ option_Value.data = [{
+ "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+ }];
+ table.render(option_Value);
+ //layer.msg(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
//鑾峰彇涓嶅悎鏍兼暟鎬绘暟
function addUnRightQty() {
@@ -3063,14 +3347,18 @@
//妫�楠屽�间繚瀛�
function set_SaveValue(dataindex) {
+ if (OperationType == 3) {
+ EchoValue();
+ }
+
for (let i = 0; i < table.cache['ValueTable'].length; i++) {
- if (table.cache['ValueTable'][i].HInSpectValueB == "") {
+ if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
table.cache['ValueTable'][i].HInSpectValueB = 0
}
- if (table.cache['ValueTable'][i].HInSpectValueT == "") {
+ if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
table.cache['ValueTable'][i].HInSpectValueT = 0
}
- if (table.cache['ValueTable'][i].HInSpectValue == "") {
+ if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
table.cache['ValueTable'][i].HInSpectValue = 0
}
}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 06d1970..e31661f 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -115,7 +115,7 @@
</div>
</div>
</div>
- <div class="layui-row">
+ <div class="layui-row">
<div class="layui-inline" id="hidediv1">
<label class="layui-form-label" style="width: 85px;">娴佽浆鍗℃暟閲�</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -129,6 +129,12 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProcExch" id="btnSearchProcExch" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
+ </div>
+ </div>
+ <div class="layui-inline" id="hidediv1">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;" readonly value="1">
</div>
</div>
</div>
@@ -683,6 +689,7 @@
var isHavingCount = false; //妫�楠屽�艰〃鏍兼槸鍚︽湁鏁版嵁
var UnRightQty_isFied = 0; //鐢ㄤ簬鍒ゆ柇鏄惁鍚堟牸//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
var editIndex = 0;//缂栬緫涓嬫爣
+ var SampleNum = [];//鏍锋湰鏁伴噺
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
@@ -807,6 +814,7 @@
$("#HICMOEntryID").val(data.HICMOEntryID);
$("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
$("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+ $("#HProcName").val(data.褰撳墠宸ュ簭);
//鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
get_CheckItem();
} else {
@@ -940,7 +948,7 @@
"HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
- "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+ "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
};
@@ -1309,7 +1317,7 @@
});
//淇濆瓨
- function set_SaveBill(data) {
+ function set_SaveBill(data) {
//璧嬪�兼渶鍚庝竴涓�変腑琛岀殑鏁版嵁缁檕ption.data
Assignment(LastIndex, LastIndex);
//淇濆瓨鏈�鍚庝竴娆＄偣鍑昏鐨勬楠屽��
@@ -1337,19 +1345,19 @@
if (sSubTable[i].HSampleSchemeID == '') {
sSubTable[i].HSampleSchemeID = 0
}
- if (sSubTable[i].HSampleQty == '') {
+ if (sSubTable[i].HSampleQty == '' || sSubTable[i].HSampleQty == null) {
sSubTable[i].HSampleQty = 0
}
- if (sSubTable[i].HSampleDamageQty == '') {
+ if (sSubTable[i].HSampleDamageQty == '' || sSubTable[i].HSampleDamageQty == null) {
sSubTable[i].HSampleDamageQty = 0
}
- if (sSubTable[i].HAcceptQty == '') {
+ if (sSubTable[i].HAcceptQty == '' || sSubTable[i].HAcceptQty == null) {
sSubTable[i].HAcceptQty = 0
}
- if (sSubTable[i].HRejectQty == '') {
+ if (sSubTable[i].HRejectQty == '' || sSubTable[i].HRejectQty == null) {
sSubTable[i].HRejectQty = 0
}
- if (sSubTable[i].HSampleUnRightQty == '') {
+ if (sSubTable[i].HSampleUnRightQty == '' || sSubTable[i].HSampleUnRightQty == null) {
sSubTable[i].HSampleUnRightQty = 0
}
if (sSubTable[i].HUnitID == '') {
@@ -1359,7 +1367,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sSubValue = JSON.stringify(table.cache['ValueTable']);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ';' + sSubValue;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ';' + sSubValue;
var index = layer.load();
$.ajax({
@@ -1473,8 +1481,6 @@
var rowdata = [];
for (var i = 0; i < data.length; i++) {
rowdata.push(
-
-
{
"HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣�, "HQCStd": data[i].妫�楠屾爣鍑�,
"HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹,
@@ -1483,15 +1489,15 @@
"HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
"HInspectVal": data[i].妫�娴嬪��, "HTargetVal": data[i].鐩爣鍊�, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�, "HUpOffSet": data[i].涓婂亸宸�, "HDownOffSet": data[i].涓嬪亸宸�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�,
"HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": 0, "HRejectQty": data[i].鎷掔粷鏁�,
- "HStrictness": 0, "HSampleUnRightQty": data[i].鏍锋湰涓嶅悎鏍兼暟, "HAQL": data[i].AQL, "HSamplingType": 0
+ "HStrictness": 0, "HSampleUnRightQty": data[i].鏍锋湰涓嶅悎鏍兼暟, "HAQL": data[i].AQL, "HSamplingType": 0, "HSamplingType": data[i].鎶芥牱绫诲瀷, "HStrictness": data[i].涓ユ牸搴�
+
}
)
- console.log(rowdata[i].HSampleQty);
+ console.log(data[i].鐩爣鍊�);
SummaryIndex.push(i.toString());
}
option.data = rowdata;
- console.log(rowdata);
table.render(option);
for (let j = 0; j < data.length; j++) {
$("#HResult" + (j + 1)).val(data[j].缁撹)
@@ -1821,19 +1827,23 @@
rowdata_Value = [];
for (var i = 0; i < result.data.length; i++) {
//瀛愯〃 璧嬪��
- rowdata.push({
+ rowdata.push(
+ {
"HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["HResult"],
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "",
"HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁�,
"HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
+ }
+ );
+ SampleNum.push(data[i].鏍锋湰閲�);
+ }
+
+ //妫�楠岄」鐩�
+ for (let j = 1; j <= data[data.length-1].鏍锋湰閲�; j++) {
+ rowdata_Value.push({
+ "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
});
- //妫�楠岄」鐩�
- for (let j = 1; j <= data[i].鏍锋湰閲�; j++) {
- rowdata_Value.push({
- "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
- });
- }
}
//妫�楠岄」鐩�
option.data = rowdata;
@@ -2078,7 +2088,7 @@
"HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
- "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+ "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
}];
option = {
@@ -2423,10 +2433,14 @@
set_SaveValue(dataindex + 1);
}
if (isHavingCount == false && OperationType != 3) {
+ var row_value = [];
+ for (let i = 0; i < SampleNum[nowindex]; i++) {
+ row_value.push({
+ "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+ });
+ }
//鍒锋柊妫�楠屽�艰〃鏍�
- option_Value.data = [{
- "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
- }];
+ option_Value.data = row_value;
table.render(option_Value);
}
//璧嬪�间笌鍥炴樉
@@ -2441,19 +2455,7 @@
} else {
isFristClick = false;
}
- //console.log(maindata);
- //Array.some(item => {
- // console.log("==============item===============");
- // console.log(item);
- //})
-
- //for (let i = 0; i < table_value.length; i++) {
-
- //}
-
- ////console.log(arr_value_add);
- //console.log(Array);
- //console.log(table_value);
+
});
//#endregion
@@ -2463,6 +2465,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--妫�楠屽��
$("#HInspectVal").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HInspectVal = $("#HInspectVal").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
//瀹氶噺鍒嗘瀽
@@ -2478,6 +2483,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--鐩爣鍊�
$("#HTargetVal").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HTargetVal = $("#HTargetVal").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
//====================璧嬪��/浼犲��===========================
@@ -2498,6 +2506,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓婇檺鍊�
$("#HUpLimit").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HUpLimit = $("#HUpLimit").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
@@ -2515,6 +2526,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓嬮檺鍊�
$("#HDownLimit").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HDownLimit = $("#HDownLimit").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
@@ -2532,6 +2546,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓婂亸宸�
$("#HUpOffSet").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HUpOffSet = $("#HUpOffSet").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
@@ -2549,6 +2566,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓嬪亸宸�
$("#HDownOffSet").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HDownOffSet = $("#HDownOffSet").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
@@ -2827,6 +2847,7 @@
//#region銆愯祴鍊间笌鍥炴樉銆�
function Assignment(nowindex, dataindex) {
+ console.log(JSON.stringify(option.data));
if (SummaryIndex.indexOf(nowindex) == -1 && option.data[0].HSampleSchemeID == 0) {
var dataobj = {
HEntryID: $("#HEntryID").val(), //琛屽彿
@@ -2923,7 +2944,7 @@
$("#HSampleDamageQty").val("")
$("#HSampleQty").val("")
$("#HSampleQty2").val("")
- $("#HAcceptQty").val("")
+ $("#HAcceptQty").val("0")
$("#HInspectionLevel").val("")
$("#HRejectQty").val("")
$("#HStrictness").val("")
@@ -2993,85 +3014,125 @@
HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
};
- } else {
+ } else {
+ //var dataobj = {
+ // HEntryID: $("#HEntryID").val(), //琛屽彿
+ // HStatus: $("#HStatus").val(), //鐘舵��
+ // HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
+ // HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
+ // //xxx: $("#xxx").val(),
+ // HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+ // HUnit: $("#HUnit").val(), //鍗曚綅
+ // HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+ // HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+ // HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+ // HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+ // HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+ // HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+ // HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
+ // HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+ // HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
+ // HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
+ // HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
+ // HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
+ // HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+ // HAQL: $("#HAQL").val(), //AQL
+ // HSamplingType: $("#HSamplingType").val(),
+
+ // HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+ // HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
+ // HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
+ // HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+ // HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+ // HUnitName: $("#HUnitName").val(), //鍗曚綅
+ // HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
+ // HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+ // HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
+ // HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+ // HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+ // HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+ // HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+ // HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+ //};
+
var dataobj = {
HEntryID: $("#HEntryID").val(), //琛屽彿
HStatus: $("#HStatus").val(), //鐘舵��
- HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
- HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
+ HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //鎶芥牱鏂规ID
+ HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //鎶芥牱鏂规
//xxx: $("#xxx").val(),
- HUnitID: $("#HUnitID").val(), //鍗曚綅ID
- HUnit: $("#HUnit").val(), //鍗曚綅
- HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
- HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
- HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
- HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
- HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
- HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
- HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
- HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
- HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
- HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
- HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
- HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
- HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
- HAQL: $("#HAQL").val(), //AQL
- HSamplingType: $("#HSamplingType").val(),
+ HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+ HUnit: option.data[nowindex].HUnit,//鍗曚綅
+ HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+ HTargetVal: option.data[nowindex].HTargetVal, //鐩爣鍊�
+ HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+ HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+ HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+ HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+ HSampleDamageQty: option.data[nowindex].HSampleDamageQty, //鏍锋湰鐮村潖鏁�
+ HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+ HAcceptQty: option.data[nowindex].HAcceptQty,//鍏佽鏁�
+ HInspectionLevel: option.data[nowindex].HInspectionLevel, //妫�楠屾按骞�
+ HRejectQty: option.data[nowindex].HRejectQty, //鎷掔粷鏁�
+ HStrictness: option.data[nowindex].HStrictness, //涓ユ牸搴�
+ HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty, //鏍锋湰涓嶅悎鏍兼暟
+ HAQL: option.data[nowindex].HAQL, //AQL
+ HSamplingType: option.data[nowindex].HSamplingType,
- HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
- HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
- HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
- HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
- HUnitID: $("#HUnitID").val(), //鍗曚綅ID
- HUnitName: $("#HUnitName").val(), //鍗曚綅
- HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
- HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
- HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
- HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
- HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
- HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
- HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
- HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+ HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+ HInspectResultToSee: '', //妫�楠岀粨鏋�
+ HInspectResultToSee2: '', //妫�楠岀粨鏋�2
+ HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty,//鏍锋湰涓嶅悎鏍兼暟
+ HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+ HUnitName: option.data[nowindex].HUnit, //鍗曚綅
+ HInspectValB: option.data[nowindex].HInspectValB,//妫�楠屽�糏D
+ HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+ HTargetValB: option.data[nowindex].HTargetValB, //鐩爣鍊糏D
+ HTargetVal: option.data[nowindex].HTargetVal,//鐩爣鍊�
+ HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+ HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+ HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+ HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
};
}
- if (option.data[0].HSampleSchemeID == 0) {
+ //if (option.data[0].HSampleSchemeID == 0) {
//璧嬪�硷紝鍌ㄥ瓨鏁版嵁
- maindata[dataindex].HStatus = dataobj.HStatus;
- maindata[dataindex].HSampleSchemeID = dataobj.HSampleSchemeID;
- maindata[dataindex].HUnitID = dataobj.HUnitID;
- maindata[dataindex].HInspectVal = dataobj.HInspectVal;
- maindata[dataindex].HTargetVal = dataobj.HTargetVal;
- maindata[dataindex].HUpLimit = dataobj.HUpLimit;
- maindata[dataindex].HDownLimit = dataobj.HDownLimit;
- maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
- maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
- maindata[dataindex].HSampleDamageQty = dataobj.HSampleDamageQty;
- maindata[dataindex].HSampleSchemeName = dataobj.HSampleSchemeName;
- maindata[dataindex].HUnit = dataobj.HUnit;
- maindata[dataindex].HSampleQty = dataobj.HSampleQty;
- maindata[dataindex].HAcceptQty = dataobj.HAcceptQty;
- maindata[dataindex].HInspectionLevel = dataobj.HInspectionLevel;
- maindata[dataindex].HRejectQty = dataobj.HRejectQty;
- maindata[dataindex].HStrictness = dataobj.HStrictness;
- maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
- maindata[dataindex].HAQL = dataobj.HAQL;
- maindata[dataindex].HSamplingType = dataobj.HSamplingType;
-
- maindata[dataindex].HSampleQty = dataobj.HSampleQty;
- maindata[dataindex].HInspectResultToSee = dataobj.HInspectResultToSee;
- maindata[dataindex].HInspectResultToSee2 = dataobj.HInspectResultToSee2;
- maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
- maindata[dataindex].HUnitID = dataobj.HUnitID;
- maindata[dataindex].HUnitName = dataobj.HUnitName;
- maindata[dataindex].HInspectValB = dataobj.HInspectValB;
- maindata[dataindex].HInspectVal = dataobj.HInspectVal;
- maindata[dataindex].HTargetValB = dataobj.HTargetValB;
- maindata[dataindex].HTargetVal = dataobj.HTargetVal;
- maindata[dataindex].HUpLimit = dataobj.HUpLimit;
- maindata[dataindex].HDownLimit = dataobj.HDownLimit;
- maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
- maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
- }
+ maindata[nowindex].HStatus = dataobj.HStatus;
+ maindata[nowindex].HSampleSchemeID = dataobj.HSampleSchemeID;
+ maindata[nowindex].HUnitID = dataobj.HUnitID;
+ maindata[nowindex].HInspectVal = dataobj.HInspectVal;
+ maindata[nowindex].HTargetVal = dataobj.HTargetVal;
+ maindata[nowindex].HUpLimit = dataobj.HUpLimit;
+ maindata[nowindex].HDownLimit = dataobj.HDownLimit;
+ maindata[nowindex].HUpOffSet = dataobj.HUpOffSet;
+ maindata[nowindex].HDownOffSet = dataobj.HDownOffSet;
+ maindata[nowindex].HSampleDamageQty = dataobj.HSampleDamageQty;
+ maindata[nowindex].HSampleSchemeName = dataobj.HSampleSchemeName;
+ maindata[nowindex].HUnit = dataobj.HUnit;
+ maindata[nowindex].HSampleQty = dataobj.HSampleQty;
+ maindata[nowindex].HAcceptQty = dataobj.HAcceptQty;
+ maindata[nowindex].HInspectionLevel = dataobj.HInspectionLevel;
+ maindata[nowindex].HRejectQty = dataobj.HRejectQty;
+ maindata[nowindex].HStrictness = dataobj.HStrictness;
+ maindata[nowindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+ maindata[nowindex].HAQL = dataobj.HAQL;
+ maindata[nowindex].HSamplingType = dataobj.HSamplingType;
+
+ maindata[nowindex].HSampleQty = dataobj.HSampleQty;
+ maindata[nowindex].HInspectResultToSee = dataobj.HInspectResultToSee;
+ maindata[nowindex].HInspectResultToSee2 = dataobj.HInspectResultToSee2;
+ maindata[nowindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+ maindata[nowindex].HUnitID = dataobj.HUnitID;
+ maindata[nowindex].HUnitName = dataobj.HUnitName;
+ maindata[nowindex].HInspectValB = dataobj.HInspectValB;
+ maindata[nowindex].HInspectVal = dataobj.HInspectVal;
+ maindata[nowindex].HTargetValB = dataobj.HTargetValB;
+ maindata[nowindex].HTargetVal = dataobj.HTargetVal;
+ maindata[nowindex].HUpLimit = dataobj.HUpLimit;
+ maindata[nowindex].HDownLimit = dataobj.HDownLimit;
+ maindata[nowindex].HUpOffSet = dataobj.HUpOffSet;
+ maindata[nowindex].HDownOffSet = dataobj.HDownOffSet;
+ //}
//鍥炴樉
@@ -3147,7 +3208,7 @@
for (var i = 0; i < result.data.length; i++) {
//瀛欒〃 璧嬪��
rowdata.push({
- "HSEQ": data[i]["HSEQ"], "HInSpectResult": data[i]["HInSpectResult"], "HInSpectValueB": data[i]["HInSpectValueB"], "HInSpectValueT": data[i]["HInSpectValueT"], "HInSpectValue": data[i]["HInSpectValue"]
+ "HSEQ": data[i]["HSEQ"], "HInSpectResult": data[i]["HInSpectResult"], "HInSpectValueB": data[i]["HInSpectValueB"] == '' ? 0 : data[i]["HInSpectValueB"], "HInSpectValueT": data[i]["HInSpectValueT"] == '' ? 0 : data[i]["HInSpectValueT"], "HInSpectValue": data[i]["HInSpectValue"] == '' ? 0 : data[i]["HInSpectValue"]
});
}
@@ -3160,6 +3221,10 @@
IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
form.render('select');
} else {
+ option_Value.data = [{
+ "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+ }];
+ table.render(option_Value);
//layer.msg(result.code + result.Message, { icon: 5 });
}
}
@@ -3401,24 +3466,23 @@
//妫�楠屽�间繚瀛�
function set_SaveValue(dataindex) {
- for (let i = 0; i < table.cache['ValueTable'].length; i++) {
- if (table.cache['ValueTable'][i].HInSpectValueB == "") {
- table.cache['ValueTable'][i].HInSpectValueB = 0
- }
- if (table.cache['ValueTable'][i].HInSpectValueT == "") {
- table.cache['ValueTable'][i].HInSpectValueT = 0
- }
- if (table.cache['ValueTable'][i].HInSpectValue == "") {
- table.cache['ValueTable'][i].HInSpectValue = 0
- }
- }
if (OperationType == 3) {
EchoValue();
+ }
+ for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+ if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
+ table.cache['ValueTable'][i].HInSpectValueB = 0
+ }
+ if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
+ table.cache['ValueTable'][i].HInSpectValueT = 0
+ }
+ if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
+ table.cache['ValueTable'][i].HInSpectValue = 0
+ }
}
var sValueTable = JSON.stringify(table.cache['ValueTable']);
var HInterID = $("#HInterID").val();
var HEntryID = dataindex;
- console.log(sValueTable);
var msg = sValueTable + ";" + HInterID + ";" + HEntryID
var index = layer.load();
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
index 884953d..ee0f095 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
@@ -712,6 +712,8 @@
, "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
, "鐗╂枡鍚嶇О": checkStatus.data[0].HName
, "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ , "HUnitID": checkStatus.data[0].HUnitID
+ , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
})
layer.close(index);//鍏抽棴寮圭獥
}
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
index a24a0e8..4d93e00 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
@@ -131,6 +131,12 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="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;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
</div>
</script>
</form>
@@ -407,6 +413,24 @@
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
break;
+ //瀹℃牳
+ case 'set_CheckBill': set_CheckBill();
+ break;
+ //鍙嶅鏍�
+ case 'set_AbandonCheck': set_AbandonCheck();
+ break;
+ //鍏抽棴
+ case 'set_CloseBill': set_CloseBill();
+ break;
+ //鍙嶅叧闂�
+ case 'set_CancelCloseBill': set_CancelCloseBill();
+ break;
+ //浣滃簾鎸夐挳
+ case 'set_Drop': set_DropBill(1);
+ break;
+ //鍙嶄綔搴熸寜閽�
+ case 'set_DeDrop': set_DropBill(2);
+ break;
};
});
@@ -517,6 +541,174 @@
});
}
+ //瀹℃牳
+ function set_CheckBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOutStockBill/CheckXs_SeOutStockBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+ //鍙嶅鏍�
+ function set_AbandonCheck() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸弽瀹℃牳鍚�?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOutStockBill/CheckXs_SeOutStockBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": 2, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+ //鍏抽棴
+ function set_CloseBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸叧闂悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOutStockBill/CloseXs_SeOutStockBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+ //鍙嶅叧闂�
+ function set_CancelCloseBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸弽鍏抽棴鍚�?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOutStockBill/CloseXs_SeOutStockBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": 2, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+ //#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() + "/Xs_SeOutStockBill/CancellXs_SeOutStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
//鎵撳嵃
function get_PrintReport() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBillList.html"
index feceab7..abca8ca 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBillList.html"
@@ -130,6 +130,12 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="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;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
</div>
</script>
</form>
@@ -398,6 +404,24 @@
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
break;
+ //瀹℃牳
+ case 'set_CheckBill': set_CheckBill();
+ break;
+ //鍙嶅鏍�
+ case 'set_AbandonCheck': set_AbandonCheck();
+ break;
+ //鍏抽棴
+ case 'set_CloseBill': set_CloseBill();
+ break;
+ //鍙嶅叧闂�
+ case 'set_CancelCloseBill': set_CancelCloseBill();
+ break;
+ //浣滃簾鎸夐挳
+ case 'set_Drop': set_DropBill(1);
+ break;
+ //鍙嶄綔搴熸寜閽�
+ case 'set_DeDrop': set_DropBill(2);
+ break;
};
});
@@ -508,6 +532,174 @@
});
}
+ //瀹℃牳
+ function set_CheckBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOutStockBackBill/CheckXs_SeOutStockBackBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+ //鍙嶅鏍�
+ function set_AbandonCheck() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸弽瀹℃牳鍚�?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOutStockBackBill/CheckXs_SeOutStockBackBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": 2, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+ //鍏抽棴
+ function set_CloseBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸叧闂悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOutStockBackBill/CloseXs_SeOutStockBackBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+ //鍙嶅叧闂�
+ function set_CancelCloseBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸弽鍏抽棴鍚�?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOutStockBackBill/CloseXs_SeOutStockBackBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": 2, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+ //#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() + "/Xs_SeOutStockBackBill/CancellXs_SeOutStockBackBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
index 4cff396..72ac92b 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
@@ -336,7 +336,7 @@
var params = get_UrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-
+
$("#HUSEORGID").val(sessionStorage["OrganizationID"]);
//鍒ゆ柇鏄惁鏂板
@@ -368,7 +368,7 @@
, "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0"
}];
- // 鍒濆鍖栫晫
+ // 鍒濆鍖栫晫
set_InitGrid();
//澶村伐鍏锋爮浜嬩欢
@@ -502,20 +502,20 @@
, loading: false
, cols: [[ //瀛愯〃
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿',width: 100, totalRow: true }
- , { field: 'HMaterID', title: 'HMaterID', width: 100,hide: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150,edit: 'text', event: "HMaterID" }//f7
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' ,width: 150,}
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100,}
+ , { type: 'numbers', title: '搴忓彿', width: 100, totalRow: true }
+ , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, }
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100,edit: 'text', event: "HUnitID" }//f7
- , { field: 'HQty', title: '鏁伴噺', width: 100,edit: 'text' }
- , { field: 'HPrice', title: '涓嶅惈绋庡崟浠�', width: 100,edit: 'text' }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID" }//f7
+ , { field: 'HQty', title: '鏁伴噺', width: 100, edit: 'text' }
+ , { field: 'HPrice', title: '涓嶅惈绋庡崟浠�', width: 100, edit: 'text' }
, { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text' }
- , { field: 'HMoney', title: '閲戦', width: 100,edit: 'text' }
+ , { field: 'HMoney', title: '閲戦', width: 100, edit: 'text' }
, { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text' }
- , { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环' ,width: 110,}
- , { field: 'HTaxRate', title: '绋庣巼', width: 100,edit: 'text' }
+ , { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 110, }
+ , { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
, { field: 'HTaxMoney', title: '绋庨', width: 100, }
, { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, }
, { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', width: 120, }
@@ -586,7 +586,7 @@
, "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿, "HUnitID": data.HUnitID
, "璁￠噺鍗曚綅": data.璁￠噺鍗曚綅, "HQty": data.鏁伴噺, "HRemark": data.琛ㄤ綋澶囨敞
, "HPrice": data.鍗曚环, "HMoney": data.閲戦, "HTaxRate": data.绋庣巼
- , "HTaxMoney": data.閲戦 * data.绋庣巼, "HlineTotal": data.閲戦 + data.绋庨, "HlineTotalBB": (data.閲戦 + data.绋庨)* data.姹囩巼
+ , "HTaxMoney": data.閲戦 * data.绋庣巼, "HlineTotal": data.閲戦 + data.绋庨, "HlineTotalBB": (data.閲戦 + data.绋庨) * data.姹囩巼
, "HTaxPrice": data.鍚◣鍗曚环, "HDiscountRate": data.鎶樻墸鐜�, "HRelTaxPrice": data.瀹為檯鍚◣鍗曚环
}
)
@@ -684,6 +684,8 @@
, "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
, "鐗╂枡鍚嶇О": checkStatus.data[0].HName
, "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ , "HUnitID": checkStatus.data[0].HUnitID
+ , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -880,7 +882,7 @@
, btn2: function (index, layero) { }
})
}
-
+
function get_checkSS() {
layer.open({
type: 2//寮圭獥绫诲瀷
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index 3ab3204..f3d60ba 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -132,6 +132,12 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="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;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
</div>
</script>
</form>
@@ -190,16 +196,17 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ get_FastQuery();
+ //get_Display(sWhere);
DisPlay_HideColumn();
}
//#endregion
- //#region 鍒濆鍖栬〃鏍兼柟娉�
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
function set_InitGrid() {
option = {
elem: '#mainTable'
@@ -417,6 +424,24 @@
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
break;
+ //瀹℃牳
+ case 'set_CheckBill': set_CheckBill();
+ break;
+ //鍙嶅鏍�
+ case 'set_AbandonCheck': set_AbandonCheck();
+ break;
+ //鍏抽棴
+ case 'set_CloseBill': set_CloseBill();
+ break;
+ //鍙嶅叧闂�
+ case 'set_CancelCloseBill': set_CancelCloseBill();
+ break;
+ //浣滃簾鎸夐挳
+ case 'set_Drop': set_DropBill(1);
+ break;
+ //鍙嶄綔搴熸寜閽�
+ case 'set_DeDrop': set_DropBill(2);
+ break;
};
});
@@ -526,6 +551,174 @@
}
//#endregion
+ //瀹℃牳
+ function set_CheckBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOrderBill/CheckXs_SeOrderBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+ //鍙嶅鏍�
+ function set_AbandonCheck() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸弽瀹℃牳鍚�?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOrderBill/CheckXs_SeOrderBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": 2, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+ //鍏抽棴
+ function set_CloseBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸叧闂悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOrderBill/CloseXs_SeOrderBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+ //鍙嶅叧闂�
+ function set_CancelCloseBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸弽鍏抽棴鍚�?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOrderBill/CloseXs_SeOrderBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": 2, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+ //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+ function set_DropBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HInterID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Xs_SeOrderBill/CancellXs_SeOrderBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
//鎵撳嵃
function get_PrintReport() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
new file mode 100644
index 0000000..bf2f419
--- /dev/null
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
@@ -0,0 +1,1093 @@
+锘�<!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/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ .layui-form-item .layui-inline {
+ margin-right: 0;
+ }
+
+ html {
+ background-color: white;
+ color: white;
+ }
+
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+ </style>
+</head>
+<body>
+
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 15px;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <h1 style="text-align: center; padding: 10px 0;"><b>閿�鍞嚭搴撳崟</b></h1>
+ <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>
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" value="0">
+ <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">涓氬姟鍛�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瀹㈡埛</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閿�鍞柟寮�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSellSName" id="HSellSName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSellSID" id="HSellSID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSellSList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HDeptName" id="HDeptName" 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="HDeptList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍙戣揣浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">淇濈鍛�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+
+ </div>
+
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閿�鍞鍗曞彿</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">涓荤</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">杩愯垂</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HConveyMoney" id="HConveyMoney" autocomplete="off" value="0">
+ </div>
+ </div>
+ <!--<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">婧愬崟绫诲瀷</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSourceBillType" id="HSourceBillType" value="0">
+ </div>
+ </div>-->
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">杩愯緭鍏徃</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HConveyCompName" id="HConveyCompName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HConveyCompID" id="HConveyCompID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HConveyCompList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">杩愯緭鏂瑰紡</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HConveyTypeName" id="HConveyTypeName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HConveyTypeID" id="HConveyTypeID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HConveyTypeList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <!--<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">杩愯緭鍏徃</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HConveyCompID" id="HConveyCompID" autocomplete="off" value="0">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">杩愯緭鏂瑰紡</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HConveyTypeID" id="HConveyTypeID" autocomplete="off" value="0">
+ </div>
+ </div>-->
+
+ </div>
+ <div class="layui-row">
+ <!--<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閫夊崟鍙�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
+ </div>
+ </div>-->
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鑱旂郴浜�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HLinkMan" id="HLinkMan" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鑱旂郴鐢佃瘽</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HLinkPhone" id="HLinkPhone" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏍搁攢浜�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HCheckStatusMan" id="HCheckStatusMan" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鎽樿</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">甯佸埆</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HDeleteMan " id="HDeleteMan " style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><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>
+
+ </div>
+ </script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ </form>
+ </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>
+ //#region 鎶樺彔娉ㄩ噴
+ //#endregion
+ 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
+ , element = layui.element;
+ var sWhere = "";
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "-" + month + "-" + day;
+
+ var allVal;
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ get_LoginIs();
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ }
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+ $("#HItemID").val(0);
+ }
+ else if (OperationType == 3) {//缂栬緫
+ $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ }
+ else if (OperationType == 4) {//娴忚
+ $("#HItemID").val(linterid);//
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
+
+ //#endregion
+
+ var rowdata = [{
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": "0", "鍙戣揣浠撳簱": "",
+ "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": ""
+ }];
+
+ // 鍒濆鍖栫晫
+ set_InitGrid();
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": "0", "鍙戣揣浠撳簱": "",
+ "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": ""
+ };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+
+ table.render(option);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ break;
+ case 'btn-CopyLine':
+ 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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ break;
+ ////鍒楄缃�
+ //case 'set_HideColumn':
+ // get_HideColumn();
+ // break;
+ }
+ });
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //閫�鍑烘寜閽�
+ form.on('submit(Exit)', function () {
+ Pub_Close(1);
+ })
+
+ //閫夋嫨涓氬姟鍛樻寜閽�
+ form.on('submit(HEmpList)', function () {
+ get_checkEmp();
+ });
+ //閫夋嫨瀹㈡埛鎸夐挳
+ form.on('submit(HCusList)', function () {
+ get_checkCus();
+ });
+ //閫夋嫨浠撳簱鎸夐挳
+ form.on('submit(HWHList)', function () {
+ get_checkWH();
+ });
+ //閫夋嫨甯佸埆鎸夐挳
+ form.on('submit(HCurList)', function () {
+ get_checkCur();
+ });
+
+ //閫夋嫨閮ㄩ棬鎸夐挳
+ form.on('submit(HDeptList)', function () {
+ get_checkDept();
+ });
+ //鏄惁鍨粯鎸夐挳
+ form.on('checkbox(checkboxHDFflag)', function (data) {
+ $("#HDFflag").val(data.elem.checked);
+ });
+ //閫夋嫨涓荤鎸夐挳
+ form.on('submit(HManagerList)', function () {
+ get_checkManager();
+ });
+ //閫夋嫨閿�鍞柟寮忔寜閽�
+ form.on('submit(HSellSList)', function () {
+ get_checkSellS();
+ });
+ //閫夋嫨鍙戣揣浜烘寜閽�
+ form.on('submit(HSecManagerList)', function () {
+ get_checkSecManager();
+ });
+ //閫夋嫨淇濈鍛樻寜閽�
+ form.on('submit(HKeeperList)', function () {
+ get_checkKeeper();
+ });
+
+
+ //淇濆瓨鎸夐挳
+ form.on('submit(Saver)', function (data) {
+ set_SaveBill(data);
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+ var data = obj.data;
+ if (obj.event == 'HDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ });
+ }
+ });
+ //#endregion
+
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ function get_LoginIs() {
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+ }
+ //#endregion
+
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , limit: 500
+ , height: 500
+ , loading: false
+ , cols: [[ //瀛愯〃
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', width: 100, totalRow: true }
+ , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, }
+ , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID" }//f7
+ , { field: 'HWHID', title: 'HWHID', width: 100, hide: true }
+ , { field: '鍙戣揣浠撳簱', title: '鍙戣揣浠撳簱', width: 100, edit: 'text', event: "HWHID" }//f7
+ , { field: 'HQty', title: '鏁伴噺', width: 100, edit: 'text' }
+ , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text' }
+ , { field: 'HMoney', title: '閲戦', width: 100, edit: 'text' }
+ , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ ]]
+ }
+
+ option.data = rowdata;
+ table.render(option);
+ }
+
+ //#region 鍔犺浇琛ㄥご
+ function RoadBillMain(linterid) {
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "Xs_SeOutStockBill/cx",
+ type: "GET",
+ data: {
+ "HInterID": linterid
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ allVal = result.data[0];
+ var data = result.data[0];
+ var IsHDFflag = data.鏄惁鍨粯;
+ if (IsHDFflag) {
+ $("input[name='checkboxHDFflag'][value='" + IsHDFflag + "']").attr("checked", true);
+ }
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDate(data.鏃ユ湡)
+ , "HInnerBillNo": data.閿�鍞鍗曞彿
+ , "HEmpID": data.HEmpID
+ , "HEmpName": data.涓氬姟鍛�
+ , "HCusID": data.HCusID
+ , "HCusName": data.瀹㈡埛
+ , "HWHID": data.HWHID
+ , "HWHName": data.浠撳簱
+ , "HAddress": data.浜よ揣鍦扮偣
+ , "HDeptName": data.閮ㄩ棬
+ , "HDeptID": data.HDeptID
+ , "HCurID": data.HCurID
+ , "HCurName": data.甯佸埆
+ , "HExRate": data.姹囩巼
+ , "HManagerName": data.涓荤
+ , "HManagerID": data.HManagerID
+ , "HSourceBillType": data.婧愬崟绫诲瀷
+ , "HLinkMan": data.鑱旂郴浜�
+ , "HLinkPhone": data.鑱旂郴鐢佃瘽
+ , "HConveyCompID": data.杩愯緭鍏徃
+ , "HConveyTypeID": data.杩愯緭鏂瑰紡
+ , "tHConveyMoney": data.杩愯垂
+ , "HDFflag": data.鏄惁鍨粯
+ , "Box2": ""
+ , "HRemark": data.琛ㄥご澶囨敞
+ , "HMaker": data.鍒跺崟浜�
+ , "HChecker": data.瀹℃牳浜�
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡
+ , "HCheckDate": data.瀹℃牳鏃ユ湡
+ , "HCloseDate": data.鍏抽棴鏃ユ湡
+ , "HUpDateDate": data.淇敼鏃ユ湡
+ , "HDeleteDate": data.浣滃簾鏃ユ湡
+ });
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "-" + month + "-" + day;
+
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '1402' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(shijian);
+ $("#HInterID").val(d.data[0].HInterID);
+ }
+ });
+ }
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ RoadBillMain(hID);
+ /* RoadBillSub(linterid);*/
+ }
+ //#region 淇濆瓨鏂规硶
+ function set_SaveBill(data) {
+
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(num);
+ var sAllStr = JSON.stringify(allVal);
+ //var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ";" + sAllStr;
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "Xs_SeOutStockBill/SeOutStockBillEdit", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+ //淇濆瓨鍚庢祻瑙�
+ //ReRoadBillMain();
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ console.log("Reason" + sMainStr);
+ }
+ });
+ }
+ //#endregion
+
+ //琛屽唴蹇嵎閿瓫閫�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //鐗╂枡
+ if (obj.event == "HMaterID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaterID": checkStatus.data[0].HItemID
+ , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
+ , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
+ , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ , "HUnitID": checkStatus.data[0].HUnitID
+ , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //璁￠噺鍗曚綅
+ if (obj.event == "HUnitID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "璁￠噺鍗曚綅": checkStatus.data[0].HName
+ , "HUnitID": checkStatus.data[0].HItemID
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //鍙戣揣浠撳簱
+ if (obj.event == "HWHID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "浠撳簱鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "鍙戣揣浠撳簱": checkStatus.data[0].HName
+ , "HWHID": checkStatus.data[0].HItemID
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ obj.event = "";
+ return false;
+ }
+ })
+ }
+
+ //琛屽唴鍒犻櫎
+ 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 {
+ obj.del();
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.reload(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ function get_checkEmp() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '涓氬姟鍛樺垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', '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('璇烽�夋嫨鏁版嵁');
+ // }
+ // $("#HEmpName").val(checkStatus.data[0].HName);
+ // $("#HEmpID").val(checkStatus.data[0].HItemID);
+ // layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ //}
+ //, btn2: function (index, layero) { }
+ })
+ }
+ function get_checkCus() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '瀹㈡埛鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.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('璇烽�夋嫨鏁版嵁');
+ // }
+ // $("#HCusName").val(checkStatus.data[0].HName);
+ // $("#HCusID").val(checkStatus.data[0].HItemID);
+ // layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ //}
+ //, btn2: function (index, layero) { }
+ })
+ }
+ function get_checkWH() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '浠撳簱鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', '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('璇烽�夋嫨鏁版嵁');
+ // }
+ // $("#HWHName").val(checkStatus.data[0].HName);
+ // $("#HWHID").val(checkStatus.data[0].HItemID);
+ // layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ //}
+ //, btn2: function (index, layero) { }
+ })
+ }
+ function get_checkCur() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '甯佸埆鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HCurName").val(checkStatus.data[0].璐у竵鍚嶇О);
+ $("#HCurID").val(checkStatus.data[0].HItemID);
+ $("#HExRate").val(checkStatus.data[0].姹囩巼);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ function get_checkDept() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '閮ㄩ棬鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/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].HName);
+ // $("#HDeptID").val(checkStatus.data[0].HItemID);
+ // layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ //}
+ //, btn2: function (index, layero) { }
+ })
+ }
+
+ function get_checkManager() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '涓荤鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', '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('璇烽�夋嫨鏁版嵁');
+ // }
+ // $("#HManagerName").val(checkStatus.data[0].HName);
+ // $("#HManagerID").val(checkStatus.data[0].HItemID);
+ // layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ //}
+ //, btn2: function (index, layero) { }
+ })
+ }
+
+ function get_checkSellS() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '閿�鍞柟寮忓垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_SellStyle.html', 'yes']
+ })
+ }
+
+ function get_checkSecManager() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鍙戣揣浜哄垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
+ })
+ }
+
+ function get_checkKeeper() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '淇濈鍛樺垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+ })
+ }
+
+ //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+ function ReRoadBillMain() {
+ location.replace('Add_Edit_Xs_SeOutStockBillList.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+ //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+ }
+ //#endregion
+
+ //#endregion
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ // 鍩虹璧勬枡杩斿洖鏁版嵁
+ function GetHEmpValue(obj) //杩斿洖涓氬姟鍛�
+ {
+ $("#HEmpName").val(obj[0].HName);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
+
+ function GetHSupValue(obj) //杩斿洖瀹㈡埛
+ {
+ $("#HCusName").val(obj[0].HName);
+ $("#HCusID").val(obj[0].HItemID);
+ }
+
+ function GetHManagerValue(obj) //杩斿洖涓荤
+ {
+ $("#HManagerName").val(obj[0].HName);
+ $("#HManagerID").val(obj[0].HItemID);
+ }
+
+ function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
+ {
+ $("#HDeptName").val(obj[0].HName);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
+
+ function GetHWHValue(obj) //杩斿洖浠撳簱
+ {
+ $("#HWHName").val(obj[0].HName);
+ $("#HWHID").val(obj[0].HItemID);
+ }
+
+ function GetSellStyleValue(obj) //杩斿洖閿�鍞柟寮�
+ {
+ $("#HSellSName").val(obj[0].HName);
+ $("#HSellSID").val(obj[0].HItemID);
+ }
+
+ function GetHKeeperValue(obj) //杩斿洖淇濈鍛�
+ {
+ $("#HKeeperName").val(obj[0].HName);
+ $("#HKeeperID").val(obj[0].HItemID);
+ }
+
+ function GetHWorkerValue(obj) //杩斿洖鍙戣揣浜猴紙鎿嶄綔宸ワ級
+ {
+ $("#HSecManagerName").val(obj[0].HName);
+ $("#HSecManagerID").val(obj[0].HItemID);
+ }
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index 6c6bd8c..831bff8 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -121,6 +121,12 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="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;" lay-event="btn-BarCodeDetail" id="btn-BarCodeDetail"><i class="layui-icon layui-icon-logout"></i>鏉＄爜鏄庣粏</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
</div>
</script>
</form>
@@ -372,6 +378,24 @@
break;
case 'btn-BarCodeDetail': get_BarCodeDetail();
break;
+ //瀹℃牳
+ case 'set_CheckBill': set_CheckBill(1);
+ break;
+ //鍙嶅鏍�
+ case 'set_AbandonCheck': set_CheckBill(2);
+ break;
+ //鍏抽棴
+ case 'set_CloseBill': set_CloseBill(1);
+ break;
+ //鍙嶅叧闂�
+ case 'set_CancelCloseBill': set_CloseBill(2);
+ break;
+ //浣滃簾鎸夐挳
+ case 'set_Drop': set_DropBill(1);
+ break;
+ //鍙嶄綔搴熸寜閽�
+ case 'set_DeDrop': set_DropBill(2);
+ break;
};
});
@@ -487,6 +511,109 @@
}
//#endregion
+ //瀹℃牳/鍙嶅鏍�
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Kf_SellOutBill/CheckKf_SellOutBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+ //鍏抽棴/鍙嶅叧闂�
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸叧闂悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Kf_SellOutBill/CloseKf_SellOutBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+ //#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() + "/Kf_SellOutBill/CancellKf_SellOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
--
Gitblit v1.9.1