From e746da7a7d253396149aecf3cdc0e6cfb3a19ee6 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 24 三月 2022 16:09:33 +0800
Subject: [PATCH] 叫料单列表 查询 退料申请单 退料确认页面列表 生产叫料平台 退料单新增 拣料配送单 删除
---
WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsBill.html | 189 +++------
WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsList.html | 263 +++++++------
WebTM/views/车间管理/叫料管理/Jl_CallGoodsBillMain.html | 20
WebTM/views/车间管理/叫料管理/叫料退料单/JIT_BackGoods.html | 385 ++++++++++++++++++++
WebTM/views/车间管理/叫料管理/叫料退料单/Jl_CallGoodsBillBackMain.html | 104 +++-
WebTM/views/生产管理/生产叫料平台/JIT_ComplementGoodBillMain.html | 126 ++++--
WebTM/views/生产管理/退料申请单/JIT_CallGoodsBackRequestBillList.html | 29
WebTM/views/index.html | 13
WebTM/WebTM.csproj | 1
9 files changed, 777 insertions(+), 353 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index d41cc62..abe7921 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -887,6 +887,7 @@
<Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_Add_Edit_FirstPieceCheckBill.html" />
<Content Include="views\杞﹂棿绠＄悊\鍙枡绠＄悊\Jl_CallGoodsBillMain.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍙枡绠＄悊\鍙枡閫�鏂欏崟\JIT_BackGoods.html" />
<Content Include="views\杞﹂棿绠＄悊\鍙枡绠＄悊\鍙枡閫�鏂欏崟\Jl_CallGoodsBillBackMain.html" />
<Content Include="views\杞﹂棿绠＄悊\鍙枡绠＄悊\鎷ｆ枡閰嶉�佸崟\Jl_ComplementGoodsBillMain.html" />
<Content Include="views\杞﹂棿绠＄悊\鍙枡绠＄悊\鐢熶骇鏃ヨ鍒掑崟\Sc_WorkBillAutoSortBillMain.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 55dea21..ce93d19 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -295,14 +295,6 @@
<a><i class="layui-icon layui-icon-set"></i><cite>鐢熶骇绠＄悊</cite></a>
<dl class="layui-nav-child">
<dd>
- <a>鐢熶骇鍙枡骞冲彴</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鍙枡骞冲彴/JIT_ComplementGoodBillMain.html">鐢熶骇鍙枡骞冲彴</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鎷ｆ枡閰嶉�佸崟/JIT_ComplementGoodsList.html">鎷ｆ枡閰嶉�佸崟鍒楄〃</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/閫�鏂欑敵璇峰崟/JIT_CallGoodsBackRequestBillList.html">閫�鏂欑敵璇峰崟鍒楄〃</a></dd>
- </dl>
- </dd>
- <dd>
<a>鐢熶骇璁㈠崟</a>
<dl class="layui-nav-child">
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">鐢熶骇璁㈠崟缁存姢</a></dd>
@@ -427,8 +419,11 @@
<dd>
<a>鍙枡绠＄悊</a>
<dl class="layui-nav-child append" id="append">
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鍙枡骞冲彴/JIT_ComplementGoodBillMain.html">鐢熶骇鍙枡骞冲彴</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎷ｆ枡閰嶉�佸崟/JIT_ComplementGoodsList.html">鎷ｆ枡閰嶉�佸崟鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/閫�鏂欑敵璇峰崟/JIT_CallGoodsBackRequestBillList.html">閫�鏂欑敵璇峰崟鍒楄〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鍙枡绠＄悊/Jl_CallGoodsBillMain.html">鍙枡鍗曞垪琛�</a></dd>
- <dd><a lay-href="杞﹂棿绠＄悊/鍙枡绠＄悊/鎷ｆ枡閰嶉�佸崟/Jl_ComplementGoodsBillMain.html">鎷ｆ枡閰嶉�佸崟鍒楄〃</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鍙枡绠＄悊/鎷ｆ枡閰嶉�佸崟/Jl_ComplementGoodsBillMain.html">鎷ｆ枡閰嶉�佸崟鍒楄〃(-)</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鍙枡绠＄悊/鍙枡閫�鏂欏崟/Jl_CallGoodsBillBackMain.html">鍙枡閫�鏂欏崟鍒楄〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鍙枡绠＄悊/鐢熶骇鏃ヨ鍒掑崟/Sc_WorkBillAutoSortBillMain.html">鐢熶骇鏃ヨ鍒掑崟鍒楄〃</a></dd>
</dl>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill.html"
index 94cc602..df0427f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill.html"
@@ -46,13 +46,10 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 80px;">鎷ｆ枡閰嶉�佸崟鍙�</label>
+ <label class="layui-form-label" style="width: 85px; margin-left: -5px;">鎷ｆ枡閰嶉�佸崟鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark" style="display: inline-block;">
- </div>
- <label class="layui-form-label"></label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HInterID" lay-verify="HInterID" id="HInterID" style="display: inline-block;">
+ <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark" style="display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HInterID" lay-verify="HInterID" id="HInterID" style="display: inline-block;display:none">
</div>
</div>
<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Ppkc" id="Ppkc">鍖归厤搴撳瓨</button>
@@ -127,6 +124,31 @@
get_FastQuery();
})
+ //閫�鍑�
+ form.on('submit(Edit)', function () {
+ Pub_Close(1);
+ })
+
+ //鍖归厤搴撳瓨
+ form.on('submit(Ppkc)', function () {
+ layer.confirm("纭畾瑕佸尮閰嶅簱瀛�?", {
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index) {
+ layer.close(index)
+ sWhere = $("#HInterID").val();
+ get_Display1(sWhere);
+ set_InitGrid1();
+ $('#Ppkc').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $('#Ckfl').removeClass("layui-btn-disabled").attr("disabled", false); //鎸夐挳鎭㈠
+ }
+ })
+ })
+
+ //浠撳簱鍙戞枡
+ form.on('submit(Ckfl)', function () {
+
+ })
+
//琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
@@ -142,60 +164,43 @@
set_InitGrid();
get_Display(sWhere);
- //set_InitGrid1();
- //get_Display1(sWhere);
+ //绂佺敤鎸夐挳
+ $('#Ckfl').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
}
//#region 鎷ｆ枡淇℃伅
function set_InitGrid() {
option = {
elem: '#mainTable'
//, toolbar: '#toolbarDemo'
- , height: 350
+ , height: 400
, page: true
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
, cols: [[
//{ type: 'checkbox', fixed: 'left' }
- { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿',width: 150 }
- , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 170}
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 170 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 260, }
- , { field: '浜у搧瑙勬牸鍨嬪彿', title: '浜у搧瑙勬牸鍨嬪彿', width: 160 }
- , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 160 }
- , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', width: 160, templet: "<div>{{d.璁″垝寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>" }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160 }
+ { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�',width: 150 }
+ , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 170}
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 170, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��', width: 260, }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 160 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 160 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 160, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 160 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
- , { field: '瀛愰」鍗曚綅', title: '瀛愰」鍗曚綅', width: 160 }
- , { field: '鍗曚綅鐢ㄩ噺', title: '鍗曚綅鐢ㄩ噺', width: 160}
- , { field: '璁″垝鍙戞枡鏁伴噺', title: '璁″垝鍙戞枡鏁伴噺', width: 160 }
- , { field: '鍙枡鏁伴噺', title: '鍙枡鏁伴噺', width: 160, edit: 'text'}
- , { field: '閫�鏂欐暟閲�', title: '閫�鏂欐暟閲�', width: 160, edit: 'text'}
- , { field: '閫�鏂欏師鍥�', title: '閫�鏂欏師鍥�', width: 160, edit: 'text'}
- , { field: '宸插彨鏂欐暟閲�', title: '宸插彨鏂欐暟閲�', width: 160}
- , { field: '宸查厤閫佹暟閲�', title: '宸查厤閫佹暟閲�', width: 160 }
- , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 160, edit: 'text', event: 'Warehouse' }
- , { field: '璋冨嚭浠撳簱id', title: '璋冨嚭浠撳簱id', width: 160, hide: true }
- , { field: '搴撳瓨鏁伴噺', title: '搴撳瓨鏁伴噺', width: 160 }
- , { field: '璋冨嚭浠撳簱搴撳瓨鏁伴噺', title: '璋冨嚭浠撳簱搴撳瓨鏁伴噺', width: 160 }
- , { field: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', title: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', width: 160 }
- , { field: '鍙敤搴撳瓨', title: '鍙敤搴撳瓨', width: 160 }
- , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 160}
- , { field: 'HICMOBillNo', title: 'HICMOBillNo', width: 160 }
- , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 160 }
- , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 160 }
- , { field: 'HDeptID', title: 'HDeptID', hide: true }
- , { field: 'HDeptNumber', title: 'HDeptNumber', hide: true }
- , { field: 'HMaterialID', title: 'HMaterialID', hide: true }
- , { field: 'HWHID', title: 'HWHID', hide: true }
- , { field: 'HOutOrgID', title: 'HOutOrgID', hide: true }
- , { field: 'HSouceInterID', title: 'HSouceInterID', hide: true }
- , { field: 'HSourceEntryID', title: 'HSourceEntryID', hide: true }
- , { field: 'HSourceBillNo', title: 'HSourceBillNo', hide: true }
- , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
- , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
- , { field: 'HSTOCKID', title: 'HSTOCKID', hide: true }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 160 }
+ , { field: '宸ュ簭', title: '宸ュ簭', width: 160 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 160}
+ , { field: '浠撲綅', title: '浠撲綅', width: 160 }
+ , { field: '閫�鍥炰汉', title: '閫�鍥炰汉', width: 160 }
+ , { field: '閫�鍥炴棩鏈�', title: '閫�鍥炴棩鏈�', width: 160, templet: "<div>{{d.閫�鍥炴棩鏈� ==null ?'':layui.util.toDateString(d.閫�鍥炴棩鏈�, 'yyyy-MM-dd')}}</div>" }
+ , { field: '閫�鍥炲師鍥�', title: '閫�鍥炲師鍥�', width: 160 }
+ , { field: '淇敼浜�', title: '淇敼浜�', width: 160 }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 160, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 160 }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 160, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 160 }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 160, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
]]
};
}
@@ -207,9 +212,11 @@
$.ajax({
url: GetWEBURL() + '/Sc_ComplementGoods/ComplementGoodsBill',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere},
success: function (data1) {
if (data1.count == 1) {
+ $("#HRemark").val(data1.data[0].鍗曟嵁鍙�);
+ $("#HInterID").val(data1.data[0].hmainid);
option.data = data1.data;
table.render(option);
layer.close(ajaxLoad);
@@ -231,7 +238,7 @@
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Sc_ComplementGoodBill/ComplementGoodBillList',
+ url: GetWEBURL() + '/Sc_ComplementGoods/ComplementGoodsBill_C',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -261,81 +268,23 @@
, limit: 50
, limits: [50, 500, 5000, 20000]
, cols: [[
- //{ type: 'checkbox', fixed: 'left' }
- { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150 }
- //, { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 170 }
- //, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 170 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 260, }
- , { field: '浜у搧瑙勬牸鍨嬪彿', title: '浜у搧瑙勬牸鍨嬪彿', width: 160 }
- , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 160 }
- , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', width: 160, templet: "<div>{{d.璁″垝寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>" }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
- , { field: '瀛愰」鍗曚綅', title: '瀛愰」鍗曚綅', width: 160 }
- , { field: '鍗曚綅鐢ㄩ噺', title: '鍗曚綅鐢ㄩ噺', width: 160 }
- , { field: '璁″垝鍙戞枡鏁伴噺', title: '璁″垝鍙戞枡鏁伴噺', width: 160 }
- , { field: '鍙枡鏁伴噺', title: '鍙枡鏁伴噺', width: 160, edit: 'text' }
- , { field: '閫�鏂欐暟閲�', title: '閫�鏂欐暟閲�', width: 160, edit: 'text' }
- , { field: '閫�鏂欏師鍥�', title: '閫�鏂欏師鍥�', width: 160, edit: 'text' }
- , { field: '宸插彨鏂欐暟閲�', title: '宸插彨鏂欐暟閲�', width: 160 }
- , { field: '宸查厤閫佹暟閲�', title: '宸查厤閫佹暟閲�', width: 160 }
- , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 160, edit: 'text', event: 'Warehouse' }
- , { field: '璋冨嚭浠撳簱id', title: '璋冨嚭浠撳簱id', width: 160, hide: true }
- , { field: '搴撳瓨鏁伴噺', title: '搴撳瓨鏁伴噺', width: 160 }
- , { field: '璋冨嚭浠撳簱搴撳瓨鏁伴噺', title: '璋冨嚭浠撳簱搴撳瓨鏁伴噺', width: 160 }
- , { field: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', title: '璋冨嚭浠撳簱鍙敤搴撳瓨鏁伴噺', width: 160 }
- , { field: '鍙敤搴撳瓨', title: '鍙敤搴撳瓨', width: 160 }
- , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 160 }
- , { field: 'HICMOBillNo', title: 'HICMOBillNo', width: 160 }
- , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 160 }
- , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 160 }
- , { field: 'HDeptID', title: 'HDeptID', hide: true }
- , { field: 'HDeptNumber', title: 'HDeptNumber', hide: true }
- , { field: 'HMaterialID', title: 'HMaterialID', hide: true }
- , { field: 'HWHID', title: 'HWHID', hide: true }
- , { field: 'HOutOrgID', title: 'HOutOrgID', hide: true }
- , { field: 'HSouceInterID', title: 'HSouceInterID', hide: true }
- , { field: 'HSourceEntryID', title: 'HSourceEntryID', hide: true }
- , { field: 'HSourceBillNo', title: 'HSourceBillNo', hide: true }
- , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
- , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
- , { field: 'HSTOCKID', title: 'HSTOCKID', hide: true }
+ { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 170 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 170 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 260, }
+ , { field: '姹囨�诲彨鏂欐暟閲�', title: '姹囨�诲彨鏂欐暟閲�', width: 160 }
+ , { field: '鏈嫞鏂欐暟閲�', title: '鏈嫞鏂欐暟閲�', width: 160 }
+ , { field: '鏈鎷ｆ枡鏁伴噺', title: '鏈鎷ｆ枡鏁伴噺', width: 160, edit: "text" }
+ , { field: '鏈�澶ф嫞鏂欐暟閲�', title: '鏈�澶ф嫞鏂欐暟閲�', width: 160 }
+ , { field: '褰撳墠浠撳簱搴撳瓨', title: '褰撳墠浠撳簱搴撳瓨', width: 160 }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 160 }
+ , { field: '宸ユ', title: '宸ユ', width: 160 }
+ , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 160 }
+ , { field: '璋冨嚭浠撲綅', title: '璋冨嚭浠撲綅', width: 160 }
]]
};
}
//#endregion
-
- //蹇�熻繃婊�
- function get_FastQuery() {
- var MaterialNumber = $("#MaterialNumber").val(); //鐗╂枡浠ｇ爜
- var MaterialName = $("#MaterialName").val(); //鐗╂枡鍚嶇О
- var MaterialModel = $("#MaterialModel").val(); //鐗╂枡瑙勬牸鍨嬪彿
- var HGD = $("#HGD").val(); //宸ユ
- var HWHName = $("#HWHName").val(); //浠撳簱
- var Organization = $("#Organization").val(); //缁勭粐
- var HBeginDate = $("#HBeginDate").val(); //鎷ｆ枡鏃ユ湡
- var HEndDate = $("#HEndDate").val(); //缁撴潫鏃ユ湡
- var HDeptName = $("#HDeptName").val(); //閮ㄩ棬
- var HJLStatus = $("#HJLStatus").val(); //鎷ｆ枡鐘舵��
- var user = sessionStorage["HUserName"]; //鍒跺崟浜�
- sWhere = {
-
- MaterialNumber: MaterialNumber,
- MaterialName: MaterialName,
- MaterialModel: MaterialModel,
- HGD: HGD,
- HWHName: HWHName,
- Organization: Organization,
- HBeginDate: HBeginDate,
- HEndDate: HEndDate,
- HDeptName: HDeptName,
- HJLStatus: HJLStatus,
- user: user
- };
- get_Display(JSON.stringify(sWhere));
- sWhere = "";
- }
//琛屽唴蹇嵎閿�
function set_GridCellCheck(obj) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
index 79dc0cf..460e26a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
@@ -15,10 +15,6 @@
.layui-row .layui-btn layui-btn-normal {
margin: 0px 10px;
}
-
- .layui-inline {
- margin: 0px 80px;
- }
</style>
</head>
<body>
@@ -34,115 +30,109 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Ylan" id="Ylan">棰勮</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Dyin" id="Dyin">鎵撳嵃</button>
</div>
- <div class="layui-tab" lay-filter="tab-POStockInBill">
- <ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
- </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-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="MaterialNumber" name="MaterialNumber" id="MaterialNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaterial" id="btnMaterial" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="MaterialName" lay-verify="MaterialName" id="MaterialName" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="MaterialID" id="MaterialID" lay-verify="MaterialID" value="0">
- </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="MaterialModel" id="MaterialModel" onmouseover="this.title=this.value" readonly>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ユ</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HGD" lay-verify="HGD" id="HGD" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGD" id="btnHGD" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠撳簱</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HWHName" lay-verify="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHName" id="btnHWHName" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">褰撳墠缁勭粐</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="Organization" id="Organization" lay-verify="Organization">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </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="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 48px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;text-align:center;">鈥�</label>
- <div class="layui-input-block" style="margin-left: 118px;">
- <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 48px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閮ㄩ棬</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptName" id="btnHDeptName" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">鎷ｆ枡鐘舵��</label>
- <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
- <select name="HJLStatus" lay-verify="HJLStatus" id="HJLStatus">
- <option value="鍏ㄩ儴">鍏ㄩ儴</option>
- <option value="宸叉嫞鏂�">宸叉嫞鏂�</option>
- <option value="鏈嫞鏂�">鏈嫞鏂�</option>
- </select>
- </div>
- </div>
- <!--<div class="layui-inline">
- <div class="layui-input-block" style="margin-left: 90px;">
- <input type="checkbox" name="ps" id="ps" lay-skin="primary" lay-filter="ps" title="浠呮樉绀烘湭瀹屽叏閰嶉��">
- </div>
- </div>-->
- </div>
- <div class="layui-row" style="text-align: center; margin-bottom: 20px;">
- <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Cx" id="Cx">鏌ヨ</button>
- <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Jlps" id="Jlps">鎷ｆ枡閰嶉��</button>
- </div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="MaterialNumber" name="MaterialNumber" id="MaterialNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaterial" id="btnMaterial" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="MaterialName" lay-verify="MaterialName" id="MaterialName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="MaterialID" id="MaterialID" lay-verify="MaterialID" value="0">
+ </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="MaterialModel" id="MaterialModel" onmouseover="this.title=this.value" readonly>
+ </div>
+ </div>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ユ</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HGD" lay-verify="HGD" id="HGD" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGD" id="btnHGD" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠撳簱</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HWHName" lay-verify="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHName" id="btnHWHName" style="padding: 0 10px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 80px;">褰撳墠缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 110px; width: 185px;">
+ <select name="Organization" id="Organization" lay-verify="Organization">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎷ｆ枡鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 48px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鈥�</label>
+ <div class="layui-input-block" style="margin-left: 118px;">
+ <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 48px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閮ㄩ棬</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptName" id="btnHDeptName" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">鎷ｆ枡鐘舵��</label>
+ <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
+ <select name="HJLStatus" lay-verify="HJLStatus" id="HJLStatus">
+ <option value="鍏ㄩ儴">鍏ㄩ儴</option>
+ <option value="宸叉嫞鏂�">宸叉嫞鏂�</option>
+ <option value="鏈嫞鏂�">鏈嫞鏂�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="text-align: center; margin-bottom: 20px; margin-top: 20px;">
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Cx" id="Cx">鏌ヨ</button>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Jlps" id="Jlps">鎷ｆ枡閰嶉��</button>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="set_DeleteBill" id="set_DeleteBill">鍒犻櫎</button>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
</div>
</div>
+
</form>
</div>
</div>
@@ -207,6 +197,11 @@
btnJlps();
})
+ //鍒犻櫎
+ form.on('submit(set_DeleteBill)', function () {
+ set_DeleteBill();
+ })
+
//琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
@@ -251,7 +246,7 @@
option = {
elem: '#mainTable'
//, toolbar: '#toolbarDemo'
- , height: 350
+ , height: 'full-190'
, page: true
, cellMinWidth: 90
, limit: 50
@@ -302,7 +297,7 @@
}
});
}
-
+
//鐗╂枡
function btnMaterial() {
layer.open({
@@ -412,16 +407,54 @@
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
else {
- var HBillNo = CheckStatus.data[0].鎷ｆ枡閰嶉�佸崟鍙�;
+ var hmainid = CheckStatus.data[0].hmainid;
layer.open({
type: 2 //绫诲瀷
, skin: 'layui-layer-rim'//鍔犱笂杈规
- , area: ['100%', '100%']//澶у皬
+ , area: ['90%', '90%']//澶у皬
, title: '閰嶉�佸崟鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
, maxmin: true
- , content: "../../鐢熶骇绠＄悊/鎷ｆ枡閰嶉�佸崟/JIT_ComplementGoodsBill.html?HBillNo=" + HBillNo
+ , content: "../../鐢熶骇绠＄悊/鎷ｆ枡閰嶉�佸崟/JIT_ComplementGoodsBill.html?hmainid=" + hmainid
+ })
+ }
+ }
+
+ //鍒犻櫎
+ function set_DeleteBill() {
+ var CheckStatus = table.checkStatus("mainTable");
+
+ if (CheckStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+ } else {
+ layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function (index) {
+ var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+ var HEntryID = CheckStatus.data[0].Hsubid; //鑾峰彇绗嚑鏉″瓙鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ComplementGoods/DelComplementGoodsList'
+ , type: "GET"
+ , data: { "HInterID": HInterID, "HEntryID": HEntryID, "HOrgID": sessionStorage["OrganizationID"], "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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ ////閲嶈浇tree
+ //tree.reload('treeDepartment', {});
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
})
}
}
@@ -493,7 +526,7 @@
}
})
}
-
+
//#endregion
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
index 1cb9a4f..d8a0fa9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
@@ -31,6 +31,13 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Zxbzjl" id="Zxbzjl">鏈�灏忓寘瑁呭彨鏂�</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Yce" id="Yce">寮曞嚭Excel</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Xc" id="Xc">涓嬫煡</button>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Cx" id="Cx">鏌ヨ</button>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Jl" id="Jl">鍙枡</button>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Scjld" id="Scjld">鐢熸垚鎷ｆ枡鍗�</button>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Blptl" id="Blptl">涓嶈壇鍝侀��鐢宠鏂�</button>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Yltl" id="Yltl">浣欓噺閫�鏂欑敵璇峰崟</button>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Bftl" id="Bftl">鎶ュ簾閫�鏂欑敵璇峰崟</button>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Sctld" id="Sctld">鐢熸垚閫�鏂欏崟</button>
</div>
<div class="layui-collapse">
<div class="layui-colla-item">
@@ -144,22 +151,7 @@
</div>
<div class="layui-collapse">
<div class="layui-colla-item">
-
<div class="layui-form-item" style="padding-top: 10px;">
-
-
-
- <div class="layui-row" style="text-align: center; margin-bottom: 20px;">
- <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Cx" id="Cx">鏌ヨ</button>
- <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Kcxd" id="Kcxd">搴撳瓨鏍″</button>
- <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Jl" id="Jl">鍙枡</button>
- <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Scjld" id="Scjld">鐢熸垚鎷ｆ枡鍗�</button>
- <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Blptl" id="Blptl">涓嶈壇鍝侀��鐢宠鏂�</button>
- <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Yltl" id="Yltl">浣欓噺閫�鏂欑敵璇峰崟</button>
- <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Bftl" id="Bftl">鎶ュ簾閫�鏂欑敵璇峰崟</button>
- <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Sctld" id="Sctld">鐢熸垚閫�鏂欏崟</button>
- <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Hbtl" id="Hbtl">鍚堝苟閫�鏂�</button>
- </div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
</div>
@@ -249,6 +241,11 @@
set_AddNew_Scjld();
})
+ //鏂板閫�鏂欏崟
+ form.on('submit(Sctld)', function () {
+ set_AddNew_Sctld();
+ })
+
//涓嬫煡
form.on('submit(Xc)', function () {
getXc();
@@ -294,14 +291,12 @@
option = {
elem: '#mainTable'
//, toolbar: '#toolbarDemo'
- , height: 500
- , page: true
+ , height: 'full-150'
, cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
+ , limit: 500
, cols: [[
- { type: 'checkbox', fixed: 'left' }
- , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿',width: 150 }
+ //{ type: 'checkbox', fixed: 'left' }
+ { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿',width: 150 }
, { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 170}
, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 170 }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 260, }
@@ -546,7 +541,8 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ //鍒锋柊椤甸潰
+ get_FastQuery();
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -564,16 +560,11 @@
//鏂板涓嶈壇鍝侀��鏂欑敵璇峰崟
function set_AddNew_Blptl() {
- var CheckStatus = table.checkStatus("mainTable");
- if (CheckStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ if (table.cache['mainTable'].length == 0) {
+ return layer.msg("鏃犳暟鎹�,鏃犳硶閫�鏂�!");
}
else {
- if (CheckStatus.data[0].閫�鏂欐暟閲� == "") {
- return layer.msg("閫�鏂欐暟閲忎笉鑳戒负绌�!");
- }
-
- var sMainStr = JSON.stringify(table.checkStatus("mainTable").data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
+ var sMainStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
$.ajax(
{
@@ -585,7 +576,8 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ //鍒锋柊椤甸潰
+ get_FastQuery();
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -603,15 +595,11 @@
//鏂板浣欓噺閫�鏂欑敵璇峰崟
function set_AddNew_Yltl() {
- var CheckStatus = table.checkStatus("mainTable");
- if (CheckStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ if (table.cache['mainTable'].length == 0) {
+ return layer.msg("鏃犳暟鎹�,鏃犳硶閫�鏂�!");
}
else {
- if (CheckStatus.data[0].閫�鏂欐暟閲� == "") {
- return layer.msg("閫�鏂欐暟閲忎笉鑳戒负绌�!");
- }
- var sMainStr = JSON.stringify(table.checkStatus("mainTable").data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
+ var sMainStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
$.ajax(
{
@@ -623,7 +611,9 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+
+ //鍒锋柊椤甸潰
+ get_FastQuery();
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -641,15 +631,11 @@
//鏂板鎶ュ簾閫�鏂欑敵璇峰崟
function set_AddNew_Bftl() {
- var CheckStatus = table.checkStatus("mainTable");
- if (CheckStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ if (table.cache['mainTable'].length == 0) {
+ return layer.msg("鏃犳暟鎹�,鏃犳硶閫�鏂�!");
}
else {
- if (CheckStatus.data[0].閫�鏂欐暟閲� == "") {
- return layer.msg("閫�鏂欐暟閲忎笉鑳戒负绌�!");
- }
- var sMainStr = JSON.stringify(table.checkStatus("mainTable").data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
+ var sMainStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
$.ajax(
{
@@ -661,7 +647,9 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+
+ //鍒锋柊椤甸潰
+ get_FastQuery();
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -698,7 +686,49 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+
+ //鍒锋柊椤甸潰
+ get_FastQuery();
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ console.log("Reason" + sMainStr);
+ }
+ });
+ }
+ })
+ }
+ }
+
+ //鏂板閫�鏂欏崟
+ function set_AddNew_Sctld() {
+ if (table.cache['mainTable'].length == 0) {
+ return layer.msg("鏃犳暟鎹�,鏃犳硶閫�鏂�!");
+ }
+ else {
+ layer.confirm('纭畾瑕佺敓鎴愰��鏂欏崟锛�', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ var sMainStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
+
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "Sc_ComplementGoodBill/Insert_TL_ICStockTuiBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ //鍒锋柊椤甸潰
+ get_FastQuery();
}
else {
layer.alert(data.Message, { icon: 5 });
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\200\200\346\226\231\347\224\263\350\257\267\345\215\225/JIT_CallGoodsBackRequestBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\200\200\346\226\231\347\224\263\350\257\267\345\215\225/JIT_CallGoodsBackRequestBillList.html"
index 08dd80b..91f583b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\200\200\346\226\231\347\224\263\350\257\267\345\215\225/JIT_CallGoodsBackRequestBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\200\200\346\226\231\347\224\263\350\257\267\345\215\225/JIT_CallGoodsBackRequestBillList.html"
@@ -192,7 +192,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 570
+ , height: 'full-90'
, page: true
, cellMinWidth: 90
, limit: 50
@@ -203,7 +203,21 @@
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+ , { field: '璋冨嚭缁勭粐', title: '璋冨嚭缁勭粐', width: 160 }
+ , { field: '璋冨叆缁勭粐', title: '璋冨叆缁勭粐', width: 160 }
+ , { field: '閫�鏂欐ā寮�', title: '閫�鏂欐ā寮�', width: 160 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 160 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
+ , { field: '閫�鍥炴暟閲�', title: '閫�鍥炴暟閲�', width: 160 }
+ , { field: '閫�鏂欏師鍥�', title: '閫�鏂欏師鍥�', width: 160 }
+ , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 160 }
+ , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 160 }
+ , { field: '璋冨叆浠撲綅', title: '璋冨叆浠撲綅', width: 160 }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 170 }
+ , { field: '璐ｄ换閮ㄩ棬浠ｇ爜', title: '璐ｄ换閮ㄩ棬浠ｇ爜', width: 160 }
+ , { field: '璐ｄ换閮ㄩ棬鍚嶇О', title: '璐ｄ换閮ㄩ棬鍚嶇О', width: 160 }
, { field: '閫�鍥炰汉', title: '閫�鍥炰汉', width: 170 }
, { field: '閫�鍥炴棩鏈�', title: '閫�鍥炴棩鏈�', width: 200, templet: "<div>{{d.閫�鍥炴棩鏈� ==null ?'':layui.util.toDateString(d.閫�鍥炴棩鏈�, 'yyyy-MM-dd')}}</div>" }
, { field: '閫�鍥炲師鍥�', title: '閫�鍥炲師鍥�', width: 170 }
@@ -221,21 +235,8 @@
, { field: '閫�鏂欎汉', title: '閫�鏂欎汉', width: 160 }
, { field: '鎼繍浜�', title: '鎼繍浜�', width: 160 }
, { field: '楠屾敹浜�', title: '楠屾敹浜�', width: 160 }
- , { field: '璋冨嚭缁勭粐', title: '璋冨嚭缁勭粐', width: 160 }
- , { field: '璋冨叆缁勭粐', title: '璋冨叆缁勭粐', width: 160 }
- , { field: '閫�鏂欐ā寮�', title: '閫�鏂欐ā寮�', width: 160 }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 160 }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
- , { field: '閫�鍥炴暟閲�', title: '閫�鍥炴暟閲�', width: 160 }
- , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 160 }
- , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 160 }
- , { field: '璋冨叆浠撲綅', title: '璋冨叆浠撲綅', width: 160 }
, { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 160 }
, { field: '璋冨嚭浠撲綅', title: '璋冨嚭浠撲綅', width: 160 }
- , { field: '璐ｄ换閮ㄩ棬浠ｇ爜', title: '璐ｄ换閮ㄩ棬浠ｇ爜', width: 160 }
- , { field: '璐ｄ换閮ㄩ棬鍚嶇О', title: '璐ｄ换閮ㄩ棬鍚嶇О', width: 160 }
]]
};
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
index 8de023b..8b8c88e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
@@ -207,6 +207,16 @@
/* { field: 'hmainid', title: 'hmainid', width: 110 }*/
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 170 }
+ , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 170 }
+ , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 170 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 170 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 170 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 170 }
+ , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 170 }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 170 }
+ , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 170 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 170 }
, { field: '閫�鍥炰汉', title: '閫�鍥炰汉', width: 170 }
@@ -235,16 +245,6 @@
, { field: '淇濈浜�', title: '淇濈浜�', width: 170 }
, { field: '鍙枡妯″紡', title: '鍙枡妯″紡', width: 170 }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 170 }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 170 }
- , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 170 }
- , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 170 }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 170 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 170 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
- , { field: '鏁伴噺', title: '鏁伴噺', width: 170 }
- , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 170 }
- , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 170 }
- , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 170 }
, { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О', width: 170 }
, { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', width: 170 }
]]
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/JIT_BackGoods.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/JIT_BackGoods.html"
new file mode 100644
index 0000000..9b7947a
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/JIT_BackGoods.html"
@@ -0,0 +1,385 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>閫�鏂欑‘璁ゅ垪琛�</title>
+ <link href="../../../../layuiadmin/layui/css/layui.css" rel="stylesheet" />
+ <link href="../../../../layuiadmin/style/admin.css" rel="stylesheet" />
+ <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../../layuiadmin/PubCustom.js"></script>
+ <style>
+ .layui-row .layui-btn layui-btn-normal {
+ margin: 0px 10px;
+ }
+
+ .layui-inline {
+ margin: 0px 80px;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Edit" id="Edit">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="PZQR" id="PZQR">鍝佽川纭</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="CKJS" id="CKJS">浠撳簱鎺ユ敹</button>
+ <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Xc" id="Xc">涓嬫煡</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Ylan" id="Ylan">棰勮</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Dyin" id="Dyin">鎵撳嵃</button>-->
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row" style="text-align:center;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 80px;font-size:25px;">閫�鏂欏崟</label>
+ </div>
+ </div>
+ <!--<div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 80px;">鎷ｆ枡閰嶉�佸崟鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark" style="display: inline-block;">
+ </div>
+ <label class="layui-form-label"></label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HInterID" lay-verify="HInterID" id="HInterID" style="display: inline-block;">
+ </div>
+ </div>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Ppkc" id="Ppkc">鍖归厤搴撳瓨</button>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Ckfl" id="Ckfl">浠撳簱鍙戞枡</button>
+ </div>-->
+ <div class="layui-tab" lay-filter="">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+
+ layui.config({
+ base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ //鏌ヨ鏉′欢
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) != "undefined") {
+ var Type = params[params[0]];
+ var HInterID = params[params[2]];
+ var HSourceBillType = params[params[4]];
+ }
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //杩囨护鏌ヨ
+ form.on('submit(Cx)', function () {
+ get_FastQuery();
+ })
+
+ //鍝佽川纭
+ form.on('submit(PZQR)', function () {
+ get_PZQR();
+ })
+
+ //浠撳簱鎺ユ敹
+ form.on('submit(CKJS)', function () {
+ get_CKJS();
+ })
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ })
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill()
+ {
+ set_InitGrid();
+ get_Display();
+
+ //set_InitGrid1();
+ //get_Display1(sWhere);
+ }
+
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , height: 500
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ //{ type: 'checkbox', fixed: 'left' }
+ { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�',width: 150 }
+ , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 170}
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 170, width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��', width: 260, }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 160 }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 160 }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 160 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 160, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '婧愬崟ID', title: '婧愬崟ID', width: 160 }
+ , { field: '婧愬崟瀛怚D', title: '婧愬崟瀛怚D', width: 160, edit: false }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 160}
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 160 }
+ , { field: '璋冨叆浠撲綅', title: '璋冨叆浠撲綅', width: 160, edit: Type == 1 ? true : false, event: 'HSPID' } //c
+ , { field: 'HSPID', title: 'HSPID', width: 160, hide: true } //c
+ , { field: '鍝佽川鍒ゅ畾', title: '鍝佽川鍒ゅ畾', width: 160 }
+ , { field: '璐ｄ换渚涘簲鍟�', title: '璐ｄ换渚涘簲鍟�', width: 160, edit: Type == 2 ? (HSourceBillType == 666601 ? true : false) : false, event: 'HSupID' }//p 涓嶈壇鍝�
+ , { field: 'HSupID', title: 'HSupID', width: 160, hide: true }//p
+ , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 160, edit: Type == 2 ? true : false, event: 'HWHID' }//p
+ , { field: 'HWHID', title: 'HWHID', width: 160, hide: true}//p
+ , { field: '閫�鏂欏師鍥�', title: '閫�鏂欏師鍥�', width: 160, edit: Type == 2 ? true : false}//p
+ , { field: 'HSupID', title: 'HSupID', width: 160, hide: true }
+ , { field: '璐ｄ换閮ㄩ棬', title: '璐ｄ换閮ㄩ棬', width: 160}
+ , { field: '鐗╂枡鍐呯爜', title: '鐗╂枡鍐呯爜', width: 160}
+ , { field: '閫�鍥炴暟閲�', title: '閫�鍥炴暟閲�', width: 160, edit: Type == 2 ? true : false}//p
+ , { field: '宸ュ簭', title: '宸ュ簭', width: 160}
+ , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 160}
+ , { field: '璋冨嚭浠撲綅', title: '璋冨嚭浠撲綅', width: 160}
+ , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 160}
+ ]]
+ };
+ }
+
+ //鏌ヨ鍔犺浇鏁版嵁
+ function get_Display() {
+
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_CallGoodsBackRequestBill/JIT_BackGoodsList',
+ type: "GET",
+ data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },//
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鍝佽川纭
+ function get_PZQR() {
+ var sWhere = JSON.stringify(table.cache['mainTable']);
+
+ $.ajax({
+ url: GetWEBURL() + '/Sc_CallGoodsBackRequestBill/JIT_BackGoodsList_PZQR',
+ type: "POST",
+ data: { "msg": sWhere },//
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.alert(data1.Message, { icon: 1 });
+ } else {
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //浠撳簱鎺ユ敹
+ function get_CKJS() {
+ layer.confirm("纭畾瑕佹帴鏀剁敓鎴愯皟鎷ㄥ崟?", {
+ btn:['纭畾', '鍙栨秷']
+ , btn1: function (index) {
+ sWhere = JSON.stringify(table.cache['mainTable']);
+ $.ajax({
+ url: GetWEBURL() + '/Sc_CallGoodsBackRequestBill/JIT_BackGoodsList_CKJS',
+ type: "POST",
+ data: { "msg": sWhere },//
+ dataType: "json",
+ success: function (data1) {
+ layer.close(index);
+ if (data1.count == 1) {
+ layer.alert(data1.Message, { icon: 1 });
+ } else {
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ })
+ }
+
+ //琛屽唴蹇嵎閿�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //浠撲綅
+ if (obj.event == "HSPID") {
+ //鎵撳紑缁翠慨椤圭洰灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "浠撲綅鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../../Baseset/鍩虹璧勬枡/Gy_StockPlaceList.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].浠撲綅鍚嶇О
+ , "HSPID": checkStatus.data[0].HItemID
+ })
+ console.log(checkStatus.data[0].HItemID)
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //渚涘簲鍟�
+ if (obj.event == "HSupID") {
+ //鎵撳紑缁翠慨椤圭洰灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "渚涘簲鍟嗗垪琛�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.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].渚涘簲鍟嗗悕绉�
+ , "HSupID": checkStatus.data[0].HItemID
+ })
+ console.log(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
+ })
+ console.log(checkStatus.data[0].HItemID)
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ }
+ })
+ }
+
+ //鑾峰彇浼犻�掓暟鎹�
+ function get_UrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+
+ //#endregion
+
+ });
+
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/Jl_CallGoodsBillBackMain.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/Jl_CallGoodsBillBackMain.html"
index 94e6b61..4085cf3 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/Jl_CallGoodsBillBackMain.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/Jl_CallGoodsBillBackMain.html"
@@ -166,6 +166,12 @@
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
break;
+ //鍝佽川纭
+ case 'set_PZQRBill': set_PZQRBill();
+ break;
+ //浠撳簱鎺ユ敹
+ case 'set_CKJSBill': set_CKJSBill();
+ break;
};
});
@@ -173,6 +179,7 @@
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
+ console.log($("#HPZStatus").val());
get_FastQuery();
});
//#endregion
@@ -216,7 +223,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 570
+ , height: 'full-90'
, page: true
, cellMinWidth: 90
, limit: 50
@@ -224,42 +231,20 @@
, cols: [[
{ type: 'checkbox', fixed: 'left' }
/* { field: 'hmainid', title: 'hmainid', width: 110 }*/
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 170 }
- , { field: '閫�鍥炰汉', title: '閫�鍥炰汉', width: 170 }
- , { field: '閫�鍥炴棩鏈�', title: '閫�鍥炴棩鏈�', width: 200, templet: "<div>{{d.閫�鍥炴棩鏈� ==null ?'':layui.util.toDateString(d.閫�鍥炴棩鏈�, 'yyyy-MM-dd')}}</div>" }
- , { field: '閫�鍥炲師鍥�', title: '閫�鍥炲師鍥�', width: 170 }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '淇敼浜�', title: '淇敼浜�' }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 170 }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 170 }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鎶ュ簾鍗曞彿', title: '鎶ュ簾鍗曞彿', sort: true, width: 165 }
+ , { field: '閫�鏂欐棩鏈�', title: '閫�鏂欐棩鏈�', width: 200, templet: "<div>{{d.閫�鏂欐棩鏈� ==null ?'':layui.util.toDateString(d.閫�鏂欐棩鏈�, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 170 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 170 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 170 }
+ , { field: '閫�鏂欐暟閲�', title: '閫�鏂欐暟閲�', width: 170 }
+ , { field: '宸ユ', title: '宸ユ', width: 160 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 160 }
+ , { field: '鎶ュ簾鍘熷洜', title: '鎶ュ簾鍘熷洜', width: 160 }
+ , { field: '鍝佽川纭', title: '鍝佽川纭', width: 160 }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 160 }
+ , { field: '閫�鏂欏師鍥�', title: '閫�鏂欏師鍥�', width: 160 }
, { field: '閫�鏂欎汉', title: '閫�鏂欎汉', width: 160 }
- , { field: '鎼繍浜�', title: '鎼繍浜�', width: 160 }
- , { field: '楠屾敹浜�', title: '楠屾敹浜�', width: 160 }
- , { field: '璋冨嚭缁勭粐', title: '璋冨嚭缁勭粐', width: 160 }
- , { field: '璋冨叆缁勭粐', title: '璋冨叆缁勭粐', width: 160 }
- , { field: '閫�鏂欐ā寮�', title: '閫�鏂欐ā寮�', width: 160 }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 160 }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
- , { field: '閫�鍥炴暟閲�', title: '閫�鍥炴暟閲�', width: 160 }
- , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 160 }
- , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 160 }
- , { field: '璋冨叆浠撲綅', title: '璋冨叆浠撲綅', width: 160 }
- , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 160 }
- , { field: '璋冨嚭浠撲綅', title: '璋冨嚭浠撲綅', width: 160 }
- , { field: '璐ｄ换閮ㄩ棬浠ｇ爜', title: '璐ｄ换閮ㄩ棬浠ｇ爜', width: 160 }
- , { field: '璐ｄ换閮ㄩ棬鍚嶇О', title: '璐ｄ换閮ㄩ棬鍚嶇О', width: 160 }
]]
};
}
@@ -416,6 +401,51 @@
}
//#endregion
+ //鍝佽川纭
+ function set_PZQRBill() {
+ var CheckStatus = table.checkStatus("mainTable");
+
+ if (CheckStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ else {
+ var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+ var HSourceBillType = CheckStatus.data[0].HSourceBillType; //鑾峰彇瀛愯〃搴忓彿
+
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '閫�鏂欑‘璁�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , maxmin: true
+ , content: '../../鍙枡绠＄悊/鍙枡閫�鏂欏崟/JIT_BackGoods.html?Type=2&&HInterID=' + HInterID + '&&HSourceBillType=' + HSourceBillType
+ })
+ }
+ }
+
+ //浠撳簱鎺ユ敹
+ function set_CKJSBill() {
+ var CheckStatus = table.checkStatus("mainTable");
+
+ if (CheckStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ else {
+ var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '閫�鏂欑‘璁�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , maxmin: true
+ , content: '../../鍙枡绠＄悊/鍙枡閫�鏂欏崟/JIT_BackGoods.html?Type=1&&HInterID=' + HInterID
+ })
+ }
+ }
+
//鍒犻櫎
function set_DeleteBill() {
var CheckStatus = table.checkStatus("mainTable");
@@ -427,7 +457,7 @@
btn: ['纭畾', '鍙栨秷'] //鎸夐挳
, btn1: function () {
var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
- var HEntryID = CheckStatus.data[0].hsubid; //鑾峰彇绗嚑鏉″瓙鏁版嵁
+ var HEntryID = CheckStatus.data[0].Hsubid; //鑾峰彇绗嚑鏉″瓙鏁版嵁
$.ajax({
url: GetWEBURL() + '/Cj_CallGoodsBillBack/DelCallGoodsBill'
--
Gitblit v1.9.1