From 2dccd23b4e7ca353c59d6d31874a506a9b6242ff Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期四, 16 九月 2021 08:16:18 +0800
Subject: [PATCH] 1
---
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBillList.html | 645 +++++++++++++++++++++++++++++++++++++++++++
WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBill.html | 2
WebTM/layuiadmin/Scripts/webConfig.js | 6
WebTM/views/index.html | 2
WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html | 53 ++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillEdit.html | 161 ++++++----
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillList.html | 24
WebTM/WebTM.csproj | 1
8 files changed, 792 insertions(+), 102 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 9530b8e..b6027f0 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -560,6 +560,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯″叿缁翠慨璁板綍鍗昞Sc_MouldRepairWorkBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍑哄簱鍗昞Sc_MouldOtherOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍏ュ簱鍗昞Sc_MouldOtherInBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepInBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdMoveBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepOutBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_Add_MouldMoveStockStepOutBill.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 31137c5..e6b0b20 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -2,15 +2,15 @@
function GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴
- //var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
+ var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣�
- var WEBURL = "http://localhost/API/";
+ //var WEBURL = "http://localhost/API/";
return WEBURL
}
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 157f795..59f3960 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -487,7 +487,7 @@
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutBillList.html">鍣ㄥ叿鍒嗗竷寮忚皟鍑哄崟鎹淮鎶�</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBill.html">鍏朵粬鍏ュ簱鍗�</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBillList.html">鍏朵粬鍏ュ簱鍗曠淮鎶�</a></dd>
- <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBill.html">鍏朵粬鍑哄簱鍗�</a></dd>
+ <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillEdit.html">鍏朵粬鍑哄簱鍗�</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillList.html">鍏朵粬鍑哄簱鍗曠淮鎶�</a></dd>
</dl>
</dd>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
index 491e1fe..538320c 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
@@ -61,11 +61,21 @@
<input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
</div>
</div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-inline">
+ <input type="text" readonly name="HWhName" id="HWhName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWhID" id="HWhID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HWhList" id="HWhList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">浠撳簱</label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="hwhid" id="hwhid" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -234,7 +244,7 @@
, { field: 'HQty', title: '瀹炴敹鏁伴噺', edit: 'text', width: 100}
, { field: 'HPrice', title: '鍗曚环', edit: 'text', width: 100}
, { field: 'HMoney', title: '閲戦', edit: 'text', width: 100}
- , { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true}
+ , { field: 'hwhid', title: 'hwhid', edit: 'text', width: 100, hide: true}
, { field: 'HWHCode', title: '鏀舵枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 100 }
, { field: 'HWHName', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 100 }
, { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true}
@@ -253,7 +263,7 @@
//鍒ゆ柇鏄惁鏂板
if (hID == null || hID == 0) {
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
- option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0,"HSPCode":"", "HSPName": "", "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "","HBackFlag":"", "HRemark": "" }];
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "hwhid": 0, "HWHCode": "", "HWHName": "", "HSPID": 0,"HSPCode":"", "HSPName": "", "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "","HBackFlag":"", "HRemark": "" }];
table.render(option);
}
else {
@@ -289,7 +299,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "", "HBackFlag": "", "HRemark": "" };
+ var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "hwhid": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "", "HBackFlag": "", "HRemark": "" };
switch (obj.event) {
case 'btn-AddLine':
//table.cache["mainTable"].push(AddRow[rows]);
@@ -491,7 +501,7 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
- HWHID: checkStatus.data[0].HItemID,
+ hwhid: checkStatus.data[0].HItemID,
HWHCode: checkStatus.data[0].HNumber,
HWHName: checkStatus.data[0].HName,
});
@@ -621,7 +631,7 @@
});
-
+
function RoadBillMain(hID)//鍔犺浇琛ㄥご
{
//alert(hID);
@@ -635,13 +645,13 @@
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data.h_v_Sc_MouldProdBackBillList_Edit[0];
+ var data = result.data.h_v_Sc_MouldProdBackBillList[0];
console.info(data);
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HWHID": data.HWHID //浠撳簱ID
+ , "hwhid": data.hwhid //浠撳簱ID
, "HWHName": data.浠撳簱鍚嶇О //浠撳簱鍚嶇О
, "HSecManagerID": data.hsecmanagerid //楠屾敹鍛業D
, "HSecManagerName": data.楠屾敹鍛� //楠屾敹鍛樺悕绉�
@@ -692,7 +702,22 @@
RoadBillMain(hID);
/* RoadBillSub(linterid);*/
}
-
+ ////榛樿浠撳簱HWhList
+ //form.on('submit(HWhList)', function () {//閫夋嫨宸ョ
+ // layer.open({
+ // type: 2
+ // , area: ['666px', '666px']
+ // , title: '浠撳簱鍒楄〃'
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+ // , resize: false
+ // , cancel: function () {
+ // //$(".layui-btn").removeClass("layui-btn-disabled");
+ // }
+ // })
+ //});
//琛ㄥご淇℃伅浠撳簱寮圭獥
form.on('submit(WareHouse)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -704,18 +729,18 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/WareHouseInformation.html', 'yes'],
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HWHName").val(checkStatus.data[0].HName);
- $("#HWHID").val(checkStatus.data[0].HItemID);
+ $("#hwhid").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -738,7 +763,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '浠撳簱鍒楄〃',
+ title: '楠屾敹鍛樺垪琛�',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
@@ -776,7 +801,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '浠撳簱鍒楄〃',
+ title: '淇濈鍛樺垪琛�',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.html"
new file mode 100644
index 0000000..4a8085c
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.html"
@@ -0,0 +1,645 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鍣ㄥ叿鍒嗗竷寮忚皟鍏ュ崟鎹淮鎶ゅ垪琛�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style >
+ .layui-form-select .layui-input {
+ padding-right: 15px;
+ cursor: pointer;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐘舵��</label>
+ <div class="layui-input-block">
+ <select name="HStatus" lay-filter="HStatus" style="width:190px;">
+ <option value="-1" selected="selected">鍏ㄩ儴</option>
+ <option value="0">鏈鏍�</option>
+ <option value="1">宸插鏍�</option>
+ <option value="2">宸插叧闂�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-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="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-FirstPieceCheck" id="btn-FirstPieceCheck">棣栨</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>榛樿鍒楀</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit" id="btn-Exit">閫�鍑�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ 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
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板鎸夐挳
+ case 'btn-Add': set_AddNew();
+ break;
+ //缂栬緫鎸夐挳
+ case 'btn-Edit': set_ShowBill();
+ break;
+ //鍒犻櫎鎸夐挳
+ case 'btn-Delete': set_DeleteBill();
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit': set_CheckBill();
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit': set_AbandonCheck();
+ break;
+ //棰勮鎸夐挳
+ case 'btn-Print': get_PrintReport();
+ break;
+
+
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ };
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery(table, option);
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ });
+ //#endregion
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ sWhere = "";
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ function set_InitGrid() {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 180 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
+ , { field: 'HDeptID', title: 'HDeptID', width: 160, hide: false }
+ , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 200 }
+ , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 200 }
+ , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true }
+ , { field: '楠屾敹鍛樹唬鐮�', title: '楠屾敹鍛樹唬鐮�', width: 200 }
+ , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 200 }
+ , { field: 'hkeeperid', title: 'hkeeperid', width: 200, hide: true }
+ , { field: '淇濈鍛樹唬鐮�', title: '淇濈鍛樹唬鐮�', width: 200 }
+ , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 }
+ , { field: 'hwhid', title: 'hwhid', width: 200, hide: true }
+ , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 200 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 200 }
+ , { field: '鎽樿', title: '鎽樿', width: 115, hide: true }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200 }
+ , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+ , { field: 'hmaterid', title: 'hmaterid', width: 200, hide: true }
+ , { field: '妯″叿浠ｇ爜', title: '妯″叿浠ｇ爜', width: 115 }
+ , { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О', width: 200 }
+ , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 200 }
+ //, { field: '妯″叿鍝佺被', title: '妯″叿鍝佺被', width: 200 }
+ //, { field: '鏀舵枡浠撳簱浠ｇ爜', title: '鏀舵枡浠撳簱浠ｇ爜', width: 200 }
+ //, { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 200 }
+ , { field: 'HSPID', title: '浠撲綅浠ｇ爜', width: 200, hide: false }
+ //, { field: '浠撲綅浠ｇ爜', title: '浠撲綅浠ｇ爜', width: 200 }
+ //, { field: '浠撲綅', title: '浠撲綅', width: 200 }
+ , { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 200 }
+ , { field: '绱浣跨敤瀵垮懡', title: '绱浣跨敤瀵垮懡', width: 200 }
+ , { field: '鏈浣跨敤瀵垮懡', title: '鏈浣跨敤瀵垮懡', width: 200 }
+ , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', width: 200 }
+ //, { field: '鏈�鍚庣敓浜т骇鍝�', title: '鏈�鍚庣敓浜т骇鍝�', width: 200 }
+ //, { field: '閫�搴撶被鍨�', title: '閫�搴撶被鍨�', width: 200 }
+ , { field: '妯″叿鏂拌鏍�', title: '妯″叿鏂拌鏍�', width: 200 }
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
+ , { field: 'HBillType', title: 'HBillType', width: 200, hide: true }
+ , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 200 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 180, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 180, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+ , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+ ];
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ //, cellMinWidth: 120
+ , totalRow: true
+ , limit: 10
+ , height: 'full-50'
+ , cols: [columns]
+ , limits: [50, 500, 1000, 5000]
+ , done: function (res, curr, count) {
+
+ }
+ };
+ ////璁剧疆鍒楀
+ //var colWidth = getColumnsWidth();
+ //if (colWidth == "" || colWidth == []) {
+
+ //}
+ //else {
+ // $.each(columns, function (x, m) {
+ // m["width"] = colWidth[x];
+ // });
+ //}
+ }
+
+ ////#region 鑾峰彇鍒楀
+ //function getColumnsWidth() {
+ // var result = [];
+ // var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
+ // //鑾峰彇鍒楀
+ // $.ajax({
+ // url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
+ // async: false,
+ // type: "Get",
+ // dataType: "json",
+ // data: { "colNum": colNum, "Name": Name },
+ // success: function (data1) {
+ // if (data1.code == 1) {
+ // result = data1.data;
+ // }
+ // else if (data1.code == -1) {
+
+ // }
+ // else {
+ // layer.alert(data1.Message, { icon: 5 });
+ // }
+ // }, error: function (e) {
+ // layer.alert(e.Message, { icon: 5 });
+ // }
+ // });
+
+ // return result;
+ //}
+ ////#endregion
+
+ //#region 鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ //鍔犺浇缃戞牸
+ var index = layer.load(0);//閬僵
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldMoveStockStepInBillList/GetMouldMoveStockStepInBillList',
+ type: "GET",
+ data: { "sWhere": sWhere},
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery(table, option) {
+ var Status = $("select[name='Status']").val();//鐘舵��
+ var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ if (Status) {
+ switch (Status) {
+ case '-1': //鍏ㄩ儴
+ sWhere += "";
+ break;
+ case '0': //鏈鏍�
+ sWhere += " and 瀹℃牳浜�=''";
+ break;
+ case '1': //宸插鏍�
+ sWhere += " and 瀹℃牳浜�<>''";
+ break;
+ case '2': //宸插叧闂�
+ sWhere += " and 鍏抽棴浜�<>''";
+ default:
+
+ }
+ }
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ var index = layer.load(0);
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+ //#endregion
+
+
+ //#region 閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $('#Status').find("option[value='-1']").attr("selected", true);
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");
+ }
+ //#endregion
+
+ //#region 鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ area: ['100%', '100%'],
+ title: '鍣ㄥ叿鍒嗗竷寮忚皟鍑哄崟鎹垪琛�-鏂板',
+ shift: 0,
+ content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldMoveStockStepOutBill.html',
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ });
+ }
+ //#endregion
+
+
+ //淇敼鎸夐挳
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鍣ㄥ叿鍒嗗竷寮忚皟鍑哄崟鎹垪琛�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['Sc_Add_MouldMoveStockStepOutBill.html?HInterID=' + data[0].hinterid + '&HType=Modify', 'yes']
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰
+ location.reload();
+ }
+ , cancel: function () {
+
+ }
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
+
+ //鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ var ModRightNameDelete = 'Sc_MouldOtherInBill_Delete'
+
+ var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
+ , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Sc_ICMOReportBill/DeltetICMOReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HItemID": checkStatus.data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ }
+ else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ //#endregion
+
+
+ //#region 瀹℃牳
+ function set_CheckBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ICMOReportBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+
+ //#region 鍙嶅鏍�
+ function set_AbandonCheck() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ICMOReportBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+ }
+
+ }
+ //#endregion
+
+ //#region 棰勮
+ function get_PrintReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + InterID);
+ //window.open("../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HDepartMent" + "&OpenTmp=b");
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+ //#endregion
+
+
+ //#region 淇濆瓨鍒楀
+ function set_SaveGridColWidth() {
+ var arr = [];
+ // 鍒楁暟
+ var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
+ for (var i = 0; i <= colNum; i++) {
+ var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
+ var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
+ if (colName != "" && colName != null) {
+ arr.push(colWidth == -1 ? 200 : colWidth);
+ }
+ }
+ arr.unshift(40); //棣栦綅杩藉姞
+ $.ajax({
+ url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
+ async: false,
+ type: "POST",
+ dataType: "json",
+ data: { "myMap": JSON.stringify(arr), "Name": Name },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.alert(data1.Message, { icon: 1 });
+ } else {
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function (e) {
+ layer.alert(e.Message, { icon: 5 });
+ }
+ });
+ //璁剧疆璧嬪�煎垪瀹�
+ var colWidth = getColumnsWidth();
+ if (colWidth == "" || colWidth == []) {
+
+ }
+ else {
+ $.each(columns, function (x, m) {
+ m["width"] = colWidth[x];
+ });
+ }
+ location.reload();
+ }
+ //#endregion
+
+ //#region 榛樿鍒楀
+ function set_DefaultGridColWidth() {
+ var arr = [];
+ // 鍒楁暟
+ var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
+ for (var i = 0; i <= colNum; i++) {
+ var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
+ if (colName != "" && colName != null) {
+ arr.push(200); //榛樿瀹藉害200
+ }
+ }
+ arr.unshift(40); //棣栦綅杩藉姞
+ $.ajax({
+ url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
+ async: false,
+ type: "POST",
+ dataType: "json",
+ data: { "myMap": JSON.stringify(arr), "Name": Name },
+ success: function (data1) {
+ if (data1.count == 1) {
+
+ } else {
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function (e) {
+ layer.alert(e.Message, { icon: 5 });
+ }
+ });
+ //璁剧疆璧嬪�煎垪瀹�
+ var colWidth = getColumnsWidth();
+ if (colWidth == "" || colWidth == []) {
+
+ }
+ else {
+ $.each(columns, function (x, m) {
+ m["width"] = colWidth[x];
+ });
+ }
+ //get_FastQuery(table, option);
+ location.reload();
+ }
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html"
index 80a829d..91c7ae5 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html"
@@ -76,8 +76,8 @@
<div class="layui-inline">
<label class="layui-form-label">楠屾敹鍛�</label>
<div class="layui-input-inline">
- <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="0" style="float:left;width:150px;">
- <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HSecManagerList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -248,36 +248,67 @@
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
};
//鍒ゆ柇鏄惁鏂板
+ //if (hID == null || hID == 0) {
+ // //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
+ // option.data = [{ "HMaterID": 0, "HMaterName": "", "HMaterSpec": "","HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHName": "", "HRemark": "" }];
+ // table.render(option);
+ //}
+ //else {
+ // $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
+ // //缂栬緫鍔犺浇鏁版嵁
+ // var ajaxLoad = layer.load();
+ // $.ajax({
+ // url: GetWEBURL() + 'Sc_MouldOtherOutBill/Sc_MouldOtherOutBillListCheckDetai',
+ // type: "GET",
+ // data: { "HID": hID },
+ // success: function (result) {
+ // //console.log(result);
+ // //console.log('gouba' + result);
+ // if (result.code == 1) {
+ // option.data = result.data;
+ // layer.close(ajaxLoad);
+
+ // } else {
+ // layer.close(ajaxLoad);
+ // layer.alert(result.code + result.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.close(ajaxLoad);
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+
+ //}
+
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "-" + month + "-" + day;
+
+ //鍒ゆ柇鏄惁鏂板
if (hID == null || hID == 0) {
- //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
option.data = [{ "HMaterID": 0, "HMaterName": "", "HMaterSpec": "","HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHName": "", "HRemark": "" }];
table.render(option);
- }
- else {
- $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
- //缂栬緫鍔犺浇鏁版嵁
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + 'Sc_MouldOtherOutBill/Sc_MouldOtherOutBillListProjectDetai',
+ url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "sqlWhere": "and hmainid=" + hID },
- success: function (result) {
- //console.log(result);
- //console.log('gouba' + result);
- if (result.count == 1) {
- option.data = result.data;
- table.render(option);
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index0);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ data: { "HBillType": '3828' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(shijian);
+ $("#HInterID").val(0);
}
});
-
}
-
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ RoadBillMain(hID);
+ /* RoadBillSub(linterid);*/
+ }
//澶村伐鍏锋爮浜嬩欢
var rowid = 0;
@@ -2282,7 +2313,7 @@
function RoadBillMain(hID)//鍔犺浇琛ㄥご
{
- alert(hID);
+ //alert(hID);
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
$.ajax({
url: GetWEBURL() + "Sc_MouldOtherOutBill/Sc_MouldOtherOutBillListCheckDetai",
@@ -2290,29 +2321,44 @@
data: {
"HID": hID
},
+
success: function (result) {
-
+ option.data = [{ "HMaterID": 0, "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHName": "", "HRemark": "" }];
+ table.render(option);
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data.h_v_Sc_MouldOtherOutBillList[0];
- form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
- , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HWHID": data.HWHID //浠撳簱ID
- , "HWHName": data.浠撳簱鍚嶇О //浠撳簱鍚嶇О
- , "HSecManagerID": data.HSecManagerID //楠屾敹鍛業D
- , "HSecManagerName": data.楠屾敹浜� //楠屾敹鍛樺悕绉�
- , "HKeeperID": data.HKeeperID //淇濈鍛業D
- , "HKeeperName": data.淇濈鍛� //淇濈鍛樺悕绉�
- , "HManagerName": data.璐熻矗浜哄悕绉� //璐熻矗浜哄悕绉�
- , "HDeptID": data.HDeptID //閮ㄩ棬ID
- , "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
- , "HSourceBillType":"" //婧愬崟绫诲瀷
- , "XDH": "" //閫夊崟鍙�
- , "HExplanation": data.鎽樿 //鎽樿
- , "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
- });
+ //form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ // "HBillNo": data.鍗曟嵁鍙�
+ // , "HDate": formatDate(data.鏃ユ湡)
+ // , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ // , "HWHID": data.HWHID //浠撳簱ID
+ // , "HWHName": data.浠撳簱鍚嶇О //浠撳簱鍚嶇О
+ // , "HSecManagerID": data.HSecManagerID //楠屾敹鍛業D
+ // , "HSecManagerName": data.楠屾敹浜� //楠屾敹鍛樺悕绉�
+ // , "HKeeperID": data.HKeeperID //淇濈鍛業D
+ // , "HKeeperName": data.淇濈鍛� //淇濈鍛樺悕绉�
+ // , "HManagerName": data.璐熻矗浜哄悕绉� //璐熻矗浜哄悕绉�
+ // , "HDeptID": data.HDeptID //閮ㄩ棬ID
+ // , "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
+ // , "HSourceBillType":"" //婧愬崟绫诲瀷
+ // , "XDH": "" //閫夊崟鍙�
+ // , "HExplanation": data.鎽樿 //鎽樿
+ // , "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+ //});
+ $("#HBillNo").val(data.鍗曟嵁鍙�);
+ $("#HDate").val(formatDate(data.鏃ユ湡));
+ $("#HInnerBillNo").val(data.鍐呴儴鍗曟嵁鍙�);
+ $("#HWHID").val(data.HWHID);
+ $("#HWHName").val(data.浠撳簱);
+ $("#HManagerID").val(data.HSecManagerID);
+ $("#HManagerName").val(data.楠屾敹浜�);
+ $("#HKeeperID").val(data.HKeeperID);
+ $("#HKeeperName").val(data.淇濈鍛�);
+ $("#HDeptID").val(data.HDeptID);
+ $("#HDeptName").val(data.閮ㄩ棬);
+ $("#HExplanation").val(data.鎽樿);
+ $("#HRemark").val(data.琛ㄥご澶囨敞);
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
@@ -2323,33 +2369,6 @@
}
- var date = new Date();
- var day = date.getDate();
- var month = date.getMonth() + 1;
- var year = date.getFullYear();
- var shijian = year + "-" + month + "-" + day;
-
- //鍒ゆ柇鏄惁鏂板
- if (hID == null || hID == 0) {
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("0");
- $("#HBillNo").val("");
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3828' },
- success: function (d) {
- //console.log(d.data);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HDate").val(shijian);
- $("#HInterID").val(0);
- }
- });
- }
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(hID);
- /* RoadBillSub(linterid);*/
- }
//琛ㄥご淇℃伅浠撳簱寮圭獥
form.on('submit(WareHouse)', function () {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillList.html"
index 5e56a65..82631c2 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillList.html"
@@ -140,23 +140,23 @@
, { field: 'hmainid', title: 'hmainid', hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
- , { field: 'HWHID', title: 'HWHID', width: 160 }
+ , { field: 'HWHID', title: 'HWHID', width: 160, hide: true}
, { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 160, hide: true }
, { field: '浠撳簱', title: '浠撳簱', width: 200 }
- , { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true }
+ , { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
, { field: '楠屾敹浜轰唬鐮�', title: '楠屾敹浜轰唬鐮�', width: 200 }
, { field: '楠屾敹浜�', title: '楠屾敹浜�', width: 200 }
- , { field: 'HKeeperID', title: 'HKeeperID', width: 200 }
+ , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
, { field: '淇濈鍛樹唬鐮�', title: '淇濈鍛樹唬鐮�', width: 200 }
- , { field: 'HDeptID', title: 'HDeptID', width: 200 }
+ , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true}
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 200 }
, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 115 }
- , { field: '妯″叿浠ｇ爜', title: '妯″叿浠ｇ爜', width: 200 }
- , { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О', width: 200 }
+ //, { field: '妯″叿浠ｇ爜', title: '妯″叿浠ｇ爜', width: 200 }
+ //, { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О', width: 200 }
, { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 200 }
- , { field: '妯″叿鍝佺被', title: '妯″叿鍝佺被', width: 200 }
- , { field: '妯″叿浠撳簱', title: '妯″叿浠撳簱', width: 200 }
- , { field: 'HSPID', title: 'HSPID', width: 200 }
+ //, { field: '妯″叿鍝佺被', title: '妯″叿鍝佺被', width: 200 }
+ //, { field: '妯″叿浠撳簱', title: '妯″叿浠撳簱', width: 200 }
+ , { field: 'HSPID', title: 'HSPID', width: 200, hide: true }
, { field: '浠撲綅', title: '浠撲綅', width: 200 }
, { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 200 }
, { field: '绱Н浣跨敤瀵垮懡', title: '绱Н浣跨敤瀵垮懡', width: 200 }
@@ -166,7 +166,7 @@
, { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115, hide: true }
, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
, { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
- , { field: 'hsupid', title: 'hsupid', width: 200 }
+ , { field: 'hsupid', title: 'hsupid', width: 200, hide: true}
, { field: '妯″叿渚涘簲鍟嗕唬鐮�', title: '妯″叿渚涘簲鍟嗕唬鐮�', width: 200 }
, { field: '妯″叿渚涘簲鍟�', title: '妯″叿渚涘簲鍟�', width: 200 }
, { field: '鎽樿', title: '鎽樿', width: 200 }
@@ -186,7 +186,7 @@
, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
, { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
- , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+ //, { field: 'hbilltype', title: 'hbilltype', width: 200 }
]]
};
}
@@ -195,7 +195,7 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Sc_MouldOtherOutBill/GetMouldOtherOutBillList',
+ url: GetWEBURL() + '/Sc_MouldProdMoveBillList/GetMouldOtherOutBillList',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html"
index d01b426..fa8373c 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html"
@@ -307,7 +307,7 @@
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
RoadBillMain(linterid);
- RoadBillSub(linterid);
+ //RoadBillSub(linterid);
}
//鍒濆琛ㄦ牸鏁版嵁
var rowdata = [{
--
Gitblit v1.9.1