From cf2ddcda51dc06268eadd577dec3fa43764c161b Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 06 五月 2022 10:57:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlaBillnList.html | 46 -
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 33
WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillList.html | 58 -
WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillEdit.html | 969 +++++++++++++++++++++++++++
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillEdit.html | 126 ++-
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html | 486 ++++++++++---
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html | 4
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 2
WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html | 56 +
WebTM/views/index.html | 8
WebTM/views/生产管理/即时库存/JIT_InventoryList.html | 231 ++++++
WebTM/views/基础资料/公用基础资料/Gy_Currency.html | 36
WebTM/WebTM.csproj | 2
13 files changed, 1,759 insertions(+), 298 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 8371784..6902516 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -797,6 +797,7 @@
<Content Include="views\鐢熶骇绠＄悊\浜ч噺姹囨姤鍗昞Sc_Add_ProductReportBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\浜ч噺姹囨姤鍗昞Sc_ProductReportBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\浜ч噺姹囨姤鍗昞Sc_ProductReportBillList_Web.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鍗虫椂搴撳瓨\JIT_InventoryList.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞EXecptFeedMessage.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_Add_MESExecptFeedBackBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillList.html" />
@@ -859,6 +860,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇閫�搴撳崟\Sc_ProductionReturnList.html" />
<Content Include="views\鐢熶骇绠＄悊\缁勬墭鍗曠紪杈慭Sc_GroupOrderBillEdit_Fast.html" />
<Content Include="views\鐢熶骇绠＄悊\缁勮鍗昞Sc_GroupOrderBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\瑕佹枡璁″垝\JIT_NeedMaterPlanBillEdit.html" />
<Content Include="views\鐢熶骇绠＄悊\瑕佹枡璁″垝\JIT_NeedMaterPlanBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBill.html" />
<Content Include="views\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillList.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index e1a3106..3b4c284 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -371,7 +371,7 @@
<a>瑕佹枡璁″垝</a>
<dl class="layui-nav-child">
<dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html">瑕佹枡璁″垝鍗曞垪琛�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_LiftMaterPlanBillEdit.html">瑕佹枡璁″垝鍗�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html">瑕佹枡璁″垝鍗�</a></dd>
</dl>
</dd>
<dd>
@@ -389,6 +389,12 @@
<dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html">瑕佹枡璁″垝淇℃伅鍒楄〃</a></dd>
</dl>
</dd>
+ <dd>
+ <a>鍗虫椂搴撳瓨</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鍗虫椂搴撳瓨/JIT_InventoryList.html">鍗虫椂搴撳瓨鍒楄〃</a></dd>
+ </dl>
+ </dd>
</dl>
</dd>
</dl>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
index 95127ad..81eecec 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
@@ -128,24 +128,24 @@
//#endregion
//#region 鍒濆鍖栬〃鏍�
- $.ajax({
- url: GetWEBURL() + '/Gy_Currency/LoadTree',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (result) {
- var data = result.data;
- //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
- var treeData = LoadTree(data);
- tree.render({
- elem: '#treeCurrency',
- data: treeData,
- id: 'treeId',
- disabled: 'disabled',
- showCheckbox: false, //鏄惁鏄剧ず澶嶉�夋
- showLine: false
- });
- }
- });
+ //$.ajax({
+ // url: GetWEBURL() + '/Gy_Currency/LoadTree',
+ // type: "GET",
+ // data: { "sWhere": sWhere },
+ // success: function (result) {
+ // var data = result.data;
+ // //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
+ // var treeData = LoadTree(data);
+ // tree.render({
+ // elem: '#treeCurrency',
+ // data: treeData,
+ // id: 'treeId',
+ // disabled: 'disabled',
+ // showCheckbox: false, //鏄惁鏄剧ず澶嶉�夋
+ // showLine: false
+ // });
+ // }
+ //});
var option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\215\263\346\227\266\345\272\223\345\255\230/JIT_InventoryList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\215\263\346\227\266\345\272\223\345\255\230/JIT_InventoryList.html"
new file mode 100644
index 0000000..de380f8
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\215\263\346\227\266\345\272\223\345\255\230/JIT_InventoryList.html"
@@ -0,0 +1,231 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鍗虫椂搴撳瓨鍒楄〃</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="FMaterialNumber" id="FMaterialNumber">
+ </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="FMaterialName" id="FMaterialName">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠撳簱缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="FStockNumber" id="FStockNumber">
+ </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="FStockName" id="FStockName">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+ var treeCkData = { id: 0 };
+ var TagId = "";
+ var TagParentId = "";
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , tree = layui.tree
+ , util = layui.util
+ var sWhere = "";
+ var option = [];
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+ //缂栬緫
+ case 'set_ShowBill': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ };
+ });
+ //#region 鐢熶骇杞﹂棿
+ form.on('submit(btnHWorkShopID)', function (data) {
+ btnHWorkShopID();
+ });
+ //#endregion
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+ //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: '鐗╂枡ID', title: '鐗╂枡ID', hide: true }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜' }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+ , { field: '鐗╂枡瑙勬牸鍨嬪彿', title: '鐗╂枡瑙勬牸鍨嬪彿' }
+ , { field: '浠撳簱ID', title: '浠撳簱ID', hide: true }
+ , { field: '浠撳簱缂栫爜', title: '浠撳簱缂栫爜' }
+ , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О' }
+ , { field: '搴撳瓨涓诲崟浣岻D', title: '搴撳瓨涓诲崟浣岻D', hide: true }
+ , { field: '鍗曚綅缂栫爜', title: '鍗曚綅缂栫爜' }
+ , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О' }
+ , { field: '鎵瑰彿', title: '鎵瑰彿' }
+ , { field: '鍙敤搴撳瓨閲�', title: '鍙敤搴撳瓨閲�' }
+ , { field: '缁勭粐缂栫爜', title: '缁勭粐缂栫爜' }
+ , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О' }
+ , { field: '璐т富绫诲瀷', title: '璐т富绫诲瀷' }
+ , { field: '璐т富ID', title: '璐т富ID' }
+ , { field: '璐т富缂栫爜', title: '璐т富缂栫爜' }
+ ]]
+ };
+ }
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/JIT_Complete/JIT_InventoryList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (result) {
+ if (result.count == 1) {
+ option.data = result.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+
+ var FMaterialNumber = $("#FMaterialNumber").val();
+ var FMaterialName = $("#FMaterialName").val();
+ var FStockNumber = $("#FStockNumber").val();
+ var FStockName = $("#FStockName").val();
+
+ if (FMaterialNumber) {
+ sWhere += " and 鐗╂枡缂栫爜 like '%" + FMaterialNumber + "%'";
+ }
+ if (FMaterialName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + FMaterialName + "%'";
+ }
+ if (FStockNumber) {
+ sWhere += " and 浠撳簱缂栫爜 like '%" + FStockNumber + "%'";
+ }
+ if (FStockName) {
+ sWhere += " and 浠撳簱鍚嶇О like '%" + FStockName + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#FMaterialNumber").val("");
+ $("#FMaterialName").val("");
+ $("#FStockNumber").val("");
+ $("#FStockName").val("");
+ sWhere = "";
+ }
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
index 03b27a2..fbdf895 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
@@ -61,7 +61,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
</div>
</script>
</form>
@@ -118,7 +118,7 @@
case 'set_DeleteBill': set_DeleteBill();
break;
//鍏抽棴
- case 'set_DeleteBill': set_CloseBill();
+ case 'set_CloseBill': set_CloseBill();
break;
};
});
@@ -171,7 +171,7 @@
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', hide: true }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
- , { field: '鏃ユ湡', title: '鏃ユ湡' }
+ , { field: '鏃ユ湡', title: '鎻愭枡鏃ユ湡' }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
, { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
@@ -188,40 +188,16 @@
, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
, { field: '浣滃簾浜�', title: '浣滃簾浜�' }
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
- //, { field: '涓绘簮鍗曠被鍨�', title: '涓绘簮鍗曠被鍨�' }
- //, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
- //, { field: '婧愬崟鍙�', title: '婧愬崟鍙�' }
- //, { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
- , { field: '濮斿缁勭粐', title: '濮斿缁勭粐' }
- , { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣' }
- , { field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟嗗悕绉�' }
- , { field: '涓昏〃閲囪喘缁勭粐', title: '涓昏〃閲囪喘缁勭粐' }
- , { field: '缁撶畻甯佸埆', title: '缁撶畻甯佸埆' }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+ , { field: '涓昏〃閲囪喘缁勭粐', title: '閲囪喘缁勭粐' }
+ , { field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟�' }
+ , { field: '婧愬崟鍗曞彿', title: '鐢熶骇璁㈠崟鍙�' }
, { field: '鏁伴噺', title: '鏁伴噺' }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
, { field: '宸ュ崟鐢熶骇鏃ユ湡', title: '宸ュ崟鐢熶骇鏃ユ湡' }
- //, { field: '鎻愬墠鏈�', title: '鎻愬墠鏈�' }
- //, { field: '寤惰繜鍘熷洜', title: '寤惰繜鍘熷洜' }
- //, { field: '鐗╂枡灞炴��', title: '鐗╂枡灞炴��' }
- //, { field: '閫佽揣鍗曟暟閲�', title: '閫佽揣鍗曟暟閲�' }
- //, { field: '閲囪喘璁㈠崟琛屽彿', title: '閲囪喘璁㈠崟琛屽彿' }
- //, { field: '鏀舵枡鏁伴噺', title: '鏀舵枡鏁伴噺' }
- //, { field: '鍏抽棴鐘舵��', title: '鍏抽棴鐘舵��' }
- //, { field: '杞Щ鏁伴噺', title: '杞Щ鏁伴噺' }
- //, { field: '閲囪喘鍛�', title: '閲囪喘鍛�' }
- //, { field: '鏈敹鏂欐暟閲�', title: '鏈敹鏂欐暟閲�' }
- //, { field: '閲囪喘璁㈠崟鍗曟嵁鏃ユ湡', title: '閲囪喘璁㈠崟鍗曟嵁鏃ユ湡' }
- //, { field: '閲囪喘璁㈠崟浜よ揣鏃ユ湡', title: '閲囪喘璁㈠崟浜よ揣鏃ユ湡' }
- //, { field: '閲囪喘璁㈠崟鎽樿', title: '閲囪喘璁㈠崟鎽樿' }
- //, { field: '閲囪喘璁㈠崟琛ㄤ綋澶囨敞', title: '閲囪喘璁㈠崟琛ㄤ綋澶囨敞' }
- //, { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿' }
- //, { field: '鏃ヨ鍒掑伐鍗曠紪鍙�', title: '鏃ヨ鍒掑伐鍗曠紪鍙�' }
- //, { field: '杞﹂棿鍚嶇О', title: '杞﹂棿鍚嶇О' }
- //, { field: '閲囪喘閮ㄩ棬', title: '閲囪喘閮ㄩ棬' }
+ , { field: '寤惰繜鍘熷洜', title: '寤惰繜鍘熷洜' }
]]
};
}
@@ -230,7 +206,7 @@
//鑾峰彇缁勭粐
function Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
- var Organization = '';
+ var Organization = '<option style="color:blue;" value="">缁勭粐</option>';
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetOrganizations",
@@ -252,7 +228,7 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Cg_PODemandPlanBill/Cg_PODemandPlanBillList',
+ url: GetWEBURL() + '/JIT_Cg_PODemandPlanBill/JIT_Cg_PODemandPlanBillList',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (result) {
@@ -344,7 +320,7 @@
var HEntryID = CheckStatus.data[0].hsubid; //鑾峰彇绗嚑鏉″瓙鏁版嵁
$.ajax({
- url: GetWEBURL() + '/Cg_PODemandPlanBill/DelPODemandPlanBillList'
+ url: GetWEBURL() + '/JIT_Cg_PODemandPlanBill/DelPODemandPlanBillList'
, type: "GET"
, data: { "HInterID": HInterID, "HEntryID": HEntryID, "User": sessionStorage["HUserName"] }
, success: function (result) {
@@ -382,7 +358,7 @@
var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
$.ajax({
- url: GetWEBURL() + '/Cg_PODemandPlanBill/DelPODemandPlanBillList'
+ url: GetWEBURL() + '/JIT_Cg_PODemandPlanBill/ClosePODemandPlanBillList'
, type: "GET"
, data: { "HInterID": HInterID, "User": sessionStorage["HUserName"] }
, success: function (result) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
index 04d5552..ea6df00 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
@@ -71,19 +71,17 @@
</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="hidden" class="layui-input" lay-verify="HSubORGID" name="HSubORGID" id="HSubORGID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HSubORGIDName" name="HSubORGIDName" id="HSubORGIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSubORGID" id="btnHSubORGID" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ <label class="layui-form-label" style="width: 85px;">濮斿缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HSubORGID" id="HSubORGID" lay-verify="HSubORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">浜よ揣鍦扮偣</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HAddress " name="HAddress " id="HAddress ">
+ <input type="text" class="layui-input" lay-verify="HAddress" name="HAddress" id="HAddress">
</div>
</div>
</div>
@@ -121,7 +119,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鎻愭枡鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 48px;">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 75px;">
</div>
</div>
<div class="layui-inline">
@@ -202,6 +200,26 @@
</select>
</script>
+ <!--琛屼笅鎷夐�夋嫨(閲囪喘缁勭粐)-->
+ <script type="text/html" id="HPURCHASEORGIDSub">
+ <select name="HPURCHASEORGIDSub" lay-filter="HPURCHASEORGIDSub" id="HPURCHASEORGIDSub{{d.LAY_TABLE_INDEX+1}}">
+ <option value=""></option>
+ <option value="1">钃濇捣瀹炰笟闆嗗洟</option>
+ <option value="100035">钃濇捣閫氳鍏徃</option>
+ <option value="100037">閫氳鍏徃鏈儴</option>
+ <option value="100038">鎵嬫満浜嬩笟閮�</option>
+ <option value="100039">骞虫澘浜嬩笟閮�</option>
+ <option value="100040">钃濇捣鐢靛瓙鍏徃</option>
+ <option value="100041">钃濇捣閿�鍞叕鍙�</option>
+ <option value="100042">棣欐腐閿�鍞叕鍙�</option>
+ <option value="100043">钃濇捣鐢靛瓙鍟嗗姟鏈夐檺鍏徃</option>
+ <option value="100044">钃濇捣闆跺敭杩為攣鍏徃</option>
+ <option value="100045">骞垮窞闂ㄥ簵</option>
+ <option value="100046">娣卞湷闂ㄥ簵</option>
+ <option value="100047">鏉窞鍗庡畯閫氫俊璁惧鏈夐檺鍏徃</option>
+ </select>
+ </script>
+
<!--澶嶉�夋 鍏抽棴鐘舵��-->
<script type="text/html" id="HCloseStatus">
<div class="layui-input-block" style="margin-left: 20px;">
@@ -209,10 +227,10 @@
</div>
</script>
- <!--鏃堕棿 宸ュ崟鐢熶骇鏃ユ湡-->
- <script type="text/html" id="HDayPlanDate">
- <div class="layui-input-block" style="margin-left: 0px;margin-top:-6px;width:100%">
- <input type="date" name="HDayPlanDate" lay-filter="HDayPlanDate" id="HDayPlanDate{{d.LAY_TABLE_INDEX+1}}" class="layui-input">
+ <!--澶嶉�夋 鏄惁鎵嬪伐鍏抽棴-->
+ <script type="text/html" id="HCloseTypeSub">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HCloseTypeSub" lay-filter="HCloseTypeSub" id="HCloseTypeSub{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
</div>
</script>
@@ -231,13 +249,19 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
+ , laydate = layui.laydate
, element = layui.element;
//鍒濆琛ㄦ牸鏁版嵁
var rowdata = [{
- "HSupplierID": "", "HSupplierNumber": "", "HSupplierName": "", "HMaterID": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
- , "HJITMaterGroup": "", "HJITSafeStock": "", "HJITMaterDemand": "", "HJITBatchQty": "", "HDeliveryPeriod": ""
- , "HLeadTime": "", "HLeadTime_Sec": "", "HDeliveryMode": "", "HDeliveryDaysCtrl": "", "HRemark": ""
+ "HLaterReason": "", "HMaterID": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": "", "HUnitIDName": ""
+ , "HErpClsID": "", "HQty": "", "HRemark": "", "HPURCHASEORGID": "", "HStatus": "", "HFixleadTime": ""
+ , "HDayPlanBillNo": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HSourceBillType": "", "HWorkShopID": ""
+ , "HWorkShopIDName": "", "HDayPlanDate": "", "HRelationQty1": "", "HPOOrderInterID": "", "HPOOrderEntryID": "", "HPOOrderBillNo": ""
+ , "HPOOrderBillSEQ": "", "HWWOrderInterID": "", "HWWOrderEntryID": "", "HWWOrderBillNo": "", "HPurchaseDeptID": ""
+ , "HPurchaseDeptIDName": "", "HCloseTypeSub": false, "HCloseMan": "", "HEntryCloseDate": "", "HSendQty": "", "HReciveQty": ""
+ , "HCloseStatus": false, "HRemoveQty": "", "HSeOrderBillNo": "", "HUnReciveQty": "", "HPOOrderBillDate": "", "HPOOrderBillDeliveryDate": ""
+ , "HPOOrderBillRemark": "", "HPOOrderBillNote": ""
}];
//#endregion
@@ -250,11 +274,11 @@
$("#HMaker").val(sessionStorage["HUserName"]);
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- //if (sessionStorage.login != "login") {
- // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- // }, function () { window.location.href = "../../user/login.html"; });
- //}
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
@@ -295,44 +319,47 @@
, { field: 'HLaterReason', title: '寤惰繜鍘熷洜', templet: '#HLaterReason', width: 200 }//list
, { field: 'HMaterID', title: 'HMaterID', hide: true }
, { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', edit: 'text', event: "HMaterID" }
- , { field: 'HSupplierName', title: '鐗╂枡鍚嶇О' }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О' }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
, { field: 'HUnitID', title: 'HUnitID', hide: true }
, { field: 'HUnitIDName', title: '璁￠噺鍗曚綅', edit: 'text', event: "HUnitID" }
, { field: 'HErpClsID', title: '鐗╂枡灞炴��', templet: '#HErpClsID' }//list
, { field: 'HQty', title: '鏁伴噺', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
- , { field: 'HPURCHASEORGID', title: 'HPURCHASEORGID', hide: true }
- , { field: 'HPURCHASEORGIDName', title: '閲囪喘缁勭粐', edit: 'text', event: "HPURCHASEORGID" }
+ , { field: 'HPURCHASEORGID', title: '閲囪喘缁勭粐', templet: "#HPURCHASEORGIDSub" }
, { field: 'HStatus', title: '鐘舵��', templet: '#HStatus' }//list
, { field: 'HFixleadTime', title: '鎻愬墠鏈�', edit: 'text' }
, { field: 'HDayPlanBillNo', title: '鏃ヨ鍒掑伐鍗曠紪鍙�', edit: 'text' }
- //缂哄皯鏃ヨ鍒掑伐鍗昮id 瀛恑d 鐢熶骇璁㈠崟鍙� 婧愬崟绫诲瀷
+ , { field: 'HSourceInterID', title: '鏃ヨ鍒掑伐鍗旻ID', edit: 'text' }
+ , { field: 'HSourceEntryID', title: '鏃ヨ鍒掑伐鍗旻ENTRYID', width: 200, edit: 'text' }
+ , { field: 'HSourceBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', edit: 'text' }
, { field: 'HWorkShopID', title: 'HWorkShopID', hide: true }
- , { field: 'HWorkShopIDName', title: '鐢熶骇杞﹂棿', edit: 'text', event: "HPURCHASEORGID" }
- , { field: 'HDayPlanDate', title: '宸ュ崟鐢熶骇鏃ユ湡', width: 200, templet: '#HDayPlanDate' }//date
- , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }
- , { field: 'HRelationQty1 ', title: '鍙敤閲囪喘鏁伴噺', edit: 'text' }
+ , { field: 'HWorkShopIDName', title: '鐢熶骇杞﹂棿', edit: 'text', event: "HWorkShopID" }
+ , { field: 'HDayPlanDate', title: '宸ュ崟鐢熶骇鏃ユ湡', width: 200, event: 'HDayPlanDate' }//date
+ , { field: 'HRelationQty1', title: '鍙敤閲囪喘鏁伴噺', edit: 'text' }
, { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟鍐呯爜', edit: 'text' }
- , { field: 'HPOOrderEntryID ', title: '閲囪喘璁㈠崟瀛愬唴鐮�', edit: 'text' }
- , { field: 'HPOOrderBillNo ', title: '閲囪喘璁㈠崟鍙�', edit: 'text' }
- , { field: 'HPOOrderBillSEQ ', title: '閲囪喘璁㈠崟琛屽彿', edit: 'text' }
- , { field: 'HWWOrderInterID ', title: '濮斿璁㈠崟鍐呯爜', edit: 'text' }
- , { field: 'HWWOrderEntryID ', title: '濮斿璁㈠崟瀛愬唴鐮�', edit: 'text' }
- , { field: 'HWWOrderBillNo ', title: '濮斿璁㈠崟', edit: 'text' }
- , { field: 'HPurchaseDeptID ', title: 'HPurchaseDeptID', hide: true }
- , { field: 'HPurchaseDeptIDName ', title: '閲囪喘閮ㄩ棬', edit: 'text', event: "HPurchaseDeptID" }
- //琛屽叧闂� 琛屽叧闂棩鏈� 鏄惁鎵嬪伐鍏抽棴
- , { field: 'HSendQty ', title: '閫佽揣鍗曟暟閲�', edit: 'text' }
+ , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', edit: 'text' }
+ , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', edit: 'text' }
+ , { field: 'HPOOrderBillSEQ', title: '閲囪喘璁㈠崟琛屽彿', edit: 'text' }
+ , { field: 'HWWOrderInterID', title: '濮斿璁㈠崟鍐呯爜', edit: 'text' }
+ , { field: 'HWWOrderEntryID', title: '濮斿璁㈠崟瀛愬唴鐮�', edit: 'text' }
+ , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟', edit: 'text' }
+ , { field: 'HPurchaseDeptID', title: 'HPurchaseDeptID', hide: true }
+ , { field: 'HPurchaseDeptIDName', title: '閲囪喘閮ㄩ棬', edit: 'text', event: "HPurchaseDeptID" }
+ , { field: 'HCloseTypeSub', title: '鏄惁鎵嬪伐鍏抽棴', templet: "#HCloseTypeSub" }//ck
+ , { field: 'HCloseMan', title: '琛屽叧闂�', width: 200, edit: 'text' }
+ , { field: 'HEntryCloseDate', title: '琛屽叧闂棩鏈�', width: 200, event: 'HEntryCloseDate' }//date
+ , { field: 'HSendQty', title: '閫佽揣鍗曟暟閲�', edit: 'text' }
, { field: 'HReciveQty', title: '鏀舵枡鏁伴噺', edit: 'text' }
, { field: 'HCloseStatus', title: '鍏抽棴鐘舵��', templet: "#HCloseStatus" }//ck
, { field: 'HRemoveQty', title: '杞Щ鏁伴噺', edit: 'text' }
, { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', edit: 'text' }
- , { field: 'HUnReciveQty ', title: '鏈敹鏂欐暟閲�', edit: 'text' }
- , { field: 'HPOOrderBillDate ', title: '閲囪喘璁㈠崟鍗曟嵁鏃ユ湡', edit: 'text', width: 150 }//date
- , { field: 'HPOOrderBillDeliveryDate ', title: '閲囪喘璁㈠崟浜よ揣鏃ユ湡', edit: 'text', width: 150 } // date
- , { field: 'HPOOrderBillRemark ', title: '閲囪喘璁㈠崟鎽樿', edit: 'text' }
- , { field: 'HPOOrderBillNote ', title: '閲囪喘璁㈠崟琛ㄤ綋澶囨敞', edit: 'text', width: 200 }
+ , { field: 'HUnReciveQty', title: '鏈敹鏂欐暟閲�', edit: 'text' }
+ , { field: 'HPOOrderBillDate', title: '閲囪喘璁㈠崟鍗曟嵁鏃ユ湡', event: "HPOOrderBillDate", width: 200 }//date
+ , { field: 'HPOOrderBillDeliveryDate', title: '閲囪喘璁㈠崟浜よ揣鏃ユ湡', event: "HPOOrderBillDeliveryDate", width: 200 } // date
+ , { field: 'HPOOrderBillRemark', title: '閲囪喘璁㈠崟鎽樿', edit: 'text' }
+ , { field: 'HPOOrderBillNote', title: '閲囪喘璁㈠崟琛ㄤ綋澶囨敞', edit: 'text', width: 200 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
}
@@ -344,11 +371,6 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
- //閫夋嫨濮斿缁勭粐鎸夐挳 鏆傛棤
- form.on('submit(btnHSubORGID)', function () {
- get_btnHSubORGID();
- });
//閫夋嫨渚涘簲鍟嗘寜閽�
form.on('submit(btnHSupplierID)', function () {
@@ -366,39 +388,24 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HSupplierID": "", "HSupplierNumber": "", "HSupplierName": "", "HMaterID": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
- , "HJITMaterGroup": "", "HJITSafeStock": "", "HJITMaterDemand": "", "HJITBatchQty": "", "HDeliveryPeriod": ""
- , "HLeadTime": "", "HLeadTime_Sec": "", "HDeliveryMode": "", "HDeliveryDaysCtrl": "", "HRemark": ""
+ "HLaterReason": "", "HMaterID": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": "", "HUnitIDName": ""
+ , "HErpClsID": "", "HQty": "", "HRemark": "", "HPURCHASEORGID": "", "HStatus": "", "HFixleadTime": ""
+ , "HDayPlanBillNo": "", "HSourceInterID": 0, "HSourceEntryID":0, "HSourceBillNo": "", "HSourceBillType": "", "HWorkShopID": ""
+ , "HWorkShopIDName": "", "HDayPlanDate": "", "HRelationQty1": "", "HPOOrderInterID": "", "HPOOrderEntryID": "", "HPOOrderBillNo": ""
+ , "HPOOrderBillSEQ": "", "HWWOrderInterID": "", "HWWOrderEntryID": "", "HWWOrderBillNo": "", "HPurchaseDeptID": ""
+ , "HPurchaseDeptIDName": "", "HCloseTypeSub": false, "HCloseMan": "", "HEntryCloseDate": "", "HSendQty": "", "HReciveQty": ""
+ , "HCloseStatus": false, "HRemoveQty": "", "HSeOrderBillNo": "", "HUnReciveQty": "", "HPOOrderBillDate": "", "HPOOrderBillDeliveryDate": ""
+ , "HPOOrderBillRemark": "", "HPOOrderBillNote": ""
};
switch (obj.event) {
case 'btn-AddLine':
-
+
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
-
- var date = [];
- for (var i = 1; i <= option.data.length; i++) {
- date.push($('input[name=HDayPlanDate]').eq(i - 1).val())
-
- //寤惰繜鍘熷洜
- $('#HLaterReason' + i + '').find("option[value='" + option.data[i - 1].HLaterReason + "']").attr("selected", true);
- //鐗╂枡灞炴��
- $('#HErpClsID' + i + '').find("option[value='" + option.data[i - 1].HErpClsID + "']").attr("selected", true);
- //鐘舵��
- $('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
-
- //鍏抽棴鐘舵��
- if (option.data[i - 1].HCloseStatus) {
- $('#HCloseStatus' + i + '').attr("checked", true);
- }
- }
- form.render('select');
- form.render('checkbox');
table.render(option);
- for (var i = 0; i < date.length; i++) {
- $('#HDayPlanDate' + i+1 + '').val(Format(date[i], "yyyy-MM-dd"))
- }
+ //琛屾暟鎹� 涓嬫媺妗� 澶嶉�夋 鏄剧ず
+ checkRefresh();
break;
case 'btn-CopyLine':
var copydata = JSON.stringify(data);
@@ -415,22 +422,8 @@
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
- for (var i = 1; i <= option.data.length; i++) {
-
- //寤惰繜鍘熷洜
- $('#HLaterReason' + i + '').find("option[value='" + option.data[i - 1].HLaterReason + "']").attr("selected", true);
- //鐗╂枡灞炴��
- $('#HErpClsID' + i + '').find("option[value='" + option.data[i - 1].HErpClsID + "']").attr("selected", true);
- //鐘舵��
- $('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
-
- //鍏抽棴鐘舵��
- if (option.data[i - 1].HCloseStatus) {
- $('#HCloseStatus' + i + '').attr("checked", true);
- }
- }
- form.render('select');
- form.render('checkbox');
+ //琛屾暟鎹� 涓嬫媺妗� 澶嶉�夋 鏄剧ず
+ checkRefresh();
}
break;
}
@@ -440,6 +433,79 @@
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+ //#region 鏃堕棿鎺т欢 缁戝畾
+
+ var data = obj.data;
+ //鏃ヨ鍒掔敓浜ф棩鏈�
+ if (obj.event == 'HDayPlanDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ checkRefresh();
+ }
+ });
+ }
+
+ //琛屽叧闂棩鏈�
+ if (obj.event == 'HEntryCloseDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ checkRefresh();
+ }
+ });
+ }
+
+ //閲囪喘璁㈠崟鍗曟嵁鏃ユ湡
+ if (obj.event == 'HPOOrderBillDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ checkRefresh();
+ }
+ });
+ }
+
+ //閲囪喘璁㈠崟浜よ揣鏃ユ湡
+ if (obj.event == 'HPOOrderBillDeliveryDate') {
+ 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
});
@@ -505,6 +571,19 @@
});
});
+ //琛岄�夋嫨澶勭悊锛堥噰璐粍缁囷級
+ form.on('select(HPURCHASEORGIDSub)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HPURCHASEORGID = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
//鍏抽棴鐘舵��
form.on('checkbox(HCloseStatus)', function (data) {
//鑾峰彇閫変腑鐨勫��
@@ -517,8 +596,18 @@
});
});
- //宸ュ崟鐢熶骇鏃ユ湡
-
+ //鏄惁鎵嬪伐鍏抽棴
+ form.on('checkbox(HCloseTypeSub)', function (data) {
+ //鑾峰彇閫変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HCloseTypeSub = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -526,7 +615,7 @@
//缁勭粐閫夋嫨椤甸潰
function get_Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
- var Organization = '';
+ var Organization = '<option style="color:blue;" value="0">缁勭粐</option>';
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetOrganizations",
@@ -537,6 +626,7 @@
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#HPURCHASEORGID").append(Organization);
+ $("#HSubORGID").append(Organization);
form.render('select');
}
layer.closeAll("loading");
@@ -554,6 +644,33 @@
vars[hash[0]] = hash[1];
}
return vars;
+ }
+
+ //澶氶�� 鍒锋柊琛ㄦ牸
+ function checkRefresh() {
+ for (var i = 1; i <= option.data.length; i++) {
+ console.log(JSON.stringify(option.data[i - 1]))
+ //寤惰繜鍘熷洜
+ $('#HLaterReason' + i + '').find("option[value='" + option.data[i - 1].HLaterReason + "']").attr("selected", true);
+ //鐗╂枡灞炴��
+ $('#HErpClsID' + i + '').find("option[value='" + option.data[i - 1].HErpClsID + "']").attr("selected", true);
+ //鐘舵��
+ $('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
+ //閲囪喘缁勭粐
+ $('#HPURCHASEORGIDSub' + i + '').find("option[value='" + option.data[i - 1].HPURCHASEORGID + "']").attr("selected", true);
+
+ //鍏抽棴鐘舵��
+ if (option.data[i - 1].HCloseStatus) {
+ $('#HCloseStatus' + i + '').attr("checked", true);
+ }
+
+ //鏄惁鎵嬪伐鍏抽棴
+ if (option.data[i - 1].HCloseTypeSub) {
+ $('#HCloseTypeSub' + i + '').attr("checked", true);
+ }
+ }
+ form.render('select');
+ form.render('checkbox');
}
//琛屽唴鍒犻櫎
@@ -626,7 +743,7 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
$("#HSettleCurrId").val(checkStatus.data[0].HItemID);
- $("#HSettleCurrIdName").val(checkStatus.data[0].甯佸埆);
+ $("#HSettleCurrIdName").val(checkStatus.data[0].璐у竵鍚嶇О);
layer.close(index);//鍏抽棴寮圭獥
}
})
@@ -636,37 +753,7 @@
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
- //渚涘簲鍟�
- if (obj.event == "HSupplierID") {
- //鎵撳紑渚涘簲鍟嗗皬绐椾綋
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "渚涘簲鍟嗗垪琛�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_SupplierList.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({
- "HSupplierID": checkStatus.data[0].HItemID
- , "HSupplierNumber": checkStatus.data[0].HNumber
- , "HSupplierName": checkStatus.data[0].HName
- })
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
//鐗╂枡
if (obj.event == "HMaterID") {
//鎵撳紑鐗╂枡 灏忕獥浣�
@@ -700,6 +787,99 @@
}
})
}
+
+ //璁￠噺鍗曚綅
+ 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({
+ "HUnitID": checkStatus.data[0].HItemID
+ , "HUnitIDName": checkStatus.data[0].HName
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鐢熶骇杞﹂棿
+ if (obj.event == "HWorkShopID") {
+ //鎵撳紑鐢熶骇杞﹂棿灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐢熶骇杞﹂棿鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.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({
+ "HWorkShopID": checkStatus.data[0].HItemID
+ , "HWorkShopIDName": checkStatus.data[0].HName
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //閲囪喘閮ㄩ棬
+ if (obj.event == "HPurchaseDeptID") {
+ //鎵撳紑閲囪喘閮ㄩ棬灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "閮ㄩ棬鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.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({
+ "HPurchaseDeptID": checkStatus.data[0].HItemID
+ , "HPurchaseDeptIDName": checkStatus.data[0].HName
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
return false;
}
@@ -711,7 +891,7 @@
{
var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
$.ajax({
- url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/PODemandPlanConfigBillList",
+ url: GetWEBURL() + "/JIT_Cg_PODemandPlanBill/JIT_Cg_PODemandPlanBillList",
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (d) {
@@ -720,17 +900,54 @@
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": d.data[0].鍗曟嵁鍙�
, "HInterID": d.data[0].hmainid
- , "HPRDORGID": d.data[0].缁勭粐
+ , "HSubORGID": d.data[0].濮斿缁勭粐
+ , "HAddress": d.data[0].浜よ揣鍦扮偣
+ , "HPURCHASEORGID": d.data[0].涓昏〃閲囪喘缁勭粐
+ , "HSupplierID": d.data[0].HSupplierID
+ , "HSupplierIDName": d.data[0].渚涘簲鍟嗗悕绉�
+ , "HSettleCurrId": d.data[0].HSettleCurrId
+ , "HSettleCurrIdName": d.data[0].缁撶畻甯佸埆
+ , "HDate": Format(new Date(d.data[0].鏃ユ湡),'yyyy-MM-dd')
+ , "HRemark": d.data[0].琛ㄥご澶囨敞
+ , "HExplanation": d.data[0].鎽樿
});
//瀛愯〃 璧嬪��
var rowdata = [{
- "HSupplierID": d.data[0].HSupplierID, "HSupplierNumber": d.data[0].渚涘簲鍟嗕唬鐮�, "HSupplierName": d.data[0].渚涘簲鍟嗗悕绉�, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О, "HMaterModel": d.data[0].瑙勬牸鍨嬪彿
- , "HJITMaterGroup": d.data[0].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[0].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[0].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[0].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[0].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
- , "HLeadTime": d.data[0].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[0].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[0].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[0].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[0].琛ㄤ綋澶囨敞
+ "HLaterReason": d.data[0].寤惰繜鍘熷洜, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О
+ , "HMaterModel": d.data[0].瑙勬牸鍨嬪彿, "HUnitID": d.data[0].HUnitID, "HUnitIDName": d.data[0].璁￠噺鍗曚綅
+ , "HErpClsID": d.data[0].鐗╂枡灞炴��, "HQty": d.data[0].鏁伴噺, "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HPURCHASEORGID": d.data[0].瀛愯〃閲囪喘缁勭粐
+ , "HStatus": d.data[0].鐘舵��, "HFixleadTime": d.data[0].鎻愬墠鏈�
+ , "HDayPlanBillNo": d.data[0].鏃ヨ鍒掑伐鍗曠紪鍙�, "HSourceInterID": d.data[0].婧愬崟ID, "HSourceEntryID": d.data[0].婧愬崟瀛怚D
+ , "HSourceBillNo": d.data[0].婧愬崟鍗曞彿, "HSourceBillType": d.data[0].瀛愭簮鍗曠被鍨�, "HWorkShopID": d.data[0].HWorkShopID
+ , "HWorkShopIDName": d.data[0].杞﹂棿鍚嶇О, "HDayPlanDate": Format(new Date(d.data[0].宸ュ崟鐢熶骇鏃ユ湡), 'yyyy-MM-dd'), "HRelationQty1": d.data[0].鍙敤閲囪喘鏁伴噺
+ , "HPOOrderInterID": d.data[0].閲囪喘璁㈠崟鍐呯爜, "HPOOrderEntryID": d.data[0].閲囪喘璁㈠崟瀛愬唴鐮�, "HPOOrderBillNo": d.data[0].閲囪喘璁㈠崟鍙�
+ , "HPOOrderBillSEQ": d.data[0].閲囪喘璁㈠崟琛屽彿, "HWWOrderInterID": d.data[0].濮斿璁㈠崟鍐呯爜, "HWWOrderEntryID": d.data[0].濮斿璁㈠崟瀛愬唴鐮�
+ , "HWWOrderBillNo": d.data[0].濮斿璁㈠崟鍙�, "HPurchaseDeptID": d.data[0].HPurchaseDeptID, "HPurchaseDeptIDName": d.data[0].閲囪喘閮ㄩ棬
+ , "HCloseTypeSub": d.data[0].鏄惁鎵嬪伐鍏抽棴 == "1" ? true : false, "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[0].瀛愬叧闂椂闂�), 'yyyy-MM-dd'), "HSendQty": d.data[0].閫佽揣鍗曟暟閲�
+ , "HReciveQty": d.data[0].鏀舵枡鏁伴噺, "HCloseStatus": d.data[0].鍏抽棴鐘舵�� == "1" ? true : false, "HRemoveQty": d.data[0].杞Щ鏁伴噺, "HSeOrderBillNo": d.data[0].閿�鍞鍗曞彿
+ , "HUnReciveQty": d.data[0].鏈敹鏂欐暟閲�, "HPOOrderBillDate": Format(new Date(d.data[0].閲囪喘璁㈠崟鍗曟嵁鏃ユ湡), 'yyyy-MM-dd'), "HPOOrderBillDeliveryDate": Format(new Date(d.data[0].閲囪喘璁㈠崟浜よ揣鏃ユ湡),'yyyy-MM-dd')
+ , "HPOOrderBillRemark": d.data[0].閲囪喘璁㈠崟鎽樿, "HPOOrderBillNote": d.data[0].閲囪喘璁㈠崟琛ㄤ綋澶囨敞
}];
option.data = rowdata;
table.render(option);
+
+ //鏄惁鎵嬪伐鍏抽棴
+ if (d.data[0].鏄惁鎵嬪伐鍏抽棴=="1") {
+ $('#HCloseTypeSub1').attr("checked", true);
+ }
+
+ //鍏抽棴鐘舵��
+ if (d.data[0].鍏抽棴鐘舵�� == "1") {
+ $('#HCloseStatus1').attr("checked", true);
+ }
+ form.render('checkbox');
+
+ //寤惰繜鍘熷洜
+ $('#HLaterReason1').find("option[value='" + d.data[0].寤惰繜鍘熷洜 + "']").attr("selected", true);
+ $('#HErpClsID1').find("option[value='" + d.data[0].鐗╂枡灞炴�� + "']").attr("selected", true);
+ $('#HPURCHASEORGIDSub1').find("option[value='" + d.data[0].瀛愯〃閲囪喘缁勭粐 + "']").attr("selected", true);
+ $('#HStatus1').find("option[value='" + d.data[0].鐘舵�� + "']").attr("selected", true);
form.render('select');
}
})
@@ -743,6 +960,11 @@
var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
+ //鍒濆鍖栧叧闂椂闂�(绌哄�肩姸鎬佷笅 璧嬪��)
+ if (table.cache["mainTable"][i].HEntryCloseDate == "") {
+ table.cache["mainTable"][i].HEntryCloseDate = "1900-01-01 00:00:00.000"
+ }
+
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
num.push(table.cache["mainTable"][i])
}
@@ -752,11 +974,11 @@
var sSubStr = JSON.stringify(num);
var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
-
+
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/AddPODemandPlanConfigBillList",
+ url: GetWEBURL() + "/JIT_Cg_PODemandPlanBill/AddPODemandPlanBillList",
async: true,
data: { "sMainSub": sMainSub },
dataType: "json",
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
index 78b7281..a479d5e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
@@ -72,12 +72,12 @@
</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: 115px;">
<input type="text" class="layui-input" lay-verify="HPrintQty" name="HPrintQty" id="HPrintQty">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁″垝閮ㄩ棬</label>
+ <label class="layui-form-label" style="width: 85px;">璁″垝閮ㄩ棬</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="hidden" class="layui-input" lay-verify="HDeptID" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="text" class="layui-input" lay-verify="HDeptIDName" name="HDeptIDName" id="HDeptIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -102,12 +102,12 @@
</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: 115px;">
<input type="text" class="layui-input" lay-verify="HInStockQty" name="HInStockQty" id="HInStockQty">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡</label>
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="text" class="layui-input" lay-verify="HMaterIDNumber" name="HMaterIDNumber" id="HMaterIDNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -131,21 +131,21 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐝粍</label>
+ <label class="layui-form-label" style="width: 85px;">鐝粍</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="hidden" class="layui-input" lay-verify="HGroupID" name="HGroupID" id="HGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="text" class="layui-input" lay-verify="HGroupIDName" name="HGroupIDName" id="HGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGroupID" id="btnHGroupID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGroupID" id="btnHGroupID" style="padding: 0 10px;float: right;">
<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>
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇杞﹂棿</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
@@ -159,31 +159,31 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍗曚綅</label>
+ <label class="layui-form-label" style="width: 85px;">鍗曚綅</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="hidden" class="layui-input" lay-verify="HUnitID" name="HUnitID" id="HUnitID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="text" class="layui-input" lay-verify="HUnitIDName" name="HUnitIDName" id="HUnitIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnitID" id="btnHUnitID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnitID" id="btnHUnitID" style="padding: 0 10px;float: right;">
<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>
+ <label class="layui-form-label" style="width: 85px;">鎿嶄綔宸�</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="hidden" class="layui-input" lay-verify="HWorkerID" name="HWorkerID" id="HWorkerID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="text" class="layui-input" lay-verify="HWorkerIDName" name="HWorkerIDName" id="HWorkerIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkerID" id="btnHWorkerID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkerID" id="btnHWorkerID" style="padding: 0 10px;float: right;">
<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>
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="hidden" class="layui-input" lay-verify="HSourceID" name="HSourceID" id="HSourceID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="text" class="layui-input" lay-verify="HSourceIDName" name="HSourceIDName" id="HSourceIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSourceID" id="btnHSourceID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSourceID" id="btnHSourceID" style="padding: 0 10px;float: right;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
@@ -191,7 +191,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">宸ュ崟鐢熶骇鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 48px;">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 78px;">
</div>
</div>
</div>
@@ -259,13 +259,13 @@
<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="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 48px;">
+ <input type="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 78px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">璁″垝缁撴潫鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 48px;">
+ <input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 78px;">
</div>
</div>
<div class="layui-inline">
@@ -321,7 +321,7 @@
<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="HPreparatDate" name="HPreparatDate" id="HPreparatDate" style="padding-left: 48px;">
+ <input type="date" class="layui-input" lay-verify="HPreparatDate" name="HPreparatDate" id="HPreparatDate" style="padding-left: 78px;">
</div>
</div>
<div class="layui-inline">
@@ -333,7 +333,7 @@
<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="HOrderCommitDate" name="HOrderCommitDate" id="HOrderCommitDate" style="padding-left: 48px;">
+ <input type="date" class="layui-input" lay-verify="HOrderCommitDate" name="HOrderCommitDate" id="HOrderCommitDate" style="padding-left: 78px;">
</div>
</div>
</div>
@@ -520,9 +520,9 @@
</script>
<!--澶嶉�夋 閿佸畾鏍囪-->
- <script type="text/html" id="HLockedSu">
+ <script type="text/html" id="HLockedSub">
<div class="layui-input-block" style="margin-left: 20px;">
- <input type="checkbox" name="HLockedSu" lay-filter="HLockedSu" id="HLockedSu{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ <input type="checkbox" name="HLockedSub" lay-filter="HLockedSub" id="HLockedSub{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
</div>
</script>
@@ -572,11 +572,11 @@
set_ClearBill();
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- //if (sessionStorage.login != "login") {
- // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- // }, function () { window.location.href = "../../user/login.html"; });
- //}
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
@@ -629,12 +629,12 @@
, { field: 'HBTimes', title: '寮�濮嬫椂闂�', event: "HBTimes" }//datetime
, { field: 'HETimes', title: '缁撴潫鏃堕棿', event: "HETimes"}//datetime
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
- , { field: 'HDateSub', title: '鎺掍骇鏃ユ湡' }//datetime
+ , { field: 'HDateSub', title: '鎺掍骇鏃ユ湡', event: "HDateSub" }//datetime
, { field: 'HCloseMan', title: '琛屽叧闂�', edit: 'text' }
, { field: 'HEntryCloseDate', title: '琛屽叧闂棩鏈�', event: "HEntryCloseDate" }//datetime
, { field: 'HCloseTypeSub', title: '鏄惁鎵嬪伐鍏抽棴', templet: '#HCloseTypeSub' }//check
, { field: 'HColumn', title: 'Excel鍒楀ご', edit: 'text' }
- , { field: 'HLockedSub', title: '閿佸畾鏍囪', templet: '#HLockedSu' }//check
+ , { field: 'HLockedSub', title: '閿佸畾鏍囪', templet: '#HLockedSub' }//check
, { field: 'HComplete', title: '鏄惁榻愬', edit: 'text' }
, { field: 'HStatusTag', title: '鐘舵�佹爣璁�', templet: '#HStatusTag' }//check
, { field: 'HIsHandModify', title: '鎵嬪伐淇敼鏍囪', templet: '#HIsHandModify' }//check
@@ -803,6 +803,23 @@
}
});
}
+
+ //鎺掍骇鏃ユ湡
+ if (obj.event == 'HDateSub') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ checkRefresh();
+ }
+ });
+ }
//琛屽叧闂棩鏈�
if (obj.event == 'HEntryCloseDate') {
@@ -827,13 +844,13 @@
//#region 澶嶉�夋
//閿佸畾鏍囪
- form.on('checkbox(HLockedSu)', function (data) {
+ form.on('checkbox(HLockedSub)', function (data) {
//鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
var elem = data.othis.parents('tr');
var dataindex = elem.attr("data-index");
$.each(option.data, function (index, value) {
if (value.LAY_TABLE_INDEX == dataindex) {
- value.HLockedSu = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ value.HLockedSub = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
}
});
});
@@ -1123,11 +1140,10 @@
//澶氶�� 鍒锋柊琛ㄦ牸
function checkRefresh() {
for (var i = 1; i <= option.data.length; i++) {
- //$('#HProcType' + i + '').find("option[value='" + option.data[i - 1].HProcType + "']").attr("selected", true);
//閿佸畾鏍囪
- if (option.data[i - 1].HLockedSu) {
- $('#HLockedSu' + i + '').attr("checked", true);
+ if (option.data[i - 1].HLockedSub) {
+ $('#HLockedSub' + i + '').attr("checked", true);
}
//鐘舵�佹爣璁�
if (option.data[i - 1].HStatusTag) {
@@ -1221,7 +1237,7 @@
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (d) {
-
+
//涓昏〃
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": d.data[0].鍗曟嵁鍙�
@@ -1295,15 +1311,45 @@
//瀛愯〃 璧嬪��
var rowdata = [{
- "HMasterDate": d.data[0].鏃ヨ鍒掔敓浜ф棩鏈�, "HQty": d.data[0].瀛愭棩璁″垝鏁伴噺, "HRptFinishQty": d.data[0].姹囨姤瀹屾垚鏁伴噺
- ,"HTimes": d.data[0].鍓╀綑宸ユ椂, "HUseTimes": d.data[0].鍗犵敤宸ユ椂, "HBTimes": d.data[0].寮�濮嬫椂闂�, "HETimes": d.data[0].缁撴潫鏃堕棿,
- "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HDateSub": d.data[0].鎺掍骇鏃ユ湡, "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate": d.data[0].瀛愬叧闂椂闂�
- , "HCloseTypeSub": false, "HColumn": d.data[0].Excel鍒楀ご, "HLockedSub": false, "HComplete": d.data[0].鏄惁榻愬
- ,"HStatusTag": false, "HIsHandModify": false
+ "HMasterDate": Format(new Date(d.data[0].鏃ヨ鍒掔敓浜ф棩鏈�), "yyyy-MM-dd"), "HQty": d.data[0].瀛愭棩璁″垝鏁伴噺, "HRptFinishQty": d.data[0].姹囨姤瀹屾垚鏁伴噺
+ , "HTimes": d.data[0].鍓╀綑宸ユ椂, "HUseTimes": d.data[0].鍗犵敤宸ユ椂, "HBTimes": Format(new Date(d.data[0].寮�濮嬫椂闂�), "yyyy-MM-dd"), "HETimes": Format(new Date(d.data[0].缁撴潫鏃堕棿), "yyyy-MM-dd")
+ , "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HDateSub": Format(new Date(d.data[0].鎺掍骇鏃ユ湡), "yyyy-MM-dd"), "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate":Format(new Date(d.data[0].瀛愬叧闂椂闂�), "yyyy-MM-dd")
+ , "HCloseTypeSub": d.data[0].鏄惁鎵嬪伐鍏抽棴 == 0 ? false : true, "HColumn": d.data[0].Excel鍒楀ご, "HLockedSub": d.data[0].瀛愰攣瀹氭爣璁� == 0 ? false : true, "HComplete": d.data[0].鏄惁榻愬
+ , "HStatusTag": d.data[0].鐘舵�佹爣璁� == 0 ? false : true, "HIsHandModify": d.data[0].鎵嬪伐淇敼鏍囪 == 0 ? false : true
}];
+
option.data = rowdata;
table.render(option);
- form.render('select');
+
+ //涓婚攣瀹氭爣璁�
+ if (d.data[0].涓婚攣瀹氭爣璁� == "1") {
+ $("#checkboxHLocked").attr("checked", true);
+ }
+ //鎸傝捣鏍囪
+ if (d.data[0].鎸傝捣鏍囪 == "1") {
+ $("#checkboxHHangUp").attr("checked", true);
+ }
+
+ //鏄惁鎵嬪伐鍏抽棴
+ if (d.data[0].鏄惁鎵嬪伐鍏抽棴=="1") {
+ $('#HCloseTypeSub1').attr("checked", true);
+ }
+
+ //閿佸畾鏍囪
+ if (d.data[0].瀛愰攣瀹氭爣璁� == "1") {
+ $('#HLockedSub1').attr("checked", true);
+ }
+
+ //鐘舵�佹爣璁�
+ if (d.data[0].鐘舵�佹爣璁� == "1") {
+ $('#HStatusTag1').attr("checked", true);
+ }
+
+ //鎵嬪伐淇敼鏍囪
+ if (d.data[0].鎵嬪伐淇敼鏍囪 == "1") {
+ $('#HIsHandModify1').attr("checked", true);
+ }
+ form.render('checkbox');
}
})
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
index c03ba5e..89dc3c5 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
@@ -61,7 +61,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
</div>
</script>
</form>
@@ -118,7 +118,7 @@
case 'set_DeleteBill': set_DeleteBill();
break;
//鍏抽棴
- case 'set_DeleteBill': set_CloseBill();
+ case 'set_CloseBill': set_CloseBill();
break;
};
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
new file mode 100644
index 0000000..92e5ee6
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
@@ -0,0 +1,969 @@
+锘�<!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/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>
+ .main-btn { /*澶撮儴涓绘寜閽�*/
+ padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+ height: 30px;
+ line-height: 30px;
+ }
+
+ .btn-title {
+ font-size: 16px;
+ }
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ width: 25%;
+ }
+ </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="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <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="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+ <input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
+ </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" lay-verify="HAddress" name="HAddress" id="HAddress">
+ </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="HProdORGID" id="HProdORGID" lay-verify="HProdORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </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="hidden" class="layui-input" lay-verify="HDeptID" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HDeptIDName" name="HDeptIDName" id="HDeptIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" 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="hidden" class="layui-input" lay-verify="HSettleCurrId" name="HSettleCurrId" id="HSettleCurrId" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HSettleCurrIdName" name="HSettleCurrIdName" id="HSettleCurrIdName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSettleCurrId" id="btnHSettleCurrId" 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="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 75px;">
+ </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" lay-verify="HRemark" name="HRemark" id="HRemark">
+ </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" lay-verify="HExplanation" name="HExplanation" id="HExplanation">
+ </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>
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/html" id="barDemo">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+
+ <!--琛屼笅鎷夐�夋嫨(寤惰繜鍘熷洜)-->
+ <script type="text/html" id="HLaterReason">
+ <select name="HLaterReason" lay-filter="HLaterReason" id="HLaterReason{{d.LAY_TABLE_INDEX+1}}">
+ <option value=""></option>
+ <option value="璁捐鍙樻洿鍥犵礌褰卞搷">璁捐鍙樻洿鍥犵礌褰卞搷</option>
+ <option value="妯″叿璁惧褰卞搷">妯″叿璁惧褰卞搷</option>
+ <option value="蹇�掔墿娴佸奖鍝�">蹇�掔墿娴佸奖鍝�</option>
+ <option value="浜у搧璐ㄩ噺闂">浜у搧璐ㄩ噺闂</option>
+ <option value="鍘熸枡澶囪揣寤舵湡">鍘熸枡澶囪揣寤舵湡</option>
+ <option value="浜哄憳浜ц兘涓嶈冻">浜哄憳浜ц兘涓嶈冻</option>
+ <option value="涓嶅彲鎶楀姏鍥犵礌">涓嶅彲鎶楀姏鍥犵礌</option>
+ </select>
+ </script>
+
+ <!--琛屼笅鎷夐�夋嫨(鐗╂枡灞炴��)-->
+ <script type="text/html" id="HErpClsID">
+ <select name="HErpClsID" lay-filter="HErpClsID" id="HErpClsID{{d.LAY_TABLE_INDEX+1}}">
+ <option value=""></option>
+ <option value="澶栬喘">澶栬喘</option>
+ <option value="鑷埗">鑷埗</option>
+ <option value="濮斿">濮斿</option>
+ <option value="閰嶇疆">閰嶇疆</option>
+ <option value="璧勪骇">璧勪骇</option>
+ <option value="鐗瑰緛">鐗瑰緛</option>
+ <option value="璐圭敤">璐圭敤</option>
+ <option value="铏氭嫙">铏氭嫙</option>
+ <option value="鏈嶅姟">鏈嶅姟</option>
+ <option value="涓�娆℃��">涓�娆℃��</option>
+ <option value="妯″瀷">妯″瀷</option>
+ <option value="浜у搧绯诲垪">浜у搧绯诲垪</option>
+ <option value="鍏朵粬">鍏朵粬</option>
+ </select>
+ </script>
+
+ <!--琛屼笅鎷夐�夋嫨(鐘舵��)-->
+ <script type="text/html" id="HStatus">
+ <select name="HStatus" lay-filter="HStatus" id="HStatus{{d.LAY_TABLE_INDEX+1}}">
+ <option value=""></option>
+ <option value="纭">纭</option>
+ <option value="鏈‘璁�">鏈‘璁�</option>
+ </select>
+ </script>
+
+ <!--琛屼笅鎷夐�夋嫨(閲囪喘缁勭粐)-->
+ <script type="text/html" id="HProdORGIDSub">
+ <select name="HProdORGIDSub" lay-filter="HProdORGIDSub" id="HProdORGIDSub{{d.LAY_TABLE_INDEX+1}}">
+ <option value=""></option>
+ <option value="1">钃濇捣瀹炰笟闆嗗洟</option>
+ <option value="100035">钃濇捣閫氳鍏徃</option>
+ <option value="100037">閫氳鍏徃鏈儴</option>
+ <option value="100038">鎵嬫満浜嬩笟閮�</option>
+ <option value="100039">骞虫澘浜嬩笟閮�</option>
+ <option value="100040">钃濇捣鐢靛瓙鍏徃</option>
+ <option value="100041">钃濇捣閿�鍞叕鍙�</option>
+ <option value="100042">棣欐腐閿�鍞叕鍙�</option>
+ <option value="100043">钃濇捣鐢靛瓙鍟嗗姟鏈夐檺鍏徃</option>
+ <option value="100044">钃濇捣闆跺敭杩為攣鍏徃</option>
+ <option value="100045">骞垮窞闂ㄥ簵</option>
+ <option value="100046">娣卞湷闂ㄥ簵</option>
+ <option value="100047">鏉窞鍗庡畯閫氫俊璁惧鏈夐檺鍏徃</option>
+ </select>
+ </script>
+
+ <!--澶嶉�夋 鍏抽棴鐘舵��-->
+ <script type="text/html" id="HCloseStatus">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HCloseStatus" lay-filter="HCloseStatus" id="HCloseStatus{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+ </script>
+
+ <!--澶嶉�夋 鏄惁鎵嬪伐鍏抽棴-->
+ <script type="text/html" id="HCloseTypeSub">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HCloseTypeSub" lay-filter="HCloseTypeSub" id="HCloseTypeSub{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+ </script>
+
+ <script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+ //#region 鍏叡鍙橀噺
+
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ ,excel = layui.excel
+ , element = layui.element;
+
+ //鍒濆琛ㄦ牸鏁版嵁
+ var rowdata = [{
+ "HLaterReason": "", "HMaterID": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": "", "HUnitIDName": ""
+ , "HErpClsID": "", "HQty": "", "HRemark": "", "HProdORGID": "", "HStatus": "", "HFixleadTime": ""
+ , "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HSourceBillType": ""
+ , "HDayPlanDate": "", "HRelationQty": 0, "HICMOInterID": "", "HICMOEntryID": "", "HICMOBillSEQ": ""
+ , "HCloseMan": "", "HEntryCloseDate": "", "HCloseTypeSub": false, "HReciveQty": "", "HCloseStatus": false
+ , "HRemoveQty": "", "HSeOrderBillNo": "", "HICMOEmpID": "", "HICMOEmpIDName": "", "HUnReciveQty": "", "HICMOBillDate": ""
+ , "HICMOBillDeliveryDate": "", "HICMOBillRemark": "", "HICMOBillNote": ""
+ }];
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍔犺浇缁勭粐
+ get_Organ();
+ //鍒跺崟浜�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ //if (sessionStorage.login != "login") {
+ // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ // }, function () { window.location.href = "../../user/login.html"; });
+ //}
+
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+ var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
+
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == -1) {
+ linteridSub = -1;
+ OperationType = 1;
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '4609' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ }
+ });
+ }
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ RoadBillMain(linterid, linteridSub);
+ //RoadBillSub(linterid);
+ }
+
+ var option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , cellMinWidth: 120
+ , height: 'full-270'
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: 'HLaterReason', title: '寤惰繜鍘熷洜', templet: '#HLaterReason', width: 200 }//list
+ , { field: 'HMaterID', title: 'HMaterID', hide: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', edit: 'text', event: "HMaterID" }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О' }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
+ , { field: 'HUnitID', title: 'HUnitID', hide: true }
+ , { field: 'HUnitIDName', title: '璁￠噺鍗曚綅', edit: 'text', event: "HUnitID" }
+ , { field: 'HErpClsID', title: '鐗╂枡灞炴��', templet: '#HErpClsID' }//list
+ , { field: 'HQty', title: '鏁伴噺', edit: 'text' }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { field: 'HProdORGID', title: '鐢熶骇缁勭粐', templet: "#HProdORGIDSub" }
+ , { field: 'HStatus', title: '鐘舵��', templet: '#HStatus' }//list
+ , { field: 'HFixleadTime', title: '鎻愬墠鏈�', edit: 'text' }
+ , { field: 'HSourceInterID', title: '鏃ヨ鍒掑伐鍗旻ID', edit: 'text' }
+ , { field: 'HSourceEntryID', title: '鏃ヨ鍒掑伐鍗旻ENTRYID', width: 200, edit: 'text' }
+ , { field: 'HSourceBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', edit: 'text' }
+ , { field: 'HDayPlanDate', title: '宸ュ崟鐢熶骇鏃ユ湡', width: 200, event: 'HDayPlanDate' }//date
+ , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', edit: 'text' }
+ , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', edit: 'text' }
+ , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', edit: 'text' }
+ , { field: 'HICMOBillSEQ', title: '鐢熶骇璁㈠崟琛屽彿', edit: 'text' }
+ , { field: 'HCloseMan', title: '琛屽叧闂�', width: 200, edit: 'text' }
+ , { field: 'HEntryCloseDate', title: '琛屽叧闂棩鏈�', width: 200, event: 'HEntryCloseDate' }//date
+ , { field: 'HCloseTypeSub', title: '鏄惁鎵嬪伐鍏抽棴', templet: "#HCloseTypeSub" }//ck
+ , { field: 'HReciveQty', title: '鍏ュ簱鏁伴噺', edit: 'text' }
+ , { field: 'HCloseStatus', title: '鍏抽棴鐘舵��', templet: "#HCloseStatus" }//ck
+ , { field: 'HRemoveQty', title: '杞Щ鏁伴噺', edit: 'text' }
+ , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', edit: 'text' }
+ , { field: 'HICMOEmpID', title: 'HICMOEmpID', hide: true }
+ , { field: 'HICMOEmpIDName', title: '鐢熶骇璁㈠崟鍒跺崟浜�', edit: 'text', event: "HICMOEmpID" }
+ , { field: 'HUnReciveQty', title: '鏈敹鏂欐暟閲�', edit: 'text' }
+ , { field: 'HICMOBillDate', title: '鐢熶骇璁㈠崟鍗曟嵁鏃ユ湡', event: "HICMOBillDate", width: 200 }//date
+ , { field: 'HICMOBillDeliveryDate', title: '鐢熶骇璁㈠崟浜よ揣鏃ユ湡', event: "HICMOBillDeliveryDate", width: 200 } // date
+ , { field: 'HICMOBillRemark', title: '鐢熶骇璁㈠崟鎽樿', edit: 'text' }
+ , { field: 'HICMOBillNote', title: '鐢熶骇璁㈠崟琛ㄤ綋澶囨敞', edit: 'text', width: 200 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ }
+
+ //鍒濆鍔犺浇琛ㄦ牸
+ option.data = rowdata;
+ table.render(option);
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //閫夋嫨閮ㄩ棬鎸夐挳
+ form.on('submit(btnHDeptID)', function () {
+ get_btnHDeptID();
+ });
+
+ //閫夋嫨甯佸埆鎸夐挳
+ form.on('submit(btnHSettleCurrId)', function () {
+ get_btnHSettleCurrId();
+ });
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow = {
+ "HLaterReason": "", "HMaterID": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": "", "HUnitIDName": ""
+ , "HErpClsID": "", "HQty": "", "HRemark": "", "HProdORGID": "", "HStatus": "", "HFixleadTime": ""
+ , "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HSourceBillType": ""
+ , "HDayPlanDate": "", "HRelationQty": 0, "HICMOInterID": "", "HICMOEntryID": "", "HICMOBillSEQ": ""
+ , "HCloseMan": "", "HEntryCloseDate": "", "HCloseTypeSub": false, "HReciveQty": "", "HCloseStatus": false
+ , "HRemoveQty": "", "HSeOrderBillNo": "", "HICMOEmpID": "", "HICMOEmpIDName": "", "HUnReciveQty": "", "HICMOBillDate": ""
+ , "HICMOBillDeliveryDate": "", "HICMOBillRemark": "", "HICMOBillNote": ""
+ };
+ 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;
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+ //#region 鏃堕棿鎺т欢 缁戝畾
+
+ var data = obj.data;
+ //鏃ヨ鍒掔敓浜ф棩鏈�
+ if (obj.event == 'HDayPlanDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ checkRefresh();
+ }
+ });
+ }
+
+ //琛屽叧闂棩鏈�
+ if (obj.event == 'HEntryCloseDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ checkRefresh();
+ }
+ });
+ }
+
+ //鐢熶骇璁㈠崟鍗曟嵁鏃ユ湡
+ if (obj.event == 'HICMOBillDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ checkRefresh();
+ }
+ });
+ }
+
+ //鐢熶骇璁㈠崟浜よ揣鏃ユ湡
+ if (obj.event == 'HICMOBillDeliveryDate') {
+ 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
+
+ });
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ if ((OperationType == 1 && linterid == -1) || OperationType == 3) {
+ Pub_Close(1);
+ } else {
+ Pub_Close(2);
+ }
+ })
+
+ //淇濆瓨鎻愪氦
+ form.on('submit(btnSave)', function (data) {//鎻愪氦
+ if (AllowLoadData()) {
+ set_AddNew(data);
+ }
+ });
+
+ //鐩戝惉鎻愪氦
+ form.verify({
+ numberOrEmpty: function (value, item) {
+
+ if (!/^\d+$/.test(value)) {
+ return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+ }
+ }
+ });
+
+ //琛岄�夋嫨澶勭悊锛堝欢杩熷師鍥狅級
+ form.on('select(HLaterReason)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HLaterReason = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //琛岄�夋嫨澶勭悊锛堢墿鏂欏睘鎬э級
+ form.on('select(HErpClsID)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HErpClsID = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //琛岄�夋嫨澶勭悊锛堢姸鎬侊級
+ form.on('select(HStatus)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HStatus = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //琛岄�夋嫨澶勭悊锛堥噰璐粍缁囷級
+ form.on('select(HProdORGIDSub)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HProdORGID = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //鍏抽棴鐘舵��
+ form.on('checkbox(HCloseStatus)', function (data) {
+ //鑾峰彇閫変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HCloseStatus = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //鏄惁鎵嬪伐鍏抽棴
+ form.on('checkbox(HCloseTypeSub)', function (data) {
+ //鑾峰彇閫変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HCloseTypeSub = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //缁勭粐閫夋嫨椤甸潰
+ function get_Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '<option style="color:blue;" value="0">缁勭粐</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HProdORGID").append(Organization);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+
+ //澶氶�� 鍒锋柊琛ㄦ牸
+ function checkRefresh() {
+ for (var i = 1; i <= option.data.length; i++) {
+ console.log(JSON.stringify(option.data[i - 1]))
+ //寤惰繜鍘熷洜
+ $('#HLaterReason' + i + '').find("option[value='" + option.data[i - 1].HLaterReason + "']").attr("selected", true);
+ //鐗╂枡灞炴��
+ $('#HErpClsID' + i + '').find("option[value='" + option.data[i - 1].HErpClsID + "']").attr("selected", true);
+ //鐘舵��
+ $('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
+ //閲囪喘缁勭粐
+ $('#HProdORGIDSub' + i + '').find("option[value='" + option.data[i - 1].HProdORGID + "']").attr("selected", true);
+
+ //鍏抽棴鐘舵��
+ if (option.data[i - 1].HCloseStatus) {
+ $('#HCloseStatus' + i + '').attr("checked", true);
+ }
+
+ //鏄惁鎵嬪伐鍏抽棴
+ if (option.data[i - 1].HCloseTypeSub) {
+ $('#HCloseTypeSub' + i + '').attr("checked", true);
+ }
+ }
+ form.render('select');
+ form.render('checkbox');
+ }
+
+ //琛屽唴鍒犻櫎
+ 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_btnHDeptID() {
+ //鎵撳紑閮ㄩ棬灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "渚涘簲鍟嗗垪琛�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ $("#HDeptIDName").val(checkStatus.data[0].HName);
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //閫夋嫨甯佸埆
+ function get_btnHSettleCurrId() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "甯佸埆鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ $("#HSettleCurrId").val(checkStatus.data[0].HItemID);
+ $("#HSettleCurrIdName").val(checkStatus.data[0].璐у竵鍚嶇О);
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //琛屽揩鎹烽敭
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+
+ //鐗╂枡
+ if (obj.event == "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
+ , "HMaterNumber": checkStatus.data[0].HNumber
+ , "HMaterName": checkStatus.data[0].HName
+ , "HMaterModel": checkStatus.data[0].HModel
+ })
+ 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({
+ "HUnitID": checkStatus.data[0].HItemID
+ , "HUnitIDName": checkStatus.data[0].HName
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //閲囪喘閮ㄩ棬
+ if (obj.event == "HICMOEmpID") {
+ //鎵撳紑閲囪喘閮ㄩ棬灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "閮ㄩ棬鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.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({
+ "HICMOEmpID": checkStatus.data[0].HItemID
+ , "HICMOEmpIDName": checkStatus.data[0].HName
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ return false;
+ }
+
+ })
+ }
+
+ //缂栬緫 椤甸潰璧嬪��
+ function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ {
+ var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ $.ajax({
+ url: GetWEBURL() + "/Sc_WorkDemandPlanBill/Sc_WorkDemandPlanBillList",
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (d) {
+
+ //涓昏〃
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HBillNo": d.data[0].鍗曟嵁鍙�
+ , "HInterID": d.data[0].hmainid
+ , "HAddress": d.data[0].浜よ揣鍦扮偣
+ , "HProdORGID": d.data[0].涓荤敓浜х粍缁�
+ , "HDeptID": d.data[0].HDeptID
+ , "HDeptIDName": d.data[0].杞﹂棿鍚嶇О
+ , "HSettleCurrId": d.data[0].HSettleCurrId
+ , "HSettleCurrIdName": d.data[0].缁撶畻甯佸埆
+ , "HDate": Format(new Date(d.data[0].鏃ユ湡),'yyyy-MM-dd')
+ , "HRemark": d.data[0].琛ㄥご澶囨敞
+ , "HExplanation": d.data[0].鎽樿
+ });
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [{
+ "HLaterReason": d.data[0].寤惰繜鍘熷洜, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О
+ , "HMaterModel": d.data[0].瑙勬牸鍨嬪彿, "HUnitID": d.data[0].HUnitID, "HUnitIDName": d.data[0].璁￠噺鍗曚綅
+ , "HErpClsID": d.data[0].鐗╂枡灞炴��, "HQty": d.data[0].鏁伴噺, "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HProdORGID": d.data[0].瀛愮敓浜х粍缁�
+ , "HStatus": d.data[0].鐘舵��, "HFixleadTime": d.data[0].鎻愬墠鏈�, "HSourceInterID": d.data[0].婧愬崟ID, "HSourceEntryID": d.data[0].婧愬崟瀛怚D
+ , "HSourceBillNo": d.data[0].婧愬崟鍗曞彿, "HSourceBillType": d.data[0].瀛愭簮鍗曠被鍨�, "HDayPlanDate": Format(new Date(d.data[0].宸ュ崟鐢熶骇鏃ユ湡), 'yyyy-MM-dd')
+ , "HRelationQty": d.data[0].鍏宠仈鏁伴噺, "HICMOInterID": d.data[0].鐢熶骇璁㈠崟鍐呯爜, "HICMOEntryID": d.data[0].鐢熶骇璁㈠崟瀛愬唴鐮�
+ , "HICMOBillSEQ": d.data[0].鐢熶骇璁㈠崟琛屽彿, "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[0].瀛愬叧闂椂闂�), 'yyyy-MM-dd')
+ , "HCloseTypeSub": d.data[0].鏄惁鎵嬪伐鍏抽棴 == "1" ? true : false, "HReciveQty": d.data[0].鍏ュ簱鏁伴噺, "HCloseStatus": d.data[0].鍏抽棴鐘舵�� == "1" ? true : false
+ , "HRemoveQty": d.data[0].杞Щ鏁伴噺, "HSeOrderBillNo": d.data[0].閿�鍞鍗曞彿, "HICMOEmpID": d.data[0].HICMOEmpID, "HICMOEmpIDName": d.data[0].鐢熶骇璁㈠崟鍒跺崟浜�
+ , "HUnReciveQty": d.data[0].鏈敹鏂欐暟閲�, "HICMOBillDate": Format(new Date(d.data[0].鐢熶骇璁㈠崟鍗曟嵁鏃ユ湡), 'yyyy-MM-dd')
+ , "HICMOBillDeliveryDate": Format(new Date(d.data[0].鐢熶骇璁㈠崟浜よ揣鏃ユ湡), 'yyyy-MM-dd'), "HICMOBillRemark": d.data[0].鐢熶骇璁㈠崟鎽樿
+ , "HICMOBillNote": d.data[0].鐢熶骇璁㈠崟琛ㄤ綋澶囨敞
+ }];
+ option.data = rowdata;
+ table.render(option);
+
+ //鏄惁鎵嬪伐鍏抽棴
+ if (d.data[0].鏄惁鎵嬪伐鍏抽棴=="1") {
+ $('#HCloseTypeSub1').attr("checked", true);
+ }
+
+ //鍏抽棴鐘舵��
+ if (d.data[0].鍏抽棴鐘舵�� == "1") {
+ $('#HCloseStatus1').attr("checked", true);
+ }
+ form.render('checkbox');
+
+ //寤惰繜鍘熷洜
+ $('#HLaterReason1').find("option[value='" + d.data[0].寤惰繜鍘熷洜 + "']").attr("selected", true);
+ //鐗╂枡灞炴��
+ $('#HErpClsID1').find("option[value='" + d.data[0].鐗╂枡灞炴�� + "']").attr("selected", true);
+ //鐢熶骇缁勭粐
+ $('#HProdORGIDSub1').find("option[value='" + d.data[0].瀛愮敓浜х粍缁� + "']").attr("selected", true);
+ //鐘舵��
+ $('#HStatus1').find("option[value='" + d.data[0].鐘舵�� + "']").attr("selected", true);
+ form.render('select');
+ }
+ })
+ }
+
+ //淇濆瓨HMaker
+ function set_AddNew(data) {
+
+ //鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ //鍒濆鍖栧叧闂椂闂�(绌哄�肩姸鎬佷笅 璧嬪��)
+ if (table.cache["mainTable"][i].HEntryCloseDate == "") {
+ table.cache["mainTable"][i].HEntryCloseDate = "1900-01-01 00:00:00.000"
+ }
+
+ 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 hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_WorkDemandPlanBill/AddWorkDemandPlanBillList",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg("淇濆瓨鎴愬姛");
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //闈炵┖楠岃瘉
+ function AllowLoadData() {
+
+ if ($("#HSettleCurrId").val() == "0") {
+ layer.msg("甯佸埆娌℃湁閫夋嫨");
+ return false;
+ }
+ return true;
+ }
+
+ //#endregion
+
+ });
+
+ </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/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
index 750bd74..1ac8e71 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
@@ -61,7 +61,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
</div>
</script>
</form>
@@ -118,7 +118,7 @@
case 'set_DeleteBill': set_DeleteBill();
break;
//鍏抽棴
- case 'set_DeleteBill': set_CloseBill();
+ case 'set_CloseBill': set_CloseBill();
break;
};
});
@@ -171,7 +171,7 @@
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', hide: true }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 120 }
- , { field: '鏃ユ湡', title: '鏃ユ湡' }
+ , { field: '鏃ユ湡', title: '瑕佹枡鏃ユ湡' }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
, { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
@@ -188,40 +188,16 @@
, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
, { field: '浣滃簾浜�', title: '浣滃簾浜�' }
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
- //, { field: '涓绘簮鍗曠被鍨�', title: '涓绘簮鍗曠被鍨�' }
- //, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
- //, { field: '婧愬崟鍙�', title: '婧愬崟鍙�' }
- //, { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
- , { field: '濮斿缁勭粐', title: '濮斿缁勭粐' }
- , { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣' }
- , { field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟嗗悕绉�' }
- , { field: '涓昏〃閲囪喘缁勭粐', title: '涓昏〃閲囪喘缁勭粐' }
- , { field: '缁撶畻甯佸埆', title: '缁撶畻甯佸埆' }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+ , { field: '涓荤敓浜х粍缁�', title: '鐢熶骇缁勭粐' }
+ , { field: '杞﹂棿鍚嶇О', title: '鐢熶骇杞﹂棿' }
+ , { field: '婧愬崟鍗曞彿', title: '鐢熶骇璁㈠崟鍙�' }
, { field: '鏁伴噺', title: '鏁伴噺' }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
, { field: '宸ュ崟鐢熶骇鏃ユ湡', title: '宸ュ崟鐢熶骇鏃ユ湡' }
- //, { field: '鎻愬墠鏈�', title: '鎻愬墠鏈�' }
- //, { field: '寤惰繜鍘熷洜', title: '寤惰繜鍘熷洜' }
- //, { field: '鐗╂枡灞炴��', title: '鐗╂枡灞炴��' }
- //, { field: '閫佽揣鍗曟暟閲�', title: '閫佽揣鍗曟暟閲�' }
- //, { field: '閲囪喘璁㈠崟琛屽彿', title: '閲囪喘璁㈠崟琛屽彿' }
- //, { field: '鏀舵枡鏁伴噺', title: '鏀舵枡鏁伴噺' }
- //, { field: '鍏抽棴鐘舵��', title: '鍏抽棴鐘舵��' }
- //, { field: '杞Щ鏁伴噺', title: '杞Щ鏁伴噺' }
- //, { field: '閲囪喘鍛�', title: '閲囪喘鍛�' }
- //, { field: '鏈敹鏂欐暟閲�', title: '鏈敹鏂欐暟閲�' }
- //, { field: '閲囪喘璁㈠崟鍗曟嵁鏃ユ湡', title: '閲囪喘璁㈠崟鍗曟嵁鏃ユ湡' }
- //, { field: '閲囪喘璁㈠崟浜よ揣鏃ユ湡', title: '閲囪喘璁㈠崟浜よ揣鏃ユ湡' }
- //, { field: '閲囪喘璁㈠崟鎽樿', title: '閲囪喘璁㈠崟鎽樿' }
- //, { field: '閲囪喘璁㈠崟琛ㄤ綋澶囨敞', title: '閲囪喘璁㈠崟琛ㄤ綋澶囨敞' }
- //, { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿' }
- //, { field: '鏃ヨ鍒掑伐鍗曠紪鍙�', title: '鏃ヨ鍒掑伐鍗曠紪鍙�' }
- //, { field: '杞﹂棿鍚嶇О', title: '杞﹂棿鍚嶇О' }
- //, { field: '閲囪喘閮ㄩ棬', title: '閲囪喘閮ㄩ棬' }
+ , { field: '寤惰繜鍘熷洜', title: '寤惰繜鍘熷洜' }
]]
};
}
@@ -230,7 +206,7 @@
//鑾峰彇缁勭粐
function Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
- var Organization = '';
+ var Organization = '<option style="color:blue;" value="">缁勭粐</option>';
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetOrganizations",
@@ -252,7 +228,7 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Cg_PODemandPlanBill/Cg_PODemandPlanBillList',
+ url: GetWEBURL() + '/Sc_WorkDemandPlanBill/Sc_WorkDemandPlanBillList',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (result) {
@@ -344,7 +320,7 @@
var HEntryID = CheckStatus.data[0].hsubid; //鑾峰彇绗嚑鏉″瓙鏁版嵁
$.ajax({
- url: GetWEBURL() + '/Cg_PODemandPlanBill/DelPODemandPlanBillList'
+ url: GetWEBURL() + '/Sc_WorkDemandPlanBill/DelWorkDemandPlanBillList'
, type: "GET"
, data: { "HInterID": HInterID, "HEntryID": HEntryID, "User": sessionStorage["HUserName"] }
, success: function (result) {
@@ -382,7 +358,7 @@
var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
$.ajax({
- url: GetWEBURL() + '/Cg_PODemandPlanBill/DelPODemandPlanBillList'
+ url: GetWEBURL() + '/Sc_WorkDemandPlanBill/CloseWorkDemandPlanBillList'
, type: "GET"
, data: { "HInterID": HInterID, "User": sessionStorage["HUserName"] }
, success: function (result) {
@@ -413,16 +389,16 @@
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
- , title: '鎻愭枡璁″垝鍗曞垪琛�-鏂板'
+ , title: '瑕佹枡璁″垝鍗曞垪琛�-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+ , content: '../瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType=&linteridSub=-1'
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
}
})
}
- //#endregion
+ //#endregion
//#region 缂栬緫
function set_ShowBill() {
@@ -436,9 +412,9 @@
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
- , title: '鎻愭枡璁″垝鍗曞垪琛�-缂栬緫'
+ , title: '瑕佹枡璁″垝鍗曞垪琛�-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -448,7 +424,7 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
}
- //#endregion
+ //#endregion
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index e72cacc..2ccb217 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -1359,7 +1359,7 @@
}];
option.data = rowdata;
table.render(option);
-
+
if (d.data[0].濮斿鏍囪) {
$('#HSupFlag1').attr("checked", true);
}
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
index d1082e0..30bd422 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
@@ -68,10 +68,10 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<div class="layui-colla-content">
<!--<div class="layui-inline">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
- </div>
- </div>-->
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -96,11 +96,11 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">鍙嶉鐘舵��</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
- </div>
- </div>-->
+ <label class="layui-form-label">鍙嶉鐘舵��</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡缂栫爜</label>
<div class="layui-input-block">
@@ -126,7 +126,7 @@
</div>
</div>
<div class="layui-inline" style="margin-left:30px">
- <label class="layui-form-label">渚涘簲鍟嗗弽棣堢姸鎬�</label>
+ <label class="layui-form-label">鍙嶉鐘舵��</label>
<div class="layui-input-block" style="width:190px;">
<select name="HFeedback" lay-filter="HFeedback">
<option value="" selected>鍏ㄩ儴</option>
@@ -137,7 +137,15 @@
</select>
</div>
</div>
-
+ <div class="layui-inline" style="margin-left:30px">
+ <label class="layui-form-label">瀹屾垚鐘舵��</label>
+ <div class="layui-input-block" style="width:190px;">
+ <select name="HFinishStatus" lay-filter="HFinishStatus">
+ <option value="鏈畬鎴�" selected>鏈畬鎴�</option>
+ <option value="宸插畬鎴�">宸插畬鎴�</option>
+ </select>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -187,12 +195,8 @@
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
- //鍔犺浇鏁版嵁鍒扮綉鏍�
- get_Display(sWhere);
- //鍔犺浇涓氬姟鍛�
- get_HEmpName();
+ set_ClearBill();
+
//#endregion
//#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
@@ -285,11 +289,18 @@
});
//#endregion
-
//#region 姝ら〉闈㈡墍鏈夋柟娉�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery(table, option)
+ //鍔犺浇涓氬姟鍛�
+ get_HEmpName();
+ }
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HBeginDate").val("2022-03-14");
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
var columns = [
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
@@ -312,6 +323,7 @@
, { field: '鎵撳嵃鏉＄爜鏁伴噺', title: '鎵撳嵃鏉＄爜鏁伴噺', width: 120}
, { field: '鍏宠仈鏁伴噺', title: '宸插彂璐ф暟閲�', width: 120 }
, { field: '鏈叧鑱旀暟閲�', title: '鏈凡鍙戣揣鏁伴噺', width: 120 }
+ , { field: '瀹屾垚鐘舵��', title: '瀹屾垚鐘舵��', width: 100 }
, { field: 'HUnitID', title: 'HUnitID', hide: true }
, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 120 }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100 }
@@ -997,6 +1009,8 @@
var HMaterShortNumber = $("#HMaterShortNumber").val();
var HSupName = $("#HSupName").val();//渚涘簲鍟�
var HFeedback = $("select[name='HFeedback']").val(); //渚涘簲鍟嗗弽棣堢姸鎬�
+ var HFinishStatus = $("select[name='HFinishStatus']").val(); //瀹屾垚鐘舵��
+
if (HStatus) {
sWhere += " and 鍒嗛厤鐘舵�� like '%" + HStatus + "%'";
}
@@ -1040,6 +1054,10 @@
sWhere += " and 鍙嶉鐘舵�� like '%" + HFeedback + "%'";
}
+ if (HFinishStatus) {
+ sWhere += " and 瀹屾垚鐘舵�� like '%" + HFinishStatus + "%'";
+
+ }
var index = layer.load(0);
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index c710f58..52e621d 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -103,11 +103,11 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">鍙嶉鐘舵��</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
- </div>
- </div>-->
+ <label class="layui-form-label">鍙嶉鐘舵��</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡缂栫爜</label>
<div class="layui-input-block">
@@ -133,7 +133,7 @@
</div>
</div>
<div class="layui-inline" style="margin-left:30px">
- <label class="layui-form-label">渚涘簲鍟嗗弽棣堢姸鎬�</label>
+ <label class="layui-form-label">鍙嶉鐘舵��</label>
<div class="layui-input-block" style="width:190px;">
<select name="HFeedback" lay-filter="HFeedback">
<option value="" selected>鍏ㄩ儴</option>
@@ -141,6 +141,15 @@
<option value="澶囨枡">澶囨枡</option>
<option value="鐢熶骇">鐢熶骇</option>
<option value="鍙戣揣">鍙戣揣</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-left:30px">
+ <label class="layui-form-label">瀹屾垚鐘舵��</label>
+ <div class="layui-input-block" style="width:190px;">
+ <select name="HFinishStatus" lay-filter="HFinishStatus">
+ <option value="鏈畬鎴�" selected>鏈畬鎴�</option>
+ <option value="宸插畬鎴�">宸插畬鎴�</option>
</select>
</div>
</div>
@@ -293,14 +302,14 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鍔犺浇鏁版嵁鍒扮綉鏍�
- get_Display(sWhere);
+ //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery(table, option)
//鍔犺浇涓氬姟鍛�
get_HEmpName();
}
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HBeginDate").val("2022-03-14");
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
var columns = [
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
@@ -323,6 +332,7 @@
, { field: '鎵撳嵃鏉＄爜鏁伴噺', title: '鎵撳嵃鏉＄爜鏁伴噺', width: 120 }
, { field: '鍏宠仈鏁伴噺', title: '宸插彂璐ф暟閲�', width: 120 }
, { field: '鏈叧鑱旀暟閲�', title: '鏈凡鍙戣揣鏁伴噺', width: 120 }
+ , { field: '瀹屾垚鐘舵��', title: '瀹屾垚鐘舵��', width: 100 }
, { field: 'HUnitID', title: 'HUnitID', hide: true }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
, { field: 'HUnitID', title: 'HUnitID', hide: true }
@@ -1007,6 +1017,7 @@
//var HXTFKStatus = $("#HXTFKStatus").val();
var HSupName = $("#HSupName").val();//渚涘簲鍟�
var HFeedback = $("select[name='HFeedback']").val(); //渚涘簲鍟嗗弽棣堢姸鎬�
+ var HFinishStatus = $("select[name='HFinishStatus']").val(); //瀹屾垚鐘舵��
if (HStatus) {
sWhere += " and 鍒嗛厤鐘舵�� like '%" + HStatus + "%'";
@@ -1051,6 +1062,10 @@
sWhere += " and 鍙嶉鐘舵�� like '%" + HFeedback + "%'";
}
+ if (HFinishStatus) {
+ sWhere += " and 瀹屾垚鐘舵�� like '%" + HFinishStatus + "%'";
+
+ }
var index = layer.load(0);
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
--
Gitblit v1.9.1