From 41e44027ef1a5a844bda6cc7d2a7207506382e85 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 08 一月 2024 09:46:16 +0800
Subject: [PATCH] 1
---
WebTM/views/user/login.html | 2
WebTM/views/user/login2.html | 14
WebTM/views/生产管理/生产完工单/Sc_Add_MESEndWorkBillList.html | 8
WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleEdit.html | 4
WebTM/views/WMS扫码模块/其他入库/Kf_OtherInBill_PDA.html | 479 +++++++++++++++++++++------
WebTM/views/index_Mobile.html | 8
WebTM/views/设备管理/设备入库/Sb_EquipStockInCheckBill.html | 3
WebTM/views/WMS扫码模块/其他入库/Kf_OtherInBillList_PDA.html | 4
WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html | 8
WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html | 15
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 48 ++
WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html | 8
WebTM/views/设备管理/设备维修派工单/Sb_EquipRepairSendWorkBillEdit.html | 11
WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html | 8
WebTM/views/user/login_pda.html | 147 ++++++--
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 6
WebTM/views/设备管理/Sb_Add_EqpRepairCheckBillList.html | 11
WebTM/views/设备管理/设备备品备件/Sb_EquipSparepartsBill.html | 5
WebTM/views/设备管理/Sb_EquipDotCheckPlanBillEdit.html | 4
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 9
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html | 4
WebTM/views/Baseset/基础资料/Gy_SupplierListNew.html | 113 ++++++
WebTM/views/Baseset/基础资料/Gy_EmployeeList.html | 2
WebTM/views/设备管理/设备投产检验验收单/Sb_EquipWorkBeforeCheckBillEdit.html | 9
WebTM/views/生产管理/产量汇报单/Sc_Add_ProductReportBillList.html | 12
WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleEdit.html | 4
WebTM/views/设备管理/Sb_Add_EqpConkBookBillList.html | 11
WebTM/views/设备管理/设备备品备件/Sb_EquipSparepartsChangeBill.html | 5
WebTM/views/Baseset/基础资料/Gy_DepartmentList.html | 2
WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html | 4
WebTM/views/设备管理/设备投产/Sb_EquipWorkBeforeCheckBill.html | 3
WebTM/WebTM.csproj | 1
32 files changed, 760 insertions(+), 212 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e3aef0e..a106875 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -123,6 +123,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ConveyCompList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ConveyTypeList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_SupplierListNew.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EquipFileBillMainList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_GetProcNoList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_InspectInstruMentList.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index c7f3304..27597b9 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -68,7 +68,7 @@
, data: []
, cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
, cols: [[
- { type: 'checkbox' }
+ { type: 'radio' }
, { field: 'HItemID', title: '閮ㄩ棬ID', hide: true }
, { field: 'HNumber', title: '閮ㄩ棬浠ｇ爜' }
, { field: 'HName', title: '閮ㄩ棬鍚嶇О', sort: true }
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 57d237d..37576d0 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -122,7 +122,7 @@
, data: []
, cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
, cols: [[
- { type: 'checkbox' }
+ { type: 'radio' }
, { field: 'HItemID', width: 150, title: '鑱屽憳ID', hide: true }
, { field: 'HNumber', width: 150, title: '鑱屽憳浠ｇ爜' }
, { field: 'HName', width: 150, title: '鑱屽憳鍚嶇О', sort: true }
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SupplierListNew.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SupplierListNew.html"
new file mode 100644
index 0000000..af025af
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SupplierListNew.html"
@@ -0,0 +1,113 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>渚涘簲鍟嗗垪琛�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 15px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护鍒�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="mainTable"></table>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ 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;
+ }
+ var params = getUrlVars();
+ var HStockOrgID = params[params[0]];
+
+ layui.use(['table', 'form', 'layer'], function () {
+ var table = layui.table
+ , form = layui.form
+ , layer = layui.layer;
+
+ //蹇�熸煡璇�
+ form.on('submit(HQuery)', function () {
+ RoadQuery($('#Value').val());
+ });
+ //杩斿洖
+ form.on('submit(FH)', function () {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ parent.GetHSupValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ RoadQuery($('#Value').val());
+ table.render({
+ elem: '#mainTable'
+ , data: []
+ , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HItemID', width: 150, title: '渚涘簲鍟咺D', hide: true }
+ , { field: 'HNumber', width: 150, title: '渚涘簲鍟嗕唬鐮�' }
+ , { field: 'HName', width: 150, title: '渚涘簲鍟嗗悕绉�', sort: true }
+ ]]
+ , page: true
+ , limits: [50, 500, 5000, 50000],
+ limit: 50
+ });
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadQuery(Where) {
+ var Value = Where;
+ if (Value == null) {
+ Value = '';
+ }
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/WEBSController/GetSupplierList_Json",
+ async: true,
+ data: { "Supplier": Value, "HStockOrgID": HStockOrgID},
+ success: function (result) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+
+ }
+ });
+ },
+ error: function (result) {
+ console.log(result);
+ }
+ });
+ };
+ });
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList_PDA.html"
index e1050a8..6fc2be7 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList_PDA.html"
@@ -209,8 +209,8 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- //, content: ['../../WMS鎵爜妯″潡/鍏朵粬鍏ュ簱/Kf_OtherInBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
- , content: ['../../楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
+ , content: ['../../WMS鎵爜妯″潡/鍏朵粬鍏ュ簱/Kf_OtherInBill_PDA.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+ //, content: ['../../楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
, resize: false
, cancel: function () {
$(".layui-btn").removeClass("layui-btn-disabled");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html"
index 99f56c3..63c113b 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>鍏朵粬鍏ュ簱</title>
+ <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">
@@ -31,27 +31,25 @@
</div>
<div class="layui-form-item" style="padding:15px;margin:0px">
<div class="layui-row">
- <div class="layui-col-xs6">
- <div class="layui-col-xs2">
- <label class="layui-form-label" style="width: 30px;padding-left: 0px;">鏉＄爜</label>
- </div>
- <div class="layui-col-xs10">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
- </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width: 30px;padding-left: 0px;">鏉＄爜</label>
</div>
- <div class="layui-col-xs5">
+ <div class="layui-col-xs7">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn layui_btn_sm" id="HBarCode-BT">纭畾</button>
+ </div>
+ <div class="layui-row">
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:30px;padding-left:0px;">鏁伴噺</label>
</div>
<div class="layui-col-xs7">
- <input type="text" name="HQty" id="HQty" lay-verify="HQty" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
- </div>
- <div class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn layui_btn_sm" id="HBarCode-BT">纭畾</button>
+ <input type="number" name="HQty" id="HQty" lay-verify="HQty" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
</div>
</div>
- <div class="layui-tab layui-col-xs12" lay-filter="tab-Kf_OtherInBill_PDA">
+ <div class="layui-tab layui-col-xs12" style="margin-top:5px;" lay-filter="tab-Kf_OtherInBill_PDA">
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;">閫夋嫨婧愬崟</li>
<li lay-id="2" style="padding:1px;">琛ㄥご淇℃伅</li>
@@ -206,6 +204,22 @@
</div>
<div class="layui-col-xs2">
<button type="button" lay-submit="" lay-filter="HDeptID-BT" class="layui-btn" id="HDeptID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:45px;padding-left:0px;">渚涘簲鍟�</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HSupID-BT" class="layui-btn" id="HSupID-BT">...</button>
</div>
</div>
</div>
@@ -414,8 +428,6 @@
//琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�佺粍缁囩瓑锛� new
$("#HWHID").val(sessionStorage["HWHID"]);
$("#HWHName").val(sessionStorage["HWHName"]);
- $("#HStockPlaceID").val(sessionStorage["HSPID"]);
- $("#HStockPlaceName").val(sessionStorage["HSPName"]);
$("#HDeptID").val(sessionStorage["HDeptID"]);
$("#HDeptName").val(sessionStorage["HDept"]);
$("#HSecManagerID").val(sessionStorage["HSecManagerID"]);
@@ -424,21 +436,48 @@
$("#HKeeperName").val(sessionStorage["HKeeper"]);
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillerID").val(sessionStorage["HBillerID"]);
$("#HStockOrgID").val(sessionStorage["OrganizationID"]);
$("#HStockOrgName").val(sessionStorage["Organization"]);
$("#HBillType").val("1203");
- $("#HBillerID").val(sessionStorage["HBillerID"]);
$("#HRedBlueFlag").val("false");
+ if (sessionStorage["HWhSPFlag"]) {
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").attr("readonly", "readonly");
+ $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+ $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+ $("#HStockPlaceName").removeAttr("readonly");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+
//榛樿鏄剧ず椤甸潰
element.tabChange('tab-Kf_OtherInBill_PDA', '2');
- set_InitDate(); //鍒濆鍖栬〃鍗曟椂闂�
- set_InitBillSubType(); //鑾峰彇鍗曟嵁瀛愮被鍨�
- set_InitGrid(); //鍒濆鍖栬〃鏍�
+ set_InitDate(); //鍒濆鍖栬〃鍗曟椂闂�
+ set_InitBillSubType(); //鑾峰彇鍗曟嵁瀛愮被鍨�
+ set_InitGrid(); //鍒濆鍖栬〃鏍�
+
+ var data = [];
+ listOption.cols = [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '婧愬崟鏁伴噺', title: '婧愬崟鏁伴噺', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 100 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+ , { field: '鏉＄爜涓暟', title: '鏉＄爜涓暟', width: 100 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
//鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
var pFocus = $("#HBarCode");
- pFocus.focus(); //鑾峰彇鍏夋爣
pFocus.select();
+ pFocus.focus(); //鑾峰彇鍏夋爣
}
//鍒濆鍖栬〃鍗曟椂闂存彃浠�
@@ -475,7 +514,7 @@
elem: '#wl-table'
//, toolbar: '#toolbarDemo'
, totalRow: true
- , height: 'full-50'
+ , height: 'full-60'
, cellMinWidth: 90
, limit: 50
};
@@ -545,11 +584,12 @@
success: function (d) {
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
- $("#HMainSourceBillType").val(d.data[0].HSourceBillType == null ? "1241" : d.data[0].HSourceBillType);
+ HInterID = $('#HInterID').val()
+ HBillNo = $('#HBillNo').val()
+ //$("#HMainSourceBillType").val(d.data[0].HSourceBillType == null ? "1241" : d.data[0].HSourceBillType);
//鑾峰彇婧愬崟绫诲瀷
if (d.data[0].HSourceBillType == "1241") {
$("#HMainSourceBillType").empty();
- $("#HMainSourceBillType").val("1241");
var optionHtml = '';
optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鍏ュ簱鐢宠鍗�' + "</option>";
$("#HMainSourceBillType").append(optionHtml);
@@ -558,7 +598,6 @@
}
else {
$("#HMainSourceBillType").empty();
- $("#HMainSourceBillType").val("-1");
var optionHtml = '';
optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鎵嬪伐褰曞叆' + "</option>";
$("#HMainSourceBillType").append(optionHtml);
@@ -598,10 +637,16 @@
$("#HStockPlaceName").val("");
$("#HStockPlaceName").removeAttr("readonly");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
- layer.msg("浠撳簱鏉＄爜涓虹┖锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ });
return;
}
+ layer.load(3);
$.ajax({
type: "GET",
url: GetWEBURL() + "/WEBSController/GetWarehouse_Json",
@@ -623,6 +668,7 @@
}
element.tabChange('tab-Kf_OtherInBill_PDA', '2');
//鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
$("#HBarCode").focus();
}
else {
@@ -633,7 +679,12 @@
$("#HStockPlaceName").val("");
$("#HStockPlaceName").removeAttr("readonly");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
- layer.msg(result.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ });
}
layer.closeAll("loading");
}
@@ -664,6 +715,10 @@
//鎵弿浠撲綅鏉＄爜
$('#HStockPlaceName').on('keydown', function (event) {
if (event.keyCode == 13) {
+ //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if ($("#HWHName").val() == '') {
+ $("#HWHID").val("0");
+ }
var sHWHID = $("#HWHID").val()
var HStockPlaceName = $('#HStockPlaceName').val()
if (HStockPlaceName == '') {
@@ -672,10 +727,16 @@
$("#HWHName").val("");
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
- layer.msg("浠撲綅鏉＄爜涓虹┖锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HStockPlaceName").select();
+ $("#HStockPlaceName").focus();
+ });
return;
}
+ layer.load(3);
$.ajax({
type: "GET",
url: GetWEBURL() + "/WEBSController/GetStockPlace_Json",
@@ -689,6 +750,7 @@
$("#HWHID").val(result.data[0].HWHID);
element.tabChange('tab-Kf_OtherInBill_PDA', '2');
//鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
$("#HBarCode").focus();
}
else {
@@ -697,7 +759,12 @@
$("#HWHName").val("");
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
- layer.msg(result.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HStockPlaceName").select();
+ $("#HStockPlaceName").focus();
+ });
}
layer.closeAll("loading");
}
@@ -707,6 +774,10 @@
//浠撲綅鎸夐挳
form.on('submit(HSpID-BT)', function () {
+ //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if ($("#HWHName").val() == '') {
+ $("#HWHID").val("0");
+ }
layer.open({
type: 2
, area: ['100%', '100%']
@@ -733,10 +804,16 @@
playSound();
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
- layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HKeeperName").select();
+ $("#HKeeperName").focus();
+ });
return;
}
+ layer.load(3);
$.ajax({
type: "GET",
url: GetWEBURL() + "/WEBSController/GetEmployee_Json",
@@ -748,13 +825,19 @@
$("#HKeeperName").val(result.data[0].HName);
element.tabChange('tab-Kf_OtherInBill_PDA', '2');
//鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
$("#HBarCode").focus();
}
else {
playSound();
$("#HKeeperID").val("0");
$("#HKeeperName").val("");
- layer.msg(result.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HKeeperName").select();
+ $("#HKeeperName").focus();
+ });
}
layer.closeAll("loading");
}
@@ -790,10 +873,16 @@
playSound();
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
- layer.msg("楠屾敹鍛樻潯鐮佷负绌猴紒", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("楠屾敹鍛樻潯鐮佷负绌猴紒", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSecManagerName").select();
+ $("#HSecManagerName").focus();
+ });
return;
}
+ layer.load(3);
$.ajax({
type: "GET",
url: GetWEBURL() + "/WEBSController/GetEmployee_Json",
@@ -805,13 +894,19 @@
$("#HSecManagerName").val(result.data[0].HName);
element.tabChange('tab-Kf_OtherInBill_PDA', '2');
//鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
$("#HBarCode").focus();
}
else {
playSound();
$("#HSecManagerID").val("0");
$("#HSecManagerName").val("");
- layer.msg(result.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSecManagerName").select();
+ $("#HSecManagerName").focus();
+ });
}
layer.closeAll("loading");
}
@@ -847,10 +942,16 @@
playSound();
$("#HDeptID").val("0");
$("#HDeptName").val("");
- layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HDeptName").select();
+ $("#HDeptName").focus();
+ });
return;
}
+ layer.load(3);
$.ajax({
type: "GET",
url: GetWEBURL() + "/WEBSController/GetDepartment_Json",
@@ -862,13 +963,19 @@
$("#HDeptName").val(result.data[0].HName);
element.tabChange('tab-Kf_OtherInBill_PDA', '2');
//鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
$("#HBarCode").focus();
}
else {
playSound();
$("#HDeptID").val("0");
$("#HDeptName").val("");
- layer.msg(result.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HDeptName").select();
+ $("#HDeptName").focus();
+ });
}
layer.closeAll("loading");
}
@@ -895,6 +1002,75 @@
//#endregion
+ //#region 渚涘簲鍟�
+ //鎵弿渚涘簲鍟嗘潯鐮�
+ $('#HSupName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ var HSupName = $('#HSupName').val()
+ if (HSupName == '') {
+ playSound();
+ $("#HSupID").val("0");
+ $("#HSupName").val("");
+ layer.msg("渚涘簲鍟嗘潯鐮佷负绌猴紒", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSupName").select();
+ $("#HSupName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetSupplier_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HSupName, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HSupID").val(result.data[0].HItemID);
+ $("#HSupName").val(result.data[0].HName);
+ element.tabChange('tab-Kf_OtherInBill_PDA', '2');
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HSupID").val("0");
+ $("#HSupName").val("");
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSupName").select();
+ $("#HSupName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ });
+
+ //渚涘簲鍟嗘寜閽�
+ form.on('submit(HSupID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '渚涘簲鍟嗗垪琛�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierListNew.html?HStockOrgID=' + HStockOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
//#endregion
@@ -902,6 +1078,32 @@
//#region 鎻愪氦
form.on('submit(cmdSaver)', function (data) {
+ //浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if ($("#HWHName").val() == '') {
+ $("#HWHID").val("0");
+ data.field.HWHID = $('#HWHID').val()
+ }
+ if ($("#HStockPlaceName").val() == '') {
+ $("#HStockPlaceID").val("0");
+ data.field.HStockPlaceID = $('#HStockPlaceID').val()
+ }
+ if ($("#HKeeperName").val() == '') {
+ $("#HKeeperID").val("0");
+ data.field.HKeeperID = $('#HKeeperID').val()
+ }
+ if ($("#HSecManagerName").val() == '') {
+ $("#HSecManagerID").val("0");
+ data.field.HSecManagerID = $('#HSecManagerID').val()
+ }
+ if ($("#HDeptName").val() == '') {
+ $("#HDeptID").val("0");
+ data.field.HDeptID = $('#HDeptID').val()
+ }
+ if ($("#HSupName").val() == '') {
+ $("#HSupID").val("0");
+ data.field.HSupID = $('#HSupID').val()
+ }
+
var sMainStr = JSON.stringify(data.field);
var sSubStr = table.cache['wl-table'];
if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
@@ -919,7 +1121,12 @@
layer.confirm(data.Message, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板','鍏抽棴'],
btn2: function () {
- parent.location.href = "../../../views/index_Mobile.html";
+ if (OperationType == 2) {
+ parent.location.href = "../../WMS鎵爜妯″潡/鍏朵粬鍏ュ簱/Kf_OtherInBillList_PDA.html";
+ }
+ else {
+ parent.location.href = "../../../views/index_Mobile.html";
+ }
}//鍏抽棴
}
, function () {
@@ -995,9 +1202,11 @@
data: { "HInterID": HInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": HBillType },
dataType: "json",
success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- //鏄剧ず琛ㄤ綋鏄庣粏
- DisBillEntryList();
+ if (data.count == 1) {
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ });
}
else {
playSound();
@@ -1008,7 +1217,6 @@
layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
- layer.close(index)
layer.closeAll("loading");
})
}
@@ -1023,7 +1231,14 @@
form.on('submit(cmdCancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.location.href = "../../../views/index_Mobile.html";
+ if (OperationType == 2) {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ }
+ else {
+ parent.location.href = "../../../views/index_Mobile.html";
+ }
});
})
@@ -1037,24 +1252,20 @@
//鎵弿婧愬崟鏉＄爜
$('#HSourceBillNo').on('keydown', function (event) {
if (event.keyCode == 13) {
- layer.load(3)
GetMeesageBySourceBillNo();
- layer.closeAll("loading");
}
});
//婧愬崟鎸夐挳
form.on('submit(HSourceBillNo-BT)', function (data) {
- layer.load(3)
GetMeesageBySourceBillNo();
- layer.closeAll("loading");
});
//鎵弿婧愬崟鏉＄爜
function GetMeesageBySourceBillNo(obj) {
var HSourceBillNo = $('#HSourceBillNo').val()
var HSourceBillType = $("#HMainSourceBillType").val()
-
+ layer.load(3)
$.ajax({
type: "GET",
url: GetWEBURL() + "/WEBSController/Get_SourceBarCode_OtherIn_Json",
@@ -1064,6 +1275,8 @@
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
playSound_OK();
HSourceFlag = true;
+ $("#HSupName").val(result.data.hSupNameField);
+ $("#HSupID").val(result.data.hSupIDField);
if (result.data.hDeptIDField != 0) {
$("#HDeptID").val(result.data.hDeptIDField);
$("#HDeptName").val(result.data.hDeptNameField);
@@ -1077,16 +1290,24 @@
$('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
}
element.tabChange('tab-Kf_OtherInBill_PDA', '2');
+ $("#HBarCode").select();
$("#HBarCode").focus();
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
}
else {
playSound();
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ element.tabChange('tab-Kf_OtherInBill_PDA', '1');
+ $("#HSourceBillNo").select();
+ $("#HSourceBillNo").focus();
+ });
}
}
});
+ layer.closeAll("loading");
}
//#endregion
@@ -1097,21 +1318,28 @@
//鎵弿鏉＄爜
$('#HBarCode').on('keydown', function (event) {
if (event.keyCode == 13) {
- layer.load(3)
GetMeesageByBarCode();
- layer.closeAll("loading");
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
}
});
//鏉＄爜鎸夐挳
form.on('submit(HBarCode-BT)', function (data) {
- layer.load(3)
GetMeesageByBarCode();
- layer.closeAll("loading");
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
});
//鎵潯鐮�
function GetMeesageByBarCode(obj) {
+ //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+ if ($("#HWHName").val() == '') {
+ $("#HWHID").val("0");
+ }
+ if ($("#HStockPlaceName").val() == '') {
+ $("#HStockPlaceID").val("0");
+ }
var sOldBarCode = $('#HBarCode').val()
var HDeleteFlag = sOldBarCode.substring(0, 1);
var sBarCode = sOldBarCode.slice(1);
@@ -1123,12 +1351,19 @@
if (HDeleteFlag == "*") {
if (sBarCode == "") {
- layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ playSound();
+ layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
return;
}
else {
$('#HBarCode').val("");
}
+ layer.load(3)
$.ajax(
{
type: "GET",
@@ -1146,21 +1381,36 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-
+ layer.msg(data.Message, {
+ icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
}
},
error: function (err) {
playSound();
- layer.msg('閿欒' + err, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg('閿欒' + err, {
+ icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
}
});
+ layer.closeAll("loading");
}
else {
var sBarCode = $('#HBarCode').val()
if (sBarCode == '') {
playSound();
- layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
return;
}
if (sBarCode != "") {
@@ -1169,6 +1419,7 @@
if (sHQty == "") {
sHQty = 0;
}
+ layer.load(3)
$.ajax({
type: "GET",
url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
@@ -1208,16 +1459,17 @@
return;//缁撴潫
}
else if (result.data.hBarTypeField == '婧愬崟鏉＄爜') {
+ HSourceFlag = true;
+ $("#HSupName").val(result.data.hSupNameField);
+ $("#HSupID").val(result.data.hSupIDField);
if (result.data.hDeptIDField != 0) {
$("#HDeptID").val(result.data.hDeptIDField);
$("#HDeptName").val(result.data.hDeptNameField);
}
$("#HSourceBillNo").val(result.data.hSourceBillNoField);
- HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
if (result.data.hSourceBillTypeField == "1241") {
$("#HMainSourceBillType").empty();
- $("#HMainSourceBillType").val("1241");
var optionHtml = '';
optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鍏ュ簱鐢宠鍗�' + "</option>";
$("#HMainSourceBillType").append(optionHtml);
@@ -1226,14 +1478,16 @@
}
else {
$("#HMainSourceBillType").empty();
- $("#HMainSourceBillType").val("-1");
var optionHtml = '';
- optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鎵嬪伐褰曞叆' + "</option>";
+ optionHtml += "<option value = '-1' >" + '鎵嬪伐褰曞叆' + "</option>";
$("#HMainSourceBillType").append(optionHtml);
layui.form.render('select');
$("#HMainSourceBillType").attr("readonly", "readonly");
}
- $("#HSourceBillNo").attr("readonly", "readonly");
+ if (result.data.hMulSourceFlagField == 0) {
+ $("#HSourceBillNo").attr("readonly", "readonly");
+ $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
element.tabChange('tab-Kf_OtherInBill_PDA', '3');
}
//鐗╂枡鏉＄爜
@@ -1242,16 +1496,17 @@
element.tabChange('tab-Kf_OtherInBill_PDA', '3');
}
else {
+ HSourceFlag = true;
+ $("#HSupName").val(result.data.hSupNameField);
+ $("#HSupID").val(result.data.hSupIDField);
if (result.data.hDeptIDField != 0) {
$("#HDeptID").val(result.data.hDeptIDField);
$("#HDeptName").val(result.data.hDeptNameField);
}
$("#HSourceBillNo").val(result.data.hSourceBillNoField);
- HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
if (result.data.hSourceBillTypeField == "1241") {
$("#HMainSourceBillType").empty();
- $("#HMainSourceBillType").val("1241");
var optionHtml = '';
optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鍏ュ簱鐢宠鍗�' + "</option>";
$("#HMainSourceBillType").append(optionHtml);
@@ -1266,7 +1521,10 @@
layui.form.render('select');
$("#HMainSourceBillType").attr("readonly", "readonly");
}
- $("#HSourceBillNo").attr("readonly", "readonly");
+ if (result.data.hMulSourceFlagField == 0) {
+ $("#HSourceBillNo").attr("readonly", "readonly");
+ $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
element.tabChange('tab-Kf_OtherInBill_PDA', '3');
}
}
@@ -1277,14 +1535,25 @@
}
else {
playSound();
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
}
},
error: function (err) {
playSound();
- layer.msg("閿欒锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("閿欒锛�" + err, {
+ icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
}
});
+ layer.closeAll("loading");
}
}
@@ -1300,9 +1569,9 @@
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
success: function (result) {
+ var data = [];
+ var col = [];
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = [];
- var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in result.list) {
//鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
@@ -1315,7 +1584,7 @@
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣' });
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -1337,17 +1606,6 @@
}
}
columns = col;
-
- //璁剧疆璧嬪�煎垪瀹�
- var colWidth = getColumnsWidth();
- if (colWidth == "" || colWidth == []) {
-
- }
- else {
- $.each(columns, function (x, m) {
- m["width"] = colWidth[x];
- });
- }
listOption.cols = [columns];
listOption.data = result.data.Materlist;
listOption.totalRow = true;
@@ -1365,41 +1623,33 @@
$("#HSPName_B").val(result.data.BarCodeDetailslist[0].HSPName);
}
else {
- //layer.msg(result.Message);
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ listOption.cols = [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '婧愬崟鏁伴噺', title: '婧愬崟鏁伴噺', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 100 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+ , { field: '鏉＄爜涓暟', title: '鏉＄爜涓暟', width: 100 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
+
+ //鏉＄爜淇℃伅
+ $("#HBarCode_B").val("");
+ $("#HMaterName_B").val("");
+ $("#HMaterModel_B").val("");
+ $("#HBatchNo_B").val("");
+ $("#HUnitName_B").val("");
+ $("#HQty_B").val("");
+ $("#HTMQty_B").val("");
+ $("#HWHName_B").val("");
+ $("#HSPName_B").val("");
}
}
});
}
-
- //#region 鑾峰彇鍒楀
- function getColumnsWidth() {
- var result = [];
- var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
- //鑾峰彇鍒楀
- $.ajax({
- type: "Get",
- url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
- async: false,
- dataType: "json",
- data: { "colNum": colNum, "Name": HModName },
- 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
//#endregion
@@ -1458,6 +1708,13 @@
$("#HDeptID").val(obj[0].HItemID);
}
}
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖渚涘簲鍟嗕俊鎭�
+ function GetHSupValue(obj) {
+ if (obj.length > 0) {
+ $("#HSupName").val(obj[0].HName);
+ $("#HSupID").val(obj[0].HItemID);
+ }
+ }
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 39ade8d..742b4e8 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -387,15 +387,9 @@
</a>
</dd>
<dd>
- <a href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html" target="main_self_frame" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 鍏朵粬鍏ュ簱
- </a>
- </dd>
- <dd>
<a href="WMS鎵爜妯″潡/鍏朵粬鍏ュ簱/Kf_OtherInBill_PDA.html" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 鍏朵粬鍏ュ簱22
+ 鍏朵粬鍏ュ簱鍗�
</a>
</dd>
<dd>
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index 71db7ca..f6a0421 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -385,6 +385,8 @@
sessionStorage["Czmm"] = result.data[0].Czmm;
sessionStorage["Czybm"] = result.data[0].Czybm;
sessionStorage["HEmpID"] = result.data[0].HEmpID;
+ sessionStorage["HEmpNumber"] = result.data[0].HEmpNumber;
+ sessionStorage["HEmpName"] = result.data[0].HEmpName;
sessionStorage["HGroup"] = result.data[0].HGroup;
sessionStorage["HGroupID"] = result.data[0].HGroupID;
sessionStorage["HProc"] = result.data[0].HProc;
diff --git a/WebTM/views/user/login2.html b/WebTM/views/user/login2.html
index 4907208..44643ec 100644
--- a/WebTM/views/user/login2.html
+++ b/WebTM/views/user/login2.html
@@ -116,7 +116,7 @@
if (i == 0)
Organization += '<option style="color:blue;" value="' + data[i].ID + '" selected>' + data[i].Name + '</option>';
else
- Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#Organization").append(Organization);
@@ -129,7 +129,7 @@
}
})
-
+
//form.render();
@@ -158,7 +158,7 @@
if (e.keyCode == 13) {
loging();
}
- });
+ });
//鐢ㄦ埛鍚嶆鍥炶溅鍏夋爣绉诲埌瀵嗙爜妗�
$('#LAY-user-login-username').on('keydown', function (e) {
if (e.keyCode == 13) {
@@ -203,7 +203,7 @@
var PassWord = $("#LAY-user-login-password").val();
layer.load(3);
$.ajax({
- type: "get",
+ type: "get",
url: GetWEBURL() + "/Web/GetUser",
data: { "UserName": UserName, "PassWord": PassWord, "HOrgName": $("#Organization").val() },
success: function (result) {
@@ -230,6 +230,8 @@
sessionStorage["Czmm"] = result.data[0].Czmm;
sessionStorage["Czybm"] = result.data[0].Czybm;
sessionStorage["HEmpID"] = result.data[0].HEmpID;
+ sessionStorage["HEmpNumber"] = result.data[0].HEmpNumber;
+ sessionStorage["HEmpName"] = result.data[0].HEmpName;
sessionStorage["HGroup"] = result.data[0].HGroup;
sessionStorage["HGroupID"] = result.data[0].HGroupID;
sessionStorage["HProc"] = result.data[0].HProc;
@@ -249,7 +251,7 @@
//if (!judgeMorPCflag) {//绉诲姩绔�
// window.location.href = '../../views/index_Mobile.html'
//} else {//PC绔�
- window.location.href = '../../views/indexMenu.html'
+ window.location.href = '../../views/indexMenu.html'
//}
get_WriteConfigFile();
}
@@ -273,7 +275,7 @@
$("body").append('<audio id="cs" hidden controls> <source src = "../video/jingbao.wav" type = "audio/ogg"> </audio >');
var audio = document.getElementById("cs");
audio.play();
- }
+ }
});
</script>
diff --git a/WebTM/views/user/login_pda.html b/WebTM/views/user/login_pda.html
index 8be2739..12ebb86 100644
--- a/WebTM/views/user/login_pda.html
+++ b/WebTM/views/user/login_pda.html
@@ -201,68 +201,135 @@
}
var UserName = $("#LAY-user-login-username").val();
var PassWord = $("#LAY-user-login-password").val();
+ var HStockOrgID = $("#Organization").val();
+ var HStockOrgName = $("#Organization option:selected").text();
layer.load(3);
$.ajax({
type: "get",
- url: GetWEBURL() + "/Web/GetUser",
- data: { "UserName": UserName, "PassWord": PassWord, "HOrgName": $("#Organization").val() },
+ url: GetWEBURL() + "/WEBSController/GetUser_Json",
+ data: { "HUserNumber": UserName, "HPassWord": PassWord, "HStockOrgID": HStockOrgID, "HStockOrgName": HStockOrgName },
success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(result.Message, { icon: 1 });
- //sessionStorage["HUserName"] = user.username;
+ if (result.count == 1) {
sessionStorage["HUserName"] = result.data[0].Czymc;
sessionStorage["HBillerID"] = result.data[0].HK3UserID;
- sessionStorage["SourceFlag"] = false;
- sessionStorage["HKeeperID"] = result.data[0].HKeeperID;
- sessionStorage["HKeeper"] = result.data[0].HKeeper;
- sessionStorage["HSecManagerID"] = result.data[0].HSecManagerID;
- sessionStorage["HSecManager"] = result.data[0].HSecManager;
- sessionStorage["HSellManID"] = result.data[0].HSellManID;
- sessionStorage["HSellMan"] = result.data[0].HSellMan;
- sessionStorage["HDeptID"] = result.data[0].HDeptID;
- sessionStorage["HDept"] = result.data[0].HDept;
- sessionStorage["HWHID"] = result.data[0].HWhID;
- sessionStorage["HWHName"] = result.data[0].HWHName;
- sessionStorage["HSPID"] = result.data[0].HSPID;
- sessionStorage["HSPName"] = result.data[0].HSPName;
- sessionStorage["HSupID"] = result.data[0].HSupID;
- sessionStorage["HSupName"] = result.data[0].HSupName;
sessionStorage["Czmm"] = result.data[0].Czmm;
sessionStorage["Czybm"] = result.data[0].Czybm;
- sessionStorage["HEmpID"] = result.data[0].HEmpID;
- sessionStorage["HGroup"] = result.data[0].HGroup;
- sessionStorage["HGroupID"] = result.data[0].HGroupID;
- sessionStorage["HProc"] = result.data[0].HProc;
- sessionStorage["HProcNo"] = result.data[0].HProcNo;
- sessionStorage["HSource"] = result.data[0].HSource;
- sessionStorage["HSourceID"] = result.data[0].HSourceID;
- sessionStorage["HWorkCenter"] = result.data[0].HWorkCenter;
- sessionStorage["HWorkCenterID"] = result.data[0].HWorkCenterID;
- sessionStorage["HProcName"] = result.data[0].HProcName;
- sessionStorage["HProcID"] = result.data[0].HProcID;
+ sessionStorage["SourceFlag"] = false;
sessionStorage["login"] = "login";
- sessionStorage["OrganizationID"] = $("#Organization").val();
- sessionStorage["Organization"] = $("#Organization option:selected").text();
- sessionStorage["HManagerID"] = result.data[0].HSecManagerID;
- sessionStorage["HManagerName"] = result.data[0].HSecManager;
- //sessionStorage["IP"] = System.Configuration.ConfigurationSettings.AppSettings("name");
+ sessionStorage["OrganizationID"] = HStockOrgID;
+ sessionStorage["Organization"] = HStockOrgName;
+ sessionStorage["HDeptID"] = result.data[0].HDeptID;
+ sessionStorage["HDept"] = result.data[0].HDeptName;
+ sessionStorage["HSupID"] = result.data[0].HSupID;
+ sessionStorage["HSupName"] = result.data[0].HSupName;
+ sessionStorage["HKeeperID"] = result.data[0].HKeeperID;
+ sessionStorage["HKeeper"] = result.data[0].HKeeperName;
+ sessionStorage["HSecManagerID"] = result.data[0].HSecManagerID;
+ sessionStorage["HSecManager"] = result.data[0].HSecManagerName;
+ sessionStorage["HSellManID"] = result.data[0].HSellManID;
+ sessionStorage["HSellMan"] = result.data[0].HSellManName;
+ sessionStorage["HEmpID"] = result.data[0].HEmpID;
+ sessionStorage["HEmpName"] = result.data[0].HEmpName;
+ sessionStorage["HWHID"] = result.data[0].HWhID;
+ sessionStorage["HWHName"] = result.data[0].HWhName;
+ sessionStorage["HWhSPFlag"] = result.data[0].HWhSPFlag;
+ sessionStorage["HSCWHID"] = result.data[0].HSCWHID;
+ sessionStorage["HSCWHName"] = result.data[0].HSCWHName;
+ sessionStorage["HSCWHSPFlag"] = result.data[0].HSCWHSPFlag;
+ sessionStorage["HMouldWhID"] = result.data[0].HMouldWhID;
+ sessionStorage["HMouldWhName"] = result.data[0].HMouldWhName;
+ sessionStorage["HMouldWhSPFlag"] = result.data[0].HMouldWhSPFlag;
+ sessionStorage["HMouldSCWhID"] = result.data[0].HMouldSCWhID;
+ sessionStorage["HMouldSCWhName"] = result.data[0].HMouldSCWhName;
+ sessionStorage["HMouldSCWhSPFlag"] = result.data[0].HMouldSCWhSPFlag;
+ sessionStorage["HGroupID"] = result.data[0].HGroupID;
+ sessionStorage["HGroup"] = result.data[0].HGroupName;
+ sessionStorage["HProcID"] = result.data[0].HProcID;
+ sessionStorage["HProcName"] = result.data[0].HProcName;
+ sessionStorage["HSourceID"] = result.data[0].HSourceID;
+ sessionStorage["HSource"] = result.data[0].HSourceName;
+ sessionStorage["HWorkCenterID"] = result.data[0].HWorkCenterID;
+ sessionStorage["HWorkCenter"] = result.data[0].HWorkCenterName;
+ sessionStorage["HSPID"] = result.data[0].HSPID;
+ sessionStorage["HSPName"] = result.data[0].HSPName;
+
+ layer.msg(result.Message, { icon: 1 });
//鐧诲綍绉诲姩绔�
window.location.href = '../../views/index_Mobile.html'
-
get_WriteConfigFile();
}
else {
- // $("#verifycode").click();
- layer.msg(result.Message, { icon: 5 });
+ layer.msg(result.Message, { icon: 5, time: 10000 });
}
layer.closeAll("loading");
},
error: function (result) {
layer.closeAll("loading");
layer.msg("鎺ュ彛璇锋眰澶辫触!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
}
})
+
+ //$.ajax({
+ // type: "get",
+ // url: GetWEBURL() + "/Web/GetUser",
+ // data: { "UserName": UserName, "PassWord": PassWord, "HOrgName": $("#Organization").val() },
+ // success: function (result) {
+ // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ // layer.msg(result.Message, { icon: 1 });
+ // //sessionStorage["HUserName"] = user.username;
+ // sessionStorage["HUserName"] = result.data[0].Czymc;
+ // sessionStorage["HBillerID"] = result.data[0].HK3UserID;
+ // sessionStorage["SourceFlag"] = false;
+ // sessionStorage["HKeeperID"] = result.data[0].HKeeperID;
+ // sessionStorage["HKeeper"] = result.data[0].HKeeper;
+ // sessionStorage["HSecManagerID"] = result.data[0].HSecManagerID;
+ // sessionStorage["HSecManager"] = result.data[0].HSecManager;
+ // sessionStorage["HSellManID"] = result.data[0].HSellManID;
+ // sessionStorage["HSellMan"] = result.data[0].HSellMan;
+ // sessionStorage["HDeptID"] = result.data[0].HDeptID;
+ // sessionStorage["HDept"] = result.data[0].HDept;
+ // sessionStorage["HWHID"] = result.data[0].HWhID;
+ // sessionStorage["HWHName"] = result.data[0].HWHName;
+ // sessionStorage["HSPID"] = result.data[0].HSPID;
+ // sessionStorage["HSPName"] = result.data[0].HSPName;
+ // sessionStorage["HSupID"] = result.data[0].HSupID;
+ // sessionStorage["HSupName"] = result.data[0].HSupName;
+ // sessionStorage["Czmm"] = result.data[0].Czmm;
+ // sessionStorage["Czybm"] = result.data[0].Czybm;
+ // sessionStorage["HEmpID"] = result.data[0].HEmpID;
+ // sessionStorage["HGroup"] = result.data[0].HGroup;
+ // sessionStorage["HGroupID"] = result.data[0].HGroupID;
+ // sessionStorage["HProc"] = result.data[0].HProc;
+ // sessionStorage["HProcNo"] = result.data[0].HProcNo;
+ // sessionStorage["HSource"] = result.data[0].HSource;
+ // sessionStorage["HSourceID"] = result.data[0].HSourceID;
+ // sessionStorage["HWorkCenter"] = result.data[0].HWorkCenter;
+ // sessionStorage["HWorkCenterID"] = result.data[0].HWorkCenterID;
+ // sessionStorage["HProcName"] = result.data[0].HProcName;
+ // sessionStorage["HProcID"] = result.data[0].HProcID;
+ // sessionStorage["login"] = "login";
+ // sessionStorage["OrganizationID"] = $("#Organization").val();
+ // sessionStorage["Organization"] = $("#Organization option:selected").text();
+ // sessionStorage["HManagerID"] = result.data[0].HSecManagerID;
+ // sessionStorage["HManagerName"] = result.data[0].HSecManager;
+ // //sessionStorage["IP"] = System.Configuration.ConfigurationSettings.AppSettings("name");
+ // //鐧诲綍绉诲姩绔�
+ // window.location.href = '../../views/index_Mobile.html'
+
+ // get_WriteConfigFile();
+ // }
+ // else {
+ // // $("#verifycode").click();
+ // layer.msg(result.Message, { icon: 5 });
+ // }
+ // layer.closeAll("loading");
+ // },
+ // error: function (result) {
+ // layer.closeAll("loading");
+ // layer.msg("鎺ュ彛璇锋眰澶辫触!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+ // }
+ //})
}
function playSound() {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
index 93c2c15..96cad61 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
@@ -378,9 +378,17 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
+ $("#HWorkManID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HWorkManName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
set_AddFNew();
}
else if (OperationType == 2) {//鏈夋簮鍗�
+ $("#HWorkManID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HWorkManName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
set_AddNew();
}
else if (OperationType == 3) {//缂栬緫
@@ -487,8 +495,8 @@
$("#HSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
$("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
$("#HSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
- $("#HGroupID").val(LoadData[0].HDeptID); //鐝粍ID
- $("#HGroupName").val(LoadData[0].HDeptName); //鐝粍
+ //$("#HGroupID").val(LoadData[0].HDeptID); //鐝粍ID
+ //$("#HGroupName").val(LoadData[0].HDeptName); //鐝粍
$("#HICMOInterID").val(LoadData[0].HICMOInterID); //鐢熶骇璁㈠崟ID
$("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
$("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
index d2ecf76..18b9cbc 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
@@ -379,9 +379,17 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
set_AddFNew();
}
else if (OperationType == 2) {//鏈夋簮鍗�
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
set_AddNew();
}
else if (OperationType == 3) {//缂栬緫
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
index 5e1ad48..c004028 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
@@ -359,9 +359,17 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
set_AddFNew();
}
else if (OperationType == 2) {//鏈夋簮鍗�
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
set_AddNew();
}
else if (OperationType == 3) {//缂栬緫
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
index ad50d73..44c714c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
@@ -365,9 +365,17 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
set_AddFNew();
}
else if (OperationType == 2) {//鏈夋簮鍗�
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
set_AddNew();
}
else if (OperationType == 3) {//缂栬緫
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index 3053c4b..a8ee9af 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -316,9 +316,21 @@
}
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
+ $("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
set_AddFNew();
}
else if (OperationType == 2) {//鏈夋簮鍗曟柊澧�
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
+ $("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
set_AddNew();
}
else if (OperationType == 3) {//缂栬緫
@@ -344,9 +356,10 @@
var NewRow = {
"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
- "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": ""
+ "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
+ "HSourceBillType":0
};
-
+
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -431,7 +444,8 @@
option.data = [{
"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
- "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": ""
+ "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
+ "HSourceBillType": 0
}];
table.render(option);
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -461,7 +475,8 @@
//var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HRemark": "" };
table.cache["mainTable"].push({
"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
- "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": ""
+ "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
+ "HSourceBillType": 0
});
option.data = table.cache["mainTable"];
table.render(option);
@@ -539,9 +554,10 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
+ $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+ //var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ //parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
});
}
else {
@@ -875,10 +891,10 @@
, { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', edit: 'text', width: 100, hide: true }
, { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true }
- , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', edit: 'text', width: 100 }
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', edit: 'text', width: 100, hide: true }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true }
- , { field: 'HSourceBillNo', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true }
- , { field: 'HSourceBillType', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', width: 100, hide: true }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', edit: 'text', width: 100, hide: true }
, { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
@@ -970,7 +986,8 @@
option.data = [{
"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
- "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": ""
+ "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
+ "HSourceBillType": 0
}];
table.render(option);
}
@@ -1002,7 +1019,8 @@
"HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": data[i].鐢熶骇璧勬簮ID, "HSourceCode": data[i].鐢熶骇璧勬簮浠ｇ爜,
"HSourceName": data[i].鐢熶骇璧勬簮鍚嶇О, "HWorkerid": data[i].鎿嶄綔鍛業D, "HWorkerCode": data[i].鎿嶄綔鍛樹唬鐮�,
"HWorkerName": data[i].鎿嶄綔鍛樺悕绉�, "HQty": data[i].浜ч噺, "HBadQty": data[i].涓嶈壇鏁伴噺 == '' ? 0 : data[i].涓嶈壇鏁伴噺, "HICMOBillNo": data[i].鐢熶骇璁㈠崟鍙�,
- "HICMOInterID": data[i].HICMOInterID, "HICMOEntryID": data[i].HICMOEntryID, "HRemark": ""
+ "HICMOInterID": data[i].HICMOInterID, "HICMOEntryID": data[i].HICMOEntryID, "HRemark": "", "HSourceInterID": data[i].HICMOInterID, "HSourceEntryID": data[i].HICMOEntryID, "HSourceBillNo": data[i].鐢熶骇璁㈠崟鍙�,
+ "HSourceBillType": 3710
});
}
@@ -1033,7 +1051,8 @@
option.data = [{
"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
- "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": ""
+ "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
+ "HSourceBillType": 0
}];
table.render(option);
}
@@ -1048,7 +1067,8 @@
option.data = [{
"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
- "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": ""
+ "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
+ "HSourceBillType": 0
}];
table.render(option);
}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
index 4d955b7..f0f1f28 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
@@ -237,8 +237,15 @@
};
//鍒ゆ柇鏄惁鏂板
if (hID == null || hID == 0) {
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍙戠幇浜篒D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍙戠幇浜�
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
+ $("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬
+ $("#HManagerID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭璐熻矗浜篒D
+ $("#HManagerName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭璐熻矗浜�
+
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
- option.data = [{ "HConkReasonID": 0, "HConkReasonCode": "", "HConkReasonName": " ", "HConkExplanation": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HRemark": " " }];
+ option.data = [{ "HConkReasonID": 0, "HConkReasonCode": "", "HConkReasonName": " ", "HConkExplanation": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " }];
table.render(option);
}
else {
@@ -274,7 +281,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HConkReasonID": 0, "HConkReasonCode": "", "HConkReasonName": " ", "HConkExplanation": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HRemark": " " };
+ var NewRow = { "HConkReasonID": 0, "HConkReasonCode": "", "HConkReasonName": " ", "HConkExplanation": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " };
switch (obj.event) {
case 'btn-AddLine':
//table.cache["mainTable"].push(AddRow[rows]);
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
index f75ee78..b96d197 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
@@ -289,6 +289,13 @@
set_InitGrid_pj();
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭缁翠慨浜篒D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭缁翠慨浜�
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
+ $("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬
+ $("#HManagerID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭璐熻矗浜篒D
+ $("#HManagerName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭璐熻矗浜�
+
set_AddFNew();
}
else if (OperationType == 3) {//缂栬緫
@@ -326,7 +333,7 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
- var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": ""/*, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " */ };
+ var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRepairExplanation": "", "HRemark": ""/*, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " */ };
switch (obj.event) {
//澧炲姞涓�琛�
case 'btn-AddLine': set_AddLine(NewRow);
@@ -340,7 +347,7 @@
table.on('toolbar(mainTable1)', function (obj) {
var checkStatus = table.checkStatus('mainTable1')
, data = checkStatus.data;
- var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "0", "HRemark": "" };
+ var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HQty": "0", "HRemark": "" };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine1': btnAddLine1(NewRow);
@@ -823,8 +830,8 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": ""/*, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " "*/ }];
- option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "0", "HRemark": "" }];
+ option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRepairExplanation": "", "HRemark": ""/*, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " "*/ }];
+ option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HQty": "0", "HRemark": "" }];
table.render(option);
table.render(option1);
}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
index 11277aa..051c359 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
@@ -221,6 +221,13 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭楠屾敹浜篒D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭楠屾敹浜�
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
+ $("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬
+ $("#HManagerID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭璐熻矗浜篒D
+ $("#HManagerName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭璐熻矗浜�
+
set_AddFNew();
}
else if (OperationType == 3) {//缂栬緫
@@ -392,7 +399,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HRepairCheckID": 0, "HRepairCheckCode": "", "HRepairCheckName": " ", "HRepairCheckContent": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HRemark": " " };
+ var NewRow = { "HRepairCheckID": 0, "HRepairCheckCode": "", "HRepairCheckName": " ", "HRepairCheckContent": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -545,7 +552,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HRepairCheckID": 0, "HRepairCheckCode": "", "HRepairCheckName": " ", "HRepairCheckContent": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HRemark": " " }];
+ option.data = [{ "HRepairCheckID": 0, "HRepairCheckCode": "", "HRepairCheckName": " ", "HRepairCheckContent": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " }];
table.render(option);
}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index 7ffe014..a0c89e6 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -211,7 +211,7 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
+ var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -708,7 +708,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" }];
table.render(option);
}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
index 9cf8b1b..f364e52 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
@@ -216,7 +216,7 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
+ var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" };
switch (obj.event) {
//澧炲姞涓�琛�
case 'btn-AddLine': set_AddLine(NewRow);
@@ -433,7 +433,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" }];
table.render(option);
}
//鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index b2f0b54..445c1fa 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -240,7 +240,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };
+ var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -742,7 +742,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+ option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " }];
option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "" }];
table.render(option);
table.render(option1);
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
index 0876d8d..90e521e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
@@ -253,7 +253,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };
+ var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -268,7 +268,7 @@
table.on('toolbar(mainTable1)', function (obj) {
var checkStatus = table.checkStatus('mainTable1')
, data = checkStatus.data;
- var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "0", "HRemark": "" };
+ var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HQty": "0", "HRemark": "" };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine1': btnAddLine1(NewRow);
@@ -549,8 +549,8 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
- option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "0", "HRemark": "" }];
+ option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " }];
+ option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HQty": "0", "HRemark": "" }];
table.render(option);
table.render(option1);
}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\205\245\345\272\223/Sb_EquipStockInCheckBill.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\205\245\345\272\223/Sb_EquipStockInCheckBill.html"
index 54ccefb..11481d2 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\205\245\345\272\223/Sb_EquipStockInCheckBill.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\205\245\345\272\223/Sb_EquipStockInCheckBill.html"
@@ -278,6 +278,9 @@
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
if (linterid == null || linterid == 0) {
+ $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
+ $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
+
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsBill.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsBill.html"
index 24bad3e..b4fa713 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsBill.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsBill.html"
@@ -272,6 +272,11 @@
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
if (linterid == null || linterid == 0) {
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
+ $("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬
+
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsChangeBill.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsChangeBill.html"
index e62de7f..f1788e4 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsChangeBill.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\244\207\345\223\201\345\244\207\344\273\266/Sb_EquipSparepartsChangeBill.html"
@@ -274,6 +274,11 @@
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
if (linterid == null || linterid == 0) {
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
+ $("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬
+
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\225\344\272\247/Sb_EquipWorkBeforeCheckBill.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\225\344\272\247/Sb_EquipWorkBeforeCheckBill.html"
index cb030f6..d91e819 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\225\344\272\247/Sb_EquipWorkBeforeCheckBill.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\225\344\272\247/Sb_EquipWorkBeforeCheckBill.html"
@@ -278,6 +278,9 @@
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
if (linterid == null || linterid == 0) {
+ $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
+ $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
+
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\225\344\272\247\346\243\200\351\252\214\351\252\214\346\224\266\345\215\225/Sb_EquipWorkBeforeCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\225\344\272\247\346\243\200\351\252\214\351\252\214\346\224\266\345\215\225/Sb_EquipWorkBeforeCheckBillEdit.html"
index ef17cd0..cefc7d4 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\225\344\272\247\346\243\200\351\252\214\351\252\214\346\224\266\345\215\225/Sb_EquipWorkBeforeCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\225\344\272\247\346\243\200\351\252\214\351\252\214\346\224\266\345\215\225/Sb_EquipWorkBeforeCheckBillEdit.html"
@@ -169,7 +169,7 @@
var option = [];
var sBillType = "3915";
- var rowdata = [{ "HQCCheckClassID": 0, "HQCCheckClassName": "", "HQCCheckItemID": "0", "HQCCheckItemName": "", "HQCStd": "", "HQCRelValue": "", "HResult": "", "HProcCheckEmp": "0", "HProcCheckEmpName": "", "HProcCheckTime": "", "HRemark": "" }];
+ var rowdata = [{ "HQCCheckClassID": 0, "HQCCheckClassName": "", "HQCCheckItemID": "0", "HQCCheckItemName": "", "HQCStd": "", "HQCRelValue": "", "HResult": "", "HProcCheckEmp": sessionStorage["HEmpID"], "HProcCheckEmpName": sessionStorage["HEmpName"], "HProcCheckTime": "", "HRemark": "" }];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -188,6 +188,9 @@
set_InitGrid();
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鏂板
+ $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
+ $("#HFirstCheckEmpNo").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
+
set_AddFNew();
}
else if (OperationType == 3) {//缂栬緫
@@ -205,7 +208,7 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- var NewRow = { "HQCCheckClassID": 0, "HQCCheckClassName": "", "HQCCheckItemID": "0", "HQCCheckItemName": "", "HQCStd": "", "HQCRelValue": "", "HResult": "", "HProcCheckEmp": "0", "HProcCheckEmpName": "", "HProcCheckTime": "", "HRemark": "" };
+ var NewRow = { "HQCCheckClassID": 0, "HQCCheckClassName": "", "HQCCheckItemID": "0", "HQCCheckItemName": "", "HQCStd": "", "HQCRelValue": "", "HResult": "", "HProcCheckEmp": sessionStorage["HEmpID"], "HProcCheckEmpName": sessionStorage["HEmpName"], "HProcCheckTime": "", "HRemark": "" };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine':
@@ -486,7 +489,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HQCCheckClassID": 0, "HQCCheckClassName": "", "HQCCheckItemID": "0", "HQCCheckItemName": "", "HQCStd": "", "HQCRelValue": "", "HResult": "", "HProcCheckEmp": "0", "HProcCheckEmpName": "", "HProcCheckTime": "", "HRemark": "" }];
+ option.data = [{ "HQCCheckClassID": 0, "HQCCheckClassName": "", "HQCCheckItemID": "0", "HQCCheckItemName": "", "HQCStd": "", "HQCRelValue": "", "HResult": "", "HProcCheckEmp": sessionStorage["HEmpID"], "HProcCheckEmpName": sessionStorage["HEmpName"], "HProcCheckTime": "", "HRemark": "" }];
table.render(option);
}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillEdit.html"
index 80bea1f..688a06f 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillEdit.html"
@@ -222,6 +222,13 @@
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭缁翠慨浜篒D
+ $("#HEmpIDName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭缁翠慨浜�
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
+ $("#HDeptIDName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬
+ $("#HManagerID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭璐熻矗浜篒D
+ $("#HManagerIDName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭璐熻矗浜�
+
OperationType = 1;
linteridSub = -1;
$.ajax({
@@ -303,7 +310,7 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
"瀛愮淮淇」鐩�": "", "HRepairID": 0, "瀛愮淮淇」鐩唬鐮�": "", "HRepairExplanation": "",
- "瀛愯礋璐ｄ汉浠ｇ爜": "", "HManagerID": 0, "瀛愯礋璐ｄ汉": "", "HRemark": ""
+ "瀛愯礋璐ｄ汉浠ｇ爜": sessionStorage["HEmpNumber"], "HManagerID": sessionStorage["HEmpID"], "瀛愯礋璐ｄ汉": sessionStorage["HEmpName"], "HRemark": ""
};
switch (obj.event) {
case 'btn-AddLine':
@@ -386,7 +393,7 @@
//鍒濆琛ㄦ牸鏁版嵁
var rowdata = [{
"瀛愮淮淇」鐩�": "", "HRepairID": 0, "瀛愮淮淇」鐩唬鐮�": "", "HRepairExplanation": "",
- "瀛愯礋璐ｄ汉浠ｇ爜": "", "HManagerID": 0, "瀛愯礋璐ｄ汉": "", "HRemark": ""
+ "瀛愯礋璐ｄ汉浠ｇ爜": sessionStorage["HEmpNumber"], "HManagerID": sessionStorage["HEmpID"], "瀛愯礋璐ｄ汉": sessionStorage["HEmpName"], "HRemark": ""
}];
option.data = rowdata;
table.render(option);
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
index 5534b0f..44ca517 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
@@ -195,7 +195,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" };
+ var NewRow = { "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -356,7 +356,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": "0", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" }];
table.render(option);
}
//鑾峰彇鏈�澶у崟鎹彿
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
index f26f885..45e91ef 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
@@ -206,7 +206,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };
+ var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -406,7 +406,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+ option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " }];
option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "" }];
table.render(option);
table.render(option1);
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index 8b11efc..b4b062b 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -727,6 +727,9 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
+
+ $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
+ $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
//鑾峰彇鏈�澶у崟鎹彿
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -742,6 +745,9 @@
});
}
else if (OperationType == 2) {
+ $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]);
+ $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]);
+
if (HICMOEntryID < 0 || HICMOEntryID == "") {
layer.alert("鐢熶骇浠诲姟鍗曞瓙鍐呯爜閿欒锛屾棤娉曞伐搴忔锛�", { icon: 5 });
$('#btn-AddNew').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鏂板鎸夐挳绂佺敤
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index fdcd920..24f68a7 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -717,6 +717,10 @@
if (OperationType == 1) {
$("#HInterID").val("");
$("#HBillNo").val("");
+
+ $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
+ $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
+
//$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
//鑾峰彇鏈�澶у崟鎹彿
$.ajax({
@@ -740,6 +744,9 @@
$('#btnSearchICMOBill').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浠诲姟鍗曞彿鎸夐挳绂佺敤
$('#btnSearchMater').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浜у搧鍐呯爜鎸夐挳绂佺敤
$('#btnSearchProcExch').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂娴佽浆鍗″彿鎸夐挳绂佺敤
+
+ $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]);
+ $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]);
//鑾峰彇鏈�澶у崟鎹彿
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -1566,7 +1573,7 @@
}
$("#HQCSchemeID").val(checkStatus.data[0].HItemID);
$("#HQCSchemeName").val(checkStatus.data[0].鏂规鍚嶇О);
- get_CheckItem();
+ get_CheckItem();
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
--
Gitblit v1.9.1